beltsh 1.14.19 → 1.15.0

package/install.js

@@ -4,7 +4,7 @@ const https = require("https");
 const fs = require("fs");
 const path = require("path");
 const os = require("os");
-const { execSync } = require("child_process");
+const zlib = require("zlib");
 const crypto = require("crypto");
 
 const MANIFEST_URL = "https://dist.inference.sh/cli/manifest.json";
@@ -22,7 +22,6 @@ if (!PLATFORM || !ARCH) {
 const KEY = `${PLATFORM}-${ARCH}`;
 
 function getInstallDir() {
-  // Same logic as the curl installer
   if (process.platform === "win32") {
     return path.join(os.homedir(), ".local", "bin");
   }
@@ -51,6 +50,74 @@ function fetch(url) {
   });
 }
 
+// Extract a single file matching `prefix` from a .zip buffer.
+// ZIP central directory is at the end of the file — parse it to find entries.
+function extractFromZip(buf, prefix) {
+  // Find End of Central Directory record (signature 0x06054b50)
+  let eocdOffset = -1;
+  for (let i = buf.length - 22; i >= 0; i--) {
+    if (buf.readUInt32LE(i) === 0x06054b50) {
+      eocdOffset = i;
+      break;
+    }
+  }
+  if (eocdOffset === -1) throw new Error("invalid zip: EOCD not found");
+
+  const cdOffset = buf.readUInt32LE(eocdOffset + 16);
+  const cdEntries = buf.readUInt16LE(eocdOffset + 10);
+
+  let pos = cdOffset;
+  for (let i = 0; i < cdEntries; i++) {
+    if (buf.readUInt32LE(pos) !== 0x02014b50) throw new Error("invalid zip: bad central dir");
+    const nameLen = buf.readUInt16LE(pos + 28);
+    const extraLen = buf.readUInt16LE(pos + 30);
+    const commentLen = buf.readUInt16LE(pos + 32);
+    const localOffset = buf.readUInt32LE(pos + 42);
+    const name = buf.toString("utf8", pos + 46, pos + 46 + nameLen);
+
+    if (name.startsWith(prefix)) {
+      // Read local file header at localOffset (signature 0x04034b50)
+      const lh = localOffset;
+      const lhNameLen = buf.readUInt16LE(lh + 26);
+      const lhExtraLen = buf.readUInt16LE(lh + 28);
+      const compMethod = buf.readUInt16LE(lh + 8);
+      const compSize = buf.readUInt32LE(lh + 18);
+      const dataStart = lh + 30 + lhNameLen + lhExtraLen;
+      const compressed = buf.subarray(dataStart, dataStart + compSize);
+
+      if (compMethod === 0) return { name, data: compressed };
+      if (compMethod === 8) return { name, data: zlib.inflateRawSync(compressed) };
+      throw new Error(`unsupported zip compression method: ${compMethod}`);
+    }
+
+    pos += 46 + nameLen + extraLen + commentLen;
+  }
+  return null;
+}
+
+// Extract a single file matching `prefix` from a .tar.gz buffer.
+function extractFromTarGz(buf, prefix) {
+  const tar = zlib.gunzipSync(buf);
+  let offset = 0;
+  while (offset < tar.length - 512) {
+    const header = tar.subarray(offset, offset + 512);
+    if (header[0] === 0) break; // end of archive
+
+    const name = header.toString("utf8", 0, 100).replace(/\0.*/, "");
+    const sizeStr = header.toString("utf8", 124, 136).replace(/\0.*/, "").trim();
+    const size = parseInt(sizeStr, 8) || 0;
+    const dataStart = offset + 512;
+
+    if (name.startsWith(prefix)) {
+      return { name, data: tar.subarray(dataStart, dataStart + size) };
+    }
+
+    // Advance past header + data (rounded up to 512-byte blocks)
+    offset = dataStart + Math.ceil(size / 512) * 512;
+  }
+  return null;
+}
+
 async function main() {
   const installDir = getInstallDir();
   console.log(`Downloading belt for ${PLATFORM}/${ARCH}...`);
@@ -71,42 +138,25 @@ async function main() {
     process.exit(1);
   }
 
-  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "belt-"));
-  const archivePath = path.join(tmpDir, path.basename(build.url));
-  fs.writeFileSync(archivePath, archive);
-
-  // Extract
-  if (archivePath.endsWith(".zip")) {
-    if (process.platform === "win32") {
-      // bsdtar ships with Windows 10+ and extracts zip natively; unzip does not exist on Windows
-      execSync(`tar -xf "${archivePath}" -C "${tmpDir}"`, { stdio: "pipe" });
-    } else {
-      execSync(`unzip -o "${archivePath}" -d "${tmpDir}"`, { stdio: "pipe" });
-    }
-  } else {
-    execSync(`tar -xzf "${archivePath}" -C "${tmpDir}"`, { stdio: "pipe" });
-  }
+  // Extract binary — pure Node, no shell commands, no MSYS path mangling
+  const entry = build.url.endsWith(".zip")
+    ? extractFromZip(archive, "inferencesh-cli")
+    : extractFromTarGz(archive, "inferencesh-cli");
 
