lib: use addAbortListener

PR-URL: #48550 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
nodejs · Sep 12, 2023 · 33c9cea · 33c9cea
1 parent 24eeae3
commit 33c9cea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
@@ -23,6 +23,7 @@ const {
   kTrustEvent,
   kNewListener,
   kRemoveListener,
+  kResistStopPropagation,
   kWeakHandler,
 } = require('internal/event_target');
 const {
@@ -447,7 +448,8 @@ async function aborted(signal, resource) {
   if (signal.aborted)
     return PromiseResolve();
   const abortPromise = createDeferredPromise();
-  signal.addEventListener('abort', abortPromise.resolve, { [kWeakHandler]: resource, once: true });
+  const opts = { __proto__: null, [kWeakHandler]: resource, once: true, [kResistStopPropagation]: true };
+  signal.addEventListener('abort', abortPromise.resolve, opts);
   return abortPromise.promise;
 }
 

diff --git a/lib/internal/watch_mode/files_watcher.js b/lib/internal/watch_mode/files_watcher.js
@@ -18,7 +18,6 @@ const { fileURLToPath } = require('url');
 const { resolve, dirname } = require('path');
 const { setTimeout } = require('timers');
 
-
 const supportsRecursiveWatching = process.platform === 'win32' ||
   process.platform === 'darwin';
 
@@ -41,7 +40,9 @@ class FilesWatcher extends EventEmitter {
     this.#mode = mode;
     this.#signal = signal;
 
-    signal?.addEventListener('abort', () => this.clear(), { __proto__: null, once: true });
+    if (signal) {
+      EventEmitter.addAbortListener(signal, () => this.clear());
+    }
   }
 
   #isPathWatched(path) {