Skip to content

fix: failing device detection process #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mastersam07 merged 2 commits into from
Apr 10, 2025
Merged

fix: failing device detection process #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b332a18
Merge branch 'dev' of https://github.com/Mastersam07/maestro-workbenc…
Mastersam07 Apr 7, 2025
513326e
fix: return found devices irrespective of what process fails
Mastersam07 Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions src/utils/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,25 @@ export interface Device {
}

export async function getAvailableDevices(): Promise<Device[]> {
const devices: Device[] = [];

try {
const { stdout: adbOutput } = await execAsync('adb devices');
const androidDevices = parseAdbDevicesOutput(adbOutput);
devices.push(...androidDevices);
} catch (error) {
console.error('Error getting Android devices:', error);
}

try {
const { stdout: xcrunOutput } = await execAsync('xcrun xctrace list devices');
const iosDevices = parseXcrunDevicesOutput(xcrunOutput);

return [...androidDevices, ...iosDevices];
devices.push(...iosDevices);
} catch (error) {
console.error('Error getting devices:', error);
return [];
console.error('Error getting iOS devices:', error);
}

return devices;
}

export async function getDefaultDevice(): Promise<string | undefined> {
Expand All @@ -33,7 +40,7 @@ export async function getDefaultDevice(): Promise<string | undefined> {
function parseAdbDevicesOutput(output: string): Device[] {
const lines = output.split('\n');
const devices: Device[] = [];

for (let i = 1; i < lines.length; i++) {
const line = lines[i].trim();
if (line && !line.includes('---')) {
Expand All @@ -47,18 +54,18 @@ function parseAdbDevicesOutput(output: string): Device[] {
}
}
}

return devices;
}

function parseXcrunDevicesOutput(output: string): Device[] {
const lines = output.split('\n');
const devices: Device[] = [];
let currentSection = '';

for (const line of lines) {
const trimmedLine = line.trim();

if (!trimmedLine || trimmedLine.startsWith('==')) {
if (trimmedLine.startsWith('== Devices ==')) {
currentSection = 'device';
Expand All @@ -76,12 +83,12 @@ function parseXcrunDevicesOutput(output: string): Device[] {
devices.push({
id,
name: version ? `${name} (${version})` : name,
type: currentSection === 'simulator' ? 'iOS Simulator' :
currentSection === 'offline' ? 'iOS Device (Offline)' : 'iOS Device'
type: currentSection === 'simulator' ? 'iOS Simulator' :
currentSection === 'offline' ? 'iOS Device (Offline)' : 'iOS Device'
});
}
}

return devices;
}

Expand Down
Loading