readline: propagate signal.reason in awaitable question

Signed-off-by: James M Snell <[email protected]> PR-URL: #41008 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Dec 13, 2021 · 67124ac · 67124ac
1 parent e795547
commit 67124ac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/lib/readline.js b/lib/readline.js
@@ -157,15 +157,16 @@ Interface.prototype.question[promisify.custom] = function(query, options) {
   options = typeof options === 'object' && options !== null ? options : {};
 
   if (options.signal && options.signal.aborted) {
-    return PromiseReject(new AbortError());
+    return PromiseReject(
+      new AbortError(undefined, { cause: options.signal.reason }));
   }
 
   return new Promise((resolve, reject) => {
     let cb = resolve;
 
     if (options.signal) {
       const onAbort = () => {
-        reject(new AbortError());
+        reject(new AbortError(undefined, { cause: options.signal.reason }));
       };
       options.signal.addEventListener('abort', onAbort, { once: true });
       cb = (answer) => {

diff --git a/lib/readline/promises.js b/lib/readline/promises.js
@@ -30,12 +30,13 @@ class Interface extends _Interface {
       if (options?.signal) {
         validateAbortSignal(options.signal, 'options.signal');
         if (options.signal.aborted) {
-          return reject(new AbortError());
+          return reject(
+            new AbortError(undefined, { cause: options.signal.reason }));
         }
 
         const onAbort = () => {
           this[kQuestionCancel]();
-          reject(new AbortError());
+          reject(new AbortError(undefined, { cause: options.signal.reason }));
         };
         options.signal.addEventListener('abort', onAbort, { once: true });
         cb = (answer) => {

diff --git a/test/parallel/test-readline-promises-interface.js b/test/parallel/test-readline-promises-interface.js
@@ -910,6 +910,15 @@ for (let i = 0; i < 12; i++) {
     rli.close();
   }
 
+  (async () => {
+    const [rli] = getInterface({ terminal });
+    const signal = AbortSignal.abort('boom');
+    await assert.rejects(rli.question('hello', { signal }), {
+      cause: 'boom',
+    });
+    rli.close();
+  })().then(common.mustCall());
+
   // Throw an error when question is executed with an aborted signal
   {
     const ac = new AbortController();