fs: use kResistStopPropagation

PR-URL: #48521
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>

Author: atlowChemi

lib/fs.js

@@ -154,6 +154,7 @@ let ReadStream;
 letWriteStream;
 letrimraf;
 letrimrafSync;
+letkResistStopPropagation;
 
 // These have to be separate because of how graceful-fs happens to do it's
 // monkeypatching.
@@ -2439,7 +2440,8 @@ function watch(filename, options, listener) {
 process.nextTick(()=>watcher.close());
 }else{
 constlistener=()=>watcher.close();
-options.signal.addEventListener('abort',listener);
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+options.signal.addEventListener('abort',listener,{__proto__: null,[kResistStopPropagation]: true});
 watcher.once('close',()=>{
 options.signal.removeEventListener('abort',listener);
 });

lib/internal/fs/recursive_watch.js

@@ -42,6 +42,7 @@ function lazyLoadFsSync() {
 internalSync??=require('fs');
 returninternalSync;
 }
+letkResistStopPropagation;
 
 asyncfunctiontraverse(dir,files=newSafeMap(),symbolicLinks=newSafeSet()){
 const{ opendir }=lazyLoadFsPromises();
@@ -265,7 +266,8 @@ class FSWatcher extends EventEmitter {
 } : (resolve,reject)=>{
 constonAbort=()=>reject(newAbortError(undefined,{cause: signal.reason}));
 if(signal.aborted)returnonAbort();
-signal.addEventListener('abort',onAbort,{__proto__: null,once: true});
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+signal.addEventListener('abort',onAbort,{__proto__: null,once: true,[kResistStopPropagation]: true});
 this.once('change',(eventType,filename)=>{
 signal.removeEventListener('abort',onAbort);
 resolve({__proto__: null,value: { eventType, filename }});

lib/internal/fs/watchers.js

@@ -299,6 +299,8 @@ ObjectDefineProperty(FSEvent.prototype, 'owner', {
 set(v){returnthis[owner_symbol]=v;},
 });
 
+letkResistStopPropagation;
+
 asyncfunction*watch(filename,options=kEmptyObject){
 constpath=toNamespacedPath(getValidatedPath(filename));
 validateObject(options,'options');
@@ -330,7 +332,10 @@ async function* watch(filename, options = kEmptyObject) {
 };
 
 try{
-signal?.addEventListener('abort',oncancel,{once: true});
+if(signal){
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+signal.addEventListener('abort',oncancel,{__proto__: null,once: true,[kResistStopPropagation]: true});
+}
 handle.onchange=(status,eventType,filename)=>{
 if(status<0){
 consterror=uvException({

lib/internal/test_runner/mock/mock_timers.js

@@ -33,6 +33,8 @@ const nodeTimers = require('timers');
 constnodeTimersPromises=require('timers/promises');
 constEventEmitter=require('events');
 
+letkResistStopPropagation;
+
 functioncompareTimersLists(a,b){
 return(a.runAt-b.runAt)||(a.id-b.id);
 }
@@ -101,17 +103,19 @@ class MockTimers {
 if(options?.signal){
 validateAbortSignal(options.signal,'options.signal');
 
-if(options.signal?.aborted){
+if(options.signal.aborted){
 throwabortIt(options.signal);
 }
 
 constonAbort=(reason)=>{
 emitter.emit('data',{__proto__: null,aborted: true, reason });
 };
 
-options.signal?.addEventListener('abort',onAbort,{
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+options.signal.addEventListener('abort',onAbort,{
 __proto__: null,
 once: true,
+[kResistStopPropagation]: true,
 });
 }
 
@@ -162,7 +166,7 @@ class MockTimers {
 returnreject(err);
 }
 
-if(options.signal?.aborted){
+if(options.signal.aborted){
 returnreject(abortIt(options.signal));
 }
 }
@@ -176,10 +180,14 @@ class MockTimers {
 returnresolve(result||id);
 },ms);
 
-options?.signal?.addEventListener('abort',onabort,{
-__proto__: null,
-once: true,
-});
+if(options?.signal){
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+options.signal.addEventListener('abort',onabort,{
+__proto__: null,
+once: true,
+[kResistStopPropagation]: true,
+});
+}
 });
 }
 

lib/internal/test_runner/runner.js

@@ -77,6 +77,8 @@ const kDiagnosticsFilterArgs = ['tests', 'suites', 'pass', 'fail', 'cancelled',
 constkCanceledTests=newSafeSet()
 .add(kCancelledByParent).add(kAborted).add(kTestTimeoutFailure);
 
+letkResistStopPropagation;
+
 // TODO(cjihrig): Replace this with recursive readdir once it lands.
 functionprocessPath(path,testFiles,options){
 conststats=statSync(path);
@@ -442,7 +444,14 @@ function watchFiles(testFiles, root, inspectPort, signal, testNamePatterns) {
 triggerUncaughtException(error,true/* fromPromise */);
 }));
 });
-signal?.addEventListener('abort',()=>root.postRun(),{__proto__: null,once: true});
+if(signal){
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+signal.addEventListener(
+'abort',
+()=>root.postRun(),
+{__proto__: null,once: true,[kResistStopPropagation]: true},
+);
+}
 
 returnfilesWatcher;
 }

lib/internal/test_runner/test.js

@@ -72,6 +72,7 @@ const kUnwrapErrors = new SafeSet()
 .add(kTestCodeFailure).add(kHookFailure)
 .add('uncaughtException').add('unhandledRejection');
 const{ testNamePatterns, testOnlyFlag }=parseCommandLine();
+letkResistStopPropagation;
 
 functionstopTest(timeout,signal){
 if(timeout===kDefaultTimeout){
@@ -266,7 +267,15 @@ class Test extends AsyncResource {
 this.signal=this.#abortController.signal;
 
 validateAbortSignal(signal,'options.signal');
-this.#outerSignal?.addEventListener('abort',this.#abortHandler);
+if(signal){
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+}
+
+this.#outerSignal?.addEventListener(
+'abort',
+this.#abortHandler,
+{__proto__: null,[kResistStopPropagation]: true},
+);
 
 this.fn=fn;
 this.harness=null;// Configured on the root test by the test harness.

lib/timers/promises.js

@@ -40,6 +40,7 @@ const {
 }=require('internal/util');
 
 constkScheduler=Symbol('kScheduler');
+letkResistStopPropagation;
 
 functioncancelListenerHandler(clear,reject,signal){
 if(!this._destroyed){
@@ -81,7 +82,8 @@ function setTimeout(after, value, options = kEmptyObject) {
 if(signal){
 oncancel=FunctionPrototypeBind(cancelListenerHandler,
 timeout,clearTimeout,reject,signal);
-signal.addEventListener('abort',oncancel);
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+signal.addEventListener('abort',oncancel,{__proto__: null,[kResistStopPropagation]: true});
 }
 });
 returnoncancel!==undefined ?
@@ -123,7 +125,8 @@ function setImmediate(value, options = kEmptyObject) {
 oncancel=FunctionPrototypeBind(cancelListenerHandler,
 immediate,clearImmediate,reject,
 signal);
-signal.addEventListener('abort',oncancel);
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+signal.addEventListener('abort',oncancel,{__proto__: null,[kResistStopPropagation]: true});
 }
 });
 returnoncancel!==undefined ?
@@ -164,7 +167,8 @@ async function* setInterval(after, value, options = kEmptyObject) {
 callback=undefined;
 }
 };
-signal.addEventListener('abort',onCancel,{once: true});
+kResistStopPropagation??=require('internal/event_target').kResistStopPropagation;
+signal.addEventListener('abort',onCancel,{__proto__: null,once: true,[kResistStopPropagation]: true});
 }
 
 while(!signal?.aborted){