diff --git a/pkg/ludus.js b/pkg/ludus.js index 957068d..e93e3ac 100644 --- a/pkg/ludus.js +++ b/pkg/ludus.js @@ -23,19 +23,19 @@ function handle_messages (e) { } for (const msg of msgs) { switch (msg.verb) { - case "complete": { + case "Complete": { console.log("Main: ludus completed with => ", msg.data) ludus_result = msg.data running = false break } // TODO: do more than report these - case "console": { + case "Console": { console.log("Main: ludus says => ", msg.data) ludus_console = ludus_console + msg.data break } - case "commands": { + case "Commands": { console.log("Main: ludus commands => ", msg.data) for (const command of msg.data) { ludus_commands.push(command) @@ -68,7 +68,7 @@ export function run (source) { if (running) "TODO: handle this? should not be running" running = true code = source - outbox = [{verb: "run", data: source}] + outbox = [{verb: "Run", data: source}] start_io_polling() } @@ -80,12 +80,12 @@ export function is_running() { // kills a ludus script export function kill () { running = false - outbox.push({verb: "kill"}) + outbox.push({verb: "Kill"}) } // sends text into ludus (status: not working) export function input (text) { - outbox.push({verb: "input", data: text}) + outbox.push({verb: "Input", data: text}) } // returns the contents of the ludus console and resets the console diff --git a/pkg/rudus.d.ts b/pkg/rudus.d.ts index 2c9353f..0ee0693 100644 --- a/pkg/rudus.d.ts +++ b/pkg/rudus.d.ts @@ -14,8 +14,8 @@ export interface InitOutput { readonly __wbindgen_malloc: (a: number, b: number) => number; readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; readonly __wbindgen_export_6: WebAssembly.Table; - readonly closure323_externref_shim: (a: number, b: number, c: any) => void; - readonly closure336_externref_shim: (a: number, b: number, c: any, d: any) => void; + readonly closure342_externref_shim: (a: number, b: number, c: any) => void; + readonly closure366_externref_shim: (a: number, b: number, c: any, d: any) => void; readonly __wbindgen_start: () => void; } diff --git a/pkg/rudus.js b/pkg/rudus.js index e89f8ba..cc24b0e 100644 --- a/pkg/rudus.js +++ b/pkg/rudus.js @@ -17,6 +17,22 @@ function handleError(f, args) { } } +function logError(f, args) { + try { + return f.apply(this, args); + } catch (e) { + let error = (function () { + try { + return e instanceof Error ? `${e.message}\n\nStack:\n${e.stack}` : e.toString(); + } catch(_) { + return ""; + } + }()); + console.error("wasm-bindgen: imported JS function that was not marked as `catch` threw an error:", error); + throw e; + } +} + const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } ); if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); }; @@ -54,6 +70,8 @@ const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' function passStringToWasm0(arg, malloc, realloc) { + if (typeof(arg) !== 'string') throw new Error(`expected a string argument, found ${typeof(arg)}`); + if (realloc === undefined) { const buf = cachedTextEncoder.encode(arg); const ptr = malloc(buf.length, 1) >>> 0; @@ -82,7 +100,7 @@ function passStringToWasm0(arg, malloc, realloc) { ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0; const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len); const ret = encodeString(arg, view); - + if (ret.read !== arg.length) throw new Error('failed to pass whole string'); offset += ret.written; ptr = realloc(ptr, len, offset, 1) >>> 0; } @@ -104,6 +122,12 @@ function isLikeNone(x) { return x === undefined || x === null; } +function _assertBoolean(n) { + if (typeof(n) !== 'boolean') { + throw new Error(`expected a boolean argument, found ${typeof(n)}`); + } +} + const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined') ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry(state => { @@ -134,6 +158,71 @@ function makeMutClosure(arg0, arg1, dtor, f) { CLOSURE_DTORS.register(real, state, state); return real; } + +function debugString(val) { + // primitive types + const type = typeof val; + if (type == 'number' || type == 'boolean' || val == null) { + return `${val}`; + } + if (type == 'string') { + return `"${val}"`; + } + if (type == 'symbol') { + const description = val.description; + if (description == null) { + return 'Symbol'; + } else { + return `Symbol(${description})`; + } + } + if (type == 'function') { + const name = val.name; + if (typeof name == 'string' && name.length > 0) { + return `Function(${name})`; + } else { + return 'Function'; + } + } + // objects + if (Array.isArray(val)) { + const length = val.length; + let debug = '['; + if (length > 0) { + debug += debugString(val[0]); + } + for(let i = 1; i < length; i++) { + debug += ', ' + debugString(val[i]); + } + debug += ']'; + return debug; + } + // Test for built-in + const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val)); + let className; + if (builtInMatches && builtInMatches.length > 1) { + className = builtInMatches[1]; + } else { + // Failed to match the standard '[object ClassName]' + return toString.call(val); + } + if (className == 'Object') { + // we're a user defined class or Object + // JSON.stringify avoids problems with cycles, and is generally much + // easier than looping through ownProperties of `val`. + try { + return 'Object(' + JSON.stringify(val) + ')'; + } catch (_) { + return 'Object'; + } + } + // errors + if (val instanceof Error) { + return `${val.name}: ${val.message}\n${val.stack}`; + } + // TODO we could test for more things here, like `Set`s and `Map`s. + return className; +} /** * @param {string} src * @returns {Promise} @@ -145,12 +234,19 @@ export function ludus(src) { return ret; } -function __wbg_adapter_20(arg0, arg1, arg2) { - wasm.closure323_externref_shim(arg0, arg1, arg2); +function _assertNum(n) { + if (typeof(n) !== 'number') throw new Error(`expected a number argument, found ${typeof(n)}`); +} +function __wbg_adapter_22(arg0, arg1, arg2) { + _assertNum(arg0); + _assertNum(arg1); + wasm.closure342_externref_shim(arg0, arg1, arg2); } -function __wbg_adapter_48(arg0, arg1, arg2, arg3) { - wasm.closure336_externref_shim(arg0, arg1, arg2, arg3); +function __wbg_adapter_50(arg0, arg1, arg2, arg3) { + _assertNum(arg0); + _assertNum(arg1); + wasm.closure366_externref_shim(arg0, arg1, arg2, arg3); } async function __wbg_load(module, imports) { @@ -195,7 +291,7 @@ function __wbg_get_imports() { const ret = arg0.call(arg1, arg2); return ret; }, arguments) }; - imports.wbg.__wbg_error_7534b8e9a36f1ab4 = function(arg0, arg1) { + imports.wbg.__wbg_error_7534b8e9a36f1ab4 = function() { return logError(function (arg0, arg1) { let deferred0_0; let deferred0_1; try { @@ -205,7 +301,7 @@ function __wbg_get_imports() { } finally { wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); } - }; + }, arguments) }; imports.wbg.__wbg_io_5a3c8ea72d8c6ea3 = function() { return handleError(function (arg0, arg1) { let deferred0_0; let deferred0_1; @@ -218,7 +314,7 @@ function __wbg_get_imports() { wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); } }, arguments) }; - imports.wbg.__wbg_log_86d603e98cc11395 = function(arg0, arg1) { + imports.wbg.__wbg_log_86d603e98cc11395 = function() { return logError(function (arg0, arg1) { let deferred0_0; let deferred0_1; try { @@ -228,8 +324,8 @@ function __wbg_get_imports() { } finally { wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); } - }; - imports.wbg.__wbg_log_edeb598b620f1ba2 = function(arg0, arg1) { + }, arguments) }; + imports.wbg.__wbg_log_edeb598b620f1ba2 = function() { return logError(function (arg0, arg1) { let deferred0_0; let deferred0_1; try { @@ -239,15 +335,15 @@ function __wbg_get_imports() { } finally { wasm.__wbindgen_free(deferred0_0, deferred0_1, 1); } - }; - imports.wbg.__wbg_new_23a2665fac83c611 = function(arg0, arg1) { + }, arguments) }; + imports.wbg.__wbg_new_23a2665fac83c611 = function() { return logError(function (arg0, arg1) { try { var state0 = {a: arg0, b: arg1}; var cb0 = (arg0, arg1) => { const a = state0.a; state0.a = 0; try { - return __wbg_adapter_48(a, state0.b, arg0, arg1); + return __wbg_adapter_50(a, state0.b, arg0, arg1); } finally { state0.a = a; } @@ -257,65 +353,65 @@ function __wbg_get_imports() { } finally { state0.a = state0.b = 0; } - }; - imports.wbg.__wbg_new_8a6f238a6ece86ea = function() { + }, arguments) }; + imports.wbg.__wbg_new_8a6f238a6ece86ea = function() { return logError(function () { const ret = new Error(); return ret; - }; - imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) { + }, arguments) }; + imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function() { return logError(function (arg0, arg1) { const ret = new Function(getStringFromWasm0(arg0, arg1)); return ret; - }; - imports.wbg.__wbg_now_8dddb61fa4928554 = function() { + }, arguments) }; + imports.wbg.__wbg_now_8dddb61fa4928554 = function() { return logError(function () { const ret = Date.now(); return ret; - }; - imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function(arg0) { + }, arguments) }; + imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function() { return logError(function (arg0) { queueMicrotask(arg0); - }; - imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function(arg0) { + }, arguments) }; + imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function() { return logError(function (arg0) { const ret = arg0.queueMicrotask; return ret; - }; - imports.wbg.__wbg_random_57c118f142535bb6 = function() { + }, arguments) }; + imports.wbg.__wbg_random_57c118f142535bb6 = function() { return logError(function () { const ret = Math.random(); return ret; - }; - imports.wbg.__wbg_resolve_4851785c9c5f573d = function(arg0) { + }, arguments) }; + imports.wbg.__wbg_resolve_4851785c9c5f573d = function() { return logError(function (arg0) { const ret = Promise.resolve(arg0); return ret; - }; - imports.wbg.__wbg_stack_0ed75d68575b0f3c = function(arg0, arg1) { + }, arguments) }; + imports.wbg.__wbg_stack_0ed75d68575b0f3c = function() { return logError(function (arg0, arg1) { const ret = arg1.stack; const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const len1 = WASM_VECTOR_LEN; getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); - }; - imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() { + }, arguments) }; + imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() { return logError(function () { const ret = typeof global === 'undefined' ? null : global; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); - }; - imports.wbg.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() { + }, arguments) }; + imports.wbg.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() { return logError(function () { const ret = typeof globalThis === 'undefined' ? null : globalThis; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); - }; - imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() { + }, arguments) }; + imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() { return logError(function () { const ret = typeof self === 'undefined' ? null : self; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); - }; - imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() { + }, arguments) }; + imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() { return logError(function () { const ret = typeof window === 'undefined' ? null : window; return isLikeNone(ret) ? 0 : addToExternrefTable0(ret); - }; - imports.wbg.__wbg_then_44b73946d2fb3e7d = function(arg0, arg1) { + }, arguments) }; + imports.wbg.__wbg_then_44b73946d2fb3e7d = function() { return logError(function (arg0, arg1) { const ret = arg0.then(arg1); return ret; - }; - imports.wbg.__wbg_then_48b406749878a531 = function(arg0, arg1, arg2) { + }, arguments) }; + imports.wbg.__wbg_then_48b406749878a531 = function() { return logError(function (arg0, arg1, arg2) { const ret = arg0.then(arg1, arg2); return ret; - }; + }, arguments) }; imports.wbg.__wbindgen_cb_drop = function(arg0) { const obj = arg0.original; if (obj.cnt-- == 1) { @@ -323,11 +419,19 @@ function __wbg_get_imports() { return true; } const ret = false; + _assertBoolean(ret); return ret; }; - imports.wbg.__wbindgen_closure_wrapper969 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 324, __wbg_adapter_20); + imports.wbg.__wbindgen_closure_wrapper7647 = function() { return logError(function (arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 343, __wbg_adapter_22); return ret; + }, arguments) }; + imports.wbg.__wbindgen_debug_string = function(arg0, arg1) { + const ret = debugString(arg1); + const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true); + getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true); }; imports.wbg.__wbindgen_init_externref_table = function() { const table = wasm.__wbindgen_export_2; @@ -341,10 +445,12 @@ function __wbg_get_imports() { }; imports.wbg.__wbindgen_is_function = function(arg0) { const ret = typeof(arg0) === 'function'; + _assertBoolean(ret); return ret; }; imports.wbg.__wbindgen_is_undefined = function(arg0) { const ret = arg0 === undefined; + _assertBoolean(ret); return ret; }; imports.wbg.__wbindgen_string_get = function(arg0, arg1) { diff --git a/pkg/rudus_bg.wasm b/pkg/rudus_bg.wasm index d9ca655..d7ca997 100644 Binary files a/pkg/rudus_bg.wasm and b/pkg/rudus_bg.wasm differ diff --git a/pkg/rudus_bg.wasm.d.ts b/pkg/rudus_bg.wasm.d.ts index 99af8eb..f0ff0f2 100644 --- a/pkg/rudus_bg.wasm.d.ts +++ b/pkg/rudus_bg.wasm.d.ts @@ -9,6 +9,6 @@ export const __wbindgen_free: (a: number, b: number, c: number) => void; export const __wbindgen_malloc: (a: number, b: number) => number; export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; export const __wbindgen_export_6: WebAssembly.Table; -export const closure323_externref_shim: (a: number, b: number, c: any) => void; -export const closure336_externref_shim: (a: number, b: number, c: any, d: any) => void; +export const closure342_externref_shim: (a: number, b: number, c: any) => void; +export const closure366_externref_shim: (a: number, b: number, c: any, d: any) => void; export const __wbindgen_start: () => void; diff --git a/pkg/worker.js b/pkg/worker.js index d539da4..ac860a3 100644 --- a/pkg/worker.js +++ b/pkg/worker.js @@ -36,7 +36,7 @@ async function run(e) { let msgs = e.data for (const msg of msgs) { // evaluate source if we get some - if (msg.verb === "run" && typeof msg.data === 'string') { + if (msg.verb === "Run" && typeof msg.data === 'string') { // temporarily stash an empty function so we don't keep calling this one if we receive additional messages onmessage = () => {} // actually run the ludus--which will call `io`--and replace `run` as the event handler for ipc diff --git a/src/io.rs b/src/io.rs index f91af40..d2f19e7 100644 --- a/src/io.rs +++ b/src/io.rs @@ -47,27 +47,27 @@ impl MsgOut { MsgOut::Complete(value) => match value { Ok(value) => { log(format!("value is: {}", value.show())); - make_json_payload("complete", serde_json::to_string(&value.show()).unwrap()) + make_json_payload("Complete", serde_json::to_string(&value.show()).unwrap()) }, - Err(_) => make_json_payload("complete", "\"null\"".to_string()) + Err(_) => make_json_payload("Complete", "\"null\"".to_string()) }, MsgOut::Commands(commands) => { let commands = commands.as_list(); let vals_json = commands.iter().map(|v| v.to_json().unwrap()).collect::>().join(","); let vals_json = format!("[{vals_json}]"); - make_json_payload("commands", vals_json) + make_json_payload("Commands", vals_json) } MsgOut::SlurpRequest(value) => { // TODO: do parsing here? // Right now, defer to fetch let url = value.to_json().unwrap(); - make_json_payload("slurp", url) + make_json_payload("Fetch", url) } MsgOut::Console(lines) => { let lines = lines.as_list(); let json_lines = lines.iter().map(|line| line.stringify()).collect::>().join("\\n"); let json_lines = format!("\"{json_lines}\""); - make_json_payload("console", json_lines) + make_json_payload("Console", json_lines) } } } @@ -77,7 +77,7 @@ impl MsgOut { #[serde(tag = "verb", content = "data")] pub enum MsgIn { Input(String), - SlurpResponse(String, String, String), + Fetch(String, String, String), Kill, Keyboard(Vec), } @@ -85,8 +85,8 @@ pub enum MsgIn { impl std::fmt::Display for MsgIn { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - MsgIn::Input(str) => write!(f, "input: {str}"), - MsgIn::Kill => write!(f, "kill"), + MsgIn::Input(str) => write!(f, "Input: {str}"), + MsgIn::Kill => write!(f, "Kill"), _ => todo!() } } @@ -96,7 +96,7 @@ impl MsgIn { pub fn to_value(self) -> Value { match self { MsgIn::Input(str) => Value::string(str), - MsgIn::SlurpResponse(url, status, string) => { + MsgIn::Fetch(url, status, string) => { let url = Value::string(url); let status = Value::keyword(status); let string = Value::string(string); @@ -124,6 +124,7 @@ pub async fn do_io (msgs: Vec) -> Vec { Err(_) => return vec![] }; let inbox = inbox.as_string().expect("response should be a string"); + log(format!("got a message: {inbox}")); let inbox: Vec = serde_json::from_str(inbox.as_str()).expect("response from js should be valid"); if !inbox.is_empty() { log("ludus received messages".to_string());