@miraj181/ipingyou 2.1.5 → 2.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miraj181/ipingyou",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "SecureLink-CLI — Secure peer-to-peer remote access via SSH & Cloudflare Tunnels",
   "main": "src/cli.js",
   "bin": {

package/src/lib/cleanup.js

@@ -14,7 +14,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { execaCommand } from 'execa';
-import { TMUX_SESSION_NAME, tmuxSocketArgs } from './tmux.js';
+import { TMUX_SESSION_NAME, TMUX_SESSION_PREFIX, tmuxSocketArgs } from './tmux.js';
 
 /** @type {Set<number>} — Active child PIDs we manage */
 const trackedPIDs = new Set();
@@ -192,7 +192,15 @@ export async function executePanicMode() {
     } else {
       await execaCommand('pkill -9 -f cloudflared', { reject: false });
       await execaCommand('pkill -9 -f "sshd:.*@"', { reject: false });
-      await execaCommand(`tmux ${tmuxSocketArgs().join(' ')} kill-session -t ${TMUX_SESSION_NAME}`, { reject: false });
+      await execaCommand(`tmux ${tmuxSocketArgs().join(' ')} kill-server`, { reject: false });
+      const { stdout } = await execaCommand('tmux list-sessions -F "#{session_name}"', { reject: false });
+      const legacyNames = stdout
+        .split(/\r?\n/)
+        .filter(Boolean)
+        .filter(name => name === TMUX_SESSION_NAME || name.startsWith(TMUX_SESSION_PREFIX));
+      for (const name of legacyNames) {
+        await execaCommand(`tmux kill-session -t ${name}`, { reject: false });
+      }
     }
   } catch {}
 

package/src/lib/tmux.js

@@ -1,6 +1,7 @@
 import os from 'node:os';
 import path from 'node:path';
 
+export const TMUX_SESSION_PREFIX = 'SecureLink_';
 export const TMUX_SESSION_NAME = 'SecureLink_Session';
 export const TMUX_SOCKET_PATH = path.join(os.tmpdir(), 'ipingyou-tmux.sock');
 
