Skip to content

Commit

Permalink
lib: child process queue pending messages
Browse files Browse the repository at this point in the history
It fixes the problem for the child process not receiving messages.

Fixes: #41134
  • Loading branch information
ErickWendel committed Dec 17, 2021
1 parent 0d9f3bd commit da5b44c
Showing 1 changed file with 25 additions and 1 deletion.
26 changes: 25 additions & 1 deletion lib/internal/child_process.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const {
StringPrototypeSlice,
Symbol,
Uint8Array,
SafeSet,
} = primordials;

const {
Expand Down Expand Up @@ -81,6 +82,7 @@ let HTTPParser;
const MAX_HANDLE_RETRANSMISSIONS = 3;
const kChannelHandle = Symbol('kChannelHandle');
const kIsUsedAsStdio = Symbol('kIsUsedAsStdio');
const kPendingMessages = Symbol('pendingMessages');

// This object contain function to convert TCP objects to native handle objects
// and back again.
Expand Down Expand Up @@ -526,6 +528,7 @@ class Control extends EventEmitter {
constructor(channel) {
super();
this.#channel = channel;
this[kPendingMessages] = new SafeSet();
}

// The methods keeping track of the counter are being used to track the
Expand Down Expand Up @@ -699,6 +702,19 @@ function setupChannel(target, channel, serializationMode) {
});
});

target.on('newListener', function () {
if(!target.channel) return;

const messages = target.channel[kPendingMessages];
if (!messages.size) return;

for (const messageParams of messages) {
process.nextTick(() => ReflectApply(target.emit, target, messageParams));
}

messages.clear();
});

target.send = function(message, handle, options, callback) {
if (typeof handle === 'function') {
callback = handle;
Expand Down Expand Up @@ -912,7 +928,15 @@ function setupChannel(target, channel, serializationMode) {
};

function emit(event, message, handle) {
target.emit(event, message, handle);
const args = [event, message, handle];
const isInternalMessage = "internalMessage" === event;
const hasListenersInstalled = target.listenerCount('message');
if (hasListenersInstalled || isInternalMessage) {
target.emit(event, message, handle);
return;
}

target.channel[kPendingMessages].add(args);
}

function handleMessage(message, handle, internal) {
Expand Down

0 comments on commit da5b44c

Please sign in to comment.