net: use addAbortListener

atlowChemi · juanarbol · commit ac11264cc56a · 2023-07-13T17:20:01.000-05:00
PR-URL: #48550 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
diff --git a/lib/net.js b/lib/net.js
@@ -35,6 +35,7 @@ const {
   ObjectDefineProperty,
   ObjectSetPrototypeOf,
   Symbol,
+  SymbolDispose,
 } = primordials;
 
 const EventEmitter = require('events');
@@ -1605,17 +1606,18 @@ function afterConnect(status, handle, req, readable, writable) {
 function addClientAbortSignalOption(self, options) {
   validateAbortSignal(options.signal, 'options.signal');
   const { signal } = options;
+  let disposable;
 
   function onAbort() {
-    signal.removeEventListener('abort', onAbort);
+    disposable?.[SymbolDispose]();
     self._aborted = true;
   }
 
   if (signal.aborted) {
     process.nextTick(onAbort);
   } else {
     process.nextTick(() => {
-      signal.addEventListener('abort', onAbort);
+      disposable = EventEmitter.addAbortListener(signal, onAbort);
     });
   }
 }
@@ -1695,8 +1697,8 @@ function addServerAbortSignalOption(self, options) {
   if (signal.aborted) {
     process.nextTick(onAborted);
   } else {
-    signal.addEventListener('abort', onAborted);
-    self.once('close', () => signal.removeEventListener('abort', onAborted));
+    const disposable = EventEmitter.addAbortListener(signal, onAborted);
+    self.once('close', disposable[SymbolDispose]);
   }
 }
 
