fix: infinite retries at error-success loop

#297
kukhariev · May 7, 2021 · 0310a03 · 0310a03
1 parent 1d16715
commit 0310a03
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/uploadx/lib/retry-handler.spec.ts b/src/uploadx/lib/retry-handler.spec.ts
@@ -19,4 +19,14 @@ describe('ErrorHandler', () => {
     errorHandler.attempts = 3;
     expect(errorHandler.kind(500)).toBe(ErrorType.Fatal);
   });
+
+  it('ErrorHandler.observe(offset)', () => {
+    const errorHandler = new RetryHandler({ maxAttempts: 2 });
+    errorHandler.observe();
+    expect(errorHandler.kind(500)).toBe(ErrorType.Retryable);
+    errorHandler.observe();
+    expect(errorHandler.kind(500)).toBe(ErrorType.Retryable);
+    errorHandler.observe();
+    expect(errorHandler.kind(500)).toBe(ErrorType.Fatal);
+  });
 });
diff --git a/src/uploadx/lib/retry-handler.ts b/src/uploadx/lib/retry-handler.ts
@@ -40,6 +40,7 @@ const defaultRetryConfig: Required<RetryConfig> = {
 export class RetryHandler {
   public attempts = 0;
   config: Required<RetryConfig>;
+  private observedValue?: string | number;
   cancel: () => void = () => {};
 
   constructor(configOptions: RetryConfig = {}) {
@@ -77,7 +78,8 @@ export class RetryHandler {
     });
   }
 
-  reset(): void {
-    this.attempts = 0;
+  observe(value?: string | number): void {
+    this.observedValue !== value && (this.attempts = 0);
+    this.observedValue = value;
   }
 }
diff --git a/src/uploadx/lib/uploader.ts b/src/uploadx/lib/uploader.ts
@@ -133,7 +133,7 @@ export abstract class Uploader implements UploadState {
       try {
         this.url = this.url || (await this.getFileUrl());
         this.offset = isNumber(this.offset) ? await this.sendFileContent() : await this.getOffset();
-        this.retry.reset();
+        this.retry.observe(this.offset);
         if (this.offset === this.size) {
           this.remaining = 0;
           this.progress = 100;