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

package/src/instance.ts

@@ -5,7 +5,7 @@ import {
   HarnessPlatformRunner,
 } from '@react-native-harness/platforms';
 import type { Config as HarnessConfig } from '@react-native-harness/config';
-import { logger } from '@react-native-harness/tools';
+import { instrumented, logger, noopDiagnostics } from '@react-native-harness/tools';
 import {
   AndroidPlatformConfig,
   assertAndroidDeviceEmulator,
@@ -17,7 +17,7 @@ import {
   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,
@@ -29,6 +29,7 @@ import {
   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';
@@ -71,13 +72,13 @@ const configureAndroidRuntime = async (
   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 ({
@@ -87,11 +88,12 @@ const startAndWaitForBoot = async ({
 }: {
   emulatorName: string;
   signal: AbortSignal;
-  mode?: Parameters<typeof adb.startEmulator>[1];
+  mode?: Parameters<typeof adbModule.startEmulator>[1];
 }): Promise<string> => {
   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 ({
@@ -106,7 +108,7 @@ const recreateAvd = async ({
     throw new HarnessEmulatorConfigError(emulatorConfig.name);
   }
 
-  await adb.createAvd({
+  await adbModule.createAvd({
     name: emulatorConfig.name,
     apiLevel: emulatorConfig.avd.apiLevel,
     profile: emulatorConfig.avd.profile,
@@ -127,7 +129,7 @@ const prepareCachedAvd = async ({
 }): Promise<string> => {
   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
@@ -152,7 +154,7 @@ const prepareCachedAvd = async ({
         emulatorName,
         compatibility.reason
       );
-      await adb.deleteAvd(emulatorName);
+      await adbModule.deleteAvd(emulatorName);
     }
 
     await recreateAvd({ emulatorConfig });
@@ -164,8 +166,8 @@ const prepareCachedAvd = async ({
     });
 
     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);
   }
@@ -183,6 +185,11 @@ export const getAndroidEmulatorPlatformInstance = async (
   init: HarnessPlatformInitOptions
 ): Promise<HarnessPlatformRunner> => {
   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;
@@ -290,10 +297,11 @@ export const getAndroidEmulatorPlatformInstance = async (
         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 () => {
@@ -315,6 +323,11 @@ export const getAndroidPhysicalDevicePlatformInstance = async (
   init?: HarnessPlatformInitOptions
 ): Promise<HarnessPlatformRunner> => {
   assertAndroidDevicePhysical(config.device);
+  const adb = instrumented(
+    adbModule,
+    'platform.android.adb',
+    init?.diagnostics ?? noopDiagnostics
+  );
   const permissionsEnabled = harnessConfig.permissions ?? false;
 
   const adbId = await getAdbId(config.device);
@@ -358,10 +371,11 @@ export const getAndroidPhysicalDevicePlatformInstance = async (
         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/src/runner.ts

@@ -1,7 +1,4 @@
-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 {
   AndroidPlatformConfigSchema,
@@ -17,11 +14,10 @@ import {
   initializeAndroidProcessEnv,
 } from './environment.js';
 
-const getAndroidRunner = async (
-  config: AndroidPlatformConfig,
-  harnessConfig: HarnessConfig,
-  init: HarnessPlatformInitOptions
-): Promise<HarnessPlatformRunner> => {
+const getAndroidRunner: HarnessPlatformRunnerFactory<
+  AndroidPlatformConfig,
+  HarnessConfig
+> = async (config, harnessConfig, init) => {
   const parsedConfig = AndroidPlatformConfigSchema.parse(config);
 
   initializeAndroidProcessEnv();