@ai-ecoverse/slicc-kernel 1.103.0 → 1.103.2

package/dist/process-worker.js

@@ -941,6 +941,7 @@ function parseSyncFsStat(json2) {
     isFile: s.isFile,
     isDirectory: s.isDirectory,
     isSymbolicLink: s.isSymbolicLink,
+    ...s.isSocket === true ? { isSocket: true } : {},
     size: s.size,
     ...typeof s.mode === "number" ? { mode: s.mode } : {},
     ...typeof s.mtimeMs === "number" ? { mtimeMs: s.mtimeMs } : {},
@@ -1316,7 +1317,7 @@ function exactIn(node) {
   return node?.mount.opts.bridge.owners === true;
 }
 function modeFromStat(st, exact = false) {
-  const type = st.isSymbolicLink ? S_IFLNK : st.isDirectory ? S_IFDIR : S_IFREG;
+  const type = st.isSymbolicLink ? S_IFLNK : st.isDirectory ? S_IFDIR : st.isSocket ? S_IFSOCK : S_IFREG;
   const fallback = st.isDirectory || st.isSymbolicLink ? 511 : 438;
   const perm = (st.mode ?? fallback) & PERM_MASK;
   return type | (exact ? perm : perm || fallback);
@@ -1862,6 +1863,10 @@ function createStreamOps(h) {
     return want;
   };
   const directory = (stream) => {
+    if ((stream.node.mode & S_IFMT) === S_IFSOCK && !(stream.flags & O_PATH)) {
+      if (stream.fd !== void 0) Fs.closeStream?.(stream.fd);
+      throw new Fs.ErrnoError(wasiErrno("ENXIO"));
+    }
     const bridge = bridgeOf(stream.node);
     if (!bridge.owners || !Fs.isDir(stream.node.mode) || stream.flags & O_PATH) return;
     try {
@@ -2339,7 +2344,7 @@ function readingLinks(Fs) {
     }
   };
 }
-var S_IFDIR, S_IFREG, S_IFLNK, PERM_MASK, DEFAULT_DIR_PERM, UMASK, SEEK_CUR, SEEK_END, EARLY_WHOLE_FILE, O_APPEND, O_ACCMODE, O_TRUNC, O_PATH, stale, opening;
+var S_IFDIR, S_IFREG, S_IFLNK, S_IFSOCK, S_IFMT, PERM_MASK, DEFAULT_DIR_PERM, UMASK, SEEK_CUR, SEEK_END, EARLY_WHOLE_FILE, O_APPEND, O_ACCMODE, O_TRUNC, O_PATH, stale, opening;
 var init_live_vfs_fs = __esm({
   "src/realm/live-vfs-fs.ts"() {
     "use strict";
@@ -2352,6 +2357,8 @@ var init_live_vfs_fs = __esm({
     S_IFDIR = 16384;
     S_IFREG = 32768;
     S_IFLNK = 40960;
+    S_IFSOCK = 49152;
+    S_IFMT = 61440;
     PERM_MASK = 4095;
     DEFAULT_DIR_PERM = 493;
     UMASK = 18;
@@ -2427,7 +2434,7 @@ function mountVfsIntoEmscripten(Fs, deps) {
   linuxRmdir(Fs);
   if (deps.cred) Fs.sliccCred = deps.cred;
   try {
-    Fs.chdir(deps.cwd);
+    (Fs.sliccChdirAt ?? Fs.chdir).call(Fs, deps.cwd);
   } catch (err) {
     warn(`cannot chdir to ${deps.cwd}: errno ${err.errno}`);
   }
@@ -2484,7 +2491,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.103.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.103.2" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -3387,6 +3394,7 @@ function kernelUname(imports, hostname, memory, glue) {
 function kernelChdir(Fs) {
   const { chdir, lookupPath, ErrnoError } = Fs;
   if (!chdir || !lookupPath || !ErrnoError) return;
+  Fs.sliccChdirAt = chdir;
   Fs.chdir = (path) => {
     const { node } = lookupPath.call(Fs, path, { follow: true });
     const directory = Fs.isDir?.(node.mode) === true;
@@ -4051,13 +4059,13 @@ var init_kernel_streams = __esm({
         const name2 = path.slice(path.lastIndexOf("/") + 1);
         if (!TTY_NAME.test(name2)) return void 0;
         const { lookupPath, cwd } = this.Fs;
-        const absolute = path.startsWith("/") ? path : `${cwd?.call(this.Fs) ?? "/"}/${path}`;
-        const dir = absolute.slice(0, absolute.lastIndexOf("/")) || "/";
+        const absolute2 = path.startsWith("/") ? path : `${cwd?.call(this.Fs) ?? "/"}/${path}`;
+        const dir = absolute2.slice(0, absolute2.lastIndexOf("/")) || "/";
         try {
           const real = lookupPath?.call(this.Fs, dir, { follow: true }).path ?? dir;
           return `${real === "/" ? "" : real}/${name2}`;
         } catch {
-          return absolute;
+          return absolute2;
         }
       }
       terminalExists(path) {
@@ -4497,7 +4505,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 };
+    if (((stream.node?.mode ?? 0) & S_IFMT2) === 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 };
@@ -4549,6 +4557,7 @@ function createProcessKernel(deps) {
       argv,
       env: env ?? deps.env,
       cwd: cwd ?? Fs.cwd(),
+      ...cwd !== null ? { chdir: true } : {},
       stdio,
       ...inherit.length > 0 ? { inherit } : {},
       ...exec ? { exec } : {},
@@ -4644,14 +4653,14 @@ function createProcessKernel(deps) {
     }
   };
 }
-var S_IFMT, S_IFDIR2, POLLIN2, POLLOUT2, POLLERR2, POLLHUP2, POLLNVAL, SELECT_SLICE_MS, WUNTRACED, WCONTINUED;
+var S_IFMT2, 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_signals();
     init_process_fork();
     init_wasi_errno();
-    S_IFMT = 61440;
+    S_IFMT2 = 61440;
     S_IFDIR2 = 16384;
     POLLIN2 = 1;
     POLLOUT2 = 4;
@@ -4818,22 +4827,6 @@ function resolved(Fs, addr) {
   const path = addr.path.startsWith("/") ? addr.path : `${Fs.cwd()}/${addr.path}`;
   return { family: "unix", path: normalizePath(path) };
 }
-function socketNode(Fs, addr) {
-  if (addr.family !== "unix" || !addr.path || addr.path.startsWith("\0")) return void 0;
-  const fs = Fs;
-  let stream;
-  try {
-    stream = Fs.open(addr.path, O_WRONLY3 | O_CREAT4 | O_EXCL3, 493);
-  } catch (e) {
-    if (e?.errno === wasiErrno("EEXIST")) {
-      throw new SyscallError("EADDRINUSE");
-    }
-    throw e;
-  }
-  if (Fs.close) Fs.close(stream);
-  else Fs.closeStream(stream.fd);
-  return { remove: () => fs.unlink?.(addr.path) };
-}
 function createSocketKernel(deps) {
   const { transport, Fs, sys, streams } = deps;
   const call2 = (req) => {
@@ -4900,16 +4893,7 @@ function createSocketKernel(deps) {
         throw e;
       }
     }),
-    bind: (fd, given) => guard(() => {
-      const addr = resolved(Fs, given);
-      const node = socketNode(Fs, addr);
-      try {
-        return done({ op: "sock-bind", fd: kfd(fd), addr });
-      } catch (e) {
-        node?.remove();
-        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(() => {
       const listener = socketAt(fd);
@@ -4955,7 +4939,7 @@ function createSocketKernel(deps) {
     })
   };
 }
-var O_RDWR2, KILLED_BY_SIGPIPE2, O_WRONLY3, O_CREAT4, O_EXCL3;
+var O_RDWR2, KILLED_BY_SIGPIPE2;
 var init_process_sockets = __esm({
   "src/process/process-sockets.ts"() {
     "use strict";
@@ -4965,9 +4949,6 @@ var init_process_sockets = __esm({
     init_wasi_errno();
     O_RDWR2 = 2;
     KILLED_BY_SIGPIPE2 = 128 + 13;
-    O_WRONLY3 = 1;
-    O_CREAT4 = 64;
-    O_EXCL3 = 128;
   }
 });
 
@@ -5956,7 +5937,7 @@ function runMain(running, init) {
     return status2;
   }
 }
-var FS_OPS, O_RDONLY2, O_WRONLY4, O_RDWR3, O_ACCMODE5, O_DIRECTORY2, accessMode, PLACED, GLUE_TRAILER, evaluateGlue, EVAL_BLOCKED;
+var FS_OPS, O_RDONLY2, O_WRONLY3, O_RDWR3, O_ACCMODE5, O_DIRECTORY2, accessMode, PLACED, GLUE_TRAILER, evaluateGlue, EVAL_BLOCKED;
 var init_process_runtime = __esm({
   "src/process/process-runtime.ts"() {
     "use strict";
@@ -5980,11 +5961,11 @@ var init_process_runtime = __esm({
     init_kernel_streams();
     FS_OPS = new Set(SYNC_FS_OPS);
     O_RDONLY2 = 0;
-    O_WRONLY4 = 1;
+    O_WRONLY3 = 1;
     O_RDWR3 = 2;
     O_ACCMODE5 = 3;
     O_DIRECTORY2 = 65536;
-    accessMode = (access) => access === "read" ? O_RDONLY2 : access === "write" ? O_WRONLY4 : O_RDWR3;
+    accessMode = (access) => access === "read" ? O_RDONLY2 : access === "write" ? O_WRONLY3 : O_RDWR3;
     PLACED = /* @__PURE__ */ new Set(["stream", "file", "socket", "clipboard", "sealed"]);
     GLUE_TRAILER = [
       "if (typeof ENV !== 'undefined') Object.assign(ENV, Module.sliccEnv);",
@@ -6944,7 +6925,7 @@ function promoteRequest(fd, f, handed) {
     op: "fd-promote",
     fd,
     path: f.path,
-    flags: (f.writable ? f.readable ? O_RDWR4 : O_WRONLY5 : 0) | (f.append ? O_APPEND2 : 0),
+    flags: (f.writable ? f.readable ? O_RDWR4 : O_WRONLY4 : 0) | (f.append ? O_APPEND2 : 0),
     position: f.offset,
     ...joins ? {} : { contents: f.buffer.contents() },
     ...orphan ? { orphan: true } : {},
@@ -6953,7 +6934,7 @@ function promoteRequest(fd, f, handed) {
     ...f.buffer.handle !== void 0 ? { handle: f.buffer.handle } : {}
   };
 }
-var SYNTHETIC_DIRS2, O_NONBLOCK2, O_WRONLY5, O_RDWR4, O_APPEND2, SEALED_PATH2, CLIPBOARD_PATH2, WasiFds, GEN2;
+var SYNTHETIC_DIRS2, O_NONBLOCK2, O_WRONLY4, O_RDWR4, O_APPEND2, SEALED_PATH2, CLIPBOARD_PATH2, WasiFds, GEN2;
 var init_wasi_fds = __esm({
   "src/process/wasi/wasi-fds.ts"() {
     "use strict";
@@ -6964,7 +6945,7 @@ var init_wasi_fds = __esm({
     init_wasi_files();
     SYNTHETIC_DIRS2 = ["usr", "bin"];
     O_NONBLOCK2 = 2048;
-    O_WRONLY5 = 1;
+    O_WRONLY4 = 1;
     O_RDWR4 = 2;
     O_APPEND2 = 1024;
     SEALED_PATH2 = "/dev/sealed";
@@ -7500,7 +7481,7 @@ var init_wasi_fds = __esm({
         if (oflags & OFLAGS.DIRECTORY) throw new WasiError("ENOTDIR");
         if (oflags & OFLAGS.CREAT && oflags & OFLAGS.EXCL) throw new WasiError("EEXIST");
         const want = wantOf2(oflags, rights);
-        const flags = want === 6 ? O_RDWR4 : want === 2 ? O_WRONLY5 : 0;
+        const flags = want === 6 ? O_RDWR4 : want === 2 ? O_WRONLY4 : 0;
         return openDevice2.call(this.kernel.sys, flags);
       }
       open(path, oflags, rights, fdflags) {
@@ -7604,7 +7585,7 @@ var init_wasi_fds = __esm({
       kernelFile(path, existing, oflags, rights, fdflags) {
         const { readable: readable3, writable: writable2 } = openAccess(existing, oflags, rights);
         const append = (fdflags & FDFLAGS.APPEND) !== 0;
-        const flags = (writable2 ? readable3 ? O_RDWR4 : O_WRONLY5 : 0) | (append ? O_APPEND2 : 0);
+        const flags = (writable2 ? readable3 ? O_RDWR4 : O_WRONLY4 : 0) | (append ? O_APPEND2 : 0);
         const made = !existing && this.createNew(path, oflags);
         const truncate = made || (oflags & OFLAGS.TRUNC) !== 0;
         const fd = this.kernel.sys.openVfs(path, flags, 0, {
@@ -8087,6 +8068,10 @@ function openRequest(af, type) {
     ...type === DGRAM ? { type: "dgram" } : {}
   };
 }
+function absolute(cwd, addr) {
+  if (addr.family !== "unix" || addr.path === "" || addr.path.startsWith("\0")) return addr;
+  return addr.path.startsWith("/") ? addr : { family: "unix", path: `${cwd}/${addr.path}` };
+}
 function optionalAddr(view, ptr) {
   if (ptr === 0 || view.getUint8(ptr) === 0) return void 0;
   return readAddr(view, ptr);
@@ -8155,7 +8140,7 @@ function wasixSocketImports(host, preview1) {
     },
     sock_bind: (fd, addr) => {
       socket(fd);
-      call2({ op: "sock-bind", fd, addr: readAddr(mem.view(), addr) });
+      call2({ op: "sock-bind", fd, addr: absolute(host.cwd, readAddr(mem.view(), addr)) });
     },
     sock_listen: (fd, backlog) => {
       socket(fd);
@@ -8163,7 +8148,8 @@ function wasixSocketImports(host, preview1) {
     },
     sock_connect: (fd, addr) => {
       const e = socket(fd);
-      call2({ op: "sock-connect", fd, addr: readAddr(mem.view(), addr), nonblock: e.nonblock });
+      const to = absolute(host.cwd, readAddr(mem.view(), addr));
+      call2({ op: "sock-connect", fd, addr: to, nonblock: e.nonblock });
     },
     sock_accept_v2: (fd, flags, outFd, outAddr) => {
       const e = socket(fd);
@@ -8309,6 +8295,7 @@ function filetypeOf(s) {
   if (!s) return FILETYPE.UNKNOWN;
   if (s.isSymbolicLink) return FILETYPE.SYMBOLIC_LINK;
   if (s.isDirectory) return FILETYPE.DIRECTORY;
+  if (s.isSocket) return FILETYPE.SOCKET_STREAM;
   return s.isFile ? FILETYPE.REGULAR_FILE : FILETYPE.UNKNOWN;
 }
 function filestatOf(path, s) {
@@ -9376,14 +9363,14 @@ function restarted2(issue) {
 function resolveFrom(cwd, path) {
   return normalize(path.startsWith("/") ? path : `${cwd}/${path}`);
 }
-var O_WRONLY6, O_RDWR5, O_APPEND3, OFLAG_CREAT, OFLAG_TRUNC, JOIN_NON_BLOCKING, JOIN_WAKE_STOPPED, JOIN_STOPPED, WasixProcess;
+var O_WRONLY5, O_RDWR5, O_APPEND3, OFLAG_CREAT, OFLAG_TRUNC, JOIN_NON_BLOCKING, JOIN_WAKE_STOPPED, JOIN_STOPPED, WasixProcess;
 var init_wasix_process = __esm({
   "src/process/wasi/wasix-process.ts"() {
     "use strict";
     init_physical_path();
     init_wasi_files();
     init_wasi_host();
-    O_WRONLY6 = 1;
+    O_WRONLY5 = 1;
     O_RDWR5 = 2;
     O_APPEND3 = 1024;
     OFLAG_CREAT = 1;
@@ -9485,13 +9472,15 @@ var init_wasix_process = __esm({
           throw Object.assign(new Error("ENOENT"), { code: "ENOENT" });
         }
         const flags = (op.rightsWrite ? O_RDWR5 : 0) | (op.append ? O_APPEND3 : 0);
-        return this.host.o.kernel.sys.openVfs(path, op.rightsWrite ? flags || O_WRONLY6 : 0, 0, {
+        return this.host.o.kernel.sys.openVfs(path, op.rightsWrite ? flags || O_WRONLY5 : 0, 0, {
           ...create ? { create } : {},
           ...op.oflags & OFLAG_TRUNC ? { truncate: true } : {}
         });
       }
       spawn(req, exec = false) {
-        const { stdio, inherit, cwd, opened: opened2 } = this.childFds(req.ops ?? []);
+        const ops = req.ops ?? [];
+        const { stdio, inherit, cwd, opened: opened2 } = this.childFds(ops);
+        const moved = ops.some((op) => op.cmd === "chdir" || op.cmd === "fchdir");
         try {
           const spawn = {
             op: "proc-spawn",
@@ -9499,6 +9488,7 @@ var init_wasix_process = __esm({
             argv: req.argv.length > 0 ? req.argv : [req.name],
             env: req.env ?? this.environment(),
             cwd,
+            ...moved ? { chdir: true } : {},
             stdio,
             inherit,
             ...exec ? { exec } : {},
@@ -9781,6 +9771,7 @@ function processes(host, call2, inThread) {
           argv: o.argv,
           env: o.env ?? { ...host.o.env },
           cwd: o.cwd ?? host.cwd,
+          ...o.cwd !== void 0 ? { chdir: true } : {},
           stdio,
           ...inThread ? {} : { restart: true }
         };
@@ -13216,6 +13207,7 @@ function childOps(kernel, io, defaults, sync) {
       ...named,
       env: { ...o.env ?? defaults.env },
       cwd: o.cwd ?? defaults.cwd,
+      ...o.cwd !== void 0 ? { chdir: true } : {},
       stdio,
       ...group,
       ...death
@@ -13395,7 +13387,7 @@ function checkOpen(abs, o, existing) {
 }
 function flagsOf(o) {
   const write2 = o.write || o.append || o.truncate;
-  const access = write2 ? o.read ? O_RDWR6 : O_WRONLY7 : 0;
+  const access = write2 ? o.read ? O_RDWR6 : O_WRONLY6 : 0;
   return access | (o.append ? O_APPEND4 : 0);
 }
 function openRequest2(abs, o) {
@@ -13412,7 +13404,7 @@ function openRequest2(abs, o) {
 function index2(n, what) {
   if (!Number.isSafeInteger(n) || n < 0) throw new JsCallError("EINVAL", what);
 }
-var CHUNK, MAX_IO, O_WRONLY7, O_RDWR6, O_APPEND4, BLOCK;
+var CHUNK, MAX_IO, O_WRONLY6, O_RDWR6, O_APPEND4, BLOCK;
 var init_js_io = __esm({
   "src/process/js/js-io.ts"() {
     "use strict";
@@ -13420,7 +13412,7 @@ var init_js_io = __esm({
     init_js_kernel();
     CHUNK = 64 * 1024;
     MAX_IO = 1024 * 1024;
-    O_WRONLY7 = 1;
+    O_WRONLY6 = 1;
     O_RDWR6 = 2;
     O_APPEND4 = 1024;
     BLOCK = 4096;
@@ -13437,8 +13429,8 @@ function missing(path) {
 function nodeStat(mode, size = 0, owner) {
   return {
     isFile: false,
-    isDirectory: (mode & S_IFMT2) === DIR,
-    isSymbolicLink: (mode & S_IFMT2) === LINK,
+    isDirectory: (mode & S_IFMT3) === DIR,
+    isSymbolicLink: (mode & S_IFMT3) === LINK,
     size,
     mode,
     mtimeMs: BORN,
@@ -13777,7 +13769,7 @@ function readWholeSync(file) {
     file.close();
   }
 }
-var DEV_READ_MAX, DEVICES2, STDIO3, SELF_FD, S_IFMT2, DIR, LINK, CHAR, BORN, CHAR_KINDS;
+var DEV_READ_MAX, DEVICES2, STDIO3, SELF_FD, S_IFMT3, DIR, LINK, CHAR, BORN, CHAR_KINDS;
 var init_js_dev = __esm({
   "src/process/js/js-dev.ts"() {
     "use strict";
@@ -13789,7 +13781,7 @@ var init_js_dev = __esm({
     DEVICES2 = ["null", "zero", "full", "random", "urandom"];
     STDIO3 = ["stdin", "stdout", "stderr"];
     SELF_FD = "/proc/self/fd";
-    S_IFMT2 = 61440;
+    S_IFMT3 = 61440;
     DIR = 16384;
     LINK = 40960;
     CHAR = 8192;
@@ -14664,6 +14656,7 @@ function runSync(kernel, d, o) {
     ...named,
     env: { ...o.env ?? d.env },
     cwd: o.cwd === void 0 ? d.cwd : d.resolve(o.cwd),
+    ...o.cwd === void 0 ? {} : { chdir: true },
     ...group,
     stdin: stdioOf(o.stdin),
     ...input ? { input } : {},