Skip to content

readline: fix pre-aborted AbortSignal question handling #37929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Linkgoron wants to merge 2 commits into from
Closed

readline: fix pre-aborted AbortSignal question handling #37929

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a39a0e7
readline: fix pre-aborted signal question handling
Linkgoron Mar 26, 2021
a676afe
fixup! readline: fix pre-aborted signal question handling
Linkgoron Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! readline: fix pre-aborted signal question handling
  • Loading branch information
@Linkgoron
Linkgoron committed Mar 26, 2021
commit a676afe5443947a97dbaf8697b53cbea4d3aa708
10 changes: 6 additions & 4 deletions lib/readline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const {
StringPrototypeStartsWith,
StringPrototypeTrim,
Promise,
PromiseReject,
Symbol,
SymbolAsyncIterator,
SafeStringIterator,
Expand Down Expand Up @@ -400,12 +401,13 @@ Interface.prototype.question = function(query, options, cb) {
Interface.prototype.question[promisify.custom] = function(query, options) {
options = typeof options === 'object' && options !== null ? options : {};

return new Promise((resolve, reject) => {
if (options.signal?.aborted) {
throw new AbortError();
}
if (options.signal && options.signal.aborted) {
return PromiseReject(new AbortError());
}

return new Promise((resolve, reject) => {
this.question(query, options, resolve);

if (options.signal) {
options.signal.addEventListener('abort', () => {
reject(new AbortError());
Expand Down