@ai-ecoverse/slicc-kernel 1.124.7 → 1.124.9

package/dist/process-worker.js

@@ -968,6 +968,7 @@ function parseSyncFsStat(json2) {
     ...s.ranged === true ? { ranged: true } : {},
     ...s.linkable === true ? { linkable: true } : {},
     ...typeof s.version === "string" ? { version: s.version } : {},
+    ...typeof s.gen === "number" ? { gen: s.gen } : {},
     ...typeof s.uid === "number" ? { uid: s.uid } : {},
     ...typeof s.gid === "number" ? { gid: s.gid } : {}
   };
@@ -1317,9 +1318,12 @@ function createSyncFsSabBridge(transport, opts = {}) {
     access: (path, mode, kind = "access", nofollow) => {
       run({ op: "access", path, mode, arg2: kind, ...nofollow ? { nofollow } : {} }, path);
     },
-    hold: (path, held2, open, handle, want = 0) => {
+    hold: (path, held2, open, handle, want = 0, seen = {}) => {
       const mode = (held2 ? 1 : 0) | (open ? 2 : 0);
-      if (mode === 3) return json2({ op: "hold", path, mode: mode | want }, path);
+      if (mode === 3) {
+        const at = seen.gen !== void 0 ? { gen: seen.gen } : {};
+        return json2({ op: "hold", path, mode: mode | want, ...at }, path);
+      }
       run({ op: "hold", path, mode, ...handle !== void 0 ? { handle } : {} }, path);
       return void 0;
     },
@@ -1882,6 +1886,16 @@ function appendThrough(h, stream, bytes) {
   stream.position = after - body.length;
   return true;
 }
+function holdLive(bridge, node, on, want) {
+  const s = node.live;
+  const seen = on && s.stat ? { gen: s.stat.gen } : void 0;
+  return bridge.hold?.(liveNodePath(node), on, true, s.handle, want, seen);
+}
+function dropOpen(s) {
+  if (s.openCount === 0) return false;
+  s.openCount -= 1;
+  return true;
+}
 function createStreamOps(h) {
   const { Fs, statOf, ensureLoaded, ensureCapacity, flushNode, bridgeOf, rangedOf } = h;
   const held2 = (stream, change) => {
@@ -1899,7 +1913,7 @@ function createStreamOps(h) {
   const opened2 = (node, on, want = 0) => {
     const s = node.live;
     try {
-      const handle = bridgeOf(node).hold?.(liveNodePath(node), on, true, s.handle, want);
+      const handle = holdLive(bridgeOf(node), node, on, want);
       s.handle = on ? handle : void 0;
       h.linked.opening(node, on);
       if (s.handle === void 0) h.handled.delete(node);
@@ -1991,7 +2005,7 @@ function createStreamOps(h) {
       const node = stream.node;
       if (!Fs.isFile(node.mode)) return;
       const s = node.live;
-      s.openCount = Math.max(0, s.openCount - 1);
+      if (!dropOpen(s)) return;
       if (s.openCount > 0) {
         held2(stream, -1);
         return;
@@ -2005,7 +2019,7 @@ function createStreamOps(h) {
         s.len = 0;
         s.loaded = false;
         held2(stream, -1);
-        opened2(node, false);
+        if (s.handle !== void 0) opened2(node, false);
       }
     },
     read(stream, buffer, offset, length, position) {
@@ -2610,7 +2624,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.124.7" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.124.9" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -4415,18 +4429,28 @@ function orphanContents(stream) {
   if (live.ranged) return live.ranged.read(0, live.ranged.size());
   return live.data?.slice(0, live.len ?? live.data.length) ?? new Uint8Array(0);
 }
+function heldOf(live) {
+  const ranged = live?.ranged;
+  const version = ranged?.pinnedVersion;
+  const pin = ranged && version !== void 0 ? { version, size: ranged.size() } : void 0;
+  const handle = live?.handle;
+  const ino = live?.stat?.ino;
+  return {
+    ...pin ? { pin } : {},
+    ...handle !== void 0 ? { handle } : {},
+    ...handle !== void 0 && ino !== void 0 ? { ino } : {}
+  };
+}
 function vfsPromoter(Fs, sys, streams2, livePath) {
   const promoted = /* @__PURE__ */ new Map();
   return (stream) => {
     if (stream.sliccKernelFd !== void 0 || !isVfsFile(Fs, stream)) return;
+    const live = stream.stream_ops;
     let kfd = promoted.get(stream.shared);
     if (kfd === void 0) {
+      live.fsync?.(stream);
       const contents = orphanContents(stream);
-      const ranged = stream.node.live?.ranged;
-      const version = ranged?.pinnedVersion;
-      const pin = ranged && version !== void 0 ? { version, size: ranged.size() } : void 0;
-      const handle = stream.node.live?.handle;
-      const held2 = { ...pin ? { pin } : {}, ...handle !== void 0 ? { handle } : {} };
+      const held2 = heldOf(stream.node.live);
       kfd = sys.openVfs(
         livePath(stream),
         stream.flags,
@@ -5698,6 +5722,7 @@ function kernelSys(transport) {
             ...opts?.created ? { created: true } : {},
             ...opts?.pin ? { pin: opts.pin } : {},
             ...opts?.handle !== void 0 ? { handle: opts.handle } : {},
+            ...opts?.ino !== void 0 ? { ino: opts.ino } : {},
             ...opts?.fifo ? { fifo: true } : {}
           },
           `fd-open-vfs ${path}`
@@ -7355,7 +7380,8 @@ function promoteRequest(fd, f, handed) {
     ...orphan ? { orphan: true } : {},
     ...!orphan && f.buffer.pin !== void 0 ? { pin: { version: f.buffer.pin, size: f.buffer.size() } } : {},
     ...!joins && f.buffer.isDirty() ? { dirty: true } : {},
-    ...f.buffer.handle !== void 0 ? { handle: f.buffer.handle } : {}
+    ...f.buffer.handle !== void 0 ? { handle: f.buffer.handle } : {},
+    ...f.buffer.handle !== void 0 && f.ino !== void 0 ? { ino: f.ino } : {}
   };
 }
 var SYNTHETIC_DIRS2, O_NONBLOCK2, O_WRONLY4, O_RDWR4, O_APPEND2, SEALED_PATH2, CLIPBOARD_PATH2, WasiFds, GEN2;
@@ -7957,6 +7983,9 @@ var init_wasi_fds = __esm({
         const alias = stdioAlias(path);
         if (alias !== void 0) return this.reopen(alias);
         const exclusive = (oflags & OFLAGS.CREAT) !== 0 && (oflags & OFLAGS.EXCL) !== 0;
+        if (exclusive && this.shared && !(oflags & OFLAGS.DIRECTORY) && this.madeAtOnce(path, mode)) {
+          return this.kernelFile(path, void 0, oflags, rights, fdflags, mode, true);
+        }
         if (exclusive && this.isLink(path)) throw new WasiError("EEXIST");
         const s = this.statOrMissing(path);
         if (exclusive && s) throw new WasiError("EEXIST");
@@ -8031,7 +8060,9 @@ var init_wasi_fds = __esm({
         const st = existing?.ranged || !existing ? this.fs.stat(path) : existing;
         const ranged = st.ranged ? st.size : void 0;
         const asked = (want & 4 ? HOLD_READ : 0) | (want & 2 ? HOLD_WRITE : 0) | (made ? HOLD_CREATED : 0);
-        const handle = this.fs.hold?.(path, true, true, void 0, this.fs.owners ? asked : 0);
+        const handle = this.fs.hold?.(path, true, true, void 0, this.fs.owners ? asked : 0, {
+          gen: st.gen
+        });
         const io = handle !== void 0 && this.fs.pinned ? this.fs.pinned(handle) : this.fs;
         const view = this.fs.changes;
         const watch = view && linkedWatch(
@@ -8054,11 +8085,11 @@ var init_wasi_fds = __esm({
         if (id !== void 0) this.know(buffer, id);
         return buffer;
       }
-      kernelFile(path, existing, oflags, rights, fdflags, mode) {
+      kernelFile(path, existing, oflags, rights, fdflags, mode, created = false) {
         const { readable: readable3, writable: writable2 } = openAccess(existing, oflags, rights);
         const append = (fdflags & FDFLAGS.APPEND) !== 0;
         const flags = (writable2 ? readable3 ? O_RDWR4 : O_WRONLY4 : 0) | (append ? O_APPEND2 : 0);
-        const made = !existing && this.createNew(path, oflags, mode);
+        const made = created || !existing && this.createNew(path, oflags, mode);
         const truncate = made || (oflags & OFLAGS.TRUNC) !== 0;
         const fd = this.kernel.sys.openVfs(path, flags, 0, {
           ...truncate ? { truncate } : {},
@@ -8093,6 +8124,16 @@ var init_wasi_fds = __esm({
           }
         }
       }
+      madeAtOnce(path, mode) {
+        if (!this.fs.create) return false;
+        try {
+          this.fs.create(path, mode, true);
+          return true;
+        } catch (err) {
+          if (err.code === "EEXIST") throw err;
+          return false;
+        }
+      }
       createNew(path, oflags, mode) {
         if (!this.fs.create) {
           this.fs.writeFile(path, new Uint8Array(0));
@@ -10851,15 +10892,37 @@ function frozen(bytes) {
     truncate: refuse2
   };
 }
-function procfsBridge(fs, tree) {
-  const toProc = (path, follow2) => procPath(fs, path, follow2);
-  const shadowing = () => {
+function physicalProc(fs) {
+  const view = fs.changes;
+  let seen;
+  return () => {
+    if (seen && view && !view.foreign()) {
+      const proc = view.changedSince(seen.gen, "/proc");
+      if (!proc.changed && !view.changedSince(seen.gen, "/").changed) {
+        seen.gen = proc.now;
+        return seen.physical;
+      }
+    }
+    const gen = view?.now();
+    let physical2;
     try {
-      return fs.exists("/proc");
-    } catch {
-      return false;
+      fs.stat("/proc");
+      physical2 = true;
+    } catch (err) {
+      const code2 = err.code;
+      if (code2 !== "ENOENT" && code2 !== "ENOTDIR") {
+        seen = void 0;
+        return false;
+      }
+      physical2 = false;
     }
+    seen = gen === void 0 ? void 0 : { gen, physical: physical2 };
+    return physical2;
   };
+}
+function procfsBridge(fs, tree) {
+  const toProc = (path, follow2) => procPath(fs, path, follow2);
+  const shadowing = physicalProc(fs);
   const via = (p, proc, own, follow2 = true) => {
     if (inProc(p)) return proc(p);
     if (shadowing()) {
@@ -10969,10 +11032,10 @@ function procfsBridge(fs, tree) {
       ],
       () => fs.link(from, to, follow2)
     ),
-    hold: (p, held2, open, handle, want) => {
+    hold: (p, held2, open, handle, want, seen) => {
       if (handle !== void 0 && snapshots.delete(handle)) return void 0;
       if (!held2) return fs.hold?.(p, held2, open, handle);
-      return via(p, snapshot, () => fs.hold?.(p, held2, open, void 0, want) ?? late(p));
+      return via(p, snapshot, () => fs.hold?.(p, held2, open, void 0, want, seen) ?? late(p));
     },
     kept: (handle) => snapshots.has(handle) || fs.kept?.(handle) === true,
     pinned: (handle) => {