@vpmedia/simplify 1.4.0 → 1.5.1

package/CHANGES.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.5.1
+
+- Bugfixes for fetch retry helper
+
+## 1.5.0
+
+- Refactored fetch retry helper
+
 ## 1.4.0
 
 - Added fetch retry helper

package/README.md

@@ -1,6 +1,6 @@
 # @vpmedia/simplify
 
-[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.4.0)](https://badge.fury.io/js/@vpmedia%2Fsimplify)
+[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.5.1)](https://badge.fury.io/js/@vpmedia%2Fsimplify)
 [![Node.js CI](https://github.com/vpmedia/simplify/actions/workflows/ci.yml/badge.svg)](https://github.com/vpmedia/simplify/actions/workflows/ci.yml)
 
 @vpmedia/simplify TBD

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/simplify",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "@vpmedia/simplify",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",

package/src/util/fetchRetry.js

@@ -7,36 +7,31 @@ const logger = new Logger('fetchRetry');
  * Fetch with retry.
  * @param {string | URL | Request} resource - Fetch URL.
  * @param {RequestInit} [fetchOptions] - Fetch options.
- * @param {{ delay?: number, numRetries?: number, isLog?: boolean}} [retryOptions] - Retry options.
+ * @param {{ delay?: number, numTries?: number, isLog?: boolean}} [retryOptions] - Retry options.
  * @returns {Promise<Response>} Fetch result.
  */
-export const fetchRetry = (resource, fetchOptions, retryOptions) => {
+export const fetchRetry = async (resource, fetchOptions, retryOptions) => {
   retryOptions = retryOptions ?? {};
-  retryOptions.delay = retryOptions.delay ?? 1000;
-  retryOptions.numRetries = retryOptions.numRetries ?? 3;
-  retryOptions.isLog = retryOptions.isLog ?? false;
-  return fetch(resource, fetchOptions)
-    .then((response) => {
-      if (retryOptions.isLog && !response.ok) {
-        logger.warn('Fetch failed', { fetchOptions, responseStatus: response.status });
+  retryOptions.delay = Math.max(retryOptions.delay ?? 1000, 1);
+  retryOptions.numTries = Math.max(retryOptions.numTries ?? 3, 1);
+  while (retryOptions.numTries > 0) {
+    logger.info('Fetch request', { resource, fetchOptions, retryOptions });
+    try {
+      const response = await fetch(resource, fetchOptions);
+      if (!response.ok) {
+        logger.warn('Fetch response', response);
+        throw new Error(`Network error: ${response.status}`, { cause: response.status });
       }
-      return response.ok ? response.json() : Promise.reject(response);
-    })
-    .catch((error) => {
-      if (retryOptions.isLog) {
-        logger.exception('Fetch error', error);
-      }
-      retryOptions.numRetries -= 1;
-      retryOptions.delay *= 2;
-      if (retryOptions.numRetries > 0) {
-        if (retryOptions.isLog) {
-          logger.warn('Fetch retry', { resource, fetchOptions, retryOptions });
-        }
-        delayPromise(retryOptions.delay).then(() => {
-          return fetchRetry(resource, fetchOptions, retryOptions);
-        });
-      } else {
+      logger.info('Fetch response', response);
+      return response;
+    } catch (error) {
+      logger.error('Fetch error', error instanceof Error ? error : new Error(String(error)));
+      retryOptions.numTries -= 1;
+      if (retryOptions.numTries === 0) {
         throw error;
       }
-    });
+      await delayPromise(retryOptions.delay);
+      retryOptions.delay *= 2;
+    }
+  }
 };

package/types/util/fetchRetry.d.ts

@@ -1,6 +1,6 @@
 export function fetchRetry(resource: string | URL | Request, fetchOptions?: RequestInit, retryOptions?: {
     delay?: number;
-    numRetries?: number;
+    numTries?: number;
     isLog?: boolean;
 }): Promise<Response>;
 //# sourceMappingURL=fetchRetry.d.ts.map

package/types/util/fetchRetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchRetry.d.ts","sourceRoot":"","sources":["../../src/util/fetchRetry.js"],"names":[],"mappings":"AAYO,qCALI,MAAM,GAAG,GAAG,GAAG,OAAO,iBACtB,WAAW,iBACX;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAC,GACrD,OAAO,CAAC,QAAQ,CAAC,CA+B7B"}
+{"version":3,"file":"fetchRetry.d.ts","sourceRoot":"","sources":["../../src/util/fetchRetry.js"],"names":[],"mappings":"AAYO,qCALI,MAAM,GAAG,GAAG,GAAG,OAAO,iBACtB,WAAW,iBACX;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAC,GACnD,OAAO,CAAC,QAAQ,CAAC,CA0B7B"}