Skip to content

Commit ff93f3e

Browse files
atlowCheminodejs-github-bot
authored andcommitted
readline: use internal addAbortListener
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>
1 parent d89fc73 commit ff93f3e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

lib/internal/readline/interface.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ const {
5353
stripVTControlCharacters,
5454
} = require('internal/util/inspect');
5555
const EventEmitter = require('events');
56+
const { addAbortListener } = require('internal/events/abort_listener');
5657
const {
5758
charLengthAt,
5859
charLengthLeft,
@@ -326,7 +327,7 @@ function InterfaceConstructor(input, output, completer, terminal) {
326327
if (signal.aborted) {
327328
process.nextTick(onAborted);
328329
} else {
329-
const disposable = EventEmitter.addAbortListener(signal, onAborted);
330+
const disposable = addAbortListener(signal, onAborted);
330331
self.once('close', disposable[SymbolDispose]);
331332
}
332333
}

lib/readline.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Interface.prototype.question = function question(query, options, cb) {
145145
const onAbort = () => {
146146
this[kQuestionCancel]();
147147
};
148-
addAbortListener ??= require('events').addAbortListener;
148+
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
149149
const disposable = addAbortListener(options.signal, onAbort);
150150
const originalCb = cb;
151151
cb = typeof cb === 'function' ? (answer) => {
@@ -175,7 +175,7 @@ Interface.prototype.question[promisify.custom] = function question(query, option
175175
const onAbort = () => {
176176
reject(new AbortError(undefined, { cause: options.signal.reason }));
177177
};
178-
addAbortListener ??= require('events').addAbortListener;
178+
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
179179
const disposable = addAbortListener(options.signal, onAbort);
180180
cb = (answer) => {
181181
disposable[SymbolDispose]();

lib/readline/promises.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Interface extends _Interface {
4545
this[kQuestionCancel]();
4646
reject(new AbortError(undefined, { cause: options.signal.reason }));
4747
};
48-
addAbortListener ??= require('events').addAbortListener;
48+
addAbortListener ??= require('internal/events/abort_listener').addAbortListener;
4949
const disposable = addAbortListener(options.signal, onAbort);
5050

5151
cb = (answer) => {

0 commit comments

Comments
 (0)