@spoosh/plugin-retry 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +22 -41
  2. package/dist/index.mjs +17 -36
  3. package/package.json +4 -4
package/dist/index.js CHANGED
@@ -26,68 +26,40 @@ module.exports = __toCommonJS(src_exports);
26
26
 
27
27
  // src/plugin.ts
28
28
  var import_core = require("@spoosh/core");
29
-
30
- // src/cloneObject.ts
31
- function clone(value, seen = /* @__PURE__ */ new WeakMap()) {
32
- if (value === void 0 || value === null || typeof value !== "object") {
33
- return value;
34
- }
35
- if (seen.has(value)) {
36
- return seen.get(value);
37
- }
38
- if (Array.isArray(value)) {
39
- const arr = [];
40
- seen.set(value, arr);
41
- return value.map((v) => clone(v, seen));
42
- }
43
- if (value instanceof Date) {
44
- return new Date(value.getTime());
45
- }
46
- if (value instanceof RegExp) {
47
- return new RegExp(value.source, value.flags);
48
- }
49
- if (value.constructor !== Object) {
50
- return value;
51
- }
52
- const obj = {};
53
- seen.set(value, obj);
54
- for (const key in value) {
55
- if (Object.prototype.hasOwnProperty.call(value, key)) {
56
- obj[key] = clone(value[key], seen);
57
- }
58
- }
59
- return obj;
60
- }
61
-
62
- // src/plugin.ts
29
+ var PLUGIN_NAME = "spoosh:retry";
63
30
  var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
