cmux-ssh-here 0.4.1 → 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();
@@ -324,16 +322,18 @@ server.listen(PORT, "0.0.0.0", function () {
 
   // 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));
 
-  // ponytail: never clear the whole screen (that wipes the user's selection and
-  // makes the link impossible to copy). Repaint the static block only on real
-  // events (link rotation, session add/remove); the per-second countdown rewrites
-  // just its own line via "\r", leaving the link above untouched and selectable.
-  const countdownLine = () => `  ↻ Link regenerates in ${remaining}s — copy it above. Ctrl-C to stop.`;
+  // 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 the raw SSH connections (cmux opens several from one machine:
-  // ControlMaster, the daemon channel, short-lived probes) into one row per IP.
+  // 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()) {
@@ -346,7 +346,9 @@ server.listen(PORT, "0.0.0.0", function () {
     );
   };
 
-  const block = () => {
+  render = () => {
+    if (!liveUI) return;
+    const rem = remainingSec();
     const lines = [
       "",
       `  cmux-ssh-here — shell as ${user} over the LAN`,
@@ -354,33 +356,26 @@ server.listen(PORT, "0.0.0.0", function () {
       "  Open in cmux:",
       `  ${buildLink()}`,
       "",
+      `  Link valid  ${bar(rem)} ${rem}s`,
+      "",
     ];
     const rows = sessionRows();
     if (rows.length) lines.push(`  Connected (${rows.length}):`, ...rows);
     else lines.push("  No active sessions yet.");
-    lines.push("");
-    return lines.join("\n");
-  };
-
-  // Repaint the block, then leave the cursor parked on the countdown line.
-  render = () => {
-    if (!liveUI) return;
-    process.stdout.write(`\n${block()}\n${countdownLine()}`);
+    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`);
 
+  // Refresh every 5s: regenerate the link when it expires, then redraw.
   setInterval(() => {
-    remaining--;
-    if (remaining <= 0) {
+    if (remainingSec() <= 0) {
       regenerateToken();
-      // Link changed: repaint the whole block (rare — once per TTL).
-      if (liveUI) render();
-      else console.log(`\n  [link regenerated]\n  ${buildLink()}\n`);
-      return;
+      if (!liveUI) console.log(`\n  [link regenerated]\n  ${buildLink()}\n`);
     }
-    // Common case: rewrite only the countdown line in place — no screen churn.
-    if (liveUI) process.stdout.write(`\r\x1b[2K${countdownLine()}`);
-  }, 1000);
+    render();
+  }, REFRESH_MS);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmux-ssh-here",
-  "version": "0.4.1",
+  "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": {