@ai-ecoverse/slicc-kernel 1.17.0 → 1.17.1

package/dist/process-worker.js

@@ -1446,6 +1446,25 @@ 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();
@@ -1487,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);
@@ -1529,31 +1565,15 @@ 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"));
@@ -5818,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({
@@ -5828,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);
@@ -5836,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);