inspector: implemented V8InspectorClient::resourceNameToUrl

This method is required by inspector to report normalized urls over the protocol. Backport-PR-URL: #22918Fixes#22223 PR-URL: #22251 Reviewed-By: Eugene Ostroukhov <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]>

Author: alexkozy

src/inspector_agent.cc

@@ -6,6 +6,7 @@
 #include"inspector/tracing_agent.h"
 #include"node/inspector/protocol/Protocol.h"
 #include"node_internals.h"
+#include"node_url.h"
 #include"v8-inspector.h"
 #include"v8-platform.h"
 
@@ -375,6 +376,25 @@ void NotifyClusterWorkersDebugEnabled(Environment* env){
 MakeCallback(env->isolate(), process_object, emit_fn.As<Function>(),
 arraysize(argv), argv,{0, 0});
 }
+
+#ifdef _WIN32
+boolIsFilePath(const std::string& path){
+// '\\'
+if (path.length() > 2 && path[0] == '\\' && path[1] == '\\')
+returntrue;
+// '[A-Z]:[/\\]'
+if (path.length() < 3)
+returnfalse;
+if ((path[0] >= 'A' && path[0] <= 'Z') || (path[0] >= 'a' && path[0] <= 'z'))
+return path[1] == ':' && (path[2] == '/' || path[2] == '\\');
+returnfalse;
+}
+#else
+boolIsFilePath(const std::string& path){
+return path.length() && path[0] == '/';
+}
+#endif// __POSIX__
+
 } // namespace
 
 classNodeInspectorClient : publicV8InspectorClient{
@@ -601,6 +621,18 @@ class NodeInspectorClient : public V8InspectorClient{
 return env_->isolate_data()->platform()->CurrentClockTimeMillis();
  }
 
+ std::unique_ptr<StringBuffer> resourceNameToUrl(
+const StringView& resource_name_view) override{
+ std::string resource_name =
+protocol::StringUtil::StringViewToUtf8(resource_name_view);
+if (!IsFilePath(resource_name))
+returnnullptr;
+ node::url::URL url = node::url::URL::FromFilePath(resource_name);
+// TODO(ak239spb): replace this code with url.href().
+// Refs: https://github.com/nodejs/node/issues/22610
+returnUtf8ToStringView(url.protocol() + "//" + url.path());
+ }
+
  node::Environment* env_;
 bool is_main_;
 bool running_nested_loop_ = false;

test/cctest/test_url.cc

@@ -124,10 +124,6 @@ TEST_F(URLTest, FromFilePath){
  file_url = URL::FromFilePath("b:\\a\\%%.js");
 EXPECT_EQ("file:", file_url.protocol());
 EXPECT_EQ("/b:/a/%25%25.js", file_url.path());
-
- file_url = URL::FromFilePath("\\\\host\\a\\b\\c");
-EXPECT_EQ("file:", file_url.protocol());
-EXPECT_EQ("host/a/b/c", file_url.path());
 #else
  file_url = URL::FromFilePath("/");
 EXPECT_EQ("file:", file_url.protocol());

test/parallel/test-inspector-multisession-js.js

@@ -1,3 +1,4 @@
+// Flags: --expose-internals
 'use strict';
 constcommon=require('../common');
 
@@ -6,6 +7,7 @@ common.skipIfInspectorDisabled();
 constassert=require('assert');
 const{ Session }=require('inspector');
 constpath=require('path');
+const{ pathToFileURL }=require('url');
 
 functiondebugged(){
 return42;
@@ -32,8 +34,8 @@ async function test(){
 
 awaitnewPromise((resolve,reject)=>{
 session1.post('Debugger.setBreakpointByUrl',{
-'lineNumber': 9,
-'url': path.resolve(__dirname,__filename),
+'lineNumber': 12,
+'url': pathToFileURL(path.resolve(__dirname,__filename)).toString(),
 'columnNumber': 0,
 'condition': ''
 },(error,result)=>{

test/parallel/test-v8-coverage.js

@@ -97,7 +97,7 @@ function getFixtureCoverage(fixtureFile, coverageDirectory){
 for(constcoverageFileofcoverageFiles){
 constcoverage=require(path.join(coverageDirectory,coverageFile));
 for(constfixtureCoverageofcoverage.result){
-if(fixtureCoverage.url.indexOf(`${path.sep}${fixtureFile}`)!==-1){
+if(fixtureCoverage.url.indexOf(`/${fixtureFile}`)!==-1){
 returnfixtureCoverage;
 }
 }

test/sequential/test-inspector-bindings.js

@@ -1,9 +1,11 @@
+// Flags: --expose-internals
 'use strict';
 constcommon=require('../common');
 common.skipIfInspectorDisabled();
 constassert=require('assert');
 constinspector=require('inspector');
 constpath=require('path');
+const{ pathToFileURL }=require('url');
 
 // This test case will set a breakpoint 4 lines below
 functiondebuggedFunction(){
@@ -84,8 +86,8 @@ function testSampleDebugSession(){
 },TypeError);
 session.post('Debugger.enable',()=>cbAsSecondArgCalled=true);
 session.post('Debugger.setBreakpointByUrl',{
-'lineNumber': 12,
-'url': path.resolve(__dirname,__filename),
+'lineNumber': 14,
+'url': pathToFileURL(path.resolve(__dirname,__filename)).toString(),
 'columnNumber': 0,
 'condition': ''
 });

test/sequential/test-inspector-break-when-eval.js

@@ -5,6 +5,7 @@ common.skipIfInspectorDisabled();
 constassert=require('assert');
 const{ NodeInstance }=require('../common/inspector-helper.js');
 constfixtures=require('../common/fixtures');
+const{ pathToFileURL }=require('url');
 
 constscript=fixtures.path('inspector-global-function.js');
 
@@ -26,7 +27,7 @@ async function breakOnLine(session){
 constcommands=[
 {'method': 'Debugger.setBreakpointByUrl',
 'params': {'lineNumber': 9,
-'url': script,
+'url': pathToFileURL(script).toString(),
 'columnNumber': 0,
 'condition': ''
 }
@@ -45,7 +46,7 @@ async function breakOnLine(session){
 }
 ];
 session.send(commands);
-awaitsession.waitForBreakOnLine(9,script);
+awaitsession.waitForBreakOnLine(9,pathToFileURL(script).toString());
 }
 
 asyncfunctionstepOverConsoleStatement(session){

test/sequential/test-inspector-debug-brk-flag.js

@@ -24,7 +24,7 @@ async function testBreakpointOnStart(session){
 ];
 
 session.send(commands);
-awaitsession.waitForBreakOnLine(0,session.scriptPath());
+awaitsession.waitForBreakOnLine(0,session.scriptURL());
 }
 
 asyncfunctionrunTests(){

test/sequential/test-inspector-exception.js

@@ -7,6 +7,7 @@ common.skipIfInspectorDisabled();
 
 constassert=require('assert');
 const{ NodeInstance }=require('../common/inspector-helper.js');
+const{ pathToFileURL }=require('url');
 
 constscript=fixtures.path('throws_error.js');
 
@@ -29,7 +30,7 @@ async function testBreakpointOnStart(session){
 ];
 
 awaitsession.send(commands);
-awaitsession.waitForBreakOnLine(0,script);
+awaitsession.waitForBreakOnLine(0,pathToFileURL(script).toString());
 }
 
 

test/sequential/test-inspector-resource-name-to-url.js

@@ -0,0 +1,40 @@
+'use strict';
+constcommon=require('../common');
+
+common.skipIfInspectorDisabled();
+
+(asyncfunctiontest(){
+const{ strictEqual }=require('assert');
+const{ Session }=require('inspector');
+const{ promisify }=require('util');
+constvm=require('vm');
+constsession=newSession();
+session.connect();
+session.post=promisify(session.post);
+awaitsession.post('Debugger.enable');
+awaitcheck('http://example.com','http://example.com');
+awaitcheck(undefined,'evalmachine.<anonymous>');
+awaitcheck('file:///foo.js','file:///foo.js');
+awaitcheck('file:///foo.js','file:///foo.js');
+awaitcheck('foo.js','foo.js');
+awaitcheck('[eval]','[eval]');
+awaitcheck('%.js','%.js');
+
+if(common.isWindows){
+awaitcheck('C:\\foo.js','file:///C:/foo.js');
+awaitcheck('C:\\a\\b\\c\\foo.js','file:///C:/a/b/c/foo.js');
+awaitcheck('a:\\%.js','file:///a:/%25.js');
+}else{
+awaitcheck('/foo.js','file:///foo.js');
+awaitcheck('/a/b/c/d/foo.js','file:///a/b/c/d/foo.js');
+awaitcheck('/%%%.js','file:///%25%25%25.js');
+}
+
+asyncfunctioncheck(filename,expected){
+constpromise=
+newPromise((resolve)=>session.once('inspectorNotification',resolve));
+newvm.Script('42',{ filename }).runInThisContext();
+const{params: { url }}=awaitpromise;
+strictEqual(url,expected);
+}
+})();

test/sequential/test-inspector.js

@@ -68,15 +68,15 @@ async function testBreakpointOnStart(session){
 ];
 
 awaitsession.send(commands);
-awaitsession.waitForBreakOnLine(0,session.scriptPath());
+awaitsession.waitForBreakOnLine(0,session.scriptURL());
 }
 
 asyncfunctiontestBreakpoint(session){
 console.log('[test]','Setting a breakpoint and verifying it is hit');
 constcommands=[
 {'method': 'Debugger.setBreakpointByUrl',
 'params': {'lineNumber': 5,
-'url': session.scriptPath(),
+'url': session.scriptURL(),
 'columnNumber': 0,
 'condition': ''
 }
@@ -91,7 +91,7 @@ async function testBreakpoint(session){
 `Script source is wrong: ${scriptSource}`);
 
 awaitsession.waitForConsoleOutput('log',['A message',5]);
-constpaused=awaitsession.waitForBreakOnLine(5,session.scriptPath());
+constpaused=awaitsession.waitForBreakOnLine(5,session.scriptURL());
 constscopeId=paused.params.callFrames[0].scopeChain[0].object.objectId;
 
 console.log('[test]','Verify we can read current application state');