@alwatr/fetch 0.16.0 → 0.18.0

package/CHANGELOG.md

@@ -3,13 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [0.16.0](https://github.com/AliMD/alwatr/compare/v0.15.0...v0.16.0) (2022-09-08)
+# [0.18.0](https://github.com/AliMD/alwatr/compare/v0.17.0...v0.18.0) (2022-10-22)
 
-**Note:** Version bump only for package @alwatr/fetch
+### Bug Fixes
+
+- **fetch:** update cache on network_first ([54b59cd](https://github.com/AliMD/alwatr/commit/54b59cdc64a543a0afcd09d2ec78d20661f3a06d))
+
+### Features
+
+- **fetch:** cache strategy ([106eabd](https://github.com/AliMD/alwatr/commit/106eabdd10574b24f9919049d0b509ae40168a9a))
+- **fetch:** optional cacheStorageName ([f2bd8f2](https://github.com/AliMD/alwatr/commit/f2bd8f2a899466628417294cb269fd569b87e17a))
+- **fetch:** stale_while_revalidate cache strategy ([f758f49](https://github.com/AliMD/alwatr/commit/f758f495efb42ce7441e8f2058c1b67de0615a8c))
+
+# [0.17.0](https://github.com/AliMD/alwatr/compare/v0.16.1...v0.17.0) (2022-10-21)
 
+### Bug Fixes
+
+- **fetch:** not ok retry condition ([0da1edd](https://github.com/AliMD/alwatr/commit/0da1edda64ec5abf70a83361d159e207691e368e))
+
+### Features
 
+- **fetch:** docs & pattern ([459ad1c](https://github.com/AliMD/alwatr/commit/459ad1c5996f851769306639136d79c0f7270770))
+- **fetch:** logger & jsdocs ([36f652d](https://github.com/AliMD/alwatr/commit/36f652d5dad23b2aeb824af77d1b0e442119c6e8))
+- **fetch:** retry pattern ([5350d1a](https://github.com/AliMD/alwatr/commit/5350d1a81b9134d598f46006a1baa880b280ea98))
 
+### Performance Improvements
 
+- **fetch:** syntax ([1fdd02e](https://github.com/AliMD/alwatr/commit/1fdd02ec8b52e32a124b8d7c1d1c7fd7c993e3af))
+
+# [0.16.0](https://github.com/AliMD/alwatr/compare/v0.15.0...v0.16.0) (2022-09-08)
+
+**Note:** Version bump only for package @alwatr/fetch
 
 # [0.15.0](https://github.com/AliMD/alwatr/compare/v0.14.0...v0.15.0) (2022-09-01)
 

package/README.md

@@ -1,20 +1,73 @@
 # @alwatr/fetch
 
-Enhanced fetch API with the timeout, helper methods, and types written in tiny TypeScript, ES module.
+Enhanced fetch API with cache strategy, retry pattern, timeout, helper methods and enhanced types written in tiny TypeScript, ES module.
 
-## Options
+## Example usage
 
-`Options` inherited from the `RequestInit`. you can watch all documents of the parameters RequestInit in [`fetch init parameters`](https://developer.mozilla.org/en-US/docs/Web/API/fetch#parameters)
+```ts
+import {getJson} from 'https://esm.run/@alwatr/fetch';
 
-Options have two other parameters:
+interface ProductInterface {
+  _id: string;
+  name: string;
+  description: string;
+  image: string;
+}
 
-- `bodyObject`: a JSON object that converts to string and put on the body.
-- `queryParameters`: a JSON object that converts to URL query params
+const productList = await getJson<Record<string, ProductInterface>>({
+  url: '/api/products',
+  queryParameters: {limit: 10},
+  timeout: 5_000,
+  retry: 3,
+  cacheStrategy: 'stale_while_revalidate',
+});
+```
 
-## Example usage
+## Fetch Options
 
-```js
-import {getJson} from 'https://esm.run/@alwatr/fetch';
+`FetchOptions` inherited from the [fetch standard parameters](https://developer.mozilla.org/en-US/docs/Web/API/fetch#parameters) and some other...
+
+- `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).
+- `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`).
+  - `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.
+
+[Read more about standard cache strategies](https://developer.chrome.com/docs/workbox/caching-strategies-overview/#caching-strategies)
+
+## API
+
+### `fetch(options: FetchOptions): Promise<Response>`
+
+It's a wrapper around the browser's `fetch` function that adds retry pattern with timeout and cacheStrategy.
+
+```ts
+const response = await fetch({
+  url: '/api/products',
+  queryParameters: {limit: 10},
+  timeout: 5_000,
+  retry: 3,
+  cacheStrategy: 'stale_while_revalidate',
+});
+```
+
+### `getJson<T>(options: FetchOptions): Promise<T>`
+
+It fetches a JSON file from a URL, and returns the parsed data.
 
-const productList = await getJson('/api/products', {limit: 10}, {timeout: 5_000});
+```ts
+const productList = await getJson<ProductResponse>({
+  url: '/api/products',
+  queryParameters: {limit: 10},
+  timeout: 5_000,
+  retry: 3,
+  cacheStrategy: 'stale_while_revalidate',
+});
 ```

package/fetch.d.ts

@@ -3,35 +3,79 @@ declare global {
         abort(reason?: string): void;
     }
 }
+export declare type CacheStrategy = 'network_only' | 'network_first' | 'cache_only' | 'cache_first' | 'stale_while_revalidate';
 export interface FetchOptions extends RequestInit {
     /**
-     * @default 10_000 ms
+     * Request URL.
+     */
+    url: string;
+    /**
+     * A timeout for the fetch request.
+     *
+     * @default 5000 ms
+     */
+    timeout: number;
+    /**
+     * If fetch response not acceptable or timed out, it will retry the request.
+     *
+     * @default 3
+     */
+    retry: number;
+    /**
+     * Strategies for caching.
+     *
+     * @default 'network_only'
+     */
+    cacheStrategy: CacheStrategy;
+    /**
+     * Cache storage name.
+     *
+     * @default 'alwatr_fetch_cache'
+     */
+    cacheStorageName: string;
+    /**
+     * Body as JS Object.
+     */
+    bodyJson?: Record<string | number, unknown>;
+    /**
+     * URL Query Parameters as JS Object.
      */
-    timeout?: number;
-    bodyObject?: Record<string | number, unknown>;
     queryParameters?: Record<string, string | number | boolean>;
 }
 /**
- * Enhanced base fetch API.
- * @example const response = await fetch(url, {jsonResponse: false});
- */
-export declare function fetch(url: string, options?: FetchOptions): Promise<Response>;
-/**
- * Enhanced get data.
- * @example
- * const response = await postData('/api/products', {limit: 10}, {timeout: 5_000});
- */
-export declare function getData(url: string, queryParameters?: Record<string | number, string | number | boolean>, options?: FetchOptions): Promise<Response>;
-/**
- * Enhanced fetch JSON.
- * @example
- * const productList = await getJson('/api/products', {limit: 10}, {timeout: 5_000});
+ * It's a wrapper around the browser's `fetch` function that adds retry pattern with timeout and cacheStrategy.
+ *
+ * Example:
+ *
+ * ```ts
+ * const response = await fetch({
+ *   url: '/api/products',
+ *   queryParameters: {limit: 10},
+ *   timeout: 5_000,
+ *   retry: 3,
+ *   cacheStrategy: 'stale_while_revalidate',
+ * });
+ * ```
  */
-export declare function getJson<ResponseType extends Record<string | number, unknown>>(url: string, queryParameters?: Record<string | number, string | number | boolean>, options?: FetchOptions): Promise<ResponseType>;
+export declare function fetch(_options: Partial<FetchOptions> & {
+    url: string;
+}): Promise<Response>;
 /**
- * Enhanced post json data.
- * @example
- * const response = await postData('/api/product/new', {name: 'foo', ...});
+ * 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',
+ * });
+ * ```
  */
-export declare function postData(url: string, body: Record<string | number, unknown>, options?: FetchOptions): Promise<Response>;
+export declare function getJson<ResponseType extends Record<string | number, unknown>>(options: Partial<FetchOptions> & {
+    url: string;
+}): Promise<ResponseType>;
 //# 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;AAGD,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;CAC7D;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CA0D5E;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CACnB,GAAG,EAAE,MAAM,EACX,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EACpE,OAAO,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,QAAQ,CAAC,CAMnB;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAC/E,GAAG,EAAE,MAAM,EACX,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EACpE,OAAO,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,YAAY,CAAC,CASvB;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACpB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,QAAQ,CAAC,CAOnB"}
+{"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"}

package/fetch.js

@@ -4,97 +4,210 @@ alwatrRegisteredList.push({
     name: '@alwatr/fetch',
     version: '{{ALWATR_VERSION}}',
 });
+let cacheStorage;
+const cacheSupported = 'caches' in self;
 /**
- * Enhanced base fetch API.
- * @example const response = await fetch(url, {jsonResponse: false});
+ * It's a wrapper around the browser's `fetch` function that adds retry pattern with timeout and cacheStrategy.
+ *
+ * Example:
+ *
+ * ```ts
+ * const response = await fetch({
+ *   url: '/api/products',
+ *   queryParameters: {limit: 10},
+ *   timeout: 5_000,
+ *   retry: 3,
+ *   cacheStrategy: 'stale_while_revalidate',
+ * });
+ * ```
  */
-export function fetch(url, options) {
-    logger.logMethodArgs('fetch', { url, options });
-    if (!navigator.onLine) {
-        logger.accident('fetch', 'abort_signal', 'abort signal received', { url });
-        throw new Error('fetch_offline');
+export async function fetch(_options) {
+    const options = _processOptions(_options);
+    logger.logMethodArgs('fetch', { options });
+    if (options.cacheStrategy === 'network_only') {
+        return _fetch(options);
     }
-    options = {
-        method: 'GET',
-        timeout: 15000,
-        window: null,
-        ...options,
-    };
-    if (options.queryParameters != null) {
+    // else handle cache strategies!
+    if (cacheStorage == null) {
+        cacheStorage = await caches.open(options.cacheStorageName);
+    }
+    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);
+            if (response.ok) {
+                cacheStorage.put(request, response.clone());
+            }
+            return response;
+        }
+        case 'cache_only': {
+            const cachedResponse = await cacheStorage.match(request);
+            if (cachedResponse == null)
+                throw new Error('fetch_cache_not_found');
+            return cachedResponse;
+        }
+        case 'network_first': {
+            try {
+                const networkResponse = await _fetch(options);
+                if (networkResponse.ok) {
+                    cacheStorage.put(request, networkResponse.clone());
+                }
+                return networkResponse;
+            }
+            catch (err) {
+                const cachedResponse = await cacheStorage.match(request);
+                if (cachedResponse == null)
+                    throw err;
+                return cachedResponse;
+            }
+        }
+        case 'stale_while_revalidate': {
+            const cachedResponse = await cacheStorage.match(request);
+            const fetchedResponsePromise = _fetch(options).then((networkResponse) => {
+                if (networkResponse.ok) {
+                    cacheStorage.put(request, networkResponse.clone());
+                }
+                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) {
-            url += '?' + queryArray.join('&');
+            options.url += '?' + queryArray.join('&');
         }
     }
-    if (options.bodyObject != null) {
-        options.body = JSON.stringify(options.bodyObject);
+    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.
+ */
+async function _fetch(options) {
+    logger.logMethodArgs('_fetch', { options });
     // @TODO: AbortController polyfill
     const abortController = new AbortController();
     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', 'abort_signal', 'abort signal received', {
-            url,
+        logger.incident('fetch', 'fetch_abort_signal', 'fetch abort signal received', {
             reason: abortController.signal.reason,
         });
     });
-    options.signal = abortController.signal;
-    const timeoutId = setTimeout(() => abortController.abort('fetch_timeout'), options.timeout);
-    // @TODO: browser fetch polyfill
-    const response = window.fetch(url, options);
-    response.then(() => clearTimeout(timeoutId));
-    return response;
-}
-/**
- * Enhanced get data.
- * @example
- * const response = await postData('/api/products', {limit: 10}, {timeout: 5_000});
- */
-export function getData(url, queryParameters, options) {
-    logger.logMethodArgs('getData', { url, queryParameters, options });
-    return fetch(url, {
-        queryParameters,
-        ...options,
-    });
-}
-/**
- * Enhanced fetch JSON.
- * @example
- * const productList = await getJson('/api/products', {limit: 10}, {timeout: 5_000});
- */
-export async function getJson(url, queryParameters, options) {
-    logger.logMethodArgs('getJson', { url, queryParameters, options });
-    const response = await getData(url, queryParameters, options);
-    if (!response.ok) {
-        throw new Error('fetch_nok');
+    const retryFetch = () => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        options.retry--;
+        options.signal = externalAbortSignal;
+        return fetch(options);
+    };
+    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
+        if (options.retry > 1 && response.status >= 502 && response.status <= 504) {
+            logger.accident('fetch', 'fetch_not_valid', 'fetch not valid and retry', {
+                response,
+            });
+            return retryFetch();
+        }
+        return response;
+    }
+    catch (reason) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        if (timedOut && options.retry > 1) {
+            logger.incident('fetch', 'fetch_timeout', 'fetch timeout and retry', {
+                reason,
+            });
+            return retryFetch();
+        }
+        else {
+            clearTimeout(timeoutId);
+            throw reason;
+        }
     }
-    return response.json();
 }
 /**
- * Enhanced post json data.
- * @example
- * const response = await postData('/api/product/new', {name: 'foo', ...});
+ * 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',
+ * });
+ * ```
  */
-export function postData(url, body, options) {
-    logger.logMethodArgs('postData', { url, body, options });
-    return fetch(url, {
-        method: 'POST',
-        bodyObject: body,
-        ...options,
-    });
+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');
+        }
+        data = (await response.json());
+    }
+    catch (err) {
+        logger.accident('getJson', 'response_json', 'response json error', {
+            retry: options.retry,
+            err,
+        });
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        if (options.retry > 1) {
+            data = await getJson(options);
+        }
+        else {
+            throw err;
+        }
+    }
+    return data;
 }
 //# 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,11 +1,13 @@
 {
   "name": "@alwatr/fetch",
-  "version": "0.16.0",
-  "description": "Enhanced fetch api with timeout, helper methods and types written in tiny TypeScript module.",
+  "version": "0.18.0",
+  "description": "Enhanced fetch API with cache strategy, retry pattern, timeout, helper methods and enhanced types written in tiny TypeScript, ES module.",
   "keywords": [
     "fetch",
     "request",
     "api",
+    "retry",
+    "cache",
     "timeout",
     "typescript",
     "esm",
@@ -32,8 +34,8 @@
     "url": "https://github.com/AliMD/alwatr/issues"
   },
   "dependencies": {
-    "@alwatr/logger": "^0.16.0",
+    "@alwatr/logger": "^0.18.0",
     "tslib": "^2.3.1"
   },
-  "gitHead": "403b42f686edc84c4a3021b40f5b05dce0289f12"
+  "gitHead": "a6f75b381a758849b514ea0d59eec6a3b3444008"
 }