@expo/build-tools 19.0.3 → 19.0.6

package/dist/ios/pod.js

@@ -8,7 +8,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
-const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.21';
+const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.26';
 const PRECOMPILED_MODULES_BASE_URL = 'https://storage.googleapis.com/eas-build-precompiled-modules/';
 async function installPods(ctx, { infoCallbackFn }) {
     const iosDir = path_1.default.join(ctx.getReactNativeProjectDirectory(), 'ios');

package/dist/steps/easFunctions.js

@@ -39,6 +39,7 @@ const saveCache_1 = require("./functions/saveCache");
 const sendSlackMessage_1 = require("./functions/sendSlackMessage");
 const startAgentDeviceRemoteSession_1 = require("./functions/startAgentDeviceRemoteSession");
 const startAndroidEmulator_1 = require("./functions/startAndroidEmulator");
+const startArgentRemoteSession_1 = require("./functions/startArgentRemoteSession");
 const startCuttlefishDevice_1 = require("./functions/startCuttlefishDevice");
 const startIosSimulator_1 = require("./functions/startIosSimulator");
 const startServeSimRemoteSession_1 = require("./functions/startServeSimRemoteSession");
@@ -77,6 +78,7 @@ function getEasFunctions(ctx) {
         (0, runFastlane_1.runFastlaneFunction)(),
         (0, parseXcactivitylog_1.parseXcactivitylogFunction)(),
         (0, startAgentDeviceRemoteSession_1.createStartAgentDeviceRemoteSessionBuildFunction)(ctx),
+        (0, startArgentRemoteSession_1.createStartArgentRemoteSessionBuildFunction)(ctx),
         (0, startAndroidEmulator_1.createStartAndroidEmulatorBuildFunction)(),
         (0, startCuttlefishDevice_1.createStartCuttlefishDeviceBuildFunction)(),
         (0, startIosSimulator_1.createStartIosSimulatorBuildFunction)(),

package/dist/steps/functions/startAgentDeviceRemoteSession.js

@@ -7,16 +7,13 @@ exports.createStartAgentDeviceRemoteSessionBuildFunction = createStartAgentDevic
 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 retry_1 = require("../../utils/retry");
 const remoteDeviceRunSession_1 = require("../utils/remoteDeviceRunSession");
 const AGENT_DEVICE_REPO_URL = 'https://github.com/callstackincubator/agent-device.git';
 const SRC_DIR = '/tmp/agent-device-src';
 const DAEMON_JSON_PATH = node_path_1.default.join(node_os_1.default.homedir(), '.agent-device', 'daemon.json');
 const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
-const CLOUDFLARED_LINUX_INSTALL_PATH = '/usr/local/bin/cloudflared';
 const STARTUP_TIMEOUT_MS = 60_000;
 function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
     return new steps_1.BuildFunction({
@@ -44,7 +41,7 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
                 await (0, turtle_spawn_1.default)('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], { env, logger });
             }
             logger.info('Ensuring cloudflared is installed.');
-            const cloudflaredCommand = await ensureCloudflaredInstalledAsync({
+            const cloudflaredCommand = await (0, remoteDeviceRunSession_1.ensureCloudflaredInstalledAsync)({
                 runtimePlatform,
                 env,
                 logger,
@@ -67,12 +64,12 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
                 env: { ...env, AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' },
             });
             logger.info(`Waiting for daemon credentials at ${DAEMON_JSON_PATH}.`);
-            await waitForFileAsync({
+            const { port: daemonPort, token: daemonToken } = await (0, remoteDeviceRunSession_1.waitForFileAsync)({
                 filePath: DAEMON_JSON_PATH,
                 timeoutMs: STARTUP_TIMEOUT_MS,
-                description: 'agent-device daemon',
+                description: 'agent-device daemon credentials',
+                parse: parseDaemonInfo,
             });
-            const { port: daemonPort, token: daemonToken } = readDaemonInfo(DAEMON_JSON_PATH);
             logger.info(`Daemon is listening on port ${daemonPort}; loaded auth token.`);
             logger.info(`Starting cloudflared tunnel to http://localhost:${daemonPort}.`);
             const cloudflared = (0, remoteDeviceRunSession_1.spawnDetached)({
@@ -81,7 +78,7 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
                 env,
             });
             logger.info('Waiting for a public tunnel URL.');
-            const agentDeviceRemoteSessionUrl = await waitForMatchInOutputAsync({
+            const agentDeviceRemoteSessionUrl = await (0, remoteDeviceRunSession_1.waitForMatchInOutputAsync)({
                 process: cloudflared,
                 pattern: /https:\/\/[a-z0-9-]+\.trycloudflare\.com/,
                 timeoutMs: STARTUP_TIMEOUT_MS,
@@ -117,44 +114,6 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
         },
     });
 }
-async function ensureCloudflaredInstalledAsync({ runtimePlatform, env, logger, }) {
-    if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
-        await (0, remoteDeviceRunSession_1.ensureBrewPackageInstalledAsync)({ name: 'cloudflared', env, logger });
-        return 'cloudflared';
-    }
-    if (await isCommandAvailableAsync({ command: 'cloudflared', env })) {
-        return 'cloudflared';
-    }
-    const cloudflaredArch = cloudflaredLinuxArchForNodeArch(node_os_1.default.arch());
-    const downloadUrl = `https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${cloudflaredArch}`;
-    logger.info(`Downloading cloudflared from ${downloadUrl} to ${CLOUDFLARED_LINUX_INSTALL_PATH}.`);
-    await (0, turtle_spawn_1.default)('sudo', ['curl', '-fsSL', '-o', CLOUDFLARED_LINUX_INSTALL_PATH, downloadUrl], {
-        env,
-        logger,
-    });
-    await (0, turtle_spawn_1.default)('sudo', ['chmod', '+x', CLOUDFLARED_LINUX_INSTALL_PATH], { env, logger });
-    // Return the absolute install path so the tunnel command works even when
-    // /usr/local/bin is not on the step's PATH.
-    return CLOUDFLARED_LINUX_INSTALL_PATH;
-}
-function cloudflaredLinuxArchForNodeArch(arch) {
-    if (arch === 'x64') {
-        return 'amd64';
-    }
-    if (arch === 'arm64') {
-        return 'arm64';
-    }
-    throw new eas_build_job_1.SystemError(`Unsupported architecture for cloudflared on Linux: "${arch}". Expected "x64" or "arm64".`);
-}
-async function isCommandAvailableAsync({ command, env, }) {
-    try {
-        await (0, turtle_spawn_1.default)('bash', ['-c', `command -v ${command}`], { env, ignoreStdio: true });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 async function cloneAgentDeviceAsync({ packageVersion, env, logger, }) {
     const branchArgs = packageVersion ? ['--branch', `v${packageVersion}`] : [];
     await (0, turtle_spawn_1.default)('git', ['clone', '--depth', '1', ...branchArgs, AGENT_DEVICE_REPO_URL, SRC_DIR], {
@@ -162,39 +121,13 @@ async function cloneAgentDeviceAsync({ packageVersion, env, logger, }) {
         logger,
     });
 }
-async function waitForMatchInOutputAsync({ process, pattern, timeoutMs, description, }) {
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-        const match = pattern.exec(process.getOutput());
-        if (match) {
-            return match[1] ?? match[0];
-        }
-        await (0, retry_1.sleepAsync)(1_000);
-    }
-    throw new eas_build_job_1.SystemError(`Timed out waiting for ${description} to start. Last output:\n${process.getOutput() || '<empty>'}`);
-}
-async function waitForFileAsync({ filePath, timeoutMs, description, }) {
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-        try {
-            await node_fs_1.default.promises.access(filePath);
-            return;
-        }
-        catch {
-            // not yet; keep polling
-        }
-        await (0, retry_1.sleepAsync)(1_000);
-    }
-    throw new eas_build_job_1.SystemError(`Timed out waiting for ${description} to write ${filePath}.`);
-}
-function readDaemonInfo(filePath) {
-    const raw = node_fs_1.default.readFileSync(filePath, 'utf8');
+function parseDaemonInfo(raw) {
     const parsed = JSON.parse(raw);
     if (!parsed ||
         typeof parsed !== 'object' ||
         typeof parsed.httpPort !== 'number' ||
         typeof parsed.token !== 'string') {
-        throw new eas_build_job_1.SystemError(`Expected ${filePath} to contain { "httpPort": <number>, "token": "..." }.`);
+        throw new eas_build_job_1.SystemError('Expected daemon credentials to contain { "httpPort": <number>, "token": "..." }.');
     }
     const { httpPort, token } = parsed;
     return { port: httpPort, token };

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

@@ -0,0 +1,3 @@
+import { BuildFunction } from '@expo/steps';
+import { CustomBuildContext } from '../../customBuildContext';
+export declare function createStartArgentRemoteSessionBuildFunction(ctx: CustomBuildContext): BuildFunction;

package/dist/steps/functions/startArgentRemoteSession.js

@@ -0,0 +1,119 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createStartArgentRemoteSessionBuildFunction = createStartArgentRemoteSessionBuildFunction;
+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 zod_1 = require("zod");
+const remoteDeviceRunSession_1 = require("../utils/remoteDeviceRunSession");
+const ARGENT_PACKAGE_NAME = '@swmansion/argent';
+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() });
+function createStartArgentRemoteSessionBuildFunction(ctx) {
+    return new steps_1.BuildFunction({
+        namespace: 'eas',
+        id: 'start_argent_remote_session',
+        name: 'Start argent remote session',
+        __metricsId: 'eas/start_argent_remote_session',
+        inputProviders: [
+            steps_1.BuildStepInput.createProvider({
+                id: 'package_version',
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
+            }),
+        ],
+        fn: async ({ logger, global }, { inputs, env }) => {
+            // Fail fast before any expensive setup if the orchestrator-injected
+            // DEVICE_RUN_SESSION_ID env var is missing — without it we cannot
+            // report the remote config back to the API server.
+            const deviceRunSessionId = (0, remoteDeviceRunSession_1.getDeviceRunSessionIdOrThrow)(env);
+            const packageVersion = inputs.package_version.value;
+            const versionSpec = packageVersion ?? 'latest';
+            const { runtimePlatform } = global;
+            logger.info(`Starting argent remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`);
+            if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
+                logger.info(`Selecting Xcode developer directory: ${XCODE_DEVELOPER_DIR}.`);
+                await (0, turtle_spawn_1.default)('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], { env, logger });
+            }
+            logger.info('Ensuring cloudflared is installed.');
+            const cloudflaredCommand = await (0, remoteDeviceRunSession_1.ensureCloudflaredInstalledAsync)({
+                runtimePlatform,
+                env,
+                logger,
+            });
+            // 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)({
+                command: 'bunx',
+                args: [`${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'mcp'],
+                env: { ...env, ARGENT_IDLE_TIMEOUT_MINUTES: '0' },
+            });
+            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,
+            });
+            logger.info(`Argent tool-server is listening on port ${toolServerPort}.`);
+            logger.info(`Starting cloudflared tunnel to http://localhost:${toolServerPort}.`);
+            const cloudflared = (0, remoteDeviceRunSession_1.spawnDetached)({
+                command: cloudflaredCommand,
+                args: ['tunnel', '--url', `http://localhost:${toolServerPort}`],
+                env,
+            });
+            logger.info('Waiting for a public tunnel URL.');
+            const toolsUrl = await (0, remoteDeviceRunSession_1.waitForMatchInOutputAsync)({
+                process: cloudflared,
+                pattern: /https:\/\/[a-z0-9-]+\.trycloudflare\.com/,
+                timeoutMs: STARTUP_TIMEOUT_MS,
+                description: 'cloudflared tunnel',
+            });
+            logger.info(`Tunnel is ready at ${toolsUrl}.`);
+            // serve-sim is iOS-only — Android sessions go without a preview URL.
+            let webPreviewUrl;
+            if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
+                const serveSim = await (0, remoteDeviceRunSession_1.startServeSimWithTunnelAsync)({
+                    env,
+                    logger,
+                    timeoutMs: STARTUP_TIMEOUT_MS,
+                });
+                webPreviewUrl = serveSim.previewUrl;
+                logger.info(`Web preview URL: ${webPreviewUrl}`);
+            }
+            await (0, remoteDeviceRunSession_1.uploadRemoteSessionConfigAsync)({
+                ctx,
+                deviceRunSessionId,
+                remoteConfig: {
+                    toolsUrl,
+                    ...(webPreviewUrl ? { webPreviewUrl } : {}),
+                },
+                logger,
+            });
+            logger.info('Remote session is live. Keeping the job alive until the session is stopped.');
+            // Keep the turtle job alive so the tool-server and tunnel stay reachable
+            // until stopDeviceRunSession cancels the run.
+            await new Promise(() => { });
+        },
+    });
+}
+function parseArgentToolServerState(raw) {
+    const result = ArgentToolServerStateSchema.safeParse(JSON.parse(raw));
+    if (!result.success) {
+        throw new eas_build_job_1.SystemError(`Expected tool-server state to contain { "port": <number>, ... }: ${result.error.message}`);
+    }
+    return result.data;
+}

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

@@ -1,5 +1,5 @@
 import { bunyan } from '@expo/logger';
-import { BuildStepEnv } from '@expo/steps';
+import { BuildRuntimePlatform, BuildStepEnv } from '@expo/steps';
 import { CustomBuildContext } from '../../customBuildContext';
 export declare function getDeviceRunSessionIdOrThrow(env: BuildStepEnv): string;
 export declare function uploadRemoteSessionConfigAsync({ ctx, deviceRunSessionId, remoteConfig, logger, }: {
@@ -30,3 +30,20 @@ export declare function startServeSimWithTunnelAsync({ env, logger, timeoutMs, }
     previewUrl: string;
     streamUrl: string;
 }>;
+export declare function ensureCloudflaredInstalledAsync({ runtimePlatform, env, logger, }: {
+    runtimePlatform: BuildRuntimePlatform;
+    env: BuildStepEnv;
+    logger: bunyan;
+}): Promise<string>;
+export declare function waitForMatchInOutputAsync({ process, pattern, timeoutMs, description, }: {
+    process: DetachedProcessHandle;
+    pattern: RegExp;
+    timeoutMs: number;
+    description: string;
+}): Promise<string>;
+export declare function waitForFileAsync<T>({ filePath, timeoutMs, description, parse, }: {
+    filePath: string;
+    timeoutMs: number;
+    description: string;
+    parse: (raw: string) => T;
+}): Promise<T>;

package/dist/steps/utils/remoteDeviceRunSession.js

@@ -8,11 +8,18 @@ exports.uploadRemoteSessionConfigAsync = uploadRemoteSessionConfigAsync;
 exports.ensureBrewPackageInstalledAsync = ensureBrewPackageInstalledAsync;
 exports.spawnDetached = spawnDetached;
 exports.startServeSimWithTunnelAsync = startServeSimWithTunnelAsync;
+exports.ensureCloudflaredInstalledAsync = ensureCloudflaredInstalledAsync;
+exports.waitForMatchInOutputAsync = waitForMatchInOutputAsync;
+exports.waitForFileAsync = waitForFileAsync;
 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 gql_tada_1 = require("gql.tada");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
 const retry_1 = require("../../utils/retry");
 const TRYCLOUDFLARE_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/;
+const CLOUDFLARED_LINUX_INSTALL_PATH = '/usr/local/bin/cloudflared';
 const START_DEVICE_RUN_SESSION_MUTATION = (0, gql_tada_1.graphql)(`
   mutation StartDeviceRunSession($deviceRunSessionId: ID!, $remoteConfig: JSONObject!) {
     deviceRunSession {
@@ -100,3 +107,67 @@ function matchLabeledUrl(content, label) {
     const match = labelPattern.exec(content);
     return match ? match[1] : null;
 }
+async function ensureCloudflaredInstalledAsync({ runtimePlatform, env, logger, }) {
+    if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
+        await ensureBrewPackageInstalledAsync({ name: 'cloudflared', env, logger });
+        return 'cloudflared';
+    }
+    if (await isCommandAvailableAsync({ command: 'cloudflared', env })) {
+        return 'cloudflared';
+    }
+    const cloudflaredArch = cloudflaredLinuxArchForNodeArch(node_os_1.default.arch());
+    const downloadUrl = `https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${cloudflaredArch}`;
+    logger.info(`Downloading cloudflared from ${downloadUrl} to ${CLOUDFLARED_LINUX_INSTALL_PATH}.`);
+    await (0, turtle_spawn_1.default)('sudo', ['curl', '-fsSL', '-o', CLOUDFLARED_LINUX_INSTALL_PATH, downloadUrl], {
+        env,
+        logger,
+    });
+    await (0, turtle_spawn_1.default)('sudo', ['chmod', '+x', CLOUDFLARED_LINUX_INSTALL_PATH], { env, logger });
+    // Return the absolute install path so the tunnel command works even when
+    // /usr/local/bin is not on the step's PATH.
+    return CLOUDFLARED_LINUX_INSTALL_PATH;
+}
+function cloudflaredLinuxArchForNodeArch(arch) {
+    if (arch === 'x64') {
+        return 'amd64';
+    }
+    if (arch === 'arm64') {
+        return 'arm64';
+    }
+    throw new eas_build_job_1.SystemError(`Unsupported architecture for cloudflared on Linux: "${arch}". Expected "x64" or "arm64".`);
+}
+async function isCommandAvailableAsync({ command, env, }) {
+    try {
+        await (0, turtle_spawn_1.default)('bash', ['-c', `command -v ${command}`], { env, ignoreStdio: true });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function waitForMatchInOutputAsync({ process, pattern, timeoutMs, description, }) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        const match = pattern.exec(process.getOutput());
+        if (match) {
+            return match[1] ?? match[0];
+        }
+        await (0, retry_1.sleepAsync)(1_000);
+    }
+    throw new eas_build_job_1.SystemError(`Timed out waiting for ${description} to start. Last output:\n${process.getOutput() || '<empty>'}`);
+}
+async function waitForFileAsync({ filePath, timeoutMs, description, parse, }) {
+    const deadline = Date.now() + timeoutMs;
+    let lastError;
+    while (Date.now() < deadline) {
+        try {
+            const raw = await node_fs_1.default.promises.readFile(filePath, 'utf8');
+            return parse(raw);
+        }
+        catch (err) {
+            lastError = err;
+        }
+        await (0, retry_1.sleepAsync)(1_000);
+    }
+    throw new eas_build_job_1.SystemError(`Timed out waiting for ${description} to be ready at ${filePath}${lastError instanceof Error ? `: ${lastError.message}` : ''}.`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "19.0.3",
+  "version": "19.0.6",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -99,5 +99,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "503b62b73d2fa1fa40352a93f672fc91f288b602"
+  "gitHead": "1e9a0981a5a707543d7686f71540aa5d8f2d098b"
 }