@ai-ecoverse/slicc-kernel 1.39.1 → 1.39.3

package/dist/node-process-worker.js

@@ -831,7 +831,10 @@ function createNodeOps(h) {
         const perm = mode & PERM_MASK & ~UMASK;
         if (perm !== DEFAULT_DIR_PERM) metadataCall(() => bridgeOf(parent).chmod(path, perm));
       } else if (Fs.isFile(mode)) {
-        call2(() => bridgeOf(parent).writeFile(path, new Uint8Array(0)));
+        const bridge = bridgeOf(parent);
+        call2(
+          () => bridge.create ? bridge.create(path) : bridge.writeFile(path, new Uint8Array(0))
+        );
       } else {
         throw new Fs.ErrnoError(wasiErrno("EPERM"));
       }
@@ -1326,6 +1329,7 @@ var init_sync_fs_wire = __esm({
       "lutimes",
       "statfs",
       "hold",
+      "create",
       "pread",
       "pwrite",
       "truncate"
@@ -1567,6 +1571,9 @@ function createSyncFsSabBridge(transport, opts = {}) {
     lutimes: (path, atimeMs, mtimeMs) => {
       run({ op: "lutimes", path, atimeMs, mtimeMs }, path);
     },
+    create: (path) => {
+      run({ op: "create", path }, path);
+    },
     hold: (path, held, open) => {
       run({ op: "hold", path, mode: (held ? 1 : 0) | (open ? 2 : 0) }, path);
     },
@@ -1805,7 +1812,8 @@ var init_kernel_streams = __esm({
           }
           const pty = this.openPty(open, path, flags, mode);
           if (pty) return pty;
-          const stream = open(path, flags, mode);
+          this.refuseExclusiveLink(path, flags);
+          const stream = this.openRacing(open, path, flags, mode);
           if (!stream.tty) return stream;
           if (stream.path === "/dev/tty" && this.sys.openTty) {
             let kfd;
@@ -1834,6 +1842,24 @@ var init_kernel_streams = __esm({
           return stream;
         };
       }
+      openRacing(open, path, flags, mode) {
+        try {
+          return open(path, flags, mode);
+        } catch (err) {
+          const lost = err.errno === wasiErrno("EEXIST") && !(flags & O_EXCL);
+          if (!lost) throw err;
+          return open(path, flags, mode);
+        }
+      }
+      refuseExclusiveLink(path, flags) {
+        if ((flags & (O_CREAT | O_EXCL)) !== (O_CREAT | O_EXCL)) return;
+        let mode = 0;
+        try {
+          mode = this.Fs.stat?.(path, true)?.mode ?? 0;
+        } catch {
+        }
+        if ((mode & 61440) === 40960) throw new this.Fs.ErrnoError(wasiErrno("EEXIST"));
+      }
       openPty(open, path, flags, mode) {
         const pts = /^\/dev\/pts\/(\d+)$/.exec(path);
         if (path !== "/dev/ptmx" && !pts) return void 0;
@@ -2902,6 +2928,7 @@ function createProcessKernel(deps) {
     if (!stream) return { none: true };
     promote?.(stream);
     if (stream.sliccKernelFd !== void 0) return { fd: stream.sliccKernelFd };
+    if (((stream.node?.mode ?? 0) & S_IFMT) === S_IFDIR2 && stream.path) return { dir: stream.path };
     const device2 = deviceOfStream(stream);
     if (device2) return device2;
     return n === 0 ? { input: drain(Fs, stream) } : { capture: true };
@@ -3045,12 +3072,14 @@ function createProcessKernel(deps) {
     }
   };
 }
-var POLLIN2, POLLOUT2, POLLERR2, POLLHUP2, POLLNVAL, SELECT_SLICE_MS, WUNTRACED, WCONTINUED;
+var S_IFMT, S_IFDIR2, POLLIN2, POLLOUT2, POLLERR2, POLLHUP2, POLLNVAL, SELECT_SLICE_MS, WUNTRACED, WCONTINUED;
 var init_process_children = __esm({
   "src/process/process-children.ts"() {
     "use strict";
     init_process_fork();
     init_wasi_errno();
+    S_IFMT = 61440;
+    S_IFDIR2 = 16384;
     POLLIN2 = 1;
     POLLOUT2 = 4;
     POLLERR2 = 8;
@@ -3759,7 +3788,7 @@ function kernelSys(transport) {
     kind(fd) {
       return json(call2({ op: "fd-info", fd }, `fd-info ${fd}`))?.kind;
     },
-    device(fd) {
+    heldMeta(fd) {
       return json(call2({ op: "fd-info", fd }, `fd-info ${fd}`)).meta;
     },
     size(fd) {
@@ -3823,9 +3852,15 @@ function wireKernelFd(Fs, streams, entry) {
 }
 function openDevice(Fs, fd, meta) {
   const flags = meta.access === "read" ? O_RDONLY : meta.access === "write" ? O_WRONLY3 : O_RDWR3;
+  return openAt(Fs, fd, `/dev/${meta.device}`, flags);
+}
+function openHeld(Fs, fd, meta) {
+  return "dir" in meta ? openAt(Fs, fd, meta.dir, O_RDONLY | O_DIRECTORY) : openDevice(Fs, fd, meta);
+}
+function openAt(Fs, fd, path, flags) {
   let stream;
   try {
-    stream = Fs.open(`/dev/${meta.device}`, flags);
+    stream = Fs.open(path, flags);
   } catch {
     return false;
   }
@@ -3840,8 +3875,8 @@ function wireKernelStdio(Fs, streams, sys) {
     const stream = Fs.getStream(fd);
     if (!stream) continue;
     const kind = sys?.kind?.(fd);
-    const device2 = kind === "device" ? sys?.device?.(fd) : void 0;
-    if (device2 && openDevice(Fs, fd, device2)) continue;
+    const meta = kind === "device" || kind === "held" ? sys?.heldMeta?.(fd) : void 0;
+    if (meta && openHeld(Fs, fd, meta)) continue;
     if (kind && PLACED.has(kind)) {
       const { flags } = stream;
       Fs.closeStream(fd);
@@ -4093,7 +4128,7 @@ function runMain(running, init) {
     return status2;
   }
 }
-var FS_OPS, O_RDONLY, O_WRONLY3, O_RDWR3, PLACED, GLUE_TRAILER, evaluateGlue, EVAL_BLOCKED;
+var FS_OPS, O_RDONLY, O_WRONLY3, O_RDWR3, O_DIRECTORY, PLACED, GLUE_TRAILER, evaluateGlue, EVAL_BLOCKED;
 var init_process_runtime = __esm({
   "src/process/process-runtime.ts"() {
     "use strict";
@@ -4118,6 +4153,7 @@ var init_process_runtime = __esm({
     O_RDONLY = 0;
     O_WRONLY3 = 1;
     O_RDWR3 = 2;
+    O_DIRECTORY = 65536;
     PLACED = /* @__PURE__ */ new Set(["stream", "file", "socket"]);
     GLUE_TRAILER = [
       "if (typeof ENV !== 'undefined') Object.assign(ENV, Module.sliccEnv);",
@@ -4321,6 +4357,7 @@ function cachingBridge(bridge, now = () => performance.now()) {
     utimes: (p, a, m) => mutating(() => bridge.utimes(p, a, m)),
     lutimes: (p, a, m) => mutating(() => bridge.lutimes(p, a, m)),
     ...bridge.hold ? { hold: bridge.hold.bind(bridge) } : {},
+    ...bridge.create ? { create: (p) => mutating(() => bridge.create?.(p)) } : {},
     ...bridge.pread && bridge.pwrite && bridge.truncate ? {
       pread: bridge.pread.bind(bridge),
       pwrite: (p, at, bytes, transfer) => mutating(() => bridge.pwrite?.(p, at, bytes, transfer)),
@@ -4613,7 +4650,7 @@ var init_wasi_fds = __esm({
         this.fs = fs;
       }
       setup(cwd, inherited, root = false) {
-        for (const fd of [0, 1, 2]) this.table.set(fd, kernelEntry2());
+        for (const fd of [0, 1, 2]) this.table.set(fd, this.stdioEntry(fd));
         const preopens = this.preopens(cwd, root);
         const top = 3 + preopens.length;
         for (const { fd, kind, flags, device: device2 } of inherited) {
@@ -4700,6 +4737,15 @@ var init_wasi_fds = __esm({
         const gen = Atomics.add(this.shared, GEN, 1) + 1;
         if (gen - 1 === this.seen) this.seen = gen;
       }
+      stdioEntry(fd) {
+        let info;
+        try {
+          info = this.kernel.call({ op: "fd-info", fd });
+        } catch {
+          return kernelEntry2();
+        }
+        return info?.meta && "dir" in info.meta ? { type: "dir", path: info.meta.dir } : kernelEntry2();
+      }
       fetch(fd) {
         let info;
         try {
@@ -4982,8 +5028,10 @@ 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.isLink(path)) throw new WasiError("EEXIST");
         const s = this.statOrMissing(path);
-        if (s && oflags & OFLAGS.CREAT && oflags & OFLAGS.EXCL) throw new WasiError("EEXIST");
+        if (exclusive && s) throw new WasiError("EEXIST");
         if (oflags & OFLAGS.DIRECTORY && !s?.isDirectory) {
           throw new WasiError(s ? "ENOTDIR" : "ENOENT");
         }
@@ -4998,8 +5046,8 @@ var init_wasi_fds = __esm({
         if (buffer) {
           if (oflags & OFLAGS.TRUNC) buffer.truncate(0);
         } else {
-          if (!existing) this.fs.writeFile(path, new Uint8Array(0));
-          const empty = !existing || (oflags & OFLAGS.TRUNC) !== 0;
+          const made = !existing && this.createNew(path, oflags);
+          const empty = made || (oflags & OFLAGS.TRUNC) !== 0;
           if (existing?.ranged) this.fs.invalidate?.();
           const st = existing?.ranged || !existing ? this.fs.stat(path) : existing;
           const ranged = st.ranged ? st.size : void 0;
@@ -5014,14 +5062,34 @@ var init_wasi_fds = __esm({
         const { readable, writable } = openAccess(existing, oflags, rights);
         const append = (fdflags & FDFLAGS.APPEND) !== 0;
         const flags = (writable ? readable ? O_RDWR4 : O_WRONLY4 : 0) | (append ? O_APPEND : 0);
-        if (!existing) this.fs.writeFile(path, new Uint8Array(0));
-        const truncate = !existing || (oflags & OFLAGS.TRUNC) !== 0;
+        const made = !existing && this.createNew(path, oflags);
+        const truncate = made || (oflags & OFLAGS.TRUNC) !== 0;
         const fd = this.kernel.sys.openVfs(path, flags, 0, truncate ? { truncate } : {});
         this.table.set(fd, { type: "kernel", kind: "file", nonblock: false, append });
         if (append) this.publishFlags(fd, { nonblock: false, append });
         this.bump();
         return fd;
       }
+      createNew(path, oflags) {
+        if (!this.fs.create) {
+          this.fs.writeFile(path, new Uint8Array(0));
+          return true;
+        }
+        try {
+          this.fs.create(path);
+          return true;
+        } catch (err) {
+          if (oflags & OFLAGS.EXCL || err.code !== "EEXIST") throw err;
+          return false;
+        }
+      }
+      isLink(path) {
+        try {
+          return this.fs.lstat(path).isSymbolicLink === true;
+        } catch {
+          return false;
+        }
+      }
       statOrMissing(path) {
         try {
           return this.fs.stat(path);