@expo/build-tools 24.1.0 → 24.3.0

package/dist/common/git.d.ts

@@ -4,6 +4,7 @@ export declare function shallowCloneRepositoryAsync({ logger, archiveSource, des
     logger: bunyan;
     archiveSource: ArchiveSource & {
         type: ArchiveSourceType.GIT;
+        repositoryUrl: string;
     };
     destinationDirectory: string;
 }): Promise<void>;

package/dist/common/projectSources.js

@@ -19,28 +19,21 @@ const zod_1 = require("zod");
 const git_1 = require("./git");
 const turtleFetch_1 = require("../utils/turtleFetch");
 async function prepareProjectSourcesAsync(ctx, destinationDirectory) {
-    let projectArchive = ctx.job.projectArchive;
     if (ctx.isLocal) {
-        console.warn('Local build, skipping project archive refresh');
-    }
-    else {
-        const projectArchiveResult = await (0, results_1.asyncResult)(fetchProjectArchiveSourceAsync(ctx));
-        if (!projectArchiveResult.ok) {
-            throw new eas_build_job_1.SystemError('Failed to fetch project sources. Re-run the job.', {
-                cause: projectArchiveResult.reason,
-            });
+        if (ctx.job.projectArchive.type !== eas_build_job_1.ArchiveSourceType.PATH) {
+            throw new eas_build_job_1.SystemError(`Expected a PATH project source for a local build, received ${ctx.job.projectArchive.type}.`, { trackingCode: 'INVALID_LOCAL_PROJECT_SOURCE' });
         }
-        projectArchive = projectArchiveResult.value;
+        await prepareProjectSourcesLocallyAsync(ctx, ctx.job.projectArchive.path, destinationDirectory);
+        return { handled: true };
+    }
+    const projectArchiveResult = await (0, results_1.asyncResult)(fetchProjectArchiveSourceAsync(ctx));
+    if (!projectArchiveResult.ok) {
+        throw new eas_build_job_1.SystemError('Failed to fetch project sources. Re-run the job.', {
+            cause: projectArchiveResult.reason,
+        });
     }
+    const projectArchive = projectArchiveResult.value;
     switch (projectArchive.type) {
-        case eas_build_job_1.ArchiveSourceType.R2:
-        case eas_build_job_1.ArchiveSourceType.GCS: {
-            throw new Error('Remote project sources should be resolved earlier to URL');
-        }
-        case eas_build_job_1.ArchiveSourceType.PATH: {
-            await prepareProjectSourcesLocallyAsync(ctx, projectArchive.path, destinationDirectory); // used in eas build --local
-            return { handled: true };
-        }
         case eas_build_job_1.ArchiveSourceType.NONE: {
             // May be used in no-sources jobs like submission jobs.
             return { handled: true };
@@ -207,7 +200,20 @@ async function fetchProjectArchiveSourceAsync(ctx) {
     if (!jsonResult.ok) {
         throw new Error(`Expected JSON response from server (${response.status}): ${jsonResult.reason}`);
     }
-    const dataResult = zod_1.z.object({ data: eas_build_job_1.ArchiveSourceSchemaZ }).safeParse(jsonResult.value);
+    const dataResult = zod_1.z
+        .object({
+        data: zod_1.z.discriminatedUnion('type', [
+            zod_1.z.object({
+                type: zod_1.z.literal(eas_build_job_1.ArchiveSourceType.GIT),
+                repositoryUrl: zod_1.z.string().url(),
+                gitRef: zod_1.z.string().nullable(),
+                gitCommitHash: zod_1.z.string(),
+            }),
+            zod_1.z.object({ type: zod_1.z.literal(eas_build_job_1.ArchiveSourceType.URL), url: zod_1.z.string().url() }),
+            zod_1.z.object({ type: zod_1.z.literal(eas_build_job_1.ArchiveSourceType.NONE) }),
+        ]),
+    })
+        .safeParse(jsonResult.value);
     if (!dataResult.success) {
         throw new Error(`Unexpected data from server (${response.status}): ${zod_1.z.prettifyError(dataResult.error)}`);
     }

package/dist/steps/easFunctions.js

@@ -52,6 +52,7 @@ const startIosSimulatorRecordings_1 = require("./functions/startIosSimulatorReco
 const startLocalEgress_1 = require("./functions/startLocalEgress");
 const startWebPreviewRemoteSession_1 = require("./functions/startWebPreviewRemoteSession");
 const startServeSimMetrics_1 = require("./functions/startServeSimMetrics");
+const startSandbox_1 = require("./functions/startSandbox");
 const collectServeSimMetrics_1 = require("./functions/collectServeSimMetrics");
 const uploadArtifact_1 = require("./functions/uploadArtifact");
 const uploadDeviceRunSessionScreenRecordings_1 = require("./functions/uploadDeviceRunSessionScreenRecordings");
@@ -106,6 +107,7 @@ function getEasFunctions(ctx) {
         (0, uploadDeviceRunSessionScreenRecordings_1.createUploadDeviceRunSessionScreenRecordingsBuildFunction)(ctx),
         (0, startWebPreviewRemoteSession_1.createStartWebPreviewRemoteSessionBuildFunction)(ctx),
         (0, startServeSimMetrics_1.createStartServeSimMetricsBuildFunction)(),
+        (0, startSandbox_1.createStartSandboxBuildFunction)(ctx),
         (0, collectServeSimMetrics_1.createCollectServeSimMetricsBuildFunction)(ctx),
         (0, installMaestro_1.createInstallMaestroBuildFunction)(),
         (0, installPods_1.createInstallPodsBuildFunction)(),

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

@@ -0,0 +1,4 @@
+import { BuildFunction } from '@expo/steps';
+import { CustomBuildContext } from '../../customBuildContext';
+export declare function createStartSandboxBuildFunction(ctx: CustomBuildContext): BuildFunction;
+export declare function markSandboxReadyAsync(ctx: CustomBuildContext, sandboxId: string, signal?: AbortSignal): Promise<void>;

package/dist/steps/functions/startSandbox.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createStartSandboxBuildFunction = createStartSandboxBuildFunction;
+exports.markSandboxReadyAsync = markSandboxReadyAsync;
+const eas_build_job_1 = require("@expo/eas-build-job");
+const steps_1 = require("@expo/steps");
+const gql_tada_1 = require("gql.tada");
+const logPhase_1 = require("../../utils/logPhase");
+const sandboxDaemon_1 = require("../utils/sandboxDaemon");
+const MARK_SANDBOX_READY_MUTATION = (0, gql_tada_1.graphql)(`
+  mutation MarkSandboxReady($sandboxId: ID!) {
+    sandbox {
+      markSandboxReady(sandboxId: $sandboxId) {
+        id
+      }
+    }
+  }
+`);
+const RECONNECT_DELAY_MS = 1_000;
+const AWAIT_SANDBOX_STEP_NAME = 'Await sandbox completion';
+function createStartSandboxBuildFunction(ctx) {
+    return new steps_1.BuildFunction({
+        namespace: 'eas',
+        id: 'start_sandbox',
+        name: 'Start sandbox daemon',
+        __metricsId: 'eas/start_sandbox',
+        inputProviders: [
+            steps_1.BuildStepInput.createProvider({
+                id: 'sandbox_id',
+                required: true,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
+            }),
+        ],
+        fn: async (stepCtx, { inputs, signal }) => {
+            const sandboxToken = ctx.env.__EAS_SANDBOX_MCP_TOKEN;
+            if (!sandboxToken) {
+                throw new eas_build_job_1.SystemError('__EAS_SANDBOX_MCP_TOKEN is required to start the sandbox daemon.');
+            }
+            const mcpServerUrl = ctx.mcpServerUrl;
+            if (!mcpServerUrl) {
+                throw new eas_build_job_1.SystemError('MCP server URL is required to start the sandbox daemon.');
+            }
+            const sandboxId = String(inputs.sandbox_id.value);
+            const daemon = await (0, sandboxDaemon_1.startSandboxDaemonAsync)({
+                credential: sandboxToken,
+                serverUrl: mcpServerUrl,
+                reconnectDelayMs: RECONNECT_DELAY_MS,
+                logger: stepCtx.logger,
+                signal,
+            });
+            try {
+                await daemon.ready;
+                signal?.throwIfAborted();
+                await markSandboxReadyAsync(ctx, sandboxId, signal);
+                signal?.throwIfAborted();
+                stepCtx.logger.info('Sandbox daemon started.');
+                await (0, logPhase_1.withLogPhaseAsync)(stepCtx.logger, AWAIT_SANDBOX_STEP_NAME, async () => {
+                    await waitForCancellationAsync(signal);
+                });
+            }
+            finally {
+                await daemon.stopAsync();
+            }
+        },
+    });
+}
+async function markSandboxReadyAsync(ctx, sandboxId, signal) {
+    signal?.throwIfAborted();
+    const result = await ctx.graphqlClient
+        .mutation(MARK_SANDBOX_READY_MUTATION, { sandboxId }, signal
+        ? {
+            fetch: (input, init) => fetch(input, {
+                ...init,
+                signal: init?.signal ? AbortSignal.any([signal, init.signal]) : signal,
+            }),
+        }
+        : undefined)
+        .toPromise();
+    signal?.throwIfAborted();
+    if (result.error) {
+        throw new eas_build_job_1.SystemError(`Failed to mark sandbox ${sandboxId} as ready.`, {
+            cause: result.error,
+        });
+    }
+}
+async function waitForCancellationAsync(signal) {
+    if (signal?.aborted) {
+        return;
+    }
+    await new Promise(resolve => {
+        signal?.addEventListener('abort', () => resolve(), { once: true });
+    });
+}

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

@@ -0,0 +1,13 @@
+import { type bunyan } from '@expo/logger';
+export interface SandboxDaemonOptions {
+    credential: string;
+    serverUrl: string;
+    reconnectDelayMs: number;
+    logger: bunyan;
+    signal?: AbortSignal;
+}
+export interface SandboxDaemon {
+    ready: Promise<void>;
+    stopAsync(): Promise<void>;
+}
+export declare function startSandboxDaemonAsync(options: SandboxDaemonOptions): Promise<SandboxDaemon>;

package/dist/steps/utils/sandboxDaemon.js

@@ -0,0 +1,90 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startSandboxDaemonAsync = startSandboxDaemonAsync;
+const eas_build_job_1 = require("@expo/eas-build-job");
+const promises_1 = require("node:timers/promises");
+const ws_1 = __importDefault(require("ws"));
+async function startSandboxDaemonAsync(options) {
+    options.signal?.throwIfAborted();
+    let socket;
+    const abortController = new AbortController();
+    let hasConnected = false;
+    let resolveConnected;
+    let rejectConnected;
+    const connected = new Promise((resolve, reject) => {
+        resolveConnected = resolve;
+        rejectConnected = reject;
+    });
+    const stop = () => {
+        abortController.abort();
+        socket?.close(1000, 'sandbox stopped');
+    };
+    options.signal?.addEventListener('abort', stop, { once: true });
+    const connectionLoop = (async () => {
+        while (!abortController.signal.aborted) {
+            try {
+                socket = new ws_1.default(new URL('/sandbox/connect', options.serverUrl), {
+                    handshakeTimeout: 10_000,
+                    headers: { Authorization: `Bearer ${options.credential}` },
+                });
+                await waitForOpen(socket);
+                options.logger.info('Sandbox MCP server connected.');
+                hasConnected = true;
+                resolveConnected();
+                await waitForClose(socket);
+            }
+            catch (error) {
+                if (!hasConnected) {
+                    const message = `Sandbox MCP server connection failed: ${error?.message ?? 'unknown error'}`;
+                    if (!abortController.signal.aborted) {
+                        options.logger.error({ err: error }, message);
+                    }
+                    rejectConnected(new eas_build_job_1.SystemError(message, { cause: error }));
+                    return;
+                }
+                if (!abortController.signal.aborted) {
+                    options.logger.warn({ err: error }, `Sandbox MCP server connection failed: ${error?.message ?? 'unknown error'}`);
+                }
+            }
+            if (!abortController.signal.aborted) {
+                try {
+                    await (0, promises_1.setTimeout)(options.reconnectDelayMs, undefined, {
+                        signal: abortController.signal,
+                    });
+                }
+                catch (error) {
+                    if (!abortController.signal.aborted) {
+                        throw error;
+                    }
+                }
+            }
+        }
+    })();
+    return {
+        ready: connected,
+        async stopAsync() {
+            options.signal?.removeEventListener('abort', stop);
+            stop();
+            await connectionLoop;
+        },
+    };
+}
+function waitForOpen(socket) {
+    return new Promise((resolve, reject) => {
+        socket.once('open', resolve);
+        socket.once('error', reject);
+        socket.once('close', () => reject(new Error('Sandbox MCP server closed before it connected.')));
+    });
+}
+function waitForClose(socket) {
+    if (socket.readyState === ws_1.default.CLOSING || socket.readyState === ws_1.default.CLOSED) {
+        return Promise.resolve();
+    }
+    return new Promise((resolve, reject) => {
+        socket.once('close', resolve);
+        socket.once('error', reject);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -40,14 +40,14 @@
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
     "@expo/downloader": "24.0.0",
-    "@expo/eas-build-job": "24.0.0",
+    "@expo/eas-build-job": "24.3.0",
     "@expo/env": "^0.4.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": "24.0.0",
+    "@expo/steps": "24.3.0",
     "@expo/template-file": "24.0.0",
     "@expo/turtle-spawn": "24.0.0",
     "@expo/xcpretty": "^4.3.1",
@@ -75,6 +75,7 @@
     "semver": "^7.6.2",
     "tar": "7.5.19",
     "uuid": "9.0.1",
+    "ws": "8.21.1",
     "yaml": "^2.8.1",
     "zod": "^4.3.5"
   },
@@ -92,6 +93,7 @@
     "@types/retry": "^0.12.5",
     "@types/semver": "^7.5.8",
     "@types/uuid": "^9.0.8",
+    "@types/ws": "8.5.10",
     "jest": "^29.7.0",
     "memfs": "^4.17.1",
     "nock": "13.4.0",
@@ -102,5 +104,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "8373ae353ca615ba2170eac2399f7592ad72d36a"
+  "gitHead": "66cdccb0e7c3ec47054c3f093c25b9799d60ff36"
 }