Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

child_process: fix IPC 'message' event regression #13856

Merged
merged 1 commit into from
Jun 24, 2017
Merged
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
18 changes: 7 additions & 11 deletions lib/internal/child_process.js
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,6 @@ function setupChannel(target, channel) {
}
chunks[0] = jsonBuffer + chunks[0];

var nextTick = false;
for (var i = 0; i < numCompleteChunks; i++) {
var message = JSON.parse(chunks[i]);

Expand All @@ -466,12 +465,11 @@ function setupChannel(target, channel) {
// that we deliver the handle with the right message however.
if (isInternal(message)) {
if (message.cmd === 'NODE_HANDLE')
handleMessage(message, recvHandle, true, false);
handleMessage(message, recvHandle, true);
else
handleMessage(message, undefined, true, false);
handleMessage(message, undefined, true);
} else {
handleMessage(message, undefined, false, nextTick);
nextTick = true;
handleMessage(message, undefined, false);
}
}
jsonBuffer = incompleteChunk;
Expand Down Expand Up @@ -533,7 +531,7 @@ function setupChannel(target, channel) {

// Convert handle object
obj.got.call(this, message, handle, function(handle) {
handleMessage(message.msg, handle, isInternal(message.msg), false);
handleMessage(message.msg, handle, isInternal(message.msg));
});
});

Expand Down Expand Up @@ -743,15 +741,13 @@ function setupChannel(target, channel) {
target.emit(event, message, handle);
}

function handleMessage(message, handle, internal, nextTick) {
function handleMessage(message, handle, internal) {
if (!target.channel)
return;

var eventName = (internal ? 'internalMessage' : 'message');
if (nextTick)
process.nextTick(emit, eventName, message, handle);
else
target.emit(eventName, message, handle);

process.nextTick(emit, eventName, message, handle);
}

channel.readStart();
Expand Down
39 changes: 39 additions & 0 deletions test/parallel/test-child-process-ipc-next-tick.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');
const NUM_MESSAGES = 10;
const values = [];

for (let i = 0; i < NUM_MESSAGES; ++i) {
values[i] = i;
}

if (process.argv[2] === 'child') {
const received = values.map(() => { return false; });

process.on('uncaughtException', common.mustCall((err) => {
received[err] = true;
const done = received.every((element) => { return element === true; });

if (done)
process.disconnect();
}, NUM_MESSAGES));

process.on('message', (msg) => {
// If messages are handled synchronously, throwing should break the IPC
// message processing.
throw msg;
});

process.send('ready');
} else {
const child = cp.fork(__filename, ['child']);

child.on('message', common.mustCall((msg) => {
assert.strictEqual(msg, 'ready');
values.forEach((value) => {
child.send(value);
});
}));
}