eas-cli 18.9.1 → 18.11.0

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) {

package/build/fingerprint/cli.js

@@ -69,6 +69,7 @@ async function createFingerprintWithoutLoggingAsync(projectDir, fingerprintPath,
     if (options.debug) {
         fingerprintOptions.debug = true;
     }
+    fingerprintOptions.silent = true;
     return await withTemporaryEnvAsync(options.env ?? {}, () => Fingerprint.createFingerprintAsync(projectDir, fingerprintOptions));
 }
 async function withTemporaryEnvAsync(envVars, fn) {