@react-native-harness/platform-android 1.4.0 → 1.5.0

package/dist/adb.d.ts

@@ -1,5 +1,5 @@
 import { type AndroidAppLaunchOptions } from '@react-native-harness/platforms';
-import { type Subprocess } from '@react-native-harness/tools';
+import { type OwnedProcess } from '@react-native-harness/tools';
 import type { ChildProcessByStdio } from 'node:child_process';
 import type { Readable } from 'node:stream';
 import { type EmulatorBootMode } from './emulator-startup.js';
@@ -44,9 +44,7 @@ export declare const getAppPid: (adbId: string, bundleId: string) => Promise<num
 export declare const getAppUid: (adbId: string, bundleId: string) => Promise<number>;
 export declare const setHideErrorDialogs: (adbId: string, hide: boolean) => Promise<void>;
 export declare const getLogcatTimestamp: (adbId: string) => Promise<string>;
-export declare const startLogcat: (adbId: string, args: readonly string[], options?: {
-    signal?: AbortSignal;
-}) => Subprocess;
+export declare const startLogcat: (adbId: string, args: readonly string[]) => OwnedProcess;
 export declare const DROPBOX_CRASH_TAGS: readonly ["data_app_crash", "data_app_native_crash"];
 export declare const getDropboxPrint: (adbId: string, tags?: readonly string[]) => Promise<string>;
 export declare const getActivityExitInfo: (adbId: string, bundleId: string) => Promise<string>;

package/dist/adb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../src/adb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../src/adb.ts"],"names":[],"mappings":"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"}

package/dist/adb.js

@@ -1,4 +1,4 @@
-import { delay, logger, spawn, SubprocessError, waitForAbort, } from '@react-native-harness/tools';
+import { delay, logger, spawn, spawnOwnedProcess, SubprocessError, waitForAbort, } from '@react-native-harness/tools';
 import { spawn as nodeSpawn } from 'node:child_process';
 import { access, rm } from 'node:fs/promises';
 import { getAvdConfigPath, getAvdDirectory, readAvdConfig, } from './avd-config.js';
@@ -505,10 +505,9 @@ export const getLogcatTimestamp = async (adbId) => {
     ]);
     return stdout.trim().replace(/^'+|'+$/g, '');
 };
