lib: clean up persisted signals when they are settled

PR-URL: #56001 Refs: #55328Fixes: #55328 Reviewed-By: Chemi Atlow <[email protected]> Reviewed-By: Jason Zhang <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]>

Author: geeksilva97

lib/internal/abort_controller.js

@@ -96,8 +96,21 @@ const dependantSignalsCleanupRegistry = new SafeFinalizationRegistry((signalWeak
 }
 });
 });
+
 constgcPersistentSignals=newSafeSet();
 
+constsourceSignalsCleanupRegistry=newSafeFinalizationRegistry(({ sourceSignalRef, composedSignalRef })=>{
+constcomposedSignal=composedSignalRef.deref();
+if(composedSignal!==undefined){
+composedSignal[kSourceSignals].delete(sourceSignalRef);
+
+if(composedSignal[kSourceSignals].size===0){
+// This signal will no longer abort. There's no need to keep it in the gcPersistentSignals set.
+gcPersistentSignals.delete(composedSignal);
+}
+}
+});
+
 constkAborted=Symbol('kAborted');
 constkReason=Symbol('kReason');
 constkCloneData=Symbol('kCloneData');
@@ -260,6 +273,10 @@ class AbortSignal extends EventTarget{
 resultSignal[kSourceSignals].add(signalWeakRef);
 signal[kDependantSignals].add(resultSignalWeakRef);
 dependantSignalsCleanupRegistry.register(resultSignal,signalWeakRef);
+sourceSignalsCleanupRegistry.register(signal,{
+sourceSignalRef: signalWeakRef,
+composedSignalRef: resultSignalWeakRef,
+});
 }elseif(!signal[kSourceSignals]){
 continue;
 }else{
@@ -277,6 +294,10 @@ class AbortSignal extends EventTarget{
 resultSignal[kSourceSignals].add(sourceSignalWeakRef);
 sourceSignal[kDependantSignals].add(resultSignalWeakRef);
 dependantSignalsCleanupRegistry.register(resultSignal,sourceSignalWeakRef);
+sourceSignalsCleanupRegistry.register(signal,{
+sourceSignalRef: sourceSignalWeakRef,
+composedSignalRef: resultSignalWeakRef,
+});
 }
 }
 }
@@ -436,6 +457,7 @@ class AbortController{
  */
 getsignal(){
 this.#signal ??=newAbortSignal(kDontThrowSymbol);
+
 returnthis.#signal;
 }
 

test/parallel/test-abortsignal-drop-settled-signals.mjs

@@ -64,6 +64,41 @@ function runShortLivedSourceSignal(limit, done){
 run(1);
 };
 
+functionrunWithOrphanListeners(limit,done){
+letcomposedSignalRef;
+constcomposedSignalRefs=[];
+consthandler=()=>{};
+
+functionrun(iteration){
+constac=newAbortController();
+if(iteration>limit){
+setImmediate(()=>{
+global.gc();
+setImmediate(()=>{
+global.gc();
+
+done(composedSignalRefs);
+});
+});
+return;
+}
+
+composedSignalRef=newWeakRef(AbortSignal.any([ac.signal]));
+composedSignalRef.deref().addEventListener('abort',handler);
+
+constotherComposedSignalRef=newWeakRef(AbortSignal.any([composedSignalRef.deref()]));
+otherComposedSignalRef.deref().addEventListener('abort',handler);
+
+composedSignalRefs.push(composedSignalRef,otherComposedSignalRef);
+
+setImmediate(()=>{
+run(iteration+1);
+});
+}
+
+run(1);
+}
+
 constlimit=10_000;
 
 describe('when there is a long-lived signal',()=>{
@@ -120,3 +155,23 @@ it('drops settled dependant signals when signal is composite', (t, done) =>{
 });
 });
 });
+
+it('drops settled signals even when there are listeners',(t,done)=>{
+runWithOrphanListeners(limit,(signalRefs)=>{
+setImmediate(()=>{
+global.gc();
+setImmediate(()=>{
+global.gc();// One more call needed to clean up the deeper composed signals
+setImmediate(()=>{
+global.gc();// One more call needed to clean up the deeper composed signals
+
+constunGCedSignals=[...signalRefs].filter((ref)=>ref.deref());
+
+t.assert.strictEqual(unGCedSignals.length,0);
+
+done();
+});
+});
+});
+});
+});