Skip to content

Commit

Permalink
fix: pass the correct HostPort into the node inspector (#17439)
Browse files Browse the repository at this point in the history
Fixes #17348
  • Loading branch information
trop[bot] authored and codebytere committed Mar 18, 2019
1 parent 766cfc1 commit 5b34f9b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
3 changes: 2 additions & 1 deletion atom/browser/node_debugger.cc
Expand Up @@ -60,7 +60,8 @@ void NodeDebugger::Start() {
}

const char* path = "";
if (inspector->Start(path, options, env_->inspector_host_port(),
if (inspector->Start(path, options,
std::make_shared<node::HostPort>(options.host_port),
true /* is_main */))
DCHECK(env_->inspector_agent()->IsListening());
}
Expand Down
28 changes: 28 additions & 0 deletions spec/node-spec.js
Expand Up @@ -257,6 +257,34 @@ describe('node feature', () => {
child.stdout.on('data', outDataHandler)
})

it('supports starting the v8 inspector with --inspect and a provided port', (done) => {
child = ChildProcess.spawn(process.execPath, ['--inspect=17364', path.join(__dirname, 'fixtures', 'module', 'run-as-node.js')], {
env: {
ELECTRON_RUN_AS_NODE: true
}
})

let output = ''
function cleanup () {
child.stderr.removeListener('data', errorDataListener)
child.stdout.removeListener('data', outDataHandler)
}
function errorDataListener (data) {
output += data
if (output.trim().startsWith('Debugger listening on ws://')) {
expect(output.trim()).to.contain(':17364', 'should be listening on port 17364')
cleanup()
done()
}
}
function outDataHandler (data) {
cleanup()
done(new Error(`Unexpected output: ${data.toString()}`))
}
child.stderr.on('data', errorDataListener)
child.stdout.on('data', outDataHandler)
})

it('does not start the v8 inspector when --inspect is after a -- argument', (done) => {
child = ChildProcess.spawn(remote.process.execPath, [path.join(__dirname, 'fixtures', 'module', 'noop.js'), '--', '--inspect'])

Expand Down

0 comments on commit 5b34f9b

Please sign in to comment.