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

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

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

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,41 @@
+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.test.js

@@ -1,12 +1,17 @@
 import { EventEmitter } from 'node:events';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import { PassThrough } from 'node:stream';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { SubprocessError } from '@react-native-harness/tools';
-import { createAvd, deleteAvd, emulatorProcess, getAppUid, getLogcatTimestamp, getStartAppArgs, hasAvd, installApp, startEmulator, uninstallApp, waitForBoot, waitForEmulatorDisconnect, } from '../adb.js';
+vi.unmock('../adb.js');
+import { createAvd, deleteAvd, emulatorProcess, getAppUid, getLogcatTimestamp, getStartAppArgs, hasAvd, installApp, startLogcat, startEmulator, uninstallApp, waitForBoot, waitForEmulatorDisconnect, } from '../adb.js';
 import * as tools from '@react-native-harness/tools';
 import * as environment from '../environment.js';
 import * as avdConfig from '../avd-config.js';
 const createAbortError = () => new DOMException('The operation was aborted', 'AbortError');
+let sdkRoot;
 const createMockChildProcess = () => {
     const process = new EventEmitter();
     process.stdout = new PassThrough();
@@ -16,6 +21,14 @@ const createMockChildProcess = () => {
 };
 beforeEach(() => {
     vi.restoreAllMocks();
+    vi.unstubAllEnvs();
+    sdkRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'android-sdk-'));
+    fs.mkdirSync(path.join(sdkRoot, 'emulator'), { recursive: true });
+    fs.writeFileSync(path.join(sdkRoot, 'emulator', 'emulator'), '');
+    fs.mkdirSync(path.join(sdkRoot, 'platform-tools'), { recursive: true });
+    fs.writeFileSync(path.join(sdkRoot, 'platform-tools', 'adb'), '');
+    vi.stubEnv('ANDROID_HOME', sdkRoot);
+    vi.spyOn(environment, 'ensureAndroidEmulatorAvailable').mockResolvedValue(sdkRoot);
 });
 describe('getStartAppArgs', () => {
     it('maps supported extras to adb am start flags', () => {
@@ -81,8 +94,31 @@ describe('getStartAppArgs', () => {
             "+'%m-%d %H:%M:%S.000'",
         ]);
     });
+    it('starts logcat using the resolved adb binary path', async () => {
+        const subprocess = {};
+        const spawnSpy = vi.spyOn(tools, 'spawn').mockReturnValue(subprocess);
+        expect(startLogcat('emulator-5554', [
+            'logcat',
+            '-v',
+            'threadtime',
+            '-b',
+            'crash',
+        ])).toBe(subprocess);
+        expect(spawnSpy).toHaveBeenCalledWith(expect.stringMatching(/adb$/), [
+            '-s',
+            'emulator-5554',
+            'logcat',
+            '-v',
+            'threadtime',
+            '-b',
+            'crash',
+        ], {
+            stdout: 'pipe',
+            stderr: 'pipe',
+        });
+    });
     it('checks whether an AVD exists', async () => {
-        vi.spyOn(tools, 'spawn').mockResolvedValueOnce({
+        vi.spyOn(tools, 'spawn').mockResolvedValue({
             stdout: 'Pixel_6_API_33\nPixel_8_API_35\n',
         });
         await expect(hasAvd('Pixel_8_API_35')).resolves.toBe(true);
@@ -365,17 +401,24 @@ describe('getStartAppArgs', () => {
     });
     it('aborts while waiting for boot completion', async () => {
         vi.useFakeTimers();
-        const spawnSpy = vi.spyOn(tools, 'spawn');
-        spawnSpy
-            .mockResolvedValueOnce({
-            stdout: 'List of devices attached\nemulator-5554\tdevice\n',
-        })
-            .mockResolvedValueOnce({
-            stdout: 'Pixel_8_API_35\n',
-        })
-            .mockResolvedValueOnce({
-            stdout: '0\n',
-        });
+        vi.spyOn(tools, 'spawn').mockImplementation((async (_file, args) => {
+            if (args?.[0] === 'devices') {
+                return {
+                    stdout: 'List of devices attached\nemulator-5554\tdevice\n',
+                };
+            }
+            if (args?.includes('emu') && args?.includes('avd') && args?.includes('name')) {
+                return {
+                    stdout: 'Pixel_8_API_35\n',
+                };
+            }
+            if (args?.includes('getprop')) {
+                return {
+                    stdout: '0\n',
+                };
+            }
+            throw new Error(`Unexpected adb call: ${args?.join(' ')}`);
+        }));
         const controller = new AbortController();
         const waitPromise = waitForBoot('Pixel_8_API_35', controller.signal);
         await vi.advanceTimersByTimeAsync(1000);

package/dist/__tests__/app-monitor.test.js

@@ -3,8 +3,8 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { tmpdir } from 'node:os';
 import { createAndroidAppMonitor, createAndroidLogEvent } from '../app-monitor.js';
-import * as tools from '@react-native-harness/tools';
 import { createCrashArtifactWriter } from '@react-native-harness/tools';
+import * as adb from '../adb.js';
 const createMockSubprocess = () => ({
     nodeChildProcess: Promise.resolve({
         kill: vi.fn(),
@@ -55,15 +55,12 @@ describe('createAndroidLogEvent', () => {
         });
     });
     it('starts logcat from the current device timestamp', async () => {
-        const spawnSpy = vi.spyOn(tools, 'spawn');
-        spawnSpy.mockImplementation(((file, args) => {
-            if (file === 'adb' && args?.includes('date')) {
-                return {
-                    stdout: '03-12 11:35:08.000\n',
-                };
-            }
-            return createMockSubprocess();
-        }));
+        const getLogcatTimestampSpy = vi
+            .spyOn(adb, 'getLogcatTimestamp')
+            .mockResolvedValue('03-12 11:35:08.000');
+        const startLogcatSpy = vi
+            .spyOn(adb, 'startLogcat')
+            .mockReturnValue(createMockSubprocess());
         const monitor = createAndroidAppMonitor({
             adbId: 'emulator-5554',
             bundleId: 'com.harnessplayground',
@@ -71,9 +68,8 @@ describe('createAndroidLogEvent', () => {
         });
         await monitor.start();
         await monitor.stop();
-        expect(spawnSpy).toHaveBeenNthCalledWith(2, 'adb', [
-            '-s',
-            'emulator-5554',
+        expect(getLogcatTimestampSpy).toHaveBeenCalledWith('emulator-5554');
+        expect(startLogcatSpy).toHaveBeenCalledWith('emulator-5554', [
             'logcat',
             '-v',
             'threadtime',
@@ -82,34 +78,24 @@ describe('createAndroidLogEvent', () => {
             '--uid=10234',
             '-T',
             '03-12 11:35:08.000',
-        ], {
-            stdout: 'pipe',
-            stderr: 'pipe',
-        });
+        ]);
     });
     it('hydrates crash details with stack lines that arrive after the first crash event', async () => {
-        const spawnSpy = vi.spyOn(tools, 'spawn');
-        spawnSpy.mockImplementation(((file, args) => {
-            if (file === 'adb' && args?.includes('date')) {
-                return {
-                    stdout: '03-12 10:44:40.000\n',
-                };
-            }
-            return createStreamingSubprocess([
-                { line: '--------- beginning of crash' },
-                {
-                    line: '03-12 10:44:40.420 13861 13861 E AndroidRuntime: Process: com.harnessplayground, PID: 13861',
-                },
-                {
-                    line: '03-12 10:44:40.421 13861 13861 E AndroidRuntime: java.lang.RuntimeException: boom',
-                    delayMs: 25,
-                },
-                {
-                    line: '03-12 10:44:40.422 13861 13861 E AndroidRuntime:     at com.harnessplayground.MainActivity.onCreate(MainActivity.kt:42)',
-                    delayMs: 25,
-                },
-            ]);
-        }));
+        vi.spyOn(adb, 'getLogcatTimestamp').mockResolvedValue('03-12 10:44:40.000');
+        vi.spyOn(adb, 'startLogcat').mockReturnValue(createStreamingSubprocess([
+            { line: '--------- beginning of crash' },
+            {
+                line: '03-12 10:44:40.420 13861 13861 E AndroidRuntime: Process: com.harnessplayground, PID: 13861',
+            },
+            {
+                line: '03-12 10:44:40.421 13861 13861 E AndroidRuntime: java.lang.RuntimeException: boom',
+                delayMs: 25,
+            },
+            {
+                line: '03-12 10:44:40.422 13861 13861 E AndroidRuntime:     at com.harnessplayground.MainActivity.onCreate(MainActivity.kt:42)',
+                delayMs: 25,
+            },
+        ]));
         const monitor = createAndroidAppMonitor({
             adbId: 'emulator-5554',
             bundleId: 'com.harnessplayground',
@@ -130,24 +116,17 @@ describe('createAndroidLogEvent', () => {
         ]);
     });
     it('persists resolved Android crash blocks into .harness', async () => {
-        const spawnSpy = vi.spyOn(tools, 'spawn');
-        spawnSpy.mockImplementation(((file, args) => {
-            if (file === 'adb' && args?.includes('date')) {
-                return {
-                    stdout: '03-12 10:44:40.000\n',
-                };
-            }
-            return createStreamingSubprocess([
-                { line: '--------- beginning of crash' },
-                {
-                    line: '03-12 10:44:40.420 13861 13861 E AndroidRuntime: Process: com.harnessplayground, PID: 13861',
-                },
-                {
-                    line: '03-12 10:44:40.421 13861 13861 E AndroidRuntime: java.lang.RuntimeException: boom',
-                    delayMs: 20,
-                },
-            ]);
-        }));
+        vi.spyOn(adb, 'getLogcatTimestamp').mockResolvedValue('03-12 10:44:40.000');
+        vi.spyOn(adb, 'startLogcat').mockReturnValue(createStreamingSubprocess([
+            { line: '--------- beginning of crash' },
+            {
+                line: '03-12 10:44:40.420 13861 13861 E AndroidRuntime: Process: com.harnessplayground, PID: 13861',
+            },
+            {
+                line: '03-12 10:44:40.421 13861 13861 E AndroidRuntime: java.lang.RuntimeException: boom',
+                delayMs: 20,
+            },
+        ]));
         const monitor = createAndroidAppMonitor({
             adbId: 'emulator-5554',
             bundleId: 'com.harnessplayground',
@@ -171,21 +150,13 @@ describe('createAndroidLogEvent', () => {
         expect(fs.readFileSync(details.artifactPath, 'utf8')).toContain('RuntimeException: boom');
     });
     it('can be started again after timestamp lookup fails', async () => {
-        const spawnSpy = vi.spyOn(tools, 'spawn');
         const timestampError = new Error('date failed');
-        spawnSpy.mockImplementation(((file, args) => {
-            if (file === 'adb' && args?.includes('date')) {
-                if (spawnSpy.mock.calls.filter(([calledFile, calledArgs]) => calledFile === 'adb' &&
-                    Array.isArray(calledArgs) &&
-                    calledArgs.includes('date')).length === 1) {
-                    throw timestampError;
-                }
-                return {
-                    stdout: '03-12 11:35:08.000\n',
-                };
-            }
-            return createMockSubprocess();
-        }));
+        vi.spyOn(adb, 'getLogcatTimestamp')
+            .mockRejectedValueOnce(timestampError)
+            .mockResolvedValueOnce('03-12 11:35:08.000');
+        const startLogcatSpy = vi
+            .spyOn(adb, 'startLogcat')
+            .mockReturnValue(createMockSubprocess());
         const monitor = createAndroidAppMonitor({
             adbId: 'emulator-5554',
             bundleId: 'com.harnessplayground',
@@ -194,9 +165,15 @@ describe('createAndroidLogEvent', () => {
         await expect(monitor.start()).rejects.toThrow(timestampError);
         await expect(monitor.start()).resolves.toBeUndefined();
         await monitor.stop();
-        expect(spawnSpy.mock.calls.some(([file, args]) => file === 'adb' &&
-            Array.isArray(args) &&
-            args.includes('logcat') &&
-            args.includes('--uid=10234'))).toBe(true);
+        expect(startLogcatSpy).toHaveBeenCalledWith('emulator-5554', [
+            'logcat',
+            '-v',
+            'threadtime',
+            '-b',
+            'crash',
+            '--uid=10234',
+            '-T',
+            '03-12 11:35:08.000',
+        ]);
     });
 });

package/dist/__tests__/instance.test.js

@@ -1,8 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { DEFAULT_METRO_PORT, } from '@react-native-harness/config';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
 import { getAndroidEmulatorPlatformInstance, getAndroidPhysicalDevicePlatformInstance, } from '../instance.js';
 import * as adb from '../adb.js';
 import * as avdConfig from '../avd-config.js';
@@ -19,9 +16,10 @@ const init = {
     signal: new AbortController().signal,
 };
 describe('Android platform instance', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
         vi.restoreAllMocks();
         vi.unstubAllEnvs();
+        vi.spyOn(await import('../environment.js'), 'ensureAndroidEmulatorAvailable').mockResolvedValue('/tmp/android-sdk');
     });
     it('reuses a running emulator and does not shut it down on dispose', async () => {
         const ensureAndroidEmulatorEnvironment = vi
@@ -137,6 +135,7 @@ describe('Android platform instance', () => {
     });
     it('reuses a compatible cached AVD snapshot when caching is enabled', async () => {
         vi.stubEnv('HARNESS_AVD_CACHING', 'true');
+        vi.spyOn(await import('../environment.js'), 'getHostAndroidSystemImageArch').mockReturnValue('arm64-v8a');
         vi.spyOn(await import('../environment.js'), 'ensureAndroidEmulatorEnvironment').mockResolvedValue('/tmp/android-sdk');
         vi.spyOn(adb, 'getDeviceIds').mockResolvedValue([]);
         vi.spyOn(adb, 'hasAvd').mockResolvedValue(true);
@@ -261,74 +260,6 @@ describe('Android platform instance', () => {
         expect(waitForEmulatorDisconnect).toHaveBeenCalledWith('emulator-5554', init.signal);
         expect(startEmulator).toHaveBeenNthCalledWith(2, 'Pixel_8_API_35', 'snapshot-reuse');
     });
-    it('installs the app from HARNESS_APP_PATH when missing', async () => {
-        const appPath = path.join(os.tmpdir(), 'HarnessPlayground.apk');
-        fs.writeFileSync(appPath, 'apk');
-        vi.stubEnv('HARNESS_APP_PATH', appPath);
-        vi.spyOn(await import('../environment.js'), 'ensureAndroidEmulatorEnvironment').mockResolvedValue('/tmp/android-sdk');
-        vi.spyOn(adb, 'getDeviceIds').mockResolvedValue(['emulator-5554']);
-        vi.spyOn(adb, 'getEmulatorName').mockResolvedValue('Pixel_8_API_35');
-        vi.spyOn(adb, 'waitForBoot').mockResolvedValue('emulator-5554');
-        vi.spyOn(adb, 'isAppInstalled').mockResolvedValue(false);
-        const installApp = vi.spyOn(adb, 'installApp').mockResolvedValue(undefined);
-        vi.spyOn(adb, 'reversePort').mockResolvedValue(undefined);
-        vi.spyOn(adb, 'setHideErrorDialogs').mockResolvedValue(undefined);
-        vi.spyOn(adb, 'getAppUid').mockResolvedValue(10234);
-        vi.spyOn(sharedPrefs, 'applyHarnessDebugHttpHost').mockResolvedValue(undefined);
-        await expect(getAndroidEmulatorPlatformInstance({
-            name: 'android',
-            device: {
-                type: 'emulator',
-                name: 'Pixel_8_API_35',
-                avd: {
-                    apiLevel: 35,
-                    profile: 'pixel_8',
-                    diskSize: '1G',
-                    heapSize: '1G',
-                },
-            },
-            bundleId: 'com.harnessplayground',
-            activityName: '.MainActivity',
-        }, harnessConfig, init)).resolves.toBeDefined();
-        expect(installApp).toHaveBeenCalledWith('emulator-5554', appPath);
-        fs.rmSync(appPath, { force: true });
-    });
-    it('reinstalls the app from HARNESS_APP_PATH when already installed', async () => {
-        const appPath = path.join(os.tmpdir(), 'HarnessPlayground-installed.apk');
-        fs.writeFileSync(appPath, 'apk');
-        vi.stubEnv('HARNESS_APP_PATH', appPath);
-        vi.spyOn(await import('../environment.js'), 'ensureAndroidEmulatorEnvironment').mockResolvedValue('/tmp/android-sdk');
-        vi.spyOn(adb, 'getDeviceIds').mockResolvedValue(['emulator-5554']);
-        vi.spyOn(adb, 'getEmulatorName').mockResolvedValue('Pixel_8_API_35');
-        vi.spyOn(adb, 'waitForBoot').mockResolvedValue('emulator-5554');
-        vi.spyOn(adb, 'isAppInstalled').mockResolvedValue(true);
-        const uninstallApp = vi
-            .spyOn(adb, 'uninstallApp')
-            .mockResolvedValue(undefined);
-        const installApp = vi.spyOn(adb, 'installApp').mockResolvedValue(undefined);
-        vi.spyOn(adb, 'reversePort').mockResolvedValue(undefined);
-        vi.spyOn(adb, 'setHideErrorDialogs').mockResolvedValue(undefined);
-        vi.spyOn(adb, 'getAppUid').mockResolvedValue(10234);
-        vi.spyOn(sharedPrefs, 'applyHarnessDebugHttpHost').mockResolvedValue(undefined);
-        await expect(getAndroidEmulatorPlatformInstance({
-            name: 'android',
-            device: {
-                type: 'emulator',
-                name: 'Pixel_8_API_35',
-                avd: {
-                    apiLevel: 35,
-                    profile: 'pixel_8',
-                    diskSize: '1G',
-                    heapSize: '1G',
-                },
-            },
-            bundleId: 'com.harnessplayground',
-            activityName: '.MainActivity',
-        }, harnessConfig, init)).resolves.toBeDefined();
-        expect(uninstallApp).toHaveBeenCalledWith('emulator-5554', 'com.harnessplayground');
-        expect(installApp).toHaveBeenCalledWith('emulator-5554', appPath);
-        fs.rmSync(appPath, { force: true });
-    });
     it('throws a HarnessAppPathError when HARNESS_APP_PATH is missing', async () => {
         vi.spyOn(adb, 'getDeviceIds').mockResolvedValue(['emulator-5554']);
         vi.spyOn(adb, 'getEmulatorName').mockResolvedValue('Pixel_8_API_35');

package/dist/adb.d.ts

@@ -1,4 +1,5 @@
 import { type AndroidAppLaunchOptions } from '@react-native-harness/platforms';
+import { type Subprocess } 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';
@@ -42,6 +43,7 @@ export declare const isAppRunning: (adbId: string, bundleId: string) => Promise<
 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 getAvds: () => Promise<string[]>;
 export type AdbDevice = {
     id: string;

package/dist/adb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../src/adb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAG/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAgB5C,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AA2C/B,eAAO,MAAM,eAAe;iCAElB,MAAM,QACN,SAAS,MAAM,EAAE,KACtB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC;CAKjD,CAAC;AAqEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,UAAU,MAAM,KAAG,MAAM,EAMpE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,UAAU,MAAM,KACf,OAAO,CAAC,IAAI,CAEd,CAAC;AAgEF,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAChB,cAAc,MAAM,EACpB,UAAU,uBAAuB,KAChC,MAAM,EAoCR,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,OAAO,CAWjB,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,OAAO,MAAM,EACb,MAAM,MAAM,EACZ,WAAU,MAAa,KACtB,OAAO,CAAC,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,OAAO,GAClB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,IAAI,CASd,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,OAAO,MAAM,EACb,UAAU,MAAM,EAChB,cAAc,MAAM,EACpB,UAAU,uBAAuB,KAChC,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,MAAM,EAAE,CAOrD,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,OAAO,MAAM,KACZ,OAAO,CAAC,MAAM,GAAG,IAAI,CASvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,MAAM,GAAG,IAAI,CASvB,CAAC;AAMF,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,KACZ,OAAO,CAAC,UAAU,GAAG,IAAI,CAI3B,CAAC;AA2EF,eAAO,MAAM,eAAe,GAAU,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAWpE,CAAC;AAEF,eAAO,MAAM,YAAY,GAAU,OAAO,MAAM,KAAG,OAAO,CAAC,IAAI,CAE9D,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,OAAO,MAAM,EACb,SAAS,MAAM,KACd,OAAO,CAAC,IAAI,CAEd,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,IAAI,CAEd,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,OAAO,CAG1D,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,kDAM7B,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAkBjC,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,IAAI,CAkB1D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,EACZ,OAAM,gBAAiC,KACtC,OAAO,CAAC,IAAI,CAgFd,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,QAAQ,WAAW,KAClB,OAAO,CAAC,MAAM,CAoBhB,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,OAAO,MAAM,EACb,QAAQ,WAAW,KAClB,OAAO,CAAC,IAAI,CAYd,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,QAAQ,WAAW,KAClB,OAAO,CAAC,MAAM,CAwBhB,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,OAAO,CAiBjB,CAAC;AAEF,eAAO,MAAM,SAAS,GACpB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,MAAM,CAoBhB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,OAAO,MAAM,EACb,MAAM,OAAO,KACZ,OAAO,CAAC,IAAI,CAWd,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAU,OAAO,MAAM,KAAG,OAAO,CAAC,MAAM,CAUtE,CAAC;AAEF,eAAO,MAAM,OAAO,QAAa,OAAO,CAAC,MAAM,EAAE,CAWhD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAAC,SAAS,EAAE,CA8B/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,IAAI,CAqEd,CAAC"}
+{"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 { logger, spawn, SubprocessError } from '@react-native-harness/tools';
+import { logger, spawn, SubprocessError, } 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';
@@ -490,6 +490,10 @@ export const getLogcatTimestamp = async (adbId) => {
     ]);
     return stdout.trim().replace(/^'+|'+$/g, '');
 };
+export const startLogcat = (adbId, args) => spawn(getAdbBinaryPath(), ['-s', adbId, ...args], {
+    stdout: 'pipe',
+    stderr: 'pipe',
+});
 export const getAvds = async () => {
     try {
         const emulatorBinaryPath = await ensureEmulatorInstalled();

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

@@ -1 +1 @@
-{"version":3,"file":"app-monitor.d.ts","sourceRoot":"","sources":["../src/app-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,eAAe,EAErB,MAAM,iCAAiC,CAAC;AAgTzC,QAAA,MAAM,qBAAqB,GACzB,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,eAAe,GAAG,IAwEpB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,mDAKrC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C,KAAG,iBAgLH,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACjC,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG;IAC3C,eAAe,EAAE,CACf,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;CACtC,CAAC"}
+{"version":3,"file":"app-monitor.d.ts","sourceRoot":"","sources":["../src/app-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,eAAe,EAErB,MAAM,iCAAiC,CAAC;AA+SzC,QAAA,MAAM,qBAAqB,GACzB,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,eAAe,GAAG,IAwEpB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,mDAKrC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C,KAAG,iBA4KH,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACjC,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG;IAC3C,eAAe,EAAE,CACf,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;CACtC,CAAC"}

package/dist/app-monitor.js

@@ -1,4 +1,4 @@
-import { escapeRegExp, getEmitter, logger, spawn, SubprocessError, } from '@react-native-harness/tools';
+import { escapeRegExp, getEmitter, logger, SubprocessError, } from '@react-native-harness/tools';
 import * as adb from './adb.js';
 import { androidCrashParser } from './crash-parser.js';
 const androidAppMonitorLogger = logger.child('android-app-monitor');
@@ -281,10 +281,7 @@ export const createAndroidAppMonitor = ({ adbId, bundleId, appUid, crashArtifact
     };
     const startLogcat = async () => {
         const logcatTimestamp = await adb.getLogcatTimestamp(adbId);
-        logcatProcess = spawn('adb', ['-s', adbId, ...getLogcatArgs(appUid, logcatTimestamp)], {
-            stdout: 'pipe',
-            stderr: 'pipe',
-        });
+        logcatProcess = adb.startLogcat(adbId, getLogcatArgs(appUid, logcatTimestamp));
         const currentProcess = logcatProcess;
         if (!currentProcess) {
             return;