child_process: cleanup AbortSignal duplication

cleanup AbortSignal child_process code duplication PR-URL: #37823 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: Linkgoron

lib/child_process.js

@@ -605,23 +605,6 @@ function spawn(file, args, options){
 constkillSignal=sanitizeKillSignal(options.killSignal);
 constchild=newChildProcess();
 
-if(options.signal){
-constsignal=options.signal;
-if(signal.aborted){
-onAbortListener();
-}else{
-signal.addEventListener('abort',onAbortListener,{once: true});
-child.once('exit',
-()=>signal.removeEventListener('abort',onAbortListener));
-}
-
-functiononAbortListener(){
-process.nextTick(()=>{
-abortChildProcess(child,killSignal);
-});
-}
-}
-
 debug('spawn',options);
 child.spawn(options);
 
@@ -645,6 +628,21 @@ function spawn(file, args, options){
 });
 }
 
+if(options.signal){
+constsignal=options.signal;
+if(signal.aborted){
+process.nextTick(onAbortListener);
+}else{
+signal.addEventListener('abort',onAbortListener,{once: true});
+child.once('exit',
+()=>signal.removeEventListener('abort',onAbortListener));
+}
+
+functiononAbortListener(){
+abortChildProcess(child,killSignal);
+}
+}
+
 returnchild;
 }
 
@@ -778,37 +776,6 @@ function sanitizeKillSignal(killSignal){
 }
 }
 
-// This level of indirection is here because the other child_process methods
-// call spawn internally but should use different cancellation logic.
-functionspawnWithSignal(file,args,options){
-// Remove signal from options to spawn
-// to avoid double emitting of AbortError
-constopts=options&&typeofoptions==='object'&&('signal'inoptions) ?
-{ ...options,signal: undefined} :
-options;
-
-if(options?.signal){
-// Validate signal, if present
-validateAbortSignal(options.signal,'options.signal');
-}
-constchild=spawn(file,args,opts);
-
-if(options?.signal){
-constkillSignal=sanitizeKillSignal(options.killSignal);
-
-functionkill(){
-abortChildProcess(child,killSignal);
-}
-if(options.signal.aborted){
-process.nextTick(kill);
-}else{
-options.signal.addEventListener('abort',kill,{once: true});
-constremove=()=>options.signal.removeEventListener('abort',kill);
-child.once('exit',remove);
-}
-}
-returnchild;
-}
 module.exports={
  _forkChild,
  ChildProcess,
@@ -817,6 +784,6 @@ module.exports ={
  execFileSync,
  execSync,
  fork,
-spawn: spawnWithSignal,
+ spawn,
  spawnSync
 };