@ai-ecoverse/slicc-kernel 1.33.0 → 1.34.1

package/dist/process-worker.js

@@ -594,6 +594,26 @@ function toMs(v) {
 }
 function createHelpers(Fs, ops) {
   const bridgeOf = (node) => node.mount.opts.bridge;
+  const dirty = /* @__PURE__ */ new Set();
+  function markDirty(node) {
+    node.live.dirty = true;
+    dirty.add(node);
+  }
+  function flushDirty() {
+    for (const node of [...dirty]) {
+      const s = node.live;
+      if (!s.dirty || s.orphan) {
+        dirty.delete(node);
+        continue;
+      }
+      if (!s.ranged && s.len > EARLY_WHOLE_FILE) continue;
+      try {
+        flushNode(node);
+        dirty.delete(node);
+      } catch {
+      }
+    }
+  }
   function call2(fn) {
     try {
       return fn();
@@ -688,7 +708,7 @@ function createHelpers(Fs, ops) {
     const ranged = s.openCount > 0 ? rangedOf(node) : void 0;
     if (ranged) {
       ranged.truncate(size);
-      s.dirty = true;
+      markDirty(node);
       return;
     }
     if (s.openCount > 0) {
@@ -697,7 +717,7 @@ function createHelpers(Fs, ops) {
       const buf = ensureCapacity(node, size);
       if (size > s.len) buf.fill(0, s.len, size);
       s.len = size;
-      s.dirty = true;
+      markDirty(node);
       return;
     }
     const path = liveNodePath(node);
@@ -727,6 +747,8 @@ function createHelpers(Fs, ops) {
     ensureCapacity,
     rangedOf,
     flushNode,
+    markDirty,
+    flushDirty,
     truncate
   };
 }
@@ -971,7 +993,7 @@ function createStreamOps(h) {
       if (ranged) {
         const bytes = new Uint8Array(buffer.buffer, buffer.byteOffset + offset, length);
         h.call(() => ranged.write(position, bytes));
-        s.dirty = true;
+        h.markDirty(node);
         return length;
       }
       ensureLoaded(node);
@@ -979,7 +1001,7 @@ function createStreamOps(h) {
       if (position > s.len) buf.fill(0, s.len, position);
       buf.set(new Uint8Array(buffer.buffer, buffer.byteOffset + offset, length), position);
       s.len = Math.max(s.len, end);
-      s.dirty = true;
+      h.markDirty(node);
       return length;
     },
     llseek(stream, offset, whence) {
@@ -1009,6 +1031,7 @@ function createLiveVfsPlugin(Fs) {
     mounts,
     node_ops: nodeOps,
     stream_ops: streamOps,
+    flushDirty: () => h.flushDirty(),
     mount(mount) {
       const st = h.call(() => mount.opts.bridge.stat(mount.opts.root));
       if (!st.isDirectory) throw new Fs.ErrnoError(wasiErrno("ENOTDIR"));
@@ -1173,7 +1196,7 @@ function guardRenames(Fs) {
     rename(from, to);
   };
 }
-var S_IFDIR, S_IFREG, S_IFLNK, PERM_MASK, DEFAULT_DIR_PERM, UMASK, SEEK_CUR, SEEK_END;
+var S_IFDIR, S_IFREG, S_IFLNK, PERM_MASK, DEFAULT_DIR_PERM, UMASK, SEEK_CUR, SEEK_END, EARLY_WHOLE_FILE;
 var init_live_vfs_fs = __esm({
   "src/realm/live-vfs-fs.ts"() {
     "use strict";
@@ -1188,6 +1211,7 @@ var init_live_vfs_fs = __esm({
     UMASK = 18;
     SEEK_CUR = 1;
     SEEK_END = 2;
+    EARLY_WHOLE_FILE = 64 * 1024;
   }
 });
 
@@ -1224,6 +1248,7 @@ function mountVfsIntoEmscripten(Fs, deps) {
   return {
     mounted,
     flush: () => flushLiveVfs(Fs, plugin),
+    flushDirty: () => plugin.flushDirty(),
     invalidate: () => invalidateLiveVfs(Fs, plugin)
   };
 }
@@ -1268,10 +1293,34 @@ function parseSyncFsStat(json) {
     ...typeof s.version === "string" ? { version: s.version } : {}
   };
 }
-var SYNC_FS_REQUEST_TIMEOUT_MS;
+var SYNC_FS_OPS, SYNC_FS_REQUEST_TIMEOUT_MS;
 var init_sync_fs_wire = __esm({
   "src/realm/sync-fs-wire.ts"() {
     "use strict";
+    SYNC_FS_OPS = [
+      "read",
+      "write",
+      "exists",
+      "stat",
+      "lstat",
+      "readdir",
+      "readdir-stat",
+      "mkdir",
+      "rm",
+      "rename",
+      "unlink",
+      "rmdir",
+      "symlink",
+      "readlink",
+      "chmod",
+      "utimes",
+      "lutimes",
+      "statfs",
+      "hold",
+      "pread",
+      "pwrite",
+      "truncate"
+    ];
     SYNC_FS_REQUEST_TIMEOUT_MS = 25e3;
   }
 });
@@ -2216,6 +2265,47 @@ function positionalIo(imports, deps) {
     }
   }
 }
+function staging(Fs, length) {
+  try {
+    return new Uint8Array(length);
+  } catch {
+    throw new Fs.ErrnoError(wasiErrno("ENOMEM"));
+  }
+}
+function useFileMmap(Fs, deps) {
+  const fs = Fs;
+  const mmap = fs.mmap;
+  if (typeof mmap !== "function") return;
+  fs.mmap = (stream, length, position, prot, flags) => {
+    const memalign = deps.memalign();
+    const memory = deps.memory();
+    const shared = (flags & MAP_TYPE) !== MAP_PRIVATE && (prot & PROT_WRITE) !== 0;
+    const kfd = stream.sliccKernelFile ? stream.sliccKernelFd : void 0;
+    if (shared && kfd !== void 0) throw new Fs.ErrnoError(wasiErrno("ENODEV"));
+    if (stream.stream_ops.mmap && kfd === void 0 || !memalign || !memory || length <= 0 || shared || (stream.flags & O_ACCMODE) === O_WRONLY || !Fs.isFile(stream.node.mode)) {
+      return mmap.call(fs, stream, length, position, prot, flags);
+    }
+    const data = staging(Fs, length);
+    let done = 0;
+    try {
+      if (kfd !== void 0) done = readInto(deps.sys, kfd, data, position);
+      else {
+        for (let got = 1; done < length && got > 0; done += got) {
+          got = Fs.read(stream, data, done, length - done, position + done);
+        }
+      }
+    } catch (err) {
+      throw new Fs.ErrnoError(errnoOf(err));
+    }
+    const size = Math.ceil(length / MAP_ALIGN) * MAP_ALIGN;
+    const ptr = memalign(MAP_ALIGN, size);
+    if (!ptr) throw new Fs.ErrnoError(wasiErrno("ENOMEM"));
+    const target = new Uint8Array(memory.buffer, ptr, size);
+    target.fill(0);
+    target.set(data.subarray(0, done));
+    return { ptr, allocated: true };
+  };
+}
 function wasmMemory(instance, imports) {
   const isMemory = (v) => v instanceof WebAssembly.Memory;
   const exported = Object.values(instance.exports).find(isMemory);
@@ -2412,7 +2502,7 @@ function useMounts(Fs, env = {}, live = false) {
     }
   };
 }
-var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, AT_SYMLINK_NOFOLLOW, EMSCRIPTEN_EPERM, O_PATH, DIR_MODE, LINK_MODE, CHAR_DEVICE, O_ACCMODE, O_CREAT2, field, NAME;
+var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, AT_SYMLINK_NOFOLLOW, EMSCRIPTEN_EPERM, O_PATH, PROT_WRITE, MAP_PRIVATE, MAP_TYPE, O_WRONLY, MAP_ALIGN, DIR_MODE, LINK_MODE, CHAR_DEVICE, O_ACCMODE, O_CREAT2, field, NAME;
 var init_process_fds = __esm({
   "src/process/process-fds.ts"() {
     "use strict";
@@ -2440,6 +2530,11 @@ var init_process_fds = __esm({
     AT_SYMLINK_NOFOLLOW = 256;
     EMSCRIPTEN_EPERM = 63;
     O_PATH = 2097152;
+    PROT_WRITE = 2;
+    MAP_PRIVATE = 2;
+    MAP_TYPE = 15;
+    O_WRONLY = 1;
+    MAP_ALIGN = 65536;
     DIR_MODE = 16749;
     LINK_MODE = 41408;
     CHAR_DEVICE = 8630;
@@ -2714,7 +2809,6 @@ function createProcessKernel(deps) {
     if (!stream) return { none: true };
     promote?.(stream);
     if (stream.sliccKernelFd !== void 0) return { fd: stream.sliccKernelFd };
-    if (stream.path === "/dev/null") return { none: true };
     const device = deviceOfStream(stream);
     if (device) return device;
     return n === 0 ? { input: drain(Fs, stream) } : { capture: true };
@@ -2929,6 +3023,7 @@ var init_process_signals = __esm({
       depth = 0;
       reporting = false;
       unwinding = false;
+      quieted = 0;
       raw;
       header;
       hooks;
@@ -2973,7 +3068,16 @@ var init_process_signals = __esm({
         this.reported = { caught, ignored };
         this.raw.call({ op: "sig-mask", caught, ignored }, Number.POSITIVE_INFINITY, "sig-mask");
       }
+      quiet(fn) {
+        this.quieted++;
+        try {
+          return fn();
+        } finally {
+          this.quieted--;
+        }
+      }
       deliver() {
+        if (this.quieted > 0) return;
         const killed = Atomics.load(this.header, SAB_I_KILLED);
         if (killed !== 0 && !this.unwinding && this.hooks.killed) {
           this.unwinding = true;
@@ -3008,7 +3112,7 @@ function socketNode(Fs, addr) {
   const fs = Fs;
   let stream;
   try {
-    stream = Fs.open(addr.path, O_WRONLY | O_CREAT4 | O_EXCL3, 493);
+    stream = Fs.open(addr.path, O_WRONLY2 | O_CREAT4 | O_EXCL3, 493);
   } catch (e) {
     if (e?.errno === wasiErrno("EEXIST")) {
       throw new SyscallError("EADDRINUSE");
@@ -3140,7 +3244,7 @@ function createSocketKernel(deps) {
     })
   };
 }
-var O_RDWR2, KILLED_BY_SIGPIPE2, O_WRONLY, O_CREAT4, O_EXCL3;
+var O_RDWR2, KILLED_BY_SIGPIPE2, O_WRONLY2, O_CREAT4, O_EXCL3;
 var init_process_sockets = __esm({
   "src/process/process-sockets.ts"() {
     "use strict";
@@ -3150,7 +3254,7 @@ var init_process_sockets = __esm({
     init_wasi_errno();
     O_RDWR2 = 2;
     KILLED_BY_SIGPIPE2 = 128 + 13;
-    O_WRONLY = 1;
+    O_WRONLY2 = 1;
     O_CREAT4 = 64;
     O_EXCL3 = 128;
   }
@@ -3562,6 +3666,9 @@ function kernelSys(transport) {
     kind(fd) {
       return json(call2({ op: "fd-info", fd }, `fd-info ${fd}`))?.kind;
     },
+    device(fd) {
+      return json(call2({ op: "fd-info", fd }, `fd-info ${fd}`)).meta;
+    },
     size(fd) {
       return json(call2({ op: "fd-vfs-stat", fd }, `fd-vfs-stat ${fd}`)).size;
     },
@@ -3619,7 +3726,7 @@ function wireKernelFd(Fs, streams, entry) {
   });
 }
 function openDevice(Fs, fd, meta) {
-  const flags = meta.access === "read" ? O_RDONLY : meta.access === "write" ? O_WRONLY2 : O_RDWR3;
+  const flags = meta.access === "read" ? O_RDONLY : meta.access === "write" ? O_WRONLY3 : O_RDWR3;
   let stream;
   try {
     stream = Fs.open(`/dev/${meta.device}`, flags);
@@ -3637,6 +3744,8 @@ function wireKernelStdio(Fs, streams, sys) {
     const stream = Fs.getStream(fd);
     if (!stream) continue;
     const kind = sys?.kind?.(fd);
+    const device = kind === "device" ? sys?.device?.(fd) : void 0;
+    if (device && openDevice(Fs, fd, device)) continue;
     if (kind && PLACED.has(kind)) {
       const { flags } = stream;
       Fs.closeStream(fd);
@@ -3695,7 +3804,15 @@ async function runWasmProcess(init, port, deps = {}) {
       }
     }
   );
-  const transport = signals.transport();
+  const gated = signals.transport();
+  let early = () => {
+  };
+  const transport = {
+    call: (req, timeoutMs, label) => {
+      if (!FS_OPS.has(req.op)) early();
+      return gated.call(req, timeoutMs, label);
+    }
+  };
   const sys = kernelSys(transport);
   const encoder3 = new TextEncoder();
   const say = (fd) => (text) => sys.write(fd, encoder3.encode(`${text}
@@ -3703,6 +3820,7 @@ async function runWasmProcess(init, port, deps = {}) {
   let ready;
   let failed2;
   let memory;
+  let exports;
   const initialized = new Promise((resolve, reject) => {
     ready = resolve;
     failed2 = reject;
@@ -3750,6 +3868,7 @@ async function runWasmProcess(init, port, deps = {}) {
         return WebAssembly.instantiate(init.program.module, imports);
       }).then((instance) => {
         memory = wasmMemory(instance, imports);
+        exports = instance.exports;
         publishMemory(init.sab, memory?.buffer.byteLength ?? 0);
         done(instance, init.program.module);
       }, failed2);
@@ -3779,6 +3898,7 @@ async function runWasmProcess(init, port, deps = {}) {
     cwd: init.cwd,
     warn: deps.warn ?? say(2)
   });
+  early = () => signals.quiet(() => vfs.flushDirty());
   const sigpipe = () => running.sliccSigpipe?.() === 1;
   const restartable = () => signals.restartable();
   const streams = new KernelStreams(running.FS, sys, { sigpipe, restartable });
@@ -3796,6 +3916,11 @@ async function runWasmProcess(init, port, deps = {}) {
   if (pipefs) streams.usePipes(pipefs);
   streams.useControllingTerminal();
   useDevFd(running.FS);
+  useFileMmap(running.FS, {
+    sys,
+    memory: () => memory,
+    memalign: () => exports?.emscripten_builtin_memalign
+  });
   ownByRealmUser(running.FS);
   const livePath = (s) => liveNodePath(s.node);
   running.sliccKernel = createProcessKernel({
@@ -3867,7 +3992,7 @@ function runMain(running, init) {
     return status2;
   }
 }
-var O_RDONLY, O_WRONLY2, O_RDWR3, PLACED, GLUE_TRAILER, evaluateGlue, EVAL_BLOCKED;
+var FS_OPS, O_RDONLY, O_WRONLY3, O_RDWR3, PLACED, GLUE_TRAILER, evaluateGlue, EVAL_BLOCKED;
 var init_process_runtime = __esm({
   "src/process/process-runtime.ts"() {
     "use strict";
@@ -3875,6 +4000,7 @@ var init_process_runtime = __esm({
     init_signals();
     init_emscripten_vfs_hook();
     init_live_vfs_fs();
+    init_sync_fs_wire();
     init_sync_sab_bridge();
     init_sync_sab_wire();
     init_kernel_streams();
@@ -3887,8 +4013,9 @@ var init_process_runtime = __esm({
     init_procfs();
     init_realm_user();
     init_kernel_streams();
+    FS_OPS = new Set(SYNC_FS_OPS);
     O_RDONLY = 0;
-    O_WRONLY2 = 1;
+    O_WRONLY3 = 1;
     O_RDWR3 = 2;
     PLACED = /* @__PURE__ */ new Set(["stream", "file", "socket"]);
     GLUE_TRAILER = [
@@ -4348,7 +4475,7 @@ function promoteRequest(fd, f, handed) {
     op: "fd-promote",
     fd,
     path: f.path,
-    flags: (f.writable ? f.readable ? O_RDWR4 : O_WRONLY3 : 0) | (f.append ? O_APPEND : 0),
+    flags: (f.writable ? f.readable ? O_RDWR4 : O_WRONLY4 : 0) | (f.append ? O_APPEND : 0),
     position: f.offset,
     ...joins ? {} : { contents: f.buffer.contents() },
     ...orphan ? { orphan: true } : {},
@@ -4356,7 +4483,7 @@ function promoteRequest(fd, f, handed) {
     ...!joins && f.buffer.isDirty() ? { dirty: true } : {}
   };
 }
-var SYNTHETIC_DIRS2, O_NONBLOCK2, O_WRONLY3, O_RDWR4, O_APPEND, DEVICES2, WasiFds, GEN;
+var SYNTHETIC_DIRS2, O_NONBLOCK2, O_WRONLY4, O_RDWR4, O_APPEND, DEVICES2, WasiFds, GEN;
 var init_wasi_fds = __esm({
   "src/process/wasi/wasi-fds.ts"() {
     "use strict";
@@ -4364,7 +4491,7 @@ var init_wasi_fds = __esm({
     init_wasi_files();
     SYNTHETIC_DIRS2 = ["usr", "bin"];
     O_NONBLOCK2 = 2048;
-    O_WRONLY3 = 1;
+    O_WRONLY4 = 1;
     O_RDWR4 = 2;
     O_APPEND = 1024;
     DEVICES2 = {
@@ -4777,7 +4904,7 @@ var init_wasi_fds = __esm({
       kernelFile(path, existing, oflags, rights, fdflags) {
         const { readable, writable } = openAccess(existing, oflags, rights);
         const append = (fdflags & FDFLAGS.APPEND) !== 0;
-        const flags = (writable ? readable ? O_RDWR4 : O_WRONLY3 : 0) | (append ? O_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 fd = this.kernel.sys.openVfs(path, flags, 0, truncate ? { truncate } : {});
@@ -5024,8 +5151,9 @@ function filestatOf(path, s) {
 function kernelFiletype(kind) {
   switch (kind) {
     case "tty":
-    case "device":
       return { filetype: FILETYPE.CHARACTER_DEVICE, seeks: false };
+    case "device":
+      return { filetype: FILETYPE.CHARACTER_DEVICE, seeks: true };
     case "socket":
       return { filetype: FILETYPE.SOCKET_STREAM, seeks: false };
     case "file":
@@ -5429,7 +5557,9 @@ var init_wasi_host = __esm({
       seek(fd, offset, whence) {
         const e = this.fds.get(fd);
         if (e.type === "kernel") {
-          if (this.fds.kind(fd, e) !== "file") throw new WasiError("ESPIPE");
+          const kind = this.fds.kind(fd, e);
+          if (kind === "device") return 0;
+          if (kind !== "file") throw new WasiError("ESPIPE");
           return this.o.kernel.sys.seek(fd, offset, whence);
         }
         if (e.type === "device") return 0;
@@ -6427,7 +6557,7 @@ var init_wasix_linker = __esm({
 function resolveFrom(cwd, path) {
   return normalize(path.startsWith("/") ? path : `${cwd}/${path}`);
 }
-var POSIX_TO_WASI_SIGNAL, O_WRONLY4, O_RDWR5, O_APPEND2, OFLAG_CREAT, OFLAG_TRUNC, WasixProcess;
+var POSIX_TO_WASI_SIGNAL, O_WRONLY5, O_RDWR5, O_APPEND2, OFLAG_CREAT, OFLAG_TRUNC, WasixProcess;
 var init_wasix_process = __esm({
   "src/process/wasi/wasix-process.ts"() {
     "use strict";
@@ -6437,7 +6567,7 @@ var init_wasix_process = __esm({
     POSIX_TO_WASI_SIGNAL = Object.fromEntries(
       Object.entries(WASI_SIGNAL_TO_POSIX).map(([wasi, posix]) => [posix, Number(wasi)])
     );
-    O_WRONLY4 = 1;
+    O_WRONLY5 = 1;
     O_RDWR5 = 2;
     O_APPEND2 = 1024;
     OFLAG_CREAT = 1;
@@ -6528,7 +6658,7 @@ var init_wasix_process = __esm({
           throw Object.assign(new Error("ENOENT"), { code: "ENOENT" });
         }
         const flags = (op.rightsWrite ? O_RDWR5 : 0) | (op.append ? O_APPEND2 : 0);
-        return this.host.o.kernel.sys.openVfs(path, op.rightsWrite ? flags || O_WRONLY4 : 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 } : {}
         });
@@ -8009,7 +8139,7 @@ function typeOf(info) {
 }
 function flagsOf(o) {
   const write = o.write || o.append || o.truncate;
-  const access = write ? o.read ? O_RDWR6 : O_WRONLY5 : 0;
+  const access = write ? o.read ? O_RDWR6 : O_WRONLY6 : 0;
   return access | (o.append ? O_APPEND3 : 0);
 }
 function createContext(o) {
@@ -8281,7 +8411,7 @@ function pathOps(kernel, resolve, statOf, open) {
     }
   };
 }
-var JsExit, CHUNK, MAX_IO, O_WRONLY5, O_RDWR6, O_APPEND3, encoder2;
+var JsExit, CHUNK, MAX_IO, O_WRONLY6, O_RDWR6, O_APPEND3, encoder2;
 var init_js_context = __esm({
   "src/process/js/js-context.ts"() {
     "use strict";
@@ -8298,7 +8428,7 @@ var init_js_context = __esm({
     };
     CHUNK = 64 * 1024;
     MAX_IO = 1024 * 1024;
-    O_WRONLY5 = 1;
+    O_WRONLY6 = 1;
     O_RDWR6 = 2;
     O_APPEND3 = 1024;
     encoder2 = new TextEncoder();