@ai-ecoverse/slicc-kernel 1.32.3 → 1.34.0

package/dist/node.js

@@ -3064,7 +3064,7 @@ function argsOf(pkg, raw) {
 }
 function abiOf(raw, fallback) {
   const abi = raw ?? fallback;
-  return abi === "emscripten" || abi === "wasi" ? abi : void 0;
+  return abi === "emscripten" || abi === "wasi" || abi === "js" ? abi : void 0;
 }
 function commandOf(pkg, name2, raw, packageAbi, shared) {
   const withEnv = envFields({ ...shared, ...envOf(pkg, raw.env) });
@@ -3073,11 +3073,25 @@ function commandOf(pkg, name2, raw, packageAbi, shared) {
     return { name: name2, abi: packageAbi, glue: script, wasm: script, argv0: name2, script, ...withEnv };
   }
   const abi = abiOf(raw.abi, packageAbi);
+  const argv0 = typeof raw.argv0 === "string" && raw.argv0 ? raw.argv0 : name2;
+  const args = argsOf(pkg, raw.args);
+  if (abi === "js") {
+    const module = inside(pkg, raw.module);
+    if (!module) return void 0;
+    return {
+      name: name2,
+      abi,
+      glue: module,
+      wasm: module,
+      argv0,
+      ...raw.argv0Path === true ? { argv0Path: true } : {},
+      ...args ? { args } : {},
+      ...withEnv
+    };
+  }
   const wasm = inside(pkg, raw.wasm);
   const glue = abi === "wasi" ? wasm : inside(pkg, raw.glue);
   if (!abi || !glue || !wasm) return void 0;
-  const argv0 = typeof raw.argv0 === "string" && raw.argv0 ? raw.argv0 : name2;
-  const args = argsOf(pkg, raw.args);
   const imports = abi === "wasi" ? inside(pkg, raw.imports) : void 0;
   return {
     name: name2,
@@ -3784,12 +3798,12 @@ var MountTable = class {
   }
   list() {
     const mounted = [...this.mounts.values()].map(
-      ({ type, source, target, options, state, error, present }) => ({
+      ({ type, source, target, options, state, error, present: present2 }) => ({
         type,
         source,
         target,
         options: { ...options },
-        state: state === "ok" && present?.() === false ? "nomedium" : state,
+        state: state === "ok" && present2?.() === false ? "nomedium" : state,
         ...error ? { error } : {}
       })
     );
@@ -4498,6 +4512,8 @@ var SAB_I_MEMORY = 10;
 var SAB_I_TOTAL_HI = 11;
 var SAB_I_OFFSET_HI = 12;
 var SAB_I_KILLED = 13;
+var SAB_I_ASYNC = 14;
+var SAB_I_STOP = 15;
 var U32 = 2 ** 32;
 function storeU53(header3, lo, hi, value) {
   Atomics.store(header3, hi, Math.floor(value / U32));
@@ -4679,8 +4695,10 @@ var AsyncOps = class {
   waiters = /* @__PURE__ */ new Set();
   closed = false;
   run;
-  constructor(run2) {
+  onReady;
+  constructor(run2, onReady) {
     this.run = run2;
+    this.onReady = onReady;
   }
   submit(req) {
     const id = this.hold();
@@ -4757,6 +4775,7 @@ var AsyncOps = class {
     this.results.set(id, result);
     this.ready.push(id);
     this.wake();
+    this.onReady?.();
   }
   wake() {
     for (const wake of [...this.waiters]) wake();
@@ -6267,6 +6286,8 @@ var KernelTty = class {
   waiters = [];
   hungUp = false;
   name;
+  onRead;
+  readers = 0;
   screen;
   signal;
   constructor(screen, signal) {
@@ -6417,7 +6438,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);
@@ -6482,13 +6515,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() {
@@ -6586,13 +6620,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() };
   }
@@ -7117,6 +7153,9 @@ var VfsNode = class {
     }
     return this.data;
   }
+  holds() {
+    return this.dirty;
+  }
   replace(contents2) {
     this.ranged = void 0;
     this.data = new Uint8Array(contents2);
@@ -7227,9 +7266,34 @@ var VfsNode = class {
 var VfsNodes = class {
   byPath = /* @__PURE__ */ new Map();
   fs;
+  entries = /* @__PURE__ */ new Map();
   constructor(fs) {
     this.fs = fs;
   }
+  async onEntry(path, op) {
+    const key = await this.entryKey(path);
+    const run2 = (this.entries.get(key) ?? Promise.resolve()).then(op);
+    const tail = run2.catch(() => void 0);
+    this.entries.set(key, tail);
+    void tail.then(() => {
+      if (this.entries.get(key) === tail) this.entries.delete(key);
+    });
+    return run2;
+  }
+  async entryKey(path) {
+    const parent = parentOf5(path);
+    const dir = await realDir(this.fs, parent).catch(() => parent);
+    const name2 = path.slice(path.lastIndexOf("/") + 1);
+    return dir === "/" ? `/${name2}` : `${dir}/${name2}`;
+  }
+  createExclusive(path) {
+    return this.onEntry(path, async () => {
+      const node = this.byPath.get(path);
+      const held = node ? await node.serial(async () => node.holds()) : false;
+      if (held || await present(this.fs, path)) throw fsError("EEXIST", path);
+      await this.fs.writeFile(path, new Uint8Array(0));
+    });
+  }
   open(path, pin) {
     let node = this.byPath.get(path);
     if (!node) {
@@ -7298,6 +7362,16 @@ var VfsNodes = class {
     }
   }
 };
+async function present(fs, path, follow = false) {
+  const look = (follow ? void 0 : fs.lstat) ?? fs.stat;
+  try {
+    await (look ? look.call(fs, path) : fs.readFileBuffer(path));
+    return true;
+  } catch (err) {
+    if (err?.code === "ENOENT") return false;
+    throw err;
+  }
+}
 var MAX_LINKS5 = 40;
 function parentOf5(path) {
   return path.slice(0, path.lastIndexOf("/")) || "/";
@@ -7362,12 +7436,17 @@ function keepingOpen(fs, nodes) {
       await fs.rm(path, options);
       nodes.unlinked(at);
     },
-    async rename(from, to) {
+    rename(from, to) {
       const [a, b] = [fs.resolvePath("/", from), fs.resolvePath("/", to)];
-      await nodes.unlinking(b);
-      await fs.rename(from, to);
-      nodes.renamed(a, b);
-    }
+      return nodes.onEntry(b, async () => {
+        await nodes.unlinking(b);
+        await fs.rename(from, to);
+        nodes.renamed(a, b);
+      });
+    },
+    writeFile: (path, content) => nodes.onEntry(fs.resolvePath("/", path), () => fs.writeFile(path, content)),
+    symlink: (target, path) => nodes.onEntry(fs.resolvePath("/", path), () => fs.symlink(target, path)),
+    mkdir: (path, options) => nodes.onEntry(fs.resolvePath("/", path), () => fs.mkdir(path, options))
   };
 }
 function vfsFile(fs, opts, nodes) {
@@ -7706,6 +7785,21 @@ var WasmProcess = class {
       this.options.hasPending?.() ? AbortSignal.abort() : this.interrupt.signal
     );
   }
+  async openVfs(req) {
+    await refuseReadonly(this.options.fs, req.path, req.flags, req);
+    const fd = this.fds.install(heldFile(), 3);
+    try {
+      if (req.exclusive) await this.nodes.createExclusive(req.path);
+      this.fds.installAt(fd, this.openVfsFile(req));
+      if (req.existing && !await present(this.options.fs, req.path, true)) {
+        throw new KernelError("ENOENT");
+      }
+    } catch (err) {
+      await Promise.resolve(this.fds.close(fd));
+      throw err;
+    }
+    return fd;
+  }
   openVfsFile(req) {
     return vfsFile(
       this.options.fs,
@@ -7748,8 +7842,7 @@ var WasmProcess = class {
       case "fd-poll":
         return { ok: true, kind: "json", json: pollFile(this.fds.get(req.fd).file) };
       case "fd-open-vfs":
-        await refuseReadonly(this.options.fs, req.path, req.flags, req);
-        return { ok: true, kind: "json", json: this.fds.install(this.openVfsFile(req), 3) };
+        return { ok: true, kind: "json", json: await this.openVfs(req) };
       case "fd-info":
         return { ok: true, kind: "json", json: this.fdInfo(req.fd) };
       case "fd-list":
@@ -8027,6 +8120,7 @@ var WasmProcess = class {
       case "sig-mask":
         this.caught = req.caught;
         this.ignored = req.ignored;
+        this.inherited &= ~(req.defaults ?? 0);
         return { ok: true, kind: "void" };
       case "sig-pause":
         return this.pause();
@@ -8056,7 +8150,10 @@ var WasmProcess = class {
   }
   alarm;
   dlLog = [];
-  asyncOps = new AsyncOps((req) => this.syscall(req));
+  asyncOps = new AsyncOps(
+    (req) => this.syscall(req),
+    () => this.options.onAsync?.()
+  );
   alarmEvery;
   setAlarm(sig, first, every, timer) {
     if (!isSignal(sig)) throw new KernelError("EINVAL");
@@ -8084,6 +8181,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);
@@ -8165,6 +8263,26 @@ var Dying = class {
     return [typeof reported === "number" ? reported : CRASHED, void 0];
   }
 };
+function processInit(opts, sab) {
+  const base = {
+    type: WASM_PROCESS_INIT,
+    pid: opts.shownPid ?? opts.pid,
+    argv0: opts.argv0,
+    args: opts.args,
+    env: opts.env,
+    cwd: opts.cwd,
+    sab,
+    ...opts.ppid !== void 0 ? { ppid: opts.ppid } : {}
+  };
+  if (opts.program.abi === "js") {
+    return { ...base, program: opts.program, fds: inheritedFds(opts.fds) };
+  }
+  return {
+    ...base,
+    program: opts.program,
+    ...opts.fork ? { fork: opts.fork } : { fds: inheritedFds(opts.fds) }
+  };
+}
 function spawnWasmProcess(opts) {
   const sab = new SharedArrayBuffer(SAB_HEADER_BYTES + SAB_DEFAULT_WINDOW_BYTES);
   const header3 = new Int32Array(sab, 0, SAB_HEADER_I32);
@@ -8190,11 +8308,22 @@ function spawnWasmProcess(opts) {
     locks: opts.locks,
     onReap: opts.onReap,
     resolver: opts.resolver,
-    onPending: (sig) => void Atomics.or(header3, SAB_I_SIGNALS, sigbit(sig)),
+    onPending: (sig) => {
+      Atomics.or(header3, SAB_I_SIGNALS, sigbit(sig));
+      Atomics.notify(header3, SAB_I_SIGNALS);
+    },
+    onAsync: () => {
+      Atomics.add(header3, SAB_I_ASYNC, 1);
+      Atomics.notify(header3, SAB_I_ASYNC);
+    },
     onTimer: (which) => void Atomics.or(header3, SAB_I_TIMERS, 1 << which),
     hasPending: () => Atomics.load(header3, SAB_I_SIGNALS) !== 0 || Atomics.load(header3, SAB_I_TIMERS) !== 0,
     raise: (sig) => signal(sig),
-    ...opts.program.abi === "wasi" ? { pendingBits: () => Atomics.load(header3, SAB_I_SIGNALS) } : {}
+    ...opts.program.abi === "wasi" || opts.program.abi === "js" ? { pendingBits: () => Atomics.load(header3, SAB_I_SIGNALS) } : {}
+  });
+  process.onState((state) => {
+    Atomics.store(header3, SAB_I_STOP, state === "stopped" ? 1 : 0);
+    Atomics.notify(header3, SAB_I_STOP);
   });
   const holds = new HeldPaths();
   opts.held?.add(holds);
@@ -8255,7 +8384,8 @@ function spawnWasmProcess(opts) {
     end?.();
   };
   const spawnThread = (thread) => {
-    if (done4) return;
+    const { program } = opts;
+    if (done4 || program.abi === "js") return;
     if (threads.size >= WASM_MAX_THREADS - 1) {
       opts.onError?.(`more than ${WASM_MAX_THREADS} threads`);
       finish(CRASHED);
@@ -8280,7 +8410,7 @@ function spawnWasmProcess(opts) {
     const tinit = {
       type: WASM_THREAD_INIT,
       pid: opts.shownPid ?? opts.pid,
-      program: opts.program,
+      program,
       argv0: opts.argv0,
       args: opts.args,
       env: opts.env,
@@ -8291,18 +8421,7 @@ function spawnWasmProcess(opts) {
     };
     tw.postMessage(tinit);
   };
-  const init = {
-    type: WASM_PROCESS_INIT,
-    pid: opts.shownPid ?? opts.pid,
-    program: opts.program,
-    argv0: opts.argv0,
-    args: opts.args,
-    env: opts.env,
-    cwd: opts.cwd,
-    sab,
-    ...opts.ppid !== void 0 ? { ppid: opts.ppid } : {},
-    ...opts.fork ? { fork: opts.fork } : { fds: inheritedFds(opts.fds) }
-  };
+  const init = processInit(opts, sab);
   worker.postMessage(init, opts.fork ? [opts.fork.memory.buffer] : []);
   const signal = (sig) => {
     if (process.signal(sig) !== "terminate") return;
@@ -8475,13 +8594,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) {
@@ -8489,7 +8611,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);
@@ -8505,13 +8635,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;
@@ -9790,11 +9932,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;
@@ -9984,6 +10123,9 @@ var Launcher = class {
     return await this.base.exists(optional) ? optional : void 0;
   }
   async program(target, env) {
+    if (target.abi === "js") {
+      return { abi: "js", glue: await this.base.readFile(target.wasm), path: target.wasm };
+    }
     if (target.abi !== "wasi") {
       const [glue, { module: module2 }] = await Promise.all([
         this.base.readFile(target.glue),
@@ -10207,6 +10349,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;
   }
@@ -10402,12 +10549,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();