Skip to content

feat(demo): Run js in worker in wat2wasm demo #2568

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
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
51 changes: 34 additions & 17 deletions docs/demo/wat2wasm/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var outputEl = document.getElementById('output');
var jsLogEl = document.getElementById('js_log');
var selectEl = document.getElementById('select');
var downloadEl = document.getElementById('download');
var runEl = document.getElementById('run');
var downloadLink = document.getElementById('downloadLink');
var buildLogEl = document.getElementById('buildLog');
var base64El = document.getElementById('base64');
Expand All @@ -49,16 +50,6 @@ for (const [f, v] of Object.entries(wabt.FEATURES)) {
});
}

var wasmInstance = null;

var wrappedConsole = Object.create(console);

wrappedConsole.log = (...args) => {
let line = args.map(String).join('') + '\n';
jsLogEl.textContent += line;
console.log(...args);
}

var watEditor = CodeMirror((elt) => {
document.getElementById('top-left').appendChild(elt);
}, {
Expand Down Expand Up @@ -124,17 +115,33 @@ function compile() {
}
}

let activeWorker = null;
function run() {
if (activeWorker != null) stop();
runEl.textContent = 'Stop';
jsLogEl.textContent = '';
if (binaryBuffer === null) return;
try {
let wasm = new WebAssembly.Module(binaryBuffer);
let js = jsEditor.getValue();
let fn = new Function('wasmModule', 'console', js + '//# sourceURL=demo.js');
fn(wasm, wrappedConsole);
} catch (e) {
jsLogEl.textContent += String(e);
const js = jsEditor.getValue();
activeWorker = new Worker('./worker.js');
activeWorker.addEventListener('message', function(event) {
switch (event.data.type) {
case 'log':
jsLogEl.textContent += event.data.data;
break;
case 'done':
stop();
break;
}
});
activeWorker.postMessage({ binaryBuffer: binaryBuffer.buffer, js }, []);
}

function stop() {
if (activeWorker != null) {
activeWorker.terminate();
activeWorker = null;
}
runEl.textContent = 'Run';
}

var onWatChange = debounce(compile, kCompileMinMS);
Expand All @@ -152,6 +159,14 @@ function onSelectChanged(e) {
setExample(this.selectedIndex);
}

function onRunClicked(e) {
if (activeWorker != null) {
stop();
} else {
onJsChange();
}
}

function onDownloadClicked(e) {
// See https://developer.mozilla.com/en-US/docs/Web/API/MouseEvent
var event = new MouseEvent('click', {
Expand Down Expand Up @@ -179,6 +194,7 @@ function onBase64Clicked(e) {
watEditor.on('change', onWatChange);
jsEditor.on('change', onJsChange);
selectEl.addEventListener('change', onSelectChanged);
runEl.addEventListener('click', onRunClicked);
downloadEl.addEventListener('click', onDownloadClicked);
buildLogEl.addEventListener('click', onBuildLogClicked );
base64El.addEventListener('click', onBase64Clicked );
Expand All @@ -191,5 +207,6 @@ for (var i = 0; i < examples.length; ++i) {
}
selectEl.selectedIndex = 1;
setExample(selectEl.selectedIndex);
runEl.classList.remove('disabled');

});
1 change: 1 addition & 0 deletions docs/demo/wat2wasm/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ <h1>wat2wasm demo</h1>
<div class="right">
<label>example:</label>
<select id="select" class="form-select"></select>
<button class="btn disabled" type="button" id="run">Run</button>
<button class="btn disabled" type="button" id="download">Download</button>
<a id="downloadLink" download="test.wasm" class="hidden"></a>
</div>
Expand Down
29 changes: 29 additions & 0 deletions docs/demo/wat2wasm/worker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
let wrappedConsole = Object.create(console);

wrappedConsole.log = (...args) => {
const line = args.map(String).join('') + '\n';
postMessage({
type: "log",
data: line
});
console.log(...args);
}

self.onmessage = async function (event) {
console.log("Running WebAssembly");
const { binaryBuffer, js } = event.data;
let wasm;
try {
wasm = new WebAssembly.Module(binaryBuffer);
} catch (e) {
postMessage({
type: "log",
data: String(e)
});
}
const fn = new Function('wasmModule', 'console', js + '//# sourceURL=demo.js');
fn(wasm, wrappedConsole);
postMessage({
type: "done"
});
}
Loading