@ai-ecoverse/slicc-kernel 1.33.0 → 1.34.1

package/dist/node.js

@@ -339,14 +339,6 @@ function sinkFile(onData) {
     }
   });
 }
-function nullFile() {
-  return new OpenFile({
-    read: async () => new Uint8Array(0),
-    write: async (bytes) => bytes.length,
-    close: () => {
-    }
-  });
-}
 function written(device, bytes) {
   if (device === "full" && bytes.length > 0) throw new KernelError("ENOSPC");
   return bytes.length;
@@ -3519,7 +3511,7 @@ var ChildTable = class {
       captured.set(n, chunks2);
       return sinkFile((bytes) => chunks2.push(bytes));
     }
-    return nullFile();
+    return deviceFile("null");
   }
   async wait(pid, nohang, signal, flags = {}) {
     let interrupt;
@@ -6286,6 +6278,8 @@ var KernelTty = class {
   waiters = [];
   hungUp = false;
   name;
+  onRead;
+  readers = 0;
   screen;
   signal;
   constructor(screen, signal) {
@@ -6436,7 +6430,19 @@ var KernelTty = class {
     }
     this.screen.write(Uint8Array.from(out));
   }
+  get reading() {
+    return this.readers > 0;
+  }
   async read(max, signal) {
+    this.onRead?.();
+    this.readers++;
+    try {
+      return await this.take(max, signal);
+    } finally {
+      this.readers--;
+    }
+  }
+  async take(max, signal) {
     while (this.readable.length === 0) {
       if (this.hungUp) return new Uint8Array(0);
       await this.changed(signal);
@@ -6501,13 +6507,14 @@ var PtyPair = class {
   slaveSeen = false;
   index;
   onFree;
-  constructor(index, signal, onFree) {
+  constructor(index, signal, onFree, onRead) {
     this.index = index;
     this.onFree = onFree;
     this.slave = new KernelTty(
       { write: (bytes) => this.fromSlave(bytes) },
       (sig) => signal(this.slave, sig)
     );
+    if (onRead) this.slave.onRead = () => onRead(this.slave);
     this.slave.name = `/dev/pts/${index}`;
   }
   master() {
@@ -6605,13 +6612,15 @@ var PtyPair = class {
 var PtyTable = class {
   pairs = /* @__PURE__ */ new Map();
   signal;
-  constructor(signal) {
+  onRead;
+  constructor(signal, onRead) {
     this.signal = signal;
+    this.onRead = onRead;
   }
   open() {
     let index = 0;
     while (this.pairs.has(index)) index += 1;
-    const pair = new PtyPair(index, this.signal, (p) => this.pairs.delete(p.index));
+    const pair = new PtyPair(index, this.signal, (p) => this.pairs.delete(p.index), this.onRead);
     this.pairs.set(index, pair);
     return { pair, master: pair.master() };
   }
@@ -8164,6 +8173,7 @@ var WasmProcess = class {
   async exit() {
     if (this.exited) return;
     this.exited = true;
+    this.die();
     this.clearAlarm();
     this.interrupt.abort();
     this.options.locks?.release(this.pid);
@@ -8576,13 +8586,16 @@ var SETUP_OPS = /* @__PURE__ */ new Set([
   "fd-info",
   "sig-mask",
   "proc-setpgid",
-  "tty-pgrp-set"
+  "tty-pgrp-set",
+  "proc-exec",
+  "proc-spawn"
 ]);
-var SETTLE_MS = 250;
+var SETTLE_MS = 2e3;
 var KEY_SIGNALS = /* @__PURE__ */ new Set([2, 3, 20]);
 var SettlingChildren = class {
   children = /* @__PURE__ */ new Map();
   held = [];
+  parked = [];
   pgidOf;
   settleMs;
   constructor(pgidOf, settleMs = SETTLE_MS) {
@@ -8590,7 +8603,15 @@ var SettlingChildren = class {
     this.settleMs = settleMs;
   }
   started(pid, ppid) {
-    this.children.set(pid, { ppid });
+    const parent = this.children.get(ppid);
+    this.children.set(pid, parent ? { ppid: parent.ppid, execer: ppid } : { ppid });
+    const group = this.pgidOf(ppid);
+    for (const p of this.parked) if (p.pgid === group) this.held.push({ ...p, copy: true });
+    this.parked = this.parked.filter((p) => p.pgid !== group);
+  }
+  reading(pgid) {
+    this.parked = this.parked.filter((p) => p.pgid !== pgid);
+    this.held = this.held.filter((h) => !(h.copy && h.pgid === pgid));
   }
   syscall(pid, op) {
     const child = this.children.get(pid);
@@ -8606,13 +8627,25 @@ var SettlingChildren = class {
     if (!child) return;
     clearTimeout(child.timer);
     this.children.delete(pid);
+    if (child.execer !== void 0) this.settled(child.execer);
     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();
+  deliver(sig, pgid, send, foreground) {
+    if (!KEY_SIGNALS.has(sig)) {
+      send();
+    } else if (this.blocking(pgid)) {
+      this.held.push({ pgid, send });
+    } else if (foreground) {
+      send();
+      const moved2 = () => {
+        if (foreground() !== pgid) send();
+      };
+      this.parked.push({ pgid, send: moved2 });
+    } else {
+      send();
+    }
   }
   blocking(pgid) {
     for (const { ppid } of this.children.values()) if (this.pgidOf(ppid) === pgid) return true;
@@ -9891,11 +9924,8 @@ var Launcher = class {
   locks = new LockTable();
   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)
-    )
+    (tty, sig) => this.keySignal(tty, 0, sig, () => this.jobs.signalOwnedForeground(tty, sig)),
+    (tty) => this.settling.reading(this.jobs.tcgetpgrp(tty, 0))
   );
   net = new LoopbackNet();
   cdp;
@@ -10311,6 +10341,11 @@ var Launcher = class {
       })
     );
   }
+  keySignal(tty, fallback, sig, send) {
+    const pgid = this.jobs.tcgetpgrp(tty, fallback);
+    const foreground = () => this.jobs.tcgetpgrp(tty, fallback);
+    this.settling.deliver(sig, pgid, send, tty.reading ? void 0 : foreground);
+  }
   ignoredBy(pid, fork = false) {
     return this.processes.get(pid)?.ignoredSignals(fork) ?? 0;
   }
@@ -10506,12 +10541,9 @@ var Launcher = class {
     let leader = 0;
     const tty = new KernelTty(
       { write: (bytes) => options.onData(bytes.slice()) },
-      (sig) => this.settling.deliver(
-        sig,
-        this.jobs.tcgetpgrp(tty, leader),
-        () => this.jobs.signalForeground(tty, leader, sig)
-      )
+      (sig) => this.keySignal(tty, leader, sig, () => this.jobs.signalForeground(tty, leader, sig))
     );
+    tty.onRead = () => this.settling.reading(this.jobs.tcgetpgrp(tty, leader));
     tty.name = `/dev/tty${++this.terminals}`;
     tty.setSize(options.cols ?? 80, options.rows ?? 24);
     const fds = new FdTable();
@@ -10560,7 +10592,7 @@ var Launcher = class {
       return { status: NOT_FOUND, stdout: concat5(out), stderr: concat5(err) };
     }
     const fds = new FdTable();
-    fds.installAt(0, options.stdin ? bytesSource(options.stdin) : nullFile());
+    fds.installAt(0, options.stdin ? bytesSource(options.stdin) : deviceFile("null"));
     fds.installAt(1, sinkFile(stdout));
     fds.installAt(2, sinkFile(stderr));
     const group = options.pgid !== void 0 ? { pgid: options.pgid } : {};
@@ -11499,10 +11531,11 @@ function hostfsFetchOf(options) {
   if (hostfsOrigin === void 0) return hostfsFetch ? { hostfsFetch } : {};
   const base = hostfsFetch ?? ((url, init) => fetch(url, init));
   return {
-    hostfsFetch: (url, init) => base(url, {
-      ...init,
-      headers: { ...init.headers, Origin: hostfsOrigin }
-    })
+    hostfsFetch: (url, init) => {
+      const headers = new Headers(init.headers);
+      headers.set("Origin", hostfsOrigin);
+      return base(url, { ...init, headers });
+    }
   };
 }
 function nodeTransport() {