@ai-ecoverse/slicc-kernel 1.48.1 → 1.48.2

package/dist/node.js

@@ -9203,6 +9203,7 @@ function isWasmSyscall(req) {
   return typeof op === "string" && SYSCALL_OPS.has(op);
 }
 var MAX_READ = 1024 * 1024;
+var KEYBOARD = /* @__PURE__ */ new Set([SIG.INT, SIG.QUIT, SIG.TSTP]);
 var DEFAULT_UMASK = 18;
 var DYING = { ok: false, errno: "EINTR", message: "the process is being killed" };
 var HOSTS_ONLY = new Resolver({ routes: new Routes() });
@@ -9221,6 +9222,8 @@ var WasmProcess = class {
   execTermsig;
   stopped = 0;
   stops = 0;
+  owed = false;
+  waits = 0;
   resumed = Promise.resolve();
   wake;
   stateListeners = [];
@@ -9276,6 +9279,7 @@ var WasmProcess = class {
       return "terminate";
     }
     this.options.onPending?.(sig);
+    if (this.options.jobs?.keyboard && KEYBOARD.has(sig)) this.owed = true;
     const blocked = this.interrupt;
     this.interrupt = new AbortController();
     blocked.abort();
@@ -9320,8 +9324,10 @@ var WasmProcess = class {
       await this.resumed;
       if (this.dying) return DYING;
       const stops = this.stops;
+      const waits = this.waits;
       const result = await this.dispatch(req, cancelled);
       if (this.dying) return DYING;
+      if (!result.ok && result.errno === "EINTR" && this.waits !== waits) this.owed = false;
       const restart = !result.ok && result.errno === "EINTR" && this.stops !== stops;
       if (restart && !this.options.hasPending?.()) continue;
       await this.resumed;
@@ -9374,8 +9380,11 @@ var WasmProcess = class {
   refuseIfPending(restart) {
     if (restart && this.options.hasPending?.()) throw new KernelError("EINTR");
   }
-  blockingSignal(cancelled) {
-    if (this.options.hasPending?.() || cancelled?.aborted) throw new KernelError("EINTR");
+  blockingSignal(cancelled, owing = true) {
+    if (owing) this.waits++;
+    if (this.options.hasPending?.() || cancelled?.aborted || owing && this.owed) {
+      throw new KernelError("EINTR");
+    }
     return cancelled ? AbortSignal.any([this.interrupt.signal, cancelled]) : this.interrupt.signal;
   }
   async read(req, cancelled) {
@@ -9521,7 +9530,7 @@ var WasmProcess = class {
         return { ok: true, kind: "json", json: this.options.jobs?.terminalNames() ?? [] };
       case "fd-select": {
         const { read, write, timeoutMs } = req;
-        const signal = this.blockingSignal(cancelled);
+        const signal = this.blockingSignal(cancelled, timeoutMs !== 0);
         const selected = await selectFds(this.fds, read, write, timeoutMs, signal);
         return { ok: true, kind: "json", json: selected };
       }
@@ -10197,6 +10206,7 @@ var JobTable = class {
   handoffs = /* @__PURE__ */ new Map();
   foreground = /* @__PURE__ */ new Map();
   terminals = /* @__PURE__ */ new Map();
+  keyboard = false;
   add(pid, parentPid, signal, terminal) {
     const parent = parentPid === void 0 ? void 0 : this.members.get(parentPid);
     if (!parent && terminal) this.terminals.set(pid, terminal);
@@ -10366,6 +10376,14 @@ var JobTable = class {
   signalForeground(tty, fallback, sig) {
     this.killGroup(this.tcgetpgrp(tty, fallback), sig);
   }
+  fromKeyboard(send) {
+    this.keyboard = true;
+    try {
+      send();
+    } finally {
+      this.keyboard = false;
+    }
+  }
 };
 
 // src/kernel/settling.ts
@@ -12201,7 +12219,8 @@ 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);
+    const keyed = () => this.jobs.fromKeyboard(send);
+    this.settling.deliver(sig, pgid, keyed, tty.reading ? void 0 : foreground);
   }
   umaskOf(pid) {
     return this.processes.get(pid)?.umask?.() ?? DEFAULT_UMASK;
@@ -13533,13 +13552,18 @@ function nodeWorker(file, live, closed) {
     }
   };
   const worker = closed ? void 0 : new Worker(file);
+  let ending = false;
   if (worker) {
     const kill = () => {
+      ending = true;
       void worker.terminate();
       fail3(TERMINATED);
     };
     live.add(kill);
-    worker.once("exit", () => live.delete(kill));
+    worker.once("exit", (code) => {
+      live.delete(kill);
+      if (!ending) fail3(`the process worker exited with ${code}`);
+    });
     worker.on("error", (err) => fail3(String(err)));
   } else {
     setTimeout(() => fail3(TERMINATED), 0);
@@ -13560,7 +13584,10 @@ function nodeWorker(file, live, closed) {
       const listener = messages.get(handler);
       if (listener) worker?.off("message", listener);
     },
-    terminate: () => void worker?.terminate()
+    terminate: () => {
+      ending = true;
+      void worker?.terminate();
+    }
   };
 }
 function textOf(on) {