@expo/build-tools 23.2.0 → 24.1.0

package/dist/steps/utils/remoteDeviceRunSession.js

@@ -41,7 +41,7 @@ exports.getNgrokTunnelDomainOrThrow = getNgrokTunnelDomainOrThrow;
 exports.getNgrokAuthtokenOrThrow = getNgrokAuthtokenOrThrow;
 exports.selectXcodeDeveloperDirectoryAsync = selectXcodeDeveloperDirectoryAsync;
 exports.waitForDeviceRunSessionStoppedAsync = waitForDeviceRunSessionStoppedAsync;
-exports.ensureFfmpegInstalledAsync = ensureFfmpegInstalledAsync;
+exports.ensureFfmpegInstalledOnceAsync = ensureFfmpegInstalledOnceAsync;
 exports.turnIceServersToWebPreviewArgs = turnIceServersToWebPreviewArgs;
 exports.fetchWebPreviewTurnArgsAsync = fetchWebPreviewTurnArgsAsync;
 exports.uploadRemoteSessionConfigAsync = uploadRemoteSessionConfigAsync;
@@ -49,7 +49,9 @@ exports.spawnDetached = spawnDetached;
 exports.metricsCorsOriginToServeSimArgs = metricsCorsOriginToServeSimArgs;
 exports.createServeSimArgs = createServeSimArgs;
 exports.createExpoDeviceHubArgs = createExpoDeviceHubArgs;
+exports.findAvailablePortAsync = findAvailablePortAsync;
 exports.waitForWebPreviewReadyAsync = waitForWebPreviewReadyAsync;
+exports.readServeSimPreviewTokenAsync = readServeSimPreviewTokenAsync;
 exports.startServeSimWithTunnelAsync = startServeSimWithTunnelAsync;
 exports.startExpoDeviceHubWithTunnelAsync = startExpoDeviceHubWithTunnelAsync;
 exports.startDeviceWebPreviewWithTunnelAsync = startDeviceWebPreviewWithTunnelAsync;
@@ -71,6 +73,7 @@ const promises_1 = require("node:timers/promises");
 const sentry_1 = require("../../sentry");
 const retry_1 = require("../../utils/retry");
 const turtleFetch_1 = require("../../utils/turtleFetch");
+const serveSimMetricsRecorder_1 = require("./serveSimMetricsRecorder");
 const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
 const WEB_PREVIEW_HOST = '127.0.0.1';
 const SERVE_SIM_PACKAGE_NAME = '@expo/serve-sim';
@@ -79,7 +82,7 @@ const SERVE_SIM_MJPEG_QUALITY = '0.55';
 const SERVE_SIM_VIDEO_BITRATE = '6000000';
 const SERVE_SIM_VIDEO_FPS = '60';
 const EXPO_DEVICE_HUB_PACKAGE_NAME = 'expo-device-hub';
