@alwatr/fetch 0.15.0 → 0.17.0

package/CHANGELOG.md

@@ -3,13 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [0.15.0](https://github.com/AliMD/alwatr/compare/v0.14.0...v0.15.0) (2022-09-01)
+# [0.17.0](https://github.com/AliMD/alwatr/compare/v0.16.1...v0.17.0) (2022-10-21)
 
-**Note:** Version bump only for package @alwatr/fetch
+### 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)
+
+**Note:** Version bump only for package @alwatr/fetch
 
 # [0.14.0](https://github.com/AliMD/alwatr/compare/v0.13.0...v0.14.0) (2022-08-19)
 

package/README.md

@@ -6,15 +6,54 @@ Enhanced fetch API with the timeout, helper methods, and types written in tiny T
 
 `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)
 
-Options have two other parameters:
+Options have some other parameters:
 
-- `bodyObject`: a JSON object that converts to string and put on the body.
-- `queryParameters`: a JSON object that converts to URL query params
+- `bodyJson`: a JSON object that converts to string and put on the body.
+- `queryParameters`: a JSON object that converts to URL query params.
+- `timeout`: A timeout for the fetch request.
+- `retry` If fetch response not acceptable or timed out, it will retry the request
 
 ## Example usage
 
-```js
+```ts
 import {getJson} from 'https://esm.run/@alwatr/fetch';
 
-const productList = await getJson('/api/products', {limit: 10}, {timeout: 5_000});
+interface ProductInterface {
+  _id: string;
+  name: string;
+  description: string;
+  image: string;
+}
+
+const productList = await getJson<Record<string, ProductInterface>>('/api/products', {
+  queryParameters: {limit: 10},
+  timeout: 15_000,
+  retry: 5,
+});
+```
+
+## API
+
+### `fetch(url: string, options: FetchOptions = {})`
+
+It's a wrapper around the browser's `fetch` function that adds retry pattern with timeout
+
+```ts
+await fetch(url, {timeout: 5_000, bodyJson: {a: 1, b: 2}});
+```
+
+### `getJson(url: string, options: FetchOptions = {})`
+
+It fetches a JSON file from a URL, and returns the JSON data
+
+```ts
+await getJson('/api/products', {queryParameters: {limit: 10}, timeout: 5_000});
+```
+
+### `postJson(url: string, bodyJson: Record<string | number, unknown>, options?: FetchOptions)`
+
+It takes a URL, a JSON object, and an optional FetchOptions object, and returns a Promise of a Response object
+
+```ts
+await postJson(url, {first_name: 'foo', last_name: 'bar'});
 ```

package/fetch.d.ts

@@ -5,33 +5,49 @@ declare global {
 }
 export interface FetchOptions extends RequestInit {
     /**
-     * @default 10_000 ms
+     * A timeout for the fetch request.
+     *
+     * @default 5000 ms
      */
     timeout?: number;
-    bodyObject?: Record<string | number, unknown>;
+    /**
+     * If fetch response not acceptable or timed out, it will retry the request.
+     *
+     * @default 3
+     */
+    retry?: number;
+    bodyJson?: Record<string | number, unknown>;
     queryParameters?: Record<string, string | number | boolean>;
 }
 /**
- * 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
+ *
+ * Example:
+ *
+ * ```ts
+ * const response = await fetch(url, {timeout: 5_000, bodyJson: {a: 1, b: 2}});
+ * ```
  */
 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 fetches a JSON file from a URL, and returns the JSON data
+ *
+ * Example:
+ *
+ * ```ts
+ * const productList = await getJson<ProductResponse>('/api/products', {queryParameters: {limit: 10}, timeout: 5_000});
+ * ```
  */
-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 getJson<ResponseType extends Record<string | number, unknown>>(url: string, options?: FetchOptions): Promise<ResponseType>;
 /**
- * Enhanced post json data.
- * @example
- * const response = await postData('/api/product/new', {name: 'foo', ...});
+ * It takes a URL, a JSON object, and an optional FetchOptions object, and returns a Promise of a
+ * Response object
+ *
+ * Example:
+ *
+ * ```ts
+ * const response = await postJson('/api/product/new', {name: 'foo', ...});
+ * ```
  */
-export declare function postData(url: string, body: Record<string | number, unknown>, options?: FetchOptions): Promise<Response>;
+export declare function postJson(url: string, bodyJson: Record<string | number, unknown>, options?: FetchOptions): 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;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;AAGD,MAAM,WAAW,YAAa,SAAQ,WAAW;IAC/C;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;CAC7D;AAED;;;;;;;;GAQG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAiGhF;AAED;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAC/E,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,YAAiB,GAC3B,OAAO,CAAC,YAAY,CAAC,CA6BvB;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CACpB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAC1C,OAAO,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,QAAQ,CAAC,CAQnB"}

package/fetch.js

@@ -5,22 +5,25 @@ alwatrRegisteredList.push({
     version: '{{ALWATR_VERSION}}',
 });
 /**
- * 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
+ *
+ * Example:
+ *
+ * ```ts
+ * const response = await fetch(url, {timeout: 5_000, bodyJson: {a: 1, b: 2}});
+ * ```
  */
-export function fetch(url, options) {
+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');
-    }
-    options = {
-        method: 'GET',
-        timeout: 15000,
-        window: null,
-        ...options,
-    };
-    if (options.queryParameters != null) {
+    // if (!navigator.onLine) {
+    //   logger.accident('fetch', 'abort_signal', 'abort signal received', {url});
+    //   throw new Error('fetch_offline');
+    // }
+    options.method ?? (options.method = 'GET');
+    options.timeout ?? (options.timeout = 5000);
+    options.retry ?? (options.retry = 3);
+    options.window ?? (options.window = null);
+    if (url.lastIndexOf('?') === -1 && options.queryParameters != null) {
         // prettier-ignore
         const queryArray = Object
             .keys(options.queryParameters)
@@ -30,8 +33,8 @@ export function fetch(url, 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',
@@ -40,10 +43,17 @@ export function fetch(url, 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', () => {
@@ -52,48 +62,90 @@ export function fetch(url, options) {
             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,
+    return response
+        .then((response) => {
+        clearTimeout(timeoutId);
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        if (response.status >= 502 && response.status <= 504 && options.retry > 1) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            options.retry--;
+            options.signal = externalAbortSignal;
+            logger.accident('fetch', 'fetch_nok', 'fetch not ok and retry', {
+                retry: options.retry,
+                response,
+            });
+            return fetch(url, options);
+        }
+        return response;
+    })
+        .catch((reason) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        if (timedOut && options.retry > 1) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            options.retry--;
+            options.signal = externalAbortSignal;
+            logger.accident('fetch', 'fetch_catch', 'fetch catch and retry', {
+                retry: options.retry,
+                reason,
+            });
+            return fetch(url, options);
+        }
+        else {
+            throw reason;
+        }
     });
 }
 /**
- * Enhanced fetch JSON.
- * @example
- * const productList = await getJson('/api/products', {limit: 10}, {timeout: 5_000});
+ * It fetches a JSON file from a URL, and returns the JSON data
+ *
+ * Example:
+ *
+ * ```ts
+ * const productList = await getJson<ProductResponse>('/api/products', {queryParameters: {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');
+export async function getJson(url, options = {}) {
+    logger.logMethodArgs('getJson', { url, options });
+    const response = await fetch(url, 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(url, options);
+        }
+        else {
+            throw err;
+        }
     }
-    return response.json();
+    return data;
 }
 /**
- * Enhanced post json data.
- * @example
- * const response = await postData('/api/product/new', {name: 'foo', ...});
+ * It takes a URL, a JSON object, and an optional FetchOptions object, and returns a Promise of a
+ * Response object
+ *
+ * Example:
+ *
+ * ```ts
+ * const response = await postJson('/api/product/new', {name: 'foo', ...});
+ * ```
  */
-export function postData(url, body, options) {
-    logger.logMethodArgs('postData', { url, body, options });
+export function postJson(url, bodyJson, options) {
+    logger.logMethod('postJson');
     return fetch(url, {
         method: 'POST',
-        bodyObject: body,
+        bodyJson,
         ...options,
     });
 }

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.15.0",
+  "version": "0.17.0",
   "description": "Enhanced fetch api with timeout, helper methods and types written in tiny TypeScript module.",
   "keywords": [
     "fetch",
@@ -32,8 +32,8 @@
     "url": "https://github.com/AliMD/alwatr/issues"
   },
   "dependencies": {
-    "@alwatr/logger": "^0.15.0",
+    "@alwatr/logger": "^0.17.0",
     "tslib": "^2.3.1"
   },
-  "gitHead": "785516d9da483e429ed9b79b3c6d71012c9aa822"
+  "gitHead": "f531925ca3db1072c0eaea90cb18e00802c93247"
 }