eas-cli 18.10.0 → 18.11.0

package/build/commands/observe/logs.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
+const pagination_1 = require("../../commandUtils/pagination");
+const log_1 = tslib_1.__importDefault(require("../../log"));
+const ObserveQuery_1 = require("../../graphql/queries/ObserveQuery");
+const fetchCustomEvents_1 = require("../../observe/fetchCustomEvents");
+const formatCustomEvents_1 = require("../../observe/formatCustomEvents");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
+const startAndEndTime_1 = require("../../observe/startAndEndTime");
+const json_1 = require("../../utils/json");
+const DEFAULT_EVENTS_LIMIT = 10;
+class ObserveLogs extends EasCommand_1.default {
+    static hidden = true;
+    static description = 'display individual custom events (logs) emitted by the app, filtered by the event name in the argument. With no arguments, a list of the available event names and associated event counts is returned.';
+    static args = {
+        eventName: core_1.Args.string({
+            description: 'Custom event name to filter by',
+            required: false,
+        }),
+    };
+    static flags = {
+        platform: core_1.Flags.option({
+            description: 'Filter by platform',
+            options: platforms_1.allowedPlatformFlagValues,
+        })(),
+        after: core_1.Flags.string({
+            description: 'Cursor for pagination. Use the endCursor from a previous query to fetch the next page.',
+        }),
+        limit: (0, pagination_1.getLimitFlagWithCustomValues)({
+            defaultTo: DEFAULT_EVENTS_LIMIT,
+            limit: 100,
+        }),
+        start: core_1.Flags.string({
+            description: 'Start of time range (ISO date)',
+            exclusive: ['days'],
+        }),
+        end: core_1.Flags.string({
+            description: 'End of time range (ISO date)',
+            exclusive: ['days'],
+        }),
+        days: core_1.Flags.integer({
+            description: 'Show events from the last N days (mutually exclusive with --start/--end)',
+            min: 1,
+            exclusive: ['start', 'end'],
+        }),
+        'app-version': core_1.Flags.string({
+            description: 'Filter by app version',
+        }),
+        'update-id': core_1.Flags.string({
+            description: 'Filter by EAS update ID',
+        }),
+        'session-id': core_1.Flags.string({
+            description: 'Filter by session ID',
+        }),
+        'all-events': core_1.Flags.boolean({
+            description: 'When no event name argument is provided, list all events across all event names instead of a summary of event names + counts.',
+            default: false,
+        }),
+        'project-id': core_1.Flags.string({
+            description: 'EAS project ID (defaults to the project ID of the current directory)',
+        }),
+        ...flags_1.EasNonInteractiveAndJsonFlags,
+    };
+    static contextDefinition = {
+        ...this.ContextOptions.ProjectId,
+        ...this.ContextOptions.LoggedIn,
+    };
+    static loggedInOnlyContextDefinition = {
+        ...this.ContextOptions.LoggedIn,
+    };
+    async runAsync() {
+        const { flags, args } = await this.parse(ObserveLogs);
+        if (args.eventName && flags['all-events']) {
+            throw new Error('--all-events cannot be combined with an event name argument. Pass an event name to filter by it, or pass --all-events to list all events across all event names.');
+        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveLogs,
+            loggedInOnlyContextDefinition: ObserveLogs.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
+        if (flags.json) {
+            (0, json_1.enableJsonOutput)();
+        }
+        else {
+            log_1.default.warn('EAS Observe is in preview and subject to breaking changes.');
+        }
+        const { daysBack, startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
+        const platform = (0, platforms_1.appObservePlatformFromFlag)(flags.platform);
+        if (!args.eventName && !flags['all-events']) {
+            const { names, isTruncated } = await ObserveQuery_1.ObserveQuery.customEventNamesAsync(graphqlClient, {
+                appId: projectId,
+                startTime,
+                endTime,
+                platform,
+            });
+            if (flags.json) {
+                (0, json_1.printJsonOnlyOutput)((0, formatCustomEvents_1.buildObserveCustomEventNamesJson)(names, isTruncated));
+            }
+            else {
+                log_1.default.addNewLineIfNone();
+                log_1.default.log((0, formatCustomEvents_1.buildObserveCustomEventNamesTable)(names, {
+                    daysBack,
+                    startTime,
+                    endTime,
+                    isTruncated,
+                }));
+            }
+            return;
+        }
+        const { events, pageInfo } = await (0, fetchCustomEvents_1.fetchObserveCustomEventsAsync)(graphqlClient, projectId, {
+            eventName: args.eventName,
+            limit: flags.limit ?? DEFAULT_EVENTS_LIMIT,
+            ...(flags.after && { after: flags.after }),
+            startTime,
+            endTime,
+            platform,
+            appVersion: flags['app-version'],
+            updateId: flags['update-id'],
+            sessionId: flags['session-id'],
+        });
+        if (args.eventName && events.length === 0) {
+            const { names, isTruncated } = await ObserveQuery_1.ObserveQuery.customEventNamesAsync(graphqlClient, {
+                appId: projectId,
+                startTime,
+                endTime,
+                platform,
+            });
+            if (flags.json) {
+                (0, json_1.printJsonOnlyOutput)((0, formatCustomEvents_1.buildObserveCustomEventsEmptyWithSuggestionsJson)(args.eventName, names, isTruncated));
+            }
+            else {
+                log_1.default.addNewLineIfNone();
+                log_1.default.log((0, formatCustomEvents_1.buildObserveCustomEventsEmptyWithSuggestionsTable)(args.eventName, names, {
+                    daysBack,
+                    startTime,
+                    endTime,
+                    isTruncated,
+                }));
+            }
+            return;
+        }
+        if (flags.json) {
+            (0, json_1.printJsonOnlyOutput)((0, formatCustomEvents_1.buildObserveCustomEventsJson)(events, pageInfo));
+        }
+        else {
+            log_1.default.addNewLineIfNone();
+            log_1.default.log((0, formatCustomEvents_1.buildObserveCustomEventsTable)(events, pageInfo, {
+                eventName: args.eventName,
+                daysBack,
+                startTime,
+                endTime,
+            }));
+        }
+    }
+}
+exports.default = ObserveLogs;

package/build/commands/observe/metrics.js

@@ -4,11 +4,12 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
-const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const fetchMetrics_1 = require("../../observe/fetchMetrics");
 const formatMetrics_1 = require("../../observe/formatMetrics");
 const metricNames_1 = require("../../observe/metricNames");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
 const startAndEndTime_1 = require("../../observe/startAndEndTime");
 const json_1 = require("../../utils/json");
 const DEFAULT_METRICS = [
@@ -35,7 +36,7 @@ class ObserveMetrics extends EasCommand_1.default {
     static flags = {
         platform: core_1.Flags.option({
             description: 'Filter by platform',
-            options: Object.values(generated_1.AppObservePlatform).map(s => s.toLowerCase()),
+            options: platforms_1.allowedPlatformFlagValues,
         })(),
         metric: core_1.Flags.option({
             description: 'Metric name to display (can be specified multiple times).',
@@ -74,20 +75,13 @@ class ObserveMetrics extends EasCommand_1.default {
     };
     async runAsync() {
         const { flags } = await this.parse(ObserveMetrics);
-        let projectId;
-        let graphqlClient;
-        if (flags['project-id']) {
-            projectId = flags['project-id'];
-            const ctx = await this.getContextAsync({ contextDefinition: ObserveMetrics.loggedInOnlyContextDefinition }, { nonInteractive: flags['non-interactive'] });
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
-        else {
-            const ctx = await this.getContextAsync(ObserveMetrics, {
-                nonInteractive: flags['non-interactive'],
-            });
-            projectId = ctx.projectId;
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveMetrics,
+            loggedInOnlyContextDefinition: ObserveMetrics.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
@@ -98,9 +92,7 @@ class ObserveMetrics extends EasCommand_1.default {
             ? flags.metric.map(metricNames_1.resolveMetricName)
             : DEFAULT_METRICS;
         const { daysBack, startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
-        const platforms = flags.platform
-            ? [flags.platform === 'android' ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios]
-            : [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+        const platforms = (0, platforms_1.appPlatformsFromFlag)(flags.platform);
         const { metricsMap, buildNumbersMap, updateIdsMap, totalEventCounts } = await (0, fetchMetrics_1.fetchObserveMetricsAsync)(graphqlClient, projectId, metricNames, platforms, startTime, endTime);
         const argumentsStat = flags.stat?.length
             ? Array.from(new Set(flags.stat.map(formatMetrics_1.resolveStatKey)))

package/build/commands/observe/versions.js

@@ -4,10 +4,11 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
-const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const fetchVersions_1 = require("../../observe/fetchVersions");
 const formatVersions_1 = require("../../observe/formatVersions");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
 const startAndEndTime_1 = require("../../observe/startAndEndTime");
 const json_1 = require("../../utils/json");
 class ObserveVersions extends EasCommand_1.default {
@@ -16,7 +17,7 @@ class ObserveVersions extends EasCommand_1.default {
     static flags = {
         platform: core_1.Flags.option({
             description: 'Filter by platform',
-            options: Object.values(generated_1.AppObservePlatform).map(s => s.toLowerCase()),
+            options: platforms_1.allowedPlatformFlagValues,
         })(),
         start: core_1.Flags.string({
             description: 'Start of time range (ISO date)',
@@ -45,20 +46,13 @@ class ObserveVersions extends EasCommand_1.default {
     };
     async runAsync() {
         const { flags } = await this.parse(ObserveVersions);
-        let projectId;
-        let graphqlClient;
-        if (flags['project-id']) {
-            projectId = flags['project-id'];
-            const ctx = await this.getContextAsync({ contextDefinition: ObserveVersions.loggedInOnlyContextDefinition }, { nonInteractive: flags['non-interactive'] });
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
-        else {
-            const ctx = await this.getContextAsync(ObserveVersions, {
-                nonInteractive: flags['non-interactive'],
-            });
-            projectId = ctx.projectId;
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveVersions,
+            loggedInOnlyContextDefinition: ObserveVersions.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
@@ -66,9 +60,7 @@ class ObserveVersions extends EasCommand_1.default {
             log_1.default.warn('EAS Observe is in preview and subject to breaking changes.');
         }
         const { startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
-        const platforms = flags.platform
-            ? [flags.platform === 'android' ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios]
-            : [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+        const platforms = (0, platforms_1.appPlatformsFromFlag)(flags.platform);
         const results = await (0, fetchVersions_1.fetchObserveVersionsAsync)(graphqlClient, projectId, platforms, startTime, endTime);
         if (flags.json) {
             (0, json_1.printJsonOnlyOutput)((0, formatVersions_1.buildObserveVersionsJson)(results));

package/build/commands/simulator/start.js

@@ -51,6 +51,7 @@ class SimulatorStart extends EasCommand_1.default {
         const platform = flags.platform === 'android' ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios;
         const createSpinner = (0, ora_1.ora)('🚀 Creating device run session').start();
         let deviceRunSessionId;
+        let jobRunUrl;
         try {
             const session = await DeviceRunSessionMutation_1.DeviceRunSessionMutation.createDeviceRunSessionAsync(graphqlClient, {
                 appId: projectId,
@@ -60,7 +61,7 @@ class SimulatorStart extends EasCommand_1.default {
             });
             deviceRunSessionId = session.id;
             const jobRunId = (0, nullthrows_1.default)(session.turtleJobRun?.id, 'Expected device run session to start');
-            const jobRunUrl = (0, url_1.getBareJobRunUrl)(session.app.ownerAccount.name, session.app.slug, jobRunId);
+            jobRunUrl = (0, url_1.getBareJobRunUrl)(session.app.ownerAccount.name, session.app.slug, jobRunId);
             createSpinner.succeed(`Device run session created (id: ${deviceRunSessionId}) ${(0, log_1.link)(jobRunUrl)}`);
         }
         catch (err) {
@@ -76,13 +77,13 @@ class SimulatorStart extends EasCommand_1.default {
                 const session = await DeviceRunSessionQuery_1.DeviceRunSessionQuery.byIdAsync(graphqlClient, deviceRunSessionId);
                 if (session.status === generated_1.DeviceRunSessionStatus.Errored ||
                     session.status === generated_1.DeviceRunSessionStatus.Stopped) {
-                    throw new Error(`Device run session ${deviceRunSessionId} ${session.status.toLowerCase()} before the ${flags.type} daemon was ready.`);
+                    throw new Error(`Device run session ${deviceRunSessionId} ${session.status.toLowerCase()} before the ${flags.type} daemon was ready. ${(0, log_1.link)(jobRunUrl)}`);
                 }
                 const jobRunStatus = session.turtleJobRun?.status;
                 if (jobRunStatus === generated_1.JobRunStatus.Errored ||
                     jobRunStatus === generated_1.JobRunStatus.Canceled ||
                     jobRunStatus === generated_1.JobRunStatus.Finished) {
-                    throw new Error(`Turtle job run for device run session ${deviceRunSessionId} ${jobRunStatus.toLowerCase()} before the ${flags.type} daemon was ready.`);
+                    throw new Error(`Turtle job run for device run session ${deviceRunSessionId} ${jobRunStatus.toLowerCase()} before the ${flags.type} daemon was ready. ${(0, log_1.link)(jobRunUrl)}`);
                 }
                 const logMessages = await fetchLogMessagesAsync(session.turtleJobRun?.logFileUrls ?? []);
                 result = checkReadiness(logMessages);
@@ -95,21 +96,99 @@ class SimulatorStart extends EasCommand_1.default {
         }
         catch (err) {
             pollSpinner.fail(`Failed while polling for ${flags.type} daemon logs`);
+            await ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId);
             throw err;
         }
         if (!result.ready) {
             pollSpinner.fail(`Timed out waiting for ${flags.type} daemon to start`);
-            throw new Error(`Timed out after ${Math.round(POLL_TIMEOUT_MS / 1000)}s waiting for ${flags.type} daemon to start.`);
+            await ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId);
+            throw new Error(`Timed out after ${Math.round(POLL_TIMEOUT_MS / 1000)}s waiting for ${flags.type} daemon to start. ${(0, log_1.link)(jobRunUrl)}`);
         }
         log_1.default.newLine();
         log_1.default.log(`🔑 Run the following in your shell to attach to ${flags.type}:`);
         log_1.default.newLine();
         log_1.default.log(result.message);
         log_1.default.newLine();
-        log_1.default.log(`When you are done, stop the session with: eas simulator:stop --id ${deviceRunSessionId}`);
+        if (flags['non-interactive']) {
+            log_1.default.log(`When you are done, stop the session with: eas simulator:stop --id ${deviceRunSessionId}`);
+            return;
+        }
+        await waitForSessionEndOrInterruptAsync({
+            graphqlClient,
+            deviceRunSessionId,
+            jobRunUrl,
+        });
     }
 }
 exports.default = SimulatorStart;
+async function waitForSessionEndOrInterruptAsync({ graphqlClient, deviceRunSessionId, jobRunUrl, }) {
+    const spinner = (0, ora_1.ora)(`Device run session active — press Ctrl+C to stop, or run \`eas simulator:stop --id ${deviceRunSessionId}\` from another shell`).start();
+    const abortController = new AbortController();
+    const { signal } = abortController;
+    const abortPromise = new Promise(resolve => {
+        signal.addEventListener('abort', () => {
+            resolve();
+        }, { once: true });
+    });
+    const sigintHandler = () => {
+        if (signal.aborted) {
+            // Force exit on a second Ctrl+C in case cleanup is hanging. The session may still be
+            // running on EAS, so tell the user how to make sure it gets terminated.
+            spinner.fail(`Aborted before the device run session could be stopped. Run \`eas simulator:stop --id ${deviceRunSessionId}\` to terminate it and avoid unexpected charges.`);
+            process.exit(130);
+        }
+        abortController.abort();
+    };
+    process.on('SIGINT', sigintHandler);
+    try {
+        while (!signal.aborted) {
+            let session;
+            try {
+                session = await DeviceRunSessionQuery_1.DeviceRunSessionQuery.byIdAsync(graphqlClient, deviceRunSessionId);
+            }
+            catch (err) {
+                log_1.default.debug(`Failed to poll device run session: ${err instanceof Error ? err.message : String(err)}`);
+                await Promise.race([(0, promise_1.sleepAsync)(POLL_INTERVAL_MS), abortPromise]);
+                continue;
+            }
+            const jobRunStatus = session.turtleJobRun?.status;
+            if (session.status === generated_1.DeviceRunSessionStatus.Errored ||
+                jobRunStatus === generated_1.JobRunStatus.Errored) {
+                spinner.fail(`Device run session errored. ${(0, log_1.link)(jobRunUrl)}`);
+                throw new Error(`Device run session ${deviceRunSessionId} errored.`);
+            }
+            if (session.status === generated_1.DeviceRunSessionStatus.Stopped ||
+                jobRunStatus === generated_1.JobRunStatus.Canceled ||
+                jobRunStatus === generated_1.JobRunStatus.Finished) {
+                spinner.succeed(`Device run session ended. ${(0, log_1.link)(jobRunUrl)}`);
+                return;
+            }
+            await Promise.race([(0, promise_1.sleepAsync)(POLL_INTERVAL_MS), abortPromise]);
+        }
+        spinner.text = 'Stopping device run session...';
+        const stopped = await ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId);
+        if (stopped) {
+            spinner.succeed('Device run session stopped');
+        }
+        else {
+            spinner.fail(`Could not confirm the device run session was stopped. Run \`eas simulator:stop --id ${deviceRunSessionId}\` to terminate it and avoid unexpected charges.`);
+        }
+    }
+    finally {
+        process.removeListener('SIGINT', sigintHandler);
+    }
+}
+async function ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId) {
+    try {
+        await DeviceRunSessionMutation_1.DeviceRunSessionMutation.ensureDeviceRunSessionStoppedAsync(graphqlClient, deviceRunSessionId);
+        return true;
+    }
+    catch (err) {
+        // Cleanup is best-effort; surface the failure but don't mask the original error.
+        log_1.default.warn(`Failed to stop device run session ${deviceRunSessionId}: ${err instanceof Error ? err.message : String(err)}`);
+        return false;
+    }
+}
 function getReadinessCheckerForType(type) {
     switch (type) {
         case DEVICE_RUN_SESSION_TYPE_FLAG_VALUES[generated_1.DeviceRunSessionType.AgentDevice]:

package/build/commands/simulator/stop.js

@@ -26,7 +26,7 @@ class SimulatorStop extends EasCommand_1.default {
         });
         const stopSpinner = (0, ora_1.ora)(`🛑 Stopping device run session ${flags.id}`).start();
         try {
-            const session = await DeviceRunSessionMutation_1.DeviceRunSessionMutation.stopDeviceRunSessionAsync(graphqlClient, flags.id);
+            const session = await DeviceRunSessionMutation_1.DeviceRunSessionMutation.ensureDeviceRunSessionStoppedAsync(graphqlClient, flags.id);
             stopSpinner.succeed(`🎉 Device run session ${session.id} is ${session.status.toLowerCase()}`);
         }
         catch (err) {