-const EXPO_DEVICE_HUB_MAX_DIMENSION = '1280';
+const EXPO_DEVICE_HUB_MAX_DIMENSION = '960';
 const EXPO_DEVICE_HUB_VIDEO_BITRATE = '6000000';
 const EXPO_DEVICE_HUB_VIDEO_FPS = '60';
 const START_DEVICE_RUN_SESSION_MUTATION = (0, gql_tada_1.graphql)(`
@@ -269,10 +272,9 @@ async function sleepUntilAbortedAsync(timeoutMs, signal) {
         }
     }
 }
-// Argent encodes screen recordings by piping simulator frames into `ffmpeg`,
-// which it resolves from PATH. The tool-server inherits this step's env, so
-// spawning ffmpeg resolves against the same PATH argent will search: it rejects
-// with ENOENT when the binary is absent, and running it also proves it works.
+// Device-session tools resolve `ffmpeg` from PATH. Spawning it with the step's
+// environment rejects with ENOENT when the binary is absent, and running it also
+// proves that the installed binary works.
 async function isFfmpegAvailableAsync(env) {
     return (await (0, results_1.asyncResult)((0, turtle_spawn_1.default)('ffmpeg', ['-version'], { env }))).ok;
 }
@@ -290,14 +292,14 @@ async function installFfmpegWithAptAsync({ env, logger, }) {
     await (0, results_1.asyncResult)((0, turtle_spawn_1.default)('sudo', ['apt-get', 'update'], { env: aptEnv, logger }));
     await (0, turtle_spawn_1.default)('sudo', ['apt-get', 'install', '-y', 'ffmpeg'], { env: aptEnv, logger });
 }
+let ffmpegSetupPromise;
 /**
- * Install ffmpeg when the runtime does not already provide it, so argent's
- * `screen-recording-start` tool can encode a video. The worker images do not
- * ship ffmpeg yet, so without this the tool fails with "`ffmpeg` was not found
- * on PATH" — on macOS (iOS simulators) and Linux (Android emulators) alike.
+ * Install ffmpeg when the runtime does not already provide it. Device-session
+ * tools use it for video encoding on macOS (iOS simulators) and Linux (Android
+ * emulators) alike, but the worker images do not ship it yet.
  *
- * Best-effort by design: screen recording is one optional argent tool, so a
- * failure here is logged and the session continues without it.
+ * Best-effort by design: a failure here is logged and the session continues
+ * without FFmpeg-dependent features.
  *
  * The whole body is wrapped because the caller runs this in the background with
  * `void`. There is no unhandledRejection handler in the worker, so a rejection
@@ -312,7 +314,7 @@ async function ensureFfmpegInstalledAsync({ runtimePlatform, env, logger, }) {
             return;
         }
         const isDarwin = runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN;
-        logger.info(`ffmpeg is not installed, installing it with ${isDarwin ? 'Homebrew' : 'apt'} for argent screen recording.`);
+        logger.info(`ffmpeg is not installed, installing it with ${isDarwin ? 'Homebrew' : 'apt'} for the device session.`);
         if (isDarwin) {
             await installFfmpegWithHomebrewAsync({ env, logger });
         }
@@ -323,10 +325,26 @@ async function ensureFfmpegInstalledAsync({ runtimePlatform, env, logger, }) {
     }
     catch (err) {
         const error = err instanceof Error ? err : new Error(String(err));
-        sentry_1.Sentry.capture('Could not install ffmpeg for argent screen recording', error, {
+        sentry_1.Sentry.capture('Could not install ffmpeg for the device session', error, {
             level: 'warning',
         });
-        logger.warn({ err: error }, 'Could not install ffmpeg. Argent screen recording will not work in this session.');
+        logger.warn({ err: error }, 'Could not install ffmpeg. FFmpeg-dependent features may not work in this session.');
+    }
+}
+async function ensureFfmpegInstalledOnceAsync({ runtimePlatform, env, logger, }) {
+    if (ffmpegSetupPromise) {
+        await ffmpegSetupPromise;
+        return;
+    }
+    const setupPromise = ensureFfmpegInstalledAsync({ runtimePlatform, env, logger });
+    ffmpegSetupPromise = setupPromise;
+    try {
+        await setupPromise;
+    }
+    finally {
+        if (ffmpegSetupPromise === setupPromise) {
+            ffmpegSetupPromise = undefined;
+        }
     }
 }
 const TurnIceServersResponseSchema = zod_1.z.object({
@@ -495,6 +513,7 @@ function createServeSimArgs({ port, turnArgs = [], metricsCorsArgs = [], package
         String(port),
         '--host',
         WEB_PREVIEW_HOST,
+        '--require-token',
         '--transport',
         'webrtc',
         '--webrtc-codec',
@@ -571,8 +590,8 @@ async function waitForWebPreviewReadyAsync({ previewServer, serverName, port, ti
                 retries: 0,
                 timeout: 2_000,
             });
-            WebPreviewReadyResponseSchema.parse(await response.json());
-            return;
+            const ready = WebPreviewReadyResponseSchema.parse(await response.json());
+            return ready.device;
         }
         catch (error) {
             lastError = error;
@@ -581,7 +600,7 @@ async function waitForWebPreviewReadyAsync({ previewServer, serverName, port, ti
     }
     throw new eas_build_job_1.SystemError(`Timed out waiting for ${serverName} readiness at ${readyUrl}${lastError instanceof Error ? `: ${lastError.message}` : ''}. Last output:\n${previewServer.getOutput() || '<empty>'}`);
 }
-async function startWebPreviewWithTunnelAsync(ctx, { baseDomain, env, logger, timeoutMs, serverName, packageSpec, createArgs, }) {
+async function startWebPreviewWithTunnelAsync(ctx, { baseDomain, env, logger, timeoutMs, serverName, packageSpec, createArgs, readPreviewTokenAsync, }) {
     const port = await findAvailablePortAsync();
     logger.info(`Launching ${packageSpec} on ${WEB_PREVIEW_HOST}:${port}.`);
     const turnArgs = await fetchWebPreviewTurnArgsAsync(ctx, { env, logger });
@@ -592,7 +611,13 @@ async function startWebPreviewWithTunnelAsync(ctx, { baseDomain, env, logger, ti
     });
     try {
         logger.info(`Waiting for ${serverName} to become ready.`);
-        await waitForWebPreviewReadyAsync({ previewServer, serverName, port, timeoutMs });
+        const device = await waitForWebPreviewReadyAsync({
+            previewServer,
+            serverName,
+            port,
+            timeoutMs,
+        });
+        const previewToken = await readPreviewTokenAsync?.(device);
         const tunnel = await startNgrokTunnelAsync({
             port,
             subdomainPrefix: 'web-preview',
@@ -602,6 +627,7 @@ async function startWebPreviewWithTunnelAsync(ctx, { baseDomain, env, logger, ti
         });
         return {
             previewUrl: tunnel.url,
+            previewToken,
             stopAsync: async () => {
                 const results = await Promise.allSettled([tunnel.stopAsync(), previewServer.stopAsync()]);
                 for (const result of results) {
@@ -617,6 +643,10 @@ async function startWebPreviewWithTunnelAsync(ctx, { baseDomain, env, logger, ti
         throw error;
     }
 }
+async function readServeSimPreviewTokenAsync(udid, stateDir = serveSimMetricsRecorder_1.SERVE_SIM_STATE_DIR) {
+    const servers = await (0, serveSimMetricsRecorder_1.readServeSimServersAsync)(stateDir);
+    return servers.find(server => server.udid === udid)?.token;
+}
 async function startServeSimWithTunnelAsync(ctx, { baseDomain, env, logger, timeoutMs, packageVersion, }) {
     const metricsCorsArgs = metricsCorsOriginToServeSimArgs(env);
     return await startWebPreviewWithTunnelAsync(ctx, {
@@ -627,9 +657,24 @@ async function startServeSimWithTunnelAsync(ctx, { baseDomain, env, logger, time
         serverName: 'serve-sim',
         packageSpec: createServeSimPackageSpec(packageVersion),
         createArgs: (port, turnArgs) => createServeSimArgs({ port, turnArgs, metricsCorsArgs, packageVersion }),
+        readPreviewTokenAsync: async (device) => {
+            const previewToken = await readServeSimPreviewTokenAsync(device);
+            if (!previewToken) {
+                // A serve-sim that does not know --require-token fails earlier, in the readiness check, so
+                // reaching here means it started and left no token in its state file.
+                throw new eas_build_job_1.SystemError(`serve-sim became ready but wrote no session token for device ${device}. The preview is ` +
+                    'on a public tunnel and would be reachable without one, so the session cannot continue. ' +
+                    'This usually means the state file was not written as expected; retry the session, and ' +
+                    'report it if it repeats.');
+            }
+            return previewToken;
+        },
     });
 }
-async function startExpoDeviceHubWithTunnelAsync(ctx, { baseDomain, env, logger, timeoutMs, packageVersion, }) {
+async function startExpoDeviceHubWithTunnelAsync(ctx, { runtimePlatform, baseDomain, env, logger, timeoutMs, packageVersion, }) {
+    if (runtimePlatform === steps_1.BuildRuntimePlatform.LINUX) {
+        await ensureFfmpegInstalledOnceAsync({ runtimePlatform, env, logger });
+    }
     return await startWebPreviewWithTunnelAsync(ctx, {
         baseDomain,
         env,
@@ -645,7 +690,7 @@ async function startDeviceWebPreviewWithTunnelAsync(ctx, { runtimePlatform, ...o
         case steps_1.BuildRuntimePlatform.DARWIN:
             return await startServeSimWithTunnelAsync(ctx, options);
         case steps_1.BuildRuntimePlatform.LINUX:
-            return await startExpoDeviceHubWithTunnelAsync(ctx, options);
+            return await startExpoDeviceHubWithTunnelAsync(ctx, { ...options, runtimePlatform });
     }
 }
 async function startNgrokTunnelAsync({ port, subdomainPrefix, baseDomain, authtoken, rewriteHostHeader, logger, }) {

package/dist/steps/utils/serveSimMetricsRecorder.d.ts

@@ -1,7 +1,9 @@
 import { type bunyan } from '@expo/logger';
+export declare const SERVE_SIM_STATE_DIR: string;
 type ServeSimServer = {
     udid: string;
     url: string;
+    token?: string;
 };
 export declare namespace ServeSimMetricsRecorder {
     function startAsync({ logger, stateDir, pollIntervalMs, }: {
@@ -18,8 +20,9 @@ export declare namespace ServeSimMetricsRecorder {
     }[]>;
 }
 export declare function readServeSimServersAsync(stateDir: string): Promise<ServeSimServer[]>;
-export declare function streamServeSimMetricsToFileAsync({ serveSimUrl, filePath, signal, logger, }: {
+export declare function streamServeSimMetricsToFileAsync({ serveSimUrl, serveSimToken, filePath, signal, logger, }: {
     serveSimUrl: string;
+    serveSimToken?: string;
     filePath: string;
     signal: AbortSignal;
     logger: bunyan;

package/dist/steps/utils/serveSimMetricsRecorder.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServeSimMetricsRecorder = void 0;
+exports.ServeSimMetricsRecorder = exports.SERVE_SIM_STATE_DIR = void 0;
 exports.readServeSimServersAsync = readServeSimServersAsync;
 exports.streamServeSimMetricsToFileAsync = streamServeSimMetricsToFileAsync;
 const node_fetch_1 = __importDefault(require("node-fetch"));
@@ -18,11 +18,11 @@ const POLL_INTERVAL_MS = 2_000;
 const MAX_CONSECUTIVE_STREAM_FAILURES_PER_DEVICE = 10;
 const END_STREAM_TIMEOUT_MS = 2_000;
 // serve-sim's own per-device registry while serving: `${tmpdir}/serve-sim/server-<udid>.json`.
-const SERVE_SIM_STATE_DIR = node_path_1.default.join(node_os_1.default.tmpdir(), 'serve-sim');
+exports.SERVE_SIM_STATE_DIR = node_path_1.default.join(node_os_1.default.tmpdir(), 'serve-sim');
 let activeSession = null;
 var ServeSimMetricsRecorder;
 (function (ServeSimMetricsRecorder) {
-    async function startAsync({ logger, stateDir = SERVE_SIM_STATE_DIR, pollIntervalMs = POLL_INTERVAL_MS, }) {
+    async function startAsync({ logger, stateDir = exports.SERVE_SIM_STATE_DIR, pollIntervalMs = POLL_INTERVAL_MS, }) {
         if (activeSession) {
             logger.info('serve-sim metrics polling is already running.');
             return;
@@ -101,6 +101,7 @@ async function pollServeSimMetricsAsync(session) {
             logger.info(`Collecting serve-sim metrics for ${server.udid}.`);
             const donePromise = streamServeSimMetricsToFileAsync({
                 serveSimUrl: server.url,
+                serveSimToken: server.token,
                 filePath,
                 signal: streamSignal,
                 logger,
@@ -140,7 +141,11 @@ async function readServeSimServersAsync(stateDir) {
         try {
             const state = JSON.parse(await (0, promises_1.readFile)(node_path_1.default.join(stateDir, entry), 'utf-8'));
             if (typeof state.device === 'string' && typeof state.url === 'string') {
-                servers.push({ udid: state.device, url: state.url });
+                servers.push({
+                    udid: state.device,
+                    url: state.url,
+                    ...(typeof state.token === 'string' ? { token: state.token } : {}),
+                });
             }
         }
         catch {
@@ -149,7 +154,7 @@ async function readServeSimServersAsync(stateDir) {
     }
     return servers;
 }
-async function streamServeSimMetricsToFileAsync({ serveSimUrl, filePath, signal, logger, }) {
+async function streamServeSimMetricsToFileAsync({ serveSimUrl, serveSimToken, filePath, signal, logger, }) {
     const file = (0, node_fs_1.createWriteStream)(filePath, { flags: 'a' });
     file.on('error', err => {
         logger.warn({ err }, `serve-sim metrics file write failed for ${filePath}.`);
@@ -157,7 +162,10 @@ async function streamServeSimMetricsToFileAsync({ serveSimUrl, filePath, signal,
     let receivedData = false;
     let metadata;
     try {
-        const response = await (0, node_fetch_1.default)(new URL('/metrics', serveSimUrl).toString(), { signal });
+        const response = await (0, node_fetch_1.default)(new URL('/metrics', serveSimUrl).toString(), {
+            signal,
+            ...(serveSimToken ? { headers: { Authorization: `Bearer ${serveSimToken}` } } : {}),
+        });
         if (!response.ok || !response.body) {
             logger.warn(`serve-sim /metrics responded ${response.status} for ${serveSimUrl}.`);
             return { receivedData, metadata };

package/dist/utils/AndroidEmulatorUtils.d.ts

@@ -21,10 +21,13 @@ export declare namespace AndroidEmulatorUtils {
         deviceName: AndroidVirtualDeviceName;
         env: NodeJS.ProcessEnv;
     }): Promise<AndroidDeviceSerialId | null>;
-    function createAsync({ deviceName, systemImagePackage, deviceIdentifier, env, logger, }: {
+    function createAsync({ deviceName, systemImagePackage, deviceIdentifier, lcdWidth, lcdHeight, lcdDensity, env, logger, }: {
         deviceName: AndroidVirtualDeviceName;
         systemImagePackage: string;
         deviceIdentifier: AndroidDeviceName | null;
+        lcdWidth: number | null;
+        lcdHeight: number | null;
+        lcdDensity: number | null;
         env: NodeJS.ProcessEnv;
         logger: bunyan;
     }): Promise<void>;

package/dist/utils/AndroidEmulatorUtils.js

@@ -68,7 +68,7 @@ var AndroidEmulatorUtils;
         return null;
     }
     AndroidEmulatorUtils.getSerialIdAsync = getSerialIdAsync;
-    async function createAsync({ deviceName, systemImagePackage, deviceIdentifier, env, logger, }) {
+    async function createAsync({ deviceName, systemImagePackage, deviceIdentifier, lcdWidth, lcdHeight, lcdDensity, env, logger, }) {
         const avdManager = (0, turtle_spawn_1.default)('avdmanager', [
             'create',
             'avd',
@@ -121,6 +121,10 @@ var AndroidEmulatorUtils;
                     }
                 }
             }
+            if (lcdWidth !== null && lcdHeight !== null && lcdDensity !== null) {
+                logger.info(`Setting screen resolution to ${lcdWidth}x${lcdHeight} and density to ${lcdDensity} ppi.`);
+                configIniFileContent = `${configIniFileContent}\nhw.lcd.height=${lcdHeight}\nhw.lcd.width=${lcdWidth}\nhw.lcd.density=${lcdDensity}\n`;
+            }
             const shouldAdjustHeapSize = env.ANDROID_EMULATOR_ADJUST_HEAP_SIZE !== 'false' &&
                 env.ANDROID_EMULATOR_ADJUST_HEAP_SIZE !== '0';
             if (shouldAdjustHeapSize) {

package/dist/utils/logPhase.d.ts

@@ -0,0 +1,2 @@
+import { type bunyan } from '@expo/logger';
+export declare function withLogPhaseAsync<T>(logger: bunyan, name: string, fn: (logger: bunyan) => Promise<T>): Promise<T>;

package/dist/utils/logPhase.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withLogPhaseAsync = withLogPhaseAsync;
+const eas_build_job_1 = require("@expo/eas-build-job");
+const steps_1 = require("@expo/steps");
+async function withLogPhaseAsync(logger, name, fn) {
+    const phaseLogger = logger.child({
+        phase: eas_build_job_1.BuildPhase.CUSTOM,
+        buildStepId: steps_1.BuildStep.getNewId(),
+        buildStepDisplayName: name,
+    });
+    phaseLogger.info({ marker: eas_build_job_1.LogMarker.START_PHASE }, `Start phase: ${name}`);
+    try {
+        const result = await fn(phaseLogger);
+        phaseLogger.info({ marker: eas_build_job_1.LogMarker.END_PHASE, result: eas_build_job_1.BuildPhaseResult.SUCCESS }, `End phase: ${name}`);
+        return result;
+    }
+    catch (error) {
+        phaseLogger.info({ marker: eas_build_job_1.LogMarker.END_PHASE, result: eas_build_job_1.BuildPhaseResult.FAIL }, `End phase: ${name}`);
+        throw error;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "23.2.0",
+  "version": "24.1.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -39,17 +39,17 @@
   "dependencies": {
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
-    "@expo/downloader": "23.0.0",
-    "@expo/eas-build-job": "23.1.0",
+    "@expo/downloader": "24.0.0",
+    "@expo/eas-build-job": "24.0.0",
     "@expo/env": "^0.4.0",
-    "@expo/logger": "23.1.0",
+    "@expo/logger": "24.0.0",
     "@expo/package-manager": "1.9.10",
     "@expo/plist": "^0.3.5",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "23.1.0",
-    "@expo/template-file": "23.0.0",
-    "@expo/turtle-spawn": "23.1.0",
+    "@expo/steps": "24.0.0",
+    "@expo/template-file": "24.0.0",
+    "@expo/turtle-spawn": "24.0.0",
     "@expo/xcpretty": "^4.3.1",
     "@ngrok/ngrok": "1.7.0",
     "@sentry/node": "7.77.0",
@@ -102,5 +102,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "74292d2ace404759ab8936d5aa1369e15d4b4f9d"
+  "gitHead": "8373ae353ca615ba2170eac2399f7592ad72d36a"
 }