cli-tunnel 1.3.1-beta.1 → 1.3.1-beta.3

package/dist/index.js

@@ -23,6 +23,10 @@ import http from 'node:http';
 import readline from 'node:readline';
 import { WebSocketServer, WebSocket } from 'ws';
 import os from 'node:os';
+import headlessPkg from '@xterm/headless';
+const HeadlessTerminal = headlessPkg.Terminal;
+import serializePkg from '@xterm/addon-serialize';
+const SerializeAddon = serializePkg.SerializeAddon;
 import { redactSecrets } from './redact.js';
 // F-15: Global error handlers to prevent unclean crashes
 process.on('uncaughtException', (err) => {
@@ -58,7 +62,7 @@ ${BOLD}Options:${RESET}
   --local            Disable devtunnel (localhost only)
   --port <n>         Bridge port (default: random)
   --name <name>      Session name (shown in dashboard)
-  --no-replay        Disable replay buffer (on by default)
+  --replay           (deprecated, screen buffer is always on)
   --help, -h         Show this help
 
 ${BOLD}Examples:${RESET}
@@ -187,7 +191,6 @@ setInterval(() => {
 }, 30000);
 // ─── Security: Redact secrets from replay events ────────────
 // ─── Bridge server ──────────────────────────────────────────
-const acpEventLog = [];
 const connections = new Map();
 let localResizeAt = 0; // Timestamp of last local terminal resize
 // #10: Session TTL enforcement — periodically close expired connections
@@ -526,12 +529,10 @@ wss.on('connection', (ws, req) => {
     // F-10: WS ping/pong heartbeat
     ws._isAlive = true;
     ws.on('pong', () => { ws._isAlive = true; });
-    // Replay history with secrets redacted (only if replay is enabled)
-    if (hasReplay) {
-        for (const event of acpEventLog) {
-            ws.send(JSON.stringify({ type: '_replay', data: redactSecrets(event) }));
-        }
-        ws.send(JSON.stringify({ type: '_replay_done' }));
+    // Send current screen state so new clients see what's on the terminal now
+    const screenState = getScreenState();
+    if (screenState) {
+        ws.send(JSON.stringify({ type: 'pty', data: screenState }));
     }
     ws.on('message', (data) => {
         // F-13: Enforce WS message rate limit (100 msg/sec)
@@ -565,6 +566,8 @@ wss.on('connection', (ws, req) => {
                 const localRecentlyResized = Date.now() - localResizeAt < 2000;
                 if (Number.isFinite(cols) && Number.isFinite(rows) && ptyProcess && !localRecentlyResized) {
                     ptyProcess.resize(Math.max(1, Math.min(500, cols)), Math.max(1, Math.min(200, rows)));
+                    if (screenTerminal)
+                        screenTerminal.resize(Math.max(1, Math.min(500, cols)), Math.max(1, Math.min(200, rows)));
                 }
             }
         }
@@ -587,20 +590,26 @@ setInterval(() => {
         ws.ping();
     }
 }, 30000);
-// F-12: Cap per-entry replay buffer size (64KB)
-const MAX_REPLAY_ENTRY_SIZE = 65536;
+// Screen buffer: headless xterm.js terminal that tracks the current screen state
+// On client connect, serialize the screen and send it — renders correctly regardless of dimensions
+let screenTerminal = null;
+let serializeAddon = null;
+function initScreenBuffer(cols, rows) {
+    screenTerminal = new HeadlessTerminal({ cols, rows, scrollback: 1000, allowProposedApi: true });
+    serializeAddon = new SerializeAddon();
+    screenTerminal.loadAddon(serializeAddon);
+}
+function getScreenState() {
+    if (!serializeAddon)
+        return '';
+    return serializeAddon.serialize();
+}
 function broadcast(data) {
-    // F-01: Redact secrets from live broadcast (not just replay)
     const redacted = redactSecrets(data);
+    // Feed into headless terminal to track screen state
+    if (screenTerminal)
+        screenTerminal.write(redacted);
     const msg = JSON.stringify({ type: 'pty', data: redacted });
-    if (hasReplay) {
-        // F-12: Cap per-entry size to prevent memory exhaustion
-        if (msg.length <= MAX_REPLAY_ENTRY_SIZE) {
-            acpEventLog.push(msg);
-        }
-        if (acpEventLog.length > 2000)
-            acpEventLog.splice(0, acpEventLog.length - 2000);
-    }
     for (const [, ws] of connections) {
         if (ws.readyState === WebSocket.OPEN)
             ws.send(msg);
@@ -869,6 +878,8 @@ async function main() {
         cols, rows, cwd,
         env: safeEnv,
     });
+    // Initialize headless terminal for screen state tracking
+    initScreenBuffer(cols, rows);
     // Detect CSPRNG crash (rare Node.js + PTY issue) and show helpful message
     let earlyExitCode = null;
     const earlyExitCheck = new Promise((resolve) => {
@@ -906,6 +917,7 @@ async function main() {
         process.stdin.setRawMode(true);
     process.stdin.resume();
     process.stdin.on('data', (data) => ptyProcess.write(data.toString()));
-    process.stdout.on('resize', () => { localResizeAt = Date.now(); ptyProcess.resize(process.stdout.columns || 120, process.stdout.rows || 30); });
+    process.stdout.on('resize', () => { localResizeAt = Date.now(); const c = process.stdout.columns || 120; const r = process.stdout.rows || 30; ptyProcess.resize(c, r); if (screenTerminal)
+        screenTerminal.resize(c, r); });
 }
 main().catch((err) => { console.error(err); process.exit(1); });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-tunnel",
-  "version": "1.3.1-beta.1",
+  "version": "1.3.1-beta.3",
   "description": "Tunnel any CLI app to your phone — PTY + devtunnel + xterm.js",
   "type": "module",
   "main": "dist/index.js",
@@ -36,6 +36,8 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
+    "@xterm/addon-serialize": "^0.14.0",
+    "@xterm/headless": "^6.0.0",
     "node-pty": "1.1.0",
     "qrcode-terminal": "0.12.0",
     "ws": "8.19.0"