fix: log-ios command

__e2e__/__snapshots__/config.test.ts.snap

@@ -9,7 +9,10 @@ exports[`shows up current config without unnecessary output 1`] = `
   "commands": [
     {
       "name": "log-ios",
-      "description": "starts iOS device syslog tail"
+      "description": "starts iOS device syslog tail",
+      "options": [
+        "<<REPLACED>>"
+      ]
     },
     {
       "name": "run-ios",

packages/cli-platform-ios/README.md

@@ -192,6 +192,12 @@ react-native log-ios
 
 Starts iOS device syslog tail.
 
+#### Options
+
+#### `--interactive`
+
+Explicitly select simulator to tail logs from. By default it will tail logs from the first booted and available simulator.
+
 ## License
 
 Everything inside this repository is [MIT licensed](./LICENSE).

packages/cli-platform-ios/src/commands/logIOS/index.ts

@@ -6,44 +6,63 @@
  *
  */
 
-import {execFileSync, spawnSync} from 'child_process';
+import {spawnSync} from 'child_process';
 import os from 'os';
 import path from 'path';
 import {logger} from '@react-native-community/cli-tools';
-import {Device} from '../../types';
-
-function findAvailableDevice(devices: {[index: string]: Array<Device>}) {
-  for (const key of Object.keys(devices)) {
-    for (const device of devices[key]) {
-      if (device.availability === '(available)' && device.state === 'Booted') {
-        return device;
-      }
-    }
-  }
-  return null;
-}
+import listIOSDevices from '../../tools/listIOSDevices';
+import getSimulators from '../../tools/getSimulators';
+import {Config} from '@react-native-community/cli-types';
+import prompts from 'prompts';
 
 /**
  * Starts iOS device syslog tail
  */
-async function logIOS() {
-  const rawDevices = execFileSync(
-    'xcrun',
-    ['simctl', 'list', 'devices', '--json'],
-    {encoding: 'utf8'},
+
+type Args = {
+  interactive: boolean;
+};
+
+async function logIOS(_argv: Array<string>, _ctx: Config, args: Args) {
+  // Here we're using two command because first command `xcrun simctl list --json devices` outputs `state` but doesn't return `available`. But second command `xcrun xcdevice list` outputs `available` but doesn't output `state`. So we need to connect outputs of both commands.
+  const simulators = getSimulators();
+  const bootedSimulators = Object.keys(simulators.devices)
+    .map((key) => simulators.devices[key])
+    .reduce((acc, val) => acc.concat(val), [])
+    .filter(({state}) => state === 'Booted');
+
+  const devices = await listIOSDevices();
+  const availableSimulators = devices.filter(
+    ({type, isAvailable}) => type === 'simulator' && isAvailable,
   );
 
-  const {devices} = JSON.parse(rawDevices) as {
-    devices: {[index: string]: Array<Device>};
-  };
+  const bootedAndAvailableSimulators = bootedSimulators.map((booted) => {
+    const available = availableSimulators.find(
+      ({udid}) => udid === booted.udid,
+    );
+    return {...available, ...booted};
+  });
 
-  const device = findAvailableDevice(devices);
-  if (device === null) {
+  if (bootedAndAvailableSimulators.length === 0) {
     logger.error('No active iOS device found');
     return;
   }
 
-  tailDeviceLogs(device.udid);
+  if (args.interactive && bootedAndAvailableSimulators.length > 1) {
+    const {udid} = await prompts({
+      type: 'select',
+      name: 'udid',
+      message: 'Select iOS simulators to tail logs from',
+      choices: bootedAndAvailableSimulators.map((simulator) => ({
+        title: simulator.name,
+        value: simulator.udid,
+      })),
+    });
+
+    tailDeviceLogs(udid);
+  } else {
+    tailDeviceLogs(bootedAndAvailableSimulators[0].udid);
+  }
 }
 
 function tailDeviceLogs(udid: string) {
@@ -69,4 +88,11 @@ export default {
   name: 'log-ios',
   description: 'starts iOS device syslog tail',
   func: logIOS,
+  options: [
+    {
+      name: '--interactive',
+      description:
+        'Explicitly select simulator to tail logs from. By default it will tail logs from the first booted and available simulator.',
+    },
+  ],
 };

packages/cli-platform-ios/src/commands/runIOS/index.ts

@@ -22,6 +22,7 @@ import {getProjectInfo} from '../../tools/getProjectInfo';
 import {getConfigurationScheme} from '../../tools/getConfigurationScheme';
 import {selectFromInteractiveMode} from '../../tools/selectFromInteractiveMode';
 import {promptForDeviceSelection} from '../../tools/prompts';
+import getSimulators from '../../tools/getSimulators';
 
 export interface FlagsT extends BuildFlags {
   simulator?: string;
@@ -203,25 +204,6 @@ async function runIOS(_: Array<string>, ctx: Config, args: FlagsT) {
   }
 }
 
-const getSimulators = () => {
-  let simulators: {devices: {[index: string]: Array<Device>}};
-
-  try {
-    simulators = JSON.parse(
-      child_process.execFileSync(
-        'xcrun',
-        ['simctl', 'list', '--json', 'devices'],
-        {encoding: 'utf8'},
-      ),
-    );
-  } catch (error) {
-    throw new CLIError(
-      'Could not get the simulator list from Xcode. Please open Xcode and try running project directly from there to resolve the remaining issues.',
-    );
-  }
-  return simulators;
-};
-
 async function runOnBootedDevicesSimulators(
   scheme: string,
   xcodeProject: IOSProjectInfo,

packages/cli-platform-ios/src/tools/getSimulators.ts

@@ -0,0 +1,24 @@
+import {CLIError} from '@react-native-community/cli-tools';
+import child_process from 'child_process';
+import {Device} from '../types';
+
+const getSimulators = () => {
+  let simulators: {devices: {[index: string]: Array<Device>}};
+
+  try {
+    simulators = JSON.parse(
+      child_process.execFileSync(
+        'xcrun',
+        ['simctl', 'list', '--json', 'devices'],
+        {encoding: 'utf8'},
+      ),
+    );
+  } catch (error) {
+    throw new CLIError(
+      'Could not get the simulator list from Xcode. Please open Xcode and try running project directly from there to resolve the remaining issues.',
+    );
+  }
+  return simulators;
+};
+
+export default getSimulators;