add abort listener using addAbortListener util and invoke disposabl…

…e interface
nodejs · Mar 14, 2024 · 5819b36 · 5819b36
1 parent 95b6c27
commit 5819b36
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/lib/events.js b/lib/events.js
@@ -1167,14 +1167,8 @@ function on(emitter, event, options = kEmptyObject) {
       addEventListener(emitter, closeEvents[i], closeHandler);
     }
   }
-  if (signal) {
-    kResistStopPropagation ??= require('internal/event_target').kResistStopPropagation;
-    addEventListener(
-      signal,
-      'abort',
-      abortListener,
-      { __proto__: null, once: true, [kResistStopPropagation]: true });
-  }
+
+  const abortListenerDisposable = signal ? addAbortListener(signal, abortListener) : null;
 
   return iterator;
 
@@ -1201,6 +1195,7 @@ function on(emitter, event, options = kEmptyObject) {
   }
 
   function closeHandler() {
+    abortListenerDisposable?.[SymbolDispose]();
     removeAll();
     finished = true;
     const doneResult = createIterResult(undefined, true);