@ai-ecoverse/slicc-kernel 1.93.0 → 1.93.2

package/dist/node.js

@@ -10500,7 +10500,7 @@ function mountTable(mounts = []) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.93.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.93.2" : "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
@@ -14073,6 +14073,7 @@ var WasmProcess = class {
     this.nodes = options.nodes ?? new VfsNodes(options.fs);
     if (!options.nodes) options.openFiles?.add(this.nodes);
     this.children.onChildState = () => this.signal(SIG.CHLD);
+    this.seedDl(options.dl);
     this.children.onReap = (pid2) => {
       this.deathSignals.delete(pid2);
       options.onReap?.(pid2);
@@ -14907,7 +14908,7 @@ var WasmProcess = class {
     switch (req.op) {
       case "proc-fork":
         this.refuseIfPending(req.restart);
-        return { ok: true, kind: "json", json: await this.children.fork(req.state) };
+        return { ok: true, kind: "json", json: await this.children.fork(this.withDl(req.state)) };
       case "proc-spawn":
         this.refuseIfPending(req.restart);
         return { ok: true, kind: "json", json: await this.spawn(req) };
@@ -15050,6 +15051,20 @@ var WasmProcess = class {
     free: [],
     live: /* @__PURE__ */ new Set()
   };
+  withDl(state) {
+    if (this.dlLog.length === 0) return state;
+    const { next: next2, handle, free, live } = this.closures;
+    const dl = { log: [...this.dlLog], next: next2, handle, free: [...free], live: [...live] };
+    return { ...state, dl };
+  }
+  seedDl(dl) {
+    if (!dl) return;
+    this.dlLog.push(...dl.log);
+    this.closures.next = dl.next;
+    this.closures.handle = dl.handle;
+    this.closures.free.push(...dl.free);
+    for (const index of dl.live) this.closures.live.add(index);
+  }
   allocateClosure(floor) {
     const index = this.closures.free.pop() ?? Math.max(floor, this.closures.next);
     this.closures.next = Math.max(this.closures.next, index + 1);
@@ -15359,6 +15374,7 @@ function processOptions(opts, header4, hooks, created3) {
     ...opts.settling ? { settling: opts.settling } : {},
     spawner: opts.spawner,
     forker: opts.forker,
+    ...opts.fork?.dl ? { dl: opts.fork.dl } : {},
     fs: opts.fs,
     kill: opts.kill,
     ...opts.writesBack ? { writesBack: opts.writesBack } : {},
@@ -19047,6 +19063,9 @@ var Launcher = class {
   hostname;
   watchers = new FsWatchers();
   pnpmHome;
+  pnpmChain;
+  pnpmMade;
+  pnpmEpoch = 0;
   mounts;
   createDriverWorker;
   media;
@@ -19097,7 +19116,10 @@ var Launcher = class {
     this.mounts = new MountTable({
       open: (type, spec) => this.driver(type, spec),
       busy: (target) => [...this.openFiles].some((nodes) => nodes.holds(target)) || heldUnder(this.held, target),
-      changed: this.watchers.changed.bind(this.watchers),
+      changed: (...paths) => {
+        if (paths.some((path) => this.pnpmChain.has(path))) this.pnpmStale();
+        this.watchers.changed(...paths);
+      },
       owners: this.owners
     });
     this.mounted = this.mounts.wrap(options.fs);
@@ -19110,6 +19132,7 @@ var Launcher = class {
     this.fstabRetries = options.fstabRetries ?? FSTAB_RETRIES;
     this.processMounts = options.processMounts ?? true;
     this.pnpmHome = options.env?.PNPM_HOME ?? SYSTEM_PNPM_HOME;
+    this.pnpmChain = new Set(chain(normalizePath(this.pnpmHome)));
     this.modulesDir = options.modules ?? "/node_modules";
     this.appended = appendedRoots(options.commands);
     this.cdp = new CdpHosts(options.cdp);
@@ -19361,8 +19384,17 @@ var Launcher = class {
     }
     if (interpreter(head) !== "node") return void 0;
     const wasm = modulePath(glue);
-    if (!await this.base.exists(wasm)) return void 0;
-    return { abi: "emscripten", glue, wasm, argv0: baseName(argv0 || file), ...asked };
+    if (await this.base.exists(wasm)) {
+      return { abi: "emscripten", glue, wasm, argv0: baseName(argv0 || file), ...asked };
+    }
+    const owner = await this.glueOwner(glue, baseName(file), scope);
+    return owner && { ...targetOf(owner), ...asked };
+  }
+  async glueOwner(glue, name2, scope) {
+    const owners = [...(await this.commands(scope)).values()].filter(
+      (c) => c.abi === "emscripten" && !c.script && c.glue === glue
+    );
+    return owners.find((c) => c.name === name2) ?? owners[0];
   }
   async head(path) {
     try {
@@ -19716,6 +19748,7 @@ var Launcher = class {
     delete env[TICKET_ENV];
     env.HOSTNAME = this.hostname;
     let program;
+    await this.pnpmReady();
     try {
       const caller = { pid: req.ppid ?? 0, uid: req.cred.euid, tag: req.tag };
       if (this.integrity) await this.checkedSources(planned, caller);
@@ -20360,8 +20393,7 @@ var Launcher = class {
       this.fs
     );
     void this.unlinked.sweep(entry.target);
-    if (this.pnpmHome.startsWith(`${entry.target.replace(/\/$/, "")}/`))
-      await this.provisionPnpmHome();
+    this.pnpmStale();
     return entry;
   }
   async ownTmp() {
@@ -20409,8 +20441,18 @@ var Launcher = class {
     if (path === "/") return path;
     return joinName(await realDir(this.base, parentOf(path)), baseName(path));
   }
-  async provisionPnpmHome() {
-    await this.base.mkdir(this.pnpmHome, { recursive: true }).catch(() => void 0);
+  pnpmReady() {
+    if (this.pnpmMade !== void 0) return this.pnpmMade;
+    const epoch = this.pnpmEpoch;
+    const made2 = this.base.mkdir(this.pnpmHome, { recursive: true }).then(() => this.owners ? this.stampLayout() : void 0).catch(() => {
+      if (this.pnpmEpoch === epoch) this.pnpmMade = void 0;
+    });
+    this.pnpmMade = made2;
+    return made2;
+  }
+  pnpmStale() {
+    this.pnpmEpoch++;
+    this.pnpmMade = void 0;
   }
   mountedBy(spec, cred) {
     if (!this.owners || cred.euid === 0 && cred.egid === 0) return spec;
@@ -20444,6 +20486,7 @@ var Launcher = class {
   umount(target, detach = false) {
     const at = normalizePath(target);
     this.mounts.umount(at, detach);
+    this.pnpmStale();
     if (!detach) return;
     for (const nodes of this.openFiles) nodes.revoke(at);
     for (const holds of this.held) holds.revoke(at);
@@ -20509,7 +20552,7 @@ var Launcher = class {
     await this.resolvePrefixes();
     for (const dir of SHARED_DIRS) await this.base.mkdir(dir, { recursive: true });
     if (this.owners) await this.ownTmp();
-    await this.provisionPnpmHome();
+    await this.pnpmReady();
     await this.users.ensure();
     if (this.owners) await this.stampLayout();
     if (this.owners) await this.sudoer.provision();