readline: use internal addAbortListener

atlowChemi · marco-ippolito · commit fb601c3a946c · 2024-05-03T08:29:52.000+02:00
PR-URL: #52081 Refs: #48596 Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/lib/internal/readline/interface.js b/lib/internal/readline/interface.js
@@ -53,6 +53,7 @@ const {
   stripVTControlCharacters,
 } = require('internal/util/inspect');
 const EventEmitter = require('events');
+const { addAbortListener } = require('internal/events/abort_listener');
 const {
   charLengthAt,
   charLengthLeft,
@@ -326,7 +327,7 @@ function InterfaceConstructor(input, output, completer, terminal) {
     if (signal.aborted) {
       process.nextTick(onAborted);
     } else {
-      const disposable = EventEmitter.addAbortListener(signal, onAborted);
+      const disposable = addAbortListener(signal, onAborted);
       self.once('close', disposable[SymbolDispose]);
     }
   }
diff --git a/lib/readline.js b/lib/readline.js
@@ -145,7 +145,7 @@ Interface.prototype.question = function question(query, options, cb) {
     const onAbort = () => {
       this[kQuestionCancel]();
     };
-    addAbortListener ??= require('events').addAbortListener;
+    addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
     const disposable = addAbortListener(options.signal, onAbort);
     const originalCb = cb;
     cb = typeof cb === 'function' ? (answer) => {
@@ -175,7 +175,7 @@ Interface.prototype.question[promisify.custom] = function question(query, option
       const onAbort = () => {
         reject(new AbortError(undefined, { cause: options.signal.reason }));
       };
-      addAbortListener ??= require('events').addAbortListener;
+      addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
       const disposable = addAbortListener(options.signal, onAbort);
       cb = (answer) => {
         disposable[SymbolDispose]();
diff --git a/lib/readline/promises.js b/lib/readline/promises.js
@@ -45,7 +45,7 @@ class Interface extends _Interface {
           this[kQuestionCancel]();
           reject(new AbortError(undefined, { cause: options.signal.reason }));
         };
-        addAbortListener ??= require('events').addAbortListener;
+        addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
         const disposable = addAbortListener(options.signal, onAbort);
 
         cb = (answer) => {
