@alwatr/fetch 0.19.0 → 0.21.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.21.0](https://github.com/AliMD/alwatr/compare/v0.20.0...v0.21.0) (2022-11-13)
+
+**Note:** Version bump only for package @alwatr/fetch
+
+# [0.20.0](https://github.com/AliMD/alwatr/compare/v0.19.0...v0.20.0) (2022-11-05)
+
+### Bug Fixes
+
+- **fetch:** \_handleRemoveDuplicate ([6207b48](https://github.com/AliMD/alwatr/commit/6207b4867935d05a0e5a1c795de9efab4ff77c68))
+- **fetch:** cacheStorageName issue ([e641ff7](https://github.com/AliMD/alwatr/commit/e641ff740055a68b6397f00bf46f1d05943c348a))
+- **fetch:** method type and case ([8d4ba77](https://github.com/AliMD/alwatr/commit/8d4ba77e56ecfe2aeaa459dcd26039c38c4b2199))
+- **fetch:** prevent duplicate revalidateCallback on first time ([2da7dc5](https://github.com/AliMD/alwatr/commit/2da7dc579e4850af06914590a231548cd469cd75))
+
+### Features
+
+- **fetch:** add retryDelay ([28e3244](https://github.com/AliMD/alwatr/commit/28e3244a2d35e7a1a91f9a5a4942f1bb4a56d981))
+- **fetch:** revalidate callback for `stale_while_revalidate` cache strategy. ([8976cc4](https://github.com/AliMD/alwatr/commit/8976cc424b2a9e96e4cfa69941d5378a6640af6f))
+- **fetch:** simple memory caching for remove duplicate/parallel requests ([74cd7f1](https://github.com/AliMD/alwatr/commit/74cd7f1500d730021a0f577c0ecfd7a2460fdb15))
+
 # [0.19.0](https://github.com/AliMD/alwatr/compare/v0.18.0...v0.19.0) (2022-11-01)
 
 **Note:** Version bump only for package @alwatr/fetch

package/README.md

@@ -1,4 +1,4 @@
-# @alwatr/fetch
+# Alwatr Fetch - `@alwatr/fetch`
 
 Enhanced fetch API with cache strategy, retry pattern, timeout, helper methods and enhanced types written in tiny TypeScript, ES module.
 
@@ -30,15 +30,22 @@ const productList = await getJson<Record<string, ProductInterface>>({
 - `url`: Request URL.
 - `bodyJson`: Body as JS Object.
 - `queryParameters`: URL Query Parameters as JS Object.
-- `timeout`: A timeout in ms for the fetch request (default `5000`ms).
+- `timeout`: A timeout in ms for the fetch request (default `10_000`ms).
 - `retry`: If fetch response not acceptable or timed out, it will retry the request (default `3`).
-- `cacheStorageName`: Cache storage name (default `alwatr_fetch_cache`).
-- `cacheStrategy`: Strategies for caching, (default `network_only`).
+- `retryDelay`: Delay before each retries (default `1_000`).
+- `removeDuplicate`: Simple memory caching for remove duplicate/parallel requests (default `never`).
+  - `never`: Never use memory caching.
+  - `always`: Always use memory caching and remove all duplicate requests (just by method+url).
+  - `until_load`: Cache parallel requests until request completed (it will be removed after the promise resolved).
+  - `auto`: If CacheStorage was supported use `until_load` strategy else use `always`.
+- `cacheStrategy`: Strategies for caching (default `network_only`).
   - `network_only`: Only network request without any cache.
   - `network_first`: Network first, falling back to cache.
   - `cache_only`: Cache only without any network request.
   - `cache_first`: Cache first, falling back to network.
   - `stale_while_revalidate`: Fastest strategy, Use cached first but always request network to update the cache.
+- `revalidateCallback`: Revalidate callback for `stale_while_revalidate` cache strategy.
+- `cacheStorageName`: Cache storage custom name (default `alwatr_fetch_cache`).
 
 [Read more about standard cache strategies](https://developer.chrome.com/docs/workbox/caching-strategies-overview/#caching-strategies)
 

package/fetch.d.ts

@@ -1,18 +1,18 @@
-declare global {
-    interface AbortController {
-        abort(reason?: string): void;
-    }
-}
 export declare type CacheStrategy = 'network_only' | 'network_first' | 'cache_only' | 'cache_first' | 'stale_while_revalidate';
+export declare type CacheDuplicate = 'never' | 'always' | 'until_load' | 'auto';
 export interface FetchOptions extends RequestInit {
     /**
      * Request URL.
      */
     url: string;
+    /**
+     * A string to set request's method.
+     */
+    method: string;
     /**
      * A timeout for the fetch request.
      *
-     * @default 5000 ms
+     * @default 10_000 ms
      */
     timeout: number;
     /**
@@ -21,18 +21,43 @@ export interface FetchOptions extends RequestInit {
      * @default 3
      */
     retry: number;
+    /**
+     * Delay before each retries.
+     *
+     * @default 1_000 ms
+     */
+    retryDelay: number;
+    /**
+     * Simple memory caching for remove duplicate/parallel requests.
+     *
+     * - `never`: Never use memory caching.
+     * - `always`: Always use memory caching and remove all duplicate requests.
+     * - `until_load`: Cache parallel requests until request completed (it will be removed after the promise resolved).
+     * - `auto`: If CacheStorage was supported use `until_load` strategy else use `always`.
+     *
+     * @default 'never'
+     */
+    removeDuplicate: CacheDuplicate;
     /**
      * Strategies for caching.
      *
+     * - `network_only`: Only network request without any cache.
+     * - `network_first`: Network first, falling back to cache.
+     * - `cache_only`: Cache only without any network request.
+     * - `cache_first`: Cache first, falling back to network.
+     * - `stale_while_revalidate`: Fastest strategy, Use cached first but always request network to update the cache.
+     *
      * @default 'network_only'
      */
     cacheStrategy: CacheStrategy;
     /**
-     * Cache storage name.
-     *
-     * @default 'alwatr_fetch_cache'
+     * Revalidate callback for `stale_while_revalidate` cache strategy.
+     */
+    revalidateCallback?: (response: Response) => void;
+    /**
+     * Cache storage custom name.
      */
-    cacheStorageName: string;
+    cacheStorageName?: string;
     /**
      * Body as JS Object.
      */
@@ -43,39 +68,42 @@ export interface FetchOptions extends RequestInit {
     queryParameters?: Record<string, string | number | boolean>;
 }
 /**
- * It's a wrapper around the browser's `fetch` function that adds retry pattern with timeout and cacheStrategy.
+ * It fetches a JSON file from a URL, and returns the parsed data.
  *
  * Example:
  *
  * ```ts
- * const response = await fetch({
+ * const productList = await getJson<ProductResponse>({
  *   url: '/api/products',
  *   queryParameters: {limit: 10},
- *   timeout: 5_000,
+ *   timeout: 10_000,
  *   retry: 3,
  *   cacheStrategy: 'stale_while_revalidate',
+ *   cacheDuplicate: 'auto',
  * });
  * ```
  */
-export declare function fetch(_options: Partial<FetchOptions> & {
+export declare function getJson<ResponseType extends Record<string | number, unknown>>(_options: Partial<FetchOptions> & {
     url: string;
-}): Promise<Response>;
+}): Promise<ResponseType>;
 /**
- * It fetches a JSON file from a URL, and returns the parsed data.
+ * It's a wrapper around the browser's `fetch` function that adds retry pattern, timeout, cacheStrategy,
+ * remove duplicates, etc.
  *
  * Example:
  *
  * ```ts
- * const productList = await getJson<ProductResponse>({
+ * const response = await fetch({
  *   url: '/api/products',
  *   queryParameters: {limit: 10},
- *   timeout: 5_000,
+ *   timeout: 10_000,
  *   retry: 3,
  *   cacheStrategy: 'stale_while_revalidate',
+ *   cacheDuplicate: 'auto',
  * });
  * ```
  */
-export declare function getJson<ResponseType extends Record<string | number, unknown>>(options: Partial<FetchOptions> & {
+export declare function fetch(_options: Partial<FetchOptions> & {
     url: string;
-}): Promise<ResponseType>;
+}): Promise<Response>;
 //# sourceMappingURL=fetch.d.ts.map

package/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["src/fetch.ts"],"names":[],"mappings":"AASA,OAAO,CAAC,MAAM,CAAC;IAEb,UAAU,eAAe;QACvB,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC9B;CACF;AAED,oBAAY,aAAa,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,GAAG,aAAa,GAAG,wBAAwB,CAAC;AAGvH,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,aAAa,EAAE,aAAa,CAAC;IAE7B;;;;OAIG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC;IAE5C;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;CAC7D;AAKD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CA+D9F;AA6GD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,OAAO,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAC/E,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,GAC/C,OAAO,CAAC,YAAY,CAAC,CA6BvB"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["src/fetch.ts"],"names":[],"mappings":"AASA,oBAAY,aAAa,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,GAAG,aAAa,GAAG,wBAAwB,CAAC;AACvH,oBAAY,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,GAAG,MAAM,CAAC;AAExE,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACF,UAAU,EAAE,MAAM,CAAC;IAEpB;;;;;;;;;OASG;IACH,eAAe,EAAE,cAAc,CAAC;IAEhC;;;;;;;;;;OAUG;IACH,aAAa,EAAE,aAAa,CAAC;IAE7B;;OAEG;IACH,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IAElD;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC;IAE5C;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;CAC7D;AAOD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,OAAO,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAC/E,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,GAChD,OAAO,CAAC,YAAY,CAAC,CA6BvB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAIxF"}

package/fetch.js

@@ -4,10 +4,53 @@ alwatrRegisteredList.push({
     name: '@alwatr/fetch',
     version: '{{ALWATR_VERSION}}',
 });
-let cacheStorage;
+let alwatrCacheStorage;
 const cacheSupported = 'caches' in self;
+const duplicateRequestStorage = {};
 /**
- * It's a wrapper around the browser's `fetch` function that adds retry pattern with timeout and cacheStrategy.
+ * It fetches a JSON file from a URL, and returns the parsed data.
+ *
+ * Example:
+ *
+ * ```ts
+ * const productList = await getJson<ProductResponse>({
+ *   url: '/api/products',
+ *   queryParameters: {limit: 10},
+ *   timeout: 10_000,
+ *   retry: 3,
+ *   cacheStrategy: 'stale_while_revalidate',
+ *   cacheDuplicate: 'auto',
+ * });
+ * ```
+ */
+export async function getJson(_options) {
+    const options = _processOptions(_options);
+    logger.logMethodArgs('getJson', { options });
+    const response = await _handleRemoveDuplicate(options);
+    let data;
+    try {
+        if (!response.ok) {
+            throw new Error('fetch_nok');
+        }
+        data = (await response.json());
+    }
+    catch (err) {
+        logger.accident('getJson', 'response_json', 'response json error', {
+            retry: options.retry,
+            err,
+        });
+        if (options.retry > 1) {
+            data = await getJson(options);
+        }
+        else {
+            throw err;
+        }
+    }
+    return data;
+}
+/**
+ * It's a wrapper around the browser's `fetch` function that adds retry pattern, timeout, cacheStrategy,
+ * remove duplicates, etc.
  *
  * Example:
  *
@@ -15,29 +58,104 @@ const cacheSupported = 'caches' in self;
  * const response = await fetch({
  *   url: '/api/products',
  *   queryParameters: {limit: 10},
- *   timeout: 5_000,
+ *   timeout: 10_000,
  *   retry: 3,
  *   cacheStrategy: 'stale_while_revalidate',
+ *   cacheDuplicate: 'auto',
  * });
  * ```
  */
-export async function fetch(_options) {
+export function fetch(_options) {
     const options = _processOptions(_options);
     logger.logMethodArgs('fetch', { options });
+    return _handleRemoveDuplicate(options);
+}
+/**
+ * Process fetch options and set defaults, etc.
+ */
+function _processOptions(options) {
+    options.method = options.method != null ? options.method.toUpperCase() : 'GET';
+    options.window ?? (options.window = null);
+    options.timeout ?? (options.timeout = 10000);
+    options.retry ?? (options.retry = 3);
+    options.retryDelay ?? (options.retryDelay = 1000);
+    options.cacheStrategy ?? (options.cacheStrategy = 'network_only');
+    options.removeDuplicate ?? (options.removeDuplicate = 'never');
+    if (options.cacheStrategy !== 'network_only' && cacheSupported !== true) {
+        logger.accident('fetch', 'fetch_cache_strategy_ignore', 'Cache storage not support in this browser', {
+            cacheSupported,
+        });
+        options.cacheStrategy = 'network_only';
+    }
+    if (options.removeDuplicate === 'auto') {
+        options.removeDuplicate = cacheSupported ? 'until_load' : 'always';
+    }
+    if (options.url.lastIndexOf('?') === -1 && options.queryParameters != null) {
+        // prettier-ignore
+        const queryArray = Object
+            .keys(options.queryParameters)
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            .map((key) => `${key}=${String(options.queryParameters[key])}`);
+        if (queryArray.length > 0) {
+            options.url += '?' + queryArray.join('&');
+        }
+    }
+    if (options.body != null && options.bodyJson != null) {
+        options.body = JSON.stringify(options.bodyJson);
+        options.headers = {
+            ...options.headers,
+            'Content-Type': 'application/json',
+        };
+    }
+    return options;
+}
+/**
+ * Handle Remove Duplicates over `_handleCacheStrategy`.
+ */
+async function _handleRemoveDuplicate(options) {
+    if (options.removeDuplicate === 'never')
+        return _handleCacheStrategy(options);
+    logger.logMethod('_handleRemoveDuplicate');
+    const cacheKey = `[${options.method}] ${options.url}`;
+    const firstRequest = duplicateRequestStorage[cacheKey] == null;
+    // We must cache fetch promise without await for handle other parallel requests.
+    duplicateRequestStorage[cacheKey] ?? (duplicateRequestStorage[cacheKey] = _handleCacheStrategy(options));
+    try {
+        // For all requests need to await for clone responses.
+        const response = await duplicateRequestStorage[cacheKey];
+        if (firstRequest === true) {
+            if (response.ok !== true || options.removeDuplicate === 'until_load') {
+                delete duplicateRequestStorage[cacheKey];
+            }
+        }
+        return response.clone();
+    }
+    catch (err) {
+        // clean cache on any error.
+        delete duplicateRequestStorage[cacheKey];
+        throw err;
+    }
+}
+/**
+ * Handle Cache Strategy over `_handleRetryPattern`.
+ */
+async function _handleCacheStrategy(options) {
     if (options.cacheStrategy === 'network_only') {
-        return _fetch(options);
+        return _handleRetryPattern(options);
     }
     // else handle cache strategies!
-    if (cacheStorage == null) {
-        cacheStorage = await caches.open(options.cacheStorageName);
+    logger.logMethod('_handleCacheStrategy');
+    if (alwatrCacheStorage == null && options.cacheStorageName == null) {
+        alwatrCacheStorage = await caches.open('alwatr_fetch_cache');
     }
+    const cacheStorage = options.cacheStorageName != null ? await caches.open(options.cacheStorageName) : alwatrCacheStorage;
     const request = new Request(options.url, options);
     switch (options.cacheStrategy) {
         case 'cache_first': {
             const cachedResponse = await cacheStorage.match(request);
             if (cachedResponse != null)
                 return cachedResponse;
-            const response = await _fetch(options);
+            const response = await _handleRetryPattern(options);
             if (response.ok) {
                 cacheStorage.put(request, response.clone());
             }
@@ -51,7 +169,7 @@ export async function fetch(_options) {
         }
         case 'network_first': {
             try {
-                const networkResponse = await _fetch(options);
+                const networkResponse = await _handleRetryPattern(options);
                 if (networkResponse.ok) {
                     cacheStorage.put(request, networkResponse.clone());
                 }
@@ -66,148 +184,90 @@ export async function fetch(_options) {
         }
         case 'stale_while_revalidate': {
             const cachedResponse = await cacheStorage.match(request);
-            const fetchedResponsePromise = _fetch(options).then((networkResponse) => {
+            const fetchedResponsePromise = _handleRetryPattern(options);
+            fetchedResponsePromise.then((networkResponse) => {
                 if (networkResponse.ok) {
                     cacheStorage.put(request, networkResponse.clone());
+                    if (cachedResponse != null && typeof options.revalidateCallback === 'function') {
+                        options.revalidateCallback(networkResponse);
+                    }
                 }
-                return networkResponse;
             });
             return cachedResponse || fetchedResponsePromise;
         }
         default: {
-            return _fetch(options);
-        }
-    }
-}
-function _processOptions(options) {
-    options.method ?? (options.method = 'GET');
-    options.window ?? (options.window = null);
-    options.timeout ?? (options.timeout = 5000);
-    options.retry ?? (options.retry = 3);
-    options.cacheStrategy ?? (options.cacheStrategy = 'network_only');
-    options.cacheStorageName ?? (options.cacheStorageName = 'alwatr_fetch_cache');
-    if (options.cacheStrategy !== 'network_only' && cacheSupported !== true) {
-        logger.accident('fetch', 'fetch_cache_strategy_ignore', 'Cache storage not support in this browser', {
-            cacheSupported,
-        });
-        options.cacheStrategy = 'network_only';
-    }
-    if (options.url.lastIndexOf('?') === -1 && options.queryParameters != null) {
-        // prettier-ignore
-        const queryArray = Object
-            .keys(options.queryParameters)
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            .map((key) => `${key}=${String(options.queryParameters[key])}`);
-        if (queryArray.length > 0) {
-            options.url += '?' + queryArray.join('&');
+            return _handleRetryPattern(options);
         }
     }
-    if (options.body != null && options.bodyJson != null) {
-        options.body = JSON.stringify(options.bodyJson);
-        options.headers = {
-            ...options.headers,
-            'Content-Type': 'application/json',
-        };
-    }
-    return options;
 }
 /**
- * It's a wrapper around the browser's `fetch` function that adds retry pattern with timeout.
+ * Handle retry pattern over `_handleTimeout`.
  */
-async function _fetch(options) {
-    logger.logMethodArgs('_fetch', { options });
-    // @TODO: AbortController polyfill
-    const abortController = new AbortController();
+async function _handleRetryPattern(options) {
+    if (!(options.retry >= 1))
+        return _handleTimeout(options);
+    logger.logMethod('_handleRetryPattern');
     const externalAbortSignal = options.signal;
-    options.signal = abortController.signal;
-    let timedOut = false;
-    const timeoutId = setTimeout(() => {
-        abortController.abort('fetch_timeout');
-        timedOut = true;
-    }, options.timeout);
-    if (externalAbortSignal != null) {
-        // Respect external abort signal
-        externalAbortSignal.addEventListener('abort', () => {
-            abortController.abort(`external abort signal: ${externalAbortSignal.reason}`);
-            clearTimeout(timeoutId);
-        });
-    }
-    abortController.signal.addEventListener('abort', () => {
-        logger.incident('fetch', 'fetch_abort_signal', 'fetch abort signal received', {
-            reason: abortController.signal.reason,
-        });
-    });
-    const retryFetch = () => {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const retryFetch = async () => {
         options.retry--;
         options.signal = externalAbortSignal;
-        return fetch(options);
+        await _wait(options.retryDelay);
+        return _handleCacheStrategy(options); // maybe cache updated by another request ;)
     };
     try {
-        // @TODO: browser fetch polyfill
-        const response = await window.fetch(options.url, options);
-        clearTimeout(timeoutId);
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const response = await _handleTimeout(options);
         if (options.retry > 1 && response.status >= 502 && response.status <= 504) {
             logger.accident('fetch', 'fetch_not_valid', 'fetch not valid and retry', {
                 response,
             });
             return retryFetch();
         }
+        // else
         return response;
     }
     catch (reason) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (timedOut && options.retry > 1) {
+        if (reason?.message === 'fetch_timeout' && options.retry > 1) {
             logger.incident('fetch', 'fetch_timeout', 'fetch timeout and retry', {
                 reason,
             });
             return retryFetch();
         }
-        else {
-            clearTimeout(timeoutId);
-            throw reason;
-        }
+        // else
+        throw reason;
     }
 }
 /**
- * It fetches a JSON file from a URL, and returns the parsed data.
- *
- * Example:
- *
- * ```ts
- * const productList = await getJson<ProductResponse>({
- *   url: '/api/products',
- *   queryParameters: {limit: 10},
- *   timeout: 5_000,
- *   retry: 3,
- *   cacheStrategy: 'stale_while_revalidate',
- * });
- * ```
+ * It's a wrapper around the browser's `fetch` with timeout.
  */
-export async function getJson(options) {
-    logger.logMethodArgs('getJson', { options });
-    const response = await fetch(options);
-    let data;
-    try {
-        if (!response.ok) {
-            throw new Error('fetch_nok');
+function _handleTimeout(options) {
+    logger.logMethod('_handleTimeout');
+    return new Promise((resolved, reject) => {
+        // @TODO: AbortController polyfill
+        const abortController = new AbortController();
+        const externalAbortSignal = options.signal;
+        options.signal = abortController.signal;
+        const timeoutId = setTimeout(() => {
+            reject(new Error('fetch_timeout'));
+            abortController.abort('fetch_timeout');
+        }, options.timeout);
+        if (externalAbortSignal != null) {
+            // Respect external abort signal
+            externalAbortSignal.addEventListener('abort', () => {
+                abortController.abort(`external abort signal: ${externalAbortSignal.reason}`);
+                clearTimeout(timeoutId);
+            });
         }
-        data = (await response.json());
-    }
-    catch (err) {
-        logger.accident('getJson', 'response_json', 'response json error', {
-            retry: options.retry,
-            err,
+        abortController.signal.addEventListener('abort', () => {
+            logger.incident('fetch', 'fetch_abort_signal', 'fetch abort signal received', {
+                reason: abortController.signal.reason,
+            });
         });
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (options.retry > 1) {
-            data = await getJson(options);
-        }
-        else {
-            throw err;
-        }
-    }
-    return data;
+        window
+            .fetch(options.url, options)
+            .then((response) => resolved(response))
+            .catch((reason) => reject(reason))
+            .finally(() => clearTimeout(timeoutId));
+    });
 }
+const _wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 //# sourceMappingURL=fetch.js.map

package/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["src/fetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["src/fetch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alwatr/fetch",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "Enhanced fetch API with cache strategy, retry pattern, timeout, helper methods and enhanced types written in tiny TypeScript, ES module.",
   "keywords": [
     "fetch",
@@ -34,8 +34,8 @@
     "url": "https://github.com/AliMD/alwatr/issues"
   },
   "dependencies": {
-    "@alwatr/logger": "^0.19.0",
+    "@alwatr/logger": "^0.21.0",
     "tslib": "^2.4.1"
   },
-  "gitHead": "59e23eeaeee00f152daf5341b0ae66b7e9ac2a96"
+  "gitHead": "b4a565ee520e5a9fab404f539463109b6af19aa9"
 }