Update to v1.1.1; refactor code structure, enhance worker processes, and improve default behavior

Author: oligamiq

RELEASE.md

@@ -7,5 +7,9 @@ File size reduction due to brotli compression.
 Change wasm compile method from compile to compileStreaming.
 - lazy loading monaco editor
 
+# v1.1.1 (2024-12-18)
+- change default code.
+- moved the file with the code that runs on the worker to another directory.
+
 ## v1.0.0 (2024-11-26)
 - Initial release

bun.lockb

@@ -1,6 +1,6 @@
 {
   "name": "@oligami/rustc-browser-wasi_shim",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -14,8 +14,7 @@
     "@bjorn3/browser_wasi_shim": "^0.3.0",
     "@oligami/browser_wasi_shim-threads": "^0.1.1",
     "@oligami/rustc-browser-wasi_shim": "file:",
-    "brotli-dec-wasm": "^2.3.0",
-    "nanotar": "^0.1.1"
+    "brotli-dec-wasm": "^2.3.0"
   },
   "private": false,
   "publishConfig": {
@@ -52,9 +51,6 @@
       "default": "./dist/rustc-browser-wasi_shim.es.js"
     }
   },
-  "files": [
-    "dist",
-    "src"
-  ],
+  "files": ["dist", "src"],
   "keywords": []
 }

lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubrc",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "rubrc root",
   "private": true,
   "directories": {
@@ -9,17 +9,18 @@
   },
   "author": "oligami <[email protected]> (https://github.com/oligamiq)",
   "license": "MIT OR Apache-2.0",
+  "type": "module",
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
     "@swc/cli": "^0.5.2",
-    "@swc/core": "^1.10.0",
+    "@swc/core": "^1.10.1",
     "@types/tar-stream": "^3.1.3",
     "autoprefixer": "^10.4.20",
     "better-typescript-lib": "^2.10.0",
     "npm-watch": "^0.13.0",
     "postcss": "^8.4.49",
-    "solid-devtools": "^0.30.1",
-    "tailwindcss": "^3.4.16",
+    "solid-devtools": "^0.30.4",
+    "tailwindcss": "^3.4.17",
     "typescript": "^5.7.2",
     "unplugin-swc": "^1.5.1",
     "vite": "^6.0.3",

package.json

