@ai-ecoverse/slicc-kernel 1.7.2 → 1.8.1

package/dist/node-process-worker.js

@@ -4431,6 +4431,20 @@ var init_wasi_imports = __esm({
   }
 });
 
+// src/process/wasi/wasi-module.ts
+var RESERVED_NAMESPACES;
+var init_wasi_module = __esm({
+  "src/process/wasi/wasi-module.ts"() {
+    "use strict";
+    RESERVED_NAMESPACES = /* @__PURE__ */ new Set([
+      "wasi_snapshot_preview1",
+      "wasix_32v1",
+      "wasi",
+      "env"
+    ]);
+  }
+});
+
 // src/process/wasi/wasi-signals.ts
 var DELIVERED, DELIVERED_MASK, WasiSignals;
 var init_wasi_signals = __esm({
@@ -5889,29 +5903,50 @@ __export(wasi_runtime_exports, {
   trapMessage: () => trapMessage,
   unsupportedImport: () => unsupportedImport
 });
-function unsupportedImport(module, memory, extended = false) {
+function enosys(module, name, foreign) {
+  const type = foreign?.[module]?.[name];
+  if (type === "other") throw new Error(noErrno(`${module}.${name}`));
+  if (type === "none") return () => void 0;
+  if (type === "i64") return () => 52n;
+  return () => 52;
+}
+function firstOther(foreign) {
+  for (const [module, fields] of Object.entries(foreign)) {
+    const name = Object.keys(fields).find((field) => fields[field] === "other");
+    if (name !== void 0) return `${module}.${name}`;
+  }
+  return void 0;
+}
+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, foreign = {}) {
   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)`;
   }
+  const unanswerable = extended ? void 0 : firstOther(foreign);
+  if (unanswerable) return noErrno(unanswerable);
   if (!WebAssembly.Module.exports(module).some((e) => e.name === "_start")) {
     return "no WASI command (it exports no _start)";
   }
   return void 0;
 }
-function linkImports(module, preview1, wasix, memory, threads, program = {}) {
+function linkImports(module, preview1, wasix, memory, threads, program = {}, foreign) {
   for (const ns of Object.keys(program)) {
     if (RESERVED.has(ns)) throw new Error(`the imports module may not define ${ns}`);
   }
@@ -5925,7 +5960,8 @@ 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.module === "wasi" && imp.name === "thread-spawn") ns[imp.name] = () => -1;
+    else if (imp.kind === "function") ns[imp.name] = enosys(imp.module, imp.name, foreign);
   }
   return imports;
 }
@@ -5997,7 +6033,8 @@ async function instantiate(host, module, memory, threads, {
   thread = false,
   stats,
   signals,
-  program
+  program,
+  foreign
 } = {}) {
   const driver = new AsyncifyDriver(host.mem);
   const wasixHost = WebAssembly.Module.imports(module).some((i) => i.module === WASIX) ? new WasixHost(host, driver, module) : void 0;
@@ -6034,7 +6071,7 @@ async function instantiate(host, module, memory, threads, {
     () => memory ?? instance?.exports.memory,
     () => instance
   );
-  const hostImports = linkImports(module, preview1, wasix, memory, threads, extra);
+  const hostImports = linkImports(module, preview1, wasix, memory, threads, extra, foreign);
   const imports = sync ? merge(hostImports, sync.linker.mainImports(module)) : hostImports;
   instance = await WebAssembly.instantiate(module, imports);
   stats?.phase("instantiate");
@@ -6080,7 +6117,8 @@ async function runWasiProcess(init, port2) {
   const refused = unsupportedImport(
     module,
     init.program.memory,
-    init.program.imports !== void 0
+    init.program.imports !== void 0,
+    init.program.foreign
   );
   if (refused) {
     say(refused);
@@ -6108,6 +6146,7 @@ async function runWasiProcess(init, port2) {
   const { instance, driver } = await instantiate(host, module, memory, threads, {
     stats,
     signals,
+    foreign: init.program.foreign,
     ...program ? { program } : {}
   });
   restoreExportedMemory(instance, memory, init);
@@ -6178,6 +6217,7 @@ async function runWasiThread(init, port2) {
   const program = await programImports(init.program, host, transport, thread.tid);
   const { instance } = await instantiate(host, init.program.module, thread.memory, threads, {
     thread: true,
+    foreign: init.program.foreign,
     ...program ? { program } : {}
   });
   const start = instance.exports.wasi_thread_start;
@@ -6204,7 +6244,7 @@ async function runWasiThread(init, port2) {
     throw e;
   }
 }
-var TRAPPED, PREVIEW1, WASIX, RESERVED, FALLBACK_MAXIMUM_PAGES, LinkSync, DL_GEN, BACKTRACE_FRAMES;
+var TRAPPED, PREVIEW1, WASIX, RESERVED, noErrno, FALLBACK_MAXIMUM_PAGES, LinkSync, DL_GEN, BACKTRACE_FRAMES;
 var init_wasi_runtime = __esm({
   "src/process/wasi/wasi-runtime.ts"() {
     "use strict";
@@ -6218,6 +6258,7 @@ var init_wasi_runtime = __esm({
     init_wasi_files();
     init_wasi_host();
     init_wasi_imports();
+    init_wasi_module();
     init_wasi_signals();
     init_wasi_stats();
     init_wasi_threads();
@@ -6228,7 +6269,8 @@ var init_wasi_runtime = __esm({
     TRAPPED = 134;
     PREVIEW1 = "wasi_snapshot_preview1";
     WASIX = "wasix_32v1";
-    RESERVED = /* @__PURE__ */ new Set([PREVIEW1, WASIX, "wasi", "env"]);
+    RESERVED = RESERVED_NAMESPACES;
+    noErrno = (key) => `imports ${key}: its result cannot carry ENOSYS, and this host does not provide it`;
     FALLBACK_MAXIMUM_PAGES = 32768;
     LinkSync = class {
       count = 0;