sandboxedjs 0.1.49 → 0.1.50

package/dist/index.js

@@ -19359,27 +19359,30 @@ function compareRelease(left, right) {
 function isPreRelease(version) {
   return /(a|b|rc|dev|post)\d*$/i.test(version.replace(/^\d+(\.\d+)*/, ""));
 }
-async function resolvePackage(client, requirement, environment) {
+async function resolvePackageCandidates(client, requirement, environment) {
   const index = await client.json(`https://pypi.org/pypi/${requirement.name}/json`);
   const candidates = Object.keys(index.releases).filter((version) => requirement.specifiers.every((s) => compareVersions(version, s.version, s.op))).sort((a, b) => compareRelease(releaseOf(a), releaseOf(b)));
   const stable = candidates.filter((version) => !isPreRelease(version));
   const ordered = (stable.length > 0 ? stable : candidates).reverse();
   let sawSourceOnly = false;
+  const resolved = [];
   for (const version of ordered) {
     const files = (index.releases[version] ?? []).filter((file3) => !file3.yanked);
     const wheel = pickWheel(files);
     if (wheel) {
-      return {
+      resolved.push({
         name: requirement.name,
         version,
         url: wheel.url,
         filename: wheel.filename,
         sha256: wheel.digests?.sha256 ?? "",
         requires: []
-      };
+      });
+      continue;
     }
     if (files.some((file3) => file3.packagetype === "sdist")) sawSourceOnly = true;
   }
+  if (resolved.length > 0) return resolved;
   if (ordered.length === 0) {
     throw new Error(
       `no version of ${requirement.name} matches ${describe(requirement)}`
@@ -19407,6 +19410,7 @@ function splitOnce(text2, separator) {
 
 // src/runtime/python/install.ts
 var SITE_PACKAGES = "/usr/lib/python3.13/site-packages";
+var SCRIPTS = "/usr/local/bin";
 function markerEnvironment(pythonVersion) {
   const [major = "3", minor = "13"] = pythonVersion.split(".");
   return {
@@ -19427,18 +19431,33 @@ async function installRequirements(options) {
     const requirement = parseRequirement(text2);
     if (requirement) queue.push({ requirement, extras: requirement.extras });
   }
-  const chosen = /* @__PURE__ */ new Map();
-  const seen = /* @__PURE__ */ new Set();
-  while (queue.length > 0) {
-    const { requirement, extras } = queue.shift();
+  const archives = /* @__PURE__ */ new Map();
+  const unavailable2 = /* @__PURE__ */ new Set();
+  const candidateCache = /* @__PURE__ */ new Map();
+  const solve = async (pending, state) => {
+    if (pending.length === 0) return state;
+    const [first, ...tail2] = pending;
+    let { requirement, extras } = first;
+    const rest = [];
+    const mergedSpecifiers = [...requirement.specifiers];
+    const mergedExtras = new Set(extras);
+    for (const item of tail2) {
+      if (item.requirement.name === requirement.name && markerApplies(item.requirement.marker, environment, item.extras)) {
+        mergedSpecifiers.push(...item.requirement.specifiers);
+        for (const extra of item.extras) mergedExtras.add(extra);
+      } else {
+        rest.push(item);
+      }
+    }
+    requirement = { ...requirement, specifiers: mergedSpecifiers };
+    extras = [...mergedExtras];
     if (!markerApplies(requirement.marker, environment, extras)) {
-      report.skipped.push({ name: requirement.name, marker: requirement.marker ?? "" });
-      continue;
+      return solve(rest, {
+        ...state,
+        skipped: [...state.skipped, { name: requirement.name, marker: requirement.marker ?? "" }]
+      });
     }
-    const key = `${requirement.name}[${extras.join(",")}]`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-    const already = chosen.get(requirement.name);
+    const already = state.chosen.get(requirement.name);
     if (already) {
       const satisfied = requirement.specifiers.every(
         (s) => compareVersions(already.version, s.version, s.op)
@@ -19448,38 +19467,143 @@ async function installRequirements(options) {
           `${requirement.name} ${already.version} is already selected but another dependency needs ` + requirement.specifiers.map((s) => `${s.op}${s.version}`).join(", ")
         );
       }
-      continue;
+      return solve(rest, state);
     }
     options.progress.collecting(requirement.name);
-    const resolved = await resolvePackage(options.client, requirement);
-    chosen.set(requirement.name, resolved);
-    options.progress.downloading(resolved.name, resolved.version);
-    const archive = await options.client.bytes(resolved.url);
-    const entries = readZip(archive);
-    const metadata = entries.find((entry) => /\.dist-info\/METADATA$/.test(entry.name));
-    if (metadata) {
-      for (const line of new TextDecoder().decode(metadata.data()).split(/\r?\n/)) {
-        if (!line.startsWith("Requires-Dist:")) continue;
-        const dependency = parseRequirement(line.slice("Requires-Dist:".length));
-        if (dependency) queue.push({ requirement: dependency, extras: [] });
-      }
-    }
-    unpack(options.vfs, options.cred, entries);
-    report.installed.push({ name: resolved.name, version: resolved.version });
-  }
+    if (unavailable2.has(requirement.name)) {
+      throw new Error(`${requirement.name} has no wheel this runtime can use`);
+    }
+    const candidateKey = `${requirement.name}:${requirement.specifiers.map((s) => `${s.op}${s.version}`).join(",")}`;
+    let candidatePromise = candidateCache.get(candidateKey);
+    if (!candidatePromise) {
+      candidatePromise = resolvePackageCandidates(options.client, requirement);
+      candidateCache.set(candidateKey, candidatePromise);
+    }
+    let candidates;
+    try {
+      candidates = await candidatePromise;
+    } catch (error) {
+      const anyKey = `${requirement.name}:`;
+      let anyPromise = candidateCache.get(anyKey);
+      if (!anyPromise) {
+        anyPromise = resolvePackageCandidates(
+          options.client,
+          { ...requirement, specifiers: [] });
+        candidateCache.set(anyKey, anyPromise);
+      }
+      try {
+        await anyPromise;
+      } catch {
+        unavailable2.add(requirement.name);
+      }
+      throw error;
+    }
+    let failure2;
+    for (const resolved of candidates) {
+      try {
+        let entries = archives.get(resolved.url);
+        if (!entries) {
+          options.progress.downloading(resolved.name, resolved.version);
+          entries = readZip(await options.client.bytes(resolved.url));
+          archives.set(resolved.url, entries);
+        }
+        const dependencies = [];
+        const metadata = entries.find((entry) => /\.dist-info\/METADATA$/.test(entry.name));
+        if (metadata) {
+          for (const line of new TextDecoder().decode(metadata.data()).split(/\r?\n/)) {
+            if (!line.startsWith("Requires-Dist:")) continue;
+            const dependency = parseRequirement(line.slice("Requires-Dist:".length));
+            if (dependency && markerApplies(dependency.marker, environment, extras)) {
+              dependencies.push({ requirement: dependency, extras: dependency.extras });
+            }
+          }
+        }
+        const chosen = new Map(state.chosen);
+        chosen.set(requirement.name, resolved);
+        return await solve([...dependencies, ...rest], {
+          chosen,
+          staged: [...state.staged, ...stageWheel(entries, resolved)],
+          installed: [...state.installed, { name: resolved.name, version: resolved.version }],
+          skipped: state.skipped
+        });
+      } catch (error) {
+        failure2 = error;
+      }
+    }
+    throw failure2 instanceof Error ? failure2 : new Error(`could not resolve ${requirement.name}`);
+  };
+  const solved = await solve(queue, {
+    chosen: /* @__PURE__ */ new Map(),
+    staged: [],
+    installed: [],
+    skipped: []
+  });
+  report.installed = solved.installed;
+  report.skipped = solved.skipped;
+  commit(options.vfs, options.cred, solved.staged);
   return report;
 }
-function unpack(vfs, cred, entries, resolved) {
+function stageWheel(entries, resolved) {
   const staged = [];
   for (const entry of entries) {
     if (entry.isDirectory) continue;
+    const dataPath = /^[^/]+\.data\/(purelib|platlib|scripts)\/(.+)$/.exec(entry.name);
+    if (dataPath) {
+      const [, scheme, relative2] = dataPath;
+      staged.push({
+        path: scheme === "scripts" ? `${SCRIPTS}/${relative2}` : `${SITE_PACKAGES}/${relative2}`,
+        data: entry.data(),
+        ...scheme === "scripts" ? { mode: 493 } : {}
+      });
+      continue;
+    }
     if (/^[^/]+\.data\//.test(entry.name)) continue;
     staged.push({ path: `${SITE_PACKAGES}/${entry.name}`, data: entry.data() });
   }
+  const entryPoints = entries.find((entry) => /\.dist-info\/entry_points\.txt$/.test(entry.name));
+  if (entryPoints) {
+    for (const [name, target] of consoleScripts(new TextDecoder().decode(entryPoints.data()))) {
+      staged.push({ path: `${SCRIPTS}/${name}`, data: new TextEncoder().encode(consoleLauncher(target)), mode: 493 });
+    }
+  }
+  return staged;
+}
+function commit(vfs, cred, staged) {
   const directories = /* @__PURE__ */ new Set();
   for (const file3 of staged) directories.add(file3.path.slice(0, file3.path.lastIndexOf("/")));
   for (const directory2 of directories) vfs.mkdir(directory2, { recursive: true, cred });
-  for (const file3 of staged) vfs.writeFile(file3.path, file3.data, { cred });
+  for (const file3 of staged) {
+    vfs.writeFile(file3.path, file3.data, { cred, ...file3.mode === void 0 ? {} : { mode: file3.mode } });
+    if (file3.mode !== void 0) vfs.chmod(file3.path, file3.mode, cred);
+  }
+}
+function consoleScripts(text2) {
+  const result = [];
+  let section = "";
+  for (const raw of text2.split(/\r?\n/)) {
+    const line = raw.trim();
+    const heading = /^\[([^\]]+)\]$/.exec(line);
+    if (heading) {
+      section = heading[1];
+      continue;
+    }
+    if (section !== "console_scripts" || line === "" || line.startsWith("#")) continue;
+    const assignment = /^([^=\s]+)\s*=\s*([^\s;]+)(?:\s*;.*)?$/.exec(line);
+    if (assignment) result.push([assignment[1], assignment[2].replace(/\s*\[.*\]$/, "")]);
+  }
+  return result;
+}
+function consoleLauncher(target) {
+  const [module, attribute = ""] = target.split(":", 2);
+  return `#!/usr/bin/python3
+import sys
+from importlib import import_module
+entry = import_module(${JSON.stringify(module)})
+for part in ${JSON.stringify(attribute)}.split('.'):
+    if part:
+        entry = getattr(entry, part)
+raise SystemExit(entry())
+`;
 }
 
 // src/runtime/python/backend.ts
@@ -19487,7 +19611,11 @@ function withSitePackages(env2) {
   const existing = env2.PYTHONPATH;
   return {
     ...env2,
-    PYTHONPATH: existing ? `${SITE_PACKAGES}:${existing}` : SITE_PACKAGES
+    PYTHONPATH: existing ? `${SITE_PACKAGES}:${existing}` : SITE_PACKAGES,
+    /* Installed packages live on a host-mounted VFS. Rewriting hundreds of
+     * cache files on every short-lived WASM process is wasted work and can
+     * exhaust the synchronous host-call bridge during large import graphs. */
+    PYTHONDONTWRITEBYTECODE: env2.PYTHONDONTWRITEBYTECODE ?? "1"
   };
 }
 var INTERPRETER_OWNED = /* @__PURE__ */ new Set(["lib", "dev", "proc", "usr"]);
@@ -19577,6 +19705,12 @@ function containerMounts(ctx) {
     }
   } catch {
   }
+  try {
+    if (ctx.vfs.stat(SCRIPTS, { cred: ctx.cred }).isDirectory()) {
+      mounts.push({ guest: SCRIPTS, container: SCRIPTS });
+    }
+  } catch {
+  }
   return mounts;
 }
 
@@ -19630,16 +19764,30 @@ environments. A package with no usable wheel is an error, never a silent skip.`,
         "outbound network access is disabled for this container (enable with network: { allowOutbound: true })"
       );
     }
+    const jsonCache = /* @__PURE__ */ new Map();
+    const bytesCache = /* @__PURE__ */ new Map();
     const client = {
       async json(url) {
-        const response = await fetch(url);
-        if (!response.ok) throw new Error(`${url} answered ${response.status}`);
-        return response.json();
+        let pending = jsonCache.get(url);
+        if (!pending) {
+          pending = fetch(url).then((response) => {
+            if (!response.ok) throw new Error(`${url} answered ${response.status}`);
+            return response.json();
+          });
+          jsonCache.set(url, pending);
+        }
+        return pending;
       },
       async bytes(url) {
-        const response = await fetch(url);
-        if (!response.ok) throw new Error(`${url} answered ${response.status}`);
-        return new Uint8Array(await response.arrayBuffer());
+        let pending = bytesCache.get(url);
+        if (!pending) {
+          pending = fetch(url).then(async (response) => {
+            if (!response.ok) throw new Error(`${url} answered ${response.status}`);
+            return new Uint8Array(await response.arrayBuffer());
+          });
+          bytesCache.set(url, pending);
+        }
+        return pending;
       }
     };
     try {