@expo/build-tools 23.2.0 → 24.1.0

package/dist/common/projectSources.js

@@ -26,9 +26,11 @@ async function prepareProjectSourcesAsync(ctx, destinationDirectory) {
     else {
         const projectArchiveResult = await (0, results_1.asyncResult)(fetchProjectArchiveSourceAsync(ctx));
         if (!projectArchiveResult.ok) {
-            ctx.logger.error({ err: projectArchiveResult.reason }, 'Failed to refresh project archive, falling back to the original one');
+            throw new eas_build_job_1.SystemError('Failed to fetch project sources. Re-run the job.', {
+                cause: projectArchiveResult.reason,
+            });
         }
-        projectArchive = projectArchiveResult.value ?? ctx.job.projectArchive;
+        projectArchive = projectArchiveResult.value;
     }
     switch (projectArchive.type) {
         case eas_build_job_1.ArchiveSourceType.R2:

package/dist/context.d.ts

@@ -48,6 +48,7 @@ export interface BuildContextOptions {
     skipNativeBuild?: boolean;
     metadata?: Metadata;
     expoApiV2BaseUrl?: string;
+    mcpServerUrl?: string;
 }
 export declare class SkipNativeBuildError extends Error {
 }
@@ -62,6 +63,7 @@ export declare class BuildContext<TJob extends Job = Job> {
     }) => void;
     readonly skipNativeBuild?: boolean;
     readonly expoApiV2BaseUrl?: string;
+    readonly mcpServerUrl?: string;
     artifacts: Artifacts;
     private readonly _isLocal;
     private _env;

package/dist/context.js

@@ -25,6 +25,7 @@ class BuildContext {
     reportError;
     skipNativeBuild;
     expoApiV2BaseUrl;
+    mcpServerUrl;
     artifacts = {};
     _isLocal;
     _env;
@@ -49,6 +50,7 @@ class BuildContext {
         this._metadata = options.metadata;
         this.skipNativeBuild = options.skipNativeBuild;
         this.expoApiV2BaseUrl = options.expoApiV2BaseUrl;
+        this.mcpServerUrl = options.mcpServerUrl;
         const environmentSecrets = this.getEnvironmentSecrets(job);
         this._env = {
             ...options.env,

package/dist/customBuildContext.d.ts

@@ -23,6 +23,7 @@ export declare class CustomBuildContext<TJob extends Job = Job> implements Exter
     readonly logger: bunyan;
     readonly graphqlClient: Client;
     readonly runtimeApi: BuilderRuntimeApi;
+    readonly mcpServerUrl?: string;
     job: TJob;
     metadata?: Metadata;
     private _env;

package/dist/customBuildContext.js

@@ -38,6 +38,7 @@ class CustomBuildContext {
     logger;
     graphqlClient;
     runtimeApi;
+    mcpServerUrl;
     job;
     metadata;
     _env;
@@ -56,6 +57,7 @@ class CustomBuildContext {
         this.runtimeApi = {
             uploadArtifact: (...args) => buildCtx['uploadArtifact'](...args),
         };
+        this.mcpServerUrl = buildCtx.mcpServerUrl;
         this.expoApiV2BaseUrl = buildCtx.expoApiV2BaseUrl;
         this.startTime = new Date();
     }

package/dist/generic.js

@@ -13,6 +13,7 @@ const projectSources_1 = require("./common/projectSources");
 const customBuildContext_1 = require("./customBuildContext");
 const easFunctionGroups_1 = require("./steps/easFunctionGroups");
 const easFunctions_1 = require("./steps/easFunctions");
+const localEgress_1 = require("./steps/utils/localEgress");
 const outputs_1 = require("./utils/outputs");
 const retry_1 = require("./utils/retry");
 async function runGenericJobAsync(ctx) {
@@ -63,7 +64,16 @@ async function runGenericJobAsync(ctx) {
             throw parseError;
         }
     });
-    const runResult = await (0, results_1.asyncResult)(workflow.executeAsync());
+    const runResult = await (0, results_1.asyncResult)((async () => {
+        try {
+            await workflow.executeAsync();
+        }
+        finally {
+            // The session-owning step may never run if simulator boot/setup fails,
+            // or may time out while resource acquisition is still in flight.
+            await (0, localEgress_1.stopLocalEgressResourcesAsync)(ctx.logger);
+        }
+    })());
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.COMPLETE_JOB, async () => {
         const results = await Promise.allSettled([
             (0, outputs_1.uploadJobOutputsToWwwAsync)(globalContext, {

package/dist/steps/easFunctions.js

@@ -49,6 +49,7 @@ const startAppiumRemoteSession_1 = require("./functions/startAppiumRemoteSession
 const startCuttlefishDevice_1 = require("./functions/startCuttlefishDevice");
 const startIosSimulator_1 = require("./functions/startIosSimulator");
 const startIosSimulatorRecordings_1 = require("./functions/startIosSimulatorRecordings");
+const startLocalEgress_1 = require("./functions/startLocalEgress");
 const startWebPreviewRemoteSession_1 = require("./functions/startWebPreviewRemoteSession");
 const startServeSimMetrics_1 = require("./functions/startServeSimMetrics");
 const collectServeSimMetrics_1 = require("./functions/collectServeSimMetrics");
@@ -99,6 +100,7 @@ function getEasFunctions(ctx) {
         (0, startAndroidEmulator_1.createStartAndroidEmulatorBuildFunction)(),
         (0, startCuttlefishDevice_1.createStartCuttlefishDeviceBuildFunction)(),
         (0, startIosSimulator_1.createStartIosSimulatorBuildFunction)(),
+        (0, startLocalEgress_1.createStartLocalEgressBuildFunction)(),
         (0, startIosSimulatorRecordings_1.createStartIosSimulatorRecordingsBuildFunction)(),
         (0, finishIosSimulatorRecordings_1.createFinishIosSimulatorRecordingsBuildFunction)(),
         (0, uploadDeviceRunSessionScreenRecordings_1.createUploadDeviceRunSessionScreenRecordingsBuildFunction)(ctx),

package/dist/steps/functions/startAgentDeviceRemoteSession.js

@@ -11,6 +11,7 @@ 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 localEgressSession_1 = require("../utils/localEgressSession");
 const sentry_1 = require("../../sentry");
 const agentDeviceArtifacts_1 = require("../utils/agentDeviceArtifacts");
 const agentDeviceEvents_1 = require("../utils/agentDeviceEvents");
@@ -48,7 +49,7 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
             }),
         ],
-        fn: async ({ logger, global }, { inputs, env, signal }) => {
+        fn: (0, localEgressSession_1.withLocalEgressSession)(async ({ logger, global }, { inputs, env, signal }) => {
             // Fail fast before any expensive setup if the injected env
             // vars are missing: DEVICE_RUN_SESSION_ID (to report the remote config
             // back to the API server), EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN (base domain
@@ -92,13 +93,16 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
                     timeoutMs: STARTUP_TIMEOUT_MS,
                 });
                 logger.info(`Web preview URL: ${webPreview.previewUrl}`);
-                await (0, remoteDeviceRunSession_1.uploadRemoteSessionConfigAsync)({
+                await (0, localEgressSession_1.uploadRemoteSessionConfigWithLocalEgressAsync)({
+                    env,
+                    signal,
                     ctx,
                     deviceRunSessionId,
                     remoteConfig: {
                         agentDeviceRemoteSessionUrl,
                         agentDeviceRemoteSessionToken: daemonToken,
                         webPreviewUrl: webPreview.previewUrl,
+                        ...(webPreview.previewToken ? { webPreviewToken: webPreview.previewToken } : {}),
                     },
                     logger,
                 });
@@ -142,7 +146,7 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
                 }
                 await daemonProcess.stopAsync();
             }
-        },
+        }),
     });
 }
 async function stopAgentDeviceEventCollectionSafelyAsync({ eventCollection, deviceRunSessionId, logger, }) {

package/dist/steps/functions/startAndroidEmulator.js

@@ -39,6 +39,21 @@ function createStartAndroidEmulatorBuildFunction() {
                 defaultValue: AndroidEmulatorUtils_1.AndroidEmulatorUtils.defaultSystemImagePackage,
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
             }),
+            steps_1.BuildStepInput.createProvider({
+                id: 'lcd_width',
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
+            }),
+            steps_1.BuildStepInput.createProvider({
+                id: 'lcd_height',
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
+            }),
+            steps_1.BuildStepInput.createProvider({
+                id: 'lcd_density',
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
+            }),
             steps_1.BuildStepInput.createProvider({
                 id: 'count',
                 required: false,
@@ -75,6 +90,9 @@ function createStartAndroidEmulatorBuildFunction() {
             const systemImagePackage = `${inputs.system_image_package.value}`;
             // We can cast because allowedValueTypeName validated this is a string.
             const deviceIdentifier = inputs.device_identifier.value;
+            const lcdWidth = inputs.lcd_width.value;
+            const lcdHeight = inputs.lcd_height.value;
+            const lcdDensity = inputs.lcd_density.value;
             const shouldAdjustAnimationScale = env.ANDROID_EMULATOR_ADJUST_ANIMATION_SCALE !== 'false' &&
                 env.ANDROID_EMULATOR_ADJUST_ANIMATION_SCALE !== '0';
             if (!shouldAdjustAnimationScale) {
@@ -107,6 +125,9 @@ function createStartAndroidEmulatorBuildFunction() {
                         deviceName,
                         systemImagePackage,
                         deviceIdentifier: deviceIdentifier ?? null,
+                        lcdWidth: lcdWidth ?? null,
+                        lcdHeight: lcdHeight ?? null,
+                        lcdDensity: lcdDensity ?? null,
                         env,
                         logger,
                     });

package/dist/steps/functions/startAppiumRemoteSession.js

@@ -14,6 +14,7 @@ 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 localEgressSession_1 = require("../utils/localEgressSession");
 const AndroidEmulatorUtils_1 = require("../../utils/AndroidEmulatorUtils");
 const IosSimulatorUtils_1 = require("../../utils/IosSimulatorUtils");
 const retry_1 = require("../../utils/retry");
@@ -43,7 +44,7 @@ function createStartAppiumRemoteSessionBuildFunction(ctx) {
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
             }),
         ],
-        fn: async ({ logger, global }, { inputs, env, signal }) => {
+        fn: (0, localEgressSession_1.withLocalEgressSession)(async ({ logger, global }, { inputs, env, signal }) => {
             const deviceRunSessionId = (0, remoteDeviceRunSession_1.getDeviceRunSessionIdOrThrow)(env);
             const ngrokTunnelDomain = (0, remoteDeviceRunSession_1.getNgrokTunnelDomainOrThrow)(env);
             const ngrokAuthtoken = (0, remoteDeviceRunSession_1.getNgrokAuthtokenOrThrow)(env);
@@ -113,7 +114,9 @@ function createStartAppiumRemoteSessionBuildFunction(ctx) {
                     logger,
                     timeoutMs: APPIUM_STARTUP_TIMEOUT_MS,
                 });
-                await (0, remoteDeviceRunSession_1.uploadRemoteSessionConfigAsync)({
+                await (0, localEgressSession_1.uploadRemoteSessionConfigWithLocalEgressAsync)({
+                    env,
+                    signal,
                     ctx,
                     deviceRunSessionId,
                     remoteConfig: {
@@ -124,6 +127,7 @@ function createStartAppiumRemoteSessionBuildFunction(ctx) {
                             'appium:udid': device.udid,
                         },
                         webPreviewUrl: webPreview.previewUrl,
+                        ...(webPreview.previewToken ? { webPreviewToken: webPreview.previewToken } : {}),
                     },
                     logger,
                 });
@@ -151,7 +155,7 @@ function createStartAppiumRemoteSessionBuildFunction(ctx) {
                 await appiumProcess.stopAsync();
                 await node_fs_1.default.promises.rm(appiumHome, { recursive: true, force: true });
             }
-        },
+        }),
     });
 }
 function resolveAppium3VersionSpec(packageVersion) {

package/dist/steps/functions/startArgentRemoteSession.js

@@ -16,6 +16,7 @@ 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 localEgressSession_1 = require("../utils/localEgressSession");
 const sentry_1 = require("../../sentry");
 const processes_1 = require("../../utils/processes");
 const retry_1 = require("../../utils/retry");
@@ -63,7 +64,7 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
             }),
         ],
