@ai-ecoverse/slicc-kernel 1.132.0 → 1.133.0

package/dist/process-worker.js

@@ -2664,7 +2664,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.132.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.133.0" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -6540,6 +6540,22 @@ function physicalPath(fs, path) {
   }
   return `/${walk.done.join("/")}`;
 }
+function physicalLeaf(fs, path) {
+  const walk = start(path);
+  for (let part = next(walk); part !== void 0; part = next(walk)) {
+    const at = `/${[...walk.done, part].join("/")}`;
+    let target;
+    try {
+      target = fs.lstat(at).isSymbolicLink ? fs.readlink(at) : void 0;
+    } catch {
+      const tail = walk.todo;
+      return tail.some((p) => p === "." || p === "..") ? void 0 : [at, ...tail].join("/");
+    }
+    if (target === void 0) walk.done.push(part);
+    else if (!follow(walk, target)) return void 0;
+  }
+  return `/${walk.done.join("/")}`;
+}
 async function physicalPathAsync(fs, path) {
   const walk = start(path);
   for (let part = next(walk); part !== void 0; part = next(walk)) {
@@ -8518,6 +8534,14 @@ var init_wasi_fds = __esm({
           this.table.set(3 + i, entry);
         });
       }
+      adoptCopy(fd) {
+        const at = this.kernel.call({ op: "fd-dup", fd, min: 3 });
+        this.table.set(at, this.stdioEntry(at));
+        return at;
+      }
+      preopenAt(path, name2) {
+        return this.install({ type: "dir", path: normalize(path), preopen: name2 });
+      }
       preopens(cwd, root) {
         const here = normalize(cwd);
         const dot = { type: "dir", path: here, preopen: "." };
@@ -10328,7 +10352,7 @@ var init_wasi_host = __esm({
         );
         if (o.shared) this.fds.share(o.shared, true);
         else if (o.forked) this.fds.restore(o.forked.fds, o.forked.cloexec);
-        else this.fds.setup(o.cwd, o.inherited ?? [], o.preopenRoot === true);
+        else if (!o.bare) this.fds.setup(o.cwd, o.inherited ?? [], o.preopenRoot === true);
         this.listening = o.shared ? [] : this.fds.sockets();
       }
       get cwd() {
@@ -10741,6 +10765,7 @@ var init_wasi_host = __esm({
         return (localCpuNanos() ?? BigInt(Math.round((performance.now() - this.started) * 1e6))) + 1n;
       }
       environ() {
+        if (this.o.bare) return Object.entries(this.o.env).map(([k, v]) => `${k}=${v}`);
         const listen2 = this.listening.length > 0 ? { SLICC_LISTEN_FDS: this.listening.join(" ") } : {};
         const env = { PWD: this.cwd, ...this.o.env, ...listen2 };
         return Object.entries(env).map(([k, v]) => `${k}=${v}`);
@@ -11231,8 +11256,8 @@ var init_wasi_host = __esm({
       }
       linkedDev(path, follow3) {
         if (!follow3) return void 0;
-        const real = physicalPath(this.o.fs, path);
-        return real !== path && kernelDev(real) ? real : void 0;
+        const real = physicalLeaf(this.o.fs, path);
+        return real !== void 0 && real !== path && kernelDev(real) ? real : void 0;
       }
       statOf(path, follow3) {
         return follow3 ? this.o.fs.stat(path) : this.o.fs.lstat(path);
@@ -11260,12 +11285,12 @@ var init_wasi_host = __esm({
           if (!follow3) {
             const slash = path.lastIndexOf("/");
             if (slash <= 0) return void 0;
-            const parent = physicalPath(this.o.fs, path.slice(0, slash));
-            const resolved3 = `${parent}/${path.slice(slash + 1)}`;
-            return resolved3 !== path && this.synthetic(resolved3) ? resolved3 : void 0;
+            const parent = physicalLeaf(this.o.fs, path.slice(0, slash));
+            const resolved3 = parent === void 0 ? void 0 : `${parent}/${path.slice(slash + 1)}`;
+            return resolved3 !== void 0 && resolved3 !== path && this.synthetic(resolved3) ? resolved3 : void 0;
           }
-          const resolved2 = physicalPath(this.o.fs, path);
-          return resolved2 !== path && this.synthetic(resolved2) ? resolved2 : void 0;
+          const resolved2 = physicalLeaf(this.o.fs, path);
+          return resolved2 !== void 0 && resolved2 !== path && this.synthetic(resolved2) ? resolved2 : void 0;
         } catch {
           return void 0;
         }
@@ -16746,6 +16771,288 @@ var init_js_tty = __esm({
   }
 });
 
+// src/process/js/js-wasi.ts
+function ownedFds(sab) {
+  if (!sab) return { add: () => {
+  }, remove: () => {
+  } };
+  const view = new Int32Array(sab);
+  const fds = /* @__PURE__ */ new Set();
+  const publish = () => {
+    Atomics.store(view, 0, 0);
+    let n = 0;
+    for (const fd of fds) {
+      if (1 + n >= view.length) break;
+      view[1 + n++] = fd;
+    }
+    Atomics.store(view, 0, n);
+  };
+  return {
+    add(fd) {
+      fds.add(fd);
+      publish();
+    },
+    remove(fd) {
+      if (fds.delete(fd)) publish();
+    }
+  };
+}
+function fdArgsOf(name2) {
+  const paths = PATHS[name2];
+  if (paths) return paths.map(([fd]) => fd);
+  return /^(fd|sock)_/.test(name2) ? [0] : [];
+}
+function laneTransport(lane) {
+  return { call: (req) => lane(req) };
+}
+function within2(root, dir, path) {
+  if (path.startsWith("/")) return false;
+  const base = dir === root ? [] : dir.slice(root === "/" ? 1 : root.length + 1).split("/");
+  const parts = [...base];
+  for (const seg of path.split("/")) {
+    if (seg === "" || seg === ".") continue;
+    if (seg === "..") {
+      if (parts.length === 0) return false;
+      parts.pop();
+    } else parts.push(seg);
+  }
+  return true;
+}
+function preopensOf(given, resolve) {
+  if (given === void 0) return [];
+  if (typeof given !== "object" || given === null) throw new JsCallError("EINVAL", "wasi preopens");
+  return Object.entries(given).map(([name2, path]) => {
+    if (typeof path !== "string" || path === "") throw new JsCallError("EINVAL", "wasi preopens");
+    return [name2, normalize(resolve(path))];
+  });
+}
+function createJsWasi(deps, o = {}) {
+  const transport = laneTransport(deps.lane);
+  const sys = kernelSys(transport);
+  const call2 = (req) => {
+    const r = deps.lane(req);
+    if (!r.ok) throw new JsCallError(r.errno, req.op);
+    return r.kind === "json" ? r.json : r.kind === "bytes" ? r.bytes : void 0;
+  };
+  const host = new WasiHost({
+    args: [...o.args ?? []],
+    env: { ...o.env ?? {} },
+    cwd: deps.cwd,
+    pid: deps.pid,
+    kernel: { sys, call: call2 },
+    fs: createSyncFsSabBridge(transport, { ...deps.fs, direct: true }),
+    bare: true
+  });
+  const owned = deps.owned;
+  const guest = /* @__PURE__ */ new Map();
+  const own = (g, k) => {
+    guest.set(g, k);
+    owned.add(k);
+  };
+  const roots = /* @__PURE__ */ new Map();
+  const opened2 = [];
+  const closeKernel = (fd) => {
+    owned.remove(fd);
+    try {
+      host.fds.close(fd);
+    } catch {
+    }
+  };
+  try {
+    (o.stdio ?? [0, 1, 2]).forEach((fd, i) => {
+      const k = host.fds.adoptCopy(fd);
+      opened2.push(k);
+      own(i, k);
+    });
+    for (const [name2, path] of preopensOf(o.preopens, deps.resolve)) {
+      const k = host.fds.preopenAt(path, name2);
+      opened2.push(k);
+      const g = 3 + roots.size;
+      own(g, k);
+      roots.set(g, path);
+    }
+  } catch (err) {
+    for (const k of opened2) closeKernel(k);
+    throw err;
+  }
+  const table = host.imports();
+  const view = () => host.mem.view();
+  const free = () => {
+    let g = 3;
+    while (guest.has(g)) g++;
+    return g;
+  };
+  const confined = (name2, args) => {
+    for (const [fdAt, ptrAt, lenAt] of PATHS[name2] ?? []) {
+      const g = args[fdAt];
+      const root = roots.get(g);
+      const dir = host.fds.find(guest.get(g));
+      if (root === void 0 || dir?.type !== "dir") continue;
+      if (!within2(root, dir.path, host.mem.string(args[ptrAt], args[lenAt]))) return false;
+    }
+    return true;
+  };
+  const opens = (out, root) => {
+    const k = view().getUint32(out, true);
+    const g = free();
+    own(g, k);
+    if (root !== void 0) roots.set(g, root);
+    view().setUint32(out, g, true);
+  };
+  const imports = {};
+  for (const [name2, fn] of Object.entries(table)) {
+    if (SPECIAL.has(name2)) continue;
+    const fdArgs = fdArgsOf(name2);
+    imports[name2] = ((...raw) => {
+      const args = [...raw];
+      for (const at of fdArgs) {
+        const k = guest.get(args[at]);
+        if (k === void 0) return E.BADF;
+        args[at] = k;
+      }
+      if (!confined(name2, raw)) return E.NOTCAPABLE;
+      const out = RESULTS[name2];
+      if (out !== void 0 && (raw[out] >>> 0) + 4 > host.mem.size()) return E.FAULT;
+      const errno2 = fn(...args);
+      if (errno2 !== E.SUCCESS) return errno2;
+      if (out !== void 0) opens(raw[out] >>> 0, roots.get(raw[0]));
+      return errno2;
+    });
+  }
+  imports.fd_close = ((g) => {
+    const k = guest.get(g);
+    if (k === void 0) return E.BADF;
+    guest.delete(g);
+    roots.delete(g);
+    owned.remove(k);
+    return table.fd_close(k);
+  });
+  imports.fd_renumber = ((from, to) => {
+    const kf = guest.get(from);
+    const kt = guest.get(to);
+    if (kf === void 0 || kt === void 0) return E.BADF;
+    if (from === to) return E.SUCCESS;
+    closeKernel(kt);
+    guest.set(to, kf);
+    const root = roots.get(from);
+    if (root === void 0) roots.delete(to);
+    else roots.set(to, root);
+    guest.delete(from);
+    roots.delete(from);
+    return E.SUCCESS;
+  });
+  imports.poll_oneoff = ((inPtr, outPtr, n, nevents) => {
+    const v = view();
+    const swapped = [];
+    for (let i = 0; i < n; i++) {
+      const at = inPtr + i * SUB_SIZE;
+      const tag = v.getUint8(at + SUB_TAG);
+      if (tag !== EVENTTYPE.FD_READ && tag !== EVENTTYPE.FD_WRITE) continue;
+      const g = v.getUint32(at + SUB_FD, true);
+      swapped.push([at + SUB_FD, g]);
+      v.setUint32(at + SUB_FD, guest.get(g) ?? NO_FD, true);
+    }
+    try {
+      return table.poll_oneoff(inPtr, outPtr, n, nevents);
+    } finally {
+      const after = view();
+      for (const [at, g] of swapped) after.setUint32(at, g, true);
+    }
+  });
+  imports.proc_exit = ((code2) => {
+    throw new JsWasiExit(code2);
+  });
+  let closed = false;
+  const run = (instance, entry) => {
+    const memory = instance.exports.memory;
+    if (memory instanceof WebAssembly.Memory) host.mem.bind(memory);
+    const fn = instance.exports[entry];
+    if (typeof fn !== "function") {
+      if (entry === "_initialize") return 0;
+      throw new JsCallError("EINVAL", `wasi: the instance exports no ${entry}`);
+    }
+    try {
+      fn();
+      return 0;
+    } catch (err) {
+      if (err instanceof JsWasiExit && o.returnOnExit !== false) return err.code;
+      throw err;
+    }
+  };
+  const wasi = {
+    imports: { wasi_snapshot_preview1: imports },
+    wasiImport: imports,
+    bind: (memory) => {
+      if (!(memory instanceof WebAssembly.Memory)) throw new JsCallError("EINVAL", "wasi bind");
+      host.mem.bind(memory);
+    },
+    start: (instance) => run(instance, "_start"),
+    initialize: (instance) => void run(instance, "_initialize"),
+    close: () => {
+      if (closed) return;
+      closed = true;
+      deps.live.delete(wasi);
+      for (const k of guest.values()) closeKernel(k);
+      guest.clear();
+      roots.clear();
+    }
+  };
+  deps.live.add(wasi);
+  return wasi;
+}
+function wasiFor(o) {
+  const deps = { ...o, live: /* @__PURE__ */ new Set(), owned: ownedFds(o.owned) };
+  return {
+    create: (options) => createJsWasi(deps, options),
+    closeAll: () => {
+      for (const wasi of [...deps.live]) wasi.close();
+    }
+  };
+}
+var JsWasiExit, SUB_SIZE, SUB_TAG, SUB_FD, NO_FD, PATHS, RESULTS, SPECIAL;
+var init_js_wasi = __esm({
+  "src/process/js/js-wasi.ts"() {
+    "use strict";
+    init_sync_sab_bridge();
+    init_process_runtime();
+    init_wasi_abi();
+    init_wasi_files();
+    init_wasi_host();
+    init_js_kernel();
+    JsWasiExit = class extends Error {
+      code;
+      constructor(code2) {
+        super(`wasi exit ${code2}`);
+        this.code = code2;
+      }
+    };
+    SUB_SIZE = 48;
+    SUB_TAG = 8;
+    SUB_FD = 16;
+    NO_FD = 2147483647;
+    PATHS = {
+      path_open: [[0, 2, 3]],
+      path_filestat_get: [[0, 2, 3]],
+      path_filestat_set_times: [[0, 2, 3]],
+      path_create_directory: [[0, 1, 2]],
+      path_remove_directory: [[0, 1, 2]],
+      path_unlink_file: [[0, 1, 2]],
+      path_readlink: [[0, 1, 2]],
+      path_symlink: [[2, 3, 4]],
+      path_rename: [
+        [0, 1, 2],
+        [3, 4, 5]
+      ],
+      path_link: [
+        [0, 2, 3],
+        [4, 5, 6]
+      ]
+    };
+    RESULTS = { path_open: 8, sock_accept: 2 };
+    SPECIAL = /* @__PURE__ */ new Set(["fd_close", "fd_renumber", "poll_oneoff", "proc_exit"]);
+  }
+});
+
 // src/process/js/js-watch.ts
 function watchRequest(path, options) {
   return { op: "watch-open", path, ...options?.recursive ? { recursive: true } : {} };
@@ -17295,14 +17602,17 @@ function createContext(o) {
   const syncKernel = new JsSyncKernel(lane, kernel, unwind);
   const terminal = ttyOps(kernel, syncKernel);
   const shared = { pid: o.pid, resolve, random, infos, handles, closing };
+  const wasi = wasiFor({ lane, pid: o.pid, cwd: o.cwd, resolve, fs: o.fs, owned: o.owned });
   const sync = {
     kernel: KERNEL_INFO,
     tty: terminal.syncTty,
     ...watchingSyncOps(kernel, syncKernel, shared),
     run: (options) => runSync(syncKernel, { env: o.env, cwd: o.cwd, resolve, signal: signalNumber }, options),
     spawn: (options) => spawnSync(options),
+    wasi: { create: wasi.create },
     exit: (status2 = 0) => {
       exiting ??= status2 & 255;
+      wasi.closeAll();
       return exitAtOnce(lane, [...writes], terminal.modes(), exiting);
     },
     kill: killer({ self: o.pid, kernel, syncKernel, lane, writes, modes: terminal.modes }),
@@ -17374,6 +17684,7 @@ function createContext(o) {
     onUnhandledRejection: (listener) => listen(strays.rejection, listener)
   };
   const drain2 = async () => {
+    wasi.closeAll();
     for (; ; ) {
       await Promise.all([...pending]);
       await new Promise((resolve2) => setTimeout(resolve2, 0));
@@ -17585,6 +17896,7 @@ var init_js_context = __esm({
     init_js_run();
     init_js_sync();
     init_js_tty();
+    init_js_wasi();
     init_js_watch();
     init_js_websocket();
     KERNEL_INFO = Object.freeze({ version: KERNEL_VERSION });
@@ -17766,8 +18078,10 @@ async function runJs(init, port2, deps, thread) {
     cwd: init.cwd,
     exit: (status3) => exited(statusOf(status3)),
     lane: laneOf(init.lane),
+    fs: { owners: init.owners === true, links: init.links === true },
     strays,
-    thread: threadContext(port2, thread)
+    thread: threadContext(port2, thread),
+    ...thread?.owned ? { owned: thread.owned } : {}
   });
   const say = (text) => ctx.write(2, `${init.argv0}: ${text}
 `).catch(() => void 0);