@expo/build-tools 18.12.1 → 18.12.3

package/dist/index.d.ts

@@ -7,3 +7,4 @@ export { PackageManager } from './utils/packageManager';
 export { findAndUploadXcodeBuildLogsAsync } from './ios/xcodeBuildLogs';
 export { Hook, runHookIfPresent } from './utils/hooks';
 export * from './generic';
+export { Sentry } from './sentry';

package/dist/index.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runHookIfPresent = exports.Hook = exports.findAndUploadXcodeBuildLogsAsync = exports.PackageManager = exports.SkipNativeBuildError = exports.BuildContext = exports.GCSLoggerStream = exports.GCS = exports.Builders = void 0;
+exports.Sentry = exports.runHookIfPresent = exports.Hook = exports.findAndUploadXcodeBuildLogsAsync = exports.PackageManager = exports.SkipNativeBuildError = exports.BuildContext = exports.GCSLoggerStream = exports.GCS = exports.Builders = void 0;
 const Builders = __importStar(require("./builders"));
 exports.Builders = Builders;
 const LoggerStream_1 = __importDefault(require("./gcs/LoggerStream"));
@@ -57,3 +57,5 @@ var hooks_1 = require("./utils/hooks");
 Object.defineProperty(exports, "Hook", { enumerable: true, get: function () { return hooks_1.Hook; } });
 Object.defineProperty(exports, "runHookIfPresent", { enumerable: true, get: function () { return hooks_1.runHookIfPresent; } });
 __exportStar(require("./generic"), exports);
+var sentry_1 = require("./sentry");
+Object.defineProperty(exports, "Sentry", { enumerable: true, get: function () { return sentry_1.Sentry; } });

package/dist/sentry.d.ts

@@ -0,0 +1,19 @@
+import * as sentryNode from '@sentry/node';
+type CaptureOptions = {
+    tags?: Record<string, string>;
+    extras?: Record<string, unknown>;
+    level?: sentryNode.SeverityLevel;
+};
+type SentryAPI = {
+    setup(opts: {
+        dsn: string | null;
+        environment: string;
+        tags?: Record<string, string>;
+    }): void;
+    capture(msg: string, options?: CaptureOptions): void;
+    capture(msg: string, err: Error | undefined, options?: CaptureOptions): void;
+    capture(err: Error, options?: CaptureOptions): void;
+    flush(timeoutMs?: number): Promise<boolean>;
+};
+export declare const Sentry: SentryAPI;
+export {};

package/dist/sentry.js

@@ -0,0 +1,102 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Sentry = void 0;
+const sentryNode = __importStar(require("@sentry/node"));
+exports.Sentry = {
+    setup({ dsn, environment, tags }) {
+        if (dsn) {
+            sentryNode.init({
+                dsn,
+                environment,
+                ...(tags ? { initialScope: { tags } } : {}),
+            });
+        }
+    },
+    capture(arg1, arg2, arg3) {
+        let msg;
+        let err;
+        let options = {};
+        if (arg1 instanceof Error) {
+            err = arg1;
+            options = arg2 ?? {};
+        }
+        else {
+            msg = arg1;
+            if (arg3 !== undefined) {
+                // 3-arg form: arg2 unambiguously means err (null/undefined → no err)
+                options = arg3;
+                if (arg2 !== undefined && arg2 !== null) {
+                    err = arg2 instanceof Error ? arg2 : new Error(String(arg2));
+                }
+            }
+            else if (arg2 instanceof Error) {
+                err = arg2;
+            }
+            else if (arg2 !== undefined && arg2 !== null) {
+                // 2-arg form: non-Error object → options; primitive → coerced err
+                if (typeof arg2 === 'object') {
+                    options = arg2;
+                }
+                else {
+                    err = new Error(String(arg2));
+                }
+            }
+        }
+        sentryNode.withScope(scope => {
+            if (options.tags) {
+                scope.setTags(options.tags);
+            }
+            if (options.extras) {
+                scope.setExtras(options.extras);
+            }
+            if (options.level) {
+                scope.setLevel(options.level);
+            }
+            if (err) {
+                if (msg && err.message !== msg) {
+                    scope.setExtra('message', msg);
+                }
+                sentryNode.captureException(err);
+            }
+            else if (msg) {
+                sentryNode.captureMessage(msg);
+            }
+        });
+    },
+    flush(timeoutMs = 2000) {
+        return sentryNode.flush(timeoutMs);
+    },
+};

