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

Remove mising iOS Bridge invariant in iOSDeviceManager

Browse Source 
Summary:
There's no need for us to have a property that can be undefined, since we can use the magic of *passing arguments* to achieve the same end result.

The unit test a bit more precarious, but it's left here for posterity or until we decide to kill it otherwise.

Reviewed By: passy

Differential Revision: D33892407

fbshipit-source-id: 3b499511189862e2265d8d6d29f849a7b813050e
This commit is contained in:
Lawrence Lomax
2022-02-01 00:43:24 -08:00
committed by Facebook GitHub Bot
parent 757b82757e
commit 9cbdc3038f
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
desktop/flipper-server-core/src/devices/ios/iOSDeviceManager.tsx
View File

@@ -35,7 +35,6 @@ export class IOSDeviceManager {
'MacOS',
'PortForwardingMacApp',
);
iosBridge: IOSBridge | undefined;
simctlBridge: SimctlBridge = new SimctlBridge();
public xcodeCommandLineToolsDetected = false;
@@ -89,14 +88,11 @@ export class IOSDeviceManager {
queryDevices(bridge: IOSBridge): Promise<any> {
return bridge
.getActiveDevices(true)
.then((devices) => this.processDevices(devices));
.then((devices) => this.processDevices(bridge, devices));
}
private processDevices(activeDevices: IOSDeviceParams[]) {
private processDevices(bridge: IOSBridge, activeDevices: IOSDeviceParams[]) {
console.debug('[conn] processDevices', activeDevices);
if (!this.iosBridge) {
throw new Error('iOS bridge not yet initialized');
}
const currentDeviceIDs = new Set(
this.flipperServer
.getDevices()
@@ -116,7 +112,7 @@ export class IOSDeviceManager {
console.info(`[conn] detected new iOS device ${udid}`, activeDevice);
const iOSDevice = new IOSDevice(
this.flipperServer,
this.iosBridge,
bridge,
udid,
type,
name,
@@ -141,15 +137,15 @@ export class IOSDeviceManager {
this.startDevicePortForwarders();
}
try {
// Check for version mismatch now for immediate error handling.
await this.checkXcodeVersionMismatch();
// Awaiting the promise here to trigger immediate error handling.
this.iosBridge = await makeIOSBridge(
const bridge = await makeIOSBridge(
settings.idbPath,
isDetected,
settings.enablePhysicalIOS,
);
// Check for version mismatch now for immediate error handling.
await this.checkXcodeVersionMismatch();
this.queryDevicesForever(this.iosBridge);
this.queryDevicesForever(bridge);
} catch (err) {
// This case is expected if both Xcode and idb are missing.
if (err.message === ERR_NO_IDB_OR_XCODE_AVAILABLE) {