eoas 2.3.17 → 3.0.0-alpha.1

package/dist/commands/init.js

@@ -27,6 +27,16 @@ class Init extends core_1.Command {
             log_1.default.error('Could not find Expo config in this project. Please make sure you have an Expo config.');
             return;
         }
+        const detectedAppId = config.extra?.eas
+            ?.projectId;
+        const { appId } = await (0, prompts_1.promptAsync)({
+            message: 'Enter the Expo project id for this project (sent as the expo-app-id header).\n' +
+                '  See https://axelmarciano.github.io/expo-open-ota/docs/getting-started/prerequisites for details.',
+            name: 'appId',
+            type: 'text',
+            initial: detectedAppId,
+            validate: v => !!v,
+        });
         const { updateUrl: promptedUrl } = await (0, prompts_1.promptAsync)({
             message: 'Enter the URL of your update server (ex: https://customota.com)',
             name: 'updateUrl',
@@ -95,6 +105,7 @@ class Init extends core_1.Command {
             enabled: true,
             requestHeaders: {
                 'expo-channel-name': 'process.env.RELEASE_CHANNEL',
+                'expo-app-id': appId,
             },
         };
         const updateConfigSpinner = (0, ora_1.ora)('Updating Expo config').start();

package/dist/commands/publish.js

@@ -111,6 +111,7 @@ class Publish extends core_1.Command {
             log_1.default.error(e.message);
             process.exit(1);
         });
+        const appId = (0, expoConfig_1.requireExpoAppId)(config);
         if (!nonInteractive) {
             const confirmed = await (0, prompts_1.confirmAsync)({
                 message: `Is this the correct URL of your self-hosted update server? ${serverUrl}`,
@@ -231,7 +232,7 @@ class Publish extends core_1.Command {
                         body: {
                             fileNames: files.map(file => file.path),
                         },
-                        requestUploadUrl: `${serverUrl}/requestUploadUrl/${branch}`,
+                        requestUploadUrl: `${serverUrl}/${appId}/requestUploadUrl/${branch}`,
                         auth: credentials,
                         runtimeVersion,
                         platform,
@@ -244,7 +245,7 @@ class Publish extends core_1.Command {
             }));
             const allItems = uploadUrls.flatMap(({ uploadRequests }) => uploadRequests);
             await Promise.all(allItems.map(async (itm) => {
-                const isLocalBucketFileUpload = itm.requestUploadUrl.startsWith(`${serverUrl}/uploadLocalFile`);
+                const isLocalBucketFileUpload = itm.requestUploadUrl.startsWith(`${serverUrl}/${appId}/uploadLocalFile`);
                 const formData = new form_data_1.default();
                 let file;
                 try {
@@ -303,7 +304,7 @@ class Publish extends core_1.Command {
         }
         const markAsFinishedSpinner = (0, ora_1.ora)('🔗 Marking the updates as finished...').start();
         const results = await Promise.all(uploadUrls.map(async ({ updateId, platform, runtimeVersion }) => {
-            const markAsUploadedUrl = new URL(`${serverUrl}/markUpdateAsUploaded/${branch}`);
+            const markAsUploadedUrl = new URL(`${serverUrl}/${appId}/markUpdateAsUploaded/${branch}`);
             markAsUploadedUrl.searchParams.set('platform', platform);
             markAsUploadedUrl.searchParams.set('updateId', updateId);
             markAsUploadedUrl.searchParams.set('runtimeVersion', runtimeVersion);

package/dist/commands/republish.js

@@ -65,6 +65,7 @@ class Publish extends core_1.Command {
             log_1.default.error("Update url is not setup in your config. Please run 'eoas init' to setup the update url");
             process.exit(1);
         }
+        const appId = (0, expoConfig_1.requireExpoAppId)(privateConfig);
         let baseUrl;
         try {
             const parsedUrl = new URL(updateUrl);
@@ -74,9 +75,12 @@ class Publish extends core_1.Command {
             log_1.default.error('Invalid URL', e);
             process.exit(1);
         }
-        const runtimeVersionsEndpoint = `${baseUrl}/api/branch/${branch}/runtimeVersions`;
+        const runtimeVersionsEndpoint = `${baseUrl}/api/apps/${appId}/branch/${branch}/runtimeVersions`;
         const response = await (0, fetch_1.fetchWithRetries)(runtimeVersionsEndpoint, {
-            headers: { ...(0, auth_1.getAuthExpoHeaders)(credentials), 'use-expo-auth': 'true' },
+            headers: {
+                ...(0, auth_1.getAuthExpoHeaders)(credentials),
+                'use-expo-auth': 'true',
+            },
         });
         if (!response.ok) {
             log_1.default.error(`Failed to fetch runtime versions: ${await response.text()}`);
@@ -99,9 +103,12 @@ class Publish extends core_1.Command {
             })),
         });
         log_1.default.log(`Selected runtime version: ${selectedRuntimeVersion.runtimeVersion}`);
-        const updatesEndpoint = `${baseUrl}/api/branch/${branch}/runtimeVersion/${selectedRuntimeVersion.runtimeVersion}/updates`;
+        const updatesEndpoint = `${baseUrl}/api/apps/${appId}/branch/${branch}/runtimeVersion/${selectedRuntimeVersion.runtimeVersion}/updates`;
         const updatesResponse = await (0, fetch_1.fetchWithRetries)(updatesEndpoint, {
-            headers: { ...(0, auth_1.getAuthExpoHeaders)(credentials), 'use-expo-auth': 'true' },
+            headers: {
+                ...(0, auth_1.getAuthExpoHeaders)(credentials),
+                'use-expo-auth': 'true',
+            },
         });
         if (!updatesResponse.ok) {
             log_1.default.error(`Failed to fetch updates: ${await updatesResponse.text()}`);
@@ -121,7 +128,7 @@ class Publish extends core_1.Command {
             })),
         });
         log_1.default.log(`Re-publishing update: ${selectedUpdated.update.updateUUID}`);
-        const republishUrl = new URL(`${baseUrl}/republish/${branch}`);
+        const republishUrl = new URL(`${baseUrl}/${appId}/republish/${branch}`);
         republishUrl.searchParams.set('platform', platform);
         republishUrl.searchParams.set('runtimeVersion', selectedRuntimeVersion.runtimeVersion);
         republishUrl.searchParams.set('updateId', selectedUpdated.update.updateId);

package/dist/commands/rollback.d.ts

@@ -6,6 +6,7 @@ export default class Publish extends Command {
     static flags: {
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        nonInteractive: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     private sanitizeFlags;
     run(): Promise<void>;

package/dist/commands/rollback.js

@@ -28,11 +28,16 @@ class Publish extends core_1.Command {
             description: 'Name of the branch to point to',
             required: true,
         }),
+        nonInteractive: core_1.Flags.boolean({
+            description: 'Run command in non-interactive mode',
+            default: false,
+        }),
     };
     sanitizeFlags(flags) {
         return {
             platform: flags.platform,
             branch: flags.branch,
+            nonInteractive: flags.nonInteractive,
         };
     }
     async run() {
@@ -42,7 +47,7 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
-        const { platform, branch } = this.sanitizeFlags(flags);
+        const { platform, branch, nonInteractive } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
             process.exit(1);
@@ -56,14 +61,16 @@ class Publish extends core_1.Command {
             log_1.default.error('Expo is not installed in this project. Please install Expo first.');
             process.exit(1);
         }
-        const confirmed = await (0, prompts_1.confirmAsync)({
-            message: `Are you sure you want to publish a rollback to the branch ${branch} ?`,
-            name: 'export',
-            type: 'confirm',
-        });
-        if (!confirmed) {
-            log_1.default.error('Operation cancelled');
-            process.exit(1);
+        if (!nonInteractive) {
+            const confirmed = await (0, prompts_1.confirmAsync)({
+                message: `Are you sure you want to publish a rollback to the branch ${branch} ?`,
+                name: 'export',
+                type: 'confirm',
+            });
+            if (!confirmed) {
+                log_1.default.error('Operation cancelled');
+                process.exit(1);
+            }
         }
         const privateConfig = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir, {
             env: process.env,
@@ -77,6 +84,7 @@ class Publish extends core_1.Command {
             log_1.default.error("Update url is not setup in your config. Please run 'eoas init' to setup the update url");
             process.exit(1);
         }
+        const appId = (0, expoConfig_1.requireExpoAppId)(privateConfig);
         let baseUrl;
         try {
             const parsedUrl = new URL(updateUrl);
@@ -126,7 +134,7 @@ class Publish extends core_1.Command {
         const rollbackSpinner = (0, ora_1.ora)('📦 Uploading rollback...').start();
         const erroredPlatforms = [];
         await Promise.all(runtimeVersions.map(async ({ runtimeVersion, platform }) => {
-            const rollbackUrl = new URL(`${baseUrl}/rollback/${branch}`);
+            const rollbackUrl = new URL(`${baseUrl}/${appId}/rollback/${branch}`);
             rollbackUrl.searchParams.set('commitHash', commitHash ?? '');
             rollbackUrl.searchParams.set('platform', platform);
             rollbackUrl.searchParams.set('runtimeVersion', runtimeVersion ?? '');

package/dist/lib/expoConfig.d.ts

@@ -21,5 +21,6 @@ export declare function ensureExpoConfigExists(projectDir: string): void;
 export declare function isUsingStaticExpoConfig(projectDir: string): boolean;
 export declare function getPublicExpoConfigAsync(projectDir: string, opts?: ExpoConfigOptions): Promise<PublicExpoConfig>;
 export declare function getExpoConfigUpdateUrl(config: ExpoConfig): string | undefined;
+export declare function requireExpoAppId(config: ExpoConfig): string;
 export declare function createOrModifyExpoConfigAsync(projectDir: string, exp: Partial<ExpoConfig>): Promise<void>;
 export declare function resolveServerUrl(config: ExpoConfig): Promise<string>;

package/dist/lib/expoConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveServerUrl = exports.createOrModifyExpoConfigAsync = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
+exports.resolveServerUrl = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
 const tslib_1 = require("tslib");
 // This file is copied from eas-cli[https://github.com/expo/eas-cli] to ensure consistent user experience across the CLI.
 const config_1 = require("@expo/config");
@@ -111,6 +111,18 @@ function getExpoConfigUpdateUrl(config) {
     return config.updates?.url;
 }
 exports.getExpoConfigUpdateUrl = getExpoConfigUpdateUrl;
+function requireExpoAppId(config) {
+    const appId = config.updates
+        ?.requestHeaders?.['expo-app-id'];
+    if (!appId) {
+        log_1.default.error("Your Expo config is missing the 'expo-app-id' entry in updates.requestHeaders.");
+        log_1.default.error("This usually means you're running eoas v3+ against a v3-style single-app config or your config is missing the 'expo-app-id' entry.");
+        log_1.default.error("Fix: run 'npx eoas init' to migrate, or pin to the previous CLI via 'npx eoas@2 ...'.");
+        process.exit(1);
+    }
+    return appId;
+}
+exports.requireExpoAppId = requireExpoAppId;
 async function createOrModifyExpoConfigAsync(projectDir, exp) {
     try {
         ensureExpoConfigExists(projectDir);
@@ -208,7 +220,7 @@ async function resolveServerUrl(config) {
         const parsedUrl = new URL(updateUrl);
         baseUrl = parsedUrl.origin;
     }
-    catch (e) {
+    catch {
         throw new Error('Invalid update URL.');
     }
     return baseUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoas",
-  "version": "2.3.17",
+  "version": "3.0.0-alpha.1",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",

package/dist/lib/channel.d.ts

@@ -1,2 +0,0 @@
-import { ExpoCredentials } from './auth';
-export declare function resolveReleaseChannelDynamicallyFromBranch(baseUrl: string, branch: string, credentials: ExpoCredentials): Promise<string>;

package/dist/lib/channel.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveReleaseChannelDynamicallyFromBranch = void 0;
-const auth_1 = require("./auth");
-const fetch_1 = require("./fetch");
-async function resolveReleaseChannelDynamicallyFromBranch(baseUrl, branch, credentials) {
-    const branchesEndpoint = `${baseUrl}/api/branches`;
-    const response = await (0, fetch_1.fetchWithRetries)(branchesEndpoint, {
-        headers: { ...(0, auth_1.getAuthExpoHeaders)(credentials), 'use-expo-auth': 'true' },
-    });
-    if (!response.ok) {
-        throw new Error(`Failed to retrieve branches from server: ${await response.text()}`);
-    }
-    const branches = (await response.json());
-    const branchInfo = branches.find(b => b.branchName === branch);
-    if (!branchInfo) {
-        throw new Error(`Branch ${branch} not found`);
-    }
-    if (!branchInfo.releaseChannel) {
-        throw new Error(`Branch ${branch} does not have a release channel linked`);
-    }
-    return branchInfo.releaseChannel;
-}
-exports.resolveReleaseChannelDynamicallyFromBranch = resolveReleaseChannelDynamicallyFromBranch;