readline: use addAbortListener

PR-URL: #48550
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

Author: atlowChemi

lib/internal/readline/interface.js

@@ -29,6 +29,7 @@ const {
  StringPrototypeStartsWith,
  StringPrototypeTrim,
  Symbol,
+ SymbolDispose,
  SymbolAsyncIterator,
  SafeStringIterator,
 }=primordials;
@@ -332,8 +333,8 @@ function InterfaceConstructor(input, output, completer, terminal) {
 if(signal.aborted){
 process.nextTick(onAborted);
 }else{
-signal.addEventListener('abort',onAborted,{once: true});
-self.once('close',()=>signal.removeEventListener('abort',onAborted));
+constdisposable=EventEmitter.addAbortListener(signal,onAborted);
+self.once('close',disposable[SymbolDispose]);
 }
 }
 

lib/readline.js

@@ -30,6 +30,7 @@ const {
  Promise,
  PromiseReject,
  StringPrototypeSlice,
+ SymbolDispose,
 }=primordials;
 
 const{
@@ -94,6 +95,7 @@ const {
  kWordRight,
  kWriteToOutput,
 }=require('internal/readline/interface');
+letaddAbortListener;
 
 functionInterface(input,output,completer,terminal){
 if(!(thisinstanceofInterface)){
@@ -144,15 +146,13 @@ Interface.prototype.question = function(query, options, cb) {
 constonAbort=()=>{
 this[kQuestionCancel]();
 };
-options.signal.addEventListener('abort',onAbort,{once: true});
-constcleanup=()=>{
-options.signal.removeEventListener('abort',onAbort);
-};
+addAbortListener??=require('events').addAbortListener;
+constdisposable=addAbortListener(options.signal,onAbort);
 constoriginalCb=cb;
 cb=typeofcb==='function' ? (answer)=>{
-cleanup();
+disposable[SymbolDispose]();
 returnoriginalCb(answer);
-} : cleanup;
+} : disposable[SymbolDispose];
 }
 
 if(typeofcb==='function'){
@@ -176,9 +176,10 @@ Interface.prototype.question[promisify.custom] = function question(query, option
 constonAbort=()=>{
 reject(newAbortError(undefined,{cause: options.signal.reason}));
 };
-options.signal.addEventListener('abort',onAbort,{once: true});
+addAbortListener??=require('events').addAbortListener;
+constdisposable=addAbortListener(options.signal,onAbort);
 cb=(answer)=>{
-options.signal.removeEventListener('abort',onAbort);
+disposable[SymbolDispose]();
 resolve(answer);
 };
 }

lib/readline/promises.js

@@ -2,6 +2,7 @@
 
 const{
  Promise,
+ SymbolDispose,
 }=primordials;
 
 const{
@@ -21,6 +22,7 @@ const { validateAbortSignal } = require('internal/validators');
 const{
  kEmptyObject,
 }=require('internal/util');
+letaddAbortListener;
 
 classInterfaceextends_Interface{
 // eslint-disable-next-line no-useless-constructor
@@ -42,9 +44,11 @@ class Interface extends _Interface {
 this[kQuestionCancel]();
 reject(newAbortError(undefined,{cause: options.signal.reason}));
 };
-options.signal.addEventListener('abort',onAbort,{once: true});
+addAbortListener??=require('events').addAbortListener;
+constdisposable=addAbortListener(options.signal,onAbort);
+
 cb=(answer)=>{
-options.signal.removeEventListener('abort',onAbort);
+disposable[SymbolDispose]();
 resolve(answer);
 };
 }