fixup! Add value-based stall detection to catch stuck progress

Author: m7kvqbe1

lib/StallDetector.ts

@@ -10,7 +10,6 @@ export class StallDetector {
   private intervalId: ReturnType<typeof setInterval> | null = null
   private lastProgressTime = 0
   private lastProgressValue = 0
-  private progressValueCount = 0
   private isActive = false
 
   constructor(
@@ -33,7 +32,6 @@ export class StallDetector {
 
     this.lastProgressTime = Date.now()
     this.lastProgressValue = 0
-    this.progressValueCount = 0
     this.isActive = true
 
     log(
@@ -47,10 +45,8 @@ export class StallDetector {
       }
 
       const now = Date.now()
-      if (this._isProgressValueStalled()) {
-        this._handleStall('progress value not changing')
-      } else if (this._isProgressStalled(now)) {
-        this._handleStall('no progress events received')
+      if (this._isProgressStalled(now)) {
+        this._handleStall('no progress')
       }
     }, this.options.checkInterval)
   }
@@ -71,14 +67,10 @@ export class StallDetector {
    * @param progressValue The current progress value (bytes uploaded)
    */
   updateProgress(progressValue: number): void {
-    this.lastProgressTime = Date.now()
-
-    // Track if the progress value has changed
-    if (progressValue === this.lastProgressValue) {
-      this.progressValueCount++
-    } else {
+    // Only update progress time if the value has actually changed
+    if (progressValue !== this.lastProgressValue) {
+      this.lastProgressTime = Date.now()
       this.lastProgressValue = progressValue
-      this.progressValueCount = 0
     }
   }
 
@@ -97,25 +89,6 @@ export class StallDetector {
     return isStalled
   }
 
-  /**
-   * Check if upload has stalled based on progress value not changing
-   */
-  private _isProgressValueStalled(): boolean {
-    // Calculate how many times we expect progress to have changed based on check intervals
-    const expectedProgressChanges = Math.floor(
-      this.options.stallTimeout / this.options.checkInterval,
-    )
-    const isStalled = this.progressValueCount >= expectedProgressChanges
-
-    if (isStalled) {
-      log(
-        `tus: progress value stuck at ${this.lastProgressValue} bytes for ${this.progressValueCount} checks`,
-      )
-    }
-
-    return isStalled
-  }
-
   /**
    * Handle a detected stall
    */

test/spec/test-stall-detection.js

@@ -426,7 +426,7 @@ describe('tus-stall-detection', () => {
       expect(patchReq.method).toBe('PATCH')
 
       const error = await options.onError.toBeCalled()
-      expect(error.message).toContain('Upload stalled: progress value not changing')
+      expect(error.message).toContain('Upload stalled: no progress')
       expect(options.onProgress.calls.count()).toBeGreaterThan(0)
     })
   })