64
31
  function retryPlugin(config = {}) {
65
32
  const { retries: defaultRetries = 3, retryDelay: defaultRetryDelay = 1e3 } = config;
66
33
  return {
67
- name: "spoosh:retry",
34
+ name: PLUGIN_NAME,
68
35
  operations: ["read", "write", "infiniteRead"],
36
+ priority: 200,
69
37
  middleware: async (context, next) => {
38
+ const t = context.tracer?.(PLUGIN_NAME);
70
39
  const pluginOptions = context.pluginOptions;
71
40
  const retriesConfig = pluginOptions?.retries ?? defaultRetries;
72
41
  const retryDelayConfig = pluginOptions?.retryDelay ?? defaultRetryDelay;
73
42
  const maxRetries = retriesConfig === false ? 0 : retriesConfig;
74
43
  if (!maxRetries || maxRetries < 0) {
44
+ t?.skip("Disabled");
75
45
  return next();
76
46
  }
77
47
  const originalRequest = {
78
- headers: clone(context.request.headers),
79
- params: clone(context.request.params),
80
- body: clone(context.request.body)
48
+ headers: (0, import_core.clone)(context.request.headers),
49
+ params: (0, import_core.clone)(context.request.params),
50
+ body: (0, import_core.clone)(context.request.body)
81
51
  };
82
52
  let res;
83
53
  for (let attempt = 0; attempt <= maxRetries; attempt++) {
84
54
  if (attempt > 0) {
85
- context.request.headers = clone(originalRequest.headers);
86
- context.request.params = clone(originalRequest.params);
87
- context.request.body = clone(originalRequest.body);
55
+ context.request.headers = (0, import_core.clone)(originalRequest.headers);
56
+ context.request.params = (0, import_core.clone)(originalRequest.params);
57
+ context.request.body = (0, import_core.clone)(originalRequest.body);
58
+ t?.log(`Retry ${attempt}/${maxRetries}`, { color: "warning" });
88
59
  }
89
60
  res = await next();
90
61
  if ((0, import_core.isAbortError)(res.error)) {
62
+ t?.log("Aborted", { color: "muted" });
91
63
  return res;
92
64
  }
93
65
  if ((0, import_core.isNetworkError)(res.error) && attempt < maxRetries) {
@@ -95,6 +67,15 @@ function retryPlugin(config = {}) {
95
67
  await delay(delayMs);
96
68
  continue;
97
69
  }
70
+ if (attempt > 0) {
71
+ if ((0, import_core.isNetworkError)(res.error)) {
72
+ t?.log("Max retries reached or non-retryable error", {
73
+ color: "error"
74
+ });
75
+ } else {
76
+ t?.log("Retry succeeded", { color: "success" });
77
+ }
78
+ }
98
79
  return res;
99
80
  }
100
81
  return res;
package/dist/index.mjs CHANGED
@@ -1,51 +1,21 @@
1
1
  // src/plugin.ts
2
- import { isNetworkError, isAbortError } from "@spoosh/core";
3
-
4
- // src/cloneObject.ts
5
- function clone(value, seen = /* @__PURE__ */ new WeakMap()) {
6
- if (value === void 0 || value === null || typeof value !== "object") {
7
- return value;
8
- }
9
- if (seen.has(value)) {
10
- return seen.get(value);
11
- }
12
- if (Array.isArray(value)) {
13
- const arr = [];
14
- seen.set(value, arr);
15
- return value.map((v) => clone(v, seen));
16
- }
17
- if (value instanceof Date) {
18
- return new Date(value.getTime());
19
- }
20
- if (value instanceof RegExp) {
21
- return new RegExp(value.source, value.flags);
22
- }
23
- if (value.constructor !== Object) {
24
- return value;
25
- }
26
- const obj = {};
27
- seen.set(value, obj);
28
- for (const key in value) {
29
- if (Object.prototype.hasOwnProperty.call(value, key)) {
30
- obj[key] = clone(value[key], seen);
31
- }
32
- }
33
- return obj;
34
- }
35
-
36
- // src/plugin.ts
2
+ import { isNetworkError, isAbortError, clone } from "@spoosh/core";
3
+ var PLUGIN_NAME = "spoosh:retry";
37
4
  var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
38
5
  function retryPlugin(config = {}) {
39
6
  const { retries: defaultRetries = 3, retryDelay: defaultRetryDelay = 1e3 } = config;
40
7
  return {
41
- name: "spoosh:retry",
8
+ name: PLUGIN_NAME,
42
9
  operations: ["read", "write", "infiniteRead"],
10
+ priority: 200,
43
11
  middleware: async (context, next) => {
12
+ const t = context.tracer?.(PLUGIN_NAME);
44
13
  const pluginOptions = context.pluginOptions;
45
14
  const retriesConfig = pluginOptions?.retries ?? defaultRetries;
46
15
  const retryDelayConfig = pluginOptions?.retryDelay ?? defaultRetryDelay;
47
16
  const maxRetries = retriesConfig === false ? 0 : retriesConfig;
48
17
  if (!maxRetries || maxRetries < 0) {
18
+ t?.skip("Disabled");
49
19
  return next();
50
20
  }
51
21
  const originalRequest = {
@@ -59,9 +29,11 @@ function retryPlugin(config = {}) {
59
29
  context.request.headers = clone(originalRequest.headers);
60
30
  context.request.params = clone(originalRequest.params);
61
31
  context.request.body = clone(originalRequest.body);
32
+ t?.log(`Retry ${attempt}/${maxRetries}`, { color: "warning" });
62
33
  }
63
34
  res = await next();
64
35
  if (isAbortError(res.error)) {
36
+ t?.log("Aborted", { color: "muted" });
65
37
  return res;
66
38
  }
67
39
  if (isNetworkError(res.error) && attempt < maxRetries) {
@@ -69,6 +41,15 @@ function retryPlugin(config = {}) {
69
41
  await delay(delayMs);
70
42
  continue;
71
43
  }
44
+ if (attempt > 0) {
45
+ if (isNetworkError(res.error)) {
46
+ t?.log("Max retries reached or non-retryable error", {
47
+ color: "error"
48
+ });
49
+ } else {
50
+ t?.log("Retry succeeded", { color: "success" });
51
+ }
52
+ }
72
53
  return res;
73
54
  }
74
55
  return res;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spoosh/plugin-retry",
3
- "version": "0.2.0",
3
+ "version": "0.3.0",
4
4
  "description": "Automatic retry plugin for Spoosh with configurable attempts and delay",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -33,11 +33,11 @@
33
33
  }
34
34
  },
35
35
  "peerDependencies": {
36
- "@spoosh/core": ">=0.12.1"
36
+ "@spoosh/core": ">=0.13.0"
37
37
  },
38
38
  "devDependencies": {
39
- "@spoosh/core": "0.12.1",
40
- "@spoosh/test-utils": "0.1.8"
39
+ "@spoosh/test-utils": "0.2.0",
40
+ "@spoosh/core": "0.13.0"
41
41
  },
42
42
  "scripts": {
43
43
  "dev": "tsup --watch",