Switch to factory

oxidecomputer · Sep 20, 2024 · 6379d37 · 6379d37
1 parent b582c0a
commit 6379d37
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/oxide-openapi-gen-ts/src/client/static/http-client.ts b/oxide-openapi-gen-ts/src/client/static/http-client.ts
@@ -117,7 +117,8 @@ export interface FullParams extends FetchParams {
   method?: string;
 }
 
-export type RetryHandler = (url: RequestInfo | URL, init: RequestInit, err: any) => boolean;
+export type RetryHandler = (err: any) => boolean;
+export type RetryHandlerFactory = (url: RequestInfo | URL, init: RequestInit) => RetryHandler;
 
 export interface ApiConfig {
   /**
@@ -127,14 +128,14 @@ export interface ApiConfig {
   host?: string;
   token?: string;
   baseParams?: FetchParams;
-  retryHandler?: RetryHandler;
+  retryHandler?: RetryHandlerFactory;
 }
 
 export class HttpClient {
   host: string;
   token?: string;
   baseParams: FetchParams;
-  retryHandler: RetryHandler;
+  retryHandler: RetryHandlerFactory;
 
   constructor({ host = "", baseParams = {}, token, retryHandler }: ApiConfig = {}) {
     this.host = host;
@@ -145,7 +146,7 @@ export class HttpClient {
       headers.append("Authorization", `Bearer ${token}`);
     }
     this.baseParams = mergeParams({ headers }, baseParams);
-    this.retryHandler = retryHandler ? retryHandler : () => false;
+    this.retryHandler = retryHandler ? retryHandler : () => () => false;
   }
 
   public async request<Data>({
@@ -160,15 +161,15 @@ export class HttpClient {
       ...mergeParams(this.baseParams, fetchParams),
       body: JSON.stringify(snakeify(body), replacer),
     };
-    return fetchWithRetry(fetch, url, init, this.retryHandler)
+    return fetchWithRetry(fetch, url, init, this.retryHandler(url, init))
   }
 }
 
 export async function fetchWithRetry<Data>(fetch: any, url: string, init: RequestInit, retry: RetryHandler): Promise<ApiResult<Data>> {
   try {
     return handleResponse(await fetch(url, init));
   } catch (err) {
-    if (retry(url, init, err)) {
+    if (retry(err)) {
       return await fetchWithRetry(fetch, url, init, retry)
     }