vigor-fetch 3.1.1 → 3.1.3

package/dist/index.d.ts

@@ -264,8 +264,8 @@ declare class VigorRetry extends VigorStatus<VigorRetryConfig, VigorRetry> {
     private _createTimelineHandler;
     private _createInterceptorHandler;
     target(func: VigorRetryConfig["target"]): VigorRetry;
-    settings(func: ((s: VigorRetrySettings) => VigorRetrySettings) | VigorRetryConfig["settings"]): VigorRetry;
-    interceptors(func: ((i: VigorRetryInterceptors) => VigorRetryInterceptors) | VigorRetryConfig["interceptors"]): VigorRetry;
+    settings(func: ((s: VigorRetrySettings) => VigorRetrySettings) | VigorRetrySettings | VigorRetrySettings["_config"]): VigorRetry;
+    interceptors(func: ((i: VigorRetryInterceptors) => VigorRetryInterceptors) | VigorRetryInterceptors | VigorRetryInterceptors["_config"]): VigorRetry;
     algorithms(func: (a: typeof this.RetryAlgorithms) => {
         _calculateDelay: VigorRetryConfig["algorithm"];
     }): VigorRetry;
@@ -355,7 +355,7 @@ type VigorParseProcessHandler = {
 type VigorParseTimeline<I extends keyof VigorParseInterceptorsFunctions, H extends keyof VigorParseProcessHandler> = {
     PROCESS_HANDLING: {
         type: H;
-        data: VigorRetryProcessHandler[H];
+        data: VigorParseProcessHandler[H];
     };
     INTERCEPTOR_LOOP_STARTED: {
         interceptorType: I;
@@ -380,9 +380,9 @@ declare class VigorParse extends VigorStatus<VigorParseConfig, VigorParse> {
     private _createTimelineHandler;
     private _createInterceptorHandler;
     target(response: VigorParseConfig["target"]): VigorParse;
-    settings(func: ((i: VigorParseSettings) => VigorParseSettings) | VigorParseConfig["settings"]): VigorParse;
-    strategies(func: ((i: VigorParseStrategies) => VigorParseStrategies) | VigorParseConfig["strategies"]): VigorParse;
-    interceptors(func: ((i: VigorParseInterceptors) => VigorParseInterceptors) | VigorParseConfig["interceptors"]): VigorParse;
+    settings(func: ((i: VigorParseSettings) => VigorParseSettings) | VigorParseSettings | VigorParseSettings["_config"]): VigorParse;
+    strategies(func: ((i: VigorParseStrategies) => VigorParseStrategies) | VigorParseStrategies | VigorParseStrategies["_config"]): VigorParse;
+    interceptors(func: ((i: VigorParseInterceptors) => VigorParseInterceptors) | VigorParseInterceptors | VigorParseInterceptors["_config"]): VigorParse;
     request<R>(config?: VigorParseConfig, timeline?: VigorParseContext["timeline"]): Promise<R>;
 }
 type VigorFetchSettingsConfig = {
@@ -534,10 +534,10 @@ declare class VigorFetch extends VigorStatus<VigorFetchConfig, VigorFetch> {
     body(obj: VigorFetchConfig["options"]["body"]): VigorFetch;
     private _buildUrl;
     private _normalizeOptions;
-    settings(func: ((s: VigorFetchSettings) => VigorFetchSettings) | VigorFetchConfig["settings"]): VigorFetch;
-    interceptors(func: ((s: VigorFetchInterceptors) => VigorFetchInterceptors) | VigorFetchConfig["interceptors"]): VigorFetch;
-    retryConfig(func: ((s: VigorRetry) => VigorRetry) | VigorFetchConfig["retryConfig"]): VigorFetch;
-    parseConfig(func: ((s: VigorParse) => VigorParse) | VigorFetchConfig["parseConfig"]): VigorFetch;
+    settings(func: ((s: VigorFetchSettings) => VigorFetchSettings) | VigorFetchSettings | VigorFetchSettings["_config"]): VigorFetch;
+    interceptors(func: ((s: VigorFetchInterceptors) => VigorFetchInterceptors) | VigorFetchInterceptors | VigorFetchInterceptors["_config"]): VigorFetch;
+    retryConfig(func: ((s: VigorRetry) => VigorRetry) | VigorRetry | VigorRetry["_config"]): VigorFetch;
+    parseConfig(func: ((s: VigorParse) => VigorParse) | VigorParse | VigorParse["_config"]): VigorFetch;
     request<R>(config?: VigorFetchConfig, timeline?: VigorFetchContext["timeline"]): Promise<R>;
 }
 type VigorAllSettingsConfig = {
@@ -711,8 +711,8 @@ declare class VigorAll extends VigorStatus<VigorAllConfig, VigorAll> {
     private _createEachTimelineHandler;
     private _createEachInterceptorHandler;
     target(...funcs: VigorIncludeSpread<VigorAllConfig["target"][number]>): VigorAll;
-    settings(func: ((s: VigorAllSettings) => VigorAllSettings) | VigorAllConfig["settings"]): VigorAll;
-    interceptors(func: ((s: VigorAllInterceptors) => VigorAllInterceptors) | VigorAllConfig["interceptors"]): VigorAll;
+    settings(func: ((s: VigorAllSettings) => VigorAllSettings) | VigorAllSettings | VigorAllSettings["_config"]): VigorAll;
+    interceptors(func: ((s: VigorAllInterceptors) => VigorAllInterceptors) | VigorAllInterceptors | VigorAllInterceptors["_config"]): VigorAll;
     private runTask;
     request<R extends VigorAllContext["result"]>(config?: VigorAllConfig, timeline?: VigorAllContext["timeline"]): Promise<R>;
 }

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const VigorErrorMessageFuncs = {
     INVALID_TARGET: ({ expected, received }) => `Invalid Task: ${typeof received} (expected: ${expected.join(', ')})`,
-    EXHAUSTED: ({ maxAttempts }) => `Retry exhausted: max ${maxAttempts})`,
+    EXHAUSTED: ({ maxAttempts }) => `Retry exhausted, (max ${maxAttempts})`,
     TIMED_OUT: ({ limit, attempt }) => `Timeout: exceeded ${limit}ms (attempt: ${attempt})`,
     INVALID_CONTENT_TYPE: ({ expected, received, response }) => `Invalid Content Type Header: ${typeof received} (expected: ${expected.join(', ')})`,
     PARSER_NOT_FOUND: ({ expected, received, response }) => `Parser Not Found For Header: ${typeof received} (expected: ${expected.join(', ')})`,
@@ -242,12 +242,18 @@ class VigorRetry extends VigorStatus {
     }
     target(func) { return this._next({ target: func }); }
     settings(func) {
+        if (func instanceof VigorRetrySettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorRetrySettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     interceptors(func) {
+        if (func instanceof VigorRetryInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorRetryInterceptors(this._config.interceptors))._getConfig() });
         }
@@ -708,18 +714,27 @@ class VigorParse extends VigorStatus {
     }
     target(response) { return this._next({ target: response }); }
     settings(func) {
+        if (func instanceof VigorParseSettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorParseSettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     strategies(func) {
+        if (func instanceof VigorParseStrategies) {
+            return this._next({ strategies: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ strategies: func(new VigorParseStrategies(this._config.strategies))._getConfig() });
         }
         return this._next({ strategies: func });
     }
     interceptors(func) {
+        if (func instanceof VigorParseInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorParseInterceptors(this._config.interceptors))._getConfig() });
         }
@@ -1032,24 +1047,36 @@ class VigorFetch extends VigorStatus {
         });
     }
     settings(func) {
+        if (func instanceof VigorFetchSettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorFetchSettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     interceptors(func) {
+        if (func instanceof VigorFetchInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorFetchInterceptors(this._config.interceptors))._getConfig() });
         }
         return this._next({ interceptors: func });
     }
     retryConfig(func) {
+        if (func instanceof VigorRetry) {
+            return this._next({ retryConfig: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ retryConfig: func(new VigorRetry(this._config.retryConfig))._getConfig() });
         }
         return this._next({ retryConfig: func });
     }
     parseConfig(func) {
+        if (func instanceof VigorParse) {
+            return this._next({ parseConfig: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ parseConfig: func(new VigorParse(this._config.parseConfig))._getConfig() });
         }
@@ -1439,12 +1466,18 @@ class VigorAll extends VigorStatus {
     }
     target(...funcs) { return this._next({ target: funcs.flat() }); }
     settings(func) {
+        if (func instanceof VigorAllSettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorAllSettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     interceptors(func) {
+        if (func instanceof VigorAllInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorAllInterceptors(this._config.interceptors))._getConfig() });
         }
@@ -1599,10 +1632,10 @@ class VigorAll extends VigorStatus {
         };
         for (const task of stats.target) {
             let promise;
-            promise = this.runTask(task, { stats, root: ctx }, { acquire, release }).then(res => {
-                ctx.queue.delete(promise);
-                return { success: true, value: res };
-            }).catch(err => ({ success: false, value: err }));
+            promise = this.runTask(task, { stats, root: ctx }, { acquire, release })
+                .then(res => ({ success: true, value: res }))
+                .catch(err => ({ success: false, value: err }))
+                .finally(() => ctx.queue.delete(promise));
             ctx.queue.add(promise);
         }
         addTimeline("QUEUE_REQUEST_STARTED", {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 const VigorErrorMessageFuncs = {
     INVALID_TARGET: ({ expected, received }) => `Invalid Task: ${typeof received} (expected: ${expected.join(', ')})`,
-    EXHAUSTED: ({ maxAttempts }) => `Retry exhausted: max ${maxAttempts})`,
+    EXHAUSTED: ({ maxAttempts }) => `Retry exhausted, (max ${maxAttempts})`,
     TIMED_OUT: ({ limit, attempt }) => `Timeout: exceeded ${limit}ms (attempt: ${attempt})`,
     INVALID_CONTENT_TYPE: ({ expected, received, response }) => `Invalid Content Type Header: ${typeof received} (expected: ${expected.join(', ')})`,
     PARSER_NOT_FOUND: ({ expected, received, response }) => `Parser Not Found For Header: ${typeof received} (expected: ${expected.join(', ')})`,
@@ -238,12 +238,18 @@ class VigorRetry extends VigorStatus {
     }
     target(func) { return this._next({ target: func }); }
     settings(func) {
+        if (func instanceof VigorRetrySettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorRetrySettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     interceptors(func) {
+        if (func instanceof VigorRetryInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorRetryInterceptors(this._config.interceptors))._getConfig() });
         }
@@ -704,18 +710,27 @@ class VigorParse extends VigorStatus {
     }
     target(response) { return this._next({ target: response }); }
     settings(func) {
+        if (func instanceof VigorParseSettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorParseSettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     strategies(func) {
+        if (func instanceof VigorParseStrategies) {
+            return this._next({ strategies: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ strategies: func(new VigorParseStrategies(this._config.strategies))._getConfig() });
         }
         return this._next({ strategies: func });
     }
     interceptors(func) {
+        if (func instanceof VigorParseInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorParseInterceptors(this._config.interceptors))._getConfig() });
         }
@@ -1028,24 +1043,36 @@ class VigorFetch extends VigorStatus {
         });
     }
     settings(func) {
+        if (func instanceof VigorFetchSettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorFetchSettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     interceptors(func) {
+        if (func instanceof VigorFetchInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorFetchInterceptors(this._config.interceptors))._getConfig() });
         }
         return this._next({ interceptors: func });
     }
     retryConfig(func) {
+        if (func instanceof VigorRetry) {
+            return this._next({ retryConfig: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ retryConfig: func(new VigorRetry(this._config.retryConfig))._getConfig() });
         }
         return this._next({ retryConfig: func });
     }
     parseConfig(func) {
+        if (func instanceof VigorParse) {
+            return this._next({ parseConfig: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ parseConfig: func(new VigorParse(this._config.parseConfig))._getConfig() });
         }
@@ -1435,12 +1462,18 @@ class VigorAll extends VigorStatus {
     }
     target(...funcs) { return this._next({ target: funcs.flat() }); }
     settings(func) {
+        if (func instanceof VigorAllSettings) {
+            return this._next({ settings: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ settings: func(new VigorAllSettings(this._config.settings))._getConfig() });
         }
         return this._next({ settings: func });
     }
     interceptors(func) {
+        if (func instanceof VigorAllInterceptors) {
+            return this._next({ interceptors: func._getConfig() });
+        }
         if (typeof func === 'function') {
             return this._next({ interceptors: func(new VigorAllInterceptors(this._config.interceptors))._getConfig() });
         }
@@ -1595,10 +1628,10 @@ class VigorAll extends VigorStatus {
         };
         for (const task of stats.target) {
             let promise;
-            promise = this.runTask(task, { stats, root: ctx }, { acquire, release }).then(res => {
-                ctx.queue.delete(promise);
-                return { success: true, value: res };
-            }).catch(err => ({ success: false, value: err }));
+            promise = this.runTask(task, { stats, root: ctx }, { acquire, release })
+                .then(res => ({ success: true, value: res }))
+                .catch(err => ({ success: false, value: err }))
+                .finally(() => ctx.queue.delete(promise));
             ctx.queue.add(promise);
         }
         addTimeline("QUEUE_REQUEST_STARTED", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vigor-fetch",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Smart, zero-dependency HTTP client with self-healing retries for rate-limited servers.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",