@rogatio/cli 6.20.0 → 6.20.1

package/dist/node/index.js

@@ -21133,79 +21133,51 @@ function sleep(ms) {
 function calculateRetryDelay(attempt) {
   return RETRY_DELAY_BASE * 2 ** attempt + Math.random() * 100;
 }
-async function fetchWithRetry(url, init, signal) {
-  let lastError;
-  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    if (signal?.aborted) {
-      throw new DOMException("Aborted", "AbortError");
-    }
-    try {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), COMPLETE_TIMEOUT);
-      if (signal) {
-        signal.addEventListener("abort", () => controller.abort());
-      }
-      const response = await fetch(url, {
-        ...init,
-        signal: controller.signal
-      });
-      clearTimeout(timeoutId);
-      if (response.ok) {
-        return response;
-      }
-      const shouldRetry = response.status === 429 || response.status >= 500;
-      if (shouldRetry && attempt < MAX_RETRIES) {
-        const retryAfter = response.headers.get("Retry-After");
-        const delay = retryAfter ? parseInt(retryAfter, 10) * 1e3 : calculateRetryDelay(attempt);
-        await sleep(Math.min(delay, 1e4));
-        continue;
-      }
-      const errorText = await response.text().catch(() => "");
-      throw new Error(`HTTP ${response.status}: ${errorText}`);
-    } catch (e) {
-      lastError = e;
-      if (e instanceof DOMException && e.name === "AbortError") {
-        throw e;
-      }
-      if (attempt < MAX_RETRIES && e.name !== "AbortError") {
-        await sleep(calculateRetryDelay(attempt));
-        continue;
-      }
-      throw e;
-    }
-  }
-  throw lastError;
+function providerStatusError(status) {
+  return new Error(`HTTP ${status}`);
 }
-async function fetchStreamWithRetry(url, init, signal) {
+async function releaseResponse(response) {
+  await response.body?.cancel().catch(() => void 0);
+}
+async function fetchProvider(url, init, timeoutMs, signal) {
   let lastError;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
     if (signal?.aborted) {
       throw new DOMException("Aborted", "AbortError");
     }
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+    if (signal) {
+      signal.addEventListener("abort", () => controller.abort());
+    }
+    let terminalStatus;
     try {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), STREAM_TIMEOUT);
-      if (signal) {
-        signal.addEventListener("abort", () => controller.abort());
-      }
       const response = await fetch(url, {
         ...init,
+        // Stay on the configured URL. A 3xx response is not followed.
+        redirect: "manual",
         signal: controller.signal
       });
       clearTimeout(timeoutId);
-      if (response.ok) {
+      if (response.status >= 300 && response.status <= 399) {
+        await releaseResponse(response);
+        terminalStatus = response.status;
+      } else if (response.ok) {
         return response;
+      } else {
+        const shouldRetry = response.status === 429 || response.status >= 500;
+        if (shouldRetry && attempt < MAX_RETRIES) {
+          await releaseResponse(response);
+          const retryAfter = response.headers.get("Retry-After");
+          const delay = retryAfter ? parseInt(retryAfter, 10) * 1e3 : calculateRetryDelay(attempt);
+          await sleep(Math.min(delay, 1e4));
+          continue;
+        }
+        await releaseResponse(response);
+        terminalStatus = response.status;
       }
-      const shouldRetry = response.status === 429 || response.status >= 500;
-      if (shouldRetry && attempt < MAX_RETRIES) {
-        const retryAfter = response.headers.get("Retry-After");
-        const delay = retryAfter ? parseInt(retryAfter, 10) * 1e3 : calculateRetryDelay(attempt);
-        await sleep(Math.min(delay, 1e4));
-        continue;
-      }
-      const errorText = await response.text().catch(() => "");
-      throw new Error(`HTTP ${response.status}: ${errorText}`);
     } catch (e) {
+      clearTimeout(timeoutId);
       lastError = e;
       if (e instanceof DOMException && e.name === "AbortError") {
         throw e;
@@ -21216,9 +21188,18 @@ async function fetchStreamWithRetry(url, init, signal) {
       }
       throw e;
     }
+    if (terminalStatus !== void 0) {
+      throw providerStatusError(terminalStatus);
+    }
   }
   throw lastError;
 }
+function fetchWithRetry(url, init, signal) {
+  return fetchProvider(url, init, COMPLETE_TIMEOUT, signal);
+}
+function fetchStreamWithRetry(url, init, signal) {
+  return fetchProvider(url, init, STREAM_TIMEOUT, signal);
+}
 function sanitizeResponse(text) {
   return text;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rogatio/cli",
-  "version": "6.20.0",
+  "version": "6.20.1",
   "private": false,
   "type": "module",
   "description": "Local-first browser request and response rules — editor host, file verification, test runner, and runtime dispatch.",