From f3f88eecb447bd33d1c0040954c649f3f6565b50 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sat, 15 Jun 2024 13:48:41 +0200
Subject: [PATCH] Use an `AbortController` to remove the temporary "error"
 handler for the worker

---
 src/display/api.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/display/api.js b/src/display/api.js
index 46acad652..3b1ca159c 100644
--- a/src/display/api.js
+++ b/src/display/api.js
@@ -2154,7 +2154,7 @@ class PDFWorker {
       const worker = new Worker(workerSrc, { type: "module" });
       const messageHandler = new MessageHandler("main", "worker", worker);
       const terminateEarly = () => {
-        worker.removeEventListener("error", onWorkerError);
+        ac.abort();
         messageHandler.destroy();
         worker.terminate();
         if (this.destroyed) {
@@ -2166,17 +2166,21 @@ class PDFWorker {
         }
       };
 
-      const onWorkerError = () => {
-        if (!this._webWorker) {
-          // Worker failed to initialize due to an error. Clean up and fall
-          // back to the fake worker.
-          terminateEarly();
-        }
-      };
-      worker.addEventListener("error", onWorkerError);
+      const ac = new AbortController();
+      worker.addEventListener(
+        "error",
+        () => {
+          if (!this._webWorker) {
+            // Worker failed to initialize due to an error. Clean up and fall
+            // back to the fake worker.
+            terminateEarly();
+          }
+        },
+        { signal: ac.signal }
+      );
 
       messageHandler.on("test", data => {
-        worker.removeEventListener("error", onWorkerError);
+        ac.abort();
         if (this.destroyed || !data) {
           terminateEarly();
           return;
@@ -2189,7 +2193,7 @@ class PDFWorker {
       });
 
       messageHandler.on("ready", data => {
-        worker.removeEventListener("error", onWorkerError);
+        ac.abort();
         if (this.destroyed) {
           terminateEarly();
           return;