Commit ff93f3e
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
3 files changed
Lines changed: 5 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -53,6 +53,7 @@ const { | |||
| 53 | 53 | stripVTControlCharacters, | |
| 54 | 54 | } = require('internal/util/inspect'); | |
| 55 | 55 | const EventEmitter = require('events'); | |
| 56 | + const { addAbortListener } = require('internal/events/abort_listener'); | ||
| 56 | 57 | const { | |
| 57 | 58 | charLengthAt, | |
| 58 | 59 | charLengthLeft, | |
@@ -326,7 +327,7 @@ function InterfaceConstructor(input, output, completer, terminal) { | |||
| 326 | 327 | if (signal.aborted) { | |
| 327 | 328 | process.nextTick(onAborted); | |
| 328 | 329 | } else { | |
| 329 | - const disposable = EventEmitter.addAbortListener(signal, onAborted); | ||
| 330 | + const disposable = addAbortListener(signal, onAborted); | ||
| 330 | 331 | self.once('close', disposable[SymbolDispose]); | |
| 331 | 332 | } | |
| 332 | 333 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -145,7 +145,7 @@ Interface.prototype.question = function question(query, options, cb) { | |||
| 145 | 145 | const onAbort = () => { | |
| 146 | 146 | this[kQuestionCancel](); | |
| 147 | 147 | }; | |
| 148 | - addAbortListener ??= require('events').addAbortListener; | ||
| 148 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 149 | 149 | const disposable = addAbortListener(options.signal, onAbort); | |
| 150 | 150 | const originalCb = cb; | |
| 151 | 151 | cb = typeof cb === 'function' ? (answer) => { | |
@@ -175,7 +175,7 @@ Interface.prototype.question[promisify.custom] = function question(query, option | |||
| 175 | 175 | const onAbort = () => { | |
| 176 | 176 | reject(new AbortError(undefined, { cause: options.signal.reason })); | |
| 177 | 177 | }; | |
| 178 | - addAbortListener ??= require('events').addAbortListener; | ||
| 178 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 179 | 179 | const disposable = addAbortListener(options.signal, onAbort); | |
| 180 | 180 | cb = (answer) => { | |
| 181 | 181 | disposable[SymbolDispose](); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,7 +45,7 @@ class Interface extends _Interface { | |||
| 45 | 45 | this[kQuestionCancel](); | |
| 46 | 46 | reject(new AbortError(undefined, { cause: options.signal.reason })); | |
| 47 | 47 | }; | |
| 48 | - addAbortListener ??= require('events').addAbortListener; | ||
| 48 | + addAbortListener ??= require('internal/events/abort_listener').addAbortListener; | ||
| 49 | 49 | const disposable = addAbortListener(options.signal, onAbort); | |
| 50 | 50 | ||
| 51 | 51 | cb = (answer) => { | |
0 commit comments