Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e485522

Browse files
legendecashvanness
authored andcommittedJan 30, 2025
inspector: roll inspector_protocol
Roll the inspector_protocol library to match V8's inspector_protocol revision. Update the node inspector to use the new `crdtp` protocol library. PR-URL: nodejs#56649 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent b044dc8 commit e485522

File tree

86 files changed

+10879
-6231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+10879
-6231
lines changed
 

‎src/inspector/network_agent.cc

+8-4
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ void NetworkAgent::Wire(UberDispatcher* dispatcher) {
5353

5454
DispatchResponse NetworkAgent::enable() {
5555
inspector_->Enable();
56-
return DispatchResponse::OK();
56+
return DispatchResponse::Success();
5757
}
5858

5959
DispatchResponse NetworkAgent::disable() {
6060
inspector_->Disable();
61-
return DispatchResponse::OK();
61+
return DispatchResponse::Success();
6262
}
6363

6464
void NetworkAgent::requestWillBeSent(
@@ -76,9 +76,11 @@ void NetworkAgent::requestWillBeSent(
7676
request->getString("method", &method);
7777

7878
ErrorSupport errors;
79+
errors.Push();
80+
errors.SetName("headers");
7981
auto headers =
8082
Network::Headers::fromValue(request->getObject("headers"), &errors);
81-
if (errors.hasErrors()) {
83+
if (!errors.Errors().empty()) {
8284
headers = std::make_unique<Network::Headers>(DictionaryValue::create());
8385
}
8486

@@ -105,9 +107,11 @@ void NetworkAgent::responseReceived(
105107
response->getString("statusText", &statusText);
106108

107109
ErrorSupport errors;
110+
errors.Push();
111+
errors.SetName("headers");
108112
auto headers =
109113
Network::Headers::fromValue(response->getObject("headers"), &errors);
110-
if (errors.hasErrors()) {
114+
if (!errors.Errors().empty()) {
111115
headers = std::make_unique<Network::Headers>(DictionaryValue::create());
112116
}
113117

‎src/inspector/node_inspector.gypi

+29-13
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
'src/inspector_socket_server.h',
1616
'src/inspector/main_thread_interface.cc',
1717
'src/inspector/main_thread_interface.h',
18+
'src/inspector/node_json.cc',
19+
'src/inspector/node_json.h',
1820
'src/inspector/node_string.cc',
1921
'src/inspector/node_string.h',
2022
'src/inspector/runtime_agent.cc',
@@ -29,6 +31,30 @@
2931
'src/inspector/network_agent.h',
3032
'src/inspector/worker_inspector.cc',
3133
'src/inspector/worker_inspector.h',
34+
35+
'<(protocol_tool_path)/crdtp/cbor.cc',
36+
'<(protocol_tool_path)/crdtp/cbor.h',
37+
'<(protocol_tool_path)/crdtp/dispatch.cc',
38+
'<(protocol_tool_path)/crdtp/dispatch.h',
39+
'<(protocol_tool_path)/crdtp/error_support.cc',
40+
'<(protocol_tool_path)/crdtp/error_support.h',
41+
'<(protocol_tool_path)/crdtp/export.h',
42+
'<(protocol_tool_path)/crdtp/find_by_first.h',
43+
'<(protocol_tool_path)/crdtp/frontend_channel.h',
44+
'<(protocol_tool_path)/crdtp/json.cc',
45+
'<(protocol_tool_path)/crdtp/json.h',
46+
'<(protocol_tool_path)/crdtp/json_platform.cc',
47+
'<(protocol_tool_path)/crdtp/json_platform.h',
48+
'<(protocol_tool_path)/crdtp/maybe.h',
49+
'<(protocol_tool_path)/crdtp/parser_handler.h',
50+
'<(protocol_tool_path)/crdtp/protocol_core.cc',
51+
'<(protocol_tool_path)/crdtp/protocol_core.h',
52+
'<(protocol_tool_path)/crdtp/serializable.cc',
53+
'<(protocol_tool_path)/crdtp/serializable.h',
54+
'<(protocol_tool_path)/crdtp/span.cc',
55+
'<(protocol_tool_path)/crdtp/span.h',
56+
'<(protocol_tool_path)/crdtp/status.cc',
57+
'<(protocol_tool_path)/crdtp/status.h',
3258
],
3359
'node_inspector_generated_sources': [
3460
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Forward.h',
@@ -44,23 +70,11 @@
4470
'<(SHARED_INTERMEDIATE_DIR)/src/node/inspector/protocol/Network.h',
4571
],
4672
'node_protocol_files': [
47-
'<(protocol_tool_path)/lib/Allocator_h.template',
48-
'<(protocol_tool_path)/lib/base_string_adapter_cc.template',
49-
'<(protocol_tool_path)/lib/base_string_adapter_h.template',
50-
'<(protocol_tool_path)/lib/DispatcherBase_cpp.template',
51-
'<(protocol_tool_path)/lib/DispatcherBase_h.template',
52-
'<(protocol_tool_path)/lib/encoding_cpp.template',
53-
'<(protocol_tool_path)/lib/encoding_h.template',
54-
'<(protocol_tool_path)/lib/ErrorSupport_cpp.template',
55-
'<(protocol_tool_path)/lib/ErrorSupport_h.template',
5673
'<(protocol_tool_path)/lib/Forward_h.template',
57-
'<(protocol_tool_path)/lib/FrontendChannel_h.template',
58-
'<(protocol_tool_path)/lib/Maybe_h.template',
5974
'<(protocol_tool_path)/lib/Object_cpp.template',
6075
'<(protocol_tool_path)/lib/Object_h.template',
61-
'<(protocol_tool_path)/lib/Parser_cpp.template',
62-
'<(protocol_tool_path)/lib/Parser_h.template',
6376
'<(protocol_tool_path)/lib/Protocol_cpp.template',
77+
'<(protocol_tool_path)/lib/ValueConversions_cpp.template',
6478
'<(protocol_tool_path)/lib/ValueConversions_h.template',
6579
'<(protocol_tool_path)/lib/Values_cpp.template',
6680
'<(protocol_tool_path)/lib/Values_h.template',
@@ -77,6 +91,7 @@
7791
'<@(node_inspector_sources)',
7892
],
7993
'include_dirs': [
94+
'<(protocol_tool_path)',
8095
'<(SHARED_INTERMEDIATE_DIR)/include', # for inspector
8196
'<(SHARED_INTERMEDIATE_DIR)',
8297
'<(SHARED_INTERMEDIATE_DIR)/src', # for inspector
@@ -112,6 +127,7 @@
112127
'action': [
113128
'<(python)',
114129
'tools/inspector_protocol/code_generator.py',
130+
'--inspector_protocol_dir', 'tools/inspector_protocol/',
115131
'--jinja_dir', '<@(protocol_tool_path)',
116132
'--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
117133
'--config', 'src/inspector/node_protocol_config.json',

0 commit comments

Comments
 (0)
Please sign in to comment.