@react-native-harness/jest 1.1.0-rc.2 → 1.1.0-rc.3

package/dist/harness.js

@@ -1,20 +1,23 @@
 import { getBridgeServer, } from '@react-native-harness/bridge/server';
+import { HARNESS_BRIDGE_PATH, } from '@react-native-harness/bridge';
 import { getMetroInstance, isMetroCacheReusable, waitForMetroBackedAppReady, } from '@react-native-harness/bundler-metro';
 import { createHarnessPluginManager, } from '@react-native-harness/plugins';
-import { logger, createCrashArtifactWriter } from '@react-native-harness/tools';
-import { InitializationTimeoutError } from './errors.js';
+import { logger, createCrashArtifactWriter, getTimeoutSignal, raceAbortSignals, } from '@react-native-harness/tools';
+import { PlatformReadyTimeoutError } from './errors.js';
 import { createCrashSupervisor, } from './crash-supervisor.js';
 import { createClientLogListener } from './client-log-handler.js';
 import path from 'node:path';
-import { logMetroCacheReused } from './logs.js';
+import { logMetroCacheReused, logRunnerStarting, logRunnerStillWaitingInQueue, logRunnerWaitingInQueue, } from './logs.js';
+import { createResourceLockManager } from './resource-lock.js';
 const harnessLogger = logger.child('runtime');
+const resourceLockManager = createResourceLockManager();
 export const maybeLogMetroCacheReuse = (config, platform, projectRoot) => {
-    if (config.unstable__enableMetroCache &&
-        isMetroCacheReusable(projectRoot)) {
+    if (config.unstable__enableMetroCache && isMetroCacheReusable(projectRoot)) {
         logMetroCacheReused(platform);
     }
 };
 const createAbortError = () => new DOMException('The operation was aborted', 'AbortError');
+const getDefaultResourceLockKey = (platform) => `${platform.platformId}:${platform.name}`;
 const waitForAbort = (signal) => {
     if (signal.aborted) {
         return Promise.reject(signal.reason ?? createAbortError());
@@ -25,6 +28,22 @@ const waitForAbort = (signal) => {
         }, { once: true });
     });
 };
