windscout 0.5.2 → 0.5.4

package/README.md

@@ -75,11 +75,11 @@ windscout -t 40 -a                          # longer connect timeout, also list
 |---|---|---|
 | `-c, --countries` | comma-separated ISO country codes, city names or nicknames | open the picker |
 | `-p, --protocols` | comma-separated: `wireguard`, `ikev2` (macOS and Windows), `stealth`, `wstunnel`, `udp`, `tcp`, optionally `:port` | saved, or all |
-| `-t, --timeout` | seconds to wait for each connection, at least 10 | picker: saved, or 20; with `-c`: 20 |
+| `-t, --timeout` | seconds to wait for each connection, at least 10 | picker: saved, or 10; with `-c`: 10 |
 | `-a, --all` | include failed attempts in the final table | off |
 | `-n, --no-speed` | connect-only mode: skip the download test, rank by latency | picker: saved, or connect-only on first run; with `-c`: speed test on |
 | `-f, --firewall` | block internet while scanning, except through the VPN | picker: saved, or off; with `-c`: off |
-| `-v, --version` | print the installed version, and the update command if a newer one is on npm | |
+| `-v, --version` | print the installed version; if a newer one is on npm, show the update command and ask (y/n) to run it | |
 
 ## Connect-only mode
 

package/dist/cli.js

@@ -3,6 +3,7 @@
 // Drives the official windscribe-cli: connects to each country/protocol pair,
 // measures latency and download speed through the tunnel, prints a ranked table.
 import { createInterface } from "node:readline";
+import { spawnSync } from "node:child_process";
 import { parseArgs } from "node:util";
 import { CONFIG, DEFAULT_TIMEOUT, loadConfig, MIN_TIMEOUT } from "./config.js";
 import { Scan } from "./scan.js";
@@ -12,7 +13,7 @@ import { command, report, target } from "./tui/report.js";
 import { leaveScreen, out } from "./tui/terminal.js";
 import { cyan, green, yellow } from "./tui/text.js";
 import { now, sleep } from "./time.js";
-import { checkUpdate, updateNotice, VERSION } from "./update.js";
+import { checkUpdate, UPDATE_COMMAND, updateNotice, VERSION, viaNpx } from "./update.js";
 import { blockInternet, CLI, connectState, isFirewallOn, PROTOCOLS, restoreFirewall, waitForLogin, windscribe } from "./windscribe.js";
 const HELP = `Usage: windscout [options]
 
@@ -26,7 +27,7 @@ Options:
   -a, --all             also show failed attempts in the final table
   -n, --no-speed        connect-only: skip the download test, rank by latency (faster scan)
   -f, --firewall        block internet while scanning, except through the VPN (turned back off afterwards)
-  -v, --version         show the installed version (and whether a newer one is out)
+  -v, --version         show the installed version (and offer to update if a newer one is out)
   -h, --help            show this help
 
 Selection is stored in ${CONFIG}
@@ -80,8 +81,16 @@ async function main() {
         console.log(`windscout ${VERSION}`);
         await checkUpdate();
         const notice = updateNotice();
-        if (notice)
-            console.error(yellow(notice));
+        if (!notice)
+            return;
+        console.error(yellow(notice));
+        if (process.stdin.isTTY && out.isTTY && !viaNpx() && /^y(es)?$/i.test(await ask("update now? (y/n) "))) {
+            console.log(cyan(UPDATE_COMMAND));
+            // shell: npm is npm.cmd on Windows
+            const { status } = spawnSync(UPDATE_COMMAND, { shell: true, stdio: "inherit" });
+            if (status)
+                process.exitCode = status;
+        }
         return;
     }
     let timeout = a.timeout ? Number(a.timeout) : undefined;

package/dist/config.js

@@ -3,7 +3,7 @@ import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { COUNTRIES, PROTOCOLS } from "./windscribe.js";
-export const DEFAULT_TIMEOUT = 20;
+export const DEFAULT_TIMEOUT = 10;
 export const MIN_TIMEOUT = 10; // seconds; shorter cuts off connections that would have worked
 export const CONFIG = join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "windscout", "config.json");
 /** The saved choice, minus anything this version doesn't offer; null on first run or an unreadable file */

package/dist/update.js

@@ -20,9 +20,12 @@ export function checkUpdate() {
         .catch(() => { });
     return check;
 }
+// run through npx: there's nothing installed to update, the next npx windscout@latest fetches it
+export const viaNpx = () => process.env.npm_command === "exec";
+export const UPDATE_COMMAND = "npm install -g windscout@latest";
 /** "update available: …" with the command to run, once checkUpdate() found a newer version */
 export function updateNotice() {
     if (!latest)
         return null;
-    return `update available: ${VERSION} → ${latest} · run: ${process.env.npm_command === "exec" ? "npx windscout@latest" : "npm install -g windscout@latest"}`;
+    return `update available: ${VERSION} → ${latest} · run: ${viaNpx() ? "npx windscout@latest" : UPDATE_COMMAND}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windscout",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Find which Windscribe locations and protocols work from your network, ranked by speed (unofficial)",
   "type": "module",
   "bin": {