Update wasm

Author: dkorpel

docs/ctod.js

@@ -1,6 +1,3 @@
-function sendInput() {
-	wasmSendString(document.getElementById("ctod-input").value, 0);
-}
 
 /// exported so webassembly can send strings to JS
 function ctodSendString(ptr, len) {
@@ -10,27 +7,36 @@ function ctodSendString(ptr, len) {
 
 // Don't display errors while user is still typing
 let timer;
+let lastAction = 'paste';
 
-function onCtodInput(str) {
-	res = wasmSendString(str, 0);
+function onCtodInput(target, action) {
+	res = wasmSendString(target.value, 0);
 
 	if (res == null) {
 		return; // don't set timeout, input too big
 	}
 
-	clearTimeout(timer);
-	timer = setTimeout(() => {
-		wasmSendString(str, 1);
-	}, /*msec*/ 500);
+	if (action == 'paste' || lastAction != 'paste')
+	{
+		clearTimeout(timer);
+		timer = setTimeout(() => {
+			wasmSendString(target.value, 1);
+			lastAction = 'none';
+		}, /*msec*/ action == 'paste' ? 0 : 500);
+	}
+
+	lastAction = action;
 }
 
-async function initWasm() {
-	wasmInstance = loadWasm('ctod.wasm', { ctodSendString });
-	document.getElementById('ctod-input').addEventListener('input', (ev) => onCtodInput(ev.target.value));
+async function initWasm()
+{
+	loadWasm('ctod.wasm', { ctodSendString });
+	const inputField = document.getElementById('ctod-input');
+	inputField.addEventListener('input', (ev) => onCtodInput(ev.target, 'input'));
+	inputField.addEventListener('paste', (ev) => onCtodInput(ev.target, 'paste'));
 }
 
 window.addEventListener('load', (event) => {
-
 	initWasm();
 
 	// Make the tab key insert a '\t' instead of changing focus

docs/ctod.wasm

@@ -1,77 +1,55 @@
-/*
-import { WASI } from 'wasi';
-
-// https://nodejs.org/api/wasi.html
-const wasi = new WASI({
-	args: argv,
-	env,
-	preopens: {}
-});
-*/
-
 // Stubs for WASI, needed because tree-sitter uses `fwrite(stderr, ...)` for error printing
 function clock_time_get() { return 0; }
 function fd_close() { return 0; }
 function fd_seek() { return 0; }
 function fd_write() { return 0; }
 function proc_exit() { return 0; }
 
-// Some WASI binaries require:
-// const importObject = { wasi_unstable: wasi.wasiImport };
-// const importObject = { wasi_snapshot_preview1: wasi.wasiImport };
-
 // Our own glue code
-function jsConsoleLog(ptr, len) { console.log(toJsString(ptr, len)); }
-function jsAbort(ptr, len) { throw new Error(toJsString(ptr, len)) }
+function jsConsoleLog(len, ptr) { console.log(toJsString(ptr, len)); }
+function jsConsoleError(len, ptr) { console.error(toJsString(ptr, len)); }
+function jsAbort(len, ptr) { throw new Error(toJsString(ptr, len)); }
 function jsGetTimeMillis() { return new Date().getTime(); }
 
-var wasmInstance;
+var wasm;
 
 function toJsString(ptr, len) {
 	try {
-		var buffer = new Uint8Array(wasmInstance.exports.memory.buffer, ptr, len);
-		return string = new TextDecoder().decode(buffer);
+		var buffer = new Uint8Array(wasm.exports.memory.buffer, ptr, len);
+		return new TextDecoder().decode(buffer);
 	} catch (err) {
-		return "eh?";
+		console.error(err);
+		return "";
 	}
 }
 
 /// Send strings from JS to webassembly
 function wasmSendString(str, type) {
-	const bytes = new TextEncoder().encode(str); // Encode in utf-8
-	// Copy the string into memory allocated in the WebAssembly
-	const ptr = wasmInstance.exports.getStringMessageBuffer();
-	const len = wasmInstance.exports.getStringMessageBufferLen();
-	if (bytes.byteLength > len) {
+	let buf = wasmStoreJsString(str, wasm.exports.getStringMessageBuffer(), wasm.exports.getStringMessageBufferLen())
+	wasm.exports.receiveStringMessage(buffer.byteOffset, bytes.byteLength + 1, type);
+	return buffer;
+}
+
+function wasmStoreJsString(str, ptr, len) {
+	const bytes = new TextEncoder().encode(str);
+	if (bytes.byteLength > len)
+	{
 		alert("input too big, must be at most " + len + " bytes") // #meh
 		return null;
 	}
-	const buffer = new Uint8Array(wasmInstance.exports.memory.buffer, ptr, bytes.byteLength + 1); // '0' terminator
+	const buffer = new Uint8Array(wasm.exports.memory.buffer, ptr, bytes.byteLength + 1); // '0' terminator
 	buffer.set(bytes);
 	buffer[bytes.byteLength] = 0; // while Uint8Array is initialized to 0, don't rely on that
-	wasmInstance.exports.receiveStringMessage(buffer.byteOffset, bytes.byteLength + 1, type);
 	return buffer;
 }
 
 async function loadWasm(fileName, imports) {
 	const importObject = {
 		wasi_snapshot_preview1: { clock_time_get, fd_close, fd_seek, fd_write, proc_exit },
-		env: { ...imports, jsConsoleLog, jsAbort, jsGetTimeMillis }
+		env: { ...imports, jsConsoleLog, jsConsoleError, jsAbort, jsGetTimeMillis }
 	};
-	const fetchPromise = new Promise(resolve => {
-		var request = new XMLHttpRequest();
-		request.open('GET', fileName);
-		request.responseType = 'arraybuffer';
-		request.onload = e => resolve(request.response);
-		request.onerror = function () {
-			resolve(undefined);
-			console.error("Could not retrieve WebAssembly object");
-		};
-		request.send();
-	})
 
-	const buffer = await fetchPromise;
-	const module = await WebAssembly.compile(buffer);
-	wasmInstance = await WebAssembly.instantiate(module, importObject);
-	return wasmInstance;
+	const { instance } = await WebAssembly.instantiateStreaming(fetch(fileName), importObject);
+	wasm = instance;
+	return instance;
 }