@naturalcycles/js-lib 14.151.0 → 14.152.0

package/dist/http/fetcher.js

@@ -232,7 +232,7 @@ class Fetcher {
         }
         clearTimeout(timeout);
         res.retryStatus.retryStopped = true;
-        // res.err can happen on JSON.parse error
+        // res.err can happen on `failed to fetch` type of error, e.g JSON.parse, CORS, unexpected redirect
         if (!res.err && this.cfg.logResponse) {
             const { retryAttempt } = res.retryStatus;
             const { logger } = this.cfg;
@@ -309,7 +309,9 @@ class Fetcher {
                 ' <<',
                 res.fetchResponse?.status || 0,
                 res.signature,
-                count && `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
+                count &&
+                    (retryStatus.retryAttempt || !retryStatus.retryStopped) &&
+                    `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
                 (0, time_util_1._since)(res.req.started),
             ]
                 .filter(Boolean)
@@ -357,7 +359,7 @@ class Fetcher {
      * statusCode of 0 (or absense of it) will BE retried.
      */
     shouldRetry(res) {
-        const { retryPost, retry4xx, retry5xx } = res.req;
+        const { retryPost, retry3xx, retry4xx, retry5xx } = res.req;
         const { method } = res.req.init;
         if (method === 'POST' && !retryPost)
             return false;
@@ -371,6 +373,11 @@ class Fetcher {
         }
         if (statusFamily === 4 && !retry4xx)
             return false;
+        if (statusFamily === 3 && !retry3xx)
+            return false;
+        // should not retry on `unexpected redirect` in error.cause.cause
+        if (res.err?.cause?.cause?.message?.includes('unexpected redirect'))
+            return false;
         return true; // default is true
     }
     getStatusFamily(res) {
@@ -420,6 +427,7 @@ class Fetcher {
             timeoutSeconds: 30,
             throwHttpErrors: true,
             retryPost: false,
+            retry3xx: false,
             retry4xx: false,
             retry5xx: true,
             // logger: console, Danger! doing this mutates console!

package/dist/http/fetcher.model.d.ts

@@ -93,6 +93,7 @@ export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers
     timeoutSeconds: number;
     retry: FetcherRetryOptions;
     retryPost: boolean;
+    retry3xx: boolean;
     retry4xx: boolean;
     retry5xx: boolean;
     started: UnixTimestampMillisNumber;
@@ -141,6 +142,10 @@ export interface FetcherOptions {
      * Set to true to allow retrying `post` requests.
      */
     retryPost?: boolean;
+    /**
+     * Defaults to false.
+     */
+    retry3xx?: boolean;
     /**
      * Defaults to false.
      */

package/dist-esm/http/fetcher.js

@@ -217,7 +217,7 @@ export class Fetcher {
         }
         clearTimeout(timeout);
         res.retryStatus.retryStopped = true;
-        // res.err can happen on JSON.parse error
+        // res.err can happen on `failed to fetch` type of error, e.g JSON.parse, CORS, unexpected redirect
         if (!res.err && this.cfg.logResponse) {
             const { retryAttempt } = res.retryStatus;
             const { logger } = this.cfg;
@@ -296,7 +296,9 @@ export class Fetcher {
                 ' <<',
                 ((_a = res.fetchResponse) === null || _a === void 0 ? void 0 : _a.status) || 0,
                 res.signature,
-                count && `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
+                count &&
+                    (retryStatus.retryAttempt || !retryStatus.retryStopped) &&
+                    `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
                 _since(res.req.started),
             ]
                 .filter(Boolean)
@@ -344,8 +346,8 @@ export class Fetcher {
      * statusCode of 0 (or absense of it) will BE retried.
      */
     shouldRetry(res) {
-        var _a;
-        const { retryPost, retry4xx, retry5xx } = res.req;
+        var _a, _b, _c, _d, _e;
+        const { retryPost, retry3xx, retry4xx, retry5xx } = res.req;
         const { method } = res.req.init;
         if (method === 'POST' && !retryPost)
             return false;
@@ -359,6 +361,11 @@ export class Fetcher {
         }
         if (statusFamily === 4 && !retry4xx)
             return false;
+        if (statusFamily === 3 && !retry3xx)
+            return false;
+        // should not retry on `unexpected redirect` in error.cause.cause
+        if ((_e = (_d = (_c = (_b = res.err) === null || _b === void 0 ? void 0 : _b.cause) === null || _c === void 0 ? void 0 : _c.cause) === null || _d === void 0 ? void 0 : _d.message) === null || _e === void 0 ? void 0 : _e.includes('unexpected redirect'))
+            return false;
         return true; // default is true
     }
     getStatusFamily(res) {
@@ -410,6 +417,7 @@ export class Fetcher {
             timeoutSeconds: 30,
             throwHttpErrors: true,
             retryPost: false,
+            retry3xx: false,
             retry4xx: false,
             retry5xx: true,
             // logger: console, Danger! doing this mutates console!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.151.0",
+  "version": "14.152.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/http/fetcher.model.ts

@@ -114,6 +114,7 @@ export interface FetcherRequest
   timeoutSeconds: number
   retry: FetcherRetryOptions
   retryPost: boolean
+  retry3xx: boolean
   retry4xx: boolean
   retry5xx: boolean
   started: UnixTimestampMillisNumber
@@ -176,6 +177,10 @@ export interface FetcherOptions {
    * Set to true to allow retrying `post` requests.
    */
   retryPost?: boolean
+  /**
+   * Defaults to false.
+   */
+  retry3xx?: boolean
   /**
    * Defaults to false.
    */

package/src/http/fetcher.ts

@@ -1,7 +1,7 @@
 /// <reference lib="dom"/>
 
 import { isServerSide } from '../env'
-import { ErrorObject } from '../error/error.model'
+import { ErrorLike, ErrorObject } from '../error/error.model'
 import { _anyToError, _anyToErrorObject, _errorLikeToErrorObject } from '../error/error.util'
 import { HttpRequestError } from '../error/httpRequestError'
 import { _clamp } from '../number/number.util'
@@ -302,7 +302,7 @@ export class Fetcher {
     clearTimeout(timeout)
     res.retryStatus.retryStopped = true
 
-    // res.err can happen on JSON.parse error
+    // res.err can happen on `failed to fetch` type of error, e.g JSON.parse, CORS, unexpected redirect
     if (!res.err && this.cfg.logResponse) {
       const { retryAttempt } = res.retryStatus
       const { logger } = this.cfg
@@ -399,7 +399,9 @@ export class Fetcher {
           ' <<',
           res.fetchResponse?.status || 0,
           res.signature,
-          count && `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
+          count &&
+            (retryStatus.retryAttempt || !retryStatus.retryStopped) &&
+            `try#${retryStatus.retryAttempt + 1}/${count + 1}`,
           _since(res.req.started),
         ]
           .filter(Boolean)
@@ -457,7 +459,7 @@ export class Fetcher {
    * statusCode of 0 (or absense of it) will BE retried.
    */
   private shouldRetry(res: FetcherResponse): boolean {
-    const { retryPost, retry4xx, retry5xx } = res.req
+    const { retryPost, retry3xx, retry4xx, retry5xx } = res.req
     const { method } = res.req.init
     if (method === 'POST' && !retryPost) return false
     const { statusFamily } = res
@@ -468,6 +470,12 @@ export class Fetcher {
       return true
     }
     if (statusFamily === 4 && !retry4xx) return false
+    if (statusFamily === 3 && !retry3xx) return false
+
+    // should not retry on `unexpected redirect` in error.cause.cause
+    if ((res.err?.cause as ErrorLike | void)?.cause?.message?.includes('unexpected redirect'))
+      return false
+
     return true // default is true
   }
 
@@ -521,6 +529,7 @@ export class Fetcher {
         timeoutSeconds: 30,
         throwHttpErrors: true,
         retryPost: false,
+        retry3xx: false,
         retry4xx: false,
         retry5xx: true,
         // logger: console, Danger! doing this mutates console!