@sachinthapa572/fast 0.1.5-rc → 0.1.7-rc

package/cli.js

@@ -1,20 +1,15 @@
 #!/usr/bin/env node
 const { spawnSync } = require("child_process");
-const { existsSync } = require("fs");
-const { join } = require("path");
-
-const binName = process.platform === "win32" ? "fast.exe" : "fast";
-const binPath = join(__dirname, "bin", binName);
-
-if (!existsSync(binPath)) {
-  console.error(
-    "fast binary not found. Run `npm rebuild` or reinstall the package."
-  );
-  process.exit(1);
-}
-
-const result = spawnSync(binPath, process.argv.slice(2), {
-  stdio: "inherit",
-});
-
-process.exit(result.status ?? 1);
+const { ensureBinary, BINARY_PATH } = require("./download");
+
+ensureBinary()
+  .then(() => {
+    const result = spawnSync(BINARY_PATH, process.argv.slice(2), {
+      stdio: "inherit",
+    });
+    process.exit(result.status ?? 1);
+  })
+  .catch((err) => {
+    console.error("Failed to install fast binary:", err.message);
+    process.exit(1);
+  });

package/download.js

@@ -0,0 +1,150 @@
+const { execSync } = require("child_process");
+const {
+  createWriteStream,
+  existsSync,
+  mkdirSync,
+  readdirSync,
+  openSync,
+  readSync,
+  closeSync,
+} = require("fs");
+const { chmod, unlink } = require("fs").promises;
+const { join } = require("path");
+const { platform, arch } = require("os");
+const https = require("https");
+const http = require("http");
+
+const pkg = require("./package.json");
+const BIN_DIR = join(__dirname, "bin");
+const BINARY_NAME = process.platform === "win32" ? "fast.exe" : "fast";
+const BINARY_PATH = join(BIN_DIR, BINARY_NAME);
+
+const OS_MAP = { win32: "Windows", darwin: "Darwin", linux: "Linux" };
+const ARCH_MAP = { x64: "x86_64", arm64: "aarch64" };
+const EXT_MAP = { win32: ".zip", darwin: ".tar.gz", linux: ".tar.gz" };
+
+const GH_OWNER = "sachinthapa572";
+const GH_REPO = "fast-release";
+const DOWNLOAD_BASE =
+  process.env.FAST_DOWNLOAD_URL ||
+  `https://github.com/${GH_OWNER}/${GH_REPO}/releases/download`;
+
+function downloadUrl() {
+  const os = OS_MAP[platform()];
+  const cpu = ARCH_MAP[arch()];
+  const ext = EXT_MAP[platform()];
+
+  if (!os || !cpu) {
+    throw new Error(`Unsupported platform: ${platform()}/${arch()}`);
+  }
+
+  return `${DOWNLOAD_BASE}/v${pkg.version}/fast_${os}_${cpu}${ext}`;
+}
+
+function download(url, dest) {
+  return new Promise((resolve, reject) => {
+    const mod = url.startsWith("https") ? https : http;
+    mod
+      .get(url, (res) => {
+        if (
+          res.statusCode >= 300 &&
+          res.statusCode < 400 &&
+          res.headers.location
+        ) {
+          download(res.headers.location, dest).then(resolve).catch(reject);
+          return;
+        }
+        if (res.statusCode !== 200) {
+          reject(
+            new Error(`Download failed: HTTP ${res.statusCode} for ${url}`),
+          );
+          return;
+        }
+        const file = createWriteStream(dest);
+        res.pipe(file);
+        file.on("finish", () => file.close(resolve));
+        file.on("error", reject);
+      })
+      .on("error", reject);
+  });
+}
+
+function extractArchive(src, dest, binaryName) {
+  if (process.platform === "win32") {
+    execSync(
+      `powershell -NoProfile -Command "Expand-Archive -Path '${src}' -DestinationPath '${dest}' -Force"`,
+      { stdio: "ignore" },
+    );
+    // PowerShell puts files in a subfolder named after the archive
+    const subdirs = readdirSync(dest).filter((f) => f !== binaryName);
+    for (const dir of subdirs) {
+      const subpath = join(dest, dir);
+      if (existsSync(subpath) && existsSync(join(subpath, binaryName))) {
+        execSync(
+          `move "${join(subpath, binaryName)}" "${join(dest, binaryName)}"`,
+          { stdio: "ignore" },
+        );
+        execSync(`rmdir /s /q "${subpath}"`, { stdio: "ignore" });
+      }
+    }
+    return;
+  }
+
+  // Extract to a temp dir so we can find the binary regardless of wrapping
+  const tmpDir = join(dest, `._extract_${Date.now()}`);
+  mkdirSync(tmpDir, { recursive: true });
+
+  try {
+    execSync(`tar xzf "${src}" -C "${tmpDir}"`, { stdio: "ignore" });
+
+    // Find the binary anywhere in the extracted tree
+    const result = execSync(`find "${tmpDir}" -type f -name "${binaryName}"`, {
+      encoding: "utf8",
+      timeout: 5000,
+    }).trim();
+
+    if (!result) {
+      throw new Error(`Binary "${binaryName}" not found in archive`);
+    }
+
+    const found = result.split("\n")[0];
+    execSync(`mv "${found}" "${join(dest, binaryName)}"`, { stdio: "ignore" });
+  } finally {
+    execSync(`rm -rf "${tmpDir}"`, { stdio: "ignore" });
+  }
+}
+
+async function ensureBinary() {
+  if (existsSync(BINARY_PATH)) return;
+
+  if (!existsSync(BIN_DIR)) mkdirSync(BIN_DIR, { recursive: true });
+
+  const url = downloadUrl();
+  const ext = EXT_MAP[platform()];
+  const tmpArchive = join(BIN_DIR, `download${ext}`);
+
+  console.error(`Downloading fast v${pkg.version}...`);
+  await download(url, tmpArchive);
+
+  // Quick sanity check: make sure it's actually a gzip, not an HTML error page
+  const header = Buffer.alloc(2);
+  const fd = openSync(tmpArchive, "r");
+  readSync(fd, header, 0, 2, 0);
+  closeSync(fd);
+  if (header[0] !== 0x1f || header[1] !== 0x8b) {
+    await unlink(tmpArchive);
+    throw new Error(
+      `Downloaded file is not a valid gzip archive (got 0x${header.toString("hex")}). Release v${pkg.version} may not exist yet.`,
+    );
+  }
+
+  console.error("Extracting...");
+  extractArchive(tmpArchive, BIN_DIR, BINARY_NAME);
+  await unlink(tmpArchive);
+
+  if (process.platform !== "win32") {
+    await chmod(BINARY_PATH, 0o755);
+  }
+}
+
+module.exports = { ensureBinary, BINARY_PATH };

