readline: fix pre-aborted signal question handling

fix pre-aborted question handling
nodejs · Mar 26, 2021 · a39a0e7 · a39a0e7
1 parent a9cdeed
commit a39a0e7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/lib/readline.js b/lib/readline.js
@@ -376,6 +376,10 @@ Interface.prototype.question = function(query, options, cb) {
   options = typeof options === 'object' && options !== null ? options : {};
 
   if (options.signal) {
+    if (options.signal.aborted) {
+      return;
+    }
+
     options.signal.addEventListener('abort', () => {
       this[kQuestionCancel]();
     }, { once: true });
@@ -397,8 +401,11 @@ Interface.prototype.question[promisify.custom] = function(query, options) {
   options = typeof options === 'object' && options !== null ? options : {};
 
   return new Promise((resolve, reject) => {
-    this.question(query, options, resolve);
+    if (options.signal?.aborted) {
+      throw new AbortError();
+    }
 
+    this.question(query, options, resolve);
     if (options.signal) {
       options.signal.addEventListener('abort', () => {
         reject(new AbortError());

diff --git a/test/parallel/test-readline-interface.js b/test/parallel/test-readline-interface.js
@@ -968,6 +968,31 @@ for (let i = 0; i < 12; i++) {
     rli.close();
   }
 
+  // pre-aborted signal
+  {
+    const signal = AbortSignal.abort();
+    const [rli] = getInterface({ terminal });
+    rli.pause();
+    rli.on('resume', common.mustNotCall());
+    rli.question('hello?', { signal }, common.mustNotCall());
+    rli.close();
+  }
+
+  // pre-aborted signal promisified question
+  {
+    const signal = AbortSignal.abort();
+    const [rli] = getInterface({ terminal });
+    const question = util.promisify(rli.question).bind(rli);
+    rli.on('resume', common.mustNotCall());
+    rli.pause();
+    question('hello?', { signal })
+    .then(common.mustNotCall())
+    .catch(common.mustCall((error) => {
+      assert.strictEqual(error.name, 'AbortError');
+    }));
+    rli.close();
+  }
+
   // Can create a new readline Interface with a null output argument
   {
     const [rli, fi] = getInterface({ output: null, terminal });