@ai-ecoverse/slicc-kernel 1.26.6 → 1.27.0

package/dist/process-worker.js

@@ -2955,6 +2955,7 @@ function createSocketKernel(deps) {
     name: (fd, peer) => guard(() => json({ op: "sock-name", fd: kfd(fd), peer })),
     getopt: (fd, level, name) => guard(() => ({ value: json({ op: "sock-getopt", fd: kfd(fd), level, name }) })),
     setopt: (fd, level, name, value2) => guard(() => done({ op: "sock-setopt", fd: kfd(fd), level, name, value: value2 })),
+    resolve: (name, family = 4) => guard(() => json({ op: "sock-resolve", name, family })),
     send: (fd, bytes, flags) => guard(() => {
       const stream = socketAt(fd);
       const nonblock = flags.dontwait === true || (stream.flags & O_NONBLOCK) !== 0;
@@ -6341,6 +6342,67 @@ var init_wasix_process = __esm({
   }
 });
 
+// src/kernel/net/routes.ts
+function ipv4Bytes(text) {
+  const parts = text.split(".");
+  if (parts.length !== 4 || !parts.every((p) => /^\d{1,3}$/.test(p))) return void 0;
+  const bytes = parts.map(Number);
+  return bytes.every((b) => b <= 255) ? bytes : void 0;
+}
+function ipv6Groups(text) {
+  if (!text.includes(":")) return void 0;
+  let canonical;
+  try {
+    canonical = new URL(`http://[${text}]/`).hostname.slice(1, -1);
+  } catch {
+    return void 0;
+  }
+  const [head, tail] = canonical.split("::");
+  const part = (s) => s ? s.split(":").map((h) => Number.parseInt(h, 16)) : [];
+  const front = part(head);
+  const back = part(tail);
+  return tail === void 0 ? front : [...front, ...new Array(8 - front.length - back.length).fill(0), ...back];
+}
+function toBits(values, width) {
+  return values.reduce((acc, v) => acc << BigInt(width) | BigInt(v), 0n);
+}
+function addressBits(host) {
+  const v4 = ipv4Bytes(host);
+  if (v4) return { v6: false, bits: toBits(v4, 8) };
+  const v6 = ipv6Groups(host);
+  return v6 ? { v6: true, bits: toBits(v6, 16) } : void 0;
+}
+function parsePrefix(text) {
+  const parts = text.trim().split("/");
+  if (parts.length > 2) return void 0;
+  const [address = "", size] = parts;
+  const parsed = addressBits(address);
+  if (!parsed) return void 0;
+  const max = parsed.v6 ? 128 : 32;
+  const length = size === void 0 ? max : /^\d{1,3}$/.test(size) ? Number(size) : -1;
+  if (length < 0 || length > max) return void 0;
+  return { ...parsed, length };
+}
+var HOST_ADDRESS, RESERVED;
+var init_routes = __esm({
+  "src/kernel/net/routes.ts"() {
+    "use strict";
+    init_loopback_names();
+    HOST_ADDRESS = HOST_LOOPBACK_ADDRESS.join(".");
+    RESERVED = [
+      "0.0.0.0/8",
+      "127.0.0.0/8",
+      "169.254.0.0/16",
+      "224.0.0.0/4",
+      "240.0.0.0/4",
+      "::/96",
+      "::ffff:0:0/96",
+      "fe80::/10",
+      "ff00::/8"
+    ].map((p) => parsePrefix(p));
+  }
+});
+
 // src/process/wasi/wasix-sockets.ts
 function readAddr(view, ptr) {
   const tag = view.getUint8(ptr);
@@ -6387,20 +6449,16 @@ function writeAddr(view, ptr, addr) {
   const octets = ipv4(addr.host) ?? [127, 0, 0, 1];
   octets.forEach((b, i) => void view.setUint8(ptr + 4 + i, b));
 }
+function ipBytes(host) {
+  const groups = ipv4(host) ? void 0 : ipv6Groups(host);
+  return groups ? groups.flatMap((g) => [g >> 8, g & 255]) : ipv4(host);
+}
 function ipv4(host) {
   const parts = host.split(".");
   if (parts.length !== 4) return void 0;
   const bytes = parts.map((p) => /^\d{1,3}$/.test(p) ? Number(p) : Number.NaN);
   return bytes.every((b) => b >= 0 && b <= 255) ? bytes : void 0;
 }
-function resolveName(name) {
-  if (name === "localhost" || name === "localhost.localdomain" || name === "ip6-localhost") {
-    return [127, 0, 0, 1];
-  }
-  if (name === "::1") return [127, 0, 0, 1];
-  if (name.toLowerCase() === HOST_LOOPBACK) return [...HOST_LOOPBACK_ADDRESS];
-  return ipv4(name);
-}
 function wasixSocketImports(host, preview1) {
   const { mem, fds, o } = host;
   const call2 = (req) => o.kernel.call(req);
@@ -6492,14 +6550,19 @@ function wasixSocketImports(host, preview1) {
     sock_set_opt_time: (fd) => void socket(fd),
     sock_send_file: () => E.NOSYS,
     resolve: (name, len, _port, addrs, naddrs, out) => {
-      const ip = resolveName(mem.string(name, len));
-      if (!ip) throw new WasiError("ENOENT");
+      const found = call2({ op: "sock-resolve", name: mem.string(name, len), family: 0 });
+      const ips = found.map(ipBytes).filter((ip) => ip !== void 0);
+      if (ips.length === 0) throw new WasiError("ENOENT");
       if (naddrs < 1) throw new WasiError("EINVAL");
       const view = mem.view();
-      new Uint8Array(view.buffer, addrs, ADDR_IP_SIZE).fill(0);
-      view.setUint8(addrs, INET4);
-      ip.forEach((b, i) => void view.setUint8(addrs + 2 + i, b));
-      view.setUint32(out, 1, true);
+      const count = Math.min(ips.length, naddrs);
+      new Uint8Array(view.buffer, addrs, ADDR_IP_SIZE * count).fill(0);
+      for (let i = 0; i < count; i++) {
+        const at = addrs + i * ADDR_IP_SIZE;
+        view.setUint8(at, ips[i].length === 4 ? INET4 : INET6);
+        new Uint8Array(view.buffer, at + 2, ips[i].length).set(ips[i]);
+      }
+      view.setUint32(out, count, true);
     }
   };
 }
@@ -6507,7 +6570,7 @@ var INET4, INET6, UNIX, STREAM, ADDR_IP_SIZE, LOOPBACK, OPTIONS;
 var init_wasix_sockets = __esm({
   "src/process/wasi/wasix-sockets.ts"() {
     "use strict";
-    init_loopback_names();
+    init_routes();
     init_wasi_abi();
     init_wasi_files();
     INET4 = 1;
@@ -7016,7 +7079,7 @@ function firstOther(foreign) {
 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 (!RESERVED2.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)
@@ -7044,7 +7107,7 @@ function unsupportedImport(module, memory, extended = false, foreign = {}) {
 }
 function linkImports(module, preview1, wasix, memory, threads, program = {}, foreign, slicc = {}) {
   for (const ns of Object.keys(program)) {
-    if (RESERVED.has(ns) || ns === SLICC)
+    if (RESERVED2.has(ns) || ns === SLICC)
       throw new Error(`the imports module may not define ${ns}`);
   }
   const imports = {
@@ -7352,7 +7415,7 @@ async function runWasiThread(init, port) {
     throw e;
   }
 }
-var TRAPPED, PREVIEW1, WASIX, SLICC, RESERVED, noErrno, FALLBACK_MAXIMUM_PAGES, LinkSync, DL_GEN, BACKTRACE_FRAMES;
+var TRAPPED, PREVIEW1, WASIX, SLICC, RESERVED2, noErrno, FALLBACK_MAXIMUM_PAGES, LinkSync, DL_GEN, BACKTRACE_FRAMES;
 var init_wasi_runtime = __esm({
   "src/process/wasi/wasi-runtime.ts"() {
     "use strict";
@@ -7378,7 +7441,7 @@ var init_wasi_runtime = __esm({
     PREVIEW1 = "wasi_snapshot_preview1";
     WASIX = "wasix_32v1";
     SLICC = "slicc";
-    RESERVED = RESERVED_NAMESPACES;
+    RESERVED2 = RESERVED_NAMESPACES;
     noErrno = (key) => `imports ${key}: its result cannot carry ENOSYS, and this host does not provide it`;
     FALLBACK_MAXIMUM_PAGES = 32768;
     LinkSync = class {