@react-native-harness/platform-android 1.4.0-rc.1 → 1.4.1

package/dist/adb.d.ts

@@ -44,7 +44,9 @@ 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[]) => Subprocess;
+export declare const startLogcat: (adbId: string, args: readonly string[], options?: {
+    signal?: AbortSignal;
+}) => Subprocess;
 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,30 +1,27 @@
-import { logger, spawn, SubprocessError, } from '@react-native-harness/tools';
+import { delay, logger, spawn, 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';
 import { ensureAndroidEmulatorAvailable, ensureAndroidSdkPackages, getAdbBinaryPath, getAndroidSystemImagePackage, getAvdManagerBinaryPath, getEmulatorBinaryPath, getHostAndroidSystemImageArch, getRequiredAndroidSdkPackages, } from './environment.js';
-import { getEmulatorStartupArgs, } from './emulator-startup.js';
+import { getEmulatorCpuCores, getEmulatorStartupArgs, } from './emulator-startup.js';
 import { AdbAppNotInstalledError, AdbPermissionGrantError, } from './adb-errors.js';
-const wait = async (ms) => {
-    await new Promise((resolve) => {
-        setTimeout(resolve, ms);
-    });
-};
-const waitForAbort = (signal) => {
-    if (signal.aborted) {
-        return Promise.reject(signal.reason);
-    }
-    return new Promise((_, reject) => {
-        signal.addEventListener('abort', () => {
-            reject(signal.reason);
-        }, { once: true });
-    });
-};
 const waitWithSignal = async (ms, signal) => {
     if (signal.aborted) {
         throw signal.reason;
     }
-    await Promise.race([wait(ms), waitForAbort(signal)]);
+    // Both sides of this race must be torn down explicitly when they lose:
+    // an uncancelled timer keeps a ref'd Timeout alive, and an uncancelled
+    // abort wait leaks a listener on `signal`, which is a session-lifetime
+    // signal here and gets polled against once per second.
+    const timer = delay(ms);
+    const abort = waitForAbort(signal);
+    try {
+        await Promise.race([timer.promise, abort.promise]);
+    }
+    finally {
+        timer.cancel();
+        abort.cancel();
+    }
 };
 const EMULATOR_STARTUP_OBSERVATION_TIMEOUT_MS = 5000;
 const EMULATOR_OUTPUT_BUFFER_LIMIT = 16 * 1024;
@@ -311,9 +308,14 @@ export const createAvd = async ({ name, apiLevel, profile, diskSize, heapSize, }
     ]);
     await ensureAvdIniExists({ name, apiLevel });
     const configPath = await ensureAvdConfigExists(name);
+    // hw.cpu.ncore is baked into config.ini (rather than passed as a `-cores`
+    // boot flag) so it's part of the AVD's persisted hardware profile: boot
+    // snapshots require an identical hardware config to load, so the vCPU
+    // count must be fixed at AVD-creation time and stay consistent across
+    // boots.
     await spawn('bash', [
         '-lc',
-        `printf '%s\n%s\n' 'disk.dataPartition.size=${diskSize}' 'vm.heapSize=${heapSize}' >> "${configPath}"`,
+        `printf '%s\n%s\n%s\n' 'disk.dataPartition.size=${diskSize}' 'vm.heapSize=${heapSize}' 'hw.cpu.ncore=${getEmulatorCpuCores()}' >> "${configPath}"`,
     ]);
 };
 export const deleteAvd = async (name) => {
@@ -375,11 +377,17 @@ export const startEmulator = async (name, mode = 'default-boot') => {
         }
         throw error;
     });
-    const observationTimeout = wait(EMULATOR_STARTUP_OBSERVATION_TIMEOUT_MS).then(() => 'timeout');
+    const observationTimer = delay(EMULATOR_STARTUP_OBSERVATION_TIMEOUT_MS);
+    const observationTimeout = observationTimer.promise.then(() => 'timeout');
     try {
         await Promise.race([earlyExit, observedBoot, observationTimeout]);
     }
     finally {
+        // If `earlyExit` or `observedBoot` won the race, this timer would
+        // otherwise sit ref'd in the event loop for the rest of its 5s;
+        // cancelling here is a no-op on the happy "proceed detached" path
+        // where the timer itself won.
+        observationTimer.cancel();
         cleanup();
     }
     childProcess.stdout?.destroy();
@@ -497,9 +505,10 @@ export const getLogcatTimestamp = async (adbId) => {
     ]);
     return stdout.trim().replace(/^'+|'+$/g, '');
 };
