@ai-ecoverse/slicc-kernel 1.8.6 → 1.8.8

package/dist/process-worker.js

@@ -1691,11 +1691,24 @@ function persistsItself(stream) {
   const type = stream.node.mount?.type;
   return typeof type?.syncfs === "function";
 }
-function syncFsync(imports, fs) {
+function namespaces(imports) {
+  const seen = /* @__PURE__ */ new Set();
   for (const namespace of Object.values(imports)) {
-    const original = namespace?.fd_sync;
-    if (typeof original !== "function" || !original.isAsync) continue;
-    namespace.fd_sync = (fd) => {
+    if (namespace && typeof namespace === "object") seen.add(namespace);
+  }
+  return [...seen];
+}
+function keyOf(namespace, name, glue) {
+  const own = glue?.[name];
+  const found = typeof own === "function" ? Object.keys(namespace).find((k) => namespace[k] === own) : void 0;
+  return found ?? (typeof namespace[name] === "function" ? name : void 0);
+}
+function syncFsync(imports, fs, glue) {
+  for (const namespace of namespaces(imports)) {
+    const key = keyOf(namespace, "fd_sync", glue);
+    const original = key === void 0 ? void 0 : namespace[key];
+    if (key === void 0 || !original?.isAsync) continue;
+    namespace[key] = (fd) => {
       const stream = fs()?.getStream(fd);
       if (!stream) return EBADF;
       if (persistsItself(stream)) return original(fd);
@@ -1751,14 +1764,14 @@ function positioned(original, write, deps) {
   };
 }
 function positionalIo(imports, deps) {
-  for (const namespace of Object.values(imports)) {
+  for (const namespace of namespaces(imports)) {
     for (const [name, write] of [
       ["fd_pread", false],
       ["fd_pwrite", true]
     ]) {
-      const original = namespace?.[name];
-      if (typeof original === "function") {
-        namespace[name] = positioned(original, write, deps);
+      const key = keyOf(namespace, name, deps.glue);
+      if (key !== void 0) {
+        namespace[key] = positioned(namespace[key], write, deps);
       }
     }
   }
@@ -2546,8 +2559,10 @@ async function runWasmProcess(init, port, deps = {}) {
             }
           }
         });
-        syncFsync(imports, () => ownValue(module, "FS"));
+        const glue = ownValue(module, "sliccFdImports");
+        syncFsync(imports, () => ownValue(module, "FS"), glue);
         positionalIo(imports, {
+          glue,
           fs: () => ownValue(module, "FS"),
           sys,
           memory: () => memory
@@ -2687,6 +2702,11 @@ var init_process_runtime = __esm({
       "  ioctl: typeof ___syscall_ioctl === 'function' ? ___syscall_ioctl : undefined,",
       "  setitimer: typeof __setitimer_js === 'function' ? __setitimer_js : undefined,",
       "};",
+      "Module.sliccFdImports ??= {",
+      "  fd_sync: typeof _fd_sync === 'function' ? _fd_sync : undefined,",
+      "  fd_pread: typeof _fd_pread === 'function' ? _fd_pread : undefined,",
+      "  fd_pwrite: typeof _fd_pwrite === 'function' ? _fd_pwrite : undefined,",
+      "};",
       "const __sliccUp = () =>",
       "  (typeof runtimeInitialized === 'undefined' || runtimeInitialized) &&",
       "  !(typeof runtimeExited !== 'undefined' && runtimeExited) &&",