Merge pull request #81 from cloudflare/tdias/issue-77-abort-errors

Don't cancel abort non-existing abort controller. Abort previous controller before replacing (Fixes #77)

Author: tiagoad

src/engines/BandwidthEngine/BandwidthEngine.js

@@ -119,7 +119,7 @@ class BandwidthMeasurementEngine {
 
   // Public methods
   pause() {
-    this.#cancelCurrentMeasurement();
+    this.#cancelCurrentMeasurement(`pause()`);
     this.#setRunning(false);
   }
 
@@ -157,6 +157,10 @@ class BandwidthMeasurementEngine {
       this.#running = running;
       setTimeout(() => this.#onRunningChange(this.#running));
     }
+
+    if (!running) {
+      this.#currentAbortController?.abort('setRunning(false)');
+    }
   }
 
   #saveMeasurementResults(measIdx, measTiming) {
@@ -271,17 +275,19 @@ class BandwidthMeasurementEngine {
       this.#fetchOptions
     );
 
-    // AbortController and timeout is shared between all retries
     if (this.#retries === 0) {
+      // abort existing abort controller
+      this.#currentAbortController?.abort('restarting engine');
+
+      // create new abort controller
       this.#currentAbortController = new AbortController();
       if (this.abortRequestDuration) {
         const abortTimeout = setTimeout(() => {
-          this.#cancelCurrentMeasurement();
+          const errorMessage = `${isDown ? 'Download' : 'Upload'} measurement of ${numBytes} bytes aborted. Measurement exceeded bandwidthAbortRequestDuration (${this.abortRequestDuration}ms)`;
+          this.#cancelCurrentMeasurement(errorMessage);
           this.#retries = 0;
           this.#setRunning(false);
-          this.#onConnectionError(
-            `${isDown ? 'Download' : 'Upload'} measurement of ${numBytes} bytes aborted. Measurement exceeded bandwidthAbortRequestDuration (${this.abortRequestDuration}ms)`
-          );
+          this.#onConnectionError(errorMessage);
         }, this.abortRequestDuration);
         this.#currentAbortController.signal.addEventListener('abort', () =>
           clearTimeout(abortTimeout)
@@ -392,8 +398,10 @@ class BandwidthMeasurementEngine {
       });
   }
 
-  #cancelCurrentMeasurement() {
-    this.#currentAbortController.abort();
+  #cancelCurrentMeasurement(reason) {
+    this.#currentAbortController?.abort(
+      reason || `aborted with no reason provided`
+    );
   }
 }