@ai-ecoverse/slicc-kernel 1.168.1 → 1.170.0

package/dist/index.js

@@ -217,14 +217,14 @@ function bodyOf(source, head, method) {
   }
   return counted(source, size);
 }
-function stream(chunks3, socket, signal) {
+function stream(chunks2, socket, signal) {
   return new ReadableStream({
     start(controller) {
       signal?.addEventListener("abort", () => controller.error(signal.reason), { once: true });
     },
     async pull(controller) {
       try {
-        const next = await chunks3.next();
+        const next = await chunks2.next();
         if (next.done) {
           controller.close();
           socket.close();
@@ -274,9 +274,9 @@ async function loopbackFetch(dial, input, options) {
       if (!raw) throw errorWithCode("ECONNRESET: the connection closed before a response");
       head = parseHead(raw);
     } while (head.status >= 100 && head.status < 200);
-    const chunks3 = bodyOf(source, head, request.method);
-    if (!chunks3) socket.close();
-    return new Response(chunks3 ? stream(chunks3, socket, options.signal) : null, {
+    const chunks2 = bodyOf(source, head, request.method);
+    if (!chunks2) socket.close();
+    return new Response(chunks2 ? stream(chunks2, socket, options.signal) : null, {
       status: head.status,
       statusText: head.statusText,
       headers: head.headers
@@ -1063,7 +1063,7 @@ function sendableClose(code) {
 function blockedReason(url, e) {
   const name = e?.name;
   if (name === "SecurityError" && url.startsWith("ws:")) {
-    return `${url}: ws:// is blocked from an https page; use wss:// or slicc-node`;
+    return `${url}: ws:// is blocked from an https page; use wss://, or link a slicc CLI (npx sliccy@next)`;
   }
   return `${url}: ${e instanceof Error ? e.message : String(e)}`;
 }
@@ -1186,7 +1186,7 @@ function requestBody(request) {
   return request.body ? { body: request.body } : {};
 }
 function fetchTransport(options = {}) {
-  const send2 = options.fetch ?? globalThis.fetch.bind(globalThis);
+  const send = options.fetch ?? globalThis.fetch.bind(globalThis);
   const Socket = options.webSocket === true ? globalThis.WebSocket : options.webSocket || void 0;
   const headers = options.webSocketHeaders === true;
   const redirect = options.redirect ?? "follow";
@@ -1203,7 +1203,7 @@ function fetchTransport(options = {}) {
     async fetch(request) {
       let response;
       try {
-        response = await send2(request.url, {
+        response = await send(request.url, {
           method: request.method,
           headers: joinHeaders(request.headers),
           ...requestBody(request),
@@ -1221,7 +1221,8 @@ function fetchTransport(options = {}) {
             `fetch ${request.url} failed (unreachable, or not allowed by CORS)${options.hint ? `: ${options.hint}` : ""}`
           ),
           { status: 502 },
-          dns ? { code: causeCode } : {}
+          dns ? { code: causeCode } : {},
+          typeof causeCode === "string" ? {} : { detail: "transport" }
         );
       }
       const headers2 = [];
@@ -1270,13 +1271,14 @@ function serveTransport(peer, transport, { closeWaitMs = CLOSE_WAIT_MS } = {}) {
   const open = /* @__PURE__ */ new Map();
   const fail = (nid, e) => {
     open.delete(nid);
-    const { status, code } = e;
+    const { status, code, detail } = e;
     peer.postMessage({
       net: "error",
       nid,
       message: e instanceof Error ? e.message : String(e),
       ...typeof status === "number" ? { status } : {},
-      ...typeof code === "string" ? { code } : {}
+      ...typeof code === "string" ? { code } : {},
+      ...detail === "transport" ? { detail } : {}
     });
   };
   const uploads = uploadsFor(peer);
@@ -1451,10 +1453,12 @@ function serveTransport(peer, transport, { closeWaitMs = CLOSE_WAIT_MS } = {}) {
 var TransportError = class extends Error {
   status;
   code;
-  constructor(message, status, code) {
+  detail;
+  constructor(message, status, code, detail) {
     super(message);
     this.status = status;
     this.code = code;
+    this.detail = detail === "transport" ? detail : void 0;
   }
 };
 var RemoteTransport = class {
@@ -1480,7 +1484,7 @@ var RemoteTransport = class {
     if (!waiter) return;
     this.waiting.delete(reply.nid);
     if (reply.net === "error") {
-      waiter.reject(new TransportError(reply.message, reply.status, reply.code));
+      waiter.reject(new TransportError(reply.message, reply.status, reply.code, reply.detail));
     } else waiter.resolve(reply);
   }
   toSocket(reply, socket) {
@@ -1700,10 +1704,10 @@ async function holdLock(locks) {
   await granted.promise;
   return { name, release: () => held.resolve() };
 }
-function concat(chunks3) {
-  const out = new Uint8Array(chunks3.reduce((n, c) => n + c.length, 0));
+function concat(chunks2) {
+  const out = new Uint8Array(chunks2.reduce((n, c) => n + c.length, 0));
   let at = 0;
-  for (const chunk of chunks3) {
+  for (const chunk of chunks2) {
     out.set(chunk, at);
     at += chunk.length;
   }
@@ -1753,8 +1757,8 @@ var Channel = class {
   }
   request(call, handlers = {}) {
     const id = ++this.nextId;
-    const { failure: failure3 } = this;
-    if (failure3) return { id, done: Promise.reject(failure3) };
+    const { failure: failure2 } = this;
+    if (failure2) return { id, done: Promise.reject(failure2) };
     const done = new Promise((resolve, reject) => {
       this.pending.set(id, { resolve, reject, ...handlers });
       this.port.postMessage({ ...call, id });
@@ -1919,10 +1923,10 @@ function endedOf(done, signal) {
 }
 async function runOn(channel, argv, opts) {
   const { onStdout, onStderr, ...rest } = opts;
-  const chunks3 = { 1: [], 2: [] };
+  const chunks2 = { 1: [], 2: [] };
   const live = { 1: new TextDecoder(), 2: new TextDecoder() };
   const tee = (fd, on) => (bytes) => {
-    chunks3[fd].push(bytes);
+    chunks2[fd].push(bytes);
     on?.(live[fd].decode(bytes, { stream: true }));
   };
   const child = await spawnOn(channel, argv, {
@@ -1931,7 +1935,7 @@ async function runOn(channel, argv, opts) {
     onStderr: tee(2, onStderr)
   });
   const { status, signal } = await child.ended;
-  const text = (fd) => new TextDecoder().decode(concat(chunks3[fd]));
+  const text = (fd) => new TextDecoder().decode(concat(chunks2[fd]));
   return {
     pid: child.pid,
     status,
@@ -1960,7 +1964,7 @@ async function terminalOn(channel, argv, opts) {
   );
   done.catch(started.reject);
   const pid = await started.promise;
-  const send2 = (action) => void channel.call({ op: "terminal", terminal: id, ...action }).catch(() => void 0);
+  const send = (action) => void channel.call({ op: "terminal", terminal: id, ...action }).catch(() => void 0);
   return {
     pid,
     exited: done,
@@ -1972,10 +1976,10 @@ async function terminalOn(channel, argv, opts) {
       listener = next;
       if (next) for (const bytes of backlog.splice(0)) next(bytes);
     },
-    write: (data) => send2({ action: "write", bytes: bytesOf2(data) }),
-    resize: (cols, rows) => send2({ action: "resize", cols, rows }),
-    signal: (name) => send2({ action: "signal", signal: name }),
-    close: () => send2({ action: "close" })
+    write: (data) => send({ action: "write", bytes: bytesOf2(data) }),
+    resize: (cols, rows) => send({ action: "resize", cols, rows }),
+    signal: (name) => send({ action: "signal", signal: name }),
+    close: () => send({ action: "close" })
   };
 }
 function fsOn(channel) {
@@ -2111,187 +2115,6 @@ async function attachKernel(port, options = {}) {
   };
 }
 
-// src/local-proxy-transport.ts
-var PATH = "/api/fetch-proxy";
-var RAW_CONTENT_TYPE = "application/vnd.slicc.raw-fetch";
-var MAX_HEAD = 1024 * 1024;
-var MAX_REQUEST_BODY2 = 64 * 1024 * 1024;
-var PERMISSIONS = ["loopback-network", "local-network-access"];
-var LOOPBACK_PAGE = /^(127\.\d+\.\d+\.\d+|localhost|\[::1\])$/;
-var failure2 = (message, status = 502) => Object.assign(new Error(`local proxy: ${message}`), { status });
-function encodeHead(url, method, headers) {
-  return JSON.stringify({ url, method, headers }).replace(
-    /[\u007f-￿]/g,
-    (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`
-  );
-}
-function hopHeaders(options, extra) {
-  return new Headers({ "X-Bridge-Token": options.key, ...extra });
-}
-function send(options) {
-  return options.fetch ?? globalThis.fetch.bind(globalThis);
-}
-async function refusalMessage(response) {
-  const text = await response.text().catch(() => "");
-  try {
-    const parsed = JSON.parse(text);
-    if (typeof parsed.error === "string") return parsed.error;
-  } catch {
-  }
-  return text || response.statusText || `answered ${response.status}`;
-}
-async function refusal(response) {
-  return failure2(await refusalMessage(response), response.ok ? 502 : response.status);
-}
-async function permission(permissions) {
-  if (!permissions) return "unknown";
-  for (const name of PERMISSIONS) {
-    try {
-      return (await permissions.query({ name })).state;
-    } catch {
-    }
-  }
-  return "unknown";
-}
-function isHead(value) {
-  const head = value;
-  return !!head && typeof head.status === "number" && typeof head.statusText === "string" && Array.isArray(head.headers) && head.headers.every(
-    (pair) => Array.isArray(pair) && pair.length === 2 && typeof pair[0] === "string" && typeof pair[1] === "string"
-  );
-}
-function concat2(a, b) {
-  const out = new Uint8Array(a.byteLength + b.byteLength);
-  out.set(a);
-  out.set(b, a.byteLength);
-  return out;
-}
-async function readHead(reader, idleMs) {
-  let buffer = new Uint8Array(0);
-  for (; ; ) {
-    if (buffer.byteLength >= 4) {
-      const length = new DataView(buffer.buffer, buffer.byteOffset, 4).getUint32(0);
-      if (length > MAX_HEAD) throw failure2(`response head of ${length} bytes`);
-      if (buffer.byteLength >= 4 + length) {
-        let head;
-        try {
-          head = JSON.parse(new TextDecoder().decode(buffer.subarray(4, 4 + length)));
-        } catch {
-        }
-        if (!isHead(head)) throw failure2("malformed response head");
-        return { head, rest: buffer.subarray(4 + length) };
-      }
-    }
-    const next = await readWithin(reader, idleMs);
-    if (next.done) throw failure2("closed before the response head");
-    buffer = concat2(buffer, next.value);
-  }
-}
-async function* chunks2(rest, reader, idleMs) {
-  try {
-    if (rest.byteLength > 0) yield rest;
-    for (let next = await readWithin(reader, idleMs); !next.done; next = await readWithin(reader, idleMs)) {
-      if (next.value.byteLength > 0) yield next.value;
-    }
-  } finally {
-    await reader.cancel().catch(() => void 0);
-  }
-}
-async function checkLocalProxy(options) {
-  const onLoopback = LOOPBACK_PAGE.test(globalThis.location?.hostname ?? "");
-  const permissions = onLoopback ? void 0 : options.permissions ?? globalThis.navigator?.permissions;
-  if (await permission(permissions) === "denied") return { state: "blocked" };
-  let response;
-  try {
-    response = await send(options)(new URL(PATH, options.url), {
-      method: "POST",
-      headers: hopHeaders(options, { "X-Slicc-Raw-Probe": "1" }),
-      credentials: "omit",
-      mode: "cors"
-    });
-  } catch {
-    const now = await permission(permissions);
-    if (now === "denied") return { state: "blocked" };
-    return {
-      state: "unreachable",
-      permission: now === "granted" || now === "prompt" ? now : "unknown"
-    };
-  }
-  if (!response.ok) {
-    return { state: "refused", status: response.status, error: await refusalMessage(response) };
-  }
-  const reply = await response.json().catch(() => null);
-  if (!reply || typeof reply.rawFetch !== "number" || reply.rawFetch < 1 || typeof reply.requestBodyStreaming !== "boolean" || typeof reply.maxRequestBodyBytes !== "number") {
-    return { state: "incompatible" };
-  }
-  return {
-    state: "ready",
-    probe: {
-      rawFetch: reply.rawFetch,
-      requestBodyStreaming: reply.requestBodyStreaming,
-      maxRequestBodyBytes: reply.maxRequestBodyBytes,
-      ...typeof reply.kernelTunnel === "number" ? { kernelTunnel: reply.kernelTunnel } : {},
-      ...typeof reply.kernelPort === "number" ? { kernelPort: reply.kernelPort } : {},
-      ...typeof reply.cdp === "number" ? { cdp: reply.cdp } : {}
-    }
-  };
-}
-async function probeLocalProxy(options) {
-  const status = await checkLocalProxy(options);
-  return status.state === "ready" ? status.probe : null;
-}
-function localProxyTransport(options) {
-  const endpoint = new URL(PATH, options.url);
-  return {
-    traits: {
-      manualRedirects: true,
-      encodedBodies: false,
-      maxRequestBody: options.maxRequestBody ?? MAX_REQUEST_BODY2
-    },
-    async fetch(request) {
-      let response;
-      try {
-        response = await send(options)(endpoint, {
-          method: "POST",
-          headers: hopHeaders(options, {
-            "X-Slicc-Raw-Request": encodeHead(request.url, request.method, request.headers)
-          }),
-          ...request.body ? { body: request.body } : {},
-          signal: request.signal,
-          credentials: "omit",
-          mode: "cors"
-        });
-      } catch (e) {
-        if (request.signal.aborted) throw e;
-        throw failure2(`${endpoint.origin} is unreachable or refuses this origin`);
-      }
-      const type = response.headers.get("content-type") ?? "";
-      if (response.status !== 200 || !type.startsWith(RAW_CONTENT_TYPE) || !response.body) {
-        throw await refusal(response);
-      }
-      const reader = response.body.getReader();
-      const idleMs = options.bodyIdleMs ?? BODY_IDLE_MS;
-      let framed;
-      try {
-        framed = await readHead(reader, idleMs);
-      } catch (e) {
-        await reader.cancel().catch(() => void 0);
-        throw e;
-      }
-      const body = chunks2(framed.rest, reader, idleMs);
-      return {
-        status: framed.head.status,
-        statusText: framed.head.statusText,
-        headers: framed.head.headers,
-        body,
-        cancel: async () => {
-          await body.return(void 0);
-          await reader.cancel().catch(() => void 0);
-        }
-      };
-    }
-  };
-}
-
 // src/mount/driver.ts
 function fsError2(code, message = code) {
   return Object.assign(new Error(message), { code });
@@ -2313,7 +2136,7 @@ function serveHostfsPort(port, transport) {
     });
     handles.clear();
   };
-  const send2 = (reply, transfer = []) => port.postMessage(reply, transfer);
+  const send = (reply, transfer = []) => port.postMessage(reply, transfer);
   const pending = /* @__PURE__ */ new Set();
   const track = (work) => {
     pending.add(work);
@@ -2333,7 +2156,7 @@ function serveHostfsPort(port, transport) {
     data
   }) => {
     const { id, op } = data;
-    if (op === "ping") return send2({ id, pong: true });
+    if (op === "ping") return send({ id, pong: true });
     if (op === "bye") return stop();
     if (op === "cleanup")
       return void Promise.allSettled([...pending]).then(() => answer(data.name, data.body)).catch(() => {
@@ -2345,12 +2168,12 @@ function serveHostfsPort(port, transport) {
       try {
         await transport.watch(
           stop2.signal,
-          (event) => send2({ id, event }),
-          () => send2({ id, open: true })
+          (event) => send({ id, event }),
+          () => send({ id, open: true })
         );
-        send2({ id, end: true });
+        send({ id, end: true });
       } catch (err) {
-        send2({ id, error: errorOf2(err) });
+        send({ id, error: errorOf2(err) });
       } finally {
         watches.delete(id);
       }
@@ -2367,18 +2190,18 @@ function serveHostfsPort(port, transport) {
           )
         );
         const bytes = read.slice();
-        return send2({ id, bytes }, [bytes.buffer]);
+        return send({ id, bytes }, [bytes.buffer]);
       }
       if (op === "write") {
         await track(
           transport.write(data.fh, data.offset, data.bytes)
         );
-        return send2({ id });
+        return send({ id });
       }
       if (op !== "call") throw fsError2("EINVAL", `unknown hostfs port op ${op}`);
-      send2({ id, result: await answer(data.name, data.body) });
+      send({ id, result: await answer(data.name, data.body) });
     } catch (err) {
-      send2({ id, error: errorOf2(err) });
+      send({ id, error: errorOf2(err) });
     }
   };
   const stop = () => {
@@ -2662,7 +2485,7 @@ async function createKernel(options = {}) {
   const worker = new Worker(url, { type: "module", name: "slicc-kernel" });
   const pending = /* @__PURE__ */ new Map();
   let nextId = 0;
-  let failure3;
+  let failure2;
   const dials = dialer((req) => call(req));
   const files = fileWatches(
     (req) => request(req),
@@ -2679,7 +2502,7 @@ async function createKernel(options = {}) {
     facades.close();
     sealed.close();
     approvals.close();
-    failure3 = error;
+    failure2 = error;
     bridge?.close();
     uplinks?.close();
     for (const call2 of pending.values()) call2.reject(error);
@@ -2739,7 +2562,7 @@ async function createKernel(options = {}) {
   });
   function request(req, handlers = {}) {
     const id = ++nextId;
-    if (failure3) return { id, done: Promise.reject(failure3) };
+    if (failure2) return { id, done: Promise.reject(failure2) };
     const done = new Promise((resolve, reject) => {
       pending.set(id, { resolve, reject, ...handlers });
       worker.postMessage({ ...req, id });
@@ -2761,7 +2584,7 @@ async function createKernel(options = {}) {
     );
     done.catch(started.reject);
     const pid = await started.promise;
-    const send2 = (action) => void call({ op: "terminal", terminal: id, ...action }).catch(() => void 0);
+    const send = (action) => void call({ op: "terminal", terminal: id, ...action }).catch(() => void 0);
     return {
       pid,
       exited: quiet(done.then((r) => endedOf2(r).status)),
@@ -2773,13 +2596,13 @@ async function createKernel(options = {}) {
         listener = next;
         if (next) for (const bytes of backlog.splice(0)) next(bytes);
       },
-      write: (data) => send2({
+      write: (data) => send({
         action: "write",
         bytes: typeof data === "string" ? new TextEncoder().encode(data) : data
       }),
-      resize: (cols, rows) => send2({ action: "resize", cols, rows }),
-      signal: (name) => send2({ action: "signal", signal: name }),
-      close: () => send2({ action: "close" })
+      resize: (cols, rows) => send({ action: "resize", cols, rows }),
+      signal: (name) => send({ action: "signal", signal: name }),
+      close: () => send({ action: "close" })
     };
   }
   const { dial } = dials;
@@ -2822,11 +2645,8 @@ export {
   KernelCallError,
   KernelGoneError,
   attachKernel,
-  checkLocalProxy,
   createKernel,
   fetchTransport,
-  localProxyTransport,
-  probeLocalProxy,
   serveHostfsPort
 };
 //# sourceMappingURL=index.js.map