@ai-ecoverse/slicc-kernel 1.141.1 → 1.141.2

package/dist/node-process-worker.js

@@ -978,8 +978,8 @@ function cachingBridge(bridge, now = () => performance.now(), shared) {
     readlink: (p) => {
       const known = blind ? void 0 : (cache.fresh(), lstats.get(p));
       const gen = seen.lstat(p);
-      const current = view !== void 0 && gen !== void 0 && !view.changedSince(gen, p).changed;
-      if (known && current && !("until" in known) && young2(known) && !known.isSymbolicLink) {
+      const current2 = view !== void 0 && gen !== void 0 && !view.changedSince(gen, p).changed;
+      if (known && current2 && !("until" in known) && young2(known) && !known.isSymbolicLink) {
         throw syncError("EINVAL", `'${p}' is not a symbolic link`);
       }
       return bridge.readlink(p);
@@ -2224,8 +2224,8 @@ var init_js_kernel = __esm({
       }
       async report(handlers, ignored, defaults) {
         const caught = caughtOf(handlers);
-        const same = caught === this.reported.caught && ignored === this.reported.ignored;
-        if (same && defaults === 0) return;
+        const same2 = caught === this.reported.caught && ignored === this.reported.ignored;
+        if (same2 && defaults === 0) return;
         this.reported = { caught, ignored };
         await this.call({ op: "sig-mask", caught, ignored, ...defaults ? { defaults } : {} });
       }
@@ -3699,6 +3699,10 @@ var init_wasi_fds = __esm({
         if (exclusive && this.isLink(path)) throw new WasiError("EEXIST");
         const s = this.statOrMissing(path);
         if (exclusive && s) throw new WasiError("EEXIST");
+        if (s?.escape !== void 0) {
+          refuseWrite({ readonly: true }, oflags, rights);
+          return this.open(s.escape, oflags, rights, fdflags, mode);
+        }
         if (oflags & OFLAGS.DIRECTORY && !s?.isDirectory) {
           throw new WasiError(s ? "ENOTDIR" : "ENOENT");
         }
@@ -6087,11 +6091,11 @@ var init_wasi_host = __esm({
         const asked = FSTFLAGS.ATIM | FSTFLAGS.ATIM_NOW | FSTFLAGS.MTIM | FSTFLAGS.MTIM_NOW;
         if (this.o.fs.owners && (flags & asked) === 0) return;
         const now = Date.now();
-        let current;
+        let current2;
         const statOf = follow3 ? this.o.fs.stat.bind(this.o.fs) : this.o.fs.lstat.bind(this.o.fs);
         const kept = (field2) => {
-          current ??= statOf(path);
-          return current[field2] ?? current.mtimeMs ?? now;
+          current2 ??= statOf(path);
+          return current2[field2] ?? current2.mtimeMs ?? now;
         };
         const pick = (set, setNow, value2, field2) => flags & setNow ? now : flags & set ? Number(value2 / NS_PER_MS4) : kept(field2);
         (follow3 ? this.o.fs.utimes : this.o.fs.lutimes).call(
@@ -6721,7 +6725,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.141.1" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.141.2" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -7814,6 +7818,10 @@ function mayTrace(viewer, target) {
   const uid = of.ruid === by.euid && of.euid === by.euid && of.suid === by.euid;
   return uid && of.rgid === by.egid && of.egid === by.egid && of.sgid === by.egid;
 }
+function fileIdentity(ino, mtimeMs) {
+  if (ino === void 0 || mtimeMs === void 0 || !Number.isFinite(mtimeMs)) return void 0;
+  return `${ino}:${Math.trunc(mtimeMs)}`;
+}
 var init_proc_info = __esm({
   "src/kernel/proc-info.ts"() {
     "use strict";
@@ -10792,15 +10800,15 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
     readdir: (node) => listAll(node)
   };
   const track = (stream, names) => {
-    let current = names;
+    let current2 = names;
     const remember2 = (list) => scans.set(stream, new Set(list.filter((n) => /^[1-9]\d*$/.test(n)).map(Number)));
-    remember2(current ?? []);
+    remember2(current2 ?? []);
     Object.defineProperty(stream, "getdents", {
       configurable: true,
       enumerable: true,
-      get: () => current,
+      get: () => current2,
       set: (next2) => {
-        current = next2;
+        current2 = next2;
         if (next2) remember2(next2);
       }
     });
@@ -10998,10 +11006,40 @@ function directMiss(err, path) {
   if (err?.direct !== true) return false;
   return !path.split("/").some((part) => part === "." || part === "..");
 }
-function routing(tree, toProc, shadowing) {
+function same(fs, path, id) {
+  try {
+    const st = fs.stat(path);
+    const now = fileIdentity(st.ino, st.mtimeMs);
+    return now === void 0 || now === id;
+  } catch {
+    return false;
+  }
+}
+function current(fs, tree, q) {
+  const to = tree.escapeTo(q);
+  if (!to || to.id === void 0) return to?.target;
+  if (!same(fs, to.target, to.id)) throw syncError("ENOENT", q);
+  return to.target;
+}
+function guard(toProc, shadowing) {
+  return (paths, run) => {
+    const physical2 = shadowing();
+    for (const [p, follow3] of paths) {
+      if (inProc(p) || physical2 && toProc(p, follow3) !== void 0) throw syncError("EROFS", p);
+    }
+    return run();
+  };
+}
+function shownLink(fs, tree, q) {
+  const target = tree.readlink(q);
+  const to = tree.linkTo(q);
+  if (!to) return target;
+  return same(fs, to.target, to.id) ? target : `${target} (deleted)`;
+}
+function routing(fs, tree, toProc, shadowing) {
   return (p, inner, own, follow3 = true, outside) => {
     const proc = (q) => {
-      const target = outside ? tree.escape(q) : void 0;
+      const target = outside ? current(fs, tree, q) : void 0;
       return target === void 0 ? inner(q) : outside(target);
     };
     if (inProc(p)) return proc(p);
@@ -11022,14 +11060,8 @@ function routing(tree, toProc, shadowing) {
 function procfsBridge(fs, tree) {
   const toProc = (path, follow3) => procPath(fs, path, follow3);
   const shadowing = physicalProc(fs);
-  const via = routing(tree, toProc, shadowing);
-  const readOnly2 = (paths, run) => {
-    const physical2 = shadowing();
-    for (const [p, follow3] of paths) {
-      if (inProc(p) || physical2 && toProc(p, follow3) !== void 0) throw syncError("EROFS", p);
-    }
-    return run();
-  };
+  const via = routing(fs, tree, toProc, shadowing);
+  const readOnly2 = guard(toProc, shadowing);
   const snapshots = /* @__PURE__ */ new Map();
   let lastSnapshot = 0;
   const snapshot = (q) => {
@@ -11054,7 +11086,7 @@ function procfsBridge(fs, tree) {
       (q) => tree.stat(q),
       () => fs.stat(p),
       true,
-      (t) => fs.stat(t)
+      (t) => ({ ...fs.stat(t), escape: t })
     ),
     lstat: (p) => via(
       p,
@@ -11093,7 +11125,7 @@ function procfsBridge(fs, tree) {
     },
     readlink: (p) => via(
       p,
-      (q) => tree.readlink(q),
+      (q) => shownLink(fs, tree, q),
       () => fs.readlink(p),
       false
     ),
@@ -11133,7 +11165,7 @@ function procfsBridge(fs, tree) {
       return via(p, snapshot, () => fs.hold?.(p, held2, open, void 0, want, seen) ?? late(p));
     },
     kept: (handle) => snapshots.has(handle) || fs.kept?.(handle) === true,
-    escape: (p) => inProc(p) ? tree.escape(p) : void 0,
+    escape: (p) => inProc(p) ? current(fs, tree, p) : void 0,
     pinned: (handle) => {
       const bytes = snapshots.get(handle);
       return bytes ? frozen(bytes) : fs.pinned?.(handle) ?? fs;
@@ -11233,12 +11265,7 @@ var init_wasi_procfs = __esm({
           const exe = () => this.info(Number(top))?.exe === void 0 ? [] : ["exe"];
           return { kind: "dir", names: () => [...PID_NAMES, ...exe(), "task"] };
         }
-        if (leaf === "exe") {
-          const info = this.info(Number(top));
-          if (info?.exe === void 0) return void 0;
-          const denied = !mayTrace(this.ownInfo(), info);
-          return { kind: "link", target: info.exe, ...denied ? { denied } : {} };
-        }
+        if (leaf === "exe") return this.exe(Number(top));
         if (!PID_NAMES.includes(leaf)) return void 0;
         return {
           kind: "file",
@@ -11250,6 +11277,13 @@ var init_wasi_procfs = __esm({
           }
         };
       }
+      exe(pid) {
+        const info = this.info(pid);
+        if (info?.exe === void 0) return void 0;
+        const denied = !mayTrace(this.ownInfo(), info);
+        const id = info.exeId === void 0 ? {} : { id: info.exeId };
+        return { kind: "link", target: info.exe, ...denied ? { denied } : {}, ...id };
+      }
       ownInfo() {
         const processes2 = this.listing().processes;
         return processes2.find((p) => p.tid === this.pid) ?? processes2.find((p) => p.pid === this.pid);
@@ -11315,10 +11349,18 @@ var init_wasi_procfs = __esm({
         return node.names();
       }
       escape(path) {
+        return this.escapeTo(path)?.target;
+      }
+      escapeTo(path) {
         const node = this.node(this.parts(path, true));
         if (node?.kind !== "link" || !node.target.startsWith("/")) return void 0;
         if (node.denied) throw syncError("EACCES", path);
-        return node.target;
+        return node.id === void 0 ? { target: node.target } : { target: node.target, id: node.id };
+      }
+      linkTo(path) {
+        const node = this.node(this.parts(path, false));
+        if (node?.kind !== "link" || node.id === void 0 || node.denied) return void 0;
+        return { target: node.target, id: node.id };
       }
       readlink(path) {
         const node = this.find(path, false);
@@ -11937,9 +11979,9 @@ function ttyOps(kernel, syncKernel) {
         if (original) await setAttr(fd, original.termios);
         return;
       }
-      const current = await getAttr(fd);
-      if (!saved.has(terminal)) saved.set(terminal, { fd, termios: current });
-      await setAttr(fd, rawOf(current));
+      const current2 = await getAttr(fd);
+      if (!saved.has(terminal)) saved.set(terminal, { fd, termios: current2 });
+      await setAttr(fd, rawOf(current2));
     },
     async size(fd) {
       const [rows, columns] = await kernel.json({ op: "tty-winsz", fd });
@@ -11985,9 +12027,9 @@ function ttyOps(kernel, syncKernel) {
         if (original) syncSet(fd, original.termios);
         return;
       }
-      const current = syncGet(fd);
-      if (!saved.has(terminal)) saved.set(terminal, { fd, termios: current });
-      syncSet(fd, rawOf(current));
+      const current2 = syncGet(fd);
+      if (!saved.has(terminal)) saved.set(terminal, { fd, termios: current2 });
+      syncSet(fd, rawOf(current2));
     }
   };
   const modes = () => [...saved].reverse().map(([terminal, { fd, termios }]) => ({ terminal, fd, termios }));
@@ -13475,8 +13517,8 @@ var init_process_signals = __esm({
         const { caught, ignored, defaults = 0 } = masks;
         const nocldwait = masks.nocldwait === true;
         const was = this.reported;
-        const same = caught === was.caught && ignored === was.ignored && nocldwait === was.nocldwait;
-        if (same && defaults === 0) return;
+        const same2 = caught === was.caught && ignored === was.ignored && nocldwait === was.nocldwait;
+        if (same2 && defaults === 0) return;
         this.reported = { caught, ignored, nocldwait };
         const req = {
           op: "sig-mask",
@@ -13561,7 +13603,7 @@ function createSocketKernel(deps) {
     call2(req);
     return 0;
   };
-  const guard = (op) => {
+  const guard2 = (op) => {
     for (; ; ) {
       try {
         return op();
@@ -13593,8 +13635,8 @@ function createSocketKernel(deps) {
     return stream.fd;
   };
   return {
-    socket: (domain, nonblock, cloexec) => guard(() => install(json2({ op: "sock-open", domain }), nonblock, cloexec)),
-    socketpair: (domain, nonblock, cloexec) => guard(() => {
+    socket: (domain, nonblock, cloexec) => guard2(() => install(json2({ op: "sock-open", domain }), nonblock, cloexec)),
+    socketpair: (domain, nonblock, cloexec) => guard2(() => {
       const [a, b] = json2({ op: "sock-pair", domain });
       let first;
       try {
@@ -13612,9 +13654,9 @@ function createSocketKernel(deps) {
         throw e;
       }
     }),
-    bind: (fd, given) => guard(() => done({ op: "sock-bind", fd: kfd(fd), addr: resolved(Fs, given) })),
-    listen: (fd, backlog) => guard(() => done({ op: "sock-listen", fd: kfd(fd), backlog })),
-    accept: (fd, nonblock, cloexec) => guard(() => {
+    bind: (fd, given) => guard2(() => done({ op: "sock-bind", fd: kfd(fd), addr: resolved(Fs, given) })),
+    listen: (fd, backlog) => guard2(() => done({ op: "sock-listen", fd: kfd(fd), backlog })),
+    accept: (fd, nonblock, cloexec) => guard2(() => {
       const listener = socketAt(fd);
       const req = {
         op: "sock-accept",
@@ -13624,7 +13666,7 @@ function createSocketKernel(deps) {
       const got = json2(req);
       return { fd: install(got.fd, nonblock, cloexec), peer: got.peer };
     }),
-    connect: (fd, addr) => guard(() => {
+    connect: (fd, addr) => guard2(() => {
       const stream = socketAt(fd);
       const nonblock = (stream.flags & O_NONBLOCK2) !== 0;
       return done({
@@ -13634,12 +13676,12 @@ function createSocketKernel(deps) {
         nonblock
       });
     }),
-    shutdown: (fd, how) => guard(() => done({ op: "sock-shutdown", fd: kfd(fd), how })),
-    name: (fd, peer) => guard(() => json2({ op: "sock-name", fd: kfd(fd), peer })),
-    getopt: (fd, level, name2) => guard(() => ({ value: json2({ op: "sock-getopt", fd: kfd(fd), level, name: name2 }) })),
-    setopt: (fd, level, name2, value2) => guard(() => done({ op: "sock-setopt", fd: kfd(fd), level, name: name2, value: value2 })),
-    resolve: (name2, family = 4) => guard(() => json2({ op: "sock-resolve", name: name2, family })),
-    send: (fd, bytes, flags) => guard(() => {
+    shutdown: (fd, how) => guard2(() => done({ op: "sock-shutdown", fd: kfd(fd), how })),
+    name: (fd, peer) => guard2(() => json2({ op: "sock-name", fd: kfd(fd), peer })),
+    getopt: (fd, level, name2) => guard2(() => ({ value: json2({ op: "sock-getopt", fd: kfd(fd), level, name: name2 }) })),
+    setopt: (fd, level, name2, value2) => guard2(() => done({ op: "sock-setopt", fd: kfd(fd), level, name: name2, value: value2 })),
+    resolve: (name2, family = 4) => guard2(() => json2({ op: "sock-resolve", name: name2, family })),
+    send: (fd, bytes, flags) => guard2(() => {
       const stream = socketAt(fd);
       const nonblock = flags.dontwait === true || (stream.flags & O_NONBLOCK2) !== 0;
       try {
@@ -13651,7 +13693,7 @@ function createSocketKernel(deps) {
         throw e;
       }
     }),
-    recv: (fd, max, flags) => guard(() => {
+    recv: (fd, max, flags) => guard2(() => {
       const stream = socketAt(fd);
       const nonblock = flags.dontwait === true || (stream.flags & O_NONBLOCK2) !== 0;
       return sys.read(stream.sliccKernelFd, max, { nonblock, peek: flags.peek === true });