@ai-ecoverse/slicc-kernel 1.39.3 → 1.40.0

package/dist/kernel-worker.js

@@ -5063,18 +5063,19 @@ async function withPackagePaths(fs, pkg, command) {
 }
 async function packages(fs, modules) {
   const names = await fs.readdir(modules).catch(() => []);
-  const dirs = [];
+  const packageNames = [];
   for (const name2 of names) {
     if (name2.startsWith(".")) continue;
     if (!name2.startsWith("@")) {
-      dirs.push(`${modules}/${name2}`);
+      packageNames.push(name2);
       continue;
     }
     for (const inner of await fs.readdir(`${modules}/${name2}`).catch(() => [])) {
-      dirs.push(`${modules}/${name2}/${inner}`);
+      packageNames.push(`${name2}/${inner}`);
     }
   }
-  return dirs;
+  packageNames.sort();
+  return packageNames.map((name2) => `${modules}/${name2}`);
 }
 async function pnpmGlobalRoots(fs, home) {
   const roots = [];
@@ -5133,8 +5134,10 @@ async function scanFilesystems(fs, modules) {
   return found;
 }
 var SUFFIX = /^\.[A-Za-z0-9_+-][A-Za-z0-9._+-]*$/;
-async function scanBinfmts(fs, modules) {
+async function scanBinfmts(fs, modules, warn = () => {
+}) {
   const found = /* @__PURE__ */ new Map();
+  const owners = /* @__PURE__ */ new Map();
   for (const pkg of await packagesIn(fs, modules)) {
     let manifest;
     try {
@@ -5146,7 +5149,15 @@ async function scanBinfmts(fs, modules) {
     if (!declared || typeof declared !== "object") continue;
     for (const [suffix, command] of Object.entries(declared)) {
       if (!SUFFIX.test(suffix) || typeof command !== "string" || !NAME.test(command)) continue;
-      if (!found.has(suffix)) found.set(suffix, command);
+      const owner = owners.get(suffix);
+      if (owner === void 0) {
+        found.set(suffix, command);
+        owners.set(suffix, pkg);
+      } else if (found.get(suffix) !== command) {
+        warn(
+          `binfmt ${suffix}: ${owner} maps it to ${found.get(suffix)}, so ${pkg}'s ${command} is ignored`
+        );
+      }
     }
   }
   return found;
@@ -7048,6 +7059,7 @@ var AsyncOps = class {
   next = 1;
   results = /* @__PURE__ */ new Map();
   ready = [];
+  running = /* @__PURE__ */ new Map();
   waiters = /* @__PURE__ */ new Set();
   closed = false;
   run;
@@ -7058,7 +7070,9 @@ var AsyncOps = class {
   }
   submit(req) {
     const id = this.hold();
-    this.run(req).then(
+    const running = new AbortController();
+    this.running.set(id, running);
+    this.run(req, running.signal).then(
       (result) => this.complete(id, result),
       (err) => this.complete(id, { ok: false, errno: "EIO", message: String(err) })
     );
@@ -7078,10 +7092,15 @@ var AsyncOps = class {
     if (!this.results.has(id)) throw new KernelError("EINVAL");
     const result = this.results.get(id);
     if (!result) throw new KernelError("EAGAIN");
-    this.cancel(id);
+    this.forget(id);
     return result;
   }
   cancel(id) {
+    this.running.get(id)?.abort();
+    this.forget(id);
+  }
+  forget(id) {
+    this.running.delete(id);
     this.results.delete(id);
     const at = this.ready.indexOf(id);
     if (at >= 0) this.ready.splice(at, 1);
@@ -7127,6 +7146,7 @@ var AsyncOps = class {
     });
   }
   complete(id, result) {
+    this.running.delete(id);
     if (!this.results.has(id)) return;
     this.results.set(id, result);
     this.ready.push(id);
@@ -8940,13 +8960,13 @@ var WasmProcess = class {
     this.wake?.();
     for (const listener of this.stateListeners) listener("continued", SIG.CONT);
   }
-  async syscall(req) {
+  async syscall(req, cancelled) {
     this.options.onSyscall?.(req);
     for (; ; ) {
       await this.resumed;
       if (this.dying) return DYING;
       const stops = this.stops;
-      const result = await this.dispatch(req);
+      const result = await this.dispatch(req, cancelled);
       if (this.dying) return DYING;
       const restart = !result.ok && result.errno === "EINTR" && this.stops !== stops;
       if (restart && !this.options.hasPending?.()) continue;
@@ -8965,9 +8985,9 @@ var WasmProcess = class {
     this.interrupt.abort();
     this.wake?.();
   }
-  async dispatch(req) {
+  async dispatch(req, cancelled) {
     try {
-      if (isFdSyscall(req)) return await this.fdSyscall(req);
+      if (isFdSyscall(req)) return await this.fdSyscall(req, cancelled);
       if (isTtySyscall(req)) return this.ttySyscall(req);
       if (isJobSyscall(req)) return this.jobSyscall(req);
       if (isSocketSyscall(req)) return await this.socketSyscall(req);
@@ -9068,7 +9088,7 @@ var WasmProcess = class {
       this.nodes
     );
   }
-  async fdSyscall(req) {
+  async fdSyscall(req, cancelled) {
     if (isVfsSyscall(req)) return this.vfsSyscall(req);
     switch (req.op) {
       case "fd-read":
@@ -9139,7 +9159,8 @@ 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();
+        const blocking = this.blockingSignal();
+        const signal = cancelled ? AbortSignal.any([blocking, cancelled]) : blocking;
         const selected = await selectFds(this.fds, read, write, timeoutMs, signal);
         return { ok: true, kind: "json", json: selected };
       }
@@ -9418,7 +9439,7 @@ var WasmProcess = class {
   alarm;
   dlLog = [];
   asyncOps = new AsyncOps(
-    (req) => this.syscall(req),
+    (req, cancelled) => this.syscall(req, cancelled),
     () => this.options.onAsync?.()
   );
   alarmEvery;
@@ -11255,6 +11276,7 @@ var Launcher = class {
   env;
   catalog;
   binfmts;
+  warned = /* @__PURE__ */ new Set();
   compiled = /* @__PURE__ */ new Map();
   processes = /* @__PURE__ */ new Map();
   zombies = /* @__PURE__ */ new Set();
@@ -11361,7 +11383,13 @@ var Launcher = class {
     return this.catalog;
   }
   interpreters() {
-    this.binfmts ??= this.roots().then((roots) => scanBinfmts(this.base, roots));
+    this.binfmts ??= this.roots().then(
+      (roots) => scanBinfmts(this.base, roots, (message2) => {
+        if (this.warned.has(message2)) return;
+        this.warned.add(message2);
+        console.warn(message2);
+      })
+    );
     return this.binfmts;
   }
   async roots() {