Skip to content
Open
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: 18 additions & 0 deletions src/webworker/js.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ console.debug('Initializing worker');
}

await mod.default({{wasm_bg}});

// wasm-bindgen registers a message handler during init. Lock the
// onmessage setter so future assignments can't add duplicate
// listeners alongside our addEventListener handler.
self.onmessage = null;
Object.defineProperty(self, 'onmessage', {
set: function(v) {},
get: function() { return null; },
});

self.postMessage({ success: true });
console.debug('Worker started');

Expand Down Expand Up @@ -87,6 +97,14 @@ initHandler = async function(event) {
// Remove this listener and add the task handler
self.removeEventListener('message', initHandler);

// Lock onmessage to prevent wasm-bindgen's handler from firing
// alongside addEventListener.
self.onmessage = null;
Object.defineProperty(self, 'onmessage', {
set: function(v) {},
get: function() { return null; },
});

// Add the main message handler for tasks
self.addEventListener('message', async event => {
console.debug('Received worker event');
Expand Down