-  // Find the extracted binary
-  const ext = PLATFORM === "windows" ? ".exe" : "";
-  const files = fs.readdirSync(tmpDir).filter((f) => f.startsWith("inferencesh-cli"));
-  if (files.length === 0) {
+  if (!entry) {
     console.error("Binary not found in archive");
     process.exit(1);
   }
 
   // Install to persistent location
+  const ext = PLATFORM === "windows" ? ".exe" : "";
   fs.mkdirSync(installDir, { recursive: true });
-  const src = path.join(tmpDir, files[0]);
   const dest = path.join(installDir, `belt${ext}`);
 
   // Remove any existing file/symlink first — copyFileSync follows symlinks,
   // which corrupts installs where an older installer left belt as a symlink.
   try { fs.unlinkSync(dest); } catch {}
-  fs.copyFileSync(src, dest);
-  if (PLATFORM !== "windows") {
-    fs.chmodSync(dest, 0o755);
-  }
+  fs.writeFileSync(dest, entry.data, { mode: PLATFORM === "windows" ? undefined : 0o755 });
 
   // Create aliases (same as curl installer). Symlinks require elevation on
   // Windows, so fall back to copying the binary there.
@@ -120,21 +170,16 @@ async function main() {
     }
   }
 
-  // Clean up temp
-  fs.rmSync(tmpDir, { recursive: true });
-
-  // Also install into npm bin/ so run.js works for npm install -g
+  // Also install into npm bin/ so run.js works for npx / npm install -g
   const npmBin = path.join(__dirname, "bin");
   fs.mkdirSync(npmBin, { recursive: true });
-  fs.copyFileSync(dest, path.join(npmBin, `belt${ext}`));
-  if (PLATFORM !== "windows") {
-    fs.chmodSync(path.join(npmBin, `belt${ext}`), 0o755);
-  }
+  const npmDest = path.join(npmBin, `belt${ext}`);
+  fs.writeFileSync(npmDest, entry.data, { mode: PLATFORM === "windows" ? undefined : 0o755 });
 
   console.log(`Installed belt ${manifest.version} to ${installDir}`);
 }
 
 main().catch((err) => {
-  console.error("Installation failed:", err.message);
+  console.error("belt installation failed:", err.message);
   process.exit(1);
 });

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "beltsh",
-  "version": "1.14.19",
+  "version": "1.15.0",
   "description": "inference.sh CLI — run AI apps, manage skills, connect MCP servers",
   "homepage": "https://inference.sh",
-  "repository": "https://github.com/inference-sh/cli",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/inference-sh/cli.git"
+  },
   "license": "MIT",
   "bin": {
     "belt": "run.js",

package/run.js

@@ -1,18 +1,24 @@
 #!/usr/bin/env node
 
 const { spawn } = require("child_process");
+const { existsSync } = require("fs");
 const path = require("path");
 
 const ext = process.platform === "win32" ? ".exe" : "";
 const bin = path.join(__dirname, "bin", `belt${ext}`);
 
+if (!existsSync(bin)) {
+  console.error(
+    "belt binary not found at " + bin + "\n" +
+    "This can happen on Git Bash/MSYS — install directly instead:\n" +
+    "  curl -fsSL https://dist.inference.sh/install.sh | sh"
+  );
+  process.exit(1);
+}
+
 const child = spawn(bin, process.argv.slice(2), { stdio: "inherit" });
 child.on("error", (err) => {
-  if (err.code === "ENOENT") {
-    console.error("belt binary not found. Try reinstalling: npm install @inferencesh/belt");
-  } else {
-    console.error(err.message);
-  }
+  console.error(err.message);
   process.exit(1);
 });
 child.on("exit", (code) => process.exit(code ?? 1));