@ai-ecoverse/slicc-kernel 1.16.1 → 1.17.1

package/dist/node-process-worker.js

@@ -1020,15 +1020,18 @@ var init_wasi_errno = __esm({
       EPROTONOSUPPORT: 66,
       EOPNOTSUPP: 138,
       EBADF: 8,
+      EBUSY: 10,
       ECHILD: 12,
       EFAULT: 21,
       EINTR: 27,
       EINVAL: 28,
       EIO: 29,
       EMFILE: 33,
+      ENODEV: 43,
       ENOENT: 44,
       ENOEXEC: 45,
       ENOSYS: 52,
+      ENOTDIR: 54,
       ENOTTY: 59,
       ENXIO: 60,
       EPERM: 63,
@@ -1443,10 +1446,30 @@ function ownReady(Fs, read, write) {
     write: write.filter((fd) => flags(fd) & (POLLOUT2 | POLLERR2 | POLLNVAL))
   };
 }
+function anySelect(Fs, transport, read, write, timeoutMs) {
+  const kernel = (fd) => Fs.getStream(fd)?.sliccKernelFd;
+  const own = (fd) => kernel(fd) === void 0;
+  if (![...read, ...write].some(own)) return kernelSelect(Fs, transport, read, write, timeoutMs);
+  const deadline = timeoutMs < 0 ? Number.POSITIVE_INFINITY : Date.now() + timeoutMs;
+  const kernelRead = read.filter((fd) => !own(fd));
+  const kernelWrite = write.filter((fd) => !own(fd));
+  for (; ; ) {
+    const local = ownReady(Fs, read.filter(own), write.filter(own));
+    const pending = local.read.length > 0 || local.write.length > 0;
+    const slice = pending ? 0 : Math.min(SELECT_SLICE_MS, Math.max(0, deadline - Date.now()));
+    const got = kernelSelect(Fs, transport, kernelRead, kernelWrite, slice);
+    if (typeof got === "number") return got;
+    const ready = { read: [...local.read, ...got.read], write: [...local.write, ...got.write] };
+    if (ready.read.length > 0 || ready.write.length > 0 || Date.now() >= deadline) {
+      return ready;
+    }
+  }
+}
 function createProcessKernel(deps) {
   const { transport, Fs } = deps;
   const reaped = /* @__PURE__ */ new Map();
   const call2 = (req, label) => transport.call(req, Infinity, label);
+  const at = (path) => path === "" || path.startsWith("/") ? path : `${Fs.cwd()}/${path}`;
   const slot = (fd, n, promote) => {
     const stream = fd >= 0 ? Fs.getStream(fd) : null;
     if (!stream) return { none: true };
@@ -1483,35 +1506,52 @@ function createProcessKernel(deps) {
       Fs.write(stream, r.bytes, 0, r.bytes.length);
     }
   };
+  const execCaptures = /* @__PURE__ */ new Map();
+  const execWait = (pid) => {
+    const r = transport.call({ op: "proc-exec", pid }, Infinity, `exec ${pid}`);
+    if (!r.ok) return -wasiErrno(r.errno);
+    deps.afterChild();
+    return r.kind === "json" ? r.json[1] : 0;
+  };
+  const spawnChild = (file, argv, env, cwd, fds, actions, exec) => {
+    const unflushed = flushed(deps.beforeSpawn);
+    if (unflushed < 0) return unflushed;
+    const promote = deps.stdioPromoter?.();
+    const stdio = [0, 1, 2].map((n) => slot(fds[n] ?? -1, n, promote));
+    const inherit = deps.inherit?.(actions) ?? [];
+    const r = transport.call(
+      {
+        op: "proc-spawn",
+        file,
+        argv,
+        env: env ?? deps.env,
+        cwd: cwd ?? Fs.cwd(),
+        stdio,
+        ...inherit.length > 0 ? { inherit } : {},
+        ...exec ? { exec } : {}
+      },
+      Infinity,
+      `proc-spawn ${file}`
+    );
+    if (!r.ok) return -wasiErrno(r.errno);
+    const pid = r.kind === "json" ? r.json : 0;
+    const captures = [1, 2].filter((n) => "capture" in stdio[n]);
+    if (captures.length === 0) return pid;
+    if (exec) {
+      execCaptures.set(pid, () => {
+        for (const n of captures) deliver(pid, n, fds[n]);
+      });
+      return pid;
+    }
+    const waited = kernelWait(pid, false);
+    if (typeof waited === "number") return waited;
+    for (const n of captures) deliver(pid, n, fds[n]);
+    reaped.set(pid, waited[1]);
+    return pid;
+  };
   return {
     spawn(file, argv, env, cwd, fds, actions) {
-      const unflushed = flushed(deps.beforeSpawn);
-      if (unflushed < 0) return unflushed;
-      const promote = deps.stdioPromoter?.();
-      const stdio = [0, 1, 2].map((n) => slot(fds[n] ?? -1, n, promote));
-      const inherit = deps.inherit?.(actions) ?? [];
-      const r = transport.call(
-        {
-          op: "proc-spawn",
-          file,
-          argv,
-          env: env ?? deps.env,
-          cwd: cwd ?? Fs.cwd(),
-          stdio,
-          ...inherit.length > 0 ? { inherit } : {}
-        },
-        Infinity,
-        `proc-spawn ${file}`
-      );
-      if (!r.ok) return -wasiErrno(r.errno);
-      const pid = r.kind === "json" ? r.json : 0;
-      const captures = [1, 2].filter((n) => "capture" in stdio[n]);
-      if (captures.length === 0) return pid;
-      const waited = kernelWait(pid, false);
-      if (typeof waited === "number") return waited;
-      for (const n of captures) deliver(pid, n, fds[n]);
-      reaped.set(pid, waited[1]);
-      return pid;
+      return spawnChild(file, argv, env, cwd, fds, actions, false);
     },
     fork(state) {
       const unflushed = flushed(deps.beforeSpawn);
@@ -1525,35 +1565,26 @@ function createProcessKernel(deps) {
       if (!r.ok) return -wasiErrno(r.errno);
       return r.kind === "json" ? r.json : -wasiErrno("EIO");
     },
-    select(read, write, timeoutMs) {
-      const kernel = (fd) => Fs.getStream(fd)?.sliccKernelFd;
-      const own = (fd) => kernel(fd) === void 0;
-      if (![...read, ...write].some(own))
-        return kernelSelect(Fs, transport, read, write, timeoutMs);
-      const deadline = timeoutMs < 0 ? Number.POSITIVE_INFINITY : Date.now() + timeoutMs;
-      const kernelRead = read.filter((fd) => !own(fd));
-      const kernelWrite = write.filter((fd) => !own(fd));
-      for (; ; ) {
-        const local = ownReady(Fs, read.filter(own), write.filter(own));
-        const pending = local.read.length > 0 || local.write.length > 0;
-        const slice = pending ? 0 : Math.min(SELECT_SLICE_MS, Math.max(0, deadline - Date.now()));
-        const got = kernelSelect(Fs, transport, kernelRead, kernelWrite, slice);
-        if (typeof got === "number") return got;
-        const ready = { read: [...local.read, ...got.read], write: [...local.write, ...got.write] };
-        if (ready.read.length > 0 || ready.write.length > 0 || Date.now() >= deadline) {
-          return ready;
-        }
-      }
-    },
-    execWait(pid) {
-      const r = transport.call({ op: "proc-exec", pid }, Infinity, `exec ${pid}`);
-      if (!r.ok) return -wasiErrno(r.errno);
-      deps.afterChild();
-      return r.kind === "json" ? r.json[1] : 0;
+    select: (read, write, timeoutMs) => anySelect(Fs, transport, read, write, timeoutMs),
+    execWait,
+    execve(file, argv, env, cwd) {
+      const pid = spawnChild(file, argv, env, cwd, [0, 1, 2], void 0, true);
+      if (pid < 0) return pid;
+      const status2 = execWait(pid);
+      execCaptures.get(pid)?.();
+      execCaptures.delete(pid);
+      return status2;
     },
     pause() {
       return status(call2({ op: "sig-pause" }, "pause"));
     },
+    mount(source, target, type, flags, data) {
+      const req = { op: "mount", source, target: at(target), type, flags, data };
+      return status(call2(req, `mount ${target}`));
+    },
+    umount2(target, flags) {
+      return status(call2({ op: "umount", target: at(target), flags }, `umount ${target}`));
+    },
     kill(pid, sig) {
       if (pid === deps.pid) {
         if (sig !== 0) deps.raise?.(sig);
@@ -1973,6 +2004,7 @@ function mountTable(mounts = []) {
   const lines = [`${root} / ${root} rw 0 0`, "devfs /dev devfs rw 0 0", "proc /proc proc rw 0 0"];
   for (const m of mounts) {
     const options = Object.entries(m.options).map(([k, v]) => v === "" ? k : `${k}=${v}`);
+    if (m.state !== "ok") options.push(m.state);
     const access = options.includes("ro") ? [] : ["rw"];
     lines.push(
       `${field(m.source)} ${field(m.target)} ${m.type} ${[...access, ...options].join(",")} 0 0`
@@ -4414,6 +4446,24 @@ var init_wasi_host = __esm({
       get cwd() {
         return this.fds.cwd() ?? this.startCwd;
       }
+      sliccImports() {
+        const { mem } = this;
+        const path = (p, l) => {
+          const text = mem.string(p, l);
+          return text === "" || text.startsWith("/") ? text : normalize(`${this.cwd}/${text}`);
+        };
+        return wrap({
+          mount: (sp, sl, tp, tl, fp, fl, flags, dp, dl) => void this.o.kernel.call({
+            op: "mount",
+            source: mem.string(sp, sl),
+            target: path(tp, tl),
+            type: mem.string(fp, fl),
+            flags,
+            data: mem.string(dp, dl)
+          }),
+          umount2: (tp, tl, flags) => void this.o.kernel.call({ op: "umount", target: path(tp, tl), flags })
+        });
+      }
       imports() {
         this.cache ??= wrap({
           ...this.processImports(),
@@ -5788,7 +5838,7 @@ var init_wasix_process = __esm({
           ...op.oflags & OFLAG_TRUNC ? { truncate: true } : {}
         });
       }
-      spawn(req) {
+      spawn(req, exec = false) {
         const { stdio, inherit, cwd, opened } = this.childFds(req.ops ?? []);
         try {
           return this.call({
@@ -5798,7 +5848,8 @@ var init_wasix_process = __esm({
             env: req.env ?? this.environment(),
             cwd,
             stdio,
-            inherit
+            inherit,
+            ...exec ? { exec } : {}
           });
         } finally {
           for (const kfd of opened) this.host.o.kernel.sys.close(kfd);
@@ -5806,7 +5857,7 @@ var init_wasix_process = __esm({
         }
       }
       exec(req) {
-        const pid = this.spawn(req);
+        const pid = this.spawn(req, true);
         const [, status2] = this.call({ op: "proc-exec", pid });
         const sig = status2 & 127;
         throw new WasiExit(sig ? 128 + sig : status2 >> 8 & 255);
@@ -6549,12 +6600,14 @@ function unsupportedImport(module, memory, extended = false, foreign = {}) {
   }
   return void 0;
 }
-function linkImports(module, preview1, wasix, memory, threads, program = {}, foreign) {
+function linkImports(module, preview1, wasix, memory, threads, program = {}, foreign, slicc = {}) {
   for (const ns of Object.keys(program)) {
-    if (RESERVED.has(ns)) throw new Error(`the imports module may not define ${ns}`);
+    if (RESERVED.has(ns) || ns === SLICC)
+      throw new Error(`the imports module may not define ${ns}`);
   }
   const imports = {
     ...program,
+    [SLICC]: { ...slicc },
     [PREVIEW1]: preview1,
     ...wasix ? { [WASIX]: { ...wasix } } : {},
     ...threads ? { wasi: { "thread-spawn": (arg) => threads.spawn(arg) } } : {}
@@ -6680,7 +6733,8 @@ async function instantiate(host, module, memory, threads, {
     () => memory ?? instance?.exports.memory,
     () => instance
   );
-  const hostImports = linkImports(module, preview1, wasix, memory, threads, extra, foreign);
+  const slicc = traced(stats, "slicc", host.sliccImports());
+  const hostImports = linkImports(module, preview1, wasix, memory, threads, extra, foreign, slicc);
   const imports = sync ? merge(hostImports, sync.linker.mainImports(module)) : hostImports;
   instance = await WebAssembly.instantiate(module, imports);
   stats?.phase("instantiate");
@@ -6856,7 +6910,7 @@ async function runWasiThread(init, port2) {
     throw e;
   }
 }
-var TRAPPED, PREVIEW1, WASIX, RESERVED, noErrno, FALLBACK_MAXIMUM_PAGES, LinkSync, DL_GEN, BACKTRACE_FRAMES;
+var TRAPPED, PREVIEW1, WASIX, SLICC, RESERVED, noErrno, FALLBACK_MAXIMUM_PAGES, LinkSync, DL_GEN, BACKTRACE_FRAMES;
 var init_wasi_runtime = __esm({
   "src/process/wasi/wasi-runtime.ts"() {
     "use strict";
@@ -6881,6 +6935,7 @@ var init_wasi_runtime = __esm({
     TRAPPED = 134;
     PREVIEW1 = "wasi_snapshot_preview1";
     WASIX = "wasix_32v1";
+    SLICC = "slicc";
     RESERVED = RESERVED_NAMESPACES;
     noErrno = (key) => `imports ${key}: its result cannot carry ENOSYS, and this host does not provide it`;
     FALLBACK_MAXIMUM_PAGES = 32768;