@ai-ecoverse/slicc-kernel 1.7.2 → 1.8.0

package/README.md

@@ -109,7 +109,7 @@ A WASI program runs in a process worker of its own like an Emscripten one, again
 
 ### Program imports
 
-A WASI command can name an ES module of its package that provides imports of its own, for host functions a program needs beyond WASI (`"imports": "host/pnpm-host.mjs"`). Each worker of the process (the process and every thread) loads it, with the same trust as Emscripten glue, and calls its `createImports(ctx)`, which returns import namespaces (`{ pnpm_host: { … } }`). It may not define `wasi_snapshot_preview1`, `wasix_32v1`, `wasi` or `env`; any other namespace the module imports is then accepted, and functions it does not provide answer `ENOSYS`. `ctx` has:
+A WASI command can name an ES module of its package that provides imports of its own, for host functions a program needs beyond WASI (`"imports": "host/pnpm-host.mjs"`). Each worker of the process (the process and every thread) loads it, with the same trust as Emscripten glue, and calls its `createImports(ctx)`, which returns import namespaces (`{ pnpm_host: { … } }`). It may not define `wasi_snapshot_preview1`, `wasix_32v1`, `wasi` or `env`; any other namespace the module imports is then accepted, and functions it does not provide answer `ENOSYS`. A WASI program (one that imports `wasi_snapshot_preview1` or `wasix_32v1`) needs no imports module for that: without one, its function imports from namespaces of its own all answer `ENOSYS`, so the same binary runs the commands that need no host functions anywhere. A module with no WASI imports, or a foreign import that is not a function, is still refused (126). `ctx` has:
 
 - `memory()`, `instance()` (after instantiation), `tid` (1 for the main thread), `argv`, `env`, `cwd()`;
 - `fs`: the synchronous filesystem the WASI calls use (absolute paths);

package/dist/node-process-worker.js

@@ -5889,22 +5889,27 @@ __export(wasi_runtime_exports, {
   trapMessage: () => trapMessage,
   unsupportedImport: () => unsupportedImport
 });
+function accepted(imp, scope2) {
+  const { module, name, kind } = imp;
+  if (module === PREVIEW1 || module === WASIX) return true;
+  if (!RESERVED.has(module) && (scope2.extended || scope2.wasi && kind === "function")) return true;
+  if (scope2.pie && (module === "GOT.mem" || module === "GOT.func")) return true;
+  if (scope2.pie && module === "env" && kind !== "memory") return true;
+  if (kind === "memory" && scope2.memory?.module === module && scope2.memory.name === name)
+    return true;
+  return module === "wasi" && name === "thread-spawn" && (scope2.wasix || !!scope2.memory?.shared);
+}
 function unsupportedImport(module, memory, extended = false) {
   const imports = WebAssembly.Module.imports(module);
   const wasix = imports.some((i) => i.module === WASIX);
-  const pie = dylinkInfo(module) !== void 0;
-  for (const imp of imports) {
-    if (imp.module === PREVIEW1 || imp.module === WASIX) continue;
-    if (extended && !RESERVED.has(imp.module)) continue;
-    if (pie && (imp.module === "GOT.mem" || imp.module === "GOT.func")) continue;
-    if (pie && imp.module === "env" && imp.kind !== "memory") continue;
-    if (imp.kind === "memory" && memory?.module === imp.module && memory.name === imp.name)
-      continue;
-    if (imp.module === "wasi" && imp.name === "thread-spawn" && (wasix || memory?.shared)) continue;
-    if (imp.kind === "memory" || imp.module === "wasi") {
-      return `imports ${imp.module}.${imp.name}: no WASI program this host runs`;
+  const wasi = wasix || imports.some((i) => i.module === PREVIEW1);
+  const scope2 = { extended, wasi, wasix, pie: dylinkInfo(module) !== void 0, memory };
+  const refused = imports.find((imp) => !accepted(imp, scope2));
+  if (refused) {
+    if (refused.kind === "memory" || refused.module === "wasi") {
+      return `imports ${refused.module}.${refused.name}: no WASI program this host runs`;
     }
-    return `imports ${imp.module}.${imp.name}: no WASI preview1 program (an Emscripten one runs with its glue)`;
+    return `imports ${refused.module}.${refused.name}: no WASI preview1 program (an Emscripten one runs with its glue)`;
   }
   if (!WebAssembly.Module.exports(module).some((e) => e.name === "_start")) {
     return "no WASI command (it exports no _start)";
@@ -5925,7 +5930,9 @@ function linkImports(module, preview1, wasix, memory, threads, program = {}) {
     const ns = imports[imp.module] ??= {};
     if (imp.name in ns) continue;
     if (imp.kind === "memory" && memory) ns[imp.name] = memory;
-    else if (imp.kind === "function") ns[imp.name] = () => imp.name === "thread-spawn" ? -1 : 52;
+    else if (imp.kind === "function") {
+      ns[imp.name] = () => imp.module === "wasi" && imp.name === "thread-spawn" ? -1 : 52;
+    }
   }
   return imports;
 }