Two fixes in one push.
(1) Streaming horizontal-output bug, take three. textContent += chunk
then appendChild(createTextNode(chunk)) both still rendered chunks
horizontally in fox's Firefox tab even though the chunks clearly
contained \\n (node test confirmed; deployed loader hash matched
local; curl-fetched lumbda-c.loader.js carried the line + '\\n' fix).
Whatever the browser was doing with sibling text nodes inside a
<pre> wasn't honoring the embedded newlines.
Switch to one <div class=\"stream-line\"> per logical line. liveBlock.append
walks the incoming chunk byte by byte, every \\n closes the current
pending div and spawns a fresh empty one for the next line. CSS
adds .stream-line { display: block; white-space: pre; } so each
finished line stacks vertically no matter what the parent
white-space rule was doing. Empty lines get a single space so they
take a row instead of collapsing. Reconcile path inside finalize()
compares the joined per-line text to the full output and rebuilds
the div column if they diverge — for the asm-tier fallback we
already had and now also for any future browser/wasm combo where
a flush silently drops a chunk.
Also drops the temporary [c-tier print] console.log debug we added
in the last commit — diagnosis arrived from elsewhere, no point
keeping the spam.
(2) Per-program autosave drafts. scheduleFreeFormSave previously
returned early if the selected program wasn't \"free-form\", so a
user who unlocked the vault, edited the bend-gpu demo, and came
back later found their edits gone — only free-form persisted.
Now drafts live as { [programName]: text } in the vault payload;
every edit, regardless of which radio is selected, debounces a
save into drafts[currentProgram]. unlockVault loads any saved
draft for the current program (and lifts the legacy
top-level freeForm field into drafts['free-form'] so existing
users don't lose their work). loadCurrentDemo shows a saved
draft instead of the ship default whenever one exists; vault bar
stays visible across all programs once the vault is engaged so
the save status note is always reachable.
115 lines
4.8 KiB
JavaScript
115 lines
4.8 KiB
JavaScript
// wasm/c/lumbda-c.loader.js
|
|
// C tier loader — Emscripten ES module factory.
|
|
//
|
|
// Exports createCTier({ baseURL }) -> Promise<{ evalLisp(src) -> Promise<string> }>.
|
|
// Output capture: Emscripten routes stdout/stderr through Module.print /
|
|
// Module.printErr callbacks. We accumulate per-eval and return joined.
|
|
|
|
async function _bootstrap() {
|
|
// Use import.meta.url so paths resolve relative to THIS loader file —
|
|
// not the caller. Works in both window and Worker contexts because both
|
|
// have a defined import.meta.url for ES modules.
|
|
const factoryURL = new URL("./lumbda-c.js", import.meta.url).href;
|
|
const wasmDir = new URL("./", import.meta.url).href;
|
|
const { default: createLumbdaC } = await import(/* @vite-ignore */ factoryURL);
|
|
|
|
// Streaming output: every printf in the wasm fires Module.print
|
|
// synchronously. We buffer normally for the final return, but if
|
|
// the current eval registered an onChunk callback we also call
|
|
// through immediately so the worker can postMessage a chunk to
|
|
// the UI as each line emerges (vs the user staring at a blank
|
|
// panel for 18 seconds during the heavy bend call).
|
|
//
|
|
// Emscripten's print convention is "one call per line WITHOUT
|
|
// the trailing newline" — the caller is expected to add a \n
|
|
// when reassembling. Our outBuf join adds it back, but the
|
|
// streaming path needs it explicitly or successive chunks
|
|
// concatenate horizontally in the output panel (saw with
|
|
// (let loop ((i 0)) ... (display i) (newline) ... (loop ...))
|
|
// — every tick ended up on the same line).
|
|
let outBuf = [];
|
|
let errBuf = [];
|
|
let currentOnChunk = null;
|
|
const module = await createLumbdaC({
|
|
locateFile: (p) => wasmDir + p,
|
|
print: (line) => {
|
|
outBuf.push(line);
|
|
if (currentOnChunk) currentOnChunk(line + "\n");
|
|
},
|
|
printErr: (line) => {
|
|
errBuf.push(line);
|
|
if (currentOnChunk) currentOnChunk(line + "\n");
|
|
},
|
|
});
|
|
|
|
const _init = module.cwrap("lumbda_wasm_init", null, []);
|
|
const _eval = module.cwrap("lumbda_wasm_eval", "number", ["string"]);
|
|
const _free = module.cwrap("lumbda_wasm_free_result", null, ["number"]);
|
|
|
|
_init();
|
|
|
|
// /tmp must exist before (portal-snapshot! ...) writes there — the
|
|
// C builtin fopen("w")s the path directly so a missing dir is a
|
|
// hard error. Emscripten's MEMFS gives us /tmp on recent versions
|
|
// but make it idempotent.
|
|
try { module.FS.mkdir("/tmp"); } catch (e) { /* exists */ }
|
|
|
|
// bend!-call host bridge — js_lumbda_bend_call inside the wasm
|
|
// (EM_JS in lumbda_wasm_entry.c) reads globalThis._lumbdaCBendUrl
|
|
// for the destination, then does sync XHR POST and writes the
|
|
// response bytes back into the wasm heap. setBendUrl mutates that
|
|
// global so runner.js can propagate a saved playground URL.
|
|
return {
|
|
setBendUrl(url) { globalThis._lumbdaCBendUrl = url || null; },
|
|
// portalSave / portalLoad bridge MEMFS to the JS side so the
|
|
// REPL can persist checkpoints to the encrypted vault and
|
|
// restore them on a fresh worker. Names come from the worker
|
|
// (REPL caller validates alphanumeric) so path traversal isn't
|
|
// a concern.
|
|
portalSave(name) {
|
|
const path = `/tmp/${name}.portal`;
|
|
try {
|
|
const bytes = module.FS.readFile(path);
|
|
return new TextDecoder().decode(bytes);
|
|
} catch (e) { return null; }
|
|
},
|
|
portalLoad(name, blob) {
|
|
const path = `/tmp/${name}.portal`;
|
|
module.FS.writeFile(path, blob);
|
|
},
|
|
async evalLisp(src, onChunk) {
|
|
outBuf = [];
|
|
errBuf = [];
|
|
currentOnChunk = onChunk || null;
|
|
const errPtr = _eval(src);
|
|
currentOnChunk = null;
|
|
let errMsg = "";
|
|
if (errPtr) {
|
|
errMsg = module.UTF8ToString(errPtr);
|
|
_free(errPtr);
|
|
}
|
|
let out = outBuf.join("\n");
|
|
if (out) out += "\n";
|
|
if (errBuf.length) out += errBuf.join("\n") + "\n";
|
|
if (errMsg) out += errMsg + "\n";
|
|
return out;
|
|
},
|
|
heapStats() {
|
|
// Emscripten exposes the linear memory directly. There's no
|
|
// free path right now (LUMBDA_NO_BOEHM), so used = total —
|
|
// every malloc accumulates until reload. Documented and
|
|
// surfaced in the REPL so the user sees the pressure.
|
|
const total = module.HEAPU8.byteLength;
|
|
return { used: total, total };
|
|
},
|
|
};
|
|
}
|
|
|
|
// Closure-encapsulated singleton (see lumbda-c.loader.js for rationale).
|
|
export const createCTier = (() => {
|
|
let tier = null;
|
|
return async () => {
|
|
if (!tier) tier = await _bootstrap();
|
|
return tier;
|
|
};
|
|
})();
|