@ai-ecoverse/slicc-kernel 1.86.0 → 1.87.0

package/dist/node-process-worker.js

@@ -1984,12 +1984,10 @@ var init_wasi_fds = __esm({
         let fd;
         let kind;
         if (path === SEALED_PATH && openSealed) {
-          if (oflags & OFLAGS.DIRECTORY) throw new WasiError("ENOTDIR");
-          if (oflags & OFLAGS.CREAT && oflags & OFLAGS.EXCL) throw new WasiError("EEXIST");
-          fd = openSealed.call(this.kernel.sys);
+          fd = this.openCharDevice(openSealed, oflags, rights);
           kind = "sealed";
         } else if (path === CLIPBOARD_PATH && openClipboard) {
-          fd = this.openClipboard(openClipboard, oflags, rights);
+          fd = this.openCharDevice(openClipboard, oflags, rights);
           kind = "clipboard";
         } else if (path === "/dev/tty" || /^\/dev\/tty\d+$/.test(path)) {
           fd = openTty?.call(this.kernel.sys, path === "/dev/tty" ? void 0 : path);
@@ -2000,12 +1998,12 @@ var init_wasi_fds = __esm({
         this.bump();
         return fd;
       }
-      openClipboard(openClipboard, oflags, rights) {
+      openCharDevice(openDevice2, oflags, rights) {
         if (oflags & OFLAGS.DIRECTORY) throw new WasiError("ENOTDIR");
         if (oflags & OFLAGS.CREAT && oflags & OFLAGS.EXCL) throw new WasiError("EEXIST");
         const want = wantOf(oflags, rights);
         const flags = want === 6 ? O_RDWR : want === 2 ? O_WRONLY : 0;
-        return openClipboard.call(this.kernel.sys, flags);
+        return openDevice2.call(this.kernel.sys, flags);
       }
       open(path, oflags, rights, fdflags) {
         const device2 = deviceOf(path);
@@ -3621,7 +3619,7 @@ function importsContext({
 }
 function processes(host, call2, inThread) {
   const close = (fd) => void call2({ op: "fd-close", fd });
-  const slot = (n, how, mine, theirs) => {
+  const slot2 = (n, how, mine, theirs) => {
     if (how === "inherit") return { fd: n };
     if (how === "null") return { none: true };
     const [read2, write2] = call2({ op: "fd-pipe" });
@@ -3635,7 +3633,7 @@ function processes(host, call2, inThread) {
       const theirs = [];
       host.fds.promoteFiles();
       try {
-        const stdio = STDIO.map((name2, n) => slot(n, o[name2] ?? "inherit", mine, theirs));
+        const stdio = STDIO.map((name2, n) => slot2(n, o[name2] ?? "inherit", mine, theirs));
         const req = {
           op: "proc-spawn",
           file: o.argv[0],
@@ -4081,7 +4079,7 @@ function writable(io, fd) {
     abort: () => io.close(fd)
   });
 }
-function childOps(kernel, io, defaults) {
+function childOps(kernel, io, defaults, sync) {
   const wait2 = async (pid) => {
     const r = await kernel.blocking({ op: "proc-wait", pid, nohang: false });
     const [, status2] = r.ok && r.kind === "json" ? r.json : [0, 0];
@@ -4101,25 +4099,43 @@ function childOps(kernel, io, defaults) {
       kill: (signal) => kill(pid, signal)
     };
   };
-  const spawn = async (o) => {
+  const request = (o) => {
     const [file] = o.argv;
     if (file === void 0) throw new JsCallError("EINVAL", "spawn");
     const group = groupOf(o, "spawn");
     const named = argv0Of(o.argv0, "spawn");
+    return (stdio) => ({
+      op: "proc-spawn",
+      file,
+      argv: [...o.argv],
+      ...named,
+      env: { ...o.env ?? defaults.env },
+      cwd: o.cwd ?? defaults.cwd,
+      stdio,
+      ...group
+    });
+  };
+  const spawnSync = (o) => {
+    const spawning = request(o);
+    const mine = [];
+    const theirs = [];
+    try {
+      const stdio = slotsSync(sync, o, mine, theirs);
+      return childOf(sync.json(spawning(stdio)), mine);
+    } catch (err) {
+      closeAllSync(sync, mine);
+      throw err;
+    } finally {
+      closeAllSync(sync, theirs);
+    }
+  };
+  const spawn = async (o) => {
+    const spawning = request(o);
     const mine = [];
     const theirs = [];
     try {
       const stdio = await slots2(kernel, o, mine, theirs);
-      const pid = await kernel.json({
-        op: "proc-spawn",
-        file,
-        argv: [...o.argv],
-        ...named,
-        env: { ...o.env ?? defaults.env },
-        cwd: o.cwd ?? defaults.cwd,
-        stdio,
-        ...group
-      });
+      const pid = await kernel.json(spawning(stdio));
       return childOf(pid, mine);
     } catch (err) {
       await closeAll(io, mine);
@@ -4128,7 +4144,7 @@ function childOps(kernel, io, defaults) {
       await closeAll(io, theirs);
     }
   };
-  return { spawn, wait: wait2, kill };
+  return { spawn, wait: wait2, kill, spawnSync };
 }
 function groupOf(o, call2) {
   const { pgid, session } = o;
@@ -4147,27 +4163,43 @@ function argv0Of(argv0, call2) {
 async function closeAll(io, fds) {
   for (const fd of fds) if (fd !== void 0) await io.close(fd).catch(() => void 0);
 }
-async function preflight(kernel, hows) {
+function closeAllSync(sync, fds) {
+  for (const fd of fds) if (fd !== void 0) sync.raw({ op: "fd-close", fd });
+}
+function checked(hows) {
+  const fds = [];
   for (const [n, how] of hows.entries()) {
     if (how === "pipe" || how === "null") continue;
     if (how !== "inherit" && typeof how !== "number") throw new JsCallError("EINVAL", "spawn");
-    await kernel.json({ op: "fd-info", fd: how === "inherit" ? n : how });
+    fds.push(how === "inherit" ? n : how);
   }
+  return fds;
+}
+async function preflight(kernel, hows) {
+  for (const fd of checked(hows)) await kernel.json({ op: "fd-info", fd });
+}
+function slot(n, how, pipe, mine, theirs) {
+  if (how === "inherit") return { fd: n };
+  if (how === "null") return { none: true };
+  if (typeof how === "number") return { fd: how };
+  const [read2, write2] = pipe();
+  mine[n] = n === 0 ? write2 : read2;
+  theirs.push(n === 0 ? read2 : write2);
+  return { fd: n === 0 ? read2 : write2 };
+}
+function slotsSync(sync, o, mine, theirs) {
+  const hows = STDIO2.map((name2) => o[name2] ?? "inherit");
+  for (const fd of checked(hows)) sync.json({ op: "fd-info", fd });
+  const pipe = () => sync.json({ op: "fd-pipe" });
+  return hows.map((how, n) => slot(n, how, pipe, mine, theirs));
 }
 async function slots2(kernel, o, mine, theirs) {
   const hows = STDIO2.map((name2) => o[name2] ?? "inherit");
   await preflight(kernel, hows);
   const stdio = [];
   for (const [n, how] of hows.entries()) {
-    if (how === "inherit") stdio.push({ fd: n });
-    else if (how === "null") stdio.push({ none: true });
-    else if (typeof how === "number") stdio.push({ fd: how });
-    else {
-      const [read2, write2] = await kernel.json({ op: "fd-pipe" });
-      mine[n] = n === 0 ? write2 : read2;
-      theirs.push(n === 0 ? read2 : write2);
-      stdio.push({ fd: n === 0 ? read2 : write2 });
-    }
+    const pair = how === "pipe" ? await kernel.json({ op: "fd-pipe" }) : [];
+    stdio.push(slot(n, how, () => pair, mine, theirs));
   }
   return stdio;
 }
@@ -4433,6 +4465,10 @@ function* aliasOf(fd, abs, o) {
   }
   return { fd: copy2, file };
 }
+function accessFlags(o) {
+  const write2 = o.write === true || o.append === true || o.truncate === true;
+  return write2 ? o.read === true ? 2 : 1 : 0;
+}
 function* opened(abs, o) {
   const node = yield* lookup(abs);
   if (isExclusive(o)) throw new JsCallError("EEXIST", abs);
@@ -4441,13 +4477,13 @@ function* opened(abs, o) {
       return { fd: yield openRequest(abs, { ...o, create: false }), file: false };
     case "tty":
       return { fd: yield { op: "fd-open-tty" }, file: false };
-    case "clipboard": {
-      const write2 = o.write === true || o.append === true || o.truncate === true;
-      const flags = write2 ? o.read === true ? 2 : 1 : 0;
-      return { fd: yield { op: "fd-open-clipboard", flags }, file: false };
-    }
+    case "clipboard":
+      return {
+        fd: yield { op: "fd-open-clipboard", flags: accessFlags(o) },
+        file: false
+      };
     case "sealed":
-      return { fd: yield { op: "fd-open-sealed" }, file: false };
+      return { fd: yield { op: "fd-open-sealed", flags: accessFlags(o) }, file: false };
     case "terminal": {
       const req = node.pts === void 0 ? { op: "fd-open-tty", name: node.name } : { op: "pty-slave-open", n: node.pts, noctty: true };
       return { fd: yield req, file: false };
@@ -6165,6 +6201,7 @@ function createContext(o) {
   const sync = {
     ...syncOps(syncKernel, { pid: o.pid, resolve, random, infos, handles }),
     run: (options) => runSync(syncKernel, { env: o.env, cwd: o.cwd, resolve, signal: signalNumber }, options),
+    spawn: (options) => spawnSync(options),
     exit: (status2 = 0) => {
       exiting ??= status2 & 255;
       return exitAtOnce(lane, [...writes], terminal.modes(), exiting);
@@ -6179,7 +6216,8 @@ function createContext(o) {
     }
   };
   const io = { read: read2, send: writeAll, close: (fd) => ctx.close(fd) };
-  const children = childOps(kernel, io, { env: o.env, cwd: o.cwd, signal: signalNumber });
+  const defaults = { env: o.env, cwd: o.cwd, signal: signalNumber };
+  const { spawnSync, ...children } = childOps(kernel, io, defaults, syncKernel);
   const strays = o.strays ?? { exception: /* @__PURE__ */ new Set(), rejection: /* @__PURE__ */ new Set() };
   const ctx = {
     argv: o.argv,
@@ -7901,7 +7939,7 @@ var init_kernel_streams = __esm({
       openSealed(open, path, flags, mode) {
         const { openSealed } = this.sys;
         if (path !== SEALED_PATH2 || !openSealed) return void 0;
-        const kfd = this.call(() => openSealed.call(this.sys));
+        const kfd = this.call(() => openSealed.call(this.sys, flags & 3));
         return this.vessel(open, kfd, { path, flags, mode }, false);
       }
       openClipboard(open, path, flags, mode) {
@@ -8953,8 +8991,8 @@ function describeInherited(Fs, sys, streams, livePath, actions = []) {
   const out = [];
   for (const [fd, stream] of slots3) {
     promote(stream);
-    const slot = inheritedSlot(fd, stream);
-    if (slot) out.push(slot);
+    const slot2 = inheritedSlot(fd, stream);
+    if (slot2) out.push(slot2);
   }
   return out;
 }
@@ -9172,7 +9210,7 @@ function createProcessKernel(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 slot2 = (fd, n, promote) => {
     const stream = fd >= 0 ? Fs.getStream(fd) : null;
     if (!stream) return { none: true };
     promote?.(stream);
@@ -9221,7 +9259,7 @@ function createProcessKernel(deps) {
     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 stdio = [0, 1, 2].map((n) => slot2(fds[n] ?? -1, n, promote));
     const inherit = deps.inherit?.(actions) ?? [];
     const req = {
       op: "proc-spawn",
@@ -10146,8 +10184,8 @@ function kernelSys(transport) {
     openPts(n, noctty) {
       return json2(call2({ op: "pty-slave-open", n, noctty }, `pty-slave-open ${n}`));
     },
-    openSealed() {
-      return json2(call2({ op: "fd-open-sealed" }, "fd-open-sealed"));
+    openSealed(flags) {
+      return json2(call2({ op: "fd-open-sealed", flags }, "fd-open-sealed"));
     },
     openClipboard(flags) {
       return json2(call2({ op: "fd-open-clipboard", flags }, "fd-open-clipboard"));