@ai-ecoverse/slicc-kernel 1.29.2 → 1.30.1

package/dist/node.js

@@ -3082,6 +3082,7 @@ function commandOf(pkg, name2, raw, packageAbi, shared) {
     wasm,
     argv0,
     ...raw.argv0Path === true ? { argv0Path: true } : {},
+    ...abi === "wasi" && raw.preopenRoot === true ? { preopenRoot: true } : {},
     ...args ? { args } : {},
     ...withEnv,
     ...imports ? { imports } : {}
@@ -7593,7 +7594,7 @@ var WasmProcess = class {
     for (const listener of this.stateListeners) listener("continued", SIG.CONT);
   }
   async syscall(req) {
-    this.options.onSyscall?.();
+    this.options.onSyscall?.(req);
     for (; ; ) {
       await this.resumed;
       const stops = this.stops;
@@ -7717,9 +7718,10 @@ var WasmProcess = class {
           json: this.fds.numbers().map((fd) => ({ fd, ...this.fdInfo(fd) }))
         };
       case "fd-meta": {
-        const file = this.fds.get(req.fd).file;
-        if (!file.held) throw new KernelError("EBADF");
-        file.heldMeta = req.meta;
+        if (!this.fds.get(req.fd).file.held) throw new KernelError("EBADF");
+        const cloexec = this.fds.closesOnExec(req.fd);
+        this.fds.installAt(req.fd, heldFile(req.meta));
+        if (cloexec) this.fds.setCloseOnExec(req.fd);
         return { ok: true, kind: "void" };
       }
       case "fd-setfl":
@@ -8386,6 +8388,57 @@ var JobTable = class {
   }
 };
 
+// src/kernel/settling.ts
+var SETUP_OPS = /* @__PURE__ */ new Set([
+  "proc-list",
+  "proc-identity",
+  "fd-info",
+  "sig-mask",
+  "proc-setpgid",
+  "tty-pgrp-set"
+]);
+var SETTLE_MS = 250;
+var KEY_SIGNALS = /* @__PURE__ */ new Set([2, 3, 20]);
+var SettlingChildren = class {
+  children = /* @__PURE__ */ new Map();
+  held = [];
+  pgidOf;
+  settleMs;
+  constructor(pgidOf, settleMs = SETTLE_MS) {
+    this.pgidOf = pgidOf;
+    this.settleMs = settleMs;
+  }
+  started(pid, ppid) {
+    this.children.set(pid, { ppid });
+  }
+  syscall(pid, op) {
+    const child = this.children.get(pid);
+    if (!child) return;
+    if (!SETUP_OPS.has(op)) {
+      this.settled(pid);
+      return;
+    }
+    child.timer ??= setTimeout(() => this.settled(pid), this.settleMs);
+  }
+  settled(pid) {
+    const child = this.children.get(pid);
+    if (!child) return;
+    clearTimeout(child.timer);
+    this.children.delete(pid);
+    const ready2 = this.held.filter((h) => !this.blocking(h.pgid));
+    this.held = this.held.filter((h) => this.blocking(h.pgid));
+    for (const h of ready2) h.send();
+  }
+  deliver(sig, pgid, send) {
+    if (KEY_SIGNALS.has(sig) && this.blocking(pgid)) this.held.push({ pgid, send });
+    else send();
+  }
+  blocking(pgid) {
+    for (const { ppid } of this.children.values()) if (this.pgidOf(ppid) === pgid) return true;
+    return false;
+  }
+};
+
 // src/mount/driver.ts
 function fsError2(code, message2 = code) {
   return Object.assign(new Error(message2), { code });
@@ -9620,7 +9673,8 @@ function targetOf(command) {
     ...command.args ? { prefix: command.args } : {},
     ...command.env ? { env: command.env } : {},
     ...command.unset ? { unset: command.unset } : {},
-    ...command.imports ? { imports: command.imports } : {}
+    ...command.imports ? { imports: command.imports } : {},
+    ...command.preopenRoot ? { preopenRoot: true } : {}
   };
 }
 function childHandle(handle) {
@@ -9654,7 +9708,14 @@ var Launcher = class {
   described = /* @__PURE__ */ new Map();
   jobs = new JobTable();
   locks = new LockTable();
-  ptys = new PtyTable((tty, sig) => this.jobs.signalOwnedForeground(tty, sig));
+  settling = new SettlingChildren((pid) => this.jobs.pgidOf(pid));
+  ptys = new PtyTable(
+    (tty, sig) => this.settling.deliver(
+      sig,
+      this.jobs.tcgetpgrp(tty, 0),
+      () => this.jobs.signalOwnedForeground(tty, sig)
+    )
+  );
   net = new LoopbackNet();
   cdp;
   ca;
@@ -9856,7 +9917,8 @@ var Launcher = class {
       ...memory ? { memory } : {},
       foreign,
       ...names ? { names } : {},
-      ...imports !== void 0 ? { imports } : {}
+      ...imports !== void 0 ? { imports } : {},
+      ...target.preopenRoot ? { preopenRoot: true } : {}
     };
   }
   async launch(planned, req) {
@@ -9893,7 +9955,10 @@ var Launcher = class {
         await (asked ??= decided.then(count));
         return this.identityOf(pid);
       },
-      onSyscall: () => this.decide(pid),
+      onSyscall: (call) => {
+        this.decide(pid);
+        this.settling.syscall(pid, call.op);
+      },
       ...req.ignored ? { ignored: req.ignored } : {},
       program: req.program,
       argv0: req.argv0,
@@ -9926,6 +9991,7 @@ var Launcher = class {
       ...this.shownIds(req)
     });
     this.processes.set(pid, handle);
+    if (req.ppid !== void 0) this.settling.started(pid, req.ppid);
     this.jobs.add(pid, req.ppid, (sig) => handle.signal(sig), terminal);
     if (req.exec && req.ppid !== void 0) this.jobs.exec(req.ppid, pid, true);
     if (req.pgid !== void 0) this.jobs.join(pid, req.pgid);
@@ -9936,6 +10002,7 @@ var Launcher = class {
     });
     void handle.exited.then(() => {
       this.processes.delete(pid);
+      this.settling.settled(pid);
       if (req.ppid === void 0 || this.orphans.delete(pid)) this.forget(pid);
       else this.zombies.add(pid);
     });
@@ -10248,7 +10315,11 @@ var Launcher = class {
     let leader = 0;
     const tty = new KernelTty(
       { write: (bytes) => options.onData(bytes.slice()) },
-      (sig) => this.jobs.signalForeground(tty, leader, sig)
+      (sig) => this.settling.deliver(
+        sig,
+        this.jobs.tcgetpgrp(tty, leader),
+        () => this.jobs.signalForeground(tty, leader, sig)
+      )
     );
     tty.name = `/dev/tty${++this.terminals}`;
     tty.setSize(options.cols ?? 80, options.rows ?? 24);