Skip to content

Commit

Permalink
inspector: split HTTP/WS server from the inspector
Browse files Browse the repository at this point in the history
Both our team experiments and some embedder request indicate a potential
in implementing alternative transport for inspector - e.g. IPC pipes or
custom embedder APIs. This change moves all HTTP specific code into a
separate class and is a first attempt at defining a boundary between the
inspector agent and transport. This API will be refined as new
transports are implemented.
Note that even without considering alternative transports, this change
enables better testing of the HTTP server (Valgrind made it possible to
identify and fix some existing memory leaks).

PR-URL: #9630
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
  • Loading branch information
Eugene Ostroukhov committed Dec 6, 2016
1 parent 8ab8363 commit 42da740
Show file tree
Hide file tree
Showing 6 changed files with 1,212 additions and 301 deletions.
21 changes: 18 additions & 3 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@
'sources': [
'src/inspector_agent.cc',
'src/inspector_socket.cc',
'src/inspector_socket.h',
'src/inspector_socket_server.cc',
'src/inspector_agent.h',
'src/inspector_socket.h',
'src/inspector_socket_server.h',
],
'dependencies': [
'deps/v8_inspector/src/inspector/inspector.gyp:standalone_inspector',
Expand Down Expand Up @@ -868,7 +870,8 @@
'dependencies': [ 'deps/gtest/gtest.gyp:gtest' ],
'include_dirs': [
'src',
'deps/v8/include'
'deps/v8/include',
'<(SHARED_INTERMEDIATE_DIR)'
],
'defines': [
# gtest's ASSERT macros conflict with our own.
Expand All @@ -886,9 +889,21 @@

'conditions': [
['v8_inspector=="true"', {
'defines': [
'HAVE_INSPECTOR=1',
],
'dependencies': [
'deps/zlib/zlib.gyp:zlib',
'v8_inspector_compress_protocol_json#host'
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)'
],
'sources': [
'src/inspector_socket.cc',
'test/cctest/test_inspector_socket.cc'
'src/inspector_socket_server.cc',
'test/cctest/test_inspector_socket.cc',
'test/cctest/test_inspector_socket_server.cc'
],
'conditions': [
[ 'node_shared_openssl=="false"', {
Expand Down
Loading

0 comments on commit 42da740

Please sign in to comment.