@ai-ecoverse/slicc-kernel 1.125.2 → 1.125.4

package/dist/node-process-worker.js

@@ -4588,6 +4588,7 @@ function filetypeOf(s) {
   if (s.isSymbolicLink) return FILETYPE.SYMBOLIC_LINK;
   if (s.isDirectory) return FILETYPE.DIRECTORY;
   if (s.isSocket) return FILETYPE.SOCKET_STREAM;
+  if (((s.mode ?? 0) & 61440) === 8192) return FILETYPE.CHARACTER_DEVICE;
   return s.isFile ? FILETYPE.REGULAR_FILE : FILETYPE.UNKNOWN;
 }
 function filestatOf(path, s) {
@@ -4829,7 +4830,11 @@ var init_wasi_host = __esm({
           }
           if (this.synthetic(path)) return ROOT_IDS;
           if (kernelDev(path)) return devSync(dev, devStat(path, follow3));
-          return follow3 ? this.o.fs.stat(path) : this.o.fs.lstat(path);
+          return this.orDev(
+            path,
+            follow3,
+            () => follow3 ? this.o.fs.stat(path) : this.o.fs.lstat(path)
+          );
         };
         return wrap({
           fd_chown: (fd, uid, gid) => {
@@ -4908,7 +4913,16 @@ var init_wasi_host = __esm({
               const node = devSync(dev, devStat(path, (flags & AT_SYMLINK_NOFOLLOW) === 0));
               return void mem.view().setUint32(out, node.mode ?? DEVICE_MODE, true);
             }
-            const st = flags & AT_SYMLINK_NOFOLLOW ? this.o.fs.lstat(path) : this.o.fs.stat(path);
+            const follow3 = (flags & AT_SYMLINK_NOFOLLOW) === 0;
+            let st;
+            try {
+              st = follow3 ? this.o.fs.stat(path) : this.o.fs.lstat(path);
+            } catch (err) {
+              const device2 = this.orDev(path, follow3, () => {
+                throw err;
+              });
+              return void mem.view().setUint32(out, device2.mode ?? DEVICE_MODE, true);
+            }
             mem.view().setUint32(out, (st.isFifo ? S_IFIFO : 0) | modeOf2(st), true);
           }
         });
@@ -5618,6 +5632,21 @@ var init_wasi_host = __esm({
       synthetic(path) {
         return deviceOf(path) !== void 0 || path === SEALED_PATH && !!this.o.kernel.sys.openSealed || path === CLIPBOARD_PATH && !!this.o.kernel.sys.openClipboard;
       }
+      linkedDev(path, follow3) {
+        if (!follow3) return void 0;
+        const real = physicalPath(this.o.fs, path);
+        return real !== path && kernelDev(real) ? real : void 0;
+      }
+      orDev(path, follow3, stat) {
+        try {
+          return stat();
+        } catch (err) {
+          const device2 = err.code === "ENOENT" && this.linkedDev(path, follow3);
+          if (!device2) throw err;
+          const json2 = (req) => this.o.kernel.call(req);
+          return devSync({ json: json2 }, devStat(device2, true));
+        }
+      }
       devChar(path, follow3) {
         try {
           const json2 = (req) => this.o.kernel.call(req);
@@ -5725,11 +5754,12 @@ var init_wasi_host = __esm({
           return filestatOf(path, follow3 ? this.o.fs.stat(path) : this.o.fs.lstat(path));
         } catch (err) {
           if (err.code !== "ENOENT") throw err;
-          if (kernelDev(path) && this.devChar(path, follow3)) {
+          const device2 = kernelDev(path) ? path : this.linkedDev(path, follow3);
+          if (device2 && this.devChar(device2, true)) {
             return this.local({
               filetype: FILETYPE.CHARACTER_DEVICE,
               size: 0n,
-              ino: pathInode(path),
+              ino: pathInode(device2),
               mtimeNs: 0n
             });
           }
@@ -6295,7 +6325,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.125.2" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.125.4" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -12610,7 +12640,7 @@ function datesOf(real) {
       dates[key] = new Date(value2);
   return dates;
 }
-var POLLIN, POLLOUT, POLLERR, POLLHUP, POLLRDNORM, POLLWRNORM, TCSETSF, O_NONBLOCK2, SOCKET_MODE, PTY_PATH, TTY_PATH, TTY_NAME, SEALED_PATH2, STRERROR, CLIPBOARD_PATH2, O_CREAT2, O_EXCL2, O_NOCTTY, O_TRUNC3, O_DIRECTORY, KILLED_BY_SIGPIPE, ProcessExit, SyscallError, KernelStreams;
+var POLLIN, POLLOUT, POLLERR, POLLHUP, POLLRDNORM, POLLWRNORM, TCSETSF, O_NONBLOCK2, SOCKET_MODE, PTY_PATH, TTY_PATH, PTS_MAJOR, TTY_NAME, SEALED_PATH2, STRERROR, CLIPBOARD_PATH2, O_CREAT2, O_EXCL2, O_NOCTTY, O_TRUNC3, O_DIRECTORY, KILLED_BY_SIGPIPE, ProcessExit, SyscallError, KernelStreams;
 var init_kernel_streams = __esm({
   "src/process/kernel-streams.ts"() {
     "use strict";
@@ -12627,6 +12657,7 @@ var init_kernel_streams = __esm({
     SOCKET_MODE = 49663;
     PTY_PATH = /^\/dev\/(?:ptmx|pts\/(\d+))$/;
     TTY_PATH = /^\/dev\/tty\d+$/;
+    PTS_MAJOR = 136;
     TTY_NAME = /^tty\d+$/;
     SEALED_PATH2 = "/dev/sealed";
     STRERROR = {
@@ -12838,6 +12869,48 @@ var init_kernel_streams = __esm({
           return [...names, ...missing2];
         };
       }
+      usePtsNodes() {
+        const fs = this.Fs;
+        const { lookupNode, readdir, getPath, mkdir, mkdev, makedev } = fs;
+        const numbers = this.sys.ptyNumbers?.bind(this.sys);
+        if (!lookupNode || !readdir || !getPath || !mkdir || !mkdev || !makedev || !numbers) return;
+        const make = (parent, name2) => {
+          const dir = getPath.call(fs, parent);
+          if (dir === "/dev" && name2 === "pts") mkdir.call(fs, "/dev/pts", 493);
+          else if (dir === "/dev/pts" && numbers().includes(Number(name2)) && /^\d+$/.test(name2))
+            mkdev.call(fs, `/dev/pts/${name2}`, makedev.call(fs, PTS_MAJOR, Number(name2)));
+          else return false;
+          return true;
+        };
+        fs.lookupNode = (parent, name2) => {
+          try {
+            return lookupNode.call(fs, parent, name2);
+          } catch (e) {
+            if (this.creatingTerminal) throw e;
+            this.creatingTerminal = true;
+            let made;
+            try {
+              made = make(parent, name2);
+            } finally {
+              this.creatingTerminal = false;
+            }
+            if (!made) throw e;
+            return lookupNode.call(fs, parent, name2);
+          }
+        };
+        fs.readdir = (path) => {
+          const at = path.replace(/\/+$/, "");
+          if (at === "/dev/pts") return [".", "..", ...numbers().map(String)];
+          const names = readdir.call(fs, path);
+          return at === "/dev" && !names.includes("pts") ? [...names, "pts"] : names;
+        };
+      }
+      ptsTarget(path, st) {
+        if ((st?.rdev ?? 0) >> 8 !== PTS_MAJOR) return void 0;
+        const { lookupPath } = this.Fs;
+        const real = lookupPath?.call(this.Fs, path, { follow: true }).path;
+        return real !== void 0 && isPtyPath(real) ? real : void 0;
+      }
       ttyNode(name2) {
         const { analyzePath, mkdev, makedev } = this.Fs;
         if (!TTY_PATH.test(name2) || !analyzePath || !mkdev || !makedev) return;
@@ -12913,6 +12986,7 @@ var init_kernel_streams = __esm({
         if (typeof this.Fs.open !== "function") return;
         this.usePtyPaths();
         this.useTerminalNodes();
+        this.usePtsNodes();
         this.listSealed();
         const open = this.Fs.open.bind(this.Fs);
         this.Fs.open = (path, flags, mode) => {
@@ -13028,15 +13102,21 @@ var init_kernel_streams = __esm({
             if (path === CLIPBOARD_PATH2 && this.sys.openClipboard) return sealedStat(251);
             const owned = this.ownedTty(path);
             if (owned && isPtyPath(path)) return this.owned(path, ptyStat(path));
-            if (!isPtyPath(path)) {
-              const st = original.call(fs, path, ...rest2);
-              return owned && TTY_PATH.test(path) ? this.owned(path, st) : st;
-            }
+            if (!isPtyPath(path))
+              return this.pathStat(path, original.call(fs, path, ...rest2), name2, owned);
             this.existingPty(path);
             return ptyStat(path);
           };
         }
       }
+      pathStat(path, st, name2, owned) {
+        const pts = name2 === "stat" ? this.ptsTarget(path, st) : void 0;
+        if (pts) {
+          this.existingPty(pts);
+          return owned ? this.owned(pts, ptyStat(pts)) : ptyStat(pts);
+        }
+        return owned && TTY_PATH.test(path) ? this.owned(path, st) : st;
+      }
       ownedTty(path) {
         return this.options.owners === true && this.sys.ttyOwner !== void 0 && path !== "/dev/ptmx";
       }
@@ -14793,6 +14873,60 @@ var init_wasi_module = __esm({
   }
 });
 
+// src/process/wasi/wasi-ptsfs.ts
+function ptsBridge(fs, call2) {
+  const open = () => call2({ op: "pty-list" });
+  const kernel = { json: (req) => call2(req) };
+  const entry = (p) => {
+    const n = PTS_ENTRY.exec(p)?.[1];
+    if (n === void 0 || !open().includes(Number(n))) throw syncError("ENOENT", p);
+    return devSync(kernel, devStat(p, true));
+  };
+  const dir = () => devSync(kernel, devStat(PTS, true));
+  const statOf = (p, real) => {
+    if (p === PTS) return dir();
+    return PTS_ENTRY.test(p) ? entry(p) : real();
+  };
+  const names = () => open().map(String).sort();
+  const over = {
+    stat: (p) => statOf(p, () => fs.stat(p)),
+    lstat: (p) => statOf(p, () => fs.lstat(p)),
+    exists: (p) => {
+      if (p === PTS) return true;
+      if (!PTS_ENTRY.test(p)) return fs.exists(p);
+      return open().includes(Number(PTS_ENTRY.exec(p)?.[1]));
+    },
+    readdir: (p) => {
+      if (p === PTS) return names();
+      const listed = fs.readdir(p);
+      return p === "/dev" && !listed.includes("pts") ? [...listed, "pts"] : listed;
+    },
+    readdirStat: (p) => {
+      if (p === PTS) return names().map((name2) => [name2, entry(`${PTS}/${name2}`)]);
+      const listed = fs.readdirStat(p);
+      if (p !== "/dev" || listed.some(([name2]) => name2 === "pts")) return listed;
+      return [...listed, ["pts", dir()]];
+    }
+  };
+  return new Proxy(fs, {
+    get(target, key, receiver) {
+      if (Object.hasOwn(over, key)) return over[key];
+      const value2 = Reflect.get(target, key, receiver);
+      return typeof value2 === "function" ? value2.bind(target) : value2;
+    }
+  });
+}
+var PTS, PTS_ENTRY;
+var init_wasi_ptsfs = __esm({
+  "src/process/wasi/wasi-ptsfs.ts"() {
+    "use strict";
+    init_sync_fs_wire();
+    init_js_dev();
+    PTS = "/dev/pts";
+    PTS_ENTRY = /^\/dev\/pts\/(\d+)$/;
+  }
+});
+
 // src/process/wasi/wasi-signals.ts
 var DELIVERED_MASK, KERNEL_DEFAULTS, LIBC_DEFAULT_EXIT, SA_RESTART, SA_NODEFER, SA_NOCLDWAIT, DISPOSITION_IGNORE, DISPOSITION_HANDLER, withBit, WASIX_LIBC_DEFAULT_LINE, WasiSignals;
 var init_wasi_signals = __esm({
@@ -16968,13 +17102,20 @@ async function runWasiProcess(init, port3) {
     ppid: id.ppid,
     parent: () => identify(transport, init).ppid,
     kernel: { sys: traced(stats, "kernel", sys), call: call2 },
-    fs: procfsBridge(
-      cachingBridge(
-        traced(stats, "fs", createSyncFsSabBridge(transport, { ...ownersOf(init), direct: true })),
-        void 0,
-        threads?.ids
+    fs: ptsBridge(
+      procfsBridge(
+        cachingBridge(
+          traced(
+            stats,
+            "fs",
+            createSyncFsSabBridge(transport, { ...ownersOf(init), direct: true })
+          ),
+          void 0,
+          threads?.ids
+        ),
+        procTree(call2, id.pid)
       ),
-      procTree(call2, id.pid)
+      call2
     ),
     ...descriptors(init, fork, threads),
     ...threads ? { credGen: threads.ids } : {}
@@ -17074,13 +17215,16 @@ async function runWasiThread(init, port3) {
     ppid: id.ppid,
     parent: () => identify(transport, init).ppid,
     kernel: { sys, call: call2 },
-    fs: procfsBridge(
-      cachingBridge(
-        createSyncFsSabBridge(transport, { ...ownersOf(init), direct: true }),
-        void 0,
-        threads.ids
+    fs: ptsBridge(
+      procfsBridge(
+        cachingBridge(
+          createSyncFsSabBridge(transport, { ...ownersOf(init), direct: true }),
+          void 0,
+          threads.ids
+        ),
+        procTree(call2, id.pid)
       ),
-      procTree(call2, id.pid)
+      call2
     ),
     shared: threads.ids
   });
@@ -17146,6 +17290,7 @@ var init_wasi_runtime = __esm({
     init_wasi_imports();
     init_wasi_module();
     init_wasi_procfs();
+    init_wasi_ptsfs();
     init_wasi_sigmask();
     init_wasi_signals();
     init_wasi_stats();