@aligent/microservice-util-lib 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aligent/microservice-util-lib",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A set of utility functions for Aligent Microservices",
   "type": "commonjs",
   "main": "./src/index.js",

package/src/openapi-fetch-middlewares/retry.js

@@ -84,6 +84,17 @@ function getRetryDelayFn(config) {
 function shouldRetryOnStatus(status, retryOn) {
     return retryOn.includes(status);
 }
+/**
+ * Checks the response status and throw error if it's not "ok".
+ *
+ * @param {Response} response - The HTTP response object.
+ * @throws {Error} When the response is not an "ok" response.
+ */
+function throwErrorIfNotOkResponse(response) {
+    if (!response.ok) {
+        throw new Error(`${response.status}: ${response.statusText}`);
+    }
+}
 /**
  * This middleware implements retry logic with support for:
  * - Configurable number of retry attempts
@@ -147,7 +158,8 @@ function retryMiddleware(config) {
             const context = { attempt: 1, request, response, error: null };
             // If retryOn is specified, only use that list
             if (config?.retryOn && config.retryOn.length > 0) {
-                if (!shouldRetryOnStatus(response.status, config.retryOn)) {
+                if (!shouldRetryOnStatus(context.response.status, config.retryOn)) {
+                    throwErrorIfNotOkResponse(context.response);
                     return context.response;
                 }
                 return await performRetries(normalisedConfig, context);
@@ -155,6 +167,7 @@ function retryMiddleware(config) {
             // Otherwise, check if we should retry based on retry condition
             const shouldRetry = await normalisedConfig.retryCondition(context, normalisedConfig.idempotentOnly);
             if (!shouldRetry) {
+                throwErrorIfNotOkResponse(context.response);
                 return context.response;
             }
             return await performRetries(normalisedConfig, context);
@@ -201,18 +214,18 @@ async function performRetries(config, context) {
             continue;
         }
         if (config.retryOn && !shouldRetryOnStatus(response?.status, config.retryOn)) {
+            throwErrorIfNotOkResponse(response);
             return response;
         }
         const shouldRetry = await config.retryCondition(context, config.idempotentOnly);
         if (!shouldRetry) {
+            throwErrorIfNotOkResponse(response);
             return response;
         }
     } while (attempt <= maxRetries);
     if (!response) {
         throw context.error;
     }
-    if (!response.ok) {
-        throw new Error(`${response.status}: ${response.statusText}`);
-    }
+    throwErrorIfNotOkResponse(response);
     return response;
 }