build: simplify build of inspector protocol

LICENSE

@@ -1061,109 +1061,6 @@ The externally maintained libraries used by Node.js are:
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   """
 
-- inspector_protocol, located at tools/inspector_protocol, is licensed as follows:
-  """
-    // Copyright 2016 The Chromium Authors. All rights reserved.
-    //
-    // Redistribution and use in source and binary forms, with or without
-    // modification, are permitted provided that the following conditions are
-    // met:
-    //
-    //    * Redistributions of source code must retain the above copyright
-    // notice, this list of conditions and the following disclaimer.
-    //    * Redistributions in binary form must reproduce the above
-    // copyright notice, this list of conditions and the following disclaimer
-    // in the documentation and/or other materials provided with the
-    // distribution.
-    //    * Neither the name of Google Inc. nor the names of its
-    // contributors may be used to endorse or promote products derived from
-    // this software without specific prior written permission.
-    //
-    // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  """
-
-- jinja2, located at tools/jinja2, is licensed as follows:
-  """
-    Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.
-
-    Some rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-
-        * The names of the contributors may not be used to endorse or
-          promote products derived from this software without specific
-          prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  """
-
-- markupsafe, located at tools/markupsafe, is licensed as follows:
-  """
-    Copyright (c) 2010 by Armin Ronacher and contributors.  See AUTHORS
-    for more details.
-
-    Some rights reserved.
-
-    Redistribution and use in source and binary forms of the software as well
-    as documentation, with or without modification, are permitted provided
-    that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-    THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-    CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
-    NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-    OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-    DAMAGE.
-  """
-
 - cpplint.py, located at tools/cpplint.py, is licensed as follows:
   """
     Copyright (c) 2009 Google Inc. All rights reserved.

src/inspector/inspector_protocol.gyp

@@ -0,0 +1,67 @@
+{
+  'variables': {
+    'protocol_tool_path': '../../deps/v8/third_party/inspector_protocol',
+  },
+  'targets': [
+    {
+      'target_name': 'generate_concatenated_inspector_protocol',
+      'type': 'none',
+      'inputs': [
+        '../../deps/v8/src/inspector/js_protocol.pdl',
+        'node_protocol.json',
+      ],
+      'outputs': [
+        '<(SHARED_INTERMEDIATE_DIR)/v8_inspector_protocol_json.h',
+      ],
+      'actions': [
+        {
+          'action_name': 'v8_inspector_convert_protocol_to_json',
+          'inputs': [
+            '../../deps/v8/src/inspector/js_protocol.pdl',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/js_protocol.json',
+          ],
+          'action': [
+            'python',
+            '<(protocol_tool_path)/ConvertProtocolToJSON.py',
+            '<@(_inputs)',
+            '<@(_outputs)',
+          ],
+        },
+        {
+          'action_name': 'concatenate_protocols',
+          'inputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/js_protocol.json',
+            'node_protocol.json',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
+          ],
+          'action': [
+            'python',
+            '<(protocol_tool_path)/ConcatenateProtocols.py',
+            '<@(_inputs)',
+            '<@(_outputs)',
+          ],
+        },
+        {
+          'action_name': 'v8_inspector_compress_protocol_json',
+          'process_outputs_as_sources': 1,
+          'inputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/concatenated_protocol.json',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/v8_inspector_protocol_json.h',
+          ],
+          'action': [
+            'python',
+            '../../tools/compress_json.py',
+            '<@(_inputs)',
+            '<@(_outputs)',
+          ],
+        },
+      ],
+    },
+  ]
+}

src/inspector/node_inspector.gypi

@@ -60,6 +60,14 @@
     '../../src/inspector/worker_agent.h',
     '../../src/inspector/worker_inspector.cc',
     '../../src/inspector/worker_inspector.h',
+    '../../src/inspector/node_protocol/Forward.h',
+    '../../src/inspector/node_protocol/Protocol.cpp',
+    '../../src/inspector/node_protocol/Protocol.h',
+    '../../src/inspector/node_protocol/NodeWorker.cpp',
+    '../../src/inspector/node_protocol/NodeWorker.h',
+    '../../src/inspector/node_protocol/NodeTracing.cpp',
+    '../../src/inspector/node_protocol/NodeTracing.h',
+
   ],
   'include_dirs': [
     '<(SHARED_INTERMEDIATE_DIR)/include', # for inspector
@@ -102,7 +110,6 @@
       'outputs': [
         '<@(node_inspector_generated_sources)',
       ],
-      'process_outputs_as_sources': 1,
       'action': [
         'python',
         'tools/inspector_protocol/CodeGenerator.py',
@@ -137,7 +144,6 @@
       'outputs': [
         '<(SHARED_INTERMEDIATE_DIR)/v8_inspector_protocol_json.h',
       ],
-      'process_outputs_as_sources': 1,
       'action': [
         'python',
         'tools/compress_json.py',

src/inspector/node_protocol.json

@@ -0,0 +1,88 @@
+{
+    "version": {
+        "major": "1",
+        "minor": "0"
+    },
+    "domains": [
+        {
+            "domain": "NodeTracing",
+            "experimental": true,
+            "types": [
+                {
+                    "id": "TraceConfig",
+                    "type": "object",
+                    "properties": [
+                        {
+                            "name": "recordMode",
+                            "description": "Controls how the trace buffer stores data.",
+                            "optional": true,
+                            "type": "string",
+                            "enum": [
+                                "recordUntilFull",
+                                "recordContinuously",
+                                "recordAsMuchAsPossible"
+                            ]
+                        },
+                        {
+                            "name": "includedCategories",
+                            "description": "Included category filters.",
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    ]
+                }
+            ],
+            "commands": [
+                {
+                    "name": "getCategories",
+                    "description": "Gets supported tracing categories.",
+                    "returns": [
+                        {
+                            "name": "categories",
+                            "description": "A list of supported tracing categories.",
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "name": "start",
+                    "description": "Start trace events collection.",
+                    "parameters": [
+                        {
+                            "name": "traceConfig",
+                            "$ref": "TraceConfig"
+                        }
+                    ]
+                },
+                {
+                    "name": "stop",
+                    "description": "Stop trace events collection. Remaining collected events will be sent as a sequence of\ndataCollected events followed by tracingComplete event."
+                }
+            ],
+            "events": [
+                {
+                    "name": "dataCollected",
+                    "description": "Contains an bucket of collected trace events.",
+                    "parameters": [
+                        {
+                            "name": "value",
+                            "type": "array",
+                            "items": {
+                                "type": "object"
+                            }
+                        }
+                    ]
+                },
+                {
+                    "name": "tracingComplete",
+                    "description": "Signals that tracing is stopped and there is no trace buffers pending flush, all data were\ndelivered via dataCollected events."
+                }
+            ]
+        }
+    ]
+}

src/inspector/node_protocol/Forward.h

@@ -0,0 +1,98 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef node_inspector_protocol_Forward_h
+#define node_inspector_protocol_Forward_h
+
+#include "inspector/node_string.h"
+
+#include <vector>
+
+namespace node {
+namespace inspector {
+namespace protocol {
+
+template<typename T> class Array;
+class DictionaryValue;
+class DispatchResponse;
+class ErrorSupport;
+class FundamentalValue;
+class ListValue;
+template<typename T> class Maybe;
+class Object;
+using Response = DispatchResponse;
+class SerializedValue;
+class StringValue;
+class UberDispatcher;
+class Value;
+
+} // namespace node
+} // namespace inspector
+} // namespace protocol
+
+#endif // !defined(node_inspector_protocol_Forward_h)
+
+
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef node_inspector_protocol_Allocator_h
+#define node_inspector_protocol_Allocator_h
+
+namespace node {
+namespace inspector {
+namespace protocol {
+
+enum NotNullTagEnum { NotNullLiteral };
+
+#define PROTOCOL_DISALLOW_NEW()                                 \
+    private:                                                    \
+        void* operator new(size_t) = delete;                    \
+        void* operator new(size_t, NotNullTagEnum, void*) = delete; \
+        void* operator new(size_t, void*) = delete;             \
+    public:
+
+#define PROTOCOL_DISALLOW_COPY(ClassName) \
+    private: \
+        ClassName(const ClassName&) = delete; \
+        ClassName& operator=(const ClassName&) = delete
+
+} // namespace node
+} // namespace inspector
+} // namespace protocol
+
+#endif // !defined(node_inspector_protocol_Allocator_h)
+
+
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef node_inspector_protocol_FrontendChannel_h
+#define node_inspector_protocol_FrontendChannel_h
+
+namespace node {
+namespace inspector {
+namespace protocol {
+
+class  Serializable {
+public:
+    virtual String serialize() = 0;
+    virtual ~Serializable() = default;
+};
+
+class  FrontendChannel {
+public:
+    virtual ~FrontendChannel() { }
+    virtual void sendProtocolResponse(int callId, std::unique_ptr<Serializable> message) = 0;
+    virtual void sendProtocolNotification(std::unique_ptr<Serializable> message) = 0;
+    virtual void flushProtocolNotifications() = 0;
+};
+
+} // namespace node
+} // namespace inspector
+} // namespace protocol
+
+#endif // !defined(node_inspector_protocol_FrontendChannel_h)