eoas 2.2.5 → 2.2.7

package/dist/commands/publish.d.ts

@@ -8,6 +8,7 @@ export default class Publish extends Command {
         channel: 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>;
+        outputDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     private sanitizeFlags;
     run(): Promise<void>;

package/dist/commands/publish.js

@@ -7,11 +7,11 @@ const core_1 = require("@oclif/core");
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const mime_1 = tslib_1.__importDefault(require("mime"));
-const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const assets_1 = require("../lib/assets");
 const auth_1 = require("../lib/auth");
 const expoConfig_1 = require("../lib/expoConfig");
+const fetch_1 = require("../lib/fetch");
 const log_1 = tslib_1.__importDefault(require("../lib/log"));
 const ora_1 = require("../lib/ora");
 const package_1 = require("../lib/package");
@@ -43,6 +43,10 @@ class Publish extends core_1.Command {
             description: 'Run command in non-interactive mode',
             default: false,
         }),
+        outputDir: core_1.Flags.string({
+            description: "Where to write build output. You can override the default dist output directory if it's being used by something else",
+            default: 'dist',
+        }),
     };
     sanitizeFlags(flags) {
         return {
@@ -50,6 +54,7 @@ class Publish extends core_1.Command {
             branch: flags.branch,
             nonInteractive: flags.nonInteractive,
             channel: flags.channel,
+            outputDir: flags.outputDir,
         };
     }
     async run() {
@@ -59,7 +64,7 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
-        const { platform, nonInteractive, branch, channel } = this.sanitizeFlags(flags);
+        const { platform, nonInteractive, branch, channel, outputDir } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
             process.exit(1);
@@ -151,8 +156,8 @@ class Publish extends core_1.Command {
         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'], {
+            await (0, spawn_async_1.default)('rm', ['-rf', outputDir], { cwd: projectDir });
+            const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'export', '--output-dir', outputDir], {
                 cwd: projectDir,
                 env: {
                     ...process.env,
@@ -174,12 +179,12 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         // eslint-disable-next-line
-        fs_extra_1.default.writeJsonSync(path_1.default.join(projectDir, 'dist', 'expoConfig.json'), publicConfig, {
+        fs_extra_1.default.writeJsonSync(path_1.default.join(projectDir, outputDir, 'expoConfig.json'), publicConfig, {
             spaces: 2,
         });
-        log_1.default.withInfo('expoConfig.json file created in dist directory');
+        log_1.default.withInfo(`expoConfig.json file created in ${outputDir} directory`);
         const uploadFilesSpinner = (0, ora_1.ora)('📤 Uploading files...').start();
-        const files = (0, assets_1.computeFilesRequests)(projectDir, platform || expoConfig_1.RequestedPlatform.All);
+        const files = (0, assets_1.computeFilesRequests)(projectDir, outputDir, platform || expoConfig_1.RequestedPlatform.All);
         if (!files.length) {
             uploadFilesSpinner.fail('No files to upload');
             process.exit(1);
@@ -211,14 +216,14 @@ class Publish extends core_1.Command {
                 const formData = new form_data_1.default();
                 let file;
                 try {
-                    file = fs_extra_1.default.createReadStream(path_1.default.join(projectDir, 'dist', itm.filePath));
+                    file = fs_extra_1.default.createReadStream(path_1.default.join(projectDir, outputDir, itm.filePath));
                 }
                 catch {
                     throw new Error(`Failed to read file ${itm.filePath}`);
                 }
                 formData.append(itm.fileName, file);
                 if (isLocalBucketFileUpload) {
-                    const response = await (0, node_fetch_1.default)(itm.requestUploadUrl, {
+                    const response = await (0, fetch_1.fetchWithRetries)(itm.requestUploadUrl, {
                         method: 'PUT',
                         headers: {
                             ...formData.getHeaders(),
@@ -242,8 +247,8 @@ class Publish extends core_1.Command {
                 if (!contentType) {
                     contentType = 'application/octet-stream';
                 }
-                const buffer = await fs_extra_1.default.readFile(path_1.default.join(projectDir, 'dist', itm.filePath));
-                const response = await (0, node_fetch_1.default)(itm.requestUploadUrl, {
+                const buffer = await fs_extra_1.default.readFile(path_1.default.join(projectDir, outputDir, itm.filePath));
+                const response = await (0, fetch_1.fetchWithRetries)(itm.requestUploadUrl, {
                     method: 'PUT',
                     headers: {
                         'Content-Type': contentType,
@@ -266,7 +271,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 response = await (0, node_fetch_1.default)(`${baseUrl}/markUpdateAsUploaded/${branch}?platform=${platform}&updateId=${updateId}&runtimeVersion=${runtimeVersion}`, {
+            const response = await (0, fetch_1.fetchWithRetries)(`${baseUrl}/markUpdateAsUploaded/${branch}?platform=${platform}&updateId=${updateId}&runtimeVersion=${runtimeVersion}`, {
                 method: 'POST',
                 headers: {
                     ...(0, auth_1.getAuthExpoHeaders)(credentials),

package/dist/lib/assets.d.ts

@@ -7,7 +7,7 @@ interface AssetToUpload {
     name: string;
     ext: string;
 }
-export declare function computeFilesRequests(projectDir: string, requestedPlatform: RequestedPlatform): AssetToUpload[];
+export declare function computeFilesRequests(projectDir: string, outputDir: string, requestedPlatform: RequestedPlatform): AssetToUpload[];
 export interface RequestUploadUrlItem {
     requestUploadUrl: string;
     fileName: string;

package/dist/lib/assets.js

@@ -4,10 +4,10 @@ exports.requestUploadUrls = exports.computeFilesRequests = exports.MetadataJoi =
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const joi_1 = tslib_1.__importDefault(require("joi"));
-const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const auth_1 = require("./auth");
 const expoConfig_1 = require("./expoConfig");
+const fetch_1 = require("./fetch");
 const log_1 = tslib_1.__importDefault(require("./log"));
 const fileMetadataJoi = joi_1.default.object({
     assets: joi_1.default.array()
@@ -54,8 +54,8 @@ function loadMetadata(distRoot) {
     log_1.default.debug(`Loaded ${platforms.length} platform(s): ${platforms.join(', ')}`);
     return metadata;
 }
-function computeFilesRequests(projectDir, requestedPlatform) {
-    const metadata = loadMetadata(path_1.default.join(projectDir, 'dist'));
+function computeFilesRequests(projectDir, outputDir, requestedPlatform) {
+    const metadata = loadMetadata(path_1.default.join(projectDir, outputDir));
     const assets = [
         { path: 'metadata.json', name: 'metadata.json', ext: 'json' },
         { path: 'expoConfig.json', name: 'expoConfig.json', ext: 'json' },
@@ -74,7 +74,7 @@ function computeFilesRequests(projectDir, requestedPlatform) {
 }
 exports.computeFilesRequests = computeFilesRequests;
 async function requestUploadUrls({ body, requestUploadUrl, auth, runtimeVersion, platform, commitHash, }) {
-    const response = await (0, node_fetch_1.default)(`${requestUploadUrl}?runtimeVersion=${runtimeVersion}&platform=${platform}&commitHash=${commitHash || ''}`, {
+    const response = await (0, fetch_1.fetchWithRetries)(`${requestUploadUrl}?runtimeVersion=${runtimeVersion}&platform=${platform}&commitHash=${commitHash || ''}`, {
         method: 'POST',
         headers: {
             ...(0, auth_1.getAuthExpoHeaders)(auth),
@@ -83,7 +83,8 @@ async function requestUploadUrls({ body, requestUploadUrl, auth, runtimeVersion,
         body: JSON.stringify(body),
     });
     if (!response.ok) {
-        throw new Error(`Failed to request upload URL`);
+        const text = await response.text();
+        throw new Error(`Failed to request upload URL: ${text}`);
     }
     return await response.json();
 }

package/dist/lib/fetch.d.ts

@@ -0,0 +1,2 @@
+import { RequestInit, Response } from 'node-fetch';
+export declare function fetchWithRetries(url: string, options: RequestInit): Promise<Response>;

package/dist/lib/fetch.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchWithRetries = void 0;
+const tslib_1 = require("tslib");
+const fetch_retry_1 = tslib_1.__importDefault(require("fetch-retry"));
+const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
+const log_1 = tslib_1.__importDefault(require("./log"));
+const fetch = (0, fetch_retry_1.default)(node_fetch_1.default);
+async function fetchWithRetries(url, options) {
+    return await fetch(url, {
+        ...options,
+        retryDelay(attempt) {
+            return Math.pow(2, attempt) * 500;
+        },
+        retryOn: (attempt, error) => {
+            if (attempt > 3) {
+                return false;
+            }
+            if (error) {
+                log_1.default.warn(`Retry ${attempt} after network error:`, error.message);
+                return true;
+            }
+            return false;
+        },
+    });
+}
+exports.fetchWithRetries = fetchWithRetries;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoas",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",
@@ -35,7 +35,9 @@
     "@urql/exchange-retry": "1.2.0",
     "better-opn": "3.0.2",
     "chalk": "4.1.2",
+    "eslint": "^8.57.1",
     "fast-glob": "3.3.2",
+    "fetch-retry": "^6.0.0",
     "figures": "3.2.0",
     "file-type": "^20.0.0",
     "form-data": "^4.0.1",
@@ -47,19 +49,18 @@
     "ignore": "5.3.0",
     "joi": "17.11.0",
     "jscodeshift": "^17.1.2",
+    "log-symbols": "^4.0.0",
     "mime": "3.0.0",
     "node-fetch": "^2.6.7",
     "ora": "^5.1.0",
+    "prettier": "3.1.1",
     "prompts": "^2.4.2",
     "recast": "^0.23.9",
     "resolve-from": "5.0.0",
     "semver": "7.5.4",
     "tar": "6.2.1",
     "terminal-link": "2.1.1",
-    "uuid": "9.0.1",
-    "eslint": "^8.57.1",
-    "prettier": "3.1.1",
-    "log-symbols": "^4.0.0"
+    "uuid": "9.0.1"
   },
   "devDependencies": {
     "@babel/parser": "^7.26.7",