package/dist/steps/functions/startAgentDeviceRemoteSession.js

@@ -81,17 +81,33 @@ function createStartAgentDeviceRemoteSessionBuildFunction(ctx) {
                 env,
             });
             logger.info('Waiting for a public tunnel URL.');
-            const tunnelUrl = await waitForMatchInOutputAsync({
+            const agentDeviceRemoteSessionUrl = await waitForMatchInOutputAsync({
                 process: cloudflared,
                 pattern: /https:\/\/[a-z0-9-]+\.trycloudflare\.com/,
                 timeoutMs: STARTUP_TIMEOUT_MS,
                 description: 'cloudflared tunnel',
             });
-            logger.info(`Tunnel is ready at ${tunnelUrl}.`);
+            logger.info(`Tunnel is ready at ${agentDeviceRemoteSessionUrl}.`);
+            // serve-sim is iOS-only — only launch it (and report a webPreviewUrl)
+            // on Darwin. Android sessions go without a preview URL.
+            let webPreviewUrl;
+            if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
+                const { previewUrl } = await (0, remoteDeviceRunSession_1.startServeSimWithTunnelAsync)({
+                    env,
+                    logger,
+                    timeoutMs: STARTUP_TIMEOUT_MS,
+                });
+                webPreviewUrl = previewUrl;
+                logger.info(`Web preview URL: ${webPreviewUrl}`);
+            }
             await (0, remoteDeviceRunSession_1.uploadRemoteSessionConfigAsync)({
                 ctx,
                 deviceRunSessionId,
-                remoteConfig: { url: tunnelUrl, token: daemonToken },
+                remoteConfig: {
+                    agentDeviceRemoteSessionUrl,
+                    agentDeviceRemoteSessionToken: daemonToken,
+                    ...(webPreviewUrl ? { webPreviewUrl } : {}),
+                },
                 logger,
             });
             logger.info('Remote session is live. Keeping the job alive until the session is stopped.');

package/dist/steps/functions/startServeSimRemoteSession.js

@@ -4,14 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartServeSimRemoteSessionBuildFunction = createStartServeSimRemoteSessionBuildFunction;
-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 retry_1 = require("../../utils/retry");
 const remoteDeviceRunSession_1 = require("../utils/remoteDeviceRunSession");
 const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
 const STARTUP_TIMEOUT_MS = 60_000;
-const TRYCLOUDFLARE_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/;
 function createStartServeSimRemoteSessionBuildFunction(ctx) {
     return new steps_1.BuildFunction({
         namespace: 'eas',
@@ -26,15 +23,9 @@ function createStartServeSimRemoteSessionBuildFunction(ctx) {
             await (0, turtle_spawn_1.default)('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], { env, logger });
             logger.info('Ensuring cloudflared is installed.');
             await (0, remoteDeviceRunSession_1.ensureBrewPackageInstalledAsync)({ name: 'cloudflared', env, logger });
-            logger.info('Launching serve-sim with tunnel.');
-            const serveSim = (0, remoteDeviceRunSession_1.spawnDetached)({
-                command: 'npx',
-                args: ['serve-sim-szdziedzic@latest', '--tunnel'],
+            const { previewUrl, streamUrl } = await (0, remoteDeviceRunSession_1.startServeSimWithTunnelAsync)({
                 env,
-            });
-            logger.info('Waiting for serve-sim to report tunnel and stream URLs.');
-            const { previewUrl, streamUrl } = await waitForServeSimUrlsAsync({
-                serveSim,
+                logger,
                 timeoutMs: STARTUP_TIMEOUT_MS,
             });
             logger.info(`Preview URL: ${previewUrl}`);
@@ -52,21 +43,3 @@ function createStartServeSimRemoteSessionBuildFunction(ctx) {
         },
     });
 }
-async function waitForServeSimUrlsAsync({ serveSim, timeoutMs, }) {
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-        const output = serveSim.getOutput();
-        const previewUrl = matchLabeledUrl(output, 'Tunnel');
-        const streamUrl = matchLabeledUrl(output, 'Stream');
-        if (previewUrl && streamUrl) {
-            return { previewUrl, streamUrl };
-        }
-        await (0, retry_1.sleepAsync)(1_000);
-    }
-    throw new eas_build_job_1.SystemError(`Timed out waiting for serve-sim to report Tunnel and Stream URLs. Last output:\n${serveSim.getOutput() || '<empty>'}`);
-}
-function matchLabeledUrl(content, label) {
-    const labelPattern = new RegExp(`${label}:\\s*(${TRYCLOUDFLARE_URL_PATTERN.source})`);
-    const match = labelPattern.exec(content);
-    return match ? match[1] : null;
-}

package/dist/steps/utils/ios/xcactivitylog.d.ts

@@ -1,11 +1,9 @@
 import { bunyan } from '@expo/logger';
 import { z } from 'zod';
 /**
- * Download xclogparser, parse xcactivitylog from derived data, and log a
- * compile metrics report. Never throws — all errors are logged at debug level.
- *
- * Can be called from both the step-based flow (BuildFunction) and the
- * traditional builder flow (runBuildPhase).
+ * Never throws — best-effort observability that does not affect build status.
+ * Failures route to Sentry via `Sentry.capture` for engineering triage;
+ * users see only a generic skip message.
  */
 export declare function parseAndReportXcactivitylog({ derivedDataPath, workspacePath, xclogparserVersion, logger, proxyBaseUrl, }: {
     derivedDataPath: string;

package/dist/steps/utils/ios/xcactivitylog.js

@@ -15,33 +15,38 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const zod_1 = require("zod");
+const sentry_1 = require("../../../sentry");
 const DEFAULT_XCLOGPARSER_VERSION = 'v0.2.47';
 const XCLOGPARSER_DOWNLOAD_URL = 'https://storage.googleapis.com/turtle-v2/xclogparser';
 const XCLOGPARSER_DOWNLOAD_TIMEOUT_MS = 20_000;
 const XCLOGPARSER_OUTPUT_FILENAME = 'xcactivitylog.json';
 /**
- * Download xclogparser, parse xcactivitylog from derived data, and log a
- * compile metrics report. Never throws — all errors are logged at debug level.
- *
- * Can be called from both the step-based flow (BuildFunction) and the
- * traditional builder flow (runBuildPhase).
+ * Never throws — best-effort observability that does not affect build status.
+ * Failures route to Sentry via `Sentry.capture` for engineering triage;
+ * users see only a generic skip message.
  */
 async function parseAndReportXcactivitylog({ derivedDataPath, workspacePath, xclogparserVersion = DEFAULT_XCLOGPARSER_VERSION, logger, proxyBaseUrl, }) {
     let tempDir;
+    let phase = 'creating_temp_directory';
     try {
         tempDir = await fs_extra_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'xclogparser-'));
+        phase = 'downloading_xclogparser';
         const xclogparserPath = await downloadXclogparser(tempDir, xclogparserVersion, logger, proxyBaseUrl);
+        phase = 'running_xclogparser';
         const jsonOutputPath = await runXclogparser({
             binaryPath: xclogparserPath,
             derivedDataPath,
             workspacePath,
             outputDir: tempDir,
         });
+        phase = 'parsing_xclogparser_output';
         const data = XcactivitylogDataSchemaZ.parse(JSON.parse(await fs_extra_1.default.readFile(jsonOutputPath, 'utf8')));
         logger.info(formatReport(data));
     }
     catch (err) {
-        logger.debug({ err }, 'Failed to analyze build performance; continuing without a report');
+        logger.info('Build performance analysis skipped.');
+        const msg = `Build performance analysis failed during "${phase}"`;
+        sentry_1.Sentry.capture(msg, err, { tags: { phase } });
     }
     finally {
         if (tempDir) {

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

@@ -22,3 +22,11 @@ export declare function spawnDetached({ command, args, cwd, env, }: {
     cwd?: string;
     env: BuildStepEnv;
 }): DetachedProcessHandle;
+export declare function startServeSimWithTunnelAsync({ env, logger, timeoutMs, }: {
+    env: BuildStepEnv;
+    logger: bunyan;
+    timeoutMs: number;
+}): Promise<{
+    previewUrl: string;
+    streamUrl: string;
+}>;

package/dist/steps/utils/remoteDeviceRunSession.js

@@ -7,9 +7,12 @@ exports.getDeviceRunSessionIdOrThrow = getDeviceRunSessionIdOrThrow;
 exports.uploadRemoteSessionConfigAsync = uploadRemoteSessionConfigAsync;
 exports.ensureBrewPackageInstalledAsync = ensureBrewPackageInstalledAsync;
 exports.spawnDetached = spawnDetached;
+exports.startServeSimWithTunnelAsync = startServeSimWithTunnelAsync;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
 const gql_tada_1 = require("gql.tada");
+const retry_1 = require("../../utils/retry");
+const TRYCLOUDFLARE_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/;
 const START_DEVICE_RUN_SESSION_MUTATION = (0, gql_tada_1.graphql)(`
   mutation StartDeviceRunSession($deviceRunSessionId: ID!, $remoteConfig: JSONObject!) {
     deviceRunSession {
@@ -63,3 +66,28 @@ function spawnDetached({ command, args, cwd, env, }) {
     promise.child.stderr?.on('data', appendChunk);
     return { getOutput: () => output };
 }
+async function startServeSimWithTunnelAsync({ env, logger, timeoutMs, }) {
+    logger.info('Launching serve-sim with tunnel.');
+    const serveSim = spawnDetached({
+        command: 'npx',
+        args: ['serve-sim-szdziedzic@latest', '--tunnel'],
+        env,
+    });
+    logger.info('Waiting for serve-sim to report tunnel and stream URLs.');
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        const output = serveSim.getOutput();
+        const previewUrl = matchLabeledUrl(output, 'Tunnel');
+        const streamUrl = matchLabeledUrl(output, 'Stream');
+        if (previewUrl && streamUrl) {
+            return { previewUrl, streamUrl };
+        }
+        await (0, retry_1.sleepAsync)(1_000);
+    }
+    throw new eas_build_job_1.SystemError(`Timed out waiting for serve-sim to report Tunnel and Stream URLs. Last output:\n${serveSim.getOutput() || '<empty>'}`);
+}
+function matchLabeledUrl(content, label) {
+    const labelPattern = new RegExp(`${label}:\\s*(${TRYCLOUDFLARE_URL_PATTERN.source})`);
+    const match = labelPattern.exec(content);
+    return match ? match[1] : null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "18.12.1",
+  "version": "18.12.3",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -50,6 +50,7 @@
     "@expo/turtle-spawn": "18.5.0",
     "@expo/xcpretty": "^4.3.1",
     "@google-cloud/storage": "^7.11.2",
+    "@sentry/node": "7.77.0",
     "@urql/core": "^6.0.1",
     "bplist-parser": "0.3.2",
     "fast-glob": "^3.3.2",
@@ -98,5 +99,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "f46b469267f4f87be6a6d1acff22464c8cf89b26"
+  "gitHead": "985cd9d52f4de333cf563cc7fe92f4e2d1e1c8e5"
 }