sandboxedjs 0.2.6 → 0.2.7

package/dist/worker-entry.js

@@ -7183,14 +7183,14 @@ var require_buffer = __commonJS({
       } else {
         if (byteOffset + valLength > arrLength) byteOffset = arrLength - valLength;
         for (i = byteOffset; i >= 0; i--) {
-          let found = true;
+          let found2 = true;
           for (let j = 0; j < valLength; j++) {
             if (read(arr, i + j) !== read(val, j)) {
-              found = false;
+              found2 = false;
               break;
             }
           }
-          if (found) return i;
+          if (found2) return i;
         }
       }
       return -1;
@@ -22060,23 +22060,23 @@ var CommonJsEngine = class {
     const builtin = this.builtin(specifier);
     if (builtin.found) return specifier;
     if (specifier.startsWith("#")) {
-      const found = this.resolveImports(specifier, importer, kind);
-      if (found) return found;
+      const found2 = this.resolveImports(specifier, importer, kind);
+      if (found2) return found2;
       throw this.moduleNotFound(specifier, importer);
     }
     const baseDir = dirname(importer);
     if (specifier.startsWith("/") || specifier.startsWith("./") || specifier.startsWith("../")) {
       const resolved = specifier.startsWith("/") ? clean(specifier) : resolve(baseDir, specifier);
-      const found = this.resolvePath(resolved, kind);
-      if (found) return found;
+      const found2 = this.resolvePath(resolved, kind);
+      if (found2) return found2;
     } else {
       const aliased = this.aliasFor(specifier);
       if (aliased) {
         const substituted = this.resolvePackage(aliased, baseDir, kind);
         if (substituted) return substituted;
       }
-      const found = this.resolvePackage(specifier, baseDir, kind);
-      if (found) return found;
+      const found2 = this.resolvePackage(specifier, baseDir, kind);
+      if (found2) return found2;
     }
     throw this.moduleNotFound(specifier, importer);
   }
@@ -22242,8 +22242,8 @@ ${code}
           continue;
         }
         for (const target of targets ?? []) {
-          const found = this.resolvePath(resolve(root, target), kind);
-          if (found) return found;
+          const found2 = this.resolvePath(resolve(root, target), kind);
+          if (found2) return found2;
         }
       }
       return null;
@@ -22252,8 +22252,8 @@ ${code}
     for (const field of ENTRY_FIELDS[kind]) {
       const value = manifest?.[field];
       if (typeof value === "string") {
-        const found = this.resolvePath(resolve(root, value), kind);
-        if (found) return found;
+        const found2 = this.resolvePath(resolve(root, value), kind);
+        if (found2) return found2;
       }
     }
     return this.resolveIndex(root);
@@ -22276,8 +22276,8 @@ ${code}
         continue;
       }
       for (const target of targets ?? []) {
-        const found = target.startsWith(".") ? this.resolvePath(resolve(root, target), kind) : this.resolvePackage(target, root, kind);
-        if (found) return found;
+        const found2 = target.startsWith(".") ? this.resolvePath(resolve(root, target), kind) : this.resolvePackage(target, root, kind);
+        if (found2) return found2;
       }
     }
     return null;
@@ -28281,10 +28281,50 @@ function isBrowser() {
 }
 function browserBlocked(hostname, message) {
   return new Error(
-    `${message} \u2014 the request to ${hostname} was blocked by the browser. A page can only read a response from a host that sends CORS headers, and most APIs send none. Give the container a proxy that makes the request for it \u2014 network: { proxy }, and \`npx sandboxedjs-egress\` is one \u2014 or run the container on a server.`
+    `${message} \u2014 the request to ${hostname} was blocked by the browser. A page can only read a response from a host that sends CORS headers, and most APIs send none. The container looks for a proxy to make the request for it and found none: mount \`handleEgressRequest\` from "sandboxedjs/egress" at /__sandboxedjs__/egress on this origin, or run \`npx sandboxedjs-egress\`, and it is used without further configuration (network: { proxy } names one somewhere else) \u2014 or run the container on a server.`
   );
 }
 
+// src/net/discover-egress.ts
+var EGRESS_PATH = "/__sandboxedjs__/egress";
+var EGRESS_MARKER = { sandboxedjs: "egress", protocol: 1 };
+var CLI_PORT = 4181;
+var found = null;
+var PROBE_TIMEOUT_MS = 1500;
+async function isEgress(url, fetchImpl) {
+  const control = new AbortController();
+  const timer = setTimeout(() => control.abort(), PROBE_TIMEOUT_MS);
+  try {
+    const answer2 = await fetchImpl(url, { method: "GET", signal: control.signal });
+    if (!answer2.ok) return false;
+    const payload = await answer2.json();
+    return payload?.sandboxedjs === EGRESS_MARKER.sandboxedjs;
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function candidates() {
+  const origin = globalThis.location?.origin;
+  const list = [];
+  if (origin && /^https?:/.test(origin)) list.push(`${origin}${EGRESS_PATH}`);
+  list.push(`http://127.0.0.1:${CLI_PORT}/`);
+  return list;
+}
+async function discoverEgress(fetchImpl = fetch) {
+  if (!isBrowser()) return null;
+  if (!found) {
+    found = (async () => {
+      for (const candidate of candidates()) {
+        if (await isEgress(candidate, fetchImpl)) return candidate;
+      }
+      return null;
+    })();
+  }
+  return await found;
+}
+
 // src/net/policy.ts
 function isLoopbackHostname(hostname) {
   const host = hostname.replace(/^\[|\]$/g, "").toLowerCase();
@@ -28327,7 +28367,8 @@ function policedFetch(policy, fetchImpl) {
     if (!outboundAllowed(policy, url)) {
       throw Object.assign(new TypeError("fetch failed"), { cause: outboundBlockedError(url) });
     }
-    if (policy.proxy) return await fetchThroughProxy(policy.proxy, fetchImpl, input, init);
+    const proxy = policy.proxy ?? await discoverEgress(fetchImpl);
+    if (proxy) return await fetchThroughProxy(proxy, fetchImpl, input, init);
     try {
       return await fetchImpl(input, init);
     } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandboxedjs",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "A Linux-like container that runs entirely inside Node.js — POSIX shell, ~140 coreutils, Node.js and Python runtimes, virtual filesystem and networking. No Docker, no VM, no native modules.",
   "type": "module",
   "license": "MIT",