Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/internal/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,20 @@ class Worker extends EventEmitter {
) {
const { isMainThread } = internalBinding('worker');
if (isMainThread) {
let isWatchDependencyMessage = false;
if (ArrayIsArray(message?.['watch:require'])) {
process.send({ 'watch:require': message['watch:require'] });
isWatchDependencyMessage = true;
}
if (ArrayIsArray(message?.['watch:import'])) {
process.send({ 'watch:import': message['watch:import'] });
isWatchDependencyMessage = true;
}
if (isWatchDependencyMessage) {
// These are internal watch mode dependency reports that have been
// forwarded to the watch supervisor above. They must not be
// surfaced to user 'message' listeners on the Worker.
return;
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions test/sequential/test-watch-mode-worker.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,36 @@ new Worker(new URL(${JSON.stringify(pathToFileURL(worker))}));
`Completed running ${inspect(file)}. Waiting for file changes before restarting...`,
]);
});

it('should not surface internal watch messages to worker message listeners', async () => {
// Regression test for https://github.com/nodejs/node/issues/65044:
// watch mode reports each worker's dependencies to the supervisor over the
// worker's message channel. Those internal `watch:require`/`watch:import`
// messages must not be delivered to user `worker.on('message')` listeners.
const dir = createTmpDir();
const worker = path.join(dir, 'worker.js');

writeFileSync(worker, `
console.log('worker running');
`);

const file = createTmpFile(`
const { Worker } = require('node:worker_threads');
const w = new Worker(${JSON.stringify(worker)});
w.on('message', (message) => {
console.log('LEAKED ' + JSON.stringify(message));
});
`, '.js', dir);

const { stderr, stdout } = await runWriteSucceed({
file,
watchedFile: worker,
});

assert.strictEqual(stderr, '');
assert.ok(
!stdout.some((line) => line.startsWith('LEAKED') || line.includes('watch:require')),
`internal watch message leaked to a user listener: ${inspect(stdout)}`,
);
});
});
Loading