Merge pull request #30 from octotravel/feat/shoud-force-retry-async

shouldForceRetry is async
octotravel · Sep 2, 2024 · a77ac14 · a77ac14
2 parents 843a641 + 48816d7
commit a77ac14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@octocloud/core",
-  "version": "1.0.59",
+  "version": "1.0.60",
   "license": "ISC",
   "author": "",
   "exports": {

diff --git a/src/util/fetchRetry.ts b/src/util/fetchRetry.ts
@@ -8,15 +8,15 @@ const FETCH_RETRY_DEFAULT_OPTIONS = {
   currentRetryAttempt: 0,
   maxRetryAttempts: DEFAULT_MAX_RETRY_ATTEMPTS,
   retryDelayMultiplierInMs: DEFAULT_RETRY_DELAY_MULTIPLIER_IN_MS,
-  shouldForceRetry: (status: number, response: Response) => false,
+  shouldForceRetry: async (status: number, response: Response) => false,
 };
 
 export interface FetchRetryOptions {
   subRequestContext?: SubRequestContext | null;
   currentRetryAttempt?: number;
   maxRetryAttempts?: number;
   retryDelayMultiplierInMs?: number;
-  shouldForceRetry?: (status: number, response: Response) => boolean;
+  shouldForceRetry?: (status: number, response: Response) => Promise<boolean>;
 }
 
 export async function fetchRetry(
@@ -29,7 +29,7 @@ export async function fetchRetry(
     currentRetryAttempt = 0,
     maxRetryAttempts = DEFAULT_MAX_RETRY_ATTEMPTS,
     retryDelayMultiplierInMs = DEFAULT_RETRY_DELAY_MULTIPLIER_IN_MS,
-    shouldForceRetry = (status: number, response: Response) => false,
+    shouldForceRetry = async (status: number, response: Response) => false,
   } = options;
   let subRequestRetryContext: SubRequestRetryContext | null = null;
   let request: Request;
@@ -84,7 +84,7 @@ export async function fetchRetry(
   const status = res.status;
 
   if (
-    ((status >= 500 && status < 599) || status === 429 || shouldForceRetry(status, res.clone())) &&
+    ((status >= 500 && status < 599) || status === 429 || (await shouldForceRetry(status, res.clone()))) &&
     currentRetryAttempt < maxRetryAttempts
   ) {
     return await fetchRetry(request, undefined, {