-export const startLogcat = (adbId, args, options) => spawn(getAdbBinaryPath(), ['-s', adbId, ...args], {
+export const startLogcat = (adbId, args) => spawnOwnedProcess(getAdbBinaryPath(), ['-s', adbId, ...args], {
     stdout: 'pipe',
     stderr: 'pipe',
-    signal: options?.signal,
 });
 export const DROPBOX_CRASH_TAGS = [
     'data_app_crash',

package/dist/app-session.d.ts

@@ -1,5 +1,5 @@
 import { type AppSession, type CrashArtifactWriter } from '@react-native-harness/platforms';
-import { type Subprocess } from '@react-native-harness/tools';
+import { type OwnedProcess } from '@react-native-harness/tools';
 type CreateAndroidAppSessionOptions = {
     appUid: number;
     bundleId: string;
@@ -7,20 +7,11 @@ type CreateAndroidAppSessionOptions = {
     stopApp: () => Promise<void>;
     getAppPid: () => Promise<number | null>;
     getLogcatTimestamp: () => Promise<string>;
-    startLogcat: (args: readonly string[], options: {
-        signal: AbortSignal;
-    }) => Subprocess;
+    startLogcat: (args: readonly string[]) => OwnedProcess;
     getDropboxOutput?: () => Promise<string>;
     getExitInfo?: () => Promise<string>;
     crashArtifactWriter?: CrashArtifactWriter;
-    /**
-     * Session-lifetime abort signal (see HarnessPlatformInitOptions.signal).
-     * Combined with the app session's own logcatAbortController so that
-     * aborting the session stops the logcat stream even if dispose() hasn't
-     * been called yet (e.g. SIGTERM during teardown of other resources).
-     */
-    signal?: AbortSignal;
 };
-export declare const createAndroidAppSession: ({ appUid, bundleId, startApp, stopApp, getAppPid, getLogcatTimestamp, startLogcat, getDropboxOutput, getExitInfo, crashArtifactWriter, signal, }: CreateAndroidAppSessionOptions) => Promise<AppSession>;
+export declare const createAndroidAppSession: ({ appUid, bundleId, startApp, stopApp, getAppPid, getLogcatTimestamp, startLogcat, getDropboxOutput, getExitInfo, crashArtifactWriter, }: CreateAndroidAppSessionOptions) => Promise<AppSession>;
 export {};
 //# sourceMappingURL=app-session.d.ts.map

package/dist/app-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-session.d.ts","sourceRoot":"","sources":["../src/app-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,UAAU,EAEf,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,6BAA6B,CAAC;AA0DrC,KAAK,8BAA8B,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,WAAW,EAAE,CACX,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,KAC7B,UAAU,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,kJAY3C,8BAA8B,KAAG,OAAO,CAAC,UAAU,CAmNrD,CAAC"}
+{"version":3,"file":"app-session.d.ts","sourceRoot":"","sources":["../src/app-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,UAAU,EAEf,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AA0DrC,KAAK,8BAA8B,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,WAAW,EAAE,CACX,IAAI,EAAE,SAAS,MAAM,EAAE,KACpB,YAAY,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAU,0IAW3C,8BAA8B,KAAG,OAAO,CAAC,UAAU,CA2MrD,CAAC"}

package/dist/app-session.js

@@ -31,7 +31,7 @@ const isCrashSignal = (line, bundleId) => {
             /fatal|crash|signal 11|signal 6|backtrace/i.test(line)));
 };
 const isExitedState = (state) => state.status === 'exited';
-export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stopApp, getAppPid, getLogcatTimestamp, startLogcat, getDropboxOutput, getExitInfo, crashArtifactWriter, signal, }) => {
+export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stopApp, getAppPid, getLogcatTimestamp, startLogcat, getDropboxOutput, getExitInfo, crashArtifactWriter, }) => {
     const emitter = createAppSessionEmitter();
     const logBuffer = createBoundedLogBuffer();
     let state = { status: 'running' };
@@ -105,20 +105,8 @@ export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stop
     };
     const logcatTimestamp = await getLogcatTimestamp();
     const sessionStartedAt = Date.now();
-    const logcatAbortController = new AbortController();
-    const logcatSignal = signal
-        ? AbortSignal.any([signal, logcatAbortController.signal])
-        : logcatAbortController.signal;
-    const logcatProcess = startLogcat(getLogcatArgs(appUid, logcatTimestamp), {
-        signal: logcatSignal,
-    });
-    // Aborting is nano-spawn's own cancellation path, so the resulting
-    // SubprocessError is settled the same way regardless of which of the
-    // merged stdout/stderr iterators observes it first. Without this, killing
-    // the underlying process directly can make both iterators reject at once,
-    // and nano-spawn's internal `Promise.race` only reports one of them,
-    // leaving the other an unhandled rejection.
-    logcatProcess.catch(() => undefined);
+    const ownedLogcatProcess = startLogcat(getLogcatArgs(appUid, logcatTimestamp));
+    const logcatProcess = ownedLogcatProcess.subprocess;
     const crashReporter = createAndroidCrashReporter({
         bundleId,
         crashArtifactWriter,
@@ -161,7 +149,7 @@ export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stop
         disposed = true;
         stopPolling = true;
         emitter.clear();
-        logcatAbortController.abort();
+        await ownedLogcatProcess.dispose();
         await Promise.allSettled([logTask]);
         throw error;
     }
@@ -187,24 +175,26 @@ export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stop
             await waitForNextPoll();
         }
     })();