@@ -1,10 +1,11 @@
 {
   "name": "rubrc",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "rubrc example page",
   "private": true,
   "author": "oligami <[email protected]> (https://github.com/oligamiq)",
   "license": "MIT OR Apache-2.0",
+  "type": "module",
   "scripts": {
     "start": "vite",
     "dev": "vite",
@@ -20,7 +21,6 @@
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/addon-search": "^0.15.0",
     "@xterm/xterm": "^5.5.0",
-    "install": "^0.13.0",
     "nanotar": "^0.1.1",
     "rubrc": "file:",
     "solid-js": "^1.9.3",

page/package.json

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   purge: ["./index.html", "./src/**/*.{vue,js,ts,jsx,tsx}"],
   plugins: {
     tailwindcss: {},

page/postcss.config.js

@@ -5,7 +5,16 @@ import type { Ctx } from "./ctx";
 import { default_value, rust_file } from "./config";
 import { DownloadButton, RunButton } from "./btn";
 import { triples } from "./sysroot";
-import { Select } from "@thisbeyond/solid-select";
+
+const Select = lazy(async () => {
+  const selector = import("@thisbeyond/solid-select");
+  const css_load = import("@thisbeyond/solid-select/style.css");
+
+  const [mod] = await Promise.all([selector, css_load]);
+
+  return { default: mod.Select };
+});
+
 import { SharedObjectRef } from "@oligami/shared-object";
 const MonacoEditor = lazy(() =>
   import("solid-monaco").then((mod) => ({ default: mod.MonacoEditor })),

page/src/App.tsx

@@ -2,7 +2,17 @@ import { File } from "@bjorn3/browser_wasi_shim";
 
 export const default_value = `// /main.rs
 fn main() {
-  println!("Hello, world!");
+    let first_time = std::time::SystemTime::now();
+
+    let count = std::env::args()
+        .nth(1)
+        .map(|arg| arg.parse::<usize>().ok())
+        .flatten()
+        .unwrap_or(10);
+
+    (0..=count).for_each(|i| println!("{i}"));
+
+    println!("Time: {:?}", first_time.elapsed().unwrap());
 }
 `;
 

page/src/config.ts

@@ -4,11 +4,10 @@ import { render } from "solid-js/web";
 
 import App from "./App";
 import { gen_ctx } from "./ctx";
-import MainWorker from "./worker?worker";
+import MainWorker from "./worker_process/worker?worker";
 import { parser_setup } from "./cmd_parser";
 import "./monaco_worker";
 import { compile_and_run_setup } from "./compile_and_run";
-import "@thisbeyond/solid-select/style.css";
 
 const root = document.getElementById("root");
 

page/src/index.tsx

@@ -1,4 +1,5 @@
 // solid-xterm's code fork
+// https://github.com/WVAviator/solid-xterm
 
 import { createEffect, createSignal, onCleanup } from "solid-js";
 import {

page/src/solid_xterm.tsx

@@ -18,6 +18,8 @@ export const triples = [
   "riscv64gc-unknown-linux-musl",
   "s390x-unknown-linux-gnu",
   "sparcv9-sun-solaris",
+  "wasm32-unknown-emscripten",
+  "wasm32-unknown-unknown",
   "wasm32-wasip1-threads",
   "wasm32-wasip1",
   "x86_64-pc-windows-gnu",

page/src/sysroot.ts

@@ -0,0 +1,90 @@
+import { SharedObject, SharedObjectRef } from "@oligami/shared-object";
+import { WASIFarmAnimal } from "@oligami/browser_wasi_shim-threads";
+import type { Ctx } from "../ctx";
+
+const shared: SharedObject[] = [];
+
+globalThis.addEventListener("message", async (event) => {
+  const {
+    wasi_refs,
+    ctx,
+  }: {
+    // WASIFarmRefObject is not export
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    wasi_refs: any[];
+    ctx: Ctx;
+  } = event.data;
+
+  const waiter = new SharedObjectRef(ctx.waiter_id).proxy<{
+    is_rustc_fetch_end: () => Promise<boolean>;
+  }>();
+
+  while (!(await waiter.is_rustc_fetch_end())) {
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  }
+
+  console.log("loading llvm");
+
+  await ready_llvm_wasm(wasi_refs, ctx);
+});
+
+import { get_llvm_wasm } from "../../../lib/src/get_llvm_wasm";
+import { strace } from "@bjorn3/browser_wasi_shim";
+let linker: WebAssembly.Instance & {
+  exports: { memory: WebAssembly.Memory; _start: () => unknown };
+};
+let wasi: WASIFarmAnimal;
+
+const ready_llvm_wasm = async (
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  wasi_refs: any[],
+  ctx: Ctx,
+) => {
+  const linker_wasm = await get_llvm_wasm();
+
+  console.log("linker_wasm", linker_wasm);
+
+  wasi = new WASIFarmAnimal(
+    wasi_refs,
+    ["llvm"], // args
+    [], // env
+    // {
+      // debug: true,
+      // can_thread_spawn: true,
+      // thread_spawn_worker_url: new URL(thread_spawn_path, import.meta.url)
+      //   .href,
+      // thread_spawn_wasm: linker,
+    // },
+  );
+
+  linker = (await WebAssembly.instantiate(linker_wasm, {
+    wasi_snapshot_preview1: strace(wasi.wasiImport, []),
+  })) as unknown as {
+    exports: { memory: WebAssembly.Memory; _start: () => unknown };
+  };
+
+  const memory_reset = linker.exports.memory.buffer;
+  const memory_reset_view = new Uint8Array(memory_reset).slice();
+
+  shared.push(
+    new SharedObject((...args) => {
+      try {
+        if (args[0] !== "llvm") {
+          wasi.args = ["llvm", ...args];
+        } else {
+          wasi.args = args;
+        }
+        console.log(`wasi.start: ${wasi.args}`);
+        console.log(wasi);
+        const memory_view = new Uint8Array(linker.exports.memory.buffer);
+        memory_view.set(memory_reset_view);
+        wasi.start(linker);
+        console.log("wasi.start done");
+      } catch (e) {
+        console.error(e);
+      }
+    }, ctx.llvm_id),
+  );
+
+  console.log("llvm loaded");
+};

page/src/worker_process/llvm.ts

@@ -0,0 +1,82 @@
+import { SharedObject, SharedObjectRef } from "@oligami/shared-object";
+import { get_rustc_wasm } from "../../../lib/src/get_rustc_wasm";
+import { WASIFarmAnimal } from "@oligami/browser_wasi_shim-threads";
+import type { Ctx } from "../ctx";
+
+import thread_spawn_path from "./thread_spawn.ts?worker&url";
+
+let terminal: (string) => void;
+let compiler: WebAssembly.Module;
+const wasi_refs = [];
+let ctx: Ctx;
+let rustc_shared: SharedObject;
+let waiter: {
+  rustc: () => Promise<void>;
+  end_rustc_fetch: () => Promise<void>;
+};
+
+globalThis.addEventListener("message", async (event) => {
+  if (event.data.ctx) {
+    ctx = event.data.ctx;
+    terminal = new SharedObjectRef(ctx.terminal_id).proxy<
+      (string) => Promise<void>
+    >();
+    await terminal("loading rustc\r\n");
+    waiter = new SharedObjectRef(ctx.waiter_id).proxy<{
+      rustc: () => Promise<void>;
+      end_rustc_fetch: () => Promise<void>;
+    }>();
+    compiler = await get_rustc_wasm();
+
+    await waiter.end_rustc_fetch();
+  } else if (event.data.wasi_ref) {
+    const { wasi_ref } = event.data;
+
+    wasi_refs.push(wasi_ref);
+
+    // wait for the compiler to load
+    while (!compiler) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+
+    await terminal("loaded rustc\r\n");
+
+    while (wasi_refs.length === 1) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+
+    await terminal("loaded wasi\r\n");
+
+    const wasi = new WASIFarmAnimal(
+      wasi_refs,
+      [], // args
+      ["RUST_MIN_STACK=16777216"], // env
+      {
+        // debug: true,
+        can_thread_spawn: true,
+        thread_spawn_worker_url: new URL(thread_spawn_path, import.meta.url)
+          .href,
+        thread_spawn_wasm: compiler,
+      },
+    );
+
+    await wasi.wait_worker_background_worker();
+
+    wasi.get_share_memory().grow(200);
+
+    rustc_shared = new SharedObject((...args) => {
+      try {
+        wasi.args = ["rustc", ...args];
+        console.log("wasi.start");
+        wasi.block_start_on_thread();
+        console.log("wasi.start done");
+      } catch (e) {
+        terminal(`${e.toString()}\r\n`);
+      }
+    }, ctx.rustc_id);
+
+    waiter.rustc();
+  } else if (event.data.wasi_ref_ui) {
+    wasi_refs.push(event.data.wasi_ref_ui);
+  }
+});