move retry logic to manager

Author: rwv

src/get/manager/DownloadManger.ts

@@ -51,18 +51,13 @@ export class DownloadManger {
   }
 
   async assignWorkToWorker (worker: DownloadWorker, workerIndex: number): Promise<void> {
+    let currentRetry = 0
+
     while (true) {
       if (this.rangeProvider.done) {
         return
       }
 
-      if (!worker.working) {
-        this.requestConfig.logger.warning(
-          `Worker ${workerIndex} is not working.`
-        )
-        throw new Error('Worker is not working')
-      }
-
       const { range, rangeIndex, signal: rangeSignal } = this.rangeProvider.getRange()
       try {
         const workController = new AbortController()
@@ -98,6 +93,16 @@ export class DownloadManger {
           this.requestConfig.logger.error(
             `Worker ${workerIndex} failed to fetch range ${rangeIndex}: ${(e as DOMException).message}.`
           )
+          currentRetry += 1
+          if (currentRetry > this.requestConfig.maxRetries) {
+            this.requestConfig.logger.error(
+              `Worker ${workerIndex} failed to fetch range ${rangeIndex} after ${currentRetry} retries.`
+            )
+            throw new Error(`Worker ${workerIndex} failed to fetch range after retries ${currentRetry}`)
+          }
+
+          // sleep for retryDelay
+          await new Promise((resolve) => setTimeout(resolve, this.requestConfig.retryDelay))
         }
 
         this.rangeProvider.removeDownloader(rangeIndex)

src/get/worker/DownloadWorker.ts

@@ -5,16 +5,12 @@ export class DownloadWorker {
   readonly input: FetchInput
   readonly requestConfig: GETRequestConfig
 
-  private errorPromise = Promise.resolve()
-  private currentRetry = 0
-
   constructor (input: FetchInput, requestConfig: GETRequestConfig) {
     this.input = input
     this.requestConfig = requestConfig
   }
 
   async download (range: Range, signal: AbortSignal): Promise<Blob> {
-    await this.errorPromise
     const [start, end] = range
 
     const controller = new AbortController()
@@ -32,14 +28,12 @@ export class DownloadWorker {
     })
     if (!response.ok) {
       controller.abort()
-      this.error()
       throw new Error(`Failed to download at range  ${range[0]}-${range[1]}`)
     }
 
     const blob = await response.blob()
 
     if (blob.size !== end - start + 1) {
-      this.error()
       throw new Error(
         `Failed to download at range ${range[0]}-${range[1]}, size mismatch`
       )
@@ -48,26 +42,7 @@ export class DownloadWorker {
     return blob
   }
 
-  private error (): void {
-    this.currentRetry++
-    this.errorPromise = new Promise((resolve) =>
-      setTimeout(resolve, this.retryDelay)
-    )
-  }
-
-  get working (): boolean {
-    return this.currentRetry < this.maxRetries
-  }
-
   get init (): GETInit {
     return this.requestConfig.init
   }
-
-  get maxRetries (): number {
-    return this.requestConfig.maxRetries
-  }
-
-  get retryDelay (): number {
-    return this.requestConfig.retryDelay
-  }
 }