+    let disposePromise;
+    const dispose = () => (disposePromise ??= (async () => {
+        if (disposed) {
+            return;
+        }
+        disposed = true;
+        stopPolling = true;
+        state = { status: 'disposed', occurredAt: Date.now() };
+        if (exitNotification) {
+            clearTimeout(exitNotification);
+            exitNotification = null;
+        }
+        cancelPendingPollDelay();
+        emitter.clear();
+        await ownedLogcatProcess.dispose();
+        await stopApp();
+        await Promise.allSettled([logTask, pollTask]);
+    })());
     return {
-        dispose: async () => {
-            if (disposed) {
-                return;
-            }
-            disposed = true;
-            stopPolling = true;
-            state = { status: 'disposed', occurredAt: Date.now() };
-            if (exitNotification) {
-                clearTimeout(exitNotification);
-                exitNotification = null;
-            }
-            cancelPendingPollDelay();
-            emitter.clear();
-            logcatAbortController.abort();
-            await stopApp();
-            await Promise.allSettled([logTask, pollTask]);
-        },
+        dispose,
         getState: async () => state,
         getLogs: () => logBuffer.getLogs(),
         getCrashDetails: crashReporter.getCrashDetails,

package/dist/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,0BAA0B,EAC/B,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE5E,OAAO,EACL,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AAyKrB,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CAoI/B,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,OAAO,0BAA0B,KAChC,OAAO,CAAC,qBAAqB,CA+D/B,CAAC"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,0BAA0B,EAC/B,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE5E,OAAO,EACL,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AAyKrB,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CAmI/B,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,OAAO,0BAA0B,KAChC,OAAO,CAAC,qBAAqB,CA8D/B,CAAC"}

package/dist/instance.js

@@ -172,11 +172,10 @@ export const getAndroidEmulatorPlatformInstance = async (config, harnessConfig,
                 stopApp: () => adb.stopApp(adbId, config.bundleId),
                 getAppPid: () => adb.getAppPid(adbId, config.bundleId),
                 getLogcatTimestamp: () => adb.getLogcatTimestamp(adbId),
-                startLogcat: (args, options) => adb.startLogcat(adbId, args, options),
+                startLogcat: (args) => adb.startLogcat(adbId, args),
                 getDropboxOutput: () => adb.getDropboxPrint(adbId),
                 getExitInfo: () => adb.getActivityExitInfo(adbId, config.bundleId),
                 crashArtifactWriter: init.crashArtifactWriter,
-                signal: init.signal,
             });
         },
         dispose: async () => {
@@ -218,11 +217,10 @@ export const getAndroidPhysicalDevicePlatformInstance = async (config, harnessCo
                 stopApp: () => adb.stopApp(adbId, config.bundleId),
                 getAppPid: () => adb.getAppPid(adbId, config.bundleId),
                 getLogcatTimestamp: () => adb.getLogcatTimestamp(adbId),
-                startLogcat: (args, options) => adb.startLogcat(adbId, args, options),
+                startLogcat: (args) => adb.startLogcat(adbId, args),
                 getDropboxOutput: () => adb.getDropboxPrint(adbId),
                 getExitInfo: () => adb.getActivityExitInfo(adbId, config.bundleId),
                 crashArtifactWriter: init?.crashArtifactWriter,
-                signal: init?.signal,
             });
         },
         dispose: async () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native-harness/platform-android",
   "description": "Android platform for React Native Harness",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -19,9 +19,9 @@
     "vite": "^7.2.2",
     "zod": "^3.25.67",
     "tslib": "^2.3.0",
-    "@react-native-harness/config": "1.4.0",
-    "@react-native-harness/tools": "1.4.0",
-    "@react-native-harness/platforms": "1.4.0"
+    "@react-native-harness/platforms": "1.5.0",
+    "@react-native-harness/tools": "1.5.0",
+    "@react-native-harness/config": "1.5.0"
   },
   "license": "MIT"
 }

package/src/adb.ts

@@ -3,9 +3,10 @@ import {
   delay,
   logger,
   spawn,
+  spawnOwnedProcess,
   SubprocessError,
   waitForAbort,
-  type Subprocess,
+  type OwnedProcess,
 } from '@react-native-harness/tools';
 import { spawn as nodeSpawn } from 'node:child_process';
 import type { ChildProcessByStdio } from 'node:child_process';
