windscout 0.5.7 → 0.5.8

package/README.md

@@ -52,6 +52,7 @@ Run `windscout` with no arguments to open the interactive picker:
 | `1`–`6` | toggle a protocol (`1`–`5` on Linux, which has no IKEv2) |
 | `s` | toggle the speed test (off = connect-only mode) |
 | `f` | toggle "block internet while scanning" (firewall) |
+| `r` | toggle random order: scan the selected countries shuffled, a new order each run |
 | `u` | update to the newer version and restart (only when the picker shows one is out) |
 | `enter` | start scanning |
 | `q` | quit (during a scan: stop and show partial results; press again to force quit) |
@@ -80,6 +81,7 @@ windscout -t 40 -a                          # longer connect timeout, also list
 | `-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 |
+| `-r, --random` | scan the countries in a random order | picker: saved, or off; with `-c`: off |
 | `-v, --version` | print the installed version; if a newer one is on npm, show the update command (with `sudo` when needed) and ask (y/n) to run it | |
 
 ## Connect-only mode

package/dist/cli.js

@@ -27,6 +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)
+  -r, --random          scan the countries in a random order
   -v, --version         show the installed version (and offer to update if a newer one is out)
   -h, --help            show this help
 
@@ -83,6 +84,7 @@ async function main() {
             version: { type: "boolean", short: "v", default: false },
             "no-speed": { type: "boolean", short: "n", default: false },
             firewall: { type: "boolean", short: "f", default: false },
+            random: { type: "boolean", short: "r", default: false },
         },
     });
     if (a.help)
@@ -104,6 +106,7 @@ async function main() {
     let protocols = a.protocols ? list(a.protocols) : undefined;
     let speedTest = !a["no-speed"];
     let firewall = a.firewall;
+    let random = a.random;
     if (!countries) {
         if (!tty)
             throw new Error("no terminal for the picker: pass countries with -c");
@@ -115,6 +118,7 @@ async function main() {
             speedTest: speedTest && (saved?.speed ?? false), // first run: connect-only
             // already on in the app: show it on, since the scan won't turn it off
             firewall: firewall || isFirewallOn(status) || (saved?.firewall ?? false),
+            random: random || (saved?.random ?? false),
         });
         if (!choice)
             return;
@@ -124,10 +128,13 @@ async function main() {
         protocols ??= choice.protocols;
         speedTest = choice.speed;
         firewall = choice.firewall;
+        random = choice.random;
         timeout = choice.timeout;
     }
     protocols ??= PROTOCOLS;
     timeout ??= DEFAULT_TIMEOUT;
+    if (random)
+        countries = countries.map((c) => [Math.random(), c]).sort(([x], [y]) => x - y).map(([, c]) => c);
     const scan = new Scan(countries, protocols, { timeout, speedTest });
     const blocking = firewall && (await blockInternet());
     const view = tty ? showProgress(scan, blocking) : logProgress(scan);

package/dist/config.js

@@ -15,6 +15,7 @@ export function loadConfig() {
             protocols: (c.protocols ?? []).filter((x) => PROTOCOLS.includes(x)),
             speed: c.speed !== false,
             firewall: c.firewall === true,
+            random: c.random === true,
             timeout: c.timeout >= MIN_TIMEOUT ? c.timeout : DEFAULT_TIMEOUT,
         };
     }

package/dist/tui/picker.js

@@ -9,7 +9,7 @@ import { bold, cyan, dim, green, under, vw, yellow } from "./text.js";
 import { box, centerIn, grid } from "./widgets.js";
 const flip = (set, value) => (set.has(value) ? set.delete(value) : set.add(value));
 /** Resolves to the choice (also saved for next time), null when the user quits, or "update" for u */
-export function pick(saved, { timeout, speedTest, firewall }) {
+export function pick(saved, { timeout, speedTest, firewall, random }) {
     const selected = new Set(saved?.countries ?? []);
     const protos = new Set(saved?.protocols.length ? saved.protocols : PROTOCOLS);
     let cursor = 0, top = 0, message = "", query = "", searching = false;
@@ -25,7 +25,7 @@ export function pick(saved, { timeout, speedTest, firewall }) {
             const rows = out.rows || 24;
             const version = versionLines(true);
             const matches = visible();
-            const height = Math.max(3, rows - 21 - version.length);
+            const height = Math.max(3, rows - 22 - version.length);
             cursor = Math.max(0, Math.min(cursor, matches.length - 1));
             if (cursor < top)
                 top = cursor;
@@ -40,6 +40,9 @@ export function pick(saved, { timeout, speedTest, firewall }) {
             const fwLine = `${dim(under("f"))} ${firewall ? green("● " + fwLabel) : dim("○ " + fwLabel)}  ${dim(firewall
                 ? "only VPN traffic gets through"
                 : "off: apps may leak in between")}`;
+            const randomLine = `${dim(under("r"))} ${random ? green("● random order") : dim("○ random order")}  ${dim(random
+                ? "scans the countries shuffled, a new order each run"
+                : "off: scans in list order")}`;
             timeout = Number(seconds);
             const short = timeout < MIN_TIMEOUT;
             const timeoutLine = `${dim(under("t"))} timeout ${editing ? bold(seconds) + cyan("▏") : (short ? yellow : bold)(seconds || "?")} s  ${dim(`per connection · at least ${MIN_TIMEOUT}`)}`;
@@ -63,9 +66,9 @@ export function pick(saved, { timeout, speedTest, firewall }) {
                 ["quit", under("Q") + "uit"],
             ];
             const buttonLine = buttons.map(([id, label]) => (id === "start" ? bold(cyan(`[ ${label} ]`)) : dim(`[ ${label} ]`))).join("  ");
-            const table = grid([{ title: "" }, { title: "Code" }, { title: "Country" }], body, { caption: search, captionRight: dim(range), minWidth: Math.max(vw(protoLine), vw(speedLine), vw(fwLine), vw(timeoutLine)) + 4 });
+            const table = grid([{ title: "" }, { title: "Code" }, { title: "Country" }], body, { caption: search, captionRight: dim(range), minWidth: Math.max(vw(protoLine), vw(speedLine), vw(fwLine), vw(randomLine), vw(timeoutLine)) + 4 });
             const width = vw(table[0]);
-            const head = box([protoLine, speedLine, fwLine, timeoutLine], {
+            const head = box([protoLine, speedLine, fwLine, randomLine, timeoutLine], {
                 title: bold(cyan("WindScout")),
                 right: `${bold(String(selected.size))}${dim(`/${COUNTRIES.length} selected`)}`,
                 width: width - 4,
@@ -85,7 +88,7 @@ export function pick(saved, { timeout, speedTest, firewall }) {
                     : searching
                         ? "type to filter · ↑↓ move · enter/esc done"
                         : `↑↓ move · space select · a/n ${query ? "all/none shown" : "all/none"} · / search`), width),
-                centerIn(dim(searching || editing ? "" : `1-${PROTOCOLS.length} protocols · s speed test · f firewall · t timeout · enter start · ${query ? "esc clear · " : ""}q quit`), width),
+                centerIn(dim(searching || editing ? "" : `1-${PROTOCOLS.length} protocols · s speed test · f firewall · r random · t timeout · enter start · ${query ? "esc clear · " : ""}q quit`), width),
             ];
             if (message)
                 lines.push(centerIn(yellow(message), width));
@@ -107,7 +110,7 @@ export function pick(saved, { timeout, speedTest, firewall }) {
                 return range;
             });
             hit = {
-                protoRow: at.top + 1, protoHits, speedRow: at.top + 2, firewallRow: at.top + 3, timeoutRow: at.top + 4,
+                protoRow: at.top + 1, protoHits, speedRow: at.top + 2, firewallRow: at.top + 3, randomRow: at.top + 4, timeoutRow: at.top + 5,
                 searchRow: at.top + head.length + 1,
                 firstRow: at.top + head.length + 5, shown: shown.length,
                 buttonRow: at.top + head.length + table.length + 1, buttonHits,
@@ -139,6 +142,7 @@ export function pick(saved, { timeout, speedTest, firewall }) {
                 protocols: PROTOCOLS.filter((p) => protos.has(p)),
                 speed: speedTest,
                 firewall,
+                random,
                 timeout,
             };
             saveConfig(choice);
@@ -178,6 +182,8 @@ export function pick(saved, { timeout, speedTest, firewall }) {
                     speedTest = !speedTest;
                 else if (y === hit.firewallRow)
                     firewall = !firewall;
+                else if (y === hit.randomRow)
+                    random = !random;
                 else if (y === hit.buttonRow) {
                     const id = hit.buttonHits.find(([, a, b]) => x >= a && x < b)?.[0];
                     if (id === "start" && start())
@@ -253,6 +259,8 @@ export function pick(saved, { timeout, speedTest, firewall }) {
                 speedTest = !speedTest;
             else if (k === "f")
                 firewall = !firewall;
+            else if (k === "r")
+                random = !random;
             else if (k === "t")
                 editing = true, seconds = "";
             else if (k === "u" && canUpdate())

package/package.json

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