tools: roll inspector_protocol to f67ec5

Fixes: #25808
PR-URL: #26303
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>

Author: pavelfeldman

src/inspector/node_inspector.gypi

@@ -34,7 +34,7 @@
 '<(protocol_tool_path)/templates/Imported_h.template',
 '<(protocol_tool_path)/templates/TypeBuilder_cpp.template',
 '<(protocol_tool_path)/templates/TypeBuilder_h.template',
-'<(protocol_tool_path)/CodeGenerator.py',
+'<(protocol_tool_path)/code_generator.py',
  ]
  },
 'defines': [
@@ -87,7 +87,7 @@
  ],
 'action': [
 'python',
-'tools/inspector_protocol/ConvertProtocolToJSON.py',
+'tools/inspector_protocol/convert_protocol_to_json.py',
 '<@(_inputs)',
 '<@(_outputs)',
  ],
@@ -105,7 +105,7 @@
 'process_outputs_as_sources': 1,
 'action': [
 'python',
-'tools/inspector_protocol/CodeGenerator.py',
+'tools/inspector_protocol/code_generator.py',
 '--jinja_dir', '<@(protocol_tool_path)/..',
 '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
 '--config', '<(SHARED_INTERMEDIATE_DIR)/node_protocol_config.json',
@@ -123,7 +123,7 @@
  ],
 'action': [
 'python',
-'tools/inspector_protocol/ConcatenateProtocols.py',
+'tools/inspector_protocol/concatenate_protocols.py',
 '<@(_inputs)',
 '<@(_outputs)',
  ],

src/inspector/node_string.cc

@@ -85,6 +85,28 @@ double toDouble(const char* buffer, size_t length, bool* ok) {
 return d;
 }
 
+std::unique_ptr<Value> parseMessage(const std::string& message, bool binary) {
+if (binary) {
+returnValue::parseBinary(
+reinterpret_cast<constuint8_t*>(message.data()),
+ message.length());
+ }
+returnparseJSON(message);
+}
+
+ProtocolMessage jsonToMessage(String message) {
+return message;
+}
+
+ProtocolMessage binaryToMessage(std::vector<uint8_t> message) {
+returnstd::string(reinterpret_cast<constchar*>(message.data()),
+ message.size());
+}
+
+String fromUTF8(constuint8_t* data, size_t length) {
+returnstd::string(reinterpret_cast<constchar*>(data), length);
+}
+
 } // namespace StringUtil
 } // namespace protocol
 } // namespace inspector

src/inspector/node_string.h

@@ -18,6 +18,17 @@ class Value;
 
 using String = std::string;
 using StringBuilder = std::ostringstream;
+using ProtocolMessage = std::string;
+
+classStringUTF8Adapter {
+public:
+explicitStringUTF8Adapter(const std::string& string) : string_(string) { }
+constchar* Data() const { return string_.data(); }
+size_tlength() const { return string_.length(); }
+
+private:
+const std::string& string_;
+};
 
 namespaceStringUtil {
 // NOLINTNEXTLINE(runtime/references) This is V8 API...
@@ -67,8 +78,29 @@ void builderAppendQuotedString(StringBuilder& builder, const String&);
 std::unique_ptr<Value> parseJSON(const String&);
 std::unique_ptr<Value> parseJSON(v8_inspector::StringView view);
 
+std::unique_ptr<Value> parseMessage(const std::string& message, bool binary);
+ProtocolMessage jsonToMessage(String message);
+ProtocolMessage binaryToMessage(std::vector<uint8_t> message);
+String fromUTF8(constuint8_t* data, size_t length);
+
 externsize_tkNotFound;
 } // namespace StringUtil
+
+// A read-only sequence of uninterpreted bytes with reference-counted storage.
+// Though the templates for generating the protocol bindings reference
+// this type, js_protocol.pdl doesn't have a field of type 'binary', so
+// therefore it's unnecessary to provide an implementation here.
+classBinary {
+public:
+constuint8_t* data() const { UNREACHABLE(); }
+size_tsize() const { UNREACHABLE(); }
+ String toBase64() const { UNREACHABLE(); }
+static Binary fromBase64(const String& base64, bool* success) {
+UNREACHABLE();
+ }
+static Binary fromSpan(constuint8_t* data, size_t size) { UNREACHABLE(); }
+};
+
 } // namespace protocol
 } // namespace inspector
 } // namespace node

src/inspector_agent.cc

