speqs 0.2.0 → 0.3.0

package/README.md

@@ -12,6 +12,18 @@ CLI tool to expose your localhost to [Speqs](https://speqs.io) for simulation te
 
 ## Install
 
+### Quick install (recommended)
+
+**macOS / Linux:**
+```bash
+curl -fsSL https://raw.githubusercontent.com/speqs-io/speqs-cli/main/install.sh | sh
+```
+
+**Windows (PowerShell):**
+```powershell
+irm https://raw.githubusercontent.com/speqs-io/speqs-cli/main/install.ps1 | iex
+```
+
 ### npm (all platforms)
 
 ```bash

package/dist/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
 import { program, Option } from "commander";
 import { runTunnel } from "./tunnel.js";
 import { login, getAppUrl } from "./auth.js";
 import { loadConfig, saveConfig } from "./config.js";
-const require = createRequire(import.meta.url);
-const { version } = require("../package.json");
+import { upgrade } from "./upgrade.js";
+import pkg from "../package.json" with { type: "json" };
+const { version } = pkg;
 program
     .name("speqs")
     .description("Speqs CLI tools")
@@ -54,4 +54,11 @@ program
     const apiUrl = options.dev ? "http://localhost:8000" : options.apiUrl;
     await runTunnel(portNum, options.token, apiUrl);
 });
+program
+    .command("upgrade")
+    .description("Update speqs to the latest version")
+    .option("--version <version>", "Install a specific version")
+    .action(async (options) => {
+    await upgrade(version, options.version);
+});
 program.parse();

package/dist/tunnel.js

@@ -2,7 +2,9 @@
  * Localhost tunnel CLI — wraps cloudflared and registers with Speqs backend.
  */
 import { spawn, execSync } from "node:child_process";
-import * as readline from "node:readline";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { existsSync, mkdirSync, chmodSync, writeFileSync } from "node:fs";
 import { loadConfig, saveConfig } from "./config.js";
 import { refreshTokens, isTokenExpired, decodeJwtExp } from "./auth.js";
 const TUNNEL_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/;
@@ -11,6 +13,8 @@ const MAX_HEARTBEAT_FAILURES = 3;
 const CLOUDFLARED_STARTUP_TIMEOUT = 30_000;
 const DEFAULT_API_URL = "https://api.speqs.io";
 const API_BASE = "/api/v1";
+const SPEQS_DIR = join(homedir(), ".speqs");
+const CLOUDFLARED_BIN = join(SPEQS_DIR, "bin", process.platform === "win32" ? "cloudflared.exe" : "cloudflared");
 // --- Token resolution ---
 async function verifyToken(token, apiUrl) {
     try {
@@ -32,15 +36,6 @@ function resolveApiUrl(apiUrlArg) {
         return apiUrlArg;
     return process.env.SPEQS_API_URL ?? DEFAULT_API_URL;
 }
-function prompt(question) {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            rl.close();
-            resolve(answer.trim());
-        });
-    });
-}
 /**
  * Resolve an access token, refreshing if needed.
  * Returns both the token and a mutable holder for runtime refresh.
@@ -95,40 +90,93 @@ async function resolveToken(tokenArg, apiUrl) {
         }
         console.error("Saved token is invalid or expired.\n");
     }
-    // 5. Interactive prompt (legacy fallback)
-    console.log('Tip: Run "speqs login" for browser-based authentication with auto-refresh.\n');
-    console.log("You can find your token in the simulation view.\n");
-    while (true) {
-        const token = await prompt("Paste your token: ");
-        if (!token) {
-            console.log("No token provided, exiting.");
-            process.exit(1);
-        }
-        if (await verifyToken(token, apiUrl)) {
-            config.token = token;
-            saveConfig(config);
-            return { token, refresh: null };
-        }
-        console.error("Invalid token. Try again.\n");
-    }
+    // 5. No valid token found — direct user to login
+    console.error('No valid token found. Run "speqs login" to authenticate.');
+    process.exit(1);
+}
+// --- Branding ---
+const RESET = "\x1b[0m";
+const ORANGE = "\x1b[38;2;212;117;78m";
+const BOLD = "\x1b[1m";
+function printBanner() {
+    console.log(`
+${ORANGE}${BOLD}   ███████╗██████╗ ███████╗ ██████╗ ███████╗
+   ██╔════╝██╔══██╗██╔════╝██╔═══██╗██╔════╝
+   ███████╗██████╔╝█████╗  ██║   ██║███████╗
+   ╚════██║██╔═══╝ ██╔══╝  ██║▄▄ ██║╚════██║
+   ███████║██║     ███████╗╚██████╔╝███████║
+   ╚══════╝╚═╝     ╚══════╝ ╚══▀▀═╝ ╚══════╝${RESET}
+
+   Tunnel active
+`);
 }
 // --- Cloudflared ---
-function checkCloudflared() {
+async function resolveCloudflaredBin() {
+    // 1. Prefer system-installed cloudflared
     try {
         execSync(process.platform === "win32" ? "where cloudflared" : "which cloudflared", { stdio: "ignore" });
+        return "cloudflared";
     }
     catch {
-        console.error("Missing dependency. Install it:\n" +
-            "  brew install cloudflare/cloudflare/cloudflared   # macOS\n" +
-            "  sudo apt install cloudflared                     # Debian/Ubuntu\n" +
-            "\n  Or: https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/");
+        // Not on PATH
+    }
+    // 2. Check ~/.speqs/bin/cloudflared
+    if (existsSync(CLOUDFLARED_BIN))
+        return CLOUDFLARED_BIN;
+    // 3. Download from Cloudflare releases
+    console.log("cloudflared not found. Installing...");
+    const url = getCloudflaredDownloadUrl();
+    if (!url) {
+        printManualInstallInstructions();
+        process.exit(1);
+    }
+    try {
+        const binDir = join(SPEQS_DIR, "bin");
+        mkdirSync(binDir, { recursive: true, mode: 0o755 });
+        if (url.endsWith(".tgz")) {
+            execSync(`curl -fsSL "${url}" | tar xz -C "${binDir}" cloudflared`, { stdio: "ignore" });
+        }
+        else {
+            const resp = await fetch(url);
+            if (!resp.ok)
+                throw new Error(`HTTP ${resp.status}`);
+            writeFileSync(CLOUDFLARED_BIN, Buffer.from(await resp.arrayBuffer()));
+        }
+        chmodSync(CLOUDFLARED_BIN, 0o755);
+        return CLOUDFLARED_BIN;
+    }
+    catch (e) {
+        console.error(`Failed to install cloudflared: ${e instanceof Error ? e.message : e}\n`);
+        printManualInstallInstructions();
         process.exit(1);
     }
 }
-function startCloudflared(port) {
+function getCloudflaredDownloadUrl() {
+    const base = "https://github.com/cloudflare/cloudflared/releases/latest/download";
+    const platform = process.platform;
+    const arch = process.arch;
+    if (platform === "darwin" && arch === "arm64")
+        return `${base}/cloudflared-darwin-arm64.tgz`;
+    if (platform === "darwin" && arch === "x64")
+        return `${base}/cloudflared-darwin-amd64.tgz`;
+    if (platform === "linux" && arch === "x64")
+        return `${base}/cloudflared-linux-amd64`;
+    if (platform === "linux" && arch === "arm64")
+        return `${base}/cloudflared-linux-arm64`;
+    if (platform === "win32" && arch === "x64")
+        return `${base}/cloudflared-windows-amd64.exe`;
+    return null;
+}
+function printManualInstallInstructions() {
+    console.error("You can install it manually:\n" +
+        "  brew install cloudflare/cloudflare/cloudflared   # macOS\n" +
+        "  sudo apt install cloudflared                     # Debian/Ubuntu\n" +
+        "\n  Or: https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/");
+}
+function startCloudflared(port, binPath) {
     return new Promise((resolve, reject) => {
         console.log(`Starting tunnel to localhost:${port}...`);
-        const proc = spawn("cloudflared", ["tunnel", "--url", `http://localhost:${port}`], {
+        const proc = spawn(binPath, ["tunnel", "--url", `http://localhost:${port}`], {
             stdio: ["ignore", "pipe", "pipe"],
         });
         let tunnelUrl = null;
@@ -144,7 +192,7 @@ function startCloudflared(port) {
             if (match && !tunnelUrl) {
                 tunnelUrl = match[0];
                 clearTimeout(timeout);
-                console.log(`Tunnel active: ${tunnelUrl}`);
+                printBanner();
                 resolve({ process: proc, tunnelUrl });
             }
         });
