eoas 1.0.39 → 2.0.1

package/dist/commands/publish.d.ts

@@ -1,9 +1,5 @@
 import { Command } from '@oclif/core';
-import { Config } from '@oclif/core/lib/config';
-import { Client } from '../lib/vcs/vcs';
 export default class Publish extends Command {
-    vcsClient: Client;
-    constructor(argv: string[], config: Config);
     static args: {};
     static description: string;
     static examples: string[];

package/dist/commands/publish.js

@@ -21,11 +21,6 @@ const runtimeVersion_1 = require("../lib/runtimeVersion");
 const vcs_1 = require("../lib/vcs");
 const workflow_1 = require("../lib/workflow");
 class Publish extends core_1.Command {
-    vcsClient;
-    constructor(argv, config) {
-        super(argv, config);
-        this.vcsClient = (0, vcs_1.resolveVcsClient)(false);
-    }
     static args = {};
     static description = 'Publish a new update to the self-hosted update server';
     static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -73,8 +68,9 @@ class Publish extends core_1.Command {
             log_1.default.error('Channel name is required');
             process.exit(1);
         }
-        await this.vcsClient.ensureRepoExistsAsync();
-        await (0, repo_1.ensureRepoIsCleanAsync)(this.vcsClient, nonInteractive);
+        const vcsClient = (0, vcs_1.resolveVcsClient)(true);
+        await vcsClient.ensureRepoExistsAsync();
+        await (0, repo_1.ensureRepoIsCleanAsync)(vcsClient, nonInteractive);
         const projectDir = process.cwd();
         const hasExpo = (0, package_1.isExpoInstalled)(projectDir);
         if (!hasExpo) {
@@ -115,31 +111,37 @@ class Publish extends core_1.Command {
         const runtimeVersions = [
             ...(!platform || platform === expoConfig_1.RequestedPlatform.All || platform === expoConfig_1.RequestedPlatform.Ios
                 ? [
-                    (await (0, runtimeVersion_1.resolveRuntimeVersionAsync)({
-                        exp: privateConfig,
+                    {
+                        runtimeVersion: (await (0, runtimeVersion_1.resolveRuntimeVersionAsync)({
+                            exp: privateConfig,
+                            platform: 'ios',
+                            workflow: await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient),
+                            projectDir,
+                            env: {
+                                RELEASE_CHANNEL: channel,
+                            },
+                        }))?.runtimeVersion,
                         platform: 'ios',
-                        workflow: await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, this.vcsClient),
-                        projectDir,
-                        env: {
-                            RELEASE_CHANNEL: channel,
-                        },
-                    }))?.runtimeVersion,
+                    },
                 ]
                 : []),
             ...(!platform || platform === expoConfig_1.RequestedPlatform.All || platform === expoConfig_1.RequestedPlatform.Android
                 ? [
-                    (await (0, runtimeVersion_1.resolveRuntimeVersionAsync)({
-                        exp: privateConfig,
+                    {
+                        runtimeVersion: (await (0, runtimeVersion_1.resolveRuntimeVersionAsync)({
+                            exp: privateConfig,
+                            platform: 'android',
+                            workflow: await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID, vcsClient),
+                            projectDir,
+                            env: {
+                                RELEASE_CHANNEL: channel,
+                            },
+                        }))?.runtimeVersion,
                         platform: 'android',
-                        workflow: await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID, this.vcsClient),
-                        projectDir,
-                        env: {
-                            RELEASE_CHANNEL: channel,
-                        },
-                    }))?.runtimeVersion,
+                    },
                 ]
                 : []),
-        ].filter(Boolean);
+        ].filter(({ runtimeVersion }) => !!runtimeVersion);
         if (!runtimeVersions.length) {
             runtimeSpinner.fail('Could not resolve runtime versions for the requested platforms');
             log_1.default.error('Could not resolve runtime versions for the requested platforms');
@@ -181,16 +183,21 @@ class Publish extends core_1.Command {
             uploadFilesSpinner.fail('No files to upload');
             process.exit(1);
         }
+        let uploadUrls = [];
         try {
-            const uploadUrls = await Promise.all(runtimeVersions.map(runtimeVersion => {
+            uploadUrls = await Promise.all(runtimeVersions.map(async ({ runtimeVersion, platform }) => {
                 if (!runtimeVersion) {
                     throw new Error('Runtime version is not resolved');
                 }
-                return (0, assets_1.requestUploadUrls)({
-                    fileNames: files.map(file => file.path),
-                }, `${baseUrl}/requestUploadUrl/${branch}`, credentials, runtimeVersion);
+                return {
+                    ...(await (0, assets_1.requestUploadUrls)({
+                        fileNames: files.map(file => file.path),
+                    }, `${baseUrl}/requestUploadUrl/${branch}`, credentials, runtimeVersion)),
+                    runtimeVersion,
+                    platform,
+                };
             }));
-            const allItems = uploadUrls.flat();
+            const allItems = uploadUrls.flatMap(({ uploadRequests }) => uploadRequests);
             await Promise.all(allItems.map(async (itm) => {
                 const isLocalBucketFileUpload = itm.requestUploadUrl.startsWith(`${baseUrl}/uploadLocalFile`);
                 const formData = new form_data_1.default();
@@ -244,15 +251,55 @@ class Publish extends core_1.Command {
             }));
             uploadFilesSpinner.succeed('✅ Files uploaded successfully');
         }
-        catch {
+        catch (e) {
             uploadFilesSpinner.fail('❌ Failed to upload static files');
+            log_1.default.error(e);
             process.exit(1);
         }
-        console.log(`\n✅ Your update has been successfully pushed to ${updateUrl}`);
-        console.log(`🔗 Channel: \`${channel}\``);
-        console.log(`🌿 Branch: \`${branch}\``);
-        console.log(`⏳ Deployed at: \`${new Date().toUTCString()}\`\n`);
-        console.log('🔥 Your users will receive the latest update automatically!');
+        const markAsFinishedSpinner = (0, ora_1.ora)('🔗 Marking the updates as finished...').start();
+        const results = await Promise.all(uploadUrls.map(async ({ updateId, platform, runtimeVersion }) => {
+            const response = await (0, node_fetch_1.default)(`${baseUrl}/markUpdateAsUploaded/${branch}?platform=${platform}&updateId=${updateId}&runtimeVersion=${runtimeVersion}`, {
+                method: 'POST',
+                headers: {
+                    ...(0, auth_1.getAuthExpoHeaders)(credentials),
+                    'Content-Type': 'application/json',
+                },
+            });
+            // If success and status code = 200
+            if (response.ok) {
+                log_1.default.withInfo(`✅ Update ready for ${platform}`);
+                return 'deployed';
+            }
+            // If response.status === 406 duplicate update
+            if (response.status === 406) {
+                log_1.default.withInfo(`⚠️ There is no change in the update for ${platform}, ignored...`);
+                return 'identical';
+            }
+            log_1.default.error('❌ Failed to mark the update as finished for platform', platform);
+            log_1.default.newLine();
+            log_1.default.error(await response.text());
+            return 'error';
+        }));
+        const erroredUpdates = results.filter(result => result === 'error');
+        const hasSuccess = results.some(result => result === 'deployed');
+        const allIdentical = results.every(result => result === 'identical');
+        if (allIdentical) {
+            markAsFinishedSpinner.warn('⚠️ No changes found in the update, nothing to deploy');
+            return;
+        }
+        if (erroredUpdates.length) {
+            markAsFinishedSpinner.fail('❌ Some errors occurred while marking updates as finished');
+            throw new Error();
+        }
+        else {
+            markAsFinishedSpinner.succeed(`\n✅ Your update has been successfully pushed to ${updateUrl}`);
+        }
+        if (hasSuccess) {
+            log_1.default.withInfo(`🔗 Channel: \`${channel}\``);
+            log_1.default.withInfo(`🌿 Branch: \`${branch}\``);
+            log_1.default.withInfo(`⏳ Deployed at: \`${new Date().toUTCString()}\`\n`);
+            log_1.default.withInfo('🔥 Your users will receive the latest update automatically!');
+        }
     }
 }
 exports.default = Publish;

package/dist/lib/assets.d.ts

@@ -15,5 +15,8 @@ export interface RequestUploadUrlItem {
 }
 export declare function requestUploadUrls(body: {
     fileNames: string[];
-}, requestUploadUrl: string, auth: ExpoCredentials, runtimeVersion: string): Promise<RequestUploadUrlItem[]>;
+}, requestUploadUrl: string, auth: ExpoCredentials, runtimeVersion: string): Promise<{
+    uploadRequests: RequestUploadUrlItem[];
+    updateId: string;
+}>;
 export {};

package/package.json

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