package/install.js

@@ -1,102 +1,12 @@
 #!/usr/bin/env node
-const { execSync } = require("child_process");
-const { createWriteStream, existsSync, mkdirSync } = require("fs");
-const { chmod, unlink } = require("fs").promises;
-const { join } = require("path");
-const { platform, arch } = require("os");
-const https = require("https");
-const http = require("http");
+const { ensureBinary } = require("./download");
 
-const pkg = require("./package.json");
-const BIN_DIR = join(__dirname, "bin");
-const BINARY_NAME = process.platform === "win32" ? "fast.exe" : "fast";
-const BINARY_PATH = join(BIN_DIR, BINARY_NAME);
-
-const OS_MAP = { win32: "Windows", darwin: "Darwin", linux: "Linux" };
-const ARCH_MAP = { x64: "x86_64", arm64: "aarch64" };
-const EXT_MAP = { win32: ".zip", darwin: ".tar.gz", linux: ".tar.gz" };
-
-// Default: download from GitHub Releases. Override via FAST_DOWNLOAD_URL env var.
-const GH_OWNER = "sachinthapa572";
-const GH_REPO = "fast-release";
-const DOWNLOAD_BASE =
-  process.env.FAST_DOWNLOAD_URL ||
-  `https://github.com/${GH_OWNER}/${GH_REPO}/releases/download`;
-
-function downloadUrl() {
-  const os = OS_MAP[platform()];
-  const cpu = ARCH_MAP[arch()];
-  const ext = EXT_MAP[platform()];
-
-  if (!os || !cpu) {
-    throw new Error(`Unsupported platform: ${platform()}/${arch()}`);
-  }
-
-  return `${DOWNLOAD_BASE}/v${pkg.version}/fast_${os}_${cpu}${ext}`;
-}
-
-function download(url, dest) {
-  return new Promise((resolve, reject) => {
-    const mod = url.startsWith("https") ? https : http;
-    mod
-      .get(url, (res) => {
-        if (
-          res.statusCode >= 300 &&
-          res.statusCode < 400 &&
-          res.headers.location
-        ) {
-          download(res.headers.location, dest).then(resolve).catch(reject);
-          return;
-        }
-        if (res.statusCode !== 200) {
-          reject(
-            new Error(`Download failed: HTTP ${res.statusCode} for ${url}`),
-          );
-          return;
-        }
-        const file = createWriteStream(dest);
-        res.pipe(file);
-        file.on("finish", () => file.close(resolve));
-        file.on("error", reject);
-      })
-      .on("error", reject);
-  });
-}
-
-function extractArchive(src, dest) {
-  if (process.platform === "win32") {
-    execSync(
-      `powershell -NoProfile -Command "Expand-Archive -Path '${src}' -DestinationPath '${dest}' -Force"`,
-      { stdio: "ignore" },
-    );
-    return;
-  }
-  execSync(`tar xzf "${src}" -C "${dest}" --strip-components 1`, {
-    stdio: "ignore",
+ensureBinary()
+  .then(() => console.log("fast installed successfully."))
+  .catch((err) => {
+    console.error("Failed to install fast binary:", err.message);
+    process.exit(1);
   });
-}
-
-async function install() {
-  if (!existsSync(BIN_DIR)) mkdirSync(BIN_DIR, { recursive: true });
-
-  const url = downloadUrl();
-  const ext = EXT_MAP[platform()];
-  const tmpArchive = join(BIN_DIR, `download${ext}`);
-
-  console.log(`Downloading fast v${pkg.version}...`);
-  await download(url, tmpArchive);
-
-  console.log("Extracting...");
-  extractArchive(tmpArchive, BIN_DIR);
-
-  await unlink(tmpArchive);
-
-  if (process.platform !== "win32") {
-    await chmod(BINARY_PATH, 0o755);
-  }
-
-  console.log("fast installed successfully.");
-}
 
 install().catch((err) => {
   console.error("Failed to install fast binary:", err.message);

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@sachinthapa572/fast",
-  "version": "0.1.5-rc",
+  "version": "0.1.7-rc",
   "description": "Test your internet speed from the command-line",
   "bin": {
     "fast": "cli.js"
   },
   "scripts": {
-    "postinstall": "node install.js",
     "preuninstall": "node uninstall.js"
   },
   "repository": {