refactor: migrate withRetries to waitUntil

Author: Hweinstock

packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts

@@ -135,17 +135,17 @@ export class HttpResourceFetcher implements ResourceFetcher<Response> {
 }
 
 export class RetryableResourceFetcher extends HttpResourceFetcher {
-    private readonly retryNumber: number
+    private readonly requestTimeoutMs: number
     private readonly retryIntervalMs: number
     private readonly resource: string
 
     constructor({
         resource,
-        params: { retryNumber = 5, retryIntervalMs = 3000, showUrl = true, timeout = new Timeout(5000) },
+        params: { requestTimeoutMs = 5000, retryIntervalMs = 3000, showUrl = true, timeout = new Timeout(5000) },
     }: {
         resource: string
         params: {
-            retryNumber?: number
+            requestTimeoutMs?: number
             retryIntervalMs?: number
             showUrl?: boolean
             timeout?: Timeout
@@ -155,13 +155,13 @@ export class RetryableResourceFetcher extends HttpResourceFetcher {
             showUrl,
             timeout,
         })
-        this.retryNumber = retryNumber
+        this.requestTimeoutMs = requestTimeoutMs
         this.retryIntervalMs = retryIntervalMs
         this.resource = resource
     }
 
     fetch(versionTag?: string) {
-        return withRetries(
+        return waitUntil(
             async () => {
                 try {
                     return await this.getNewETagContent(versionTag)
@@ -171,8 +171,9 @@ export class RetryableResourceFetcher extends HttpResourceFetcher {
                 }
             },
             {
-                maxRetries: this.retryNumber,
-                delay: this.retryIntervalMs,
+                timeout: this.requestTimeoutMs,
+                interval: this.retryIntervalMs,
+                retryOnFail: true,
             }
         )
     }