Skip to content

Commit b9e291f

Browse files
committed
inspector: open add SymbolDispose
1 parent d8eb8cf commit b9e291f

File tree

3 files changed

+88
-0
lines changed

3 files changed

+88
-0
lines changed

doc/api/inspector.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,20 @@ console.
419419

420420
### `inspector.open([port[, host[, wait]]])`
421421

422+
<!-- YAML
423+
changes:
424+
- version: REPLACEME
425+
pr-url: https://github.com/nodejs/node/pull/48765
426+
description: inspector.open() now returns a `Disposable` object.
427+
-->
428+
422429
* `port` {number} Port to listen on for inspector connections. Optional.
423430
**Default:** what was specified on the CLI.
424431
* `host` {string} Host to listen on for inspector connections. Optional.
425432
**Default:** what was specified on the CLI.
426433
* `wait` {boolean} Block until a client has connected. Optional.
427434
**Default:** `false`.
435+
* Returns: {Disposable} that calls [`inspector.close()`][].
428436

429437
Activate inspector on host and port. Equivalent to
430438
`node --inspect=[[host:]port]`, but can be done programmatically after node has
@@ -472,5 +480,6 @@ An exception will be thrown if there is no active inspector.
472480
[Chrome DevTools Protocol Viewer]: https://chromedevtools.github.io/devtools-protocol/v8/
473481
[Heap Profiler]: https://chromedevtools.github.io/devtools-protocol/v8/HeapProfiler
474482
[`'Debugger.paused'`]: https://chromedevtools.github.io/devtools-protocol/v8/Debugger#event-paused
483+
[`inspector.close()`]: #inspectorclose
475484
[`session.connect()`]: #sessionconnect
476485
[security warning]: cli.md#warning-binding-inspector-to-a-public-ipport-combination-is-insecure

lib/inspector.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const {
55
JSONStringify,
66
SafeMap,
77
Symbol,
8+
SymbolDispose,
89
} = primordials;
910

1011
const {
@@ -181,6 +182,8 @@ function inspectorOpen(port, host, wait) {
181182
open(port, host);
182183
if (wait)
183184
waitForDebugger();
185+
186+
return { __proto__: null, [SymbolDispose]() { _debugEnd(); } };
184187
}
185188

186189
/**
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
import * as common from '../common/index.mjs';
2+
import * as inspector from 'node:inspector';
3+
import assert from 'node:assert';
4+
import net from 'node:net';
5+
import url from 'node:url';
6+
import { fork } from 'node:child_process';
7+
8+
common.skipIfInspectorDisabled();
9+
if (process.env.BE_CHILD) {
10+
beChild();
11+
} else {
12+
let firstPort;
13+
14+
const filename = url.fileURLToPath(import.meta.url);
15+
const child = fork(filename, { env: { ...process.env, BE_CHILD: 1 } });
16+
17+
child.once('message', common.mustCall((msg) => {
18+
assert.strictEqual(msg.cmd, 'started');
19+
20+
child.send({ cmd: 'open', args: [] });
21+
child.once('message', common.mustCall(wasOpenedHandler));
22+
}));
23+
24+
function wasOpenedHandler(msg) {
25+
assert.strictEqual(msg.cmd, 'url');
26+
const port = url.parse(msg.url).port;
27+
ping(port, common.mustSucceed(() => {
28+
// Inspector is already open, and won't be reopened, so args don't matter.
29+
child.send({ cmd: 'dispose' });
30+
child.once('message', common.mustCall(wasDisposedWhenOpenHandler));
31+
firstPort = port;
32+
}));
33+
}
34+
35+
function wasDisposedWhenOpenHandler(msg) {
36+
assert.strictEqual(msg.cmd, 'url');
37+
assert.strictEqual(msg.url, undefined);
38+
ping(firstPort, (err) => {
39+
assert(err);
40+
child.send({ cmd: 'dispose' });
41+
child.once('message', common.mustCall(wasReDisposedHandler));
42+
});
43+
}
44+
45+
function wasReDisposedHandler(msg) {
46+
assert.strictEqual(msg.cmd, 'url');
47+
assert.strictEqual(msg.url, undefined);
48+
process.exit();
49+
}
50+
}
51+
52+
function ping(port, callback) {
53+
net.connect({ port, family: 4 })
54+
.on('connect', function() { close(this); })
55+
.on('error', function(err) { close(this, err); });
56+
57+
function close(self, err) {
58+
self.end();
59+
self.on('close', () => callback(err));
60+
}
61+
}
62+
63+
function beChild() {
64+
let inspectorDisposer;
65+
process.send({ cmd: 'started' });
66+
67+
process.on('message', (msg) => {
68+
if (msg.cmd === 'open') {
69+
inspectorDisposer = inspector.open(0, false, undefined);
70+
}
71+
if (msg.cmd === 'dispose') {
72+
inspectorDisposer[Symbol.dispose]();
73+
}
74+
process.send({ cmd: 'url', url: inspector.url() });
75+
});
76+
}

0 commit comments

Comments
 (0)