+const withPlatformReadyTimeout = async (options) => {
+    const timeoutSignal = getTimeoutSignal(options.timeout);
+    const combinedSignal = raceAbortSignals([options.signal, timeoutSignal]);
+    try {
+        return await options.work(combinedSignal);
+    }
+    catch (error) {
+        if (error instanceof DOMException &&
+            error.name === 'AbortError' &&
+            timeoutSignal.aborted &&
+            !options.signal.aborted) {
+            throw new PlatformReadyTimeoutError(options.timeout);
+        }
+        throw error;
+    }
+};
 export const waitForAppReady = async (options) => {
     const { metroInstance, serverBridge, platformInstance, platformId, bundleStartTimeout, readyTimeout, maxAppRestarts, testFilePath, crashSupervisor, appLaunchOptions, launchApp = () => platformInstance.restartApp(appLaunchOptions), } = options;
     const signal = options.signal ?? new AbortController().signal;
@@ -93,417 +112,490 @@ const getHarnessInternal = async (config, platform, projectRoot, signal) => {
         platform,
     };
     harnessLogger.debug('creating Harness internals for runner=%s platform=%s', platform.name, platform.platformId);
-    maybeLogMetroCacheReuse(config, platform, projectRoot);
-    const pluginAbortController = new AbortController();
-    const pluginManager = createHarnessPluginManager({
-        plugins: (config.plugins ?? []),
-        projectRoot,
-        config,
-        runner: platform,
-        abortSignal: pluginAbortController.signal,
+    const resourceLockKey = await (platform.getResourceLockKey?.() ??
+        getDefaultResourceLockKey(platform));
+    let didWaitForResourceLock = false;
+    let lastStillWaitingLogAt = 0;
+    const resourceLease = await resourceLockManager.acquire(resourceLockKey, {
+        signal,
+        onWait: () => {
+            didWaitForResourceLock = true;
+            logRunnerWaitingInQueue(platform);
+            harnessLogger.debug('waiting in queue for runner=%s key=%s', platform.name, resourceLockKey);
+        },
+        onStillWaiting: (elapsedMs) => {
+            if (elapsedMs - lastStillWaitingLogAt < 5000) {
+                return;
+            }
+            lastStillWaitingLogAt = elapsedMs;
+            logRunnerStillWaitingInQueue(platform);
+            harnessLogger.debug('still waiting in queue for runner=%s key=%s elapsedMs=%d', platform.name, resourceLockKey, elapsedMs);
+        },
     });
-    let currentRun = null;
-    let activeTestFilePath;
-    const pendingHookPromises = new Set();
-    let pendingHookError;
-    const getCurrentRunId = () => currentRun?.runId;
-    const toRelativeTestFilePath = (testFilePath) => testFilePath == null ? undefined : path.relative(projectRoot, testFilePath);
-    const setActiveTestFilePath = (testFilePath) => {
-        activeTestFilePath = toRelativeTestFilePath(testFilePath);
-    };
-    const flushPendingHooks = async () => {
-        if (pendingHookPromises.size > 0) {
-            await Promise.allSettled([...pendingHookPromises]);
-        }
-        if (pendingHookError !== undefined) {
-            const error = pendingHookError;
-            pendingHookError = undefined;
-            throw error;
-        }
-    };
-    const trackHook = (promise) => {
-        const trackedPromise = promise
-            .catch((error) => {
-            pendingHookError ??= error;
-        })
-            .finally(() => {
-            pendingHookPromises.delete(trackedPromise);
+    if (didWaitForResourceLock) {
+        logRunnerStarting(platform);
+    }
+    harnessLogger.debug('resource lock acquired for runner=%s key=%s', platform.name, resourceLockKey);
+    try {
+        maybeLogMetroCacheReuse(config, platform, projectRoot);
+        const pluginAbortController = new AbortController();
+        const pluginManager = createHarnessPluginManager({
+            plugins: (config.plugins ?? []),
+            projectRoot,
+            config,
+            runner: platform,
+            abortSignal: pluginAbortController.signal,
         });
-        pendingHookPromises.add(trackedPromise);
-    };
-    const scheduleHook = (name, payload) => {
-        trackHook(pluginManager.callHook(name, payload));
-    };
-    harnessLogger.debug('starting Metro, platform runner, and bridge initialization');
-    const [metroInstance, platformInstance, serverBridge] = await Promise.all([
-        getMetroInstance({ projectRoot, harnessConfig: config }, signal).then((instance) => {
-            harnessLogger.debug('Metro initialized');
-            return instance;
-        }),
-        import(platform.runner)
-            .then((module) => module.default(platform.config, config))
-            .then((instance) => {
-            harnessLogger.debug('platform runner initialized');
-            return instance;
-        }),
-        getBridgeServer({
-            port: config.webSocketPort,
+        let currentRun = null;
+        let activeTestFilePath;
+        const pendingHookPromises = new Set();
+        let pendingHookError;
+        const getCurrentRunId = () => currentRun?.runId;
+        const toRelativeTestFilePath = (testFilePath) => testFilePath == null
+            ? undefined
+            : path.relative(projectRoot, testFilePath);
+        const setActiveTestFilePath = (testFilePath) => {
+            activeTestFilePath = toRelativeTestFilePath(testFilePath);
+        };
+        const flushPendingHooks = async () => {
+            if (pendingHookPromises.size > 0) {
+                await Promise.allSettled([...pendingHookPromises]);
+            }
+            if (pendingHookError !== undefined) {
+                const error = pendingHookError;
+                pendingHookError = undefined;
+                throw error;
+            }
+        };
+        const trackHook = (promise) => {
+            const trackedPromise = promise
+                .catch((error) => {
+                pendingHookError ??= error;
+            })
+                .finally(() => {
+                pendingHookPromises.delete(trackedPromise);
+            });
+            pendingHookPromises.add(trackedPromise);
+        };
+        const scheduleHook = (name, payload) => {
+            trackHook(pluginManager.callHook(name, payload));
+        };
+        const serverBridge = await getBridgeServer({
+            noServer: true,
             timeout: config.bridgeTimeout,
             context,
-        }).then((bridge) => {
-            harnessLogger.debug('bridge server initialized on port %d', config.webSocketPort);
-            return bridge;
-        }),
-    ]);
-    const crashArtifactWriter = createCrashArtifactWriter({
-        runnerName: platform.name,
-        platformId: platform.platformId,
-    });
-    const appMonitor = platformInstance.createAppMonitor({
-        crashArtifactWriter,
-    });
-    const appLaunchOptions = platform.config.appLaunchOptions;
-    const clientLogListener = createClientLogListener();
-    const bridgeEventListener = (event) => {
-        const runId = getCurrentRunId();
-        if (!runId) {
-            return;
-        }
-        switch (event.type) {
-            case 'collection-started':
-                scheduleHook('collection:started', {
-                    runId,
-                    file: event.file,
-                });
-                break;
-            case 'collection-finished':
-                scheduleHook('collection:finished', {
-                    runId,
-                    file: event.file,
-                    duration: event.duration,
-                    totalTests: event.totalTests,
-                });
-                break;
-            case 'suite-started':
-                scheduleHook('suite:started', {
-                    runId,
-                    file: event.file,
-                    name: event.name,
-                });
-                break;
-            case 'suite-finished':
-                scheduleHook('suite:finished', {
-                    runId,
-                    file: event.file,
-                    name: event.name,
-                    duration: event.duration,
-                    status: event.status,
-                    error: event.error,
-                });
-                break;
-            case 'test-started':
-                scheduleHook('test:started', {
-                    runId,
-                    file: event.file,
-                    suite: event.suite,
-                    name: event.name,
-                });
-                break;
-            case 'test-finished':
-                scheduleHook('test:finished', {
-                    runId,
-                    file: event.file,
-                    suite: event.suite,
-                    name: event.name,
-                    duration: event.duration,
-                    status: event.status,
-                    error: event.error,
-                });
-                break;
-            case 'module-bundling-started':
-                scheduleHook('metro:bundle-started', {
+        });
+        harnessLogger.debug('starting Metro, platform runner, and bridge initialization');
+        harnessLogger.debug('bridge server initialized on Metro websocket path %s', HARNESS_BRIDGE_PATH);
+        const [metroInstance, platformInstance] = await (async () => {
+            try {
+                return await Promise.all([
+                    getMetroInstance({
+                        projectRoot,
+                        harnessConfig: config,
+                        websocketEndpoints: {
+                            [HARNESS_BRIDGE_PATH]: serverBridge.ws,
+                        },
+                    }, signal).then((instance) => {
+                        harnessLogger.debug('Metro initialized');
+                        return instance;
+                    }),
+                    withPlatformReadyTimeout({
+                        timeout: config.platformReadyTimeout,
+                        signal,
+                        work: async () => {
+                            return await import(platform.runner)
+                                .then((module) => module.default(platform.config, config, {
+                                signal,
+                            }))
+                                .then((instance) => {
+                                harnessLogger.debug('platform runner initialized');
+                                return instance;
+                            });
+                        },
+                    }),
+                ]);
+            }
+            catch (error) {
+                await Promise.allSettled([
+                    resourceLease.release(),
+                    serverBridge.dispose(),
+                ]);
+                throw error;
+            }
+        })();
+        const crashArtifactWriter = createCrashArtifactWriter({
+            runnerName: platform.name,
+            platformId: platform.platformId,
+        });
+        const appMonitor = platformInstance.createAppMonitor({
+            crashArtifactWriter,
+        });
+        const appLaunchOptions = platform.config.appLaunchOptions;
+        const clientLogListener = createClientLogListener();
+        const bridgeEventListener = (event) => {
+            const runId = getCurrentRunId();
+            if (!runId) {
+                return;
+            }
+            switch (event.type) {
+                case 'collection-started':
+                    scheduleHook('collection:started', {
+                        runId,
+                        file: event.file,
+                    });
+                    break;
+                case 'collection-finished':
+                    scheduleHook('collection:finished', {
+                        runId,
+                        file: event.file,
+                        duration: event.duration,
+                        totalTests: event.totalTests,
+                    });
+                    break;
+                case 'suite-started':
+                    scheduleHook('suite:started', {
+                        runId,
+                        file: event.file,
+                        name: event.name,
+                    });
+                    break;
+                case 'suite-finished':
+                    scheduleHook('suite:finished', {
+                        runId,
+                        file: event.file,
+                        name: event.name,
+                        duration: event.duration,
+                        status: event.status,
+                        error: event.error,
+                    });
+                    break;
+                case 'test-started':
+                    scheduleHook('test:started', {
+                        runId,
+                        file: event.file,
+                        suite: event.suite,
+                        name: event.name,
+                    });
+                    break;
+                case 'test-finished':
+                    scheduleHook('test:finished', {
+                        runId,
+                        file: event.file,
+                        suite: event.suite,
+                        name: event.name,
+                        duration: event.duration,
+                        status: event.status,
+                        error: event.error,
+                    });
+                    break;
+                case 'module-bundling-started':
+                    scheduleHook('metro:bundle-started', {
+                        runId,
+                        target: 'module',
+                        file: event.file,
+                    });
+                    break;
+                case 'module-bundling-finished':
+                    scheduleHook('metro:bundle-finished', {
+                        runId,
+                        target: 'module',
+                        file: event.file,
+                        duration: event.duration,
+                    });
+                    break;
+                case 'module-bundling-failed':
+                    scheduleHook('metro:bundle-failed', {
+                        runId,
+                        target: 'module',
+                        file: event.file,
+                        duration: event.duration,
+                        error: event.error,
+                    });
+                    break;
+                case 'setup-file-bundling-started':
+                    scheduleHook('metro:bundle-started', {
+                        runId,
+                        target: 'setupFile',
+                        file: event.file,
+                        setupType: event.setupType,
+                    });
+                    break;
+                case 'setup-file-bundling-finished':
+                    scheduleHook('metro:bundle-finished', {
+                        runId,
+                        target: 'setupFile',
+                        file: event.file,
+                        setupType: event.setupType,
+                        duration: event.duration,
+                    });
+                    break;
+                case 'setup-file-bundling-failed':
+                    scheduleHook('metro:bundle-failed', {
+                        runId,
+                        target: 'setupFile',
+                        file: event.file,
+                        setupType: event.setupType,
+                        duration: event.duration,
+                        error: event.error,
+                    });
+                    break;
+            }
+        };
+        const onMetroEvent = (event) => {
+            const runId = getCurrentRunId();
+            if (runId && event.type === 'client_log') {
+                scheduleHook('metro:client-log', {
                     runId,
-                    target: 'module',
-                    file: event.file,
+                    level: event.level,
+                    data: event.data,
                 });
-                break;
-            case 'module-bundling-finished':
-                scheduleHook('metro:bundle-finished', {
+            }
+        };
+        const crashSupervisor = createCrashSupervisor({
+            appMonitor,
+            platformRunner: platformInstance,
+        });
+        const onReady = (device) => {
+            crashSupervisor.markReady();
+            const runId = getCurrentRunId();
+            if (!runId) {
+                return;
+            }
+            scheduleHook('runtime:ready', {
+                runId,
+                device,
+            });
+        };
+        const onDisconnect = () => {
+            const runId = getCurrentRunId();
+            if (!runId) {
+                return;
+            }
+            scheduleHook('runtime:disconnected', {
+                runId,
+                reason: 'bridge-disconnected',
+            });
+        };
+        const onAppMonitorEvent = (event) => {
+            const runId = getCurrentRunId();
+            if (!runId) {
+                return;
+            }
+            if (event.type === 'app_started') {
+                scheduleHook('app:started', {
                     runId,
-                    target: 'module',
-                    file: event.file,
-                    duration: event.duration,
+                    testFile: activeTestFilePath,
+                    pid: event.pid,
+                    source: event.source,
+                    line: event.line,
                 });
-                break;
-            case 'module-bundling-failed':
-                scheduleHook('metro:bundle-failed', {
+                return;
+            }
+            if (event.type === 'app_exited') {
+                scheduleHook('app:exited', {
                     runId,
-                    target: 'module',
-                    file: event.file,
-                    duration: event.duration,
-                    error: event.error,
+                    testFile: activeTestFilePath,
+                    pid: event.pid,
+                    source: event.source,
+                    line: event.line,
+                    isConfirmed: event.isConfirmed,
+                    crashDetails: event.crashDetails,
                 });
-                break;
-            case 'setup-file-bundling-started':
-                scheduleHook('metro:bundle-started', {
+                return;
+            }
+            if (event.type === 'possible_crash') {
+                scheduleHook('app:possible-crash', {
                     runId,
-                    target: 'setupFile',
-                    file: event.file,
-                    setupType: event.setupType,
+                    testFile: activeTestFilePath,
+                    pid: event.pid,
+                    source: event.source,
+                    line: event.line,
+                    isConfirmed: event.isConfirmed,
+                    crashDetails: event.crashDetails,
                 });
-                break;
-            case 'setup-file-bundling-finished':
-                scheduleHook('metro:bundle-finished', {
-                    runId,
-                    target: 'setupFile',
-                    file: event.file,
-                    setupType: event.setupType,
-                    duration: event.duration,
+            }
+        };
+        serverBridge.on('ready', onReady);
+        serverBridge.on('disconnect', onDisconnect);
+        serverBridge.on('event', bridgeEventListener);
+        metroInstance.events.addListener(onMetroEvent);
+        appMonitor.addListener(onAppMonitorEvent);
+        harnessLogger.debug('registered runtime, bridge, and Metro listeners');
+        if (config.forwardClientLogs) {
+            metroInstance.events.addListener(clientLogListener);
+            harnessLogger.debug('client log forwarding enabled');
+        }
+        const dispose = async (reason = 'normal') => {
+            harnessLogger.debug('disposing Harness (reason=%s)', reason);
+            let hookError;
+            try {
+                await flushPendingHooks();
+                await pluginManager.callHook('harness:after-run', {
+                    runId: currentRun?.runId,
+                    reason,
+                    summary: currentRun?.summary,
+                    status: currentRun?.status,
+                    error: currentRun?.error,
                 });
-                break;
-            case 'setup-file-bundling-failed':
-                scheduleHook('metro:bundle-failed', {
-                    runId,
-                    target: 'setupFile',
-                    file: event.file,
-                    setupType: event.setupType,
-                    duration: event.duration,
-                    error: event.error,
+                await flushPendingHooks();
+                await pluginManager.callHook('harness:before-dispose', {
+                    runId: currentRun?.runId,
+                    reason,
+                    summary: currentRun?.summary,
+                    status: currentRun?.status,
+                    error: currentRun?.error,
                 });
-                break;
-        }
-    };
-    const onMetroEvent = (event) => {
-        const runId = getCurrentRunId();
-        if (runId && event.type === 'client_log') {
-            scheduleHook('metro:client-log', {
-                runId,
-                level: event.level,
-                data: event.data,
-            });
-        }
-    };
-    const crashSupervisor = createCrashSupervisor({
-        appMonitor,
-        platformRunner: platformInstance,
-    });
-    const onReady = (device) => {
-        crashSupervisor.markReady();
-        const runId = getCurrentRunId();
-        if (!runId) {
-            return;
-        }
-        scheduleHook('runtime:ready', {
-            runId,
-            device,
-        });
-    };
-    const onDisconnect = () => {
-        const runId = getCurrentRunId();
-        if (!runId) {
-            return;
-        }
-        scheduleHook('runtime:disconnected', {
-            runId,
-            reason: 'bridge-disconnected',
-        });
-    };
-    const onAppMonitorEvent = (event) => {
-        const runId = getCurrentRunId();
-        if (!runId) {
-            return;
-        }
-        if (event.type === 'app_started') {
-            scheduleHook('app:started', {
-                runId,
-                testFile: activeTestFilePath,
-                pid: event.pid,
-                source: event.source,
-                line: event.line,
-            });
-            return;
-        }
-        if (event.type === 'app_exited') {
-            scheduleHook('app:exited', {
-                runId,
-                testFile: activeTestFilePath,
-                pid: event.pid,
-                source: event.source,
-                line: event.line,
-                isConfirmed: event.isConfirmed,
-                crashDetails: event.crashDetails,
-            });
-            return;
-        }
-        if (event.type === 'possible_crash') {
-            scheduleHook('app:possible-crash', {
-                runId,
-                testFile: activeTestFilePath,
-                pid: event.pid,
-                source: event.source,
-                line: event.line,
-                isConfirmed: event.isConfirmed,
-                crashDetails: event.crashDetails,
-            });
+                await flushPendingHooks();
+            }
+            catch (error) {
+                hookError = error;
+            }
+            if (config.forwardClientLogs) {
+                metroInstance.events.removeListener(clientLogListener);
+            }
+            metroInstance.events.removeListener(onMetroEvent);
+            appMonitor.removeListener(onAppMonitorEvent);
+            serverBridge.off('ready', onReady);
+            serverBridge.off('disconnect', onDisconnect);
+            serverBridge.off('event', bridgeEventListener);
+            let cleanupError;
+            try {
+                await Promise.all([
+                    crashSupervisor.dispose(),
+                    serverBridge.dispose(),
+                    platformInstance.dispose(),
+                    metroInstance.dispose(),
+                ]);
+            }
+            catch (error) {
+                cleanupError = error;
+            }
+            finally {
+                await resourceLease.release();
+                pluginAbortController.abort();
+            }
+            harnessLogger.debug('Harness resources disposed');
+            if (hookError) {
+                throw hookError;
+            }
+            if (cleanupError) {
+                throw cleanupError;
+            }
+        };
+        if (signal.aborted) {
+            await dispose('abort');
+            throw new DOMException('The operation was aborted', 'AbortError');
         }
-    };
-    serverBridge.on('ready', onReady);
-    serverBridge.on('disconnect', onDisconnect);
-    serverBridge.on('event', bridgeEventListener);
-    metroInstance.events.addListener(onMetroEvent);
-    appMonitor.addListener(onAppMonitorEvent);
-    harnessLogger.debug('registered runtime, bridge, and Metro listeners');
-    if (config.forwardClientLogs) {
-        metroInstance.events.addListener(clientLogListener);
-        harnessLogger.debug('client log forwarding enabled');
-    }
-    const dispose = async (reason = 'normal') => {
-        harnessLogger.debug('disposing Harness (reason=%s)', reason);
-        let hookError;
         try {
+            await pluginManager.callHook('harness:before-creation', {
+                appLaunchOptions,
+            });
             await flushPendingHooks();
-            await pluginManager.callHook('harness:before-dispose', {
-                runId: currentRun?.runId,
-                reason,
-                summary: currentRun?.summary,
-                status: currentRun?.status,
-                error: currentRun?.error,
+            await appMonitor.start();
+            harnessLogger.debug('app monitor started');
+            await pluginManager.callHook('harness:before-run', {
+                appLaunchOptions,
             });
             await flushPendingHooks();
         }
         catch (error) {
-            hookError = error;
-        }
-        if (config.forwardClientLogs) {
-            metroInstance.events.removeListener(clientLogListener);
-        }
-        metroInstance.events.removeListener(onMetroEvent);
-        appMonitor.removeListener(onAppMonitorEvent);
-        serverBridge.off('ready', onReady);
-        serverBridge.off('disconnect', onDisconnect);
-        serverBridge.off('event', bridgeEventListener);
-        await Promise.all([
-            crashSupervisor.dispose(),
-            serverBridge.dispose(),
-            platformInstance.dispose(),
-            metroInstance.dispose(),
-        ]);
-        pluginAbortController.abort();
-        harnessLogger.debug('Harness resources disposed');
-        if (hookError) {
-            throw hookError;
-        }
-    };
-    if (signal.aborted) {
-        await dispose('abort');
-        throw new DOMException('The operation was aborted', 'AbortError');
-    }
-    try {
-        await pluginManager.callHook('harness:before-creation', {
-            appLaunchOptions,
-        });
-        await appMonitor.start();
-        harnessLogger.debug('app monitor started');
-    }
-    catch (error) {
-        const runState = currentRun;
-        if (runState) {
-            runState.error = error;
-            currentRun = runState;
-        }
-        await dispose(error instanceof DOMException && error.name === 'AbortError' ? 'abort' : 'error');
-        throw error;
-    }
-    const ensureAppReady = async (testFilePath) => {
-        await flushPendingHooks();
-        setActiveTestFilePath(testFilePath);
-        crashSupervisor.setActiveTestFile(testFilePath);
-        harnessLogger.debug('ensuring app is ready for %s', testFilePath);
-        if (crashSupervisor.isReady() && (await platformInstance.isAppRunning())) {
-            harnessLogger.debug('reusing existing ready app for %s', testFilePath);
-            return;
-        }
-        crashSupervisor.reset();
-        harnessLogger.debug('app not ready, waiting for launch and runtime readiness');
-        await waitForAppReady({
-            metroInstance,
-            serverBridge,
-            platformInstance: platformInstance,
-            platformId: platform.platformId,
-            bundleStartTimeout: config.bundleStartTimeout ?? 60000,
-            readyTimeout: config.bridgeTimeout,
-            maxAppRestarts: config.maxAppRestarts ?? 2,
-            testFilePath,
-            crashSupervisor,
-            appLaunchOptions,
-        });
-        await flushPendingHooks();
-        harnessLogger.debug('app is ready for %s', testFilePath);
-    };
-    const restart = async (testFilePath) => {
-        await flushPendingHooks();
-        await crashSupervisor.stop();
-        setActiveTestFilePath(testFilePath);
-        harnessLogger.debug('restarting app (testFile=%s mode=%s)', testFilePath ?? 'n/a', testFilePath ? 'stop-and-ensure-ready' : 'direct-restart');
-        if (testFilePath) {
-            harnessLogger.debug('stopping app before restart');
-            await platformInstance.stopApp();
-        }
-        else {
-            harnessLogger.debug('requesting direct app restart');
-            await platformInstance.restartApp(appLaunchOptions);
-        }
-        crashSupervisor.reset();
-        await crashSupervisor.start();
-        if (testFilePath) {
-            await ensureAppReady(testFilePath);
+            const runState = currentRun;
+            if (runState) {
+                runState.error = error;
+                currentRun = runState;
+            }
+            await dispose(error instanceof DOMException && error.name === 'AbortError'
+                ? 'abort'
+                : 'error');
+            throw error;
         }
-        await flushPendingHooks();
-        harnessLogger.debug('restart completed');
-    };
-    return {
-        context,
-        runTests: async (path, options) => {
+        const ensureAppReady = async (testFilePath) => {
             await flushPendingHooks();
-            activeTestFilePath = path;
-            const client = serverBridge.rpc.clients.at(-1);
-            if (!client) {
-                throw new Error('No client found');
+            setActiveTestFilePath(testFilePath);
+            crashSupervisor.setActiveTestFile(testFilePath);
+            harnessLogger.debug('ensuring app is ready for %s', testFilePath);
+            if (crashSupervisor.isReady() &&
+                (await platformInstance.isAppRunning())) {
+                harnessLogger.debug('reusing existing ready app for %s', testFilePath);
+                return;
             }
-            harnessLogger.debug('running test file on client: %s', path);
-            const result = await client.runTests(path, {
-                ...options,
-                runner: platform.runner,
+            crashSupervisor.reset();
+            harnessLogger.debug('app not ready, waiting for launch and runtime readiness');
+            await waitForAppReady({
+                metroInstance,
+                serverBridge,
+                platformInstance: platformInstance,
+                platformId: platform.platformId,
+                bundleStartTimeout: config.bundleStartTimeout ?? 60000,
+                readyTimeout: config.bridgeTimeout,
+                maxAppRestarts: config.maxAppRestarts ?? 2,
+                testFilePath,
+                crashSupervisor,
+                appLaunchOptions,
             });
             await flushPendingHooks();
-            return result;
-        },
-        ensureAppReady,
-        restart,
-        dispose: () => dispose('normal'),
-        crashSupervisor,
-        callHook: async (name, payload) => {
+            harnessLogger.debug('app is ready for %s', testFilePath);
+        };
+        const restart = async (testFilePath) => {
             await flushPendingHooks();
-            await pluginManager.callHook(name, payload);
+            await crashSupervisor.stop();
+            setActiveTestFilePath(testFilePath);
+            harnessLogger.debug('restarting app (testFile=%s mode=%s)', testFilePath ?? 'n/a', testFilePath ? 'stop-and-ensure-ready' : 'direct-restart');
+            if (testFilePath) {
+                harnessLogger.debug('stopping app before restart');
+                await platformInstance.stopApp();
+            }
+            else {
+                harnessLogger.debug('requesting direct app restart');
+                await platformInstance.restartApp(appLaunchOptions);
+            }
+            crashSupervisor.reset();
+            await crashSupervisor.start();
+            if (testFilePath) {
+                await ensureAppReady(testFilePath);
+            }
             await flushPendingHooks();
-        },
-        setRunState: (runState) => {
-            currentRun = runState;
-        },
-        getRunState: () => currentRun,
-    };
-};
-export const getHarness = async (config, platform, projectRoot) => {
-    const abortSignal = AbortSignal.timeout(config.bridgeTimeout);
-    harnessLogger.debug('creating Harness with bridge timeout %dms', config.bridgeTimeout);
-    try {
-        const harness = await getHarnessInternal(config, platform, projectRoot, abortSignal);
-        return harness;
+            harnessLogger.debug('restart completed');
+        };
+        return {
+            context,
+            runTests: async (path, options) => {
+                await flushPendingHooks();
+                activeTestFilePath = path;
+                const client = serverBridge.rpc.clients.at(-1);
+                if (!client) {
+                    throw new Error('No client found');
+                }
+                harnessLogger.debug('running test file on client: %s', path);
+                const result = await client.runTests(path, {
+                    ...options,
+                    runner: platform.runner,
+                });
+                await flushPendingHooks();
+                return result;
+            },
+            ensureAppReady,
+            restart,
+            dispose: () => dispose('normal'),
+            crashSupervisor,
+            callHook: async (name, payload) => {
+                await flushPendingHooks();
+                await pluginManager.callHook(name, payload);
+                await flushPendingHooks();
+            },
+            setRunState: (runState) => {
+                currentRun = runState;
+            },
+            getRunState: () => currentRun,
+        };
     }
     catch (error) {
-        if (error instanceof DOMException && error.name === 'AbortError') {
-            throw new InitializationTimeoutError();
-        }
+        await resourceLease.release();
         throw error;
     }
 };
+export const getHarness = async (config, platform, projectRoot) => {
+    harnessLogger.debug('creating Harness with platform ready timeout %dms', config.platformReadyTimeout);
+    return await getHarnessInternal(config, platform, projectRoot, new AbortController().signal);
+};