cmux-ssh-here 0.4.0 → 0.5.0

package/bin.js

@@ -33,10 +33,10 @@ const { default: pty } = await import("node-pty");
 // and an ssh client treats a leading-dash username as a flag. Hex is URL/ssh-safe.
 const TTL_SECONDS = Number(process.env.CMUX_SSH_TTL) || 180; // link/token lifetime before regeneration
 let token; // secret carried in user=<token>; rotated every TTL_SECONDS
-let remaining; // seconds until the next regeneration
+let expiry; // epoch ms when the current token expires
 const regenerateToken = () => {
   token = randomBytes(12).toString("hex");
-  remaining = TTL_SECONDS;
+  expiry = Date.now() + TTL_SECONDS * 1000;
 };
 regenerateToken();
 
@@ -251,13 +251,11 @@ const server = new Server(serverCfg, (client, info) => {
     return ctx.username === token ? ctx.accept() : ctx.reject();
   });
   client.on("ready", () => {
+    // ponytail: just track the connection; the 5s timer redraws — no per-event
+    // repaint (that was the screen-churn that broke copying).
     const id = nextSid++;
     sessions.set(id, { ip: info?.ip || "?", since: Date.now() });
-    render();
-    client.on("close", () => {
-      sessions.delete(id);
-      render();
-    });
+    client.on("close", () => sessions.delete(id));
   });
   client.on("session", (accept) => {
     const session = accept();
@@ -322,42 +320,62 @@ server.listen(PORT, "0.0.0.0", function () {
     return `https://cmux.com/deeplink/ssh?${params}`;
   };
 
-  // ponytail: in debug mode skip the screen-clearing UI so logs stay readable;
-  // just print the link whenever it rotates.
+  // ponytail: in debug mode skip the dashboard so logs stay readable.
   const liveUI = !process.env.CMUX_SSH_DEBUG;
+  const REFRESH_MS = 5000; // ponytail: 5s cadence — long enough to select & copy the link
   const ago = (since) => `${Math.floor((Date.now() - since) / 1000)}s`;
+  const remainingSec = () => Math.max(0, Math.ceil((expiry - Date.now()) / 1000));
+
+  // Decreasing progress bar for the link's remaining lifetime.
+  const bar = (rem) => {
+    const W = 28;
+    const filled = Math.round((rem / TTL_SECONDS) * W);
+    return `[${"█".repeat(filled)}${"░".repeat(W - filled)}]`;
+  };
+
+  // Collapse cmux's several SSH connections from one machine into one row per IP.
+  const sessionRows = () => {
+    const byIp = new Map();
+    for (const s of sessions.values()) {
+      const e = byIp.get(s.ip);
+      if (e) { e.count++; e.since = Math.min(e.since, s.since); }
+      else byIp.set(s.ip, { count: 1, since: s.since });
+    }
+    return [...byIp.entries()].map(
+      ([ipAddr, e]) => `    • ${ipAddr}  connected ${ago(e.since)} ago${e.count > 1 ? `  (${e.count} connections)` : ""}`
+    );
+  };
 
   render = () => {
     if (!liveUI) return;
+    const rem = remainingSec();
     const lines = [
       "",
       `  cmux-ssh-here — shell as ${user} over the LAN`,
       "",
-      `  Open in cmux (regenerates in ${remaining}s):`,
+      "  Open in cmux:",
       `  ${buildLink()}`,
       "",
+      `  Link valid  ${bar(rem)} ${rem}s`,
+      "",
     ];
-    if (sessions.size) {
-      lines.push(`  Connected sessions (${sessions.size}):`);
-      for (const s of sessions.values()) lines.push(`    • ${s.ip}  connected ${ago(s.since)} ago`);
-    } else {
-      lines.push("  No active sessions yet.");
-    }
-    lines.push("", "  Ctrl-C to stop.", "");
-    // Clear screen + home, then redraw.
-    process.stdout.write(`\x1b[2J\x1b[3J\x1b[H${lines.join("\n")}\n`);
+    const rows = sessionRows();
+    if (rows.length) lines.push(`  Connected (${rows.length}):`, ...rows);
+    else lines.push("  No active sessions yet.");
+    lines.push("", "  Updates every 5s · Ctrl-C to stop.", "");
+    // Home + clear-to-end (not full \x1b[2J): redraw in the same spot every 5s.
+    process.stdout.write(`\x1b[H\x1b[J${lines.join("\n")}\n`);
   };
 
   if (liveUI) render();
-  else console.log(`\n  Open in cmux (regenerates in ${remaining}s):\n  ${buildLink()}\n`);
+  else console.log(`\n  Open in cmux (regenerates in ${remainingSec()}s):\n  ${buildLink()}\n`);
 
-  // Tick once a second: count down, regenerate on expiry, refresh the UI.
+  // Refresh every 5s: regenerate the link when it expires, then redraw.
   setInterval(() => {
-    remaining--;
-    if (remaining <= 0) {
+    if (remainingSec() <= 0) {
       regenerateToken();
       if (!liveUI) console.log(`\n  [link regenerated]\n  ${buildLink()}\n`);
     }
     render();
-  }, 1000);
+  }, REFRESH_MS);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmux-ssh-here",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Spin up a token-auth SSH server and print a cmux deep link to connect over LAN",
   "type": "module",
   "bin": {