@@ -236,15 +236,19 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
  }
 
  std::string dispatchProtocolMessage(const StringView& message) {
- std::unique_ptr<protocol::DictionaryValue> parsed;
+ std::string raw_message = protocol::StringUtil::StringViewToUtf8(message);
+ std::unique_ptr<protocol::DictionaryValue> value =
+protocol::DictionaryValue::cast(protocol::StringUtil::parseMessage(
+ raw_message, false));
+int call_id;
  std::string method;
- node_dispatcher_->getCommandName(
-protocol::StringUtil::StringViewToUtf8(message), &method, &parsed);
+ node_dispatcher_->parseCommand(value.get(), &call_id, &method);
 if (v8_inspector::V8InspectorSession::canDispatchMethod(
 Utf8ToStringView(method)->string())) {
  session_->dispatchProtocolMessage(message);
  } else {
- node_dispatcher_->dispatch(std::move(parsed));
+ node_dispatcher_->dispatch(call_id, method, std::move(value),
+ raw_message);
  }
 return method;
  }
@@ -284,11 +288,17 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel,
 
 voidsendProtocolResponse(int callId,
  std::unique_ptr<Serializable> message) override {
-sendMessageToFrontend(message->serialize());
+sendMessageToFrontend(message->serializeToJSON());
  }
 voidsendProtocolNotification(
  std::unique_ptr<Serializable> message) override {
-sendMessageToFrontend(message->serialize());
+sendMessageToFrontend(message->serializeToJSON());
+ }
+
+voidfallThrough(int callId,
+const std::string& method,
+const std::string& message) override {
+DCHECK(false);
  }
 
  std::unique_ptr<protocol::TracingAgent> tracing_agent_;

tools/inspector_protocol/README.v8 tools/inspector_protocol/README.nodetools/inspector_protocol/README.v8 renamed to tools/inspector_protocol/README.node

@@ -2,7 +2,7 @@ Name: inspector protocol
 Short Name: inspector_protocol
 URL: https://chromium.googlesource.com/deps/inspector_protocol/
 Version: 0
-Revision: 752d4abd13119010cf30e454e8ef9b5fb7ef43a3
+Revision: f67ec5180f476830e839226b5ca948e43070fdab
 License: BSD
 License File: LICENSE
 Security Critical: no

…r_protocol/CheckProtocolCompatibility.py …protocol/check_protocol_compatibility.pytools/inspector_protocol/CheckProtocolCompatibility.py renamed to tools/inspector_protocol/check_protocol_compatibility.py tools/inspector_protocol/CheckProtocolCompatibility.py renamed to tools/inspector_protocol/check_protocol_compatibility.py

@@ -45,11 +45,14 @@
 #
 # Adding --show_changes to the command line prints out a list of valid public API changes.
 
+from __future__ importprint_function
 importcopy
 importos.path
 importoptparse
 importsys
 
+importpdl
+
 try:
 importjson
 exceptImportError:
@@ -166,6 +169,11 @@ def compare_types(context, kind, type_1, type_2, types_map_1, types_map_2, depth
 base_type_1=type_1["type"]
 base_type_2=type_2["type"]
 
+# Binary and string have the same wire representation in JSON.
+if ((base_type_1=="string"andbase_type_2=="binary") or
+ (base_type_2=="string"andbase_type_1=="binary")):
+return
+
 ifbase_type_1!=base_type_2:
 errors.append("%s: %s base type mismatch, '%s' vs '%s'"% (context, kind, base_type_1, base_type_2))
 elifbase_type_1=="object":
@@ -228,8 +236,8 @@ def load_schema(file_name, domains):
 ifnotos.path.isfile(file_name):
 return
 input_file=open(file_name, "r")
-json_string=input_file.read()
-parsed_json=json.loads(json_string)
+parsed_json=pdl.loads(input_file.read(), file_name)
+input_file.close()
 domains+=parsed_json["domains"]
 returnparsed_json["version"]
 
@@ -422,6 +430,7 @@ def load_domains_and_baselines(file_name, domains, baseline_domains):
 version=load_schema(os.path.normpath(file_name), domains)
 suffix="-%s.%s.json"% (version["major"], version["minor"])
 baseline_file=file_name.replace(".json", suffix)
+baseline_file=file_name.replace(".pdl", suffix)
 load_schema(os.path.normpath(baseline_file), baseline_domains)
 returnversion
 
@@ -467,9 +476,9 @@ def main():
 ifarg_options.show_changes:
 changes=compare_schemas(domains, baseline_domains, True)
 iflen(changes) >0:
-print" Public changes since %s:"%version
+print(" Public changes since %s:"%version)
 forchangeinchanges:
-print" %s"%change
+print(" %s"%change)
 
 ifarg_options.stamp:
 withopen(arg_options.stamp, 'a') as_: