fix: iOS platform integration

Author: V3RON

packages/cli/src/bundlers/metro.ts

@@ -8,7 +8,6 @@ export const runMetro = async (): Promise<ChildProcess> => {
       ...process.env,
       RN_HARNESS: 'true',
     },
-    ignoreErrors: true,
   });
   const nodeChildProcess = await metro.nodeChildProcess;
 
@@ -38,7 +37,7 @@ export const waitForMetro = async (
           return;
         }
       }
-    } catch {}
+    } catch { }
 
     if (attempts < maxRetries) {
       await new Promise((resolve) => setTimeout(resolve, retryDelay));

packages/cli/src/platforms/android/index.ts

@@ -56,13 +56,14 @@ const androidPlatformAdapter: PlatformAdapter = {
         await runApp(runner.deviceId, runner.bundleId);
       },
       dispose: async () => {
+        await killApp(deviceId, runner.bundleId);
+
         if (emulator) {
           await killWithAwait(emulator);
         }
 
         await interactionEngine.close();
-        metro.kill();
-        await killApp(deviceId, runner.bundleId);
+        await killWithAwait(metro);
       },
       interactionEngine,
     };

packages/cli/src/platforms/ios/build.ts

@@ -1,4 +1,4 @@
-import { spawn } from '@react-native-harness/tools';
+import { spawn, spawnAndForget } from '@react-native-harness/tools';
 import { reloadApp } from '../../bundlers/metro.js';
 
 export const listDevices = async (): Promise<any> => {
@@ -33,8 +33,9 @@ export const installPods = async (): Promise<void> => {
 };
 
 export const listApps = async (udid: string): Promise<string[]> => {
-  const { stdout } = await spawn('xcrun', ['simctl', 'listapps', udid]);
-  return stdout.split('\n').map((line) => line.trim());
+  const { stdout: plistOutput } = await spawn('xcrun', ['simctl', 'listapps', udid]);
+  const { stdout: jsonOutput } = await spawn('plutil', ['-convert', 'json', '-o', '-', '-'], { stdin: { string: plistOutput } });
+  return Object.keys(JSON.parse(jsonOutput));
 };
 
 export const isAppInstalled = async (
@@ -66,13 +67,13 @@ export const runApp = async (
   simulatorName: string,
   appName: string
 ): Promise<void> => {
-  await spawn('xcrun', ['simctl', 'terminate', simulatorName, appName]);
+  await killApp(simulatorName, appName);
   await spawn('xcrun', ['simctl', 'launch', simulatorName, appName]);
 };
 
 export const killApp = async (
   simulatorName: string,
   appName: string
 ): Promise<void> => {
-  await spawn('xcrun', ['simctl', 'terminate', simulatorName, appName]);
+  await spawnAndForget('xcrun', ['simctl', 'terminate', simulatorName, appName]);
 };

packages/cli/src/platforms/ios/index.ts

@@ -1,7 +1,7 @@
 import { getInteractionEngine } from '@react-native-harness/interaction-engine';
 import { TestRunnerConfig } from '@react-native-harness/config';
 import { type PlatformAdapter } from '../platform-adapter.js';
-import { runSimulator } from './simulator.js';
+import { getSimulatorStatus, runSimulator, stopSimulator } from './simulator.js';
 import { isAppInstalled, runApp, killApp } from './build.js';
 import { killWithAwait } from '../../process.js';
 import { runMetro } from '../../bundlers/metro.js';
@@ -10,10 +10,15 @@ import { AppNotInstalledError } from '../../errors/appNotInstalledError.js';
 const iosPlatformAdapter: PlatformAdapter = {
   name: 'ios',
   getEnvironment: async (runner: TestRunnerConfig) => {
+    let shouldStopSimulator = false;
+    const simulatorStatus = await getSimulatorStatus(runner.deviceId);
     const metroPromise = runMetro();
     const interactionEnginePromise = getInteractionEngine(runner);
 
-    await runSimulator(runner.deviceId);
+    if (simulatorStatus === 'stopped') {
+      await runSimulator(runner.deviceId);
+      shouldStopSimulator = true;
+    }
 
     const isInstalled = await isAppInstalled(
       runner.deviceId,
@@ -33,9 +38,12 @@ const iosPlatformAdapter: PlatformAdapter = {
         await runApp(runner.deviceId, runner.bundleId);
       },
       dispose: async () => {
+        await killApp(runner.deviceId, runner.bundleId);
+        if (shouldStopSimulator) {
+          await stopSimulator(runner.deviceId);
+        }
         await interactionEngine.close();
         await killWithAwait(metro);
-        await killApp(runner.deviceId, runner.bundleId);
       },
       interactionEngine,
     };

packages/interaction-engine/src/backends/appium/server.ts

@@ -1,4 +1,4 @@
-import { spawn } from '@react-native-harness/tools';
+import { spawnAndForget } from '@react-native-harness/tools';
 import * as net from 'node:net';
 
 export type RunAppiumServerOptions = {
@@ -7,9 +7,7 @@ export type RunAppiumServerOptions = {
 };
 
 export const runAppiumServer = async (options: RunAppiumServerOptions) => {
-  spawn('appium', ['--port', options.port.toString()], {
-    ignoreErrors: true,
-  });
+  spawnAndForget('appium', ['--port', options.port.toString()]);
 
   await waitForServer({
     port: options.port,

packages/tools/src/spawn.ts

@@ -2,7 +2,7 @@ import type { Options, Subprocess } from 'nano-spawn';
 import nanoSpawn, { SubprocessError } from 'nano-spawn';
 import logger from './logger.js';
 
-export type SpawnOptions = Options & { ignoreErrors?: boolean };
+export type SpawnOptions = Options;
 
 export const spawn = (
   file: string,
@@ -19,16 +19,18 @@ export const spawn = (
   logger.debug(`Running: ${file}`, ...(args ?? []));
   const childProcess = nanoSpawn(file, args, { ...defaultOptions, ...options });
 
-  if (options?.ignoreErrors) {
-    childProcess.catch(() => {
-      // We don't care about the error here.
-    });
-  }
-
   setupChildProcessCleanup(childProcess);
   return childProcess;
 };
 
+export const spawnAndForget = async (file: string, args?: readonly string[], options?: SpawnOptions): Promise<void> => {
+  try {
+    await spawn(file, args, options);
+  } catch {
+    // We don't care about the error here.
+  }
+};
+
 export { Subprocess, SubprocessError };
 
 const setupChildProcessCleanup = (childProcess: Subprocess) => {