jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch errors when querying physical devices

Browse Source 
Summary:
This is our #1 error and always means there's something off with
the user's setup.

Reviewed By: mweststrate

Differential Revision: D26370974

fbshipit-source-id: 5e2644ce9de8a7d28614a22fab5ce54dab0561d3
This commit is contained in:
Pascal Hartig
2021-02-11 05:06:28 -08:00
committed by Facebook GitHub Bot
parent 92f3ab8ff4
commit eff1ce5ba7
1 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
desktop/app/src/utils/iOSContainerUtility.tsx
View File

@@ -64,7 +64,8 @@ async function targets(idbPath: string): Promise<Array<DeviceTarget>> {
// But idb is MUCH more CPU efficient than instruments, so // But idb is MUCH more CPU efficient than instruments, so
// when installed, use it. // when installed, use it.
if (await memoize(isAvailable)(idbPath)) { if (await memoize(isAvailable)(idbPath)) {
return safeExec(`${idbPath} list-targets --json`).then(({stdout}) => return safeExec(`${idbPath} list-targets --json`)
.then(({stdout}) =>
// It is safe to assume this to be non-null as it only turns null // It is safe to assume this to be non-null as it only turns null
// if the output redirection is misconfigured: // if the output redirection is misconfigured:
// https://stackoverflow.com/questions/27786228/node-child-process-spawn-stdout-returning-as-null // https://stackoverflow.com/questions/27786228/node-child-process-spawn-stdout-returning-as-null
@@ -76,13 +77,18 @@ async function targets(idbPath: string): Promise<Array<DeviceTarget>> {
.filter(Boolean) .filter(Boolean)
.map((line) => JSON.parse(line)) .map((line) => JSON.parse(line))
.filter(({type}: IdbTarget) => type !== 'simulator') .filter(({type}: IdbTarget) => type !== 'simulator')
.map((target: IdbTarget) => { .map<DeviceTarget>((target: IdbTarget) => {
return {udid: target.udid, type: 'physical', name: target.name}; return {udid: target.udid, type: 'physical', name: target.name};
}), }),
); )
.catch((e: Error) => {
console.warn('Failed to query idb for targets:', e);
return [];
});
} else { } else {
await killOrphanedInstrumentsProcesses(); await killOrphanedInstrumentsProcesses();
return safeExec('instruments -s devices').then(({stdout}) => return safeExec('instruments -s devices')
.then(({stdout}) =>
stdout! stdout!
.toString() .toString()
.split('\n') .split('\n')
@@ -91,10 +97,14 @@ async function targets(idbPath: string): Promise<Array<DeviceTarget>> {
.map((line) => /(.+) \([^(]+\) \[(.*)\]( \(Simulator\))?/.exec(line)) .map((line) => /(.+) \([^(]+\) \[(.*)\]( \(Simulator\))?/.exec(line))
.filter(notNull) .filter(notNull)
.filter(([_match, _name, _udid, isSim]) => !isSim) .filter(([_match, _name, _udid, isSim]) => !isSim)
.map(([_match, name, udid]) => { .map<DeviceTarget>(([_match, name, udid]) => {
return {udid: udid, type: 'physical', name: name}; return {udid, type: 'physical', name};
}), }),
); )
.catch((e) => {
console.warn('Failed to query instruments:', e);
return [];
});
} }
} }