@spoosh/plugin-retry 0.1.9 → 0.3.0

package/README.md

@@ -16,7 +16,7 @@ npm install @spoosh/plugin-retry
 import { Spoosh } from "@spoosh/core";
 import { retryPlugin } from "@spoosh/plugin-retry";
 
-const client = new Spoosh<ApiSchema, Error>("/api").use([
+const spoosh = new Spoosh<ApiSchema, Error>("/api").use([
   retryPlugin({ retries: 3, retryDelay: 1000 }),
 ]);
 

package/dist/index.d.mts

@@ -35,7 +35,7 @@ type RetryWriteResult = object;
  * ```ts
  * import { Spoosh } from "@spoosh/core";
  *
- * const client = new Spoosh<ApiSchema, Error>("/api")
+ * const spoosh = new Spoosh<ApiSchema, Error>("/api")
  *   .use([
  *     // ... other plugins
  *     retryPlugin({ retries: 3, retryDelay: 1000 }),

package/dist/index.d.ts

@@ -35,7 +35,7 @@ type RetryWriteResult = object;
  * ```ts
  * import { Spoosh } from "@spoosh/core";
  *
- * const client = new Spoosh<ApiSchema, Error>("/api")
+ * const spoosh = new Spoosh<ApiSchema, Error>("/api")
  *   .use([
  *     // ... other plugins
  *     retryPlugin({ retries: 3, retryDelay: 1000 }),

package/dist/index.js

@@ -25,21 +25,60 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/plugin.ts
+var import_core = require("@spoosh/core");
+var PLUGIN_NAME = "spoosh:retry";
+var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 function retryPlugin(config = {}) {
   const { retries: defaultRetries = 3, retryDelay: defaultRetryDelay = 1e3 } = config;
   return {
-    name: "spoosh:retry",
+    name: PLUGIN_NAME,
     operations: ["read", "write", "infiniteRead"],
+    priority: 200,
     middleware: async (context, next) => {
+      const t = context.tracer?.(PLUGIN_NAME);
       const pluginOptions = context.pluginOptions;
-      const retries = pluginOptions?.retries ?? defaultRetries;
-      const retryDelay = pluginOptions?.retryDelay ?? defaultRetryDelay;
-      context.request = {
-        ...context.request,
-        retries,
-        retryDelay
+      const retriesConfig = pluginOptions?.retries ?? defaultRetries;
+      const retryDelayConfig = pluginOptions?.retryDelay ?? defaultRetryDelay;
+      const maxRetries = retriesConfig === false ? 0 : retriesConfig;
+      if (!maxRetries || maxRetries < 0) {
+        t?.skip("Disabled");
+        return next();
+      }
+      const originalRequest = {
+        headers: (0, import_core.clone)(context.request.headers),
+        params: (0, import_core.clone)(context.request.params),
+        body: (0, import_core.clone)(context.request.body)
       };
-      return next();
+      let res;
+      for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        if (attempt > 0) {
+          context.request.headers = (0, import_core.clone)(originalRequest.headers);
+          context.request.params = (0, import_core.clone)(originalRequest.params);
+          context.request.body = (0, import_core.clone)(originalRequest.body);
+          t?.log(`Retry ${attempt}/${maxRetries}`, { color: "warning" });
+        }
+        res = await next();
+        if ((0, import_core.isAbortError)(res.error)) {
+          t?.log("Aborted", { color: "muted" });
+          return res;
+        }
+        if ((0, import_core.isNetworkError)(res.error) && attempt < maxRetries) {
+          const delayMs = retryDelayConfig * Math.pow(2, attempt);
+          await delay(delayMs);
+          continue;
+        }
+        if (attempt > 0) {
+          if ((0, import_core.isNetworkError)(res.error)) {
+            t?.log("Max retries reached or non-retryable error", {
+              color: "error"
+            });
+          } else {
+            t?.log("Retry succeeded", { color: "success" });
+          }
+        }
+        return res;
+      }
+      return res;
     }
   };
 }

package/dist/index.mjs

@@ -1,19 +1,58 @@
 // src/plugin.ts
+import { isNetworkError, isAbortError, clone } from "@spoosh/core";
+var PLUGIN_NAME = "spoosh:retry";
+var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 function retryPlugin(config = {}) {
   const { retries: defaultRetries = 3, retryDelay: defaultRetryDelay = 1e3 } = config;
   return {
-    name: "spoosh:retry",
+    name: PLUGIN_NAME,
     operations: ["read", "write", "infiniteRead"],
+    priority: 200,
     middleware: async (context, next) => {
+      const t = context.tracer?.(PLUGIN_NAME);
       const pluginOptions = context.pluginOptions;
-      const retries = pluginOptions?.retries ?? defaultRetries;
-      const retryDelay = pluginOptions?.retryDelay ?? defaultRetryDelay;
-      context.request = {
-        ...context.request,
-        retries,
-        retryDelay
+      const retriesConfig = pluginOptions?.retries ?? defaultRetries;
+      const retryDelayConfig = pluginOptions?.retryDelay ?? defaultRetryDelay;
+      const maxRetries = retriesConfig === false ? 0 : retriesConfig;
+      if (!maxRetries || maxRetries < 0) {
+        t?.skip("Disabled");
+        return next();
+      }
+      const originalRequest = {
+        headers: clone(context.request.headers),
+        params: clone(context.request.params),
+        body: clone(context.request.body)
       };
-      return next();
+      let res;
+      for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        if (attempt > 0) {
+          context.request.headers = clone(originalRequest.headers);
+          context.request.params = clone(originalRequest.params);
+          context.request.body = clone(originalRequest.body);
+          t?.log(`Retry ${attempt}/${maxRetries}`, { color: "warning" });
+        }
+        res = await next();
+        if (isAbortError(res.error)) {
+          t?.log("Aborted", { color: "muted" });
+          return res;
+        }
+        if (isNetworkError(res.error) && attempt < maxRetries) {
+          const delayMs = retryDelayConfig * Math.pow(2, attempt);
+          await delay(delayMs);
+          continue;
+        }
+        if (attempt > 0) {
+          if (isNetworkError(res.error)) {
+            t?.log("Max retries reached or non-retryable error", {
+              color: "error"
+            });
+          } else {
+            t?.log("Retry succeeded", { color: "success" });
+          }
+        }
+        return res;
+      }
+      return res;
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/plugin-retry",
-  "version": "0.1.9",
+  "version": "0.3.0",
   "description": "Automatic retry plugin for Spoosh with configurable attempts and delay",
   "license": "MIT",
   "repository": {
@@ -33,11 +33,11 @@
     }
   },
   "peerDependencies": {
-    "@spoosh/core": ">=0.12.0"
+    "@spoosh/core": ">=0.13.0"
   },
   "devDependencies": {
-    "@spoosh/core": "0.12.0",
-    "@spoosh/test-utils": "0.1.8"
+    "@spoosh/test-utils": "0.2.0",
+    "@spoosh/core": "0.13.0"
   },
   "scripts": {
     "dev": "tsup --watch",