1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inspector: simplify dispatchProtocolMessage

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/49780
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
This commit is contained in:
Daniel Lemire 2023-09-29 21:58:09 -04:00 committed by GitHub
parent 813713f211
commit 2990390359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/inspector/node_string.cc
View File

@ -97,16 +97,6 @@ double toDouble(const char* buffer, size_t length, bool* ok) {
return d;
}
std::unique_ptr<Value> parseMessage(const std::string_view message,
bool binary) {
if (binary) {
return Value::parseBinary(
reinterpret_cast<const uint8_t*>(message.data()),
message.length());
}
return parseJSON(message);
}
ProtocolMessage jsonToMessage(String message) {
return message;
}

2
src/inspector/node_string.h
View File

@ -68,8 +68,6 @@ void builderAppendQuotedString(StringBuilder& builder, const std::string_view);
std::unique_ptr<Value> parseJSON(const std::string_view);
std::unique_ptr<Value> parseJSON(v8_inspector::StringView view);
std::unique_ptr<Value> parseMessage(const std::string_view message,
bool binary);
ProtocolMessage jsonToMessage(String message);
ProtocolMessage binaryToMessage(std::vector<uint8_t> message);
String fromUTF8(const uint8_t* data, size_t length);

4
src/inspector_agent.cc
View File

@ -253,8 +253,8 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
"[inspector received] %s\n",
raw_message);
std::unique_ptr<protocol::DictionaryValue> value =
protocol::DictionaryValue::cast(protocol::StringUtil::parseMessage(
raw_message, false));
protocol::DictionaryValue::cast(
protocol::StringUtil::parseJSON(message));
int call_id;
std::string method;
node_dispatcher_->parseCommand(value.get(), &call_id, &method);

12
tools/inspector_protocol/lib/base_string_adapter_cc.template
View File

@ -128,18 +128,6 @@ std::unique_ptr<base::Value> toBaseValue(Value* value, int depth) {
return nullptr;
}
// static
std::unique_ptr<Value> StringUtil::parseMessage(
const std::string& message, bool binary) {
if (binary) {
return Value::parseBinary(
reinterpret_cast<const uint8_t*>(message.data()),
message.length());
}
std::unique_ptr<base::Value> value = base::JSONReader::ReadDeprecated(message);
return toProtocolValue(value.get(), 1000);
}
// static
ProtocolMessage StringUtil::jsonToMessage(String message) {
return message;

1
tools/inspector_protocol/lib/base_string_adapter_h.template
View File

@ -92,7 +92,6 @@ class {{config.lib.export_macro}} StringUtil {
return builder.toString();
}
static std::unique_ptr<Value> parseMessage(const std::string& message, bool binary);
static ProtocolMessage jsonToMessage(String message);
static ProtocolMessage binaryToMessage(std::vector<uint8_t> message);