lib: fix AbortSignal.any() with timeout signals

PR-URL: #57867
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>

Author: gurgunday

lib/internal/abort_controller.js

@@ -259,14 +259,30 @@ class AbortSignal extends EventTarget {
 if(!signalsArray.length){
 returnresultSignal;
 }
+
 constresultSignalWeakRef=newSafeWeakRef(resultSignal);
 resultSignal[kSourceSignals]=newSafeSet();
+
+// Track if we have any timeout signals
+lethasTimeoutSignals=false;
+
 for(leti=0;i<signalsArray.length;i++){
 constsignal=signalsArray[i];
+
+// Check if this is a timeout signal
+if(signal[kTimeout]){
+hasTimeoutSignals=true;
+
+// Add the timeout signal to gcPersistentSignals to keep it alive
+// This is what the kNewListener method would do when adding abort listeners
+gcPersistentSignals.add(signal);
+}
+
 if(signal.aborted){
 abortSignal(resultSignal,signal.reason);
 returnresultSignal;
 }
+
 signal[kDependantSignals]??=newSafeSet();
 if(!signal[kComposite]){
 constsignalWeakRef=newSafeWeakRef(signal);
@@ -301,6 +317,12 @@ class AbortSignal extends EventTarget {
 }
 }
 }
+
+// If we have any timeout signals, add the composite signal to gcPersistentSignals
+if(hasTimeoutSignals&&resultSignal[kSourceSignals].size>0){
+gcPersistentSignals.add(resultSignal);
+}
+
 returnresultSignal;
 }
 
@@ -416,8 +438,10 @@ function abortSignal(signal, reason) {
 // otherwise to a new "AbortError" DOMException.
 signal[kAborted]=true;
 signal[kReason]=reason;
+
 // 3. Let dependentSignalsToAbort be a new list.
 constdependentSignalsToAbort=ObjectSetPrototypeOf([],null);
+
 // 4. For each dependentSignal of signal's dependent signals:
 signal[kDependantSignals]?.forEach((s)=>{
 constdependentSignal=s.deref();
@@ -433,12 +457,27 @@ function abortSignal(signal, reason) {
 
 // 5. Run the abort steps for signal
 runAbort(signal);
+
 // 6. For each dependentSignal of dependentSignalsToAbort,
 // run the abort steps for dependentSignal.
 for(leti=0;i<dependentSignalsToAbort.length;i++){
 constdependentSignal=dependentSignalsToAbort[i];
 runAbort(dependentSignal);
 }
+
+// Clean up the signal from gcPersistentSignals
+gcPersistentSignals.delete(signal);
+
+// If this is a composite signal, also remove all of its source signals from gcPersistentSignals
+// when they get dereferenced from the signal's kSourceSignals set
+if(signal[kComposite]&&signal[kSourceSignals]){
+signal[kSourceSignals].forEach((sourceWeakRef)=>{
+constsourceSignal=sourceWeakRef.deref();
+if(sourceSignal){
+gcPersistentSignals.delete(sourceSignal);
+}
+});
+}
 }
 
 // To run the abort steps for an AbortSignal signal

test/parallel/test-abort-controller-any-timeout.js

@@ -0,0 +1,28 @@
+'use strict';
+
+require('../common');
+constassert=require('assert');
+const{ once }=require('node:events');
+const{ describe, it }=require('node:test');
+
+describe('AbortSignal.any() with timeout signals',()=>{
+it('should abort when the first timeout signal fires',async()=>{
+constsignal=AbortSignal.any([AbortSignal.timeout(9000),AbortSignal.timeout(110000)]);
+
+constabortPromise=Promise.race([
+once(signal,'abort').then(()=>{
+throwsignal.reason;
+}),
+newPromise((resolve)=>setTimeout(resolve,10000)),
+]);
+
+// The promise should be aborted by the 9000ms timeout
+awaitassert.rejects(
+()=>abortPromise,
+{
+name: 'TimeoutError',
+message: 'The operation was aborted due to timeout'
+}
+);
+});
+});