cutsio 0.2.4 → 0.2.5

package/dist/index.js

@@ -137,6 +137,18 @@ var ApiError = class extends Error {
     this.status = status;
   }
 };
+var MAX_REQUEST_RETRIES = 3;
+var BASE_RETRY_DELAY_MS = 1e3;
+var MAX_RETRY_DELAY_MS = 3e4;
+function retryDelayMs(attempt, retryAfter) {
+  const headerSeconds = retryAfter ? Number(retryAfter) : Number.NaN;
+  const headerMs = Number.isFinite(headerSeconds) && headerSeconds >= 0 ? headerSeconds * 1e3 : null;
+  const backoffMs = Math.min(BASE_RETRY_DELAY_MS * 2 ** attempt, MAX_RETRY_DELAY_MS);
+  return Math.min(headerMs ?? backoffMs, MAX_RETRY_DELAY_MS) + Math.random() * 500;
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 var CutsioClient = class {
   base;
   apiKey;
@@ -181,17 +193,21 @@ var CutsioClient = class {
       ...init?.body ? { "Content-Type": "application/json" } : {},
       ...init?.headers ?? {}
     };
-    const response = await fetch(`${this.base}${path}`, { ...init, headers });
-    if (!response.ok) {
-      let message = `HTTP ${response.status}`;
-      try {
-        const body = await response.json();
-        if (typeof body.error === "string") message = body.error;
-      } catch {
+    for (let attempt = 0; ; attempt += 1) {
+      const response = await fetch(`${this.base}${path}`, { ...init, headers });
+      if (response.ok) return response.json();
+      const retryable = response.status === 429 || response.status === 502 || response.status === 503 || response.status === 504;
+      if (!retryable || attempt >= MAX_REQUEST_RETRIES) {
+        let message = `HTTP ${response.status}`;
+        try {
+          const body = await response.json();
+          if (typeof body.error === "string") message = body.error;
+        } catch {
+        }
+        throw new ApiError(message, response.status);
       }
-      throw new ApiError(message, response.status);
+      await sleep(retryDelayMs(attempt, response.headers.get("retry-after")));
     }
-    return response.json();
   }
 };
 
@@ -751,12 +767,16 @@ async function sync(client, options) {
   while (queue.size > 0) {
     const ready = [];
     const ids = [...queue.keys()];
+    let serverDelayMs = 0;
     for (let index = 0; index < ids.length; index += PREPARE_BATCH_SIZE) {
       const batch = ids.slice(index, index + PREPARE_BATCH_SIZE);
       const results = await client.prepare(batch);
       for (const result of results) {
         const item = queue.get(result.id);
         if (!item) continue;
+        if (typeof result.retryAfterSeconds === "number" && result.retryAfterSeconds > 0) {
+          serverDelayMs = Math.max(serverDelayMs, result.retryAfterSeconds * 1e3);
+        }
         switch (result.status) {
           case "ready":
             if (result.url) {
@@ -850,7 +870,7 @@ async function sync(client, options) {
       }
       break;
     }
-    await sleep(prepareDelayMs);
+    await sleep2(Math.min(Math.max(serverDelayMs, prepareDelayMs), MAX_PREPARE_DELAY_MS));
     prepareDelayMs = Math.min(prepareDelayMs * 2, MAX_PREPARE_DELAY_MS);
   }
   return { downloaded, unchanged, skipped, failed };
@@ -870,7 +890,7 @@ async function runPool(items, concurrency, worker) {
     })
   );
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
@@ -903,7 +923,7 @@ var color = {
 };
 var isInteractive = colorEnabled;
 var animationsEnabled = colorEnabled && process.env.CUTSIO_NO_ANIM !== "1";
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
@@ -1253,12 +1273,12 @@ async function revealBanner() {
   for (let index = 0; index < WORDMARK.length; index += 1) {
     process.stdout.write(`${shade(WORDMARK[index] ?? "", index)}
 `);
-    if (animationsEnabled) await sleep2(38);
+    if (animationsEnabled) await sleep3(38);
   }
   process.stdout.write(`${color.dim("  mezzanine sync for your Mac")}
 
 `);
-  if (animationsEnabled) await sleep2(60);
+  if (animationsEnabled) await sleep3(60);
 }
 
 // src/commands/welcome.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cutsio",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Sync Cutsio mezzanine masters to a local folder",
   "homepage": "https://cutsio.com",
   "type": "module",