@@ -174,7 +222,7 @@ async function registerTunnel(apiUrl, token, tunnelUrl, port) {
         });
         if (!resp.ok)
             throw new Error(`HTTP ${resp.status}`);
-        console.log("Registered with Speqs backend");
+        // Registration successful — banner already shown
     }
     catch (e) {
         console.error(`Warning: Failed to register tunnel: ${e}`);
@@ -300,10 +348,10 @@ export async function runTunnel(port, tokenArg, apiUrlArg) {
             return refreshInFlight;
         }
         : null;
-    checkCloudflared();
+    const cloudflaredPath = await resolveCloudflaredBin();
     let cfResult;
     try {
-        cfResult = await startCloudflared(port);
+        cfResult = await startCloudflared(port, cloudflaredPath);
     }
     catch (e) {
         console.error(`Failed to start cloudflared: ${e}`);

package/dist/upgrade.d.ts

@@ -0,0 +1 @@
+export declare function upgrade(currentVersion: string, targetVersion?: string): Promise<void>;

package/dist/upgrade.js

@@ -0,0 +1,94 @@
+import { createWriteStream, renameSync, unlinkSync, chmodSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { pipeline } from "node:stream/promises";
+import { Readable } from "node:stream";
+const GITHUB_REPO = "speqs-io/speqs-cli";
+function getPlatformTarget() {
+    const platform = process.platform;
+    const arch = process.arch;
+    const targets = {
+        darwin: { arm64: "darwin-arm64", x64: "darwin-x64" },
+        linux: { arm64: "linux-arm64", x64: "linux-x64" },
+        win32: { x64: "windows-x64" },
+    };
+    const target = targets[platform]?.[arch];
+    if (!target) {
+        throw new Error(`Unsupported platform: ${platform}-${arch}`);
+    }
+    return target;
+}
+async function getLatestVersion() {
+    const res = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/releases/latest`, { headers: { Accept: "application/vnd.github.v3+json" } });
+    if (!res.ok)
+        throw new Error(`Failed to fetch latest version: ${res.statusText}`);
+    const data = (await res.json());
+    return data.tag_name.replace(/^v/, "");
+}
+export async function upgrade(currentVersion, targetVersion) {
+    if (targetVersion && !/^\d+\.\d+\.\d+/.test(targetVersion)) {
+        throw new Error(`Invalid version format: ${targetVersion}`);
+    }
+    const latest = targetVersion || (await getLatestVersion());
+    if (latest === currentVersion) {
+        console.log(`Already up to date (v${currentVersion}).`);
+        return;
+    }
+    console.log(`Updating speqs v${currentVersion} → v${latest}...`);
+    const target = getPlatformTarget();
+    const ext = process.platform === "win32" ? ".exe" : "";
+    const assetName = `speqs-${target}${ext}`;
+    const url = `https://github.com/${GITHUB_REPO}/releases/download/v${latest}/${assetName}`;
+    const res = await fetch(url, { redirect: "follow" });
+    if (!res.ok) {
+        throw new Error(`Download failed: ${res.statusText} (${url})`);
+    }
+    if (!res.body) {
+        throw new Error(`Download failed: empty response body (${url})`);
+    }
+    const execPath = process.execPath;
+    // Use same directory as the binary to avoid cross-device rename issues
+    const tmpPath = join(dirname(execPath), `.speqs-upgrade-${Date.now()}${ext}`);
+    const fileStream = createWriteStream(tmpPath);
+    try {
+        await pipeline(Readable.fromWeb(res.body), fileStream);
+    }
+    catch (err) {
+        try {
+            unlinkSync(tmpPath);
+        }
+        catch { }
+        throw err;
+    }
+    if (process.platform === "win32") {
+        const oldPath = execPath + ".old";
+        try {
+            unlinkSync(oldPath);
+        }
+        catch { }
+        renameSync(execPath, oldPath);
+        try {
+            renameSync(tmpPath, execPath);
+            try {
+                unlinkSync(oldPath);
+            }
+            catch { }
+        }
+        catch (err) {
+            // Restore original binary on failure
+            try {
+                renameSync(oldPath, execPath);
+            }
+            catch { }
+            try {
+                unlinkSync(tmpPath);
+            }
+            catch { }
+            throw err;
+        }
+    }
+    else {
+        chmodSync(tmpPath, 0o755);
+        renameSync(tmpPath, execPath);
+    }
+    console.log(`Updated to v${latest}.`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speqs",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "The command-line interface for Speqs",
   "type": "module",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "build:binary": "bun build --compile src/index.ts --outfile speqs",
     "dev": "tsc --watch",
     "prepublishOnly": "npm run build"
   },