-export const startLogcat = (adbId, args) => spawn(getAdbBinaryPath(), ['-s', adbId, ...args], {
+export const startLogcat = (adbId, args, options) => spawn(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

@@ -7,11 +7,20 @@ type CreateAndroidAppSessionOptions = {
     stopApp: () => Promise<void>;
     getAppPid: () => Promise<number | null>;
     getLogcatTimestamp: () => Promise<string>;
-    startLogcat: (args: readonly string[]) => Subprocess;
+    startLogcat: (args: readonly string[], options: {
+        signal: AbortSignal;
+    }) => Subprocess;
     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, }: CreateAndroidAppSessionOptions) => Promise<AppSession>;
+export declare const createAndroidAppSession: ({ appUid, bundleId, startApp, stopApp, getAppPid, getLogcatTimestamp, startLogcat, getDropboxOutput, getExitInfo, crashArtifactWriter, signal, }: 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;AAkErC,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,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,UAAU,CAAC;IACrD,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,CAsMrD,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,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"}

package/dist/app-session.js

@@ -30,16 +30,8 @@ const isCrashSignal = (line, bundleId) => {
         (line.includes(bundleId) &&
             /fatal|crash|signal 11|signal 6|backtrace/i.test(line)));
 };
-const stopSubprocess = async (child) => {
-    try {
-        (await child.nodeChildProcess).kill();
-    }
-    catch {
-        // Ignore termination failures for already-ended background processes.
-    }
-};
 const isExitedState = (state) => state.status === 'exited';
-export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stopApp, getAppPid, getLogcatTimestamp, startLogcat, getDropboxOutput, getExitInfo, crashArtifactWriter, }) => {
+export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stopApp, getAppPid, getLogcatTimestamp, startLogcat, getDropboxOutput, getExitInfo, crashArtifactWriter, signal, }) => {
     const emitter = createAppSessionEmitter();
     const logBuffer = createBoundedLogBuffer();
     let state = { status: 'running' };
@@ -113,7 +105,20 @@ export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stop
     };
     const logcatTimestamp = await getLogcatTimestamp();
     const sessionStartedAt = Date.now();
