readline: fix pre-aborted signal question handling

readline: fix pre-aborted signal question handling · nodejs/node@6cc1e15

2 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ const {`
`59`	`59`	`StringPrototypeStartsWith,`
`60`	`60`	`StringPrototypeTrim,`
`61`	`61`	`Promise,`
	`62`	`+ PromiseReject,`
`62`	`63`	`Symbol,`
`63`	`64`	`SymbolAsyncIterator,`
`64`	`65`	`SafeStringIterator,`
`@@ -385,6 +386,10 @@ Interface.prototype.question = function(query, options, cb) {`
`385`	`386`	`options = typeof options === 'object' && options !== null ? options : {};`
`386`	`387`
`387`	`388`	`if (options.signal) {`
	`389`	`+if (options.signal.aborted) {`
	`390`	`+return;`
	`391`	`+}`
	`392`	`+`
`388`	`393`	`options.signal.addEventListener('abort', () => {`
`389`	`394`	`this[kQuestionCancel]();`
`390`	`395`	`}, { once: true });`
`@@ -405,6 +410,10 @@ Interface.prototype.question = function(query, options, cb) {`
`405`	`410`	`Interface.prototype.question[promisify.custom] = function(query, options) {`
`406`	`411`	`options = typeof options === 'object' && options !== null ? options : {};`
`407`	`412`
	`413`	`+if (options.signal && options.signal.aborted) {`
	`414`	`+return PromiseReject(new AbortError());`
	`415`	`+}`
	`416`	`+`
`408`	`417`	`return new Promise((resolve, reject) => {`
`409`	`418`	`this.question(query, options, resolve);`
`410`	`419`

Original file line number	Diff line number	Diff line change
`@@ -968,6 +968,31 @@ for (let i = 0; i < 12; i++) {`
`968`	`968`	`rli.close();`
`969`	`969`	`}`
`970`	`970`
	`971`	`+// pre-aborted signal`
	`972`	`+{`
	`973`	`+const signal = AbortSignal.abort();`
	`974`	`+const [rli] = getInterface({ terminal });`
	`975`	`+rli.pause();`
	`976`	`+rli.on('resume', common.mustNotCall());`
	`977`	`+rli.question('hello?', { signal }, common.mustNotCall());`
	`978`	`+rli.close();`
	`979`	`+}`
	`980`	`+`
	`981`	`+// pre-aborted signal promisified question`
	`982`	`+{`
	`983`	`+const signal = AbortSignal.abort();`
	`984`	`+const [rli] = getInterface({ terminal });`
	`985`	`+const question = util.promisify(rli.question).bind(rli);`
	`986`	`+rli.on('resume', common.mustNotCall());`
	`987`	`+rli.pause();`
	`988`	`+question('hello?', { signal })`
	`989`	`+.then(common.mustNotCall())`
	`990`	`+.catch(common.mustCall((error) => {`
	`991`	`+assert.strictEqual(error.name, 'AbortError');`
	`992`	`+}));`
	`993`	`+rli.close();`
	`994`	`+}`
	`995`	`+`
`971`	`996`	`// Can create a new readline Interface with a null output argument`
`972`	`997`	`{`
`973`	`998`	`const [rli, fi] = getInterface({ output: null, terminal });`