fixup

Signed-off-by: Matteo Collina <hello@matteocollina.com>
nodejs · Dec 15, 2023 · 0cb37bb · 0cb37bb
1 parent 6269f65
commit 0cb37bb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/lib/ours/util.js b/lib/ours/util.js
@@ -165,10 +165,26 @@ module.exports = {
   AbortSignalAny:
     AbortSignal.any ||
     function AbortSignalAny(signals) {
-      if (signals[0]) {
+      // Fast path if there is only one signal.
+      if (signals.length === 1) {
         return signals[0]
       }
       const ac = new AbortController()
+      const abort = () => ac.abort()
+      signals.forEach((signal) => {
+        signal.addEventListener('abort', abort, {
+          once: true
+        })
+      })
+      ac.signal.addEventListener(
+        'abort',
+        () => {
+          signals.forEach((signal) => signal.removeEventListener('abort', abort))
+        },
+        {
+          once: true
+        }
+      )
       return ac.signal
     }
 }

diff --git a/src/util.js b/src/util.js
@@ -164,10 +164,18 @@ module.exports = {
     };
   },
   AbortSignalAny: AbortSignal.any || function AbortSignalAny(signals) {
-    if (signals[0]) {
+    // Fast path if there is only one signal.
+    if (signals.length === 1) {
       return signals[0]
     }
     const ac = new AbortController()
+    const abort = () => ac.abort()
+    signals.forEach(signal => {
+      signal.addEventListener('abort', abort, { once: true })
+    })
+    ac.signal.addEventListener('abort', () => {
+      signals.forEach(signal => signal.removeEventListener('abort', abort))
+    }, { once: true })
     return ac.signal
   }
 }