@ai-ecoverse/slicc-kernel 1.12.0 → 1.14.0

package/dist/process-worker.js

@@ -253,7 +253,7 @@ function createNodeOps(h) {
       const size = Fs.isDir(node.mode) ? 4096 : s.loaded ? s.len : st.size;
       const mtime = new Date(st.mtimeMs ?? 0);
       return {
-        dev: 1,
+        dev: st.dev ?? 1,
         ino: st.ino ?? inodeOf(liveNodePath(node)),
         mode: node.mode,
         nlink: 1,
@@ -383,28 +383,46 @@ function createNodeOps(h) {
   };
 }
 function createStreamOps(h) {
-  const { Fs, statOf, ensureLoaded, ensureCapacity, flushNode } = h;
+  const { Fs, statOf, ensureLoaded, ensureCapacity, flushNode, bridgeOf } = h;
+  const held = (stream, change) => {
+    const s = stream.node.live;
+    if ((stream.flags & 3) === 0 || s.orphan) return;
+    const before = s.writers ?? 0;
+    s.writers = Math.max(0, before + change);
+    if (before === 0 !== (s.writers === 0)) {
+      try {
+        bridgeOf(stream.node).hold?.(liveNodePath(stream.node), s.writers > 0);
+      } catch {
+      }
+    }
+  };
   return {
     open(stream) {
       if (!Fs.isFile(stream.node.mode)) return;
       stream.node.live.openCount++;
+      held(stream, 1);
     },
     dup(stream) {
       if (!Fs.isFile(stream.node.mode)) return;
       stream.node.live.openCount++;
+      held(stream, 1);
     },
     close(stream) {
       const node = stream.node;
       if (!Fs.isFile(node.mode)) return;
       const s = node.live;
       s.openCount = Math.max(0, s.openCount - 1);
-      if (s.openCount > 0) return;
+      if (s.openCount > 0) {
+        held(stream, -1);
+        return;
+      }
       try {
         flushNode(node);
       } finally {
         s.data = void 0;
         s.len = 0;
         s.loaded = false;
+        held(stream, -1);
       }
     },
     read(stream, buffer, offset, length, position) {
@@ -587,7 +605,7 @@ function guardStatfs(Fs) {
     const defaults = statfsNode(node);
     let usage;
     try {
-      usage = node.live ? node.mount?.opts?.bridge?.statfs?.() : void 0;
+      usage = node.live ? node.mount?.opts?.bridge?.statfs?.(liveNodePath(node)) : void 0;
     } catch {
       return defaults;
     }
@@ -718,7 +736,8 @@ function parseSyncFsStat(json) {
     ...typeof s.mtimeMs === "number" ? { mtimeMs: s.mtimeMs } : {},
     ...typeof s.atimeMs === "number" ? { atimeMs: s.atimeMs } : {},
     ...typeof s.ctimeMs === "number" ? { ctimeMs: s.ctimeMs } : {},
-    ...typeof s.ino === "number" ? { ino: s.ino } : {}
+    ...typeof s.ino === "number" ? { ino: s.ino } : {},
+    ...typeof s.dev === "number" ? { dev: s.dev } : {}
   };
 }
 var SYNC_FS_REQUEST_TIMEOUT_MS;
@@ -949,7 +968,10 @@ function createSyncFsSabBridge(transport, opts = {}) {
     utimes: (path, atimeMs, mtimeMs) => {
       run({ op: "utimes", path, atimeMs, mtimeMs }, path);
     },
-    statfs: () => parseSyncFsUsage(json({ op: "statfs", path: "/" }, "/"))
+    hold: (path, held) => {
+      run({ op: "hold", path, mode: held ? 1 : 0 }, path);
+    },
+    statfs: (path = "/") => parseSyncFsUsage(json({ op: "statfs", path }, path))
   };
 }
 var init_sync_sab_bridge = __esm({
@@ -1916,11 +1938,18 @@ function useDevFd(Fs) {
     return fstat.call(Fs, fd);
   };
 }
-function mountTable() {
+function mountTable(mounts = []) {
   const root = globalThis.navigator?.storage ? "opfs" : "memory";
-  return [`${root} / ${root} rw 0 0`, "devfs /dev devfs rw 0 0", "proc /proc proc rw 0 0", ""].join(
-    "\n"
-  );
+  const lines = [`${root} / ${root} rw 0 0`, "devfs /dev devfs rw 0 0", "proc /proc proc rw 0 0"];
+  for (const m of mounts) {
+    const options = Object.entries(m.options).map(([k, v]) => v === "" ? k : `${k}=${v}`);
+    const access = options.includes("ro") ? [] : ["rw"];
+    lines.push(
+      `${field(m.source)} ${field(m.target)} ${m.type} ${[...access, ...options].join(",")} 0 0`
+    );
+  }
+  return `${lines.join("\n")}
+`;
 }
 function accounts(env = {}) {
   const user = env.USER ?? "web_user";
@@ -1935,13 +1964,13 @@ ${name}:x:1000:
 `
   };
 }
-function useMounts(Fs, env = {}) {
+function useMounts(Fs, env = {}, live = false) {
   const { writeFile, mkdirTree } = Fs;
   if (typeof Fs.open !== "function" || typeof writeFile !== "function") return;
   const { passwd, group } = accounts(env);
   const backing = { "/etc/mtab": "/proc/mounts" };
   try {
-    writeFile.call(Fs, "/proc/mounts", mountTable());
+    if (!live) writeFile.call(Fs, "/proc/mounts", mountTable());
   } catch {
     return;
   }
@@ -1965,7 +1994,7 @@ function useMounts(Fs, env = {}) {
     }
   };
 }
-var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, DIR_MODE, LINK_MODE, O_ACCMODE, O_CREAT2, NAME;
+var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, DIR_MODE, LINK_MODE, O_ACCMODE, O_CREAT2, field, NAME;
 var init_process_fds = __esm({
   "src/process/process-fds.ts"() {
     "use strict";
@@ -1993,6 +2022,7 @@ var init_process_fds = __esm({
     LINK_MODE = 41408;
     O_ACCMODE = 3;
     O_CREAT2 = 64;
+    field = (text) => (text || "none").replace(/[\s\\]/g, (c) => `\\${c.charCodeAt(0).toString(8).padStart(3, "0")}`);
     NAME = /^[a-z_][a-z0-9_-]*$/i;
   }
 });
@@ -2685,6 +2715,7 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
         if (!infoOf(Number(name))) throw error();
         return pidDir(name, Number(name));
       }
+      if (name === "mounts") return file(parent, name, () => mountTable(sys.mountList?.() ?? []));
       if (SYSTEM_FILES.includes(name)) {
         return file(
           parent,
@@ -2697,7 +2728,7 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
     },
     readdir: (node) => {
       const names = new Set(readdir ? readdir(node) : [".", ".."]);
-      for (const name of SYSTEM_FILES) names.add(name);
+      for (const name of [...SYSTEM_FILES, "mounts"]) names.add(name);
       for (const p of procList().processes) names.add(String(p.pid));
       return [...names];
     }
@@ -2721,6 +2752,7 @@ var HZ, DIR_MODE2, FILE_MODE, ENOENT, ESRCH, EINVAL, UID, KIB, FALLBACK_MEMORY,
 var init_procfs = __esm({
   "src/process/procfs.ts"() {
     "use strict";
+    init_process_fds();
     HZ = 100;
     DIR_MODE2 = 16749;
     FILE_MODE = 33060;
@@ -2852,6 +2884,9 @@ function kernelSys(transport) {
     procList() {
       return json(call2({ op: "proc-list" }, "proc-list"));
     },
+    mountList() {
+      return json(call2({ op: "mount-list" }, "mount-list"));
+    },
     ptyNumber(fd) {
       return json(call2({ op: "pty-number", fd }, `pty-number ${fd}`));
     },
@@ -3017,7 +3052,7 @@ async function runWasmProcess(init, port, deps = {}) {
   const restartable = () => signals.restartable();
   const streams = new KernelStreams(running.FS, sys, { sigpipe, restartable });
   trackCloseOnExec(running.FS);
-  useMounts(running.FS, init.env);
+  useMounts(running.FS, init.env, true);
   useProcfs(running.FS, sys, init.pid);
   if (init.fork) restoreForkedStreams(running.FS, streams, init.fork.streams ?? []);
   else {
@@ -6421,7 +6456,7 @@ function enosys(module, name, foreign) {
 }
 function firstOther(foreign) {
   for (const [module, fields] of Object.entries(foreign)) {
-    const name = Object.keys(fields).find((field) => fields[field] === "other");
+    const name = Object.keys(fields).find((field2) => fields[field2] === "other");
     if (name !== void 0) return `${module}.${name}`;
   }
   return void 0;