@expo/build-tools 24.0.0 → 24.1.0

package/dist/steps/utils/remoteDeviceRunSession.js

@@ -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';
@@ -510,6 +513,7 @@ function createServeSimArgs({ port, turnArgs = [], metricsCorsArgs = [], package
         String(port),
         '--host',
         WEB_PREVIEW_HOST,
+        '--require-token',
         '--transport',
         'webrtc',
         '--webrtc-codec',
@@ -586,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;
@@ -596,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 });
@@ -607,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',
@@ -617,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) {
@@ -632,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, {
@@ -642,6 +657,18 @@ 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, { runtimePlatform, baseDomain, env, logger, timeoutMs, packageVersion, }) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "24.0.0",
+  "version": "24.1.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -102,5 +102,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "5409c03d58c50b80e4ec9d5ca40f2fbdfaba9aa0"
+  "gitHead": "8373ae353ca615ba2170eac2399f7592ad72d36a"
 }