timers: propagate signal.reason in awaitable timers

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]>

Author: jasnell

lib/timers/promises.js

@@ -44,7 +44,7 @@ const kScheduler = Symbol('kScheduler');
 functioncancelListenerHandler(clear,reject,signal){
 if(!this._destroyed){
 clear(this);
-reject(newAbortError());
+reject(newAbortError(undefined,{cause: signal?.reason}));
 }
 }
 
@@ -74,15 +74,15 @@ function setTimeout(after, value, options = kEmptyObject){
 // to 12.x, then this can be converted to use optional chaining to
 // simplify the check.
 if(signal&&signal.aborted){
-returnPromiseReject(newAbortError());
+returnPromiseReject(newAbortError(undefined,{cause: signal.reason}));
 }
 letoncancel;
 constret=newPromise((resolve,reject)=>{
 consttimeout=newTimeout(resolve,after,args,false,ref);
 insert(timeout,timeout._idleTimeout);
 if(signal){
 oncancel=FunctionPrototypeBind(cancelListenerHandler,
-timeout,clearTimeout,reject);
+timeout,clearTimeout,reject,signal);
 signal.addEventListener('abort',oncancel);
 }
 });
@@ -117,15 +117,16 @@ function setImmediate(value, options = kEmptyObject){
 // to 12.x, then this can be converted to use optional chaining to
 // simplify the check.
 if(signal&&signal.aborted){
-returnPromiseReject(newAbortError());
+returnPromiseReject(newAbortError(undefined,{cause: signal.reason}));
 }
 letoncancel;
 constret=newPromise((resolve,reject)=>{
 constimmediate=newImmediate(resolve,[value]);
 if(!ref)immediate.unref();
 if(signal){
 oncancel=FunctionPrototypeBind(cancelListenerHandler,
-immediate,clearImmediate,reject);
+immediate,clearImmediate,reject,
+signal);
 signal.addEventListener('abort',oncancel);
 }
 });
@@ -142,7 +143,7 @@ async function* setInterval(after, value, options = kEmptyObject){
 validateBoolean(ref,'options.ref');
 
 if(signal?.aborted)
-thrownewAbortError();
+thrownewAbortError(undefined,{cause: signal?.reason});
 
 letonCancel;
 letinterval;
@@ -161,7 +162,9 @@ async function* setInterval(after, value, options = kEmptyObject){
 onCancel=()=>{
 clearInterval(interval);
 if(callback){
-callback(PromiseReject(newAbortError()));
+callback(
+PromiseReject(
+newAbortError(undefined,{cause: signal.reason})));
 callback=undefined;
 }
 };
@@ -176,7 +179,7 @@ async function* setInterval(after, value, options = kEmptyObject){
 yieldvalue;
 }
 }
-thrownewAbortError();
+thrownewAbortError(undefined,{cause: signal?.reason});
 }finally{
 clearInterval(interval);
 signal?.removeEventListener('abort',onCancel);

test/parallel/test-timers-immediate-promisified.js

@@ -97,3 +97,10 @@ process.on('multipleResolves', common.mustNotCall());
 assert.strictEqual(stderr,'');
 }));
 }
+
+(async()=>{
+constsignal=AbortSignal.abort('boom');
+awaitassert.rejects(timerPromises.setImmediate(undefined,{ signal }),{
+cause: 'boom',
+});
+})().then(common.mustCall());

test/parallel/test-timers-interval-promisified.js

@@ -246,3 +246,15 @@ process.on('multipleResolves', common.mustNotCall());
 setPromiseTimeout(time_unit*3).then(()=>post=true),
 ]).then(common.mustCall());
 }
+
+(async()=>{
+constsignal=AbortSignal.abort('boom');
+try{
+constiterable=timerPromises.setInterval(2,undefined,{ signal });
+// eslint-disable-next-line no-unused-vars, no-empty
+forawait(const_ofiterable){}
+assert.fail('should have failed');
+}catch(err){
+assert.strictEqual(err.cause,'boom');
+}
+})().then(common.mustCall());

test/parallel/test-timers-timeout-promisified.js

@@ -97,3 +97,10 @@ process.on('multipleResolves', common.mustNotCall());
 assert.strictEqual(stderr,'');
 }));
 }
+
+(async()=>{
+constsignal=AbortSignal.abort('boom');
+awaitassert.rejects(timerPromises.setTimeout(1,undefined,{ signal }),{
+cause: 'boom',
+});
+})().then(common.mustCall());