@relay-core/cli 0.3.5 → 0.3.7

package/install.js

@@ -1,109 +1,87 @@
 #!/usr/bin/env node
+"use strict";
+
 const { execSync } = require("child_process");
-const { existsSync, mkdirSync, readFileSync } = require("fs");
-const { createWriteStream } = require("fs");
+const { existsSync, mkdirSync, readFileSync, createWriteStream } = require("fs");
 const { pipeline } = require("stream/promises");
 const { join } = require("path");
 const https = require("https");
 
-const getVersion = () => {
-  try {
-    const pkg = JSON.parse(readFileSync(join(__dirname, "package.json"), "utf-8"));
-    return pkg.version;
-  } catch {
-    return "0.3.0";
-  }
-};
+const PKG_DIR = join(__dirname, "..");
+const BINARY_NAME = "relay-core-cli";
 
-const PACKAGE = process.env.npm_package_name || "@relay-core/cli";
-const VERSION = getVersion();
+function getVersion() {
+  try {
+    return JSON.parse(readFileSync(join(PKG_DIR, "package.json"), "utf-8")).version;
+  } catch { return "0.3.0"; }
+}
 
-// Map (os, arch) → GitHub release target
 function getTarget() {
-  const os = process.platform;
-  const arch = process.arch;
   const map = {
     "darwin-x64": "x86_64-apple-darwin",
     "darwin-arm64": "aarch64-apple-darwin",
     "linux-x64": "x86_64-unknown-linux-gnu",
+    "linux-arm64": "aarch64-unknown-linux-gnu",
     "win32-x64": "x86_64-pc-windows-msvc",
   };
-  const key = `${os}-${arch}`;
-  const target = map[key];
+  const target = map[`${process.platform}-${process.arch}`];
   if (!target) {
-    console.error(`Unsupported platform: ${key}. Supported: macOS (x64/arm64), Linux (x64), Windows (x64).`);
+    console.error(`Unsupported platform: ${process.platform}-${process.arch}. macOS/Linux/Windows (x64/arm64) supported.`);
     process.exit(1);
   }
   return target;
 }
 
-function getBinaryName() {
-  return PACKAGE.endsWith("mcp") ? "relay-core-probe" : "relay-core-cli";
-}
-
-function getBinaryPath(binaryName) {
-  return process.platform === "win32"
-    ? join(__dirname, "bin", binaryName + ".exe")
-    : join(__dirname, "bin", binaryName);
-}
-
 async function download(url, dest) {
   console.log(`Downloading ${url} → ${dest}`);
   return new Promise((resolve, reject) => {
     const file = createWriteStream(dest);
     https.get(url, (response) => {
       if (response.statusCode === 302 || response.statusCode === 301) {
-        https.get(response.headers.location, (redirectRes) => {
-          pipeline(redirectRes, file).then(resolve).catch(reject);
-        });
-        return;
-      }
-      if (response.statusCode !== 200) {
-        reject(new Error(`HTTP ${response.statusCode}`));
+        https.get(response.headers.location, (rr) => pipeline(rr, file).then(resolve, reject));
         return;
       }
-      pipeline(response, file).then(resolve).catch(reject);
+      if (response.statusCode !== 200) return reject(new Error(`HTTP ${response.statusCode}`));
+      pipeline(response, file).then(resolve, reject);
     }).on("error", reject);
   });
 }
 
 (async () => {
   try {
-    const binDir = join(__dirname, "bin");
+    const binDir = join(PKG_DIR, "bin");
     mkdirSync(binDir, { recursive: true });
-    const binaryName = getBinaryName();
-    const binaryPath = getBinaryPath(binaryName);
 
-    // Re-download if binary missing or version mismatch
+    const ext = process.platform === "win32" ? ".exe" : "";
+    const binaryPath = join(binDir, BINARY_NAME + ext);
+    const version = getVersion();
+
     if (existsSync(binaryPath)) {
       try {
         const out = execSync(`"${binaryPath}" --version`, { encoding: "utf-8", timeout: 5000 }).trim();
-        if (out.includes(VERSION)) {
-          console.log(`${binaryName} v${VERSION} already installed.`);
+        if (out.includes(version)) {
+          console.log(`${BINARY_NAME} v${version} already installed.`);
           return;
         }
-        console.log(`Installed ${out}, updating to v${VERSION}...`);
-      } catch {
-        console.log("Binary exists but failed --version check, re-downloading...");
-      }
+        console.log(`Installed ${out}, updating to v${version}...`);
+      } catch { console.log("Re-downloading..."); }
     }
 
     const target = getTarget();
-    const ext = process.platform === "win32" ? "zip" : "tar.gz";
-    const url = `https://github.com/relaycraft/relay-core/releases/download/v${VERSION}/${binaryName}-${target}.${ext}`;
-    const archivePath = join(binDir, `${binaryName}.${ext}`);
+    const archiveExt = process.platform === "win32" ? "zip" : "tar.gz";
+    const url = `https://github.com/relaycraft/relay-core/releases/download/v${version}/${BINARY_NAME}-${target}.${archiveExt}`;
+    const archivePath = join(binDir, `${BINARY_NAME}.${archiveExt}`);
 
     await download(url, archivePath);
-
     console.log("Extracting...");
+
     if (process.platform === "win32") {
       execSync(`powershell -Command "Expand-Archive -Path '${archivePath}' -DestinationPath '${binDir}' -Force"`, { stdio: "inherit" });
     } else {
       execSync(`tar xzf ${archivePath} -C ${binDir}`, { stdio: "inherit" });
       execSync(`chmod +x ${binaryPath}`, { stdio: "inherit" });
     }
-
-    console.log(`${binaryName} v${VERSION} installed.`);
+    console.log(`${BINARY_NAME} v${version} installed.`);
   } catch (err) {
     console.error("Install failed:", err.message);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@relay-core/cli",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "RelayCore CLI — high-performance Rust traffic interception proxy with TUI",
   "license": "MIT",
   "repository": "github:relaycraft/relay-core",