@expo/build-tools 21.7.0 → 21.8.0

package/dist/logging/HttpLogStream.js

@@ -8,6 +8,7 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
 const stream_1 = require("stream");
 const retry_1 = require("../utils/retry");
 const MAX_BATCH_BYTES = 200_000;
+const REQUEST_TIMEOUT_MS = 10_000;
 /**
  * A bunyan-compatible writable stream for sending logs over HTTP.
  */
@@ -120,6 +121,7 @@ class HttpLogStream extends stream_1.Writable {
                     'Content-Type': 'application/x-ndjson',
                 },
                 body: logs.map(log => log.serialized).join('\n'),
+                signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
             });
             if (!response.ok) {
                 const responseText = await (0, results_1.asyncResult)(response.text());

package/dist/steps/functions/maestroTests.js

@@ -18,6 +18,7 @@ const retry_1 = require("../../utils/retry");
 const FlowPathSchema = zod_1.z.array(zod_1.z.string().min(1)).min(1);
 const RetriesSchema = zod_1.z.number().int().min(0).default(0);
 const ShardsSchema = zod_1.z.number().int().min(1).optional();
+const AndroidConnectionModeSchema = zod_1.z.enum(['adb', 'dadb']).default('adb');
 function parseInput(schema, value, message) {
     const result = schema.safeParse(value);
     if (!result.success) {
@@ -109,6 +110,11 @@ function createMaestroTestsBuildFunction(ctx) {
                 required: false,
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
             }),
+            steps_1.BuildStepInput.createProvider({
+                id: 'android_connection_mode',
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
+            }),
         ],
         outputProviders: [
             steps_1.BuildStepOutput.createProvider({ id: 'junit_report_directory', required: true }),
@@ -153,6 +159,9 @@ function createMaestroTestsBuildFunction(ctx) {
             const flowPaths = parseInput(FlowPathSchema, inputs.flow_path.value, 'flow_path must be a non-empty array of non-empty strings.');
             const retries = parseInput(RetriesSchema, inputs.retries.value, 'retries must be a non-negative integer.');
             const shards = parseInput(ShardsSchema, inputs.shards.value, 'shards must be a positive integer.');
+            const androidConnectionMode = parseInput(AndroidConnectionModeSchema, inputs.android_connection_mode.value ||
+                env.EAS_MAESTRO_ANDROID_CONNECTION_MODE ||
+                undefined, 'android_connection_mode and EAS_MAESTRO_ANDROID_CONNECTION_MODE must be either "adb" or "dadb".');
             const retryFailedOnly = inputs.retry_failed_only.value;
             try {
                 await promises_1.default.mkdir(junitReportDirectory, { recursive: true });
@@ -176,6 +185,33 @@ function createMaestroTestsBuildFunction(ctx) {
             let lastAttemptExitCode = null;
             const harvested = [];
             const totalAttempts = retries + 1;
+            if (platform === 'android' && androidConnectionMode === 'dadb') {
+                try {
+                    const adbOverrideDirectoryPath = await promises_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'maestro-tests-adb-override-'));
+                    await promises_1.default.writeFile(path_1.default.join(adbOverrideDirectoryPath, 'adb'), '#!/bin/sh\nexit 1\n', {
+                        mode: 0o755,
+                    });
+                    // DADB starts an ADB server when it can find an adb binary. Stop the existing
+                    // server first, then make only the Maestro process find the failing shim.
+                    try {
+                        await (0, turtle_spawn_1.default)('adb', ['kill-server'], { env: { ...spawnEnv }, logger, signal });
+                        logger.info('Using a direct DADB connection for Android Maestro tests after stopping the ADB server.');
+                    }
+                    catch (err) {
+                        logger.warn({ err }, 'Using a direct DADB connection for Android Maestro tests, but failed to stop the ADB server.');
+                    }
+                    spawnEnv.PATH = spawnEnv.PATH
+                        ? `${adbOverrideDirectoryPath}${path_1.default.delimiter}${spawnEnv.PATH}`
+                        : adbOverrideDirectoryPath;
+                }
+                catch (err) {
+                    // Intentionally skip cleanup because the worker is disposable.
+                    throw new eas_build_job_1.SystemError('Failed to enable direct DADB connection for Maestro', {
+                        cause: err,
+                    });
+                }
+                // Do not restart ADB or remove the override. This keeps Maestro in direct DADB mode.
+            }
             for (let attempt = 0; attempt <= retries; attempt++) {
                 const outputPath = outputFormat === 'junit'
                     ? path_1.default.join(junitReportDirectory, `${platform}-maestro-junit-attempt-${attempt}.xml`)

package/dist/steps/functions/startAndroidEmulator.js

@@ -8,6 +8,9 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const steps_1 = require("@expo/steps");
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const AndroidEmulatorUtils_1 = require("../../utils/AndroidEmulatorUtils");
 const retry_1 = require("../../utils/retry");
 const ANDROID_STARTUP_ATTEMPT_TIMEOUT_MS = [60_000, 120_000, 180_000];
@@ -43,7 +46,15 @@ function createStartAndroidEmulatorBuildFunction() {
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
             }),
         ],
-        fn: async ({ logger }, { inputs, env }) => {
+        outputProviders: [
+            steps_1.BuildStepOutput.createProvider({
+                id: 'logcat_directory',
+                required: true,
+            }),
+        ],
+        fn: async ({ logger }, { inputs, outputs, env }) => {
+            const logcatDirectory = await node_fs_1.default.promises.mkdtemp(node_path_1.default.join(node_os_1.default.tmpdir(), 'eas-android-emulator-logcat-'));
+            outputs.logcat_directory.set(logcatDirectory);
             if (env.EAS_NO_EMULATOR_HOST_SUPPORT_CHECK !== '1') {
                 await assertAndroidEmulatorHostSupportAsync({ env });
             }
@@ -103,6 +114,7 @@ function createStartAndroidEmulatorBuildFunction() {
                     const startResult = await AndroidEmulatorUtils_1.AndroidEmulatorUtils.startAsync({
                         deviceName,
                         env,
+                        logcatDirectory,
                     });
                     attemptSerialId = startResult.serialId;
                     await AndroidEmulatorUtils_1.AndroidEmulatorUtils.waitForReadyAsync({
@@ -184,6 +196,7 @@ function createStartAndroidEmulatorBuildFunction() {
                             const startResult = await AndroidEmulatorUtils_1.AndroidEmulatorUtils.startAsync({
                                 deviceName: cloneIdentifier,
                                 env,
+                                logcatDirectory,
                             });
                             cloneSerialId = startResult.serialId;
                             logger.info('Waiting for emulator to become ready');

package/dist/steps/utils/deviceRunSessionEvents.js

@@ -220,7 +220,7 @@ function createRealtimeLogStream(ctx, logger) {
         ? 'http://localhost:4999/logs/'
         : ctx.env.EXPO_STAGING
             ? 'https://staging-logs.expo.dev/logs/'
-            : undefined;
+            : 'https://logs.expo.dev/logs/';
     const jobRunId = ctx.env.EAS_BUILD_ID;
     const robotAccessToken = ctx.job.secrets?.robotAccessToken;
     if (!baseUrl || !jobRunId || !robotAccessToken) {

package/dist/templates/EasBuildConfigureVersionGradle.d.ts

@@ -1 +1 @@
-export declare const EasBuildConfigureVersionGradleTemplate = "// Build integration with EAS\n\nimport java.nio.file.Paths\n\ndef versionCodeVal = null\ndef versionNameVal = null\n<% if (VERSION_CODE) { %>\n    versionCodeVal = \"<%- VERSION_CODE %>\"\n<% } %>\n<% if (VERSION_NAME) { %>\n    versionNameVal = \"<%- VERSION_NAME %>\"\n<% } %>\n\nandroid {\n  defaultConfig {\n    if (versionCodeVal) {\n      versionCode = Integer.parseInt(versionCodeVal)\n    }\n    if (versionNameVal) {\n      versionName = versionNameVal\n    }\n  }\n  applicationVariants.all { variant ->\n    variant.outputs.each { output ->\n      if (versionCodeVal) {\n        output.versionCodeOverride = Integer.parseInt(versionCodeVal)\n      }\n      if (versionNameVal) {\n        output.versionNameOverride = versionNameVal\n      }\n    }\n  }\n}\n";
+export declare const EasBuildConfigureVersionGradleTemplate = "// Build integration with EAS\n\nimport java.nio.file.Paths\n\ndef versionCodeVal = null\ndef versionNameVal = null\n<% if (VERSION_CODE) { %>\n    versionCodeVal = \"<%- VERSION_CODE %>\"\n<% } %>\n<% if (VERSION_NAME) { %>\n    versionNameVal = \"<%- VERSION_NAME %>\"\n<% } %>\n\nandroid {\n  defaultConfig {\n    if (versionCodeVal) {\n      versionCode = Integer.parseInt(versionCodeVal)\n    }\n    if (versionNameVal) {\n      versionName = versionNameVal\n    }\n  }\n}\n\n// AGP 9's new DSL removes the applicationVariants API, we set the version on each output through the androidComponents API instead.\ndef easAndroidExtension = project.extensions.getByName('android')\nif (easAndroidExtension.hasProperty('applicationVariants')) {\n  easAndroidExtension.applicationVariants.all { variant ->\n    variant.outputs.each { output ->\n      if (versionCodeVal) {\n        output.versionCodeOverride = Integer.parseInt(versionCodeVal)\n      }\n      if (versionNameVal) {\n        output.versionNameOverride = versionNameVal\n      }\n    }\n  }\n} else {\n  def easAndroidComponents = project.extensions.getByName('androidComponents')\n  easAndroidComponents.onVariants(easAndroidComponents.selector().all()) { variant ->\n    variant.outputs.each { output ->\n      if (versionCodeVal) {\n        output.versionCode.set(Integer.parseInt(versionCodeVal))\n      }\n      if (versionNameVal) {\n        output.versionName.set(versionNameVal)\n      }\n    }\n  }\n}\n";

package/dist/templates/EasBuildConfigureVersionGradle.js

@@ -23,7 +23,12 @@ android {
       versionName = versionNameVal
     }
   }
-  applicationVariants.all { variant ->
+}
+
+// AGP 9's new DSL removes the applicationVariants API, we set the version on each output through the androidComponents API instead.
+def easAndroidExtension = project.extensions.getByName('android')
+if (easAndroidExtension.hasProperty('applicationVariants')) {
+  easAndroidExtension.applicationVariants.all { variant ->
     variant.outputs.each { output ->
       if (versionCodeVal) {
         output.versionCodeOverride = Integer.parseInt(versionCodeVal)
@@ -33,5 +38,17 @@ android {
       }
     }
   }
+} else {
+  def easAndroidComponents = project.extensions.getByName('androidComponents')
+  easAndroidComponents.onVariants(easAndroidComponents.selector().all()) { variant ->
+    variant.outputs.each { output ->
+      if (versionCodeVal) {
+        output.versionCode.set(Integer.parseInt(versionCodeVal))
+      }
+      if (versionNameVal) {
+        output.versionName.set(versionNameVal)
+      }
+    }
+  }
 }
 `;

package/dist/utils/AndroidEmulatorUtils.d.ts

@@ -34,12 +34,14 @@ export declare namespace AndroidEmulatorUtils {
         env: NodeJS.ProcessEnv;
         logger: bunyan;
     }): Promise<void>;
-    function startAsync({ deviceName, env, }: {
+    function startAsync({ deviceName, env, logcatDirectory, }: {
         deviceName: AndroidVirtualDeviceName;
         env: NodeJS.ProcessEnv;
+        logcatDirectory: string;
     }): Promise<{
         emulatorPromise: SpawnPromise<SpawnResult>;
         serialId: AndroidDeviceSerialId;
+        logcatOutputPath: string;
     }>;
     function waitForReadyAsync({ serialId, env, timeoutMs, logger, }: {
         serialId: AndroidDeviceSerialId;

package/dist/utils/AndroidEmulatorUtils.js

@@ -4,10 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AndroidEmulatorUtils = void 0;
+const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const assert_1 = __importDefault(require("assert"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
+const node_crypto_1 = require("node:crypto");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -212,13 +214,32 @@ var AndroidEmulatorUtils;
         }
     }
     AndroidEmulatorUtils.cloneAsync = cloneAsync;
-    async function startAsync({ deviceName, env, }) {
+    async function startAsync({ deviceName, env, logcatDirectory, }) {
+        let logcatOutputPath;
+        try {
+            await node_fs_1.default.promises.mkdir(logcatDirectory, { recursive: true });
+            const safeDeviceName = deviceName.replace(/[^a-zA-Z0-9_.-]/g, '_');
+            const timestamp = Math.floor(Date.now() / 1000)
+                .toString(16)
+                .padStart(8, '0');
+            logcatOutputPath = node_path_1.default.join(logcatDirectory, `${safeDeviceName}-${timestamp}-${(0, node_crypto_1.randomBytes)(2).toString('hex')}.log`);
+            await node_fs_1.default.promises.writeFile(logcatOutputPath, '');
+        }
+        catch (err) {
+            throw new eas_build_job_1.SystemError(`Failed to prepare Android emulator logcat output for ${deviceName}.`, {
+                cause: err,
+            });
+        }
         const emulatorPromise = (0, turtle_spawn_1.default)(`${process.env.ANDROID_HOME}/emulator/emulator`, [
             '-no-window',
             '-no-boot-anim',
             '-writable-system',
             '-noaudio',
             '-no-snapshot-save',
+            '-logcat',
+            '*:v',
+            '-logcat-output',
+            logcatOutputPath,
             '-avd',
             deviceName,
             '-accel',
@@ -255,7 +276,7 @@ var AndroidEmulatorUtils;
         });
         // We don't want to await the SpawnPromise here.
         // eslint-disable-next-line @typescript-eslint/return-await
-        return { emulatorPromise, serialId };
+        return { emulatorPromise, serialId, logcatOutputPath };
     }
     AndroidEmulatorUtils.startAsync = startAsync;
     async function waitForReadyAsync({ serialId, env, timeoutMs = 3 * 60 * 1_000, logger, }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "21.7.0",
+  "version": "21.8.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -46,7 +46,7 @@
     "@expo/plist": "^0.3.5",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "21.6.0",
+    "@expo/steps": "21.7.1",
     "@expo/template-file": "21.0.2",
     "@expo/turtle-spawn": "21.0.0",
     "@expo/xcpretty": "^4.3.1",
@@ -100,5 +100,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "f923181857de80919ec7ee9861c9b71c2ee5635d"
+  "gitHead": "b8cff2008966a6c7202736577cd231025ee47f21"
 }