@ai-ecoverse/slicc-kernel 1.109.0 → 1.110.1

package/dist/node-process-worker.js

@@ -5204,7 +5204,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.109.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.110.1" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });

package/dist/node.js

@@ -4083,6 +4083,8 @@ var S_ISGID3 = 1024;
 var READ_ATTEMPTS = 3;
 var MAX_LINKS5 = 40;
 var CHECK_MS = 1e3;
+var FILE_HANDLES = 4096;
+var STALE = /* @__PURE__ */ new Set(["NotFoundError", "TypeMismatchError"]);
 var EXECUTABLE = /\/node_modules\/(?:@[^/]+\/)?[^/]+\/bin\//;
 var ERRNO_BY_DOM_ERROR = {
   NotFoundError: "ENOENT",
@@ -4204,6 +4206,9 @@ var OpfsFs = class {
   root;
   meta;
   dirs = new PathMap();
+  files = new PathMap();
+  snapshots = /* @__PURE__ */ new WeakMap();
+  found = /* @__PURE__ */ new WeakMap();
   checked = /* @__PURE__ */ new WeakMap();
   channel;
   remote;
@@ -4441,6 +4446,19 @@ var OpfsFs = class {
   }
   forget(path) {
     this.dirs.deleteTree(path);
+    this.files.deleteTree(path);
+  }
+  remember(path, handle, looked = false) {
+    if (handle.kind !== "file") return handle;
+    if (looked) {
+      this.found.set(handle, performance.now());
+      this.snapshots.delete(handle);
+    }
+    this.files.delete(path);
+    if (this.files.size >= FILE_HANDLES)
+      this.files.delete(this.files.keys().next().value);
+    this.files.set(path, handle);
+    return handle;
   }
   async inDir(path, op) {
     const dir = await this.dir(path);
@@ -4464,16 +4482,30 @@ var OpfsFs = class {
   }
   async handle(path) {
     if (split(path).length === 0) return this.root;
+    const cached = this.files.get(path);
+    const fresh2 = cached && performance.now() - (this.found.get(cached) ?? -CHECK_MS) < CHECK_MS;
+    if (cached && !fresh2) this.files.delete(path);
+    if (cached && fresh2) {
+      try {
+        this.snapshots.set(cached, await cached.getFile());
+        return this.remember(path, cached);
+      } catch (err) {
+        if (!STALE.has(err?.name))
+          throw translate(err, path, "read");
+        this.files.delete(path);
+        this.snapshots.delete(cached);
+      }
+    }
     const [dir, name2] = await this.parent(path);
     const known = this.dirs.has(path);
     return this.inDir(dir, async (parent) => {
       const [first, second] = known ? ["directory", "file"] : ["file", "directory"];
       try {
-        return await this.child(parent, name2, first);
+        return this.remember(path, await this.child(parent, name2, first), true);
       } catch (err) {
         if (err?.name !== "TypeMismatchError") throw err;
       }
-      return this.child(parent, name2, second);
+      return this.remember(path, await this.child(parent, name2, second), true);
     }).catch((err) => {
       throw translate(err, path);
     });
@@ -4616,9 +4648,15 @@ var OpfsFs = class {
       if (this.dirTimes.get(path) === ms) this.dirTimes.delete(path);
     }
   }
+  async snapshot(handle) {
+    const taken = this.snapshots.get(handle);
+    if (!taken) return handle.getFile();
+    this.snapshots.delete(handle);
+    return taken;
+  }
   async statOf(path, handle, meta, touched) {
     const directory = handle.kind === "directory";
-    const file = directory ? void 0 : await handle.getFile();
+    const file = directory ? void 0 : await this.snapshot(handle);
     const modified = file?.lastModified ?? 0;
     const kept = meta?.mtimeMs !== void 0 && meta.mtimeFor === modified ? meta.mtimeMs : modified;
     const mtime = touched ?? kept;
@@ -5975,14 +6013,14 @@ var WsReader = class {
   }
 };
 function switchingHead(accept2, protocol = "") {
-  const chosen = protocol ? `Sec-WebSocket-Protocol: ${protocol}\r
+  const chosen2 = protocol ? `Sec-WebSocket-Protocol: ${protocol}\r
 ` : "";
   return latin1Bytes(
     `HTTP/1.1 101 Switching Protocols\r
 Upgrade: websocket\r
 Connection: Upgrade\r
 Sec-WebSocket-Accept: ${accept2}\r
-${chosen}\r
+${chosen2}\r
 `
   );
 }
@@ -6435,7 +6473,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.109.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.110.1" : "0.0.0-dev";
 var OS_RELEASE = "6.0.0-slicc";
 function procVersion() {
   return `Linux version ${OS_RELEASE} (slicc-kernel ${KERNEL_VERSION}) #1 SMP PREEMPT_DYNAMIC
@@ -6483,6 +6521,37 @@ function argsOf(pkg, raw) {
   if (!raw.every((arg) => typeof arg === "string")) return void 0;
   return raw.map((arg) => arg.replace(PACKAGE, pkg));
 }
+var warnedVariants = /* @__PURE__ */ new Set();
+function variantOf(pkg, raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const { env, wasm } = raw;
+  const path = inside(pkg, wasm);
+  if (!path || !env || typeof env !== "object" || Array.isArray(env)) return void 0;
+  const pairs = Object.entries(env);
+  if (pairs.length === 0) return void 0;
+  if (!pairs.every(([key, value2]) => ENV_KEY.test(key) && typeof value2 === "string")) {
+    return void 0;
+  }
+  return { env: Object.fromEntries(pairs), wasm: path };
+}
+function variantsOf(pkg, name2, raw) {
+  if (raw === void 0) return void 0;
+  const variants = Array.isArray(raw) ? raw.map((one) => variantOf(pkg, one)) : [void 0];
+  if (variants.every((one) => one !== void 0)) {
+    return variants.length > 0 ? variants : void 0;
+  }
+  const key = `${pkg}:${name2}:${JSON.stringify(raw)}`;
+  if (!warnedVariants.has(key)) {
+    warnedVariants.add(key);
+    console.warn(`slicc-kernel: ${pkg}: ${name2}: ignoring malformed "variants", running its wasm`);
+  }
+  return void 0;
+}
+function variantFor(variants, env) {
+  return variants?.find(
+    (one) => Object.entries(one.env).every(([key, value2]) => env[key] === value2)
+  )?.wasm;
+}
 function abiOf(raw, fallback) {
   const abi = raw ?? fallback;
   return abi === "emscripten" || abi === "wasi" || abi === "js" ? abi : void 0;
@@ -6516,6 +6585,7 @@ function commandOf(pkg, name2, raw, packageAbi, shared) {
   const glue = abi === "wasi" ? wasm : inside(pkg, raw.glue);
   if (!abi || !glue || !wasm) return void 0;
   const imports = abi === "wasi" ? inside(pkg, raw.imports) : void 0;
+  const variants = variantsOf(pkg, name2, raw.variants);
   return {
     name: name2,
     abi,
@@ -6527,7 +6597,8 @@ function commandOf(pkg, name2, raw, packageAbi, shared) {
     ...abi === "wasi" && raw.preopenRoot === true ? { preopenRoot: true } : {},
     ...args ? { args } : {},
     ...withEnv,
-    ...imports ? { imports } : {}
+    ...imports ? { imports } : {},
+    ...variants ? { variants } : {}
   };
 }
 function commandsOf(pkg, manifest) {
@@ -6847,13 +6918,14 @@ var CRONTAB_SOURCE = `export default async function crontab(ctx) {
   let text;
   try {
     if (file === "-") {
+      const stream = new TextDecoder();
       const parts = [];
       for (;;) {
         const chunk = await ctx.read(0);
         if (chunk.length === 0) break;
-        parts.push(decode(chunk));
+        parts.push(stream.decode(chunk, { stream: true }));
       }
-      text = parts.join("");
+      text = parts.join("") + stream.decode();
     } else text = decode(await ctx.fs.readFile(ctx.resolve(file)));
   } catch (err) {
     await say(2, "crontab: " + file + ": " + (err && err.code ? err.code : String(err)) + "\\n");
@@ -7399,7 +7471,10 @@ var CronService = class {
       const account = await this.host.lookup(job.user);
       if (account) out.push({ source: "system", account, job });
     }
-    const names = await fs.readdir(SPOOL_DIR).catch(() => []);
+    const names = await fs.readdir(SPOOL_DIR).catch((err) => {
+      if (err?.code === "ENOENT") return [];
+      throw err;
+    });
     for (const name2 of names.sort()) {
       if (name2.startsWith(".") || name2.endsWith("~")) continue;
       const path = `${SPOOL_DIR}/${name2}`;
@@ -21991,9 +22066,18 @@ function targetOf(command) {
     ...command.env ? { env: command.env } : {},
     ...command.unset ? { unset: command.unset } : {},
     ...command.imports ? { imports: command.imports } : {},
-    ...command.preopenRoot ? { preopenRoot: true } : {}
+    ...command.preopenRoot ? { preopenRoot: true } : {},
+    ...command.variants ? { variants: command.variants } : {}
   };
 }
+function chosen(planned, env) {
+  const { target } = planned;
+  const wasm = variantFor(target.variants, env);
+  if (wasm === void 0) return planned;
+  const { asked: _asked, ...rest2 } = target;
+  const glue = target.abi === "wasi" ? wasm : target.glue;
+  return { ...planned, target: { ...rest2, wasm, glue } };
+}
 function withScriptEnv(target, command) {
   if (!command) return target;
   return {
@@ -22904,14 +22988,15 @@ var Launcher = class {
       ...target.preopenRoot ? { preopenRoot: true } : {}
     };
   }
-  async launch(planned, req) {
-    const { target, args } = planned;
+  async launch(asked, req) {
     const cwd = await physicalPathAsync(this.base, req.cwd);
     const seen = { ...req.env, HOSTNAME: this.hostname, cwd };
-    const env = { ...expandDefaults(target.env, seen), ...req.env };
-    for (const key of target.unset ?? []) delete env[key];
+    const env = { ...expandDefaults(asked.target.env, seen), ...req.env };
+    for (const key of asked.target.unset ?? []) delete env[key];
     delete env[TICKET_ENV];
     env.HOSTNAME = this.hostname;
+    const planned = chosen(asked, env);
+    const { target, args } = planned;
     let program;
     await this.pnpmReady();
     try {
@@ -24288,6 +24373,7 @@ var MemoryFile = class {
     this.parent = parent;
   }
   async getFile() {
+    if (this.parent.removed || this.parent.children.get(this.name) !== this) fail2("NotFoundError");
     return new File(this.data.blobs, this.name, { lastModified: this.lastModified });
   }
   async createWritable({ keepExistingData = false } = {}) {