@dcrosstech/dct-ts-utils 1.0.1 → 1.1.0

package/dist/lib/retry.d.ts

@@ -1,7 +1,8 @@
 export declare class RetryError<Args = unknown> extends Error {
     readonly retryArgs: Args;
     readonly finalError?: Error;
-    constructor(message: string, retryArgs: Args, finalError?: Error);
+    readonly retryAfter?: number;
+    constructor(message: string, retryArgs: Args, finalError?: Error, retryAfter?: number);
 }
 export declare class TerminalError extends Error {
     constructor(message: string);

package/dist/lib/retry.js

@@ -1,10 +1,11 @@
 import { sleep } from "./sleep";
 export class RetryError extends Error {
-    constructor(message, retryArgs, finalError) {
+    constructor(message, retryArgs, finalError, retryAfter) {
         super(message);
         this.name = "RetryError";
         this.retryArgs = retryArgs;
         this.finalError = finalError;
+        this.retryAfter = retryAfter;
     }
 }
 export class TerminalError extends Error {
@@ -73,7 +74,8 @@ function computeDelayMs(q, minD, maxD, factor, maxE, jitter, retryAttempt) {
 export async function executeWithExponentialBackoff(cfg, fn, initialArgs) {
     const { q, minD, maxD, maxR, f, maxE, j } = normalizeConfig(cfg);
     let args = initialArgs;
-    for (let attemptIndex = 0;; attemptIndex++) {
+    let retryAfter;
+    for (let attempt = 0;; attempt++) {
         try {
             return await fn(args);
         }
@@ -84,18 +86,21 @@ export async function executeWithExponentialBackoff(cfg, fn, initialArgs) {
             if (err instanceof RetryError) {
                 args = err.retryArgs;
                 finalOnExhaustion = err.finalError;
+                retryAfter = err.retryAfter;
             }
             // Out of retries?
-            if (maxR !== undefined && attemptIndex >= maxR) {
+            if (maxR !== undefined && attempt >= maxR) {
                 if (finalOnExhaustion) {
                     throw finalOnExhaustion;
                 }
                 throw err;
             }
-            const retryAttempt = attemptIndex + 1; // 1-based retry count
-            const delayMs = computeDelayMs(q, minD, maxD, f, maxE, j, retryAttempt);
-            if (delayMs > 0) {
-                await sleep(delayMs);
+            const retryAttempt = attempt + 1; // 1-based retry count
+            if (!retryAfter) {
+                retryAfter = computeDelayMs(q, minD, maxD, f, maxE, j, retryAttempt);
+            }
+            if (retryAfter > 0) {
+                await sleep(retryAfter);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrosstech/dct-ts-utils",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Common TypeScript utilities (sleep, semaphore, queues, heaps, exponential backoff)",
   "license": "ISC",
   "author": "David Cross <david@crossfamilyweb.com>",