-    const logcatProcess = startLogcat(getLogcatArgs(appUid, logcatTimestamp));
+    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 crashReporter = createAndroidCrashReporter({
         bundleId,
         crashArtifactWriter,
@@ -156,7 +161,7 @@ export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stop
         disposed = true;
         stopPolling = true;
         emitter.clear();
-        await stopSubprocess(logcatProcess);
+        logcatAbortController.abort();
         await Promise.allSettled([logTask]);
         throw error;
     }
@@ -196,7 +201,7 @@ export const createAndroidAppSession = async ({ appUid, bundleId, startApp, stop
             }
             cancelPendingPollDelay();
             emitter.clear();
-            await stopSubprocess(logcatProcess);
+            logcatAbortController.abort();
             await stopApp();
             await Promise.allSettled([logTask, pollTask]);
         },

package/dist/avd-config.d.ts

@@ -6,6 +6,7 @@ export type AvdConfig = {
     hwDeviceName?: string;
     diskDataPartitionSize?: string;
     vmHeapSize?: string;
+    hwCpuNcore?: string;
 };
 export type AvdCompatibilityResult = {
     compatible: true;

package/dist/avd-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"avd-config.d.ts","sourceRoot":"","sources":["../src/avd-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE7E,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,GACpB;IAAE,UAAU,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,KAAG,MAI9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,MAE/C,CAAC;AAkEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,KAAG,SAyCjD,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,KACX,OAAO,CAAC,SAAS,GAAG,IAAI,CAU1B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,oCAI7B;IACD,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,sBAAsB,CAAC;CAClC,KAAG,sBAmFH,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,yBAGzC;IACD,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,sBAAsB,CAAC;CAClC,KAAG;IACF,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,sBAAsB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,IAeH,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,8BAItC;IACD,GAAG,CAAC,EAAE,wBAAwB,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,KAAG,OAWH,CAAC"}
+{"version":3,"file":"avd-config.d.ts","sourceRoot":"","sources":["../src/avd-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAG7E,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAC9B;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,GACpB;IAAE,UAAU,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1C,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,KAAG,MAI9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,MAE/C,CAAC;AAkEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,KAAG,SA4CjD,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,KACX,OAAO,CAAC,SAAS,GAAG,IAAI,CAU1B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,oCAI7B;IACD,QAAQ,EAAE,eAAe,CAAC;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,sBAAsB,CAAC;CAClC,KAAG,sBA+FH,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,yBAGzC;IACD,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,sBAAsB,CAAC;CAClC,KAAG;IACF,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,sBAAsB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,IAeH,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,8BAItC;IACD,GAAG,CAAC,EAAE,wBAAwB,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,KAAG,OAWH,CAAC"}

package/dist/avd-config.js

@@ -1,4 +1,5 @@
 import { access, readFile } from 'node:fs/promises';
+import { getEmulatorCpuCores } from './emulator-startup.js';
 export const getAvdDirectory = (name) => {
     return `${process.env.ANDROID_AVD_HOME ?? `${process.env.HOME}/.android/avd`}/${name}.avd`;
 };
@@ -81,6 +82,9 @@ export const parseAvdConfig = (contents) => {
             case 'vm.heapSize':
                 config.vmHeapSize = value;
                 break;
+            case 'hw.cpu.ncore':
+                config.hwCpuNcore = value;
+                break;
             default:
                 break;
         }
@@ -146,6 +150,13 @@ export const isAvdCompatible = ({ emulator, avdConfig, hostArch, }) => {
             reason: `Heap size mismatch: expected ${requestedAvdConfig.heapSize}, got ${avdConfig.vmHeapSize ?? 'missing'}.`,
         };
     }
+    if (normalizeConfigValue(avdConfig.hwCpuNcore ?? '') !==
+        normalizeConfigValue(String(getEmulatorCpuCores()))) {
+        return {
+            compatible: false,
+            reason: `CPU core count mismatch: expected ${getEmulatorCpuCores()}, got ${avdConfig.hwCpuNcore ?? 'missing'}.`,
+        };
+    }
     return { compatible: true };
 };
 export const getNormalizedAvdCacheConfig = ({ emulator, hostArch, }) => {

package/dist/emulator-startup.d.ts

@@ -1,3 +1,26 @@
 export type EmulatorBootMode = 'default-boot' | 'clean-snapshot-generation' | 'snapshot-reuse';
+/**
+ * Returns the vCPU count baked into an AVD for this runner.
+ *
+ * AVD snapshots require an identical hardware configuration to load, so all
+ * AVD creation, compatibility, and cache-key callers must use this value on
+ * the same host.
+ */
+export declare const getEmulatorCpuCores: () => number;
 export declare const getEmulatorStartupArgs: (name: string, mode: EmulatorBootMode) => string[];
+/**
+ * Parses the output of `emulator -accel-check` to determine whether
+ * hardware acceleration (KVM on Linux, HVF on macOS) is usable. The
+ * emulator prints a message containing "is installed and usable" when
+ * acceleration is available.
+ */
+export declare const isAccelerationUsable: (accelCheckOutput: string) => boolean;
+/**
+ * Runs `emulator -accel-check` and logs a non-fatal warning when hardware
+ * acceleration (KVM/HVF) appears unavailable, in which case the emulator
+ * falls back to very slow software emulation. This check must never fail or
+ * block emulator startup - any error running it is swallowed and only
+ * debug-logged.
+ */
+export declare const warnIfEmulatorAccelerationUnavailable: () => Promise<void>;
 //# sourceMappingURL=emulator-startup.d.ts.map

package/dist/emulator-startup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emulator-startup.d.ts","sourceRoot":"","sources":["../src/emulator-startup.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GACxB,cAAc,GACd,2BAA2B,GAC3B,gBAAgB,CAAC;AAUrB,eAAO,MAAM,sBAAsB,GACjC,MAAM,MAAM,EACZ,MAAM,gBAAgB,KACrB,MAAM,EASR,CAAC"}
+{"version":3,"file":"emulator-startup.d.ts","sourceRoot":"","sources":["../src/emulator-startup.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,gBAAgB,GACxB,cAAc,GACd,2BAA2B,GAC3B,gBAAgB,CAAC;AAErB;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,QAAO,MAEtC,CAAC;AAWF,eAAO,MAAM,sBAAsB,GACjC,MAAM,MAAM,EACZ,MAAM,gBAAgB,KACrB,MAAM,EASR,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,kBAAkB,MAAM,KAAG,OAE/D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qCAAqC,QACtC,OAAO,CAAC,IAAI,CA+BrB,CAAC"}

package/dist/emulator-startup.js

@@ -1,9 +1,24 @@
+import { getDeviceCoreBudget, logger, spawn, SubprocessError, } from '@react-native-harness/tools';
+import os from 'node:os';
+import { getEmulatorBinaryPath } from './environment.js';
+const emulatorStartupLogger = logger.child('android-emulator-startup');
+/**
+ * Returns the vCPU count baked into an AVD for this runner.
+ *
+ * AVD snapshots require an identical hardware configuration to load, so all
+ * AVD creation, compatibility, and cache-key callers must use this value on
+ * the same host.
+ */
+export const getEmulatorCpuCores = () => {
+    return getDeviceCoreBudget(os.availableParallelism());
+};
 const COMMON_EMULATOR_ARGS = [
     '-no-window',
     '-gpu',
     'swiftshader_indirect',
     '-noaudio',
     '-no-boot-anim',
+    '-no-metrics',
 ];
 export const getEmulatorStartupArgs = (name, mode) => {
     const modeArgs = mode === 'clean-snapshot-generation'
@@ -13,3 +28,46 @@ export const getEmulatorStartupArgs = (name, mode) => {
             : ['-no-snapshot-load', '-no-snapshot-save'];
     return [`@${name}`, ...modeArgs, ...COMMON_EMULATOR_ARGS];
 };
+/**
+ * Parses the output of `emulator -accel-check` to determine whether
+ * hardware acceleration (KVM on Linux, HVF on macOS) is usable. The
+ * emulator prints a message containing "is installed and usable" when
+ * acceleration is available.
+ */
+export const isAccelerationUsable = (accelCheckOutput) => {
+    return accelCheckOutput.includes('is installed and usable');
+};
+/**
+ * Runs `emulator -accel-check` and logs a non-fatal warning when hardware
+ * acceleration (KVM/HVF) appears unavailable, in which case the emulator
+ * falls back to very slow software emulation. This check must never fail or
+ * block emulator startup - any error running it is swallowed and only
+ * debug-logged.
+ */
+export const warnIfEmulatorAccelerationUnavailable = async () => {
+    let combinedOutput;
+    try {
+        const emulatorBinaryPath = getEmulatorBinaryPath();
+        const { stdout, stderr } = await spawn(emulatorBinaryPath, [
+            '-accel-check',
+        ]);
+        combinedOutput = `${stdout}\n${stderr}`;
+    }
+    catch (error) {
+        if (error instanceof SubprocessError) {
+            // The check itself ran but exited non-zero - this is how
+            // `-accel-check` reports that acceleration is unavailable, so treat
+            // its output as a normal (non-fatal) result rather than swallowing it.
+            combinedOutput = `${error.stdout}\n${error.stderr}`;
+        }
+        else {
+            // Failed to even run the check (e.g. binary missing). This must never
+            // fail or block emulator startup.
+            emulatorStartupLogger.debug('Failed to run "emulator -accel-check": %o', error);
+            return;
+        }
+    }
+    if (!isAccelerationUsable(combinedOutput)) {
+        logger.warn('Hardware acceleration (KVM/HVF) appears unavailable for the Android emulator. It will fall back to very slow software emulation.');
+    }
+};

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export { androidEmulator, physicalAndroidDevice, androidPlatform, } from './fact
 export type { AndroidPlatformConfig } from './config.js';
 export { getNormalizedAvdCacheConfig, resolveAvdCachingEnabled, } from './avd-config.js';
 export { getHostAndroidSystemImageArch } from './environment.js';
+export { getEmulatorCpuCores } from './emulator-startup.js';
 export { HarnessAppPathError, HarnessEmulatorConfigError } from './errors.js';
 export { getRunTargets } from './targets.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -1,5 +1,6 @@
 export { androidEmulator, physicalAndroidDevice, androidPlatform, } from './factory.js';
 export { getNormalizedAvdCacheConfig, resolveAvdCachingEnabled, } from './avd-config.js';
 export { getHostAndroidSystemImageArch } from './environment.js';
+export { getEmulatorCpuCores } from './emulator-startup.js';
 export { HarnessAppPathError, HarnessEmulatorConfigError } from './errors.js';
 export { getRunTargets } from './targets.js';

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;AAuKrB,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CA8H/B,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,OAAO,0BAA0B,KAChC,OAAO,CAAC,qBAAqB,CAyD/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,CAoI/B,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,OAAO,0BAA0B,KAChC,OAAO,CAAC,qBAAqB,CA+D/B,CAAC"}

package/dist/instance.js

@@ -1,13 +1,14 @@
 import { AppNotInstalledError, DeviceNotFoundError, } from '@react-native-harness/platforms';
-import { logger } from '@react-native-harness/tools';
+import { instrumented, logger, noopDiagnostics } from '@react-native-harness/tools';
 import { assertAndroidDeviceEmulator, assertAndroidDevicePhysical, } from './config.js';
 import { isAvdCompatible, readAvdConfig, resolveAvdCachingEnabled, } from './avd-config.js';
 import { getAdbId } from './adb-id.js';
-import * as adb from './adb.js';
+import * as adbModule from './adb.js';
 import { applyHarnessDebugHttpHost, clearHarnessDebugHttpHost, } from './shared-prefs.js';
 import { getDeviceName } from './utils.js';
 import { HarnessAppPathError, HarnessEmulatorConfigError } from './errors.js';
 import { ensureAndroidEmulatorAvailable, ensureAndroidEmulatorEnvironment, getHostAndroidSystemImageArch, } from './environment.js';
+import { warnIfEmulatorAccelerationUnavailable } from './emulator-startup.js';
 import { isInteractive } from '@react-native-harness/tools';
 import fs from 'node:fs';
 import { createAndroidAppSession } from './app-session.js';
@@ -35,23 +36,24 @@ const getOptionalHarnessAppPath = () => {
 const configureAndroidRuntime = async (adbId, config, harnessConfig) => {
     const metroPort = harnessConfig.metroPort;
     await Promise.all([
-        adb.reversePort(adbId, metroPort),
-        adb.reversePort(adbId, 8080),
-        adb.setHideErrorDialogs(adbId, true),
+        adbModule.reversePort(adbId, metroPort),
+        adbModule.reversePort(adbId, 8080),
+        adbModule.setHideErrorDialogs(adbId, true),
         applyHarnessDebugHttpHost(adbId, config.bundleId, `localhost:${metroPort}`),
     ]);
-    return adb.getAppUid(adbId, config.bundleId);
+    return adbModule.getAppUid(adbId, config.bundleId);
 };
 const startAndWaitForBoot = async ({ emulatorName, signal, mode, }) => {
     await ensureAndroidEmulatorAvailable();
-    await adb.startEmulator(emulatorName, mode);
-    return adb.waitForBoot(emulatorName, signal);
+    await warnIfEmulatorAccelerationUnavailable();
+    await adbModule.startEmulator(emulatorName, mode);
+    return adbModule.waitForBoot(emulatorName, signal);
 };
 const recreateAvd = async ({ emulatorConfig, }) => {
     if (!emulatorConfig.avd) {
         throw new HarnessEmulatorConfigError(emulatorConfig.name);
     }
-    await adb.createAvd({
+    await adbModule.createAvd({
         name: emulatorConfig.name,
         apiLevel: emulatorConfig.avd.apiLevel,
         profile: emulatorConfig.avd.profile,
@@ -62,7 +64,7 @@ const recreateAvd = async ({ emulatorConfig, }) => {
 const prepareCachedAvd = async ({ emulatorConfig, signal, }) => {
     const emulatorName = emulatorConfig.name;
     const hostArch = getHostAndroidSystemImageArch();
-    const hasExistingAvd = await adb.hasAvd(emulatorName);
+    const hasExistingAvd = await adbModule.hasAvd(emulatorName);
     const avdConfig = hasExistingAvd ? await readAvdConfig(emulatorName) : null;
     const compatibility = avdConfig == null
         ? { compatible: false, reason: 'Missing AVD config.ini.' }
@@ -77,7 +79,7 @@ const prepareCachedAvd = async ({ emulatorConfig, signal, }) => {
             : 'Creating Android emulator %s...', emulatorName);
         if (hasExistingAvd && !compatibility.compatible) {
             androidInstanceLogger.debug('Android AVD %s is not reusable: %s', emulatorName, compatibility.reason);
-            await adb.deleteAvd(emulatorName);
+            await adbModule.deleteAvd(emulatorName);
         }
         await recreateAvd({ emulatorConfig });
         const generationAdbId = await startAndWaitForBoot({
@@ -86,8 +88,8 @@ const prepareCachedAvd = async ({ emulatorConfig, signal, }) => {
             mode: 'clean-snapshot-generation',
         });
         logger.info('Saving Android emulator snapshot for %s...', emulatorName);
-        await adb.stopEmulator(generationAdbId);
-        await adb.waitForEmulatorDisconnect(generationAdbId, signal);
+        await adbModule.stopEmulator(generationAdbId);
+        await adbModule.waitForEmulatorDisconnect(generationAdbId, signal);
     }
     else {
         logger.info('Using cached Android emulator %s...', emulatorName);
@@ -100,6 +102,7 @@ const prepareCachedAvd = async ({ emulatorConfig, signal, }) => {
 };
 export const getAndroidEmulatorPlatformInstance = async (config, harnessConfig, init) => {
     assertAndroidDeviceEmulator(config.device);
+    const adb = instrumented(adbModule, 'platform.android.adb', init.diagnostics ?? noopDiagnostics);
     const permissionsEnabled = harnessConfig.permissions ?? false;
     const emulatorConfig = config.device;
     const emulatorName = emulatorConfig.name;
@@ -169,10 +172,11 @@ export const getAndroidEmulatorPlatformInstance = async (config, harnessConfig,
                 stopApp: () => adb.stopApp(adbId, config.bundleId),
                 getAppPid: () => adb.getAppPid(adbId, config.bundleId),
                 getLogcatTimestamp: () => adb.getLogcatTimestamp(adbId),
-                startLogcat: (args) => adb.startLogcat(adbId, args),
+                startLogcat: (args, options) => adb.startLogcat(adbId, args, options),
                 getDropboxOutput: () => adb.getDropboxPrint(adbId),
                 getExitInfo: () => adb.getActivityExitInfo(adbId, config.bundleId),
                 crashArtifactWriter: init.crashArtifactWriter,
+                signal: init.signal,
             });
         },
         dispose: async () => {
@@ -188,6 +192,7 @@ export const getAndroidEmulatorPlatformInstance = async (config, harnessConfig,
 };
 export const getAndroidPhysicalDevicePlatformInstance = async (config, harnessConfig, init) => {
     assertAndroidDevicePhysical(config.device);
+    const adb = instrumented(adbModule, 'platform.android.adb', init?.diagnostics ?? noopDiagnostics);
     const permissionsEnabled = harnessConfig.permissions ?? false;
     const adbId = await getAdbId(config.device);
     if (!adbId) {
@@ -213,10 +218,11 @@ export const getAndroidPhysicalDevicePlatformInstance = async (config, harnessCo
                 stopApp: () => adb.stopApp(adbId, config.bundleId),
                 getAppPid: () => adb.getAppPid(adbId, config.bundleId),
                 getLogcatTimestamp: () => adb.getLogcatTimestamp(adbId),
-                startLogcat: (args) => adb.startLogcat(adbId, args),
+                startLogcat: (args, options) => adb.startLogcat(adbId, args, options),
                 getDropboxOutput: () => adb.getDropboxPrint(adbId),
                 getExitInfo: () => adb.getActivityExitInfo(adbId, config.bundleId),
                 crashArtifactWriter: init?.crashArtifactWriter,
+                signal: init?.signal,
             });
         },
         dispose: async () => {

package/dist/runner.d.ts

@@ -1,6 +1,6 @@
-import { HarnessPlatformRunner, type HarnessPlatformInitOptions } from '@react-native-harness/platforms';
+import { type HarnessPlatformRunnerFactory } from '@react-native-harness/platforms';
 import type { Config as HarnessConfig } from '@react-native-harness/config';
 import { type AndroidPlatformConfig } from './config.js';
-declare const getAndroidRunner: (config: AndroidPlatformConfig, harnessConfig: HarnessConfig, init: HarnessPlatformInitOptions) => Promise<HarnessPlatformRunner>;
+declare const getAndroidRunner: HarnessPlatformRunnerFactory<AndroidPlatformConfig, HarnessConfig>;
 export default getAndroidRunner;
 //# sourceMappingURL=runner.d.ts.map

package/dist/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,KAAK,0BAA0B,EAChC,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,aAAa,CAAC;AAUrB,QAAA,MAAM,gBAAgB,GACpB,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CAoB/B,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,aAAa,CAAC;AAUrB,QAAA,MAAM,gBAAgB,EAAE,4BAA4B,CAClD,qBAAqB,EACrB,aAAa,CAqBd,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native-harness/platform-android",
   "description": "Android platform for React Native Harness",
-  "version": "1.4.0-rc.1",
+  "version": "1.4.1",
   "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/platforms": "1.4.0-rc.1",
-    "@react-native-harness/config": "1.4.0-rc.1",
-    "@react-native-harness/tools": "1.4.0-rc.1"
+    "@react-native-harness/config": "1.4.1",
+    "@react-native-harness/platforms": "1.4.1",
+    "@react-native-harness/tools": "1.4.1"
   },
   "license": "MIT"
 }