eoas 2.0.0 → 2.1.0

package/dist/commands/generate-certs.js

@@ -17,7 +17,7 @@ class GenerateCerts extends core_1.Command {
             message: 'In which directory would you like to store your code signing certificate (used by your expo app)?',
             name: 'certificateOutputDir',
             type: 'text',
-            initial: './keysStore',
+            initial: './certs',
             validate: v => {
                 try {
                     // eslint-disable-next-line
@@ -30,10 +30,10 @@ class GenerateCerts extends core_1.Command {
             },
         });
         const { keyOutputDir } = await (0, prompts_1.promptAsync)({
-            message: 'In which directory would you like to store your key pair (used by your OTA Server) ?. ⚠️ Those keysStore are sensitive and should be kept private.',
+            message: 'In which directory would you like to store your key pair (used by your OTA Server) ?. ⚠️ Those certss are sensitive and should be kept private.',
             name: 'keyOutputDir',
             type: 'text',
-            initial: './keysStore',
+            initial: './certs',
             validate: v => {
                 try {
                     // eslint-disable-next-line

package/dist/commands/init.js

@@ -49,19 +49,19 @@ class Init extends core_1.Command {
             }
         }
         const confirmed = await (0, prompts_1.confirmAsync)({
-            message: 'Do you have already generated your certificates and keysStore for code signing?',
+            message: 'Do you have already generated your certificates for code signing?',
             name: 'certificates',
             type: 'confirm',
         });
         if (!confirmed) {
-            log_1.default.fail('You need to generate your certificates first by using npx eoas generate-keysStore');
+            log_1.default.fail('You need to generate your certificates first by using npx eoas generate-certs');
             return;
         }
         const { codeSigningCertificatePath } = await (0, prompts_1.promptAsync)({
-            message: 'Enter the path to your code signing certificate (ex: ./keysStore/certificate.pem)',
+            message: 'Enter the path to your code signing certificate (ex: ./certs/certificate.pem)',
             name: 'codeSigningCertificatePath',
             type: 'text',
-            initial: './keysStore/certificate.pem',
+            initial: './certs/certificate.pem',
             validate: v => {
                 try {
                     const fullPath = path_1.default.resolve(projectDir, v);

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 %>'];
@@ -61,25 +56,26 @@ class Publish extends core_1.Command {
         const credentials = (0, auth_1.retrieveExpoCredentials)();
         if (!credentials.token && !credentials.sessionSecret) {
             log_1.default.error('You are not logged to eas, please run `eas login`');
-            return;
+            process.exit(1);
         }
         const { flags } = await this.parse(Publish);
         const { platform, nonInteractive, branch, channel } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
-            return;
+            process.exit(1);
         }
         if (!channel) {
             log_1.default.error('Channel name is required');
-            return;
+            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) {
             log_1.default.error('Expo is not installed in this project. Please install Expo first.');
-            return;
+            process.exit(1);
         }
         const privateConfig = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir, {
             env: {
@@ -89,7 +85,7 @@ class Publish extends core_1.Command {
         const updateUrl = (0, expoConfig_1.getExpoConfigUpdateUrl)(privateConfig);
         if (!updateUrl) {
             log_1.default.error("Update url is not setup in your config. Please run 'eoas init' to setup the update url");
-            return;
+            process.exit(1);
         }
         let baseUrl;
         try {
@@ -98,7 +94,7 @@ class Publish extends core_1.Command {
         }
         catch (e) {
             log_1.default.error('Invalid URL', e);
-            return;
+            process.exit(1);
         }
         if (!nonInteractive) {
             const confirmed = await (0, prompts_1.confirmAsync)({
@@ -108,44 +104,51 @@ class Publish extends core_1.Command {
             });
             if (!confirmed) {
                 log_1.default.error('Please run `eoas init` to setup the correct update url');
+                process.exit(1);
             }
         }
-        const runtimeSpinner = (0, ora_1.ora)('Resolving runtime version').start();
+        const runtimeSpinner = (0, ora_1.ora)('🔄 Resolving runtime version...').start();
         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');
-            return;
+            process.exit(1);
         }
-        runtimeSpinner.succeed('Runtime versions resolved');
-        const exportSpinner = (0, ora_1.ora)("Exporting project's static files").start();
+        runtimeSpinner.succeed('✅ Runtime versions resolved');
+        const exportSpinner = (0, ora_1.ora)('📦 Exporting project files...').start();
         try {
             await (0, spawn_async_1.default)('rm', ['-rf', 'dist'], { cwd: projectDir });
             const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'export', '--output-dir', 'dist'], {
@@ -155,39 +158,46 @@ class Publish extends core_1.Command {
                     EXPO_NO_DOTENV: '1',
                 },
             });
-            exportSpinner.succeed('Project exported successfully');
+            exportSpinner.succeed('🚀 Project exported successfully');
             log_1.default.withInfo(stdout);
         }
         catch {
-            exportSpinner.fail('Failed to export the project');
+            exportSpinner.fail('❌ Failed to export the project');
+            process.exit(1);
         }
         const publicConfig = await (0, expoConfig_1.getPublicExpoConfigAsync)(projectDir, {
             skipSDKVersionRequirement: true,
         });
         if (!publicConfig) {
             log_1.default.error('Could not find Expo config in this project. Please make sure you have an Expo config.');
-            return;
+            process.exit(1);
         }
         // eslint-disable-next-line
         fs_extra_1.default.writeJsonSync(path_1.default.join(projectDir, 'dist', 'expoConfig.json'), publicConfig, {
             spaces: 2,
         });
         log_1.default.withInfo('expoConfig.json file created in dist directory');
-        const uploadFilesSpinner = (0, ora_1.ora)('Uploading files to the server').start();
+        const uploadFilesSpinner = (0, ora_1.ora)('📤 Uploading files...').start();
         const files = (0, assets_1.computeFilesRequests)(projectDir, platform || expoConfig_1.RequestedPlatform.All);
         if (!files.length) {
             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();
@@ -234,15 +244,61 @@ class Publish extends core_1.Command {
                     body: buffer,
                 });
                 if (!response.ok) {
-                    log_1.default.error('Failed to upload file', await response.text());
-                    throw new Error('Failed to upload file');
+                    log_1.default.error('❌ File upload failed', await response.text());
+                    process.exit(1);
                 }
                 file.close();
             }));
-            uploadFilesSpinner.succeed('Files uploaded successfully');
+            uploadFilesSpinner.succeed('✅ Files uploaded successfully');
         }
-        catch {
-            uploadFilesSpinner.fail('Failed to upload static files');
+        catch (e) {
+            uploadFilesSpinner.fail('❌ Failed to upload static files');
+            log_1.default.error(e);
+            process.exit(1);
+        }
+        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!');
         }
     }
 }

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": "2.0.0",
+  "version": "2.1.0",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",