ghostterm 2.3.0 → 2.3.1

package/README.md

@@ -68,7 +68,7 @@ ghostterm
 
 1. First time: browser opens for Google sign-in (one-time, remembered after)
 2. Open **[ghostterm.pages.dev](https://ghostterm.pages.dev)** on your phone
-3. Sign in with the same Google account → **auto-connects, no pairing codes**
+3. Sign in with the same Google account → **auto-connects** or enter the 10-digit pairing code
 
 > Don't want to install? Use `npx ghostterm` to run without installing.
 

package/bin/ghostterm-p2p.js

@@ -1,288 +1,312 @@
-#!/usr/bin/env node
-'use strict';
-
-// Prevent crash from node-pty conpty_console_list_agent on Windows background processes
-process.on('uncaughtException', (err) => {
-  if (err.message && err.message.includes('AttachConsole')) {
-    // Ignore — this is a known node-pty issue in background mode
-    return;
-  }
-  console.error('Uncaught error:', err.message);
-});
-
-const WebSocket = require('ws');
-const { CompanionWebRTC } = require('../lib/webrtc-peer');
-const { PtyManager } = require('../lib/pty-manager');
-const { getToken, saveToken } = require('../lib/auth');
-
-// --- Configuration ---
-const DEFAULT_SIGNALING = 'wss://ghostterm-p2p-signal.fly.dev';
-const SITE_URL = 'https://ghostterm.pages.dev';
-
-const args = process.argv.slice(2);
-const signalingUrl = getArg('--signal', '-s') || DEFAULT_SIGNALING;
-const siteUrl = getArg('--site') || SITE_URL;
-const helpRequested = args.includes('--help') || args.includes('-h');
-
-function getArg(long, short) {
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === long || (short && args[i] === short)) {
-      return args[i + 1];
-    }
-  }
-  return null;
-}
-
-if (helpRequested) {
-  console.log(`
-  GhostTerm P2P - Control your terminal from your phone via WebRTC
-
-  Usage:
-    npx ghostterm-p2p [options]
-
-  Options:
-    -s, --signal <url>   Signaling server URL (default: ${DEFAULT_SIGNALING})
-    --site <url>         Mobile site URL (default: ${SITE_URL})
-    -h, --help           Show this help
-
-  How it works:
-    1. This tool connects to the signaling server and gets a 6-digit pair code
-    2. Open the mobile site on your phone and enter the code
-    3. A direct P2P WebRTC connection is established
-    4. All terminal data flows directly between your phone and PC (encrypted)
-    5. The signaling server never sees your terminal data
-  `);
-  process.exit(0);
-}
-
-// --- State ---
-let ws = null;
-let webrtc = null;
-let ptyManager = null;
-let reconnecting = false;
-let authToken = null;
-
-// --- Main ---
-
-async function start() {
-  console.log('\n  GhostTerm P2P');
-  console.log('  =============');
-
-  // Try to get auth token (optional — won't block if no login)
-  try {
-    authToken = await getToken();
-  } catch (e) {
-    console.log('  Skipping login (anonymous mode)');
-    authToken = null;
-  }
-
-  console.log('  Connecting to signaling server...');
-  connectSignaling();
-}
-
-function connectSignaling() {
-  const url = `${signalingUrl}?role=companion`;
-  ws = new WebSocket(url);
-
-  ws.on('open', () => {
-    console.log('  Connected to signaling server.');
-    reconnecting = false;
-    resetReconnectDelay();
-    // Send auth token if available
-    if (authToken) {
-      ws.send(JSON.stringify({ type: 'auth', token: authToken }));
-    }
-  });
-
-  ws.on('message', (raw) => {
-    let msg;
-    try {
-      msg = JSON.parse(raw);
-    } catch {
-      return;
-    }
-    handleSignalingMessage(msg);
-  });
-
-  ws.on('close', () => {
-    if (!reconnecting) {
-      console.log('\n  Signaling server disconnected.');
-    }
-    scheduleReconnect();
-  });
-
-  ws.on('error', (err) => {
-    if (err.code === 'ECONNREFUSED' || err.code === 'ENOTFOUND') {
-      console.error(`  Cannot reach signaling server at ${signalingUrl}`);
-    }
-  });
-}
-
-function handleSignalingMessage(msg) {
-  switch (msg.type) {
-    case 'waiting_auth':
-      // Server ready, waiting for Google auth
-      break;
-
-    case 'auth_ok':
-      console.log(`  Authenticated as: ${msg.email}`);
-      console.log(`\n  Open ${siteUrl} on your phone`);
-      console.log('  Sign in with the same Google account to connect.\n');
-      if (msg.longToken) {
-        saveToken(null, msg.longToken);
-        authToken = msg.longToken;
-      }
-      if (msg.autoPaired) {
-        console.log('  Mobile already connected! Establishing P2P...');
-      }
-      break;
-
-    case 'mobile_connected':
-      console.log('\n  Mobile device connected! Establishing P2P...');
-      initiateWebRTC();
-      break;
-
-    case 'webrtc_answer':
-    case 'webrtc_ice':
-      if (webrtc) {
-        webrtc.handleSignaling(msg);
-      }
-      break;
-
-    case 'mobile_disconnected':
-      if (webrtc && webrtc.isActive) break;
-      console.log('\n  Mobile disconnected.');
-      cleanupWebRTC();
-      break;
-
-    case 'auth_error':
-      console.error(`  Auth failed: ${msg.message}`);
-      console.error('  Try deleting ~/.ghostterm/credentials.json and restart.');
-      break;
-
-    case 'error':
-      console.error(`  Server error: ${msg.message}`);
-      break;
-  }
-}
-
-function initiateWebRTC() {
-  cleanupWebRTC();
-
-  webrtc = new CompanionWebRTC();
-  ptyManager = new PtyManager();
-
-  // Wire PTY output to WebRTC
-  ptyManager.on('send', (msg) => {
-    if (webrtc && webrtc.isActive) {
-      webrtc.send(msg);
-    }
-  });
-
-  // Wire WebRTC messages to PTY
-  webrtc.on('message', (msg) => {
-    if (msg.type === 'shutdown') {
-      console.log('\n  Shutdown requested from mobile. Bye!');
-      cleanupWebRTC();
-      if (ws) ws.close();
-      process.exit(0);
-    }
-    if (msg.type === 'resize') {
-      console.log(`  [resize] cols=${msg.cols} rows=${msg.rows} sid=${msg.sessionId || 'attached'}`);
-    }
-    if (ptyManager) {
-      const responses = ptyManager.handleMessage(msg);
-      for (const resp of responses) {
-        webrtc.send(resp);
-      }
-    }
-  });
-
-  webrtc.on('open', () => {
-    console.log('  P2P connection established! Terminal is now accessible from your phone.');
-    console.log('  All data flows directly between your devices (encrypted).');
-    console.log('  Press Ctrl+C to stop.\n');
-  });
-
-  webrtc.on('close', () => {
-    console.log('\n  P2P connection closed.');
-    cleanupPty();
-    scheduleReconnect();
-  });
-
-  webrtc.on('timeout', () => {
-    console.log('\n  P2P heartbeat timeout. Connection lost.');
-  });
-
-  webrtc.on('error', (err) => {
-    console.error(`  WebRTC error: ${err}`);
-  });
-
-  // Initiate the connection (sends offer via signaling)
-  webrtc.initiate((msg) => {
-    if (ws && ws.readyState === WebSocket.OPEN) {
-      ws.send(JSON.stringify(msg));
-    }
-  });
-}
-
-function cleanupWebRTC() {
-  if (webrtc) {
-    webrtc.removeAllListeners();
-    webrtc.close();
-    webrtc = null;
-  }
-  cleanupPty();
-}
-
-function cleanupPty() {
-  if (ptyManager) {
-    ptyManager.removeAllListeners();
-    ptyManager.destroy();
-    ptyManager = null;
-  }
-}
-
-let reconnectTimer = null;
-let reconnectDelay = 1000; // start at 1s
-const RECONNECT_MAX = 30000; // cap at 30s
-
-function scheduleReconnect() {
-  if (reconnectTimer) return;
-  reconnecting = true;
-  const delay = reconnectDelay;
-  console.log(`  Reconnecting in ${(delay / 1000).toFixed(0)}s...`);
-  reconnectTimer = setTimeout(() => {
-    reconnectTimer = null;
-    connectSignaling();
-  }, delay);
-  // Exponential backoff: 1s → 2s → 4s → 8s → 16s → 30s (capped)
-  reconnectDelay = Math.min(reconnectDelay * 2, RECONNECT_MAX);
-}
-
-function resetReconnectDelay() {
-  reconnectDelay = 1000;
-}
-
-// --- Graceful shutdown ---
-
-process.on('SIGINT', () => {
-  console.log('\n  Shutting down...');
-  cleanupWebRTC();
-  if (ws) {
-    ws.close();
-  }
-  if (reconnectTimer) {
-    clearTimeout(reconnectTimer);
-  }
-  process.exit(0);
-});
-
-process.on('SIGTERM', () => {
-  cleanupWebRTC();
-  if (ws) ws.close();
-  process.exit(0);
-});
-
-// --- Go ---
-start();
+#!/usr/bin/env node
+'use strict';
+
+// Prevent crash from node-pty conpty_console_list_agent on Windows background processes
+process.on('uncaughtException', (err) => {
+  if (err.message && err.message.includes('AttachConsole')) {
+    // Ignore — this is a known node-pty issue in background mode
+    return;
+  }
+  console.error('Uncaught error:', err.message);
+});
+
+const WebSocket = require('ws');
+const qrcode = require('qrcode-terminal');
+const { CompanionWebRTC } = require('../lib/webrtc-peer');
+const { PtyManager } = require('../lib/pty-manager');
+const { getToken, saveToken } = require('../lib/auth');
+
+// --- Configuration ---
+const DEFAULT_SIGNALING = 'wss://ghostterm-p2p-signal.fly.dev';
+const SITE_URL = 'https://ghostterm.pages.dev';
+
+const args = process.argv.slice(2);
+const signalingUrl = getArg('--signal', '-s') || DEFAULT_SIGNALING;
+const siteUrl = getArg('--site') || SITE_URL;
+const helpRequested = args.includes('--help') || args.includes('-h');
+
+function getArg(long, short) {
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === long || (short && args[i] === short)) {
+      return args[i + 1];
+    }
+  }
+  return null;
+}
+
+if (helpRequested) {
+  console.log(`
+  GhostTerm P2P - Control your terminal from your phone via WebRTC
+
+  Usage:
+    npx ghostterm-p2p [options]
+
+  Options:
+    -s, --signal <url>   Signaling server URL (default: ${DEFAULT_SIGNALING})
+    --site <url>         Mobile site URL (default: ${SITE_URL})
+    -h, --help           Show this help
+
+  How it works:
+    1. This tool connects to the signaling server and gets a 6-digit pair code
+    2. Open the mobile site on your phone and enter the code
+    3. A direct P2P WebRTC connection is established
+    4. All terminal data flows directly between your phone and PC (encrypted)
+    5. The signaling server never sees your terminal data
+  `);
+  process.exit(0);
+}
+
+// --- State ---
+let ws = null;
+let webrtc = null;
+let ptyManager = null;
+let pairCode = null;
+let reconnecting = false;
+let authToken = null; // Google or long token
+
+// --- Main ---
+
+async function start() {
+  console.log('\n  GhostTerm P2P');
+  console.log('  =============');
+
+  // Try to get auth token (optional — won't block if no login)
+  try {
+    authToken = await getToken();
+  } catch (e) {
+    console.log('  Skipping login (anonymous mode)');
+    authToken = null;
+  }
+
+  console.log('  Connecting to signaling server...');
+  connectSignaling();
+}
+
+function connectSignaling() {
+  const url = `${signalingUrl}?role=companion`;
+  ws = new WebSocket(url);
+
+  ws.on('open', () => {
+    console.log('  Connected to signaling server.');
+    reconnecting = false;
+    resetReconnectDelay();
+    // Send auth token if available
+    if (authToken) {
+      ws.send(JSON.stringify({ type: 'auth', token: authToken }));
+    }
+  });
+
+  ws.on('message', (raw) => {
+    let msg;
+    try {
+      msg = JSON.parse(raw);
+    } catch {
+      return;
+    }
+    handleSignalingMessage(msg);
+  });
+
+  ws.on('close', () => {
+    if (!reconnecting) {
+      console.log('\n  Signaling server disconnected.');
+    }
+    scheduleReconnect();
+  });
+
+  ws.on('error', (err) => {
+    if (err.code === 'ECONNREFUSED' || err.code === 'ENOTFOUND') {
+      console.error(`  Cannot reach signaling server at ${signalingUrl}`);
+    }
+  });
+}
+
+function handleSignalingMessage(msg) {
+  switch (msg.type) {
+    case 'pair_code':
+      pairCode = msg.code;
+      displayPairCode(msg.code);
+      break;
+
+    case 'mobile_connected':
+      console.log('\n  Mobile device paired! Establishing P2P connection...');
+      initiateWebRTC();
+      break;
+
+    case 'webrtc_answer':
+    case 'webrtc_ice':
+      if (webrtc) {
+        webrtc.handleSignaling(msg);
+      }
+      break;
+
+    case 'mobile_disconnected':
+      // Ignore if P2P is active — mobile closed signaling WS after P2P established (expected)
+      if (webrtc && webrtc.isActive) {
+        // P2P still alive, signaling disconnect is normal
+        break;
+      }
+      console.log('\n  Mobile disconnected.');
+      cleanupWebRTC();
+      break;
+
+    case 'pair_expired':
+      console.log('\n  Pair code expired. Reconnecting for a new code...');
+      ws.close();
+      break;
+
+    case 'auth_ok':
+      console.log(`  Authenticated as: ${msg.email}`);
+      // Save long token for future sessions
+      if (msg.longToken) {
+        saveToken(null, msg.longToken);
+        authToken = msg.longToken;
+      }
+      break;
+
+    case 'auth_error':
+      console.error(`  Auth failed: ${msg.message}`);
+      break;
+
+    case 'error':
+      console.error(`  Server error: ${msg.message}`);
+      break;
+  }
+}
+
+function displayPairCode(code) {
+  const mobileUrl = `${siteUrl}?code=${code}`;
+
+  console.log('\n  +--------------------------+');
+  console.log(`  |    Pair Code:  ${code}     |`);
+  console.log('  +--------------------------+');
+  console.log(`\n  Or scan QR code with your phone:\n`);
+
+  qrcode.generate(mobileUrl, { small: true }, (qr) => {
+    // Indent each line
+    const lines = qr.split('\n').map(l => '    ' + l).join('\n');
+    console.log(lines);
+    console.log(`\n  Mobile URL: ${mobileUrl}`);
+    console.log('\n  Waiting for phone to connect...\n');
+  });
+}
+
+function initiateWebRTC() {
+  cleanupWebRTC();
+
+  webrtc = new CompanionWebRTC();
+  ptyManager = new PtyManager();
+
+  // Wire PTY output to WebRTC
+  ptyManager.on('send', (msg) => {
+    if (webrtc && webrtc.isActive) {
+      webrtc.send(msg);
+    }
+  });
+
+  // Wire WebRTC messages to PTY
+  webrtc.on('message', (msg) => {
+    if (msg.type === 'shutdown') {
+      console.log('\n  Shutdown requested from mobile. Bye!');
+      cleanupWebRTC();
+      if (ws) ws.close();
+      process.exit(0);
+    }
+    if (msg.type === 'resize') {
+      console.log(`  [resize] cols=${msg.cols} rows=${msg.rows} sid=${msg.sessionId || 'attached'}`);
+    }
+    if (ptyManager) {
+      const responses = ptyManager.handleMessage(msg);
+      for (const resp of responses) {
+        webrtc.send(resp);
+      }
+    }
+  });
+
+  webrtc.on('open', () => {
+    console.log('  P2P connection established! Terminal is now accessible from your phone.');
+    console.log('  All data flows directly between your devices (encrypted).');
+    console.log('  Press Ctrl+C to stop.\n');
+  });
+
+  webrtc.on('close', () => {
+    console.log('\n  P2P connection closed.');
+    cleanupPty();
+    scheduleReconnect();
+  });
+
+  webrtc.on('timeout', () => {
+    console.log('\n  P2P heartbeat timeout. Connection lost.');
+  });
+
+  webrtc.on('error', (err) => {
+    console.error(`  WebRTC error: ${err}`);
+  });
+
+  // Initiate the connection (sends offer via signaling)
+  webrtc.initiate((msg) => {
+    if (ws && ws.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify(msg));
+    }
+  });
+}
+
+function cleanupWebRTC() {
+  if (webrtc) {
+    webrtc.removeAllListeners();
+    webrtc.close();
+    webrtc = null;
+  }
+  cleanupPty();
+}
+
+function cleanupPty() {
+  if (ptyManager) {
+    ptyManager.removeAllListeners();
+    ptyManager.destroy();
+    ptyManager = null;
+  }
+}
+
+let reconnectTimer = null;
+let reconnectDelay = 1000; // start at 1s
+const RECONNECT_MAX = 30000; // cap at 30s
+
+function scheduleReconnect() {
+  if (reconnectTimer) return;
+  reconnecting = true;
+  const delay = reconnectDelay;
+  console.log(`  Reconnecting in ${(delay / 1000).toFixed(0)}s...`);
+  reconnectTimer = setTimeout(() => {
+    reconnectTimer = null;
+    connectSignaling();
+  }, delay);
+  // Exponential backoff: 1s → 2s → 4s → 8s → 16s → 30s (capped)
+  reconnectDelay = Math.min(reconnectDelay * 2, RECONNECT_MAX);
+}
+
+function resetReconnectDelay() {
+  reconnectDelay = 1000;
+}
+
+// --- Graceful shutdown ---
+
+process.on('SIGINT', () => {
+  console.log('\n  Shutting down...');
+  cleanupWebRTC();
+  if (ws) {
+    ws.close();
+  }
+  if (reconnectTimer) {
+    clearTimeout(reconnectTimer);
+  }
+  process.exit(0);
+});
+
+process.on('SIGTERM', () => {
+  cleanupWebRTC();
+  if (ws) ws.close();
+  process.exit(0);
+});
+
+// --- Go ---
+start();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostterm",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Control your PC terminal from your phone — direct P2P, no server in between",
   "bin": {
     "ghostterm": "bin/ghostterm-p2p.js"
@@ -14,7 +14,8 @@
   "dependencies": {
     "node-datachannel": "^0.12.0",
     "node-pty": "^1.0.0",
-    "ws": "^8.0.0"
+    "ws": "^8.0.0",
+    "qrcode-terminal": "^0.12.0"
   },
   "engines": {
     "node": ">=18.0.0"