Skip to content

worker: make MessagePort inherit from EventTarget #34057

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.

Sign up for GitHub

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

Closed
addaleax wants to merge 8 commits into from
Closed

worker: make MessagePort inherit from EventTarget #34057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11a940e
test: delete invalid test
addaleax Jun 25, 2020
0b2cd67
events: expand NodeEventTarget functionality
addaleax Jun 25, 2020
37fa701
test: fixup worker + source map test
addaleax Jun 25, 2020
6b1926f
worker: make MessagePort inherit from EventTarget
addaleax Jun 25, 2020
c9aabd6
squash! events: expand NodeEventTarget functionality
addaleax Jul 21, 2020
a61bd04
fixup! worker: make MessagePort inherit from EventTarget
addaleax Jul 21, 2020
644932c
fixup! squash! events: expand NodeEventTarget functionality
addaleax Jul 21, 2020
7cb1db7
fixup! fixup! worker: make MessagePort inherit from EventTarget
addaleax Jul 21, 2020
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
Prev Previous commit
Next Next commit
fixup! worker: make MessagePort inherit from EventTarget
  • Loading branch information
@addaleax
addaleax committed Jul 21, 2020
commit a61bd04a77568ecc471e4f7bccf4daccb2712a68
17 changes: 15 additions & 2 deletions benchmark/worker/messageport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const common = require('../common.js');
const { MessageChannel } = require('worker_threads');
const bench = common.createBenchmark(main, {
payload: ['string', 'object'],
style: ['eventtarget', 'eventemitter'],
n: [1e6]
});

Expand All @@ -25,14 +26,26 @@ function main(conf) {
const { port1, port2 } = new MessageChannel();

let messages = 0;
port2.onmessage = () => {
function listener() {
if (messages++ === n) {
bench.end(n);
port1.close();
} else {
write();
}
};
}

switch (conf.style) {
case 'eventtarget':
port2.onmessage = listener;
break;
case 'eventemitter':
port2.on('message', listener);
break;
default:
throw new Error('Unsupported listener type');
}

bench.start();
write();

Expand Down
8 changes: 3 additions & 5 deletions lib/internal/per_context/messageport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ class MessageEvent {
}
}

const kMessageEventSymbol = SymbolFor('nodejs.internal.MessageEvent');
const kHybridDispatch = SymbolFor('nodejs.internal.kHybridDispatch');

exports.emitMessage = function(data, type) {
if (typeof this.dispatchEvent === 'function') {
const MessageEvent = this[kMessageEventSymbol];
const event = new MessageEvent(data, this, type);
this.dispatchEvent(event);
if (typeof this[kHybridDispatch] === 'function') {
this[kHybridDispatch](data, type);
return;
}

Expand Down
18 changes: 7 additions & 11 deletions lib/internal/worker/io.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const {
ObjectGetPrototypeOf,
ObjectSetPrototypeOf,
Symbol,
SymbolFor,
} = primordials;

const {
Expand All @@ -34,9 +33,9 @@ const {
NodeEventTarget,
defineEventHandler,
initNodeEventTarget,
kCreateEvent,
kNewListener,
kRemoveListener,
kPreprocessEvent,
} = require('internal/event_target');
const { inspect } = require('internal/util/inspect');

Expand Down Expand Up @@ -82,10 +81,12 @@ class MessageEvent extends Event {

ObjectDefineProperty(
MessagePort.prototype,
SymbolFor('nodejs.internal.MessageEvent'),
kCreateEvent,
{
value: MessageEvent,
configurable: true,
value: function(data, type) {
return new MessageEvent(data, this, type);
},
configurable: false,
writable: false,
enumerable: false,
});
Expand All @@ -96,6 +97,7 @@ function oninit() {
// TODO(addaleax): This should be on MessagePort.prototype, but
// defineEventHandler() does not support that.
defineEventHandler(this, 'message');
defineEventHandler(this, 'messageerror');
setupPortReferencing(this, this, 'message');
}

Expand All @@ -105,12 +107,6 @@ ObjectDefineProperty(MessagePort.prototype, onInitSymbol, {
value: oninit
});

MessagePort.prototype[kPreprocessEvent] = function(event) {
if (event.type === 'message' || event.type === 'messageerror')
return event.data;
return event;
};

class MessagePortCloseEvent extends Event {
constructor() {
super('close');
Expand Down