Detect Physical iOS device without Xcode

Summary:
This diff adds the support of detecting physical device in Flipper even if the xcode is not installed and there is no cli tool installed.

See the demo.

Reviewed By: timur-valiev

Differential Revision: D26816588

fbshipit-source-id: 5f052998fcbe5c51385222d16df0e1855177b552

desktop/app/src/dispatcher/__tests__/iOSDevice.node.tsx

@@ -7,7 +7,18 @@
  * @format
  */
 
-import {parseXcodeFromCoreSimPath} from '../iOSDevice';
+import {
+  parseXcodeFromCoreSimPath,
+  getAllPromisesForQueryingDevices,
+} from '../iOSDevice';
+import configureStore from 'redux-mock-store';
+import reducers, {State} from '../../reducers/index';
+import {getInstance} from '../../fb-stubs/Logger';
+
+const mockStore = configureStore<State, {}>([])(
+  reducers(undefined, {type: 'INIT'}),
+);
+const logger = getInstance();
 
 const standardCoresimulatorLog =
   'username            1264   0.0  0.1  5989740  41648   ??  Ss    2:23PM   0:12.92 /Applications/Xcode_12.4.0_fb.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/usr/libexec/mobileassetd';
@@ -48,3 +59,23 @@ test('test parseXcodeFromCoreSimPath from standard locations', () => {
     match[0],
   ).toEqual('/Applications/Xcode_12.4.0_fb.app/Contents/Developer');
 });
+
+test('test getAllPromisesForQueryingDevices when xcode detected', () => {
+  const promises = getAllPromisesForQueryingDevices(
+    mockStore,
+    logger,
+    {},
+    true,
+  );
+  expect(promises.length).toEqual(3);
+});
+
+test('test getAllPromisesForQueryingDevices when xcode is not detected', () => {
+  const promises = getAllPromisesForQueryingDevices(
+    mockStore,
+    logger,
+    {},
+    false,
+  );
+  expect(promises.length).toEqual(1);
+});

desktop/app/src/dispatcher/iOSDevice.tsx

@@ -93,22 +93,47 @@ if (typeof window !== 'undefined') {
   });
 }
 
+export function getAllPromisesForQueryingDevices(
+  store: Store,
+  logger: Logger,
+  iosBridge: IOSBridge,
+  isXcodeDetected: boolean,
+): Array<Promise<any>> {
+  const promArray = [
+    getActiveDevices(
+      store.getState().settingsState.idbPath,
+      store.getState().settingsState.enablePhysicalIOS,
+    ).then((devices: IOSDeviceParams[]) => {
+      processDevices(store, logger, iosBridge, devices, 'physical');
+    }),
+  ];
+  if (isXcodeDetected) {
+    promArray.push(
+      ...[
+        checkXcodeVersionMismatch(store),
+        getSimulators(store, true).then((devices) => {
+          processDevices(store, logger, iosBridge, devices, 'emulator');
+        }),
+      ],
+    );
+  }
+  return promArray;
+}
+
 async function queryDevices(
   store: Store,
   logger: Logger,
   iosBridge: IOSBridge,
 ): Promise<any> {
-  return Promise.all([
-    checkXcodeVersionMismatch(store),
-    getSimulators(store, true).then((devices) => {
-      processDevices(store, logger, iosBridge, devices, 'emulator');
-    }),
-    getActiveDevices(store.getState().settingsState.idbPath).then(
-      (devices: IOSDeviceParams[]) => {
-        processDevices(store, logger, iosBridge, devices, 'physical');
-      },
+  const isXcodeInstalled = await iosUtil.isXcodeDetected();
+  return Promise.all(
+    getAllPromisesForQueryingDevices(
+      store,
+      logger,
+      iosBridge,
+      isXcodeInstalled,
     ),
-  ]);
+  );
 }
 
 function processDevices(
@@ -224,8 +249,11 @@ export async function launchSimulator(udid: string): Promise<any> {
   await promisify(execFile)('open', ['-a', 'simulator']);
 }
 
-function getActiveDevices(idbPath: string): Promise<Array<IOSDeviceParams>> {
-  return iosUtil.targets(idbPath).catch((e) => {
+function getActiveDevices(
+  idbPath: string,
+  isPhysicalDeviceEnabled: boolean,
+): Promise<Array<IOSDeviceParams>> {
+  return iosUtil.targets(idbPath, isPhysicalDeviceEnabled).catch((e) => {
     console.error('Failed to get active iOS devices:', e.message);
     return [];
   });
@@ -279,25 +307,19 @@ async function checkXcodeVersionMismatch(store: Store) {
     console.error('Failed to determine Xcode version:', e);
   }
 }
-async function isXcodeDetected(): Promise<boolean> {
-  return exec('xcode-select -p')
-    .then((_) => true)
-    .catch((_) => false);
-}
 
 export default (store: Store, logger: Logger) => {
   if (!store.getState().settingsState.enableIOS) {
     return;
   }
-  isXcodeDetected().then((isDetected) => {
+  iosUtil.isXcodeDetected().then((isDetected) => {
     store.dispatch(setXcodeDetected(isDetected));
-    if (isDetected) {
-      if (store.getState().settingsState.enablePhysicalIOS) {
-        startDevicePortForwarders();
-      }
-      return makeIOSBridge(
-        store.getState().settingsState.idbPath,
-      ).then((iosBridge) => queryDevicesForever(store, logger, iosBridge));
+    if (store.getState().settingsState.enablePhysicalIOS) {
+      startDevicePortForwarders();
     }
+    return makeIOSBridge(
+      store.getState().settingsState.idbPath,
+      isDetected,
+    ).then((iosBridge) => queryDevicesForever(store, logger, iosBridge));
   });
 };