@expo/build-tools 20.2.0 → 20.3.0

package/dist/steps/functions/startArgentRemoteSession.d.ts

@@ -1,3 +1,8 @@
+import { type bunyan } from '@expo/logger';
 import { BuildFunction } from '@expo/steps';
 import { CustomBuildContext } from '../../customBuildContext';
 export declare function createStartArgentRemoteSessionBuildFunction(ctx: CustomBuildContext): BuildFunction;
+export declare function warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger, }: {
+    packageVersion: string | undefined;
+    logger: bunyan;
+}): void;

package/dist/steps/functions/startArgentRemoteSession.js

@@ -4,19 +4,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartArgentRemoteSessionBuildFunction = createStartArgentRemoteSessionBuildFunction;
+exports.warnIfArgentPackageVersionCannotBeVerified = warnIfArgentPackageVersionCannotBeVerified;
 const eas_build_job_1 = require("@expo/eas-build-job");
 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 semver_1 = __importDefault(require("semver"));
 const zod_1 = require("zod");
 const remoteDeviceRunSession_1 = require("../utils/remoteDeviceRunSession");
 const ARGENT_PACKAGE_NAME = '@swmansion/argent';
+const MIN_ARGENT_REMOTE_SESSION_VERSION = '0.11.0';
 const ARGENT_STATE_FILE = node_path_1.default.join(node_os_1.default.homedir(), '.argent', 'tool-server.json');
 const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
 const STARTUP_TIMEOUT_MS = 60_000;
-const ArgentToolServerStateSchema = zod_1.z.object({ port: zod_1.z.number() });
+const ArgentToolServerStateSchema = zod_1.z.object({
+    port: zod_1.z.number(),
+    token: zod_1.z.string().optional(),
+});
 function createStartArgentRemoteSessionBuildFunction(ctx) {
     return new steps_1.BuildFunction({
         namespace: 'eas',
@@ -39,6 +45,7 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
             const ngrokTunnelDomain = (0, remoteDeviceRunSession_1.getNgrokTunnelDomainOrThrow)(env);
             const ngrokAuthtoken = (0, remoteDeviceRunSession_1.getNgrokAuthtokenOrThrow)(env);
             const packageVersion = inputs.package_version.value;
+            warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger });
             const versionSpec = packageVersion ?? 'latest';
             const { runtimePlatform } = global;
             logger.info(`Starting argent remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`);
@@ -48,32 +55,48 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
             }
             // Stale state from a previous run would mask the new server's port.
             await node_fs_1.default.promises.rm(ARGENT_STATE_FILE, { force: true });
