From fbf5a31af46d564c7530d70e93b672cdd22c448f Mon Sep 17 00:00:00 2001 From: cola119 Date: Thu, 4 Jul 2024 11:02:09 +0900 Subject: [PATCH] inspector: drop support for response body inspection --- lib/internal/process/pre_execution.js | 24 +++----------- src/inspector/network_agent.cc | 30 +----------------- src/inspector/network_agent.h | 6 ---- src/inspector/node_network_agent.cc | 21 +------------ src/inspector/node_network_agent.h | 2 -- src/inspector/node_protocol.pdl | 31 ------------------- .../test-inspector-network-domain.mjs | 20 ------------ 7 files changed, 7 insertions(+), 127 deletions(-) diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js index a4bed85d48b12e..0ca297ae03695c 100644 --- a/lib/internal/process/pre_execution.js +++ b/lib/internal/process/pre_execution.js @@ -469,28 +469,14 @@ function setupNetworkInspection() { if (typeof request._inspectorRequestId !== 'string') { return; } + const timestamp = DateNow() / 1000; emitProtocolEvent('NodeNetwork.responseReceived', { requestId: request._inspectorRequestId, - timestamp: DateNow() / 1000, + timestamp, }); - let responseString = ''; - const onData = (chunk) => { - emitProtocolEvent('NodeNetwork.dataReceived', { - requestId: request._inspectorRequestId, - timestamp: DateNow() / 1000, - dataLength: chunk.length, - }); - responseString += chunk.toString(); - }; - response.on('data', onData); - response.on('end', () => { - emitProtocolEvent('NodeNetwork.loadingFinished', { - requestId: request._inspectorRequestId, - response: responseString, - timestamp: DateNow() / 1000, - encodedDataLength: responseString.length, - }); - response.removeListener('data', onData); + emitProtocolEvent('NodeNetwork.loadingFinished', { + requestId: request._inspectorRequestId, + timestamp, }); }); } diff --git a/src/inspector/network_agent.cc b/src/inspector/network_agent.cc index fe6cd1b0af9cf4..ed9369f8170548 100644 --- a/src/inspector/network_agent.cc +++ b/src/inspector/network_agent.cc @@ -12,7 +12,6 @@ std::unique_ptr Request(const String& url, NetworkAgent::NetworkAgent() { event_notifier_map_["requestWillBeSent"] = &NetworkAgent::requestWillBeSent; event_notifier_map_["responseReceived"] = &NetworkAgent::responseReceived; - event_notifier_map_["dataReceived"] = &NetworkAgent::dataReceived; event_notifier_map_["loadingFinished"] = &NetworkAgent::loadingFinished; } @@ -29,16 +28,6 @@ void NetworkAgent::Wire(UberDispatcher* dispatcher) { Network::Dispatcher::wire(dispatcher, this); } -DispatchResponse NetworkAgent::getResponseBody(const String& in_requestId, - String* out_body) { - auto it = request_id_to_response_.find(in_requestId); - if (it != request_id_to_response_.end()) { - *out_body = it->second; - request_id_to_response_.erase(it); - } - return DispatchResponse::OK(); -} - void NetworkAgent::requestWillBeSent( std::unique_ptr params) { String request_id; @@ -67,31 +56,14 @@ void NetworkAgent::responseReceived( frontend_->responseReceived(request_id, timestamp); } -void NetworkAgent::dataReceived( - std::unique_ptr params) { - String request_id; - params->getString("requestId", &request_id); - double timestamp; - params->getDouble("timestamp", ×tamp); - int data_length; - params->getInteger("dataLength", &data_length); - - frontend_->dataReceived(request_id, timestamp, data_length); -} - void NetworkAgent::loadingFinished( std::unique_ptr params) { String request_id; params->getString("requestId", &request_id); double timestamp; params->getDouble("timestamp", ×tamp); - int encoded_data_length; - params->getInteger("encodedDataLength", &encoded_data_length); - String response; - params->getString("response", &response); - request_id_to_response_[request_id] = response; - frontend_->loadingFinished(request_id, timestamp, encoded_data_length); + frontend_->loadingFinished(request_id, timestamp); } } // namespace protocol diff --git a/src/inspector/network_agent.h b/src/inspector/network_agent.h index 4c1f01d5baac1a..faf1ed5b3d184b 100644 --- a/src/inspector/network_agent.h +++ b/src/inspector/network_agent.h @@ -23,20 +23,14 @@ class NetworkAgent : public Network::Backend { void emitNotification(const String& event, std::unique_ptr params); - DispatchResponse getResponseBody(const String& in_requestId, - String* out_body) override; - void requestWillBeSent(std::unique_ptr params); void responseReceived(std::unique_ptr params); - void dataReceived(std::unique_ptr params); - void loadingFinished(std::unique_ptr params); private: std::shared_ptr frontend_; - std::unordered_map request_id_to_response_; using EventNotifier = void (NetworkAgent::*)(std::unique_ptr); std::unordered_map event_notifier_map_; diff --git a/src/inspector/node_network_agent.cc b/src/inspector/node_network_agent.cc index 9d55211db4cbfe..08ce46ae5976ef 100644 --- a/src/inspector/node_network_agent.cc +++ b/src/inspector/node_network_agent.cc @@ -9,7 +9,6 @@ NodeNetworkAgent::NodeNetworkAgent(Environment* env) : env_(env) { event_notifier_map_["requestWillBeSent"] = &NodeNetworkAgent::requestWillBeSent; event_notifier_map_["responseReceived"] = &NodeNetworkAgent::responseReceived; - event_notifier_map_["dataReceived"] = &NodeNetworkAgent::dataReceived; event_notifier_map_["loadingFinished"] = &NodeNetworkAgent::loadingFinished; } @@ -62,32 +61,14 @@ void NodeNetworkAgent::responseReceived( protocol::StringUtil::ToStringView(params->toJSONString())); } -void NodeNetworkAgent::dataReceived( - std::unique_ptr params) { - String request_id; - params->getString("requestId", &request_id); - double timestamp; - params->getDouble("timestamp", ×tamp); - int data_length; - params->getInteger("dataLength", &data_length); - - frontend_->dataReceived(request_id, timestamp, data_length); - - env_->inspector_agent()->EmitProtocolEvent( - protocol::StringUtil::ToStringView("Network.dataReceived"), - protocol::StringUtil::ToStringView(params->toJSONString())); -} - void NodeNetworkAgent::loadingFinished( std::unique_ptr params) { String request_id; params->getString("requestId", &request_id); double timestamp; params->getDouble("timestamp", ×tamp); - int encoded_data_length; - params->getInteger("encodedDataLength", &encoded_data_length); - frontend_->loadingFinished(request_id, timestamp, encoded_data_length); + frontend_->loadingFinished(request_id, timestamp); env_->inspector_agent()->EmitProtocolEvent( protocol::StringUtil::ToStringView("Network.loadingFinished"), diff --git a/src/inspector/node_network_agent.h b/src/inspector/node_network_agent.h index 98d25311f03489..68e24b90613f22 100644 --- a/src/inspector/node_network_agent.h +++ b/src/inspector/node_network_agent.h @@ -26,8 +26,6 @@ class NodeNetworkAgent : public NodeNetwork::Backend { void responseReceived(std::unique_ptr params); - void dataReceived(std::unique_ptr params); - void loadingFinished(std::unique_ptr params); private: diff --git a/src/inspector/node_protocol.pdl b/src/inspector/node_protocol.pdl index 8c7a162f4831bd..c1c1469ec03c56 100644 --- a/src/inspector/node_protocol.pdl +++ b/src/inspector/node_protocol.pdl @@ -121,23 +121,12 @@ experimental domain NodeNetwork # Timestamp. Network.MonotonicTime timestamp - event dataReceived - parameters - # Request identifier. - Network.RequestId requestId - # Timestamp. - Network.MonotonicTime timestamp - # Data chunk length. - integer dataLength - event loadingFinished parameters # Request identifier. Network.RequestId requestId # Timestamp. Network.MonotonicTime timestamp - # Total number of bytes received for this request. - number encodedDataLength # Partial support for Network domain of ChromeDevTools Protocol. # https://chromedevtools.github.io/devtools-protocol/tot/Network @@ -157,15 +146,6 @@ experimental domain Network string url string method - # Returns content served for the given request. - command getResponseBody - parameters - # Identifier of the network request to get content for. - RequestId requestId - returns - # Response body. - string body - # Fired when page is about to send HTTP request. event requestWillBeSent parameters @@ -186,23 +166,12 @@ experimental domain Network # Timestamp. MonotonicTime timestamp - event dataReceived - parameters - # Request identifier. - RequestId requestId - # Timestamp. - MonotonicTime timestamp - # Data chunk length. - integer dataLength - event loadingFinished parameters # Request identifier. RequestId requestId # Timestamp. MonotonicTime timestamp - # Total number of bytes received for this request. - number encodedDataLength # Support for inspecting node process state. experimental domain NodeRuntime diff --git a/test/parallel/test-inspector-network-domain.mjs b/test/parallel/test-inspector-network-domain.mjs index a843e2715260ee..af520a1612f72b 100644 --- a/test/parallel/test-inspector-network-domain.mjs +++ b/test/parallel/test-inspector-network-domain.mjs @@ -62,11 +62,6 @@ const testHttpGet = () => new Promise((resolve, reject) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number'); })); - session.on('NodeNetwork.dataReceived', common.mustCall(({ params }) => { - assert.ok(params.requestId.startsWith('node-network-event-')); - assert.strictEqual(typeof params.timestamp, 'number'); - assert.strictEqual(typeof params.dataLength, 'number'); - })); session.on('NodeNetwork.loadingFinished', common.mustCall(({ params }) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number'); @@ -87,11 +82,6 @@ const testHttpGet = () => new Promise((resolve, reject) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number'); })); - session.on('Network.dataReceived', common.mustCall(({ params }) => { - assert.ok(params.requestId.startsWith('node-network-event-')); - assert.strictEqual(typeof params.timestamp, 'number'); - assert.strictEqual(typeof params.dataLength, 'number'); - })); session.on('Network.loadingFinished', common.mustCall(({ params }) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number'); @@ -123,11 +113,6 @@ const testHttpsGet = () => new Promise((resolve, reject) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number'); })); - session.on('NodeNetwork.dataReceived', common.mustCall(({ params }) => { - assert.ok(params.requestId.startsWith('node-network-event-')); - assert.strictEqual(typeof params.timestamp, 'number'); - assert.strictEqual(typeof params.dataLength, 'number'); - })); session.on('NodeNetwork.loadingFinished', common.mustCall(({ params }) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number'); @@ -148,11 +133,6 @@ const testHttpsGet = () => new Promise((resolve, reject) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number'); })); - session.on('Network.dataReceived', common.mustCall(({ params }) => { - assert.ok(params.requestId.startsWith('node-network-event-')); - assert.strictEqual(typeof params.timestamp, 'number'); - assert.strictEqual(typeof params.dataLength, 'number'); - })); session.on('Network.loadingFinished', common.mustCall(({ params }) => { assert.ok(params.requestId.startsWith('node-network-event-')); assert.strictEqual(typeof params.timestamp, 'number');