@@ -789,13 +790,11 @@ export const getLogcatTimestamp = async (adbId: string): Promise<string> => {
 
 export const startLogcat = (
   adbId: string,
-  args: readonly string[],
-  options?: { signal?: AbortSignal }
-): Subprocess =>
-  spawn(getAdbBinaryPath(), ['-s', adbId, ...args], {
+  args: readonly string[]
+): OwnedProcess =>
+  spawnOwnedProcess(getAdbBinaryPath(), ['-s', adbId, ...args], {
     stdout: 'pipe',
     stderr: 'pipe',
-    signal: options?.signal,
   });
 
 export const DROPBOX_CRASH_TAGS = [

package/src/app-session.ts

@@ -8,7 +8,7 @@ import {
 import {
   escapeRegExp,
   logger,
-  type Subprocess,
+  type OwnedProcess,
 } from '@react-native-harness/tools';
 import { createAndroidCrashReporter } from './crash-reporter.js';
 
@@ -75,19 +75,11 @@ type CreateAndroidAppSessionOptions = {
   getAppPid: () => Promise<number | null>;
   getLogcatTimestamp: () => Promise<string>;
   startLogcat: (
-    args: readonly string[],
-    options: { signal: AbortSignal }
-  ) => Subprocess;
+    args: readonly string[]
+  ) => OwnedProcess;
   getDropboxOutput?: () => Promise<string>;
   getExitInfo?: () => Promise<string>;
   crashArtifactWriter?: CrashArtifactWriter;
-  /**
-   * Session-lifetime abort signal (see HarnessPlatformInitOptions.signal).
-   * Combined with the app session's own logcatAbortController so that
-   * aborting the session stops the logcat stream even if dispose() hasn't
-   * been called yet (e.g. SIGTERM during teardown of other resources).
-   */
-  signal?: AbortSignal;
 };
 
 export const createAndroidAppSession = async ({
@@ -101,7 +93,6 @@ export const createAndroidAppSession = async ({
   getDropboxOutput,
   getExitInfo,
   crashArtifactWriter,
-  signal,
 }: CreateAndroidAppSessionOptions): Promise<AppSession> => {
   const emitter = createAppSessionEmitter();
   const logBuffer = createBoundedLogBuffer();
@@ -196,20 +187,8 @@ export const createAndroidAppSession = async ({
 
   const logcatTimestamp = await getLogcatTimestamp();
   const sessionStartedAt = Date.now();
-  const logcatAbortController = new AbortController();
-  const logcatSignal = signal
-    ? AbortSignal.any([signal, logcatAbortController.signal])
-    : logcatAbortController.signal;
-  const logcatProcess = startLogcat(getLogcatArgs(appUid, logcatTimestamp), {
-    signal: logcatSignal,
-  });
-  // Aborting is nano-spawn's own cancellation path, so the resulting
-  // SubprocessError is settled the same way regardless of which of the
-  // merged stdout/stderr iterators observes it first. Without this, killing
-  // the underlying process directly can make both iterators reject at once,
-  // and nano-spawn's internal `Promise.race` only reports one of them,
-  // leaving the other an unhandled rejection.
-  logcatProcess.catch(() => undefined);
+  const ownedLogcatProcess = startLogcat(getLogcatArgs(appUid, logcatTimestamp));
+  const logcatProcess = ownedLogcatProcess.subprocess;
   const crashReporter = createAndroidCrashReporter({
     bundleId,
     crashArtifactWriter,
@@ -255,7 +234,7 @@ export const createAndroidAppSession = async ({
     disposed = true;
     stopPolling = true;
     emitter.clear();
-    logcatAbortController.abort();
+    await ownedLogcatProcess.dispose();
     await Promise.allSettled([logTask]);
     throw error;
   }
@@ -285,8 +264,9 @@ export const createAndroidAppSession = async ({
     }
   })();
 
-  return {
-    dispose: async () => {
+  let disposePromise: Promise<void> | undefined;
+  const dispose = () =>
+    (disposePromise ??= (async () => {
       if (disposed) {
         return;
       }
@@ -303,10 +283,13 @@ export const createAndroidAppSession = async ({
       cancelPendingPollDelay();
 
       emitter.clear();
-      logcatAbortController.abort();
+      await ownedLogcatProcess.dispose();
       await stopApp();
       await Promise.allSettled([logTask, pollTask]);
-    },
+    })());
+
+  return {
+    dispose,
     getState: async () => state,
     getLogs: () => logBuffer.getLogs(),
     getCrashDetails: crashReporter.getCrashDetails,

package/src/instance.ts

@@ -297,11 +297,10 @@ export const getAndroidEmulatorPlatformInstance = async (
         stopApp: () => adb.stopApp(adbId, config.bundleId),
         getAppPid: () => adb.getAppPid(adbId, config.bundleId),
         getLogcatTimestamp: () => adb.getLogcatTimestamp(adbId),
-        startLogcat: (args, options) => adb.startLogcat(adbId, args, options),
+        startLogcat: (args) => adb.startLogcat(adbId, args),
         getDropboxOutput: () => adb.getDropboxPrint(adbId),
         getExitInfo: () => adb.getActivityExitInfo(adbId, config.bundleId),
         crashArtifactWriter: init.crashArtifactWriter,
-        signal: init.signal,
       });
     },
     dispose: async () => {
@@ -371,11 +370,10 @@ export const getAndroidPhysicalDevicePlatformInstance = async (
         stopApp: () => adb.stopApp(adbId, config.bundleId),
         getAppPid: () => adb.getAppPid(adbId, config.bundleId),
         getLogcatTimestamp: () => adb.getLogcatTimestamp(adbId),
-        startLogcat: (args, options) => adb.startLogcat(adbId, args, options),
+        startLogcat: (args) => adb.startLogcat(adbId, args),
         getDropboxOutput: () => adb.getDropboxPrint(adbId),
         getExitInfo: () => adb.getActivityExitInfo(adbId, config.bundleId),
         crashArtifactWriter: init?.crashArtifactWriter,
-        signal: init?.signal,
       });
     },
     dispose: async () => {

package/dist/__tests__/adb-id.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=adb-id.test.d.ts.map

package/dist/__tests__/adb-id.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adb-id.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/adb-id.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/adb-id.test.js

@@ -1,41 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { getAdbId, isAdbIdEmulator } from '../adb-id.js';
-import * as adb from '../adb.js';
-describe('adb id resolution', () => {
-    beforeEach(() => {
-        vi.restoreAllMocks();
-    });
-    it('identifies emulator adb ids', () => {
-        expect(isAdbIdEmulator('emulator-5554')).toBe(true);
-        expect(isAdbIdEmulator('device-serial-001')).toBe(false);
-    });
-    it('skips non-emulator ids when resolving an emulator device', async () => {
-        vi.spyOn(adb, 'getDeviceIds').mockResolvedValue([
-            'device-serial-001',
-            'emulator-5554',
-        ]);
-        vi.spyOn(adb, 'getEmulatorName').mockResolvedValue('Test_AVD_API_35');
-        await expect(getAdbId({
-            type: 'emulator',
-            name: 'Test_AVD_API_35',
-        })).resolves.toBe('emulator-5554');
-    });
-    it('resolves matching physical device by manufacturer and model', async () => {
-        vi.spyOn(adb, 'getDeviceIds').mockResolvedValue([
-            'device-serial-001',
-            'emulator-5554',
-        ]);
-        vi.spyOn(adb, 'getDeviceInfo').mockImplementation(async (adbId) => {
-            const results = {
-                'device-serial-001': { manufacturer: 'Acme', model: 'Model A1' },
-                'emulator-5554': { manufacturer: 'Emulator', model: 'Emulator Model' },
-            };
-            return results[adbId] || null;
-        });
-        await expect(getAdbId({
-            type: 'physical',
-            manufacturer: 'acme',
-            model: 'model a1',
-        })).resolves.toBe('device-serial-001');
-    });
-});

package/dist/__tests__/adb-wait.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=adb-wait.test.d.ts.map

package/dist/__tests__/adb-wait.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adb-wait.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/adb-wait.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/adb-wait.test.js

@@ -1,69 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-const mocks = vi.hoisted(() => ({
-    spawn: vi.fn(),
-}));
-// The global test/setup.ts mocks '../adb.js' wholesale (including
-// waitForEmulator itself), which is right for consumers of this module but
-// defeats the purpose here: this suite exercises the *real* polling loop
-// (and its private waitWithSignal helper) to catch timer/listener leaks.
-// Re-declaring the mock for this file restores the actual implementation,
-// while `spawn` and `getAdbBinaryPath` (genuine cross-module imports) are
-// swapped out to keep `getDeviceIds()` from touching a real adb binary.
-vi.mock('../adb.js', async () => {
-    const actual = await vi.importActual('../adb.js');
-    return actual;
-});
-vi.mock('../environment.js', async () => {
-    const actual = await vi.importActual('../environment.js');
-    return { ...actual, getAdbBinaryPath: () => '/fake/sdk/platform-tools/adb' };
-});
-vi.mock('@react-native-harness/tools', async () => {
-    const actual = await vi.importActual('@react-native-harness/tools');
-    return { ...actual, spawn: mocks.spawn };
-});
-const { waitForEmulator } = await import('../adb.js');
-afterEach(() => {
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-});
-describe('waitForEmulator polling', () => {
-    it('does not leak an abort listener per poll iteration when the delay wins', async () => {
-        vi.useFakeTimers();
-        // No matching device on any poll: `adb devices` reports an empty list.
-        mocks.spawn.mockResolvedValue({ stdout: 'List of devices attached\n' });
-        const controller = new AbortController();
-        const addSpy = vi.spyOn(controller.signal, 'addEventListener');
-        const removeSpy = vi.spyOn(controller.signal, 'removeEventListener');
-        const resultPromise = waitForEmulator('Test_AVD', controller.signal);
-        resultPromise.catch(() => undefined);
-        for (let i = 0; i < 3; i += 1) {
-            await vi.advanceTimersByTimeAsync(1_000);
-        }
-        // Regression: each 1s poll iteration used to add an 'abort' listener
-        // to the local waitForAbort helper that was never removed when the
-        // delay (not the abort) won the race, leaking one listener per second
-        // of polling against this session-lifetime signal.
-        expect(addSpy.mock.calls.length).toBeGreaterThanOrEqual(3);
-        const addCallsBeforeAbort = addSpy.mock.calls.length;
-        controller.abort(new Error('teardown'));
-        await expect(resultPromise).rejects.toThrow('teardown');
-        // Every listener added while losing the race — including the one still
-        // pending when the abort itself won — must be removed again.
-        expect(removeSpy).toHaveBeenCalledTimes(addCallsBeforeAbort);
-    });
-    it('clears the pending 1s poll timer when the signal aborts mid-wait', async () => {
-        vi.useFakeTimers();
-        mocks.spawn.mockResolvedValue({ stdout: 'List of devices attached\n' });
-        const controller = new AbortController();
-        const resultPromise = waitForEmulator('Test_AVD', controller.signal);
-        resultPromise.catch(() => undefined);
-        // Let the loop enter its 1s wait, then abort before the timer fires.
-        await vi.advanceTimersByTimeAsync(0);
-        controller.abort(new Error('teardown'));
-        await expect(resultPromise).rejects.toThrow('teardown');
-        // Regression: the bare setTimeout-backed `wait()` used to have no
-        // handle to clear, so it stayed alive in the event loop for the rest
-        // of the 1s interval even after the abort branch won.
-        expect(vi.getTimerCount()).toBe(0);
-    });
-});

package/dist/__tests__/adb.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=adb.test.d.ts.map

package/dist/__tests__/adb.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adb.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/adb.test.ts"],"names":[],"mappings":""}