-        fn: async ({ logger, global }, { inputs, env, signal }) => {
+        fn: (0, localEgressSession_1.withLocalEgressSession)(async ({ logger, global }, { inputs, env, signal }) => {
             // Fail fast before any expensive setup if the injected env
             // vars are missing: DEVICE_RUN_SESSION_ID (to report the remote config
             // back to the API server), EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN (base domain
@@ -82,21 +83,28 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
             if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
                 await (0, remoteDeviceRunSession_1.selectXcodeDeveloperDirectoryAsync)({ env, logger });
             }
-            // Argent shells out to ffmpeg to record the screen. Installing it pulls a
-            // large Homebrew dependency tree, so do not block session readiness on it:
-            // the session comes up at its usual speed and only a recording started in
-            // the first moments misses ffmpeg. Never rejects, so `void` is safe.
-            void (0, remoteDeviceRunSession_1.ensureFfmpegInstalledAsync)({ runtimePlatform, env, logger });
+            // Start the potentially slow installation while Argent is being prepared.
+            // On Linux expo-device-hub calls this again and awaits the same in-flight
+            // setup before launching. On macOS this remains non-blocking, so only a
+            // recording started in the first moments may miss ffmpeg.
+            // Never rejects, so `void` is safe.
+            void (0, remoteDeviceRunSession_1.ensureFfmpegInstalledOnceAsync)({ runtimePlatform, env, logger });
             logger.info('Enabling the Argent artifacts list endpoint flag.');
-            await (0, turtle_spawn_1.default)('bunx', [`${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'enable', ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG], { env, logger });
+            await (0, turtle_spawn_1.default)('bun', [
+                'x',
+                `${ARGENT_PACKAGE_NAME}@${versionSpec}`,
+                'enable',
+                ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG,
+            ], { env, logger });
             logger.info('Enabling the Argent tool-server event log flag.');
-            await (0, turtle_spawn_1.default)('bunx', [`${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'enable', ARGENT_EVENT_LOG_FLAG], { env, logger });
-            logger.info(`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via bunx.`);
-            // Keep Argent itself in foreground mode under the detached bunx process. This preserves
-            // the bunx -> Argent CLI -> tool-server ancestry used to identify the matching state file.
+            await (0, turtle_spawn_1.default)('bun', ['x', `${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'enable', ARGENT_EVENT_LOG_FLAG], { env, logger });
+            logger.info(`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via bun x.`);
+            // Keep Argent itself in foreground mode under the detached bun process. This preserves
+            // the bun -> Argent CLI -> tool-server ancestry used to identify the matching state file.
             const argentServer = (0, remoteDeviceRunSession_1.spawnDetached)({
-                command: 'bunx',
+                command: 'bun',
                 args: [
+                    'x',
                     `${ARGENT_PACKAGE_NAME}@${versionSpec}`,
                     'server',
                     'start',
@@ -166,13 +174,16 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
                     timeoutMs: STARTUP_TIMEOUT_MS,
                 });
                 logger.info(`Web preview URL: ${webPreview.previewUrl}`);
-                await (0, remoteDeviceRunSession_1.uploadRemoteSessionConfigAsync)({
+                await (0, localEgressSession_1.uploadRemoteSessionConfigWithLocalEgressAsync)({
+                    env,
+                    signal,
                     ctx,
                     deviceRunSessionId,
                     remoteConfig: {
                         toolsUrl: publicToolsUrl,
                         ...(toolServerToken ? { toolsAuthToken: toolServerToken } : {}),
                         webPreviewUrl: webPreview.previewUrl,
+                        ...(webPreview.previewToken ? { webPreviewToken: webPreview.previewToken } : {}),
                     },
                     logger,
                 });
@@ -209,7 +220,7 @@ function createStartArgentRemoteSessionBuildFunction(ctx) {
                 }
                 await argentServer.stopAsync();
             }
-        },
+        }),
     });
 }
 async function stopArgentEventCollectionSafelyAsync({ eventCollection, deviceRunSessionId, logger, }) {
@@ -234,7 +245,7 @@ function warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger, })
     if (!validVersion) {
         logger.warn(`Argent remote simulator sessions require ${ARGENT_PACKAGE_NAME}@${exports.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.`);
+            `Continuing and letting bun x resolve it.`);
         return;
     }
     if (semver_1.default.lt(validVersion, exports.MIN_ARGENT_REMOTE_SESSION_VERSION)) {

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

@@ -0,0 +1,10 @@
+import { BuildFunction } from '@expo/steps';
+/**
+ * Points the device host's system HTTP(S) proxy at the EAS CLI's egress client.
+ * Must run before `eas/start_ios_simulator`: the simulator reads the system proxy
+ * at boot. Nothing else on the host changes, so requests from libraries that
+ * bypass the system proxy are not covered; the shared session monitor reports
+ * them. The shared session cleanup releases the resources started here when
+ * the session ends, with a job finalizer as a fallback.
+ */
+export declare function createStartLocalEgressBuildFunction(): BuildFunction;

package/dist/steps/functions/startLocalEgress.js

@@ -0,0 +1,156 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createStartLocalEgressBuildFunction = createStartLocalEgressBuildFunction;
+const steps_1 = require("@expo/steps");
+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 localEgress_1 = require("../utils/localEgress");
+const remoteDeviceRunSession_1 = require("../utils/remoteDeviceRunSession");
+/**
+ * The downloader and ngrok SDK do not accept an AbortSignal. Stop awaiting them
+ * on cancellation, while retaining handlers that dispose any eventual result.
+ */
+function awaitLocalEgressAcquisitionAsync(pending, signal, disposeAbandonedAsync, logger) {
+    return new Promise((resolve, reject) => {
+        let abandoned = false;
+        const abort = () => {
+            signal.removeEventListener('abort', abort);
+            abandoned = true;
+            reject(signal.reason);
+        };
+        signal.addEventListener('abort', abort, { once: true });
+        if (signal.aborted) {
+            abort();
+        }
+        void pending
+            .then(async (result) => {
+            signal.removeEventListener('abort', abort);
+            if (abandoned) {
+                await disposeAbandonedAsync(result);
+            }
+            else {
+                resolve(result);
+            }
+        }, async (error) => {
+            signal.removeEventListener('abort', abort);
+            if (abandoned) {
+                await disposeAbandonedAsync();
+            }
+            else {
+                reject(error);
+            }
+        })
+            .catch(err => logger.warn({ err }, 'Could not release a cancelled local egress acquisition.'));
+    });
+}
+/**
+ * Points the device host's system HTTP(S) proxy at the EAS CLI's egress client.
+ * Must run before `eas/start_ios_simulator`: the simulator reads the system proxy
+ * at boot. Nothing else on the host changes, so requests from libraries that
+ * bypass the system proxy are not covered; the shared session monitor reports
+ * them. The shared session cleanup releases the resources started here when
+ * the session ends, with a job finalizer as a fallback.
+ */
+function createStartLocalEgressBuildFunction() {
+    return new steps_1.BuildFunction({
+        namespace: 'eas',
+        id: 'start_local_egress',
+        name: 'Start local egress',
+        __metricsId: 'eas/start_local_egress',
+        supportedRuntimePlatforms: [steps_1.BuildRuntimePlatform.DARWIN],
+        fn: async ({ logger }, { env, signal }) => {
+            const ngrokTunnelDomain = (0, remoteDeviceRunSession_1.getNgrokTunnelDomainOrThrow)(env);
+            const ngrokAuthtoken = (0, remoteDeviceRunSession_1.getNgrokAuthtokenOrThrow)(env);
+            let workDir;
+            let server;
+            let tunnel;
+            let finishSetup;
+            const setupFinished = new Promise(resolve => {
+                finishSetup = resolve;
+            });
+            // Register before acquisition. Cancellation ends setup promptly; pending
+            // SDK calls retain their own late-result disposal handlers.
+            const lifetimeSignal = (0, localEgress_1.registerLocalEgressResources)(async () => {
+                await setupFinished;
+                const results = await Promise.allSettled([
+                    Promise.resolve().then(() => tunnel?.stopAsync()),
+                    Promise.resolve().then(() => server?.stopAsync()),
+                ]);
+                for (const result of results) {
+                    if (result.status === 'rejected') {
+                        logger.warn({ err: result.reason }, 'Could not stop a local egress resource.');
+                    }
+                }
+                await Promise.all([
+                    node_fs_1.default.promises.rm(localEgress_1.LOCAL_EGRESS_HANDOFF_PATH, { force: true }),
+                    workDir ? node_fs_1.default.promises.rm(workDir, { recursive: true, force: true }) : undefined,
+                ]);
+            });
+            const startupSignal = signal ? AbortSignal.any([signal, lifetimeSignal]) : lifetimeSignal;
+            try {
+                startupSignal.throwIfAborted();
+                workDir = await node_fs_1.default.promises.mkdtemp(node_path_1.default.join(node_os_1.default.tmpdir(), 'eas-local-egress-'));
+                startupSignal.throwIfAborted();
+                logger.info(`Downloading the reverse tunnel server (chisel ${localEgress_1.CHISEL_VERSION}).`);
+                const downloadDir = workDir;
+                const chiselPath = await awaitLocalEgressAcquisitionAsync((0, localEgress_1.downloadChiselAsync)({ destinationDir: downloadDir, logger }), startupSignal, async () => await node_fs_1.default.promises.rm(downloadDir, { recursive: true, force: true }), logger);
+                startupSignal.throwIfAborted();
+                const credentials = (0, localEgress_1.generateEgressCredentials)();
+                const authfilePath = node_path_1.default.join(workDir, 'authfile.json');
+                await node_fs_1.default.promises.writeFile(authfilePath, (0, localEgress_1.createChiselAuthfileContents)({ ...credentials, port: localEgress_1.LOCAL_EGRESS_PROXY_PORT }), { encoding: 'utf8', mode: 0o600 });
+                startupSignal.throwIfAborted();
+                const controlPort = await (0, remoteDeviceRunSession_1.findAvailablePortAsync)();
+                startupSignal.throwIfAborted();
+                logger.info(`Starting the reverse tunnel server on 127.0.0.1:${controlPort}.`);
+                const started = await (0, localEgress_1.startChiselServerAsync)({
+                    chiselPath,
+                    controlPort,
+                    authfilePath,
+                    env,
+                    signal: startupSignal,
+                });
+                server = started.process;
+                startupSignal.throwIfAborted();
+                tunnel = await awaitLocalEgressAcquisitionAsync((0, remoteDeviceRunSession_1.startNgrokTunnelAsync)({
+                    port: controlPort,
+                    subdomainPrefix: 'egress',
+                    baseDomain: ngrokTunnelDomain,
+                    authtoken: ngrokAuthtoken,
+                    logger,
+                }), startupSignal, async (listener) => await listener?.stopAsync(), logger);
+                startupSignal.throwIfAborted();
+                const { service } = await (0, localEgress_1.configureSystemProxyAsync)({
+                    env,
+                    logger,
+                    port: localEgress_1.LOCAL_EGRESS_PROXY_PORT,
+                    signal: startupSignal,
+                });
+                startupSignal.throwIfAborted();
+                await (0, localEgress_1.writeLocalEgressHandoffAsync)({
+                    url: tunnel.url,
+                    token: credentials.password,
+                    fingerprint: started.fingerprint,
+                    port: localEgress_1.LOCAL_EGRESS_PROXY_PORT,
+                });
+                startupSignal.throwIfAborted();
+                logger.info(`Local egress is configured on network service "${service}". HTTP(S) and WebSocket ` +
+                    'requests that honor the system proxy (WebKit, URLSession and other CFNetwork clients) ' +
+                    'fail until the EAS CLI egress client connects, then exit from that machine. Requests ' +
+                    'from libraries that bypass the system proxy are not covered and exit from this worker. ' +
+                    'Connection sampling may report these bypasses, but can miss short connections and unconnected UDP traffic.');
+            }
+            catch (error) {
+                finishSetup();
+                await (0, localEgress_1.stopLocalEgressResourcesAsync)(logger);
+                throw error;
+            }
+            finally {
+                finishSetup();
+            }
+        },
+    });
+}

package/dist/steps/functions/startWebPreviewRemoteSession.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartWebPreviewRemoteSessionBuildFunction = createStartWebPreviewRemoteSessionBuildFunction;
 const steps_1 = require("@expo/steps");
+const localEgressSession_1 = require("../utils/localEgressSession");
 const remoteDeviceRunSession_1 = require("../utils/remoteDeviceRunSession");
 const STARTUP_TIMEOUT_MS = 60_000;
 function createStartWebPreviewRemoteSessionBuildFunction(ctx) {
@@ -22,7 +23,7 @@ function createStartWebPreviewRemoteSessionBuildFunction(ctx) {
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.NUMBER,
             }),
         ],
-        fn: async ({ logger, global }, { inputs, env, signal }) => {
+        fn: (0, localEgressSession_1.withLocalEgressSession)(async ({ logger, global }, { inputs, env, signal }) => {
             const deviceRunSessionId = (0, remoteDeviceRunSession_1.getDeviceRunSessionIdOrThrow)(env);
             const ngrokTunnelDomain = (0, remoteDeviceRunSession_1.getNgrokTunnelDomainOrThrow)(env);
             const maxDurationSeconds = inputs.max_duration_seconds?.value;
@@ -42,10 +43,15 @@ function createStartWebPreviewRemoteSessionBuildFunction(ctx) {
             });
             logger.info(`Preview URL: ${webPreview.previewUrl}`);
             try {
-                await (0, remoteDeviceRunSession_1.uploadRemoteSessionConfigAsync)({
+                await (0, localEgressSession_1.uploadRemoteSessionConfigWithLocalEgressAsync)({
+                    env,
+                    signal,
                     ctx,
                     deviceRunSessionId,
-                    remoteConfig: { previewUrl: webPreview.previewUrl },
+                    remoteConfig: {
+                        previewUrl: webPreview.previewUrl,
+                        ...(webPreview.previewToken ? { previewToken: webPreview.previewToken } : {}),
+                    },
                     logger,
                 });
                 await (0, remoteDeviceRunSession_1.waitForDeviceRunSessionStoppedAsync)({
@@ -59,6 +65,6 @@ function createStartWebPreviewRemoteSessionBuildFunction(ctx) {
             finally {
                 await webPreview.stopAsync();
             }
-        },
+        }),
     });
 }

package/dist/steps/functions/uploadToAsc.js

@@ -124,18 +124,24 @@ function createUploadToAscBuildFunction() {
             const ascApiKeyJson = await fs_extra_1.default.readJson(ascApiKeyPath);
             const ascApiKey = zod_1.z
                 .object({
-                issuer_id: zod_1.z.string(),
+                issuer_id: zod_1.z.string().nullish(),
                 key_id: zod_1.z.string(),
                 key: zod_1.z.string(),
             })
                 .parse(ascApiKeyJson);
             const privateKey = await jose.importPKCS8(ascApiKey.key, 'ES256');
-            const token = await new jose.SignJWT({})
+            const jwt = new jose.SignJWT({})
                 .setProtectedHeader({ alg: 'ES256', kid: ascApiKey.key_id })
-                .setIssuer(ascApiKey.issuer_id)
                 .setAudience('appstoreconnect-v1')
-                .setExpirationTime('20m')
-                .sign(privateKey);
+                .setExpirationTime('20m');
+            if (ascApiKey.issuer_id) {
+                jwt.setIssuer(ascApiKey.issuer_id);
+            }
+            else {
+                // Nullish issuer_id means an individual API key
+                jwt.setSubject('user');
+            }
+            const token = await jwt.sign(privateKey);
             const client = new AscApiClient_1.AscApiClient({ token, logger: stepsCtx.logger });
             stepsCtx.logger.info(`Reading App information for Apple app identifier: ${appleAppIdentifier}...`);
             const appResponse = await AscApiUtils_1.AscApiUtils.getAppInfoAsync({ client, appleAppIdentifier });

package/dist/steps/utils/appiumCommandSummary.js

@@ -350,6 +350,7 @@ exports.APPIUM_COMMAND_SUMMARIES = {
     mobileSimctl: 'Ran a simctl command',
     mobileSiriCommand: 'Sent a Siri command',
     mobileStartActivity: 'Started an activity',
+    mobileStartAutomationSession: 'Started an automation session',
     mobileStartLogsBroadcast: 'Started log streaming',
     mobileStartMediaProjectionRecording: 'Started media projection recording',
     mobileStartNetworkMonitor: 'Started network monitoring',
@@ -359,6 +360,7 @@ exports.APPIUM_COMMAND_SUMMARIES = {
     mobileStartService: 'Started a service',
     mobileStartSystemMonitor: 'Started system monitoring',
     mobileStartXctestScreenRecording: 'Started XCTest screen recording',
+    mobileStopAutomationSession: 'Stopped an automation session',
     mobileStopLogsBroadcast: 'Stopped log streaming',
     mobileStopMediaProjectionRecording: 'Stopped media projection recording',
     mobileStopNetworkMonitor: 'Stopped network monitoring',
@@ -380,6 +382,7 @@ exports.APPIUM_COMMAND_SUMMARIES = {
     mobileUnscheduleAction: 'Canceled a scheduled action',
     mobileUpdateSafariPreferences: 'Updated Safari preferences',
     mobileViewPortRect: 'Read the viewport size',
+    mobileViewportElementRect: 'Read an element position and size in the viewport',
     mobileViewportScreenshot: 'Took a viewport screenshot',
     mobileVoiceOverCurrentSpeech: 'Read current VoiceOver speech',
     mobileVoiceOverMove: 'Moved the VoiceOver cursor',