eoas 2.2.6 → 2.2.8

package/dist/commands/publish.js

@@ -4,15 +4,14 @@ const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const core_1 = require("@oclif/core");
-const fetch_retry_1 = tslib_1.__importDefault(require("fetch-retry"));
 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");
@@ -21,7 +20,6 @@ const repo_1 = require("../lib/repo");
 const runtimeVersion_1 = require("../lib/runtimeVersion");
 const vcs_1 = require("../lib/vcs");
 const workflow_1 = require("../lib/workflow");
-const fetch = (0, fetch_retry_1.default)(node_fetch_1.default);
 class Publish extends core_1.Command {
     static args = {};
     static description = 'Publish a new update to the self-hosted update server';
@@ -225,7 +223,7 @@ class Publish extends core_1.Command {
                 }
                 formData.append(itm.fileName, file);
                 if (isLocalBucketFileUpload) {
-                    const response = await fetchWithRetries(itm.requestUploadUrl, {
+                    const response = await (0, fetch_1.fetchWithRetries)(itm.requestUploadUrl, {
                         method: 'PUT',
                         headers: {
                             ...formData.getHeaders(),
@@ -250,7 +248,7 @@ class Publish extends core_1.Command {
                     contentType = 'application/octet-stream';
                 }
                 const buffer = await fs_extra_1.default.readFile(path_1.default.join(projectDir, outputDir, itm.filePath));
-                const response = await fetchWithRetries(itm.requestUploadUrl, {
+                const response = await (0, fetch_1.fetchWithRetries)(itm.requestUploadUrl, {
                     method: 'PUT',
                     headers: {
                         'Content-Type': contentType,
@@ -267,14 +265,13 @@ class Publish extends core_1.Command {
             uploadFilesSpinner.succeed('✅ Files uploaded successfully');
         }
         catch (e) {
-            console.log('e', 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 fetchWithRetries(`${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),
@@ -319,20 +316,3 @@ class Publish extends core_1.Command {
     }
 }
 exports.default = Publish;
-async function fetchWithRetries(url, options) {
-    return await fetch(url, {
-        ...options,
-        retryDelay(attempt) {
-            return Math.pow(2, attempt) * 500;
-        },
-        retries: 3,
-        retryOn: (attempt, error) => {
-            console.log(error);
-            if (error) {
-                log_1.default.warn(`Retry ${attempt} after network error:`, error.message);
-                return true;
-            }
-            return false;
-        },
-    });
-}

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()
@@ -74,7 +74,7 @@ function computeFilesRequests(projectDir, outputDir, 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.6",
+  "version": "2.2.8",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",
@@ -94,4 +94,4 @@
     "/bin",
     "/dist"
   ]
-}
+}

package/bin/dev.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\dev" %*

package/bin/dev.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
-(async () => {
-  const oclif = await import('@oclif/core');
-  await oclif.execute({ development: true, dir: __dirname });
-})();

package/bin/run.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\run" %*

package/bin/run.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-// eslint-disable-next-line unicorn/prefer-top-level-await
-(async () => {
-  const oclif = await import('@oclif/core')
-  await oclif.execute({dir: __dirname})
-})()