@@ -11,3 +12,12 @@ export function tmuxSocketArgs() {
 export function tmuxSocketCommand() {
   return `tmux -S ${TMUX_SOCKET_PATH}`;
 }
+
+export function buildTmuxSessionName(label) {
+  const safeLabel = String(label || 'client')
+    .replace(/[^a-zA-Z0-9_-]/g, '')
+    .slice(0, 24) || 'client';
+  const stamp = Date.now().toString(36);
+  const rand = Math.random().toString(36).slice(2, 6);
+  return `${TMUX_SESSION_PREFIX}${safeLabel}_${stamp}${rand}`;
+}

package/src/modes/client.js

@@ -25,7 +25,7 @@ import { pushTelemetry, requestHostApproval, resolveUID, revokeUID, waitForAppro
 import { calculateChecksum } from '../lib/checksum.js';
 import { promptLocalPath, promptRemotePath } from '../lib/path-browser.js';
 import { buildSshArgs, extractHostname, formatScpRemotePath, getKnownHostsOptions, getSshControlOptions, quoteRemoteShell } from '../lib/ssh.js';
-import { TMUX_SESSION_NAME, tmuxSocketCommand } from '../lib/tmux.js';
+import { buildTmuxSessionName, tmuxSocketCommand } from '../lib/tmux.js';
 import open from 'open';
 import { cleanupSessionLog, initSessionLog, logSessionEvent, recordEvent } from '../lib/session-log.js';
 
@@ -88,8 +88,9 @@ async function connectSSH(username, hostname, privateKeyPath, persistKnownHosts
     ], { persistKnownHosts });
 
     sshArgs.push(`${username}@${hostname}`);
-    const tmuxPrepare = `${tmuxSocketCommand()} has-session -t ${TMUX_SESSION_NAME} 2>/dev/null || ${tmuxSocketCommand()} new-session -d -s ${TMUX_SESSION_NAME}`;
-    const tmuxAttach = `${tmuxSocketCommand()} attach -t ${TMUX_SESSION_NAME}`;
+    const tmuxSession = buildTmuxSessionName(username);
+    const tmuxPrepare = `${tmuxSocketCommand()} has-session -t ${tmuxSession} 2>/dev/null || ${tmuxSocketCommand()} new-session -d -s ${tmuxSession}`;
+    const tmuxAttach = `${tmuxSocketCommand()} attach -t ${tmuxSession}`;
     sshArgs.push('-t', `${tmuxPrepare} && ${tmuxAttach} || exec $SHELL -l`);
 
     const child = execa('ssh', sshArgs, {

package/src/modes/host.js

@@ -29,7 +29,7 @@ import { startChatServer, openLocalChatUI } from '../lib/chat.js';
 import { spawnTunnelSupervised } from '../lib/tunnel.js';
 import { decideApprovalRequest, fetchApprovalRequests, pingBroker, registerWithBroker, revokeUID } from '../lib/broker.js';
 import { cleanupSessionLog, getSessionLogPath, initSessionLog, logSessionEvent, recordEvent } from '../lib/session-log.js';
-import { TMUX_SESSION_NAME, tmuxSocketArgs } from '../lib/tmux.js';
+import { TMUX_SESSION_NAME, TMUX_SESSION_PREFIX, tmuxSocketArgs } from '../lib/tmux.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 let BROKER_URL = process.env.BROKER_URL || 'https://ipingyou.onrender.com';
@@ -139,6 +139,37 @@ async function ensureTmuxInstalled() {
           throw new Error('Homebrew is required to install tmux on macOS');
         }
       }
+
+      function isSecureLinkSession(name) {
+        return name === TMUX_SESSION_NAME || name.startsWith(TMUX_SESSION_PREFIX);
+      }
+
+      async function listTmuxSessions(socketArgs = []) {
+        const result = await execa('tmux', [...socketArgs, 'list-sessions', '-F', '#{session_name}|#{session_created}'], { reject: false });
+        if (result.exitCode !== 0) return [];
+        return result.stdout
+          .split(/\r?\n/)
+          .filter(Boolean)
+          .map(line => {
+            const [name, createdAt] = line.split('|');
+            return { name, createdAt: Number(createdAt) || null };
+          });
+      }
+
+      async function getMirrorableSessions() {
+        const sessions = [];
+        const customSessions = await listTmuxSessions(tmuxSocketArgs());
+        customSessions
+          .filter(s => isSecureLinkSession(s.name))
+          .forEach(s => sessions.push({ ...s, socketArgs: tmuxSocketArgs(), source: 'custom' }));
+
+        const legacySessions = await listTmuxSessions();
+        legacySessions
+          .filter(s => isSecureLinkSession(s.name))
+          .forEach(s => sessions.push({ ...s, socketArgs: [], source: 'legacy' }));
+
+        return sessions;
+      }
     }
   } catch (err) {
     spinner.fail(`tmux check/install failed: ${err.message}`);
@@ -811,16 +842,32 @@ async function hostDashboard(uid, password, serviceConfig, tunnelProcess, sessio
 
           try {
             await execaCommand('tmux -V', { reject: true });
-            const sessionCheck = await execa('tmux', [...tmuxSocketArgs(), 'has-session', '-t', TMUX_SESSION_NAME], { reject: false });
-            if (sessionCheck.exitCode !== 0) {
+            const sessions = await getMirrorableSessions();
+            if (sessions.length === 0) {
               console.log(chalk.yellow('  ⚠️  No mirrored terminal session is active yet.'));
               console.log(chalk.dim('     A client must choose "Connect via SSH" first. SCP-only clients do not create a tmux session.'));
               console.log(chalk.dim('     tmux is needed on the host machine only; the client does not need tmux.'));
               logSessionEvent('host_mirror_missing_session', {}, 'warn');
               return waitForAction();
             }
-            await execa('tmux', [...tmuxSocketArgs(), 'attach', '-t', TMUX_SESSION_NAME, '-r'], { stdio: 'inherit', reject: false });
-            logSessionEvent('host_mirror_attached');
+
+            let target = sessions[0];
+            if (sessions.length > 1) {
+              const { sessionChoice } = await inquirer.prompt([{
+                type: 'list',
+                name: 'sessionChoice',
+                message: 'Select an active client session to mirror:',
+                choices: sessions.map((s, idx) => {
+                  const created = s.createdAt ? new Date(s.createdAt * 1000).toLocaleTimeString() : 'Unknown';
+                  const label = `${s.name} ${chalk.dim(`(started ${created})`)}`;
+                  return { name: label, value: String(idx) };
+                }),
+              }]);
+              target = sessions[parseInt(sessionChoice, 10)] || sessions[0];
+            }
+
+            await execa('tmux', [...target.socketArgs, 'attach', '-t', target.name, '-r'], { stdio: 'inherit', reject: false });
+            logSessionEvent('host_mirror_attached', { session: target.name, source: target.source });
           } catch (err) {
             console.log(chalk.yellow('  ⚠️  Could not attach to tmux.'));
             console.log(chalk.dim(`     ${err.message}`));
@@ -884,7 +931,13 @@ async function hostDashboard(uid, password, serviceConfig, tunnelProcess, sessio
               await execaCommand('powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter \\"name = \'sshd.exe\'\\" | Where-Object { $_.CommandLine -match \'sshd:.*@\' } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }"', { reject: false });
             } else {
               await execaCommand("pkill -f 'sshd:.*@'", { shell: true, reject: false });
-              await execa('tmux', [...tmuxSocketArgs(), 'kill-session', '-t', TMUX_SESSION_NAME], { reject: false });
+              await execa('tmux', [...tmuxSocketArgs(), 'kill-server'], { reject: false });
+              const legacySessions = await listTmuxSessions();
+              for (const session of legacySessions) {
+                if (isSecureLinkSession(session.name)) {
+                  await execa('tmux', ['kill-session', '-t', session.name], { reject: false });
+                }
+              }
             }
             spinner.succeed('All client SSH sessions terminated');
             logSessionEvent('host_sessions_terminated');