@lodestar/utils 1.16.0-dev.533db97f18 → 1.16.0-dev.53f8f99c64

package/lib/retry.d.ts

@@ -4,11 +4,17 @@ export type RetryOptions = {
      */
     retries?: number;
     /**
-     * An optional Function that is invoked after the provided callback throws
-     * It expects a boolean to know if it should retry or not
-     * Useful to make retrying conditional on the type of error thrown
+     * An optional Function that is invoked after the provided callback throws.
+     * It expects a boolean to know if it should retry or not.
+     * Useful to make retrying conditional on the type of error thrown.
      */
     shouldRetry?: (lastError: Error) => boolean;
+    /**
+     * An optional Function that is invoked right before a retry is performed.
+     * It's passed the Error that triggered it and a number identifying the attempt.
+     * Useful to track number of retries and errors in logs or metrics.
+     */
+    onRetry?: (lastError: Error, attempt: number) => unknown;
     /**
      * Milliseconds to wait before retrying again
      */

package/lib/retry.js

@@ -7,15 +7,25 @@ import { sleep } from "./sleep.js";
  */
 export async function retry(fn, opts) {
     const maxRetries = opts?.retries ?? 5;
+    // Number of retries + the initial attempt
+    const maxAttempts = maxRetries + 1;
     const shouldRetry = opts?.shouldRetry;
+    const onRetry = opts?.onRetry;
     let lastError = Error("RetryError");
-    for (let i = 1; i <= maxRetries; i++) {
+    for (let i = 1; i <= maxAttempts; i++) {
         try {
+            // If not the first attempt, invoke right before retrying
+            if (i > 1)
+                onRetry?.(lastError, i);
             return await fn(i);
         }
         catch (e) {
             lastError = e;
-            if (shouldRetry && !shouldRetry(lastError)) {
+            if (i === maxAttempts) {
+                // Reached maximum number of attempts, there's no need to check if we should retry
+                break;
+            }
+            else if (shouldRetry && !shouldRetry(lastError)) {
                 break;
             }
             else if (opts?.retryDelay !== undefined) {

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;AAoBjC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAI,EAAuC,EAAE,IAAmB;IACzF,MAAM,UAAU,GAAG,IAAI,EAAE,OAAO,IAAI,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,CAAC;IAEtC,IAAI,SAAS,GAAU,KAAK,CAAC,YAAY,CAAC,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE,EAAE;QACpC,IAAI;YACF,OAAO,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,SAAS,GAAG,CAAU,CAAC;YACvB,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;gBAC1C,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,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"}

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.16.0-dev.533db97f18",
+  "version": "1.16.0-dev.53f8f99c64",
   "type": "module",
   "exports": "./lib/index.js",
   "files": [
@@ -58,5 +58,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "990f388e4f2bb4fee539415e2e361d68aff5f661"
+  "gitHead": "2536a9754d55fac8d093d83e8ee9c8428bfddf4d"
 }