-            logger.info(`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} via bunx.`);
-            // `argent mcp` is the public entry that triggers @argent/tools-client
-            // to spawn the tool-server detached + unref'd, so the tool-server
-            // outlives this MCP process. ARGENT_IDLE_TIMEOUT_MINUTES=0 disables the
-            // 30-min idle shutdown that would otherwise tear the tunnel down.
-            (0, remoteDeviceRunSession_1.spawnDetached)({
+            logger.info(`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via bunx.`);
+            const argentServer = (0, remoteDeviceRunSession_1.spawnDetached)({
                 command: 'bunx',
-                args: [`${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'mcp'],
-                env: { ...env, ARGENT_IDLE_TIMEOUT_MINUTES: '0' },
+                args: [
+                    `${ARGENT_PACKAGE_NAME}@${versionSpec}`,
+                    'server',
+                    'start',
+                    '--port',
+                    '0',
+                    '--idle-timeout',
+                    '0',
+                    '--detach',
+                ],
+                env,
             });
             logger.info(`Waiting for argent tool-server state at ${ARGENT_STATE_FILE}.`);
-            const { port: toolServerPort } = await (0, remoteDeviceRunSession_1.waitForFileAsync)({
-                filePath: ARGENT_STATE_FILE,
-                timeoutMs: STARTUP_TIMEOUT_MS,
-                description: 'argent tool-server state',
-                parse: parseArgentToolServerState,
-            });
+            let toolServerPort;
+            let toolServerToken;
+            try {
+                const toolServerState = await (0, remoteDeviceRunSession_1.waitForFileAsync)({
+                    filePath: ARGENT_STATE_FILE,
+                    timeoutMs: STARTUP_TIMEOUT_MS,
+                    description: 'argent tool-server state',
+                    parse: parseArgentToolServerState,
+                });
+                toolServerPort = toolServerState.port;
+                toolServerToken = toolServerState.token;
+            }
+            catch (err) {
+                const output = argentServer.getOutput();
+                throw new eas_build_job_1.SystemError(`${err instanceof Error ? err.message : `Timed out waiting for argent tool-server state.`}${output ? `\nArgent tool-server output:\n${output}` : ''}`);
+            }
             logger.info(`Argent tool-server is listening on port ${toolServerPort}.`);
-            const toolsUrl = await (0, remoteDeviceRunSession_1.startNgrokTunnelAsync)({
+            const publicToolsUrl = await (0, remoteDeviceRunSession_1.startNgrokTunnelAsync)({
                 port: toolServerPort,
                 subdomainPrefix: 'argent',
                 baseDomain: ngrokTunnelDomain,
                 authtoken: ngrokAuthtoken,
+                rewriteHostHeader: true,
                 logger,
             });
-            logger.info(`Tunnel is ready at ${toolsUrl}.`);
+            logger.info(`Tunnel is ready at ${publicToolsUrl}.`);
             // serve-sim is iOS-only — Android sessions go without a preview URL.
             let webPreviewUrl;
             if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
@@ -90,7 +113,8 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
                 ctx,
                 deviceRunSessionId,
                 remoteConfig: {
-                    toolsUrl,
+                    toolsUrl: publicToolsUrl,
+                    ...(toolServerToken ? { toolsAuthToken: toolServerToken } : {}),
                     ...(webPreviewUrl ? { webPreviewUrl } : {}),
                 },
                 logger,
@@ -102,6 +126,23 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
         },
     });
 }
+function warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger, }) {
+    if (!packageVersion || packageVersion === 'latest') {
+        return;
+    }
+    const validVersion = semver_1.default.valid(packageVersion);
+    if (!validVersion) {
+        logger.warn(`Argent remote simulator sessions require ${ARGENT_PACKAGE_NAME}@${MIN_ARGENT_REMOTE_SESSION_VERSION} or newer, ` +
+            `but package_version "${packageVersion}" is not an exact semver version that EAS can verify. ` +
+            `Continuing and letting bunx resolve it.`);
+        return;
+    }
+    if (semver_1.default.lt(validVersion, MIN_ARGENT_REMOTE_SESSION_VERSION)) {
+        throw new eas_build_job_1.SystemError(`Argent remote simulator sessions require ${ARGENT_PACKAGE_NAME}@${MIN_ARGENT_REMOTE_SESSION_VERSION} or newer. ` +
+            `The requested package_version "${packageVersion}" is too old for the EAS remote-session API. ` +
+            `Use "latest" or pass an exact version >= ${MIN_ARGENT_REMOTE_SESSION_VERSION}.`);
+    }
+}
 function parseArgentToolServerState(raw) {
     const result = ArgentToolServerStateSchema.safeParse(JSON.parse(raw));
     if (!result.success) {

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

@@ -55,11 +55,12 @@ export declare function startServeSimWithTunnelAsync(ctx: CustomBuildContext, {
     previewUrl: string;
     streamUrl: string;
 }>;
-export declare function startNgrokTunnelAsync({ port, subdomainPrefix, baseDomain, authtoken, logger, }: {
+export declare function startNgrokTunnelAsync({ port, subdomainPrefix, baseDomain, authtoken, rewriteHostHeader, logger, }: {
     port: number;
     subdomainPrefix: string;
     baseDomain: string;
     authtoken: string;
+    rewriteHostHeader?: boolean;
     logger: bunyan;
 }): Promise<string>;
 export declare function waitForFileAsync<T>({ filePath, timeoutMs, description, parse, }: {

package/dist/steps/utils/remoteDeviceRunSession.js

@@ -231,12 +231,17 @@ function matchLabeledUrl({ output, label, baseDomain, }) {
     const match = labelPattern.exec(output);
     return match ? match[1] : null;
 }
-async function startNgrokTunnelAsync({ port, subdomainPrefix, baseDomain, authtoken, logger, }) {
+async function startNgrokTunnelAsync({ port, subdomainPrefix, baseDomain, authtoken, rewriteHostHeader, logger, }) {
     const domain = `${subdomainPrefix}-${(0, node_crypto_1.randomBytes)(8).toString('hex')}.${baseDomain}`;
     logger.info(`Starting ngrok tunnel ${domain} -> http://localhost:${port}.`);
     // Run the ngrok agent in-process via the SDK; it keeps the session alive until
     // the process exits, and the step blocks forever to hold it open.
-    const listener = await ngrok.forward({ addr: port, authtoken, domain });
+    const listener = await ngrok.forward({
+        addr: port,
+        authtoken,
+        domain,
+        ...(rewriteHostHeader ? { request_header_add: [`Host:localhost:${port}`] } : {}),
+    });
     const url = listener.url();
     if (!url) {
         throw new eas_build_job_1.SystemError(`ngrok tunnel for ${domain} did not return a public URL.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "20.2.0",
+  "version": "20.3.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -100,5 +100,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "203e9997eebafcbddc600285f6a809afb4a93a74"
+  "gitHead": "490457976c996d06447e6442fbd1aec1ace09f1b"
 }