@vpmedia/simplify 1.5.1 → 1.5.2

package/CHANGES.md

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

package/README.md

@@ -1,6 +1,6 @@
 # @vpmedia/simplify
 
-[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.5.1)](https://badge.fury.io/js/@vpmedia%2Fsimplify)
+[![npm version](https://badge.fury.io/js/@vpmedia%2Fsimplify.svg?v=1.5.2)](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.5.1",
+  "version": "1.5.2",
   "description": "@vpmedia/simplify",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",

package/src/util/fetchRetry.js

@@ -1,7 +1,7 @@
 import { Logger } from '../logging/Logger.js';
 import { delayPromise } from './delayPromise.js';
 
-const logger = new Logger('fetchRetry');
+const logger = new Logger('fetch');
 
 /**
  * Fetch with retry.
@@ -12,20 +12,20 @@ const logger = new Logger('fetchRetry');
  */
 export const fetchRetry = async (resource, fetchOptions, retryOptions) => {
   retryOptions = retryOptions ?? {};
-  retryOptions.delay = Math.max(retryOptions.delay ?? 1000, 1);
+  retryOptions.delay = Math.max(retryOptions.delay ?? 500, 1);
   retryOptions.numTries = Math.max(retryOptions.numTries ?? 3, 1);
   while (retryOptions.numTries > 0) {
-    logger.info('Fetch request', { resource, fetchOptions, retryOptions });
+    logger.info('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 });
+        logger.warn('failure', response);
+        throw new Error(`fetch ${response.url} returned status ${response.status}`, { cause: response.status });
       }
-      logger.info('Fetch response', response);
+      logger.info('success', response);
       return response;
     } catch (error) {
-      logger.error('Fetch error', error instanceof Error ? error : new Error(String(error)));
+      logger.error('error', error instanceof Error ? error : new Error(String(error)));
       retryOptions.numTries -= 1;
       if (retryOptions.numTries === 0) {
         throw error;