@melaya/runner 1.1.32 → 1.1.33

package/dist/uvBootstrap.js

@@ -57,9 +57,10 @@ function findOnPath(bin) {
 }
 // Inactivity-bounded child runner (mirrors pythonEnv.runProc): a managed-CPython
 // download legitimately takes a while but streams progress, so we bound silence.
-function run(cmd, args, onLine, inactivityMs = 5 * 60_000) {
+function run(cmd, args, onLine, opts = {}) {
+    const inactivityMs = opts.inactivityMs ?? 5 * 60_000;
     return new Promise((resolve) => {
-        const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"], env: process.env });
+        const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, ...opts.env }, cwd: opts.cwd });
         let done = false;
         let timer;
         const finish = (c) => { if (done)
@@ -85,15 +86,38 @@ function run(cmd, args, onLine, inactivityMs = 5 * 60_000) {
         bump();
     });
 }
-function capture(cmd, args) {
+function capture(cmd, args, env = {}) {
     return new Promise((resolve) => {
         let out = "";
-        const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"], env: process.env });
+        const child = spawn(cmd, args, { stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, ...env } });
         child.stdout?.on("data", (b) => { out += b.toString(); });
         child.on("exit", () => resolve(out.trim()));
         child.on("error", () => resolve(""));
     });
 }
+// Extract the downloaded uv archive. uv ships .tar.gz for macOS/Linux and .zip
+// for Windows, so extraction must branch by type — a single `tar` call can't
+// cover both portably (a shell's `tar` may be MSYS GNU tar, which can't read
+// zip). destDir already contains the archive; we extract in place.
+async function extractArchive(archivePath, asset, destDir, onLine) {
+    if (asset.endsWith(".zip")) {
+        // Windows only. PowerShell's Expand-Archive is always present and reliably
+        // reads zips, unlike whatever `tar` happens to be on PATH.
+        const ps = `Expand-Archive -LiteralPath '${archivePath.replace(/'/g, "''")}' -DestinationPath '${destDir.replace(/'/g, "''")}' -Force`;
+        let code = await run("powershell", ["-NoProfile", "-NonInteractive", "-Command", ps], onLine);
+        if (code === 0)
+            return true;
+        // Fallback: Windows' bundled bsdtar (System32\tar.exe) also handles zip.
+        const sys32 = join(process.env.SystemRoot || "C:\\Windows", "System32", "tar.exe");
+        code = await run(existsSync(sys32) ? sys32 : "tar", ["-xf", asset, "-C", "."], onLine, { cwd: destDir });
+        return code === 0;
+    }
+    // macOS/Linux: .tar.gz — bsdtar (macOS) and GNU tar (Linux) both read gz.
+    // cwd + bare relative name keeps args colon-free (harmless on unix, required
+    // on Windows for the fallback path above).
+    const code = await run("tar", ["-xf", asset, "-C", "."], onLine, { cwd: destDir });
+    return code === 0;
+}
 function findBinaryRecursive(dir, name) {
     let entries;
     try {
@@ -154,9 +178,9 @@ async function downloadUv(onLine) {
         return null;
     }
     onLine("extracting uv");
-    const code = await run("tar", ["-xf", archivePath, "-C", tmp], onLine);
-    if (code !== 0) {
-        onLine("tar extraction of uv failed (is `tar` available?)");
+    const extracted = await extractArchive(archivePath, asset, tmp, onLine);
+    if (!extracted) {
+        onLine("extraction of the uv archive failed");
         return null;
     }
     const found = findBinaryRecursive(tmp, uvBinName());
@@ -200,12 +224,20 @@ export async function provisionPython(version, onLine) {
     if (!uv)
         return null;
     onLine(`installing a managed Python ${version} (one-time; ~30-60s)`);
-    const code = await run(uv, ["python", "install", version], onLine);
+    // UV_SYSTEM_CERTS makes uv verify against the OS trust store instead of its
+    // bundled webpki roots — required behind TLS-intercepting proxies/antivirus
+    // (else "invalid peer certificate: UnknownIssuer") and on networks whose
+    // issuer isn't in webpki. Set as an env var (not the CLI flag) so it's a
+    // no-op on uv versions that don't know it rather than an unknown-flag error;
+    // the flag was also renamed from --native-tls, and env vars dodge that churn.
+    // UV_HTTP_TIMEOUT lifts the per-request timeout for the ~20MB CPython download.
+    const uvEnv = { UV_SYSTEM_CERTS: "1", UV_HTTP_TIMEOUT: "300" };
+    const code = await run(uv, ["python", "install", version], onLine, { env: uvEnv });
     if (code !== 0) {
         onLine(`uv python install ${version} failed`);
         return null;
     }
-    const path = await capture(uv, ["python", "find", version]);
+    const path = await capture(uv, ["python", "find", version], uvEnv);
     if (path && existsSync(path))
         return path;
     onLine(`uv could not resolve a Python ${version} interpreter path after install`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melaya/runner",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "description": "Run Melaya AI pipelines locally with your own LM Studio or Ollama models",
   "license": "UNLICENSED",
   "private": false,