inspector: use inspector API for "break on start"

This change removes a need for using deprecated debug context for breaking at the start of the main module. PR-URL: #12076 Reviewed-By: Ben Noordhuis <[email protected]>

Author: Eugene Ostroukhov

lib/internal/bootstrap_node.js

@@ -262,7 +262,9 @@
 if(process.inspector){
 inspectorConsole=global.console;
 wrapConsoleCall=process.inspector.wrapConsoleCall;
-deleteprocess.inspector;
+deleteprocess.inspector.wrapConsoleCall;
+if(Object.keys(process.inspector).length===0)
+deleteprocess.inspector;
 }
 varconsole;
 Object.defineProperty(global,'console',{

lib/module.js

@@ -472,6 +472,19 @@ function tryModuleLoad(module, filename){
 }
 }
 
+functiongetInspectorCallWrapper(){
+varinspector=process.inspector;
+if(!inspector||!inspector.callAndPauseOnStart){
+returnnull;
+}
+varwrapper=inspector.callAndPauseOnStart.bind(inspector);
+deleteinspector.callAndPauseOnStart;
+if(Object.keys(process.inspector).length===0){
+deleteprocess.inspector;
+}
+returnwrapper;
+}
+
 Module._resolveFilename=function(request,parent,isMain){
 if(NativeModule.nonInternalExists(request)){
 returnrequest;
@@ -561,6 +574,7 @@ Module.prototype._compile = function(content, filename){
 displayErrors: true
 });
 
+varinspectorWrapper=null;
 if(process._debugWaitConnect&&process._eval==null){
 if(!resolvedArgv){
 // we enter the repl if we're not given a filename argument.
@@ -574,16 +588,25 @@ Module.prototype._compile = function(content, filename){
 // Set breakpoint on module start
 if(filename===resolvedArgv){
 deleteprocess._debugWaitConnect;
-constDebug=vm.runInDebugContext('Debug');
-Debug.setBreakPoint(compiledWrapper,0,0);
+inspectorWrapper=getInspectorCallWrapper();
+if(!inspectorWrapper){
+constDebug=vm.runInDebugContext('Debug');
+Debug.setBreakPoint(compiledWrapper,0,0);
+}
 }
 }
 vardirname=path.dirname(filename);
 varrequire=internalModule.makeRequireFunction(this);
 vardepth=internalModule.requireDepth;
 if(depth===0)stat.cache=newMap();
-varresult=compiledWrapper.call(this.exports,this.exports,require,this,
-filename,dirname);
+varresult;
+if(inspectorWrapper){
+result=inspectorWrapper(compiledWrapper,this.exports,this.exports,
+require,this,filename,dirname);
+}else{
+result=compiledWrapper.call(this.exports,this.exports,require,this,
+filename,dirname);
+}
 if(depth===0)stat.cache=null;
 returnresult;
 };

src/inspector_agent.cc

@@ -94,7 +94,6 @@ std::unique_ptr<StringBuffer> Utf8ToStringView(const std::string& message){
  utf16.length());
 returnStringBuffer::create(view);
 }
-
 } // namespace
 
 classV8NodeInspector;
@@ -145,6 +144,8 @@ class AgentImpl{
 voidFatalException(v8::Local<v8::Value> error,
  v8::Local<v8::Message> message);
 
+voidSchedulePauseOnNextStatement(const std::string& reason);
+
 voidPostIncomingMessage(InspectorAction action, int session_id,
 const std::string& message);
 voidResumeStartup(){
@@ -160,6 +161,8 @@ class AgentImpl{
 staticvoidThreadCbIO(void* agent);
 staticvoidWriteCbIO(uv_async_t* async);
 staticvoidMainThreadAsyncCb(uv_async_t* req);
+staticvoidCallAndPauseOnStart(
+const v8::FunctionCallbackInfo<v8::Value>& args);
 
 voidInstallInspectorOnProcess();
 
@@ -310,6 +313,14 @@ class V8NodeInspector : public v8_inspector::V8InspectorClient{
  session_->dispatchProtocolMessage(message);
  }
 
+voidschedulePauseOnNextStatement(const std::string& reason){
+if (session_ != nullptr){
+ std::unique_ptr<StringBuffer> buffer = Utf8ToStringView(reason);
+ session_->schedulePauseOnNextStatement(buffer->string(),
+ buffer->string());
+ }
+ }
+
  v8::Local<v8::Context> ensureDefaultContextInGroup(int contextGroupId)
 override{
 return env_->context();
@@ -477,6 +488,28 @@ void AgentImpl::InstallInspectorOnProcess(){
  v8::Local<v8::Object> inspector = v8::Object::New(env->isolate());
 READONLY_PROPERTY(process, "inspector", inspector);
  env->SetMethod(inspector, "wrapConsoleCall", InspectorWrapConsoleCall);
+if (options_.wait_for_connect()){
+ env->SetMethod(inspector, "callAndPauseOnStart", CallAndPauseOnStart);
+ }
+}
+
+// static
+voidAgentImpl::CallAndPauseOnStart(
+const v8::FunctionCallbackInfo<v8::Value>& args){
+ Environment* env = Environment::GetCurrent(args);
+CHECK_GT(args.Length(), 1);
+CHECK(args[0]->IsFunction());
+ std::vector<v8::Local<v8::Value>> call_args;
+for (int i = 2; i < args.Length(); i++){
+ call_args.push_back(args[i]);
+ }
+
+ env->inspector_agent()->SchedulePauseOnNextStatement("Break on start");
+
+ v8::MaybeLocal<v8::Value> retval =
+ args[0].As<v8::Function>()->Call(env->context(), args[1],
+ call_args.size(), call_args.data());
+ args.GetReturnValue().Set(retval.ToLocalChecked());
 }
 
 std::unique_ptr<StringBuffer> ToProtocolString(v8::Local<v8::Value> value){
@@ -682,6 +715,10 @@ void AgentImpl::Write(TransportAction action, int session_id,
 CHECK_EQ(0, err);
 }
 
+voidAgentImpl::SchedulePauseOnNextStatement(const std::string& reason){
+ inspector_->schedulePauseOnNextStatement(reason);
+}
+
 // Exported class Agent
 Agent::Agent(node::Environment* env) : impl(new AgentImpl(env)){}
 
@@ -715,6 +752,10 @@ void Agent::FatalException(v8::Local<v8::Value> error,
  impl->FatalException(error, message);
 }
 
+voidAgent::SchedulePauseOnNextStatement(const std::string& reason){
+ impl->SchedulePauseOnNextStatement(reason);
+}
+
 InspectorAgentDelegate::InspectorAgentDelegate(AgentImpl* agent,
 const std::string& script_path,
 const std::string& script_name,

src/inspector_agent.h

@@ -43,6 +43,7 @@ class Agent{
 voidWaitForDisconnect();
 voidFatalException(v8::Local<v8::Value> error,
  v8::Local<v8::Message> message);
+voidSchedulePauseOnNextStatement(const std::string& reason);
 private:
  AgentImpl* impl;
 };