eas-cli 18.11.0 → 18.12.1

package/build/commands/integrations/convex/connect.d.ts

@@ -12,6 +12,7 @@ export default class IntegrationsConvexConnect extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;
+    private upsertConvexUrlEasEnvVarAsync;
     private resolveRegionAsync;
     private resolveTeamNameAsync;
     private resolveProjectNameAsync;

package/build/commands/integrations/convex/connect.js

@@ -7,11 +7,15 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const environment_1 = require("../../../build/utils/environment");
 const EasCommand_1 = tslib_1.__importDefault(require("../../../commandUtils/EasCommand"));
 const convex_1 = require("../../../commandUtils/convex");
 const flags_1 = require("../../../commandUtils/flags");
+const generated_1 = require("../../../graphql/generated");
 const ConvexMutation_1 = require("../../../graphql/mutations/ConvexMutation");
+const EnvironmentVariableMutation_1 = require("../../../graphql/mutations/EnvironmentVariableMutation");
 const ConvexQuery_1 = require("../../../graphql/queries/ConvexQuery");
+const EnvironmentVariablesQuery_1 = require("../../../graphql/queries/EnvironmentVariablesQuery");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
 const ora_1 = require("../../../ora");
 const projectUtils_1 = require("../../../project/projectUtils");
@@ -21,6 +25,12 @@ const CONVEX_REGIONS = [
     { title: 'EU West (aws-eu-west-1)', value: 'aws-eu-west-1' },
 ];
 const DEFAULT_REGION = 'aws-us-east-1';
