@scrymore/scry-deployer 0.3.0 → 0.3.1

package/lib/apiClient.js

@@ -16,10 +16,83 @@ const logger = createLogger({ verbose: isVerbose });
 const COVERAGE_UPLOAD_DELAY_MS = 5000;
 const COVERAGE_RETRY_DELAY_MS = 60000;
 
+// The upload is the last step of a deploy, so a blip here discards several
+// minutes of completed screenshot capture. Retrying is far cheaper than
+// redoing that work. See ISSUES.md #19.
+const UPLOAD_MAX_ATTEMPTS = 4;
+const UPLOAD_BACKOFF_BASE_MS = 2000;
+
+// Network-level failures that a later attempt can plausibly survive. Flapping
+// DNS reports EAI_AGAIN (and, mid-flap, ENOTFOUND) rather than a clean refusal.
+const TRANSIENT_CODES = new Set([
+  'EAI_AGAIN',
+  'ENOTFOUND',
+  'ECONNRESET',
+  'ECONNREFUSED',
+  'ETIMEDOUT',
+  'ECONNABORTED',
+  'EPIPE',
+  'EHOSTUNREACH',
+  'ENETUNREACH',
+  'ERR_NETWORK',
+]);
+
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+/**
+ * Whether a failed upload attempt is worth repeating.
+ *
+ * A 4xx other than 429 means the request itself is wrong — retrying it just
+ * burns time and produces the identical failure.
+ *
+ * @param {Error & {code?: string, response?: {status?: number}}} error
+ * @returns {boolean}
+ */
+function isTransientUploadError(error) {
+  const status = error?.response?.status;
+  if (typeof status === 'number') {
+    return status === 429 || status >= 500;
+  }
+  return TRANSIENT_CODES.has(error?.code);
+}
+
+/**
+ * Run an upload attempt, repeating it while the failure looks transient.
+ *
+ * @template T
+ * @param {(attempt: number) => Promise<T>} attemptFn
+ * @param {string} label Shown in logs so a retried upload does not look like a hang.
+ * @returns {Promise<T>}
+ */
+async function withUploadRetry(attemptFn, label) {
+  let lastError;
+
+  for (let attempt = 1; attempt <= UPLOAD_MAX_ATTEMPTS; attempt++) {
+    try {
+      return await attemptFn(attempt);
+    } catch (error) {
+      lastError = error;
+
+      if (!isTransientUploadError(error) || attempt === UPLOAD_MAX_ATTEMPTS) {
+        throw error;
+      }
+
+      const backoff = UPLOAD_BACKOFF_BASE_MS * Math.pow(2, attempt - 1);
+      const reason = error.code || `HTTP ${error?.response?.status}`;
+      // Deliberately at info level: a silent retry is indistinguishable from a
+      // hung deploy, which is its own reported failure mode.
+      logger.info(
+        `${label} attempt ${attempt}/${UPLOAD_MAX_ATTEMPTS} failed (${reason}); retrying in ${backoff / 1000}s...`
+      );
+      await sleep(backoff);
+    }
+  }
+
+  throw lastError;
+}
+
 /**
  * Creates a pre-configured axios instance for making API calls.
  * @param {string} apiUrl The base URL of the API.
@@ -205,9 +278,14 @@ async function uploadFileDirectly(apiClient, { project, version }, filePath, fil
   const contentType = file.contentType || 'application/zip';
 
   try {
-    const presigned = await requestPresignedUrl(apiClient, { project, version }, { fileName, contentType });
-    const upload = await putToPresignedUrl(presigned.url, fileBuffer, contentType);
-    return { success: true, url: presigned.url, status: upload.status, visibility: presigned.visibility };
+    // The presigned URL is signed at request time, so a retry after a long
+    // backoff must re-request it — reusing a stale one fails with a confusing
+    // signature error instead of the real network cause.
+    return await withUploadRetry(async () => {
+      const presigned = await requestPresignedUrl(apiClient, { project, version }, { fileName, contentType });
+      const upload = await putToPresignedUrl(presigned.url, fileBuffer, contentType);
+      return { success: true, url: presigned.url, status: upload.status, visibility: presigned.visibility };
+    }, `Upload of ${fileName}`);
   } catch (error) {
     logger.debug(`Upload failed. Error type: ${error.constructor.name}, Message: ${error.message}`);
     const details = getAxiosErrorDetails(error, apiClient.defaults.baseURL);
@@ -374,4 +452,7 @@ module.exports = {
   uploadBuild,
   requestPresignedUrl,
   putToPresignedUrl,
+  isTransientUploadError,
+  withUploadRetry,
+  UPLOAD_MAX_ATTEMPTS,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrymore/scry-deployer",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A CLI to automate the deployment of Storybook static builds.",
   "main": "index.js",
   "bin": {