cluster: use inspector utils

PR-URL: #44592
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

Author: MoLow

lib/internal/cluster/primary.js

@@ -6,10 +6,14 @@ const {
  ArrayPrototypeSome,
  ObjectKeys,
  ObjectValues,
- RegExpPrototypeExec,
  SafeMap,
  StringPrototypeStartsWith,
 }=primordials;
+const{
+codes: {
+ERR_SOCKET_BAD_PORT,
+}
+}=require('internal/errors');
 
 constassert=require('internal/assert');
 const{ fork }=require('child_process');
@@ -18,14 +22,12 @@ const EventEmitter = require('events');
 constRoundRobinHandle=require('internal/cluster/round_robin_handle');
 constSharedHandle=require('internal/cluster/shared_handle');
 constWorker=require('internal/cluster/worker');
+const{ getInspectPort, isUsingInspector }=require('internal/util/inspector');
 const{ internal, sendHelper }=require('internal/cluster/utils');
 constcluster=newEventEmitter();
 constintercom=newEventEmitter();
 constSCHED_NONE=1;
 constSCHED_RR=2;
-constminPort=1024;
-constmaxPort=65535;
-const{ validatePort }=require('internal/validators');
 
 module.exports=cluster;
 
@@ -40,7 +42,6 @@ cluster.SCHED_NONE = SCHED_NONE; // Leave it to the operating system.
 cluster.SCHED_RR=SCHED_RR;// Primary distributes connections.
 
 letids=0;
-letdebugPortOffset=1;
 letinitialized=false;
 
 // XXX(bnoordhuis) Fold cluster.schedulingPolicy into cluster.settings?
@@ -117,29 +118,12 @@ function setupSettingsNT(settings) {
 functioncreateWorkerProcess(id,env){
 constworkerEnv={ ...process.env, ...env,NODE_UNIQUE_ID: `${id}`};
 constexecArgv=[...cluster.settings.execArgv];
-constdebugArgRegex=/--inspect(?:-brk|-port)?|--debug-port/;
-constnodeOptions=process.env.NODE_OPTIONS||'';
-
-// TODO(MoLow): Use getInspectPort from internal/util/inspector
-if(ArrayPrototypeSome(execArgv,
-(arg)=>RegExpPrototypeExec(debugArgRegex,arg)!==null)||
-RegExpPrototypeExec(debugArgRegex,nodeOptions)!==null){
-letinspectPort;
-if('inspectPort'incluster.settings){
-if(typeofcluster.settings.inspectPort==='function')
-inspectPort=cluster.settings.inspectPort();
-else
-inspectPort=cluster.settings.inspectPort;
-
-validatePort(inspectPort);
-}else{
-inspectPort=process.debugPort+debugPortOffset;
-if(inspectPort>maxPort)
-inspectPort=inspectPort-maxPort+minPort-1;
-debugPortOffset++;
-}
 
-ArrayPrototypePush(execArgv,`--inspect-port=${inspectPort}`);
+if(cluster.settings.inspectPort===null){
+thrownewERR_SOCKET_BAD_PORT('Port',null,true);
+}
+if(isUsingInspector(cluster.settings.execArgv)){
+ArrayPrototypePush(execArgv,`--inspect-port=${getInspectPort(cluster.settings.inspectPort)}`);
 }
 
 returnfork(cluster.settings.exec,cluster.settings.args,{

lib/internal/util/inspector.js

@@ -8,6 +8,7 @@ const {
  ObjectKeys,
  ObjectPrototypeHasOwnProperty,
  RegExpPrototypeExec,
+ SafeWeakMap,
 }=primordials;
 
 const{ validatePort }=require('internal/validators');
@@ -17,19 +18,18 @@ const kMaxPort = 65535;
 constkInspectArgRegex=/--inspect(?:-brk|-port)?|--debug-port/;
 constkInspectMsgRegex=/Debuggerlisteningonws:\/\/\[?(.+?)\]?:(\d+)\/|Debuggerattached|Waitingforthedebuggertodisconnect\.\.\./;
 
-let_isUsingInspector;
-functionisUsingInspector(){
-_isUsingInspector??=
-ArrayPrototypeSome(process.execArgv,(arg)=>RegExpPrototypeExec(kInspectArgRegex,arg)!==null)||
-RegExpPrototypeExec(kInspectArgRegex,process.env.NODE_OPTIONS)!==null;
-return_isUsingInspector;
+const_isUsingInspector=newSafeWeakMap();
+functionisUsingInspector(execArgv=process.execArgv){
+if(!_isUsingInspector.has(execArgv)){
+_isUsingInspector.set(execArgv,
+ArrayPrototypeSome(execArgv,(arg)=>RegExpPrototypeExec(kInspectArgRegex,arg)!==null)||
+RegExpPrototypeExec(kInspectArgRegex,process.env.NODE_OPTIONS)!==null);
+}
+return_isUsingInspector.get(execArgv);
 }
 
 letdebugPortOffset=1;
 functiongetInspectPort(inspectPort){
-if(!isUsingInspector()){
-returnnull;
-}
 if(typeofinspectPort==='function'){
 inspectPort=inspectPort();
 }elseif(inspectPort==null){