@lodestar/utils 1.17.0-dev.cd59df328b → 1.17.0-dev.e9a3f07a64

package/lib/retry.d.ts

@@ -19,6 +19,9 @@ export type RetryOptions = {
      * Milliseconds to wait before retrying again
      */
     retryDelay?: number;
+    /**
+     * Abort signal to stop retrying
+     */
     signal?: AbortSignal;
 };
 /**

package/lib/retry.js

@@ -1,3 +1,4 @@
+import { ErrorAborted } from "./errors.js";
 import { sleep } from "./sleep.js";
 /**
  * Retry a given function on error.
@@ -13,10 +14,15 @@ export async function retry(fn, opts) {
     const onRetry = opts?.onRetry;
     let lastError = Error("RetryError");
     for (let i = 1; i <= maxAttempts; i++) {
+        // If not the first attempt
+        if (i > 1) {
+            if (opts?.signal?.aborted) {
+                throw new ErrorAborted("retry");
+            }
+            // Invoke right before retrying
+            onRetry?.(lastError, i);
+        }
         try {
-            // If not the first attempt, invoke right before retrying
-            if (i > 1)
-                onRetry?.(lastError, i);
             return await fn(i);
         }
         catch (e) {

package/lib/retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"retry.js","sourceRoot":"","sources":["../src/retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AA0BjC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAI,EAAuC,EAAE,IAAmB;IACzF,MAAM,UAAU,GAAG,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;IACtC,0CAA0C;IAC1C,MAAM,WAAW,GAAG,UAAU,GAAG,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,CAAC;IAE9B,IAAI,SAAS,GAAU,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI;YACF,yDAAyD;YACzD,IAAI,CAAC,GAAG,CAAC;gBAAE,OAAO,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAEnC,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,SAAS,GAAG,CAAU,CAAC;YAEvB,IAAI,CAAC,KAAK,WAAW,EAAE;gBACrB,kFAAkF;gBAClF,MAAM;aACP;iBAAM,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;gBACjD,MAAM;aACP;iBAAM,IAAI,IAAI,EAAE,UAAU,KAAK,SAAS,EAAE;gBACzC,MAAM,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;aAC7C;SACF;KACF;IACD,MAAM,SAAS,CAAC;AAClB,CAAC"}
+{"version":3,"file":"retry.js","sourceRoot":"","sources":["../src/retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AA6BjC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAI,EAAuC,EAAE,IAAmB;IACzF,MAAM,UAAU,GAAG,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;IACtC,0CAA0C;IAC1C,MAAM,WAAW,GAAG,UAAU,GAAG,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,CAAC;IAE9B,IAAI,SAAS,GAAU,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,EAAE,EAAE;QACrC,2BAA2B;QAC3B,IAAI,CAAC,GAAG,CAAC,EAAE;YACT,IAAI,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;gBACzB,MAAM,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;aACjC;YACD,+BAA+B;YAC/B,OAAO,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;SACzB;QAED,IAAI;YACF,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,SAAS,GAAG,CAAU,CAAC;YAEvB,IAAI,CAAC,KAAK,WAAW,EAAE;gBACrB,kFAAkF;gBAClF,MAAM;aACP;iBAAM,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;gBACjD,MAAM;aACP;iBAAM,IAAI,IAAI,EAAE,UAAU,KAAK,SAAS,EAAE;gBACzC,MAAM,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;aAC7C;SACF;KACF;IACD,MAAM,SAAS,CAAC;AAClB,CAAC"}

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.17.0-dev.cd59df328b",
+  "version": "1.17.0-dev.e9a3f07a64",
   "type": "module",
   "exports": "./lib/index.js",
   "files": [
@@ -59,5 +59,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "490c8aa7603bf8625cff9a313acc6026ef94415d"
+  "gitHead": "7d1e0eb98f35d84a8d21b4d2db5f1bf27c95cfd7"
 }