+const EAS_CONVEX_ENV_VAR_NAME = 'EXPO_PUBLIC_CONVEX_URL';
+const EAS_CONVEX_ENVIRONMENTS = [
+    environment_1.DefaultEnvironment.Production,
+    environment_1.DefaultEnvironment.Preview,
+    environment_1.DefaultEnvironment.Development,
+];
 class IntegrationsConvexConnect extends EasCommand_1.default {
     static description = 'connect Convex to your Expo project';
     static contextDefinition = {
@@ -99,23 +109,63 @@ class IntegrationsConvexConnect extends EasCommand_1.default {
             spinner.fail('Failed to set up Convex project');
             throw error;
         }
-        // 6. Send team invite (non-fatal)
+        // 6. Save the Convex URL as an EAS environment variable for builds
+        await this.upsertConvexUrlEasEnvVarAsync(graphqlClient, projectId, setupResult.convexDeploymentUrl, nonInteractive);
+        // 7. Send team invite (non-fatal)
         const teamInviteResult = await this.sendTeamInviteAsync(graphqlClient, connection, actor, {
             nonInteractive,
         });
-        // 7. Write deploy key and URL to .env.local
+        // 8. Write deploy key and URL to .env.local
         await this.writeEnvLocalAsync(projectDir, setupResult.deployKey, setupResult.convexDeploymentUrl, nonInteractive);
-        // 8. Success message
+        // 9. Success message
         log_1.default.addNewLineIfNone();
         log_1.default.log(chalk_1.default.green('Convex is ready!'));
         log_1.default.newLine();
         log_1.default.log('Next steps:');
         log_1.default.log(`  1. Start the Convex dev server: ${chalk_1.default.cyan('npx convex dev')}`);
+        log_1.default.log(`  2. Learn how to connect to your new Convex database by following our quickstart guide: ${chalk_1.default.cyan('https://docs.expo.dev/guides/using-convex')}`);
+        log_1.default.log(`  3. Read more about Convex: ${chalk_1.default.cyan('https://docs.convex.dev/')}`);
         log_1.default.newLine();
         if (teamInviteResult === 'sent') {
             log_1.default.log(`Check your email for an invitation to join your Convex team. Accept it for full dashboard access.`);
         }
     }
+    async upsertConvexUrlEasEnvVarAsync(graphqlClient, projectId, convexUrl, nonInteractive) {
+        const existingVariables = await EnvironmentVariablesQuery_1.EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
+            appId: projectId,
+            filterNames: [EAS_CONVEX_ENV_VAR_NAME],
+        });
+        const existingProjectVariable = existingVariables.find(variable => variable.scope === generated_1.EnvironmentVariableScope.Project);
+        if (existingProjectVariable) {
+            if (!nonInteractive) {
+                const overwrite = await (0, prompts_1.confirmAsync)({
+                    message: `EAS already has an ${EAS_CONVEX_ENV_VAR_NAME} environment variable for this project. Overwrite it?`,
+                });
+                if (!overwrite) {
+                    log_1.default.warn(`Skipped updating EAS environment variable ${chalk_1.default.bold(EAS_CONVEX_ENV_VAR_NAME)}.`);
+                    return;
+                }
+            }
+            await EnvironmentVariableMutation_1.EnvironmentVariableMutation.updateAsync(graphqlClient, {
+                id: existingProjectVariable.id,
+                name: EAS_CONVEX_ENV_VAR_NAME,
+                value: convexUrl,
+                environments: EAS_CONVEX_ENVIRONMENTS,
+                visibility: generated_1.EnvironmentVariableVisibility.Public,
+                type: generated_1.EnvironmentSecretType.String,
+            });
+            log_1.default.withTick(`Updated EAS environment variable ${chalk_1.default.bold(EAS_CONVEX_ENV_VAR_NAME)} for builds`);
+            return;
+        }
+        await EnvironmentVariableMutation_1.EnvironmentVariableMutation.createForAppAsync(graphqlClient, {
+            name: EAS_CONVEX_ENV_VAR_NAME,
+            value: convexUrl,
+            environments: EAS_CONVEX_ENVIRONMENTS,
+            visibility: generated_1.EnvironmentVariableVisibility.Public,
+            type: generated_1.EnvironmentSecretType.String,
+        }, projectId);
+        log_1.default.withTick(`Created EAS environment variable ${chalk_1.default.bold(EAS_CONVEX_ENV_VAR_NAME)} for builds`);
+    }
     async resolveRegionAsync(flagValue, nonInteractive) {
         if (flagValue) {
             return flagValue;

package/build/commands/simulator/get.d.ts

@@ -0,0 +1,13 @@
+import EasCommand from '../../commandUtils/EasCommand';
+export default class SimulatorGet extends EasCommand {
+    static hidden: boolean;
+    static description: string;
+    static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        id: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
+    static contextDefinition: {
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
+    };
+    runAsync(): Promise<void>;
+}

package/build/commands/simulator/get.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const url_1 = require("../../build/utils/url");
+const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
+const generated_1 = require("../../graphql/generated");
+const DeviceRunSessionQuery_1 = require("../../graphql/queries/DeviceRunSessionQuery");
+const log_1 = tslib_1.__importStar(require("../../log"));
+const ora_1 = require("../../ora");
+const utils_1 = require("../../simulator/utils");
+class SimulatorGet extends EasCommand_1.default {
+    static hidden = true;
+    static description = '[EXPERIMENTAL] get info about a remote simulator session on EAS by its device run session ID';
+    static flags = {
+        id: core_1.Flags.string({
+            description: 'Device run session ID',
+            required: true,
+        }),
+        ...flags_1.EASNonInteractiveFlag,
+    };
+    static contextDefinition = {
+        ...this.ContextOptions.LoggedIn,
+    };
+    async runAsync() {
+        const { flags } = await this.parse(SimulatorGet);
+        const { loggedIn: { graphqlClient }, } = await this.getContextAsync(SimulatorGet, {
+            nonInteractive: flags['non-interactive'],
+        });
+        const fetchSpinner = (0, ora_1.ora)(`Fetching device run session ${flags.id}`).start();
+        let session;
+        try {
+            session = await DeviceRunSessionQuery_1.DeviceRunSessionQuery.byIdAsync(graphqlClient, flags.id);
+            fetchSpinner.succeed(`Fetched device run session ${session.id}`);
+        }
+        catch (err) {
+            fetchSpinner.fail(`Failed to fetch device run session ${flags.id}`);
+            throw err;
+        }
+        const jobRunUrl = session.turtleJobRun
+            ? (0, url_1.getBareJobRunUrl)(session.app.ownerAccount.name, session.app.slug, session.turtleJobRun.id)
+            : '';
+        log_1.default.newLine();
+        log_1.default.log(`ID:       ${session.id}`);
+        log_1.default.log(`Type:     ${session.type}`);
+        log_1.default.log(`Status:   ${session.status}`);
+        log_1.default.log(`URL:      ${jobRunUrl ? (0, log_1.link)(jobRunUrl) : ''}`);
+        if (session.status === generated_1.DeviceRunSessionStatus.InProgress) {
+            log_1.default.newLine();
+            if (session.remoteConfig) {
+                log_1.default.log((0, utils_1.formatRemoteSessionInstructions)(session.remoteConfig));
+            }
+            else {
+                log_1.default.log('⏳ Session is starting up — remote config is not available yet. Re-run this command in a moment.');
+            }
+        }
+    }
+}
+exports.default = SimulatorGet;

package/build/commands/simulator/start.js

@@ -10,6 +10,7 @@ const DeviceRunSessionMutation_1 = require("../../graphql/mutations/DeviceRunSes
 const DeviceRunSessionQuery_1 = require("../../graphql/queries/DeviceRunSessionQuery");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
+const utils_1 = require("../../simulator/utils");
 const promise_1 = require("../../utils/promise");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const POLL_INTERVAL_MS = 5_000; // 5 seconds
@@ -18,11 +19,12 @@ const POLL_TIMEOUT_MS = 15 * 60 * 1_000; // 15 minutes
 // so adding a new enum value in codegen fails the build until it is wired up here.
 const DEVICE_RUN_SESSION_TYPE_FLAG_VALUES = {
     [generated_1.DeviceRunSessionType.AgentDevice]: 'agent-device',
+    [generated_1.DeviceRunSessionType.ServeSim]: 'serve-sim',
 };
 const DEVICE_RUN_SESSION_TYPE_BY_FLAG_VALUE = Object.fromEntries(Object.entries(DEVICE_RUN_SESSION_TYPE_FLAG_VALUES).map(([type, value]) => [value, type]));
 class SimulatorStart extends EasCommand_1.default {
     static hidden = true;
-    static description = '[EXPERIMENTAL] start a remote simulator session on EAS and get the credentials to connect to it with the CLI tool of your choice';
+    static description = '[EXPERIMENTAL] start a remote simulator session on EAS and get instructions to connect to it';
     static flags = {
         platform: core_1.Flags.option({
             description: 'Device platform',
@@ -68,46 +70,42 @@ class SimulatorStart extends EasCommand_1.default {
             createSpinner.fail('Failed to create device run session');
             throw err;
         }
-        const checkReadiness = getReadinessCheckerForType(flags.type);
-        const pollSpinner = (0, ora_1.ora)(`⏳ Waiting for ${flags.type} daemon to start`).start();
+        const pollSpinner = (0, ora_1.ora)(`⏳ Waiting for ${flags.type} session to be ready`).start();
         const deadline = Date.now() + POLL_TIMEOUT_MS;
-        let result = { ready: false };
+        let remoteConfig;
         try {
             while (Date.now() < deadline) {
                 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. ${(0, log_1.link)(jobRunUrl)}`);
+                    throw new Error(`Device run session ${deviceRunSessionId} ${session.status.toLowerCase()} before the ${flags.type} session 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. ${(0, log_1.link)(jobRunUrl)}`);
+                    throw new Error(`Turtle job run for device run session ${deviceRunSessionId} ${jobRunStatus.toLowerCase()} before the ${flags.type} session was ready. ${(0, log_1.link)(jobRunUrl)}`);
                 }
-                const logMessages = await fetchLogMessagesAsync(session.turtleJobRun?.logFileUrls ?? []);
-                result = checkReadiness(logMessages);
-                if (result.ready) {
-                    pollSpinner.succeed(`🎉 ${flags.type} daemon is ready`);
+                if (session.remoteConfig) {
+                    remoteConfig = session.remoteConfig;
+                    pollSpinner.succeed(`🎉 ${flags.type} session is ready`);
                     break;
                 }
                 await (0, promise_1.sleepAsync)(POLL_INTERVAL_MS);
             }
         }
         catch (err) {
-            pollSpinner.fail(`Failed while polling for ${flags.type} daemon logs`);
+            pollSpinner.fail(`Failed while polling for ${flags.type} session to be ready`);
             await ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId);
             throw err;
         }
-        if (!result.ready) {
-            pollSpinner.fail(`Timed out waiting for ${flags.type} daemon to start`);
+        if (!remoteConfig) {
+            pollSpinner.fail(`Timed out waiting for ${flags.type} session to be ready`);
             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)}`);
+            throw new Error(`Timed out after ${Math.round(POLL_TIMEOUT_MS / 1000)}s waiting for ${flags.type} session to be ready. ${(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.log((0, utils_1.formatRemoteSessionInstructions)(remoteConfig));
         log_1.default.newLine();
         if (flags['non-interactive']) {
             log_1.default.log(`When you are done, stop the session with: eas simulator:stop --id ${deviceRunSessionId}`);
@@ -189,96 +187,3 @@ async function ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRun
         return false;
     }
 }
-function getReadinessCheckerForType(type) {
-    switch (type) {
-        case DEVICE_RUN_SESSION_TYPE_FLAG_VALUES[generated_1.DeviceRunSessionType.AgentDevice]:
-            return checkAgentDeviceReadiness;
-        default:
-            throw new Error(`Unsupported device run session type: ${type}`);
-    }
-}
-const AGENT_DEVICE_BASE_URL_ENV_VAR = 'AGENT_DEVICE_DAEMON_BASE_URL';
-const AGENT_DEVICE_AUTH_TOKEN_ENV_VAR = 'AGENT_DEVICE_DAEMON_AUTH_TOKEN';
-function checkAgentDeviceReadiness(logMessages) {
-    let baseUrl;
-    let authToken;
-    for (const msg of logMessages) {
-        baseUrl = baseUrl ?? extractExportedEnvValue(msg, AGENT_DEVICE_BASE_URL_ENV_VAR);
-        authToken = authToken ?? extractExportedEnvValue(msg, AGENT_DEVICE_AUTH_TOKEN_ENV_VAR);
-        if (baseUrl && authToken) {
-            break;
-        }
-    }
-    if (baseUrl && authToken) {
-        return {
-            ready: true,
-            message: [
-                `export ${AGENT_DEVICE_BASE_URL_ENV_VAR}='${baseUrl}'`,
-                `export ${AGENT_DEVICE_AUTH_TOKEN_ENV_VAR}='${authToken}'`,
-            ].join('\n'),
-        };
-    }
-    return { ready: false };
-}
-async function fetchLogMessagesAsync(logUrls) {
-    const messages = [];
-    for (const url of logUrls) {
-        const text = await fetchLogTextAsync(url);
-        if (!text) {
-            continue;
-        }
-        for (const line of text.split('\n')) {
-            if (!line.trim()) {
-                continue;
-            }
-            messages.push(extractLogMessage(line));
-        }
-    }
-    return messages;
-}
-async function fetchLogTextAsync(url) {
-    try {
-        const response = await fetch(url);
-        if (!response.ok) {
-            return undefined;
-        }
-        return await response.text();
-    }
-    catch {
-        return undefined;
-    }
-}
-function extractLogMessage(line) {
-    // Turtle job run logs are JSONL (bunyan-shaped), e.g.
-    //   {"msg":"export FOO=\"bar\"","time":"...","logId":"..."}
-    // Fall back to the raw line if it's not JSON or doesn't have a string msg.
-    const trimmed = line.trim();
-    if (!trimmed.startsWith('{')) {
-        return line;
-    }
-    try {
-        const parsed = JSON.parse(trimmed);
-        if (parsed && typeof parsed === 'object' && 'msg' in parsed) {
-            const msg = parsed.msg;
-            if (typeof msg === 'string') {
-                return msg;
-            }
-        }
-    }
-    catch {
-        // not JSON, fall through
-    }
-    return line;
-}
-function extractExportedEnvValue(text, varName) {
-    // Matches: export NAME=value | export NAME="value" | export NAME='value'
-    const pattern = new RegExp(`export\\s+${escapeRegExp(varName)}=(?:"([^"]*)"|'([^']*)'|(\\S+))`);
-    const match = pattern.exec(text);
-    if (!match) {
-        return undefined;
-    }
-    return match[1] ?? match[2] ?? match[3];
-}
-function escapeRegExp(value) {
-    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}