shell-mirror 1.5.124 → 1.5.126

package/mac-agent/agent.js

@@ -807,15 +807,79 @@ async function createPeerConnection(clientId) {
   };
 }
 
-function cleanup(clientId = null) {
+async function cleanup(clientId = null) {
   // Disconnect client from session manager
   if (clientId) {
     sessionManager.disconnectClient(clientId);
   } else {
-    // Full agent shutdown - stop heartbeat system
+    // Full agent shutdown - send final heartbeat with empty sessions BEFORE stopping heartbeat
+    logToFile('[AGENT] Sending final heartbeat with empty sessions before shutdown...');
+
+    if (heartbeatInterval) {
+      const finalHeartbeatData = JSON.stringify({
+        agentId: AGENT_ID,
+        timestamp: Date.now(),
+        activeSessions: 0,
+        sessions: [], // Empty session list to clear dashboard
+        localPort: process.env.LOCAL_PORT || 8080,
+        capabilities: ['webrtc', 'direct_websocket'],
+        status: 'shutting_down'
+      });
+
+      const options = {
+        hostname: 'shellmirror.app',
+        port: 443,
+        path: '/php-backend/api/agent-heartbeat.php',
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Content-Length': Buffer.byteLength(finalHeartbeatData),
+          'X-Agent-Secret': 'mac-agent-secret-2024',
+          'X-Agent-ID': AGENT_ID
+        }
+      };
+
+      try {
+        await new Promise((resolve, reject) => {
+          const req = https.request(options, (res) => {
+            let responseData = '';
+            res.on('data', (chunk) => {
+              responseData += chunk;
+            });
+            res.on('end', () => {
+              if (res.statusCode === 200) {
+                logToFile('[AGENT] ✅ Sent final heartbeat with empty sessions');
+                resolve();
+              } else {
+                logToFile(`[AGENT] ⚠️ Final heartbeat HTTP error: ${res.statusCode}`);
+                resolve(); // Continue shutdown even if heartbeat fails
+              }
+            });
+          });
+
+          req.on('error', (error) => {
+            logToFile(`[AGENT] ❌ Failed to send final heartbeat: ${error.message}`);
+            resolve(); // Continue shutdown even if heartbeat fails
+          });
+
+          req.setTimeout(5000, () => {
+            req.destroy();
+            logToFile('[AGENT] ⚠️ Final heartbeat timed out after 5s');
+            resolve(); // Continue shutdown even if heartbeat times out
+          });
+
+          req.write(finalHeartbeatData);
+          req.end();
+        });
+      } catch (error) {
+        logToFile(`[AGENT] ❌ Error sending final heartbeat: ${error.message}`);
+      }
+    }
+
+    // Now stop heartbeat system
     stopHeartbeatSystem();
   }
-  
+
   if (dataChannel) {
     dataChannel.close();
     dataChannel = null;
@@ -1058,17 +1122,17 @@ function sendMessage(message) {
 }
 
 // Graceful shutdown handling
-process.on('SIGINT', () => {
+process.on('SIGINT', async () => {
   console.log('\n[AGENT] Shutting down gracefully...');
-  cleanup();
+  await cleanup();
   if (ws) ws.close();
   if (localServer) localServer.close();
   process.exit(0);
 });
 
-process.on('SIGTERM', () => {
+process.on('SIGTERM', async () => {
   console.log('\n[AGENT] Received SIGTERM, shutting down...');
-  cleanup();
+  await cleanup();
   if (ws) ws.close();
   if (localServer) localServer.close();
   process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shell-mirror",
-  "version": "1.5.124",
+  "version": "1.5.126",
   "description": "Access your Mac shell from any device securely. Perfect for mobile coding with Claude Code CLI, Gemini CLI, and any shell tool.",
   "main": "server.js",
   "bin": {

package/public/app/terminal.js

@@ -56,6 +56,10 @@ let currentSession = null;
 let availableSessions = [];
 let requestedSessionId = null; // For connecting to specific session from URL
 
+// Connection status messaging
+let connectionStatusMessage = 'Connecting to agent...';
+let connectionTimeoutWarning = null;
+
 // Chunk reassembly for large messages
 const chunkAssembler = {
     activeChunks: new Map(),
@@ -166,6 +170,31 @@ function updateConnectionStatus(status) {
     // else: disconnected (default red)
 }
 
+// Set connection status message (shown in tab bar when no sessions)
+function setConnectionMessage(message, writeToTerminal = true) {
+    connectionStatusMessage = message;
+    console.log('[CLIENT] 📢 Connection message:', message);
+
+    // Update the tab bar display
+    updateSessionDisplay();
+
+    // Optionally write to terminal for visibility
+    if (writeToTerminal && term) {
+        term.write(`\r\n\x1b[36m${message}\x1b[0m\r\n`); // Cyan color
+    }
+}
+
+// Clear connection timeout warnings (called when connection succeeds)
+function clearConnectionTimeouts() {
+    if (connectionTimeoutWarning) {
+        clearTimeout(connectionTimeoutWarning.timeout10s);
+        clearTimeout(connectionTimeoutWarning.timeout30s);
+        clearTimeout(connectionTimeoutWarning.timeout60s);
+        connectionTimeoutWarning = null;
+        console.log('[CLIENT] ✅ Connection timeout warnings cleared');
+    }
+}
+
 // Cleanup timer for chunk assembler
 setInterval(() => {
     chunkAssembler.cleanup();
@@ -244,6 +273,9 @@ function startConnection() {
     terminalContainer.classList.add('show');
     term.open(document.getElementById('terminal'));
 
+    // Show initial connection message
+    setConnectionMessage('🔗 Connecting to agent...', true);
+
     // Initialize session display (shows header with connection status even before session exists)
     updateSessionDisplay();
 
@@ -262,6 +294,40 @@ function startConnection() {
         fitAddon.fit();
         term.focus(); // Ensure cursor is visible even before connection
     }, 100);
+
+    // Set up connection timeout warnings
+    const timeout10s = setTimeout(() => {
+        if (!currentSession) {
+            setConnectionMessage('⏱️ Taking longer than usual... Please wait', true);
+            term.write('\r\n\x1b[33m⏱️ Connection is taking longer than expected...\x1b[0m\r\n');
+        }
+    }, 10000);
+
+    const timeout30s = setTimeout(() => {
+        if (!currentSession) {
+            setConnectionMessage('⚠️ Connection very slow - Agent may be offline', true);
+            term.write('\x1b[33m⚠️ Still trying to connect. The agent may be offline or unreachable.\x1b[0m\r\n');
+            term.write('\x1b[36m💡 Tip: Check the agent status on the Dashboard\x1b[0m\r\n');
+        }
+    }, 30000);
+
+    const timeout60s = setTimeout(() => {
+        if (!currentSession) {
+            updateConnectionStatus('disconnected');
+            setConnectionMessage('❌ Failed to connect - Agent or session unavailable', false);
+            term.write('\r\n\r\n\x1b[31m❌ Connection Failed\x1b[0m\r\n');
+            term.write('\x1b[33mThe agent or session you requested is not available.\x1b[0m\r\n');
+            term.write('\r\n\x1b[36mPossible reasons:\x1b[0m\r\n');
+            term.write('  • Agent is offline or shut down\r\n');
+            term.write('  • Session was terminated\r\n');
+            term.write('  • Network connectivity issues\r\n');
+            term.write('\r\n\x1b[36m💡 Click Dashboard to return and try another session\x1b[0m\r\n');
+        }
+    }, 60000);
+
+    // Store timeout IDs so they can be cleared on successful connection
+    connectionTimeoutWarning = { timeout10s, timeout30s, timeout60s };
+
     initialize();
 }
 
@@ -275,17 +341,20 @@ async function initialize() {
     
     if (directConnectionSuccess) {
         console.log('[CLIENT] ✅ Direct connection established - no server needed!');
+        setConnectionMessage('✅ Connected via local network!', true);
         return;
     }
-    
+
     console.log('[CLIENT] ⚠️ Direct connection failed, falling back to WebRTC signaling...');
+    setConnectionMessage('🌐 Attempting WebRTC connection...', true);
     await initializeWebRTCSignaling();
 }
 
 async function tryDirectConnection() {
     console.log('[CLIENT] 🔗 Attempting direct connection to agent...');
     updateConnectionStatus('connecting');
-    
+    setConnectionMessage('🔍 Trying direct connection to local network...', true);
+
     // Get agent data from API to find local connection details
     try {
         const response = await fetch('/php-backend/api/agents-list.php', {
@@ -394,6 +463,10 @@ function setupDirectConnection(directWs) {
             case 'session_created':
                 console.log('[CLIENT] ✅ Direct session created:', data.sessionId);
 
+                // Clear connection timeout warnings
+                clearConnectionTimeouts();
+                setConnectionMessage('✅ Session created successfully!', false);
+
                 // Update current session
                 currentSession = {
                     id: data.sessionId,
@@ -570,6 +643,10 @@ async function initializeWebRTCSignaling() {
 
                             // Handle session assignment from agent
                             if (nextData.sessionId) {
+                                // Clear connection timeout warnings
+                                clearConnectionTimeouts();
+                                setConnectionMessage('✅ Session connected!', false);
+
                                 currentSession = {
                                     id: nextData.sessionId,
                                     name: nextData.sessionName || 'Terminal Session',
@@ -577,7 +654,7 @@ async function initializeWebRTCSignaling() {
                                 };
                                 console.log('[CLIENT] 📋 Session assigned:', currentSession);
                                 console.log('[CLIENT] 🔍 Agent ID for storage:', AGENT_ID);
-                                
+
                                 // Update UI to show session info
                                 updateSessionDisplay();
                                 
@@ -793,6 +870,7 @@ async function createPeerConnection() {
                 console.log('[CLIENT] ❌ ICE connection failed - no viable candidates');
                 console.log('[CLIENT] 💡 Troubleshooting: This may be due to firewall/NAT issues or blocked STUN servers');
                 updateConnectionStatus('disconnected');
+                setConnectionMessage('❌ Unable to connect - Agent may be offline', false);
                 term.write('\r\n\r\n❌ Connection failed: Network connectivity issues\r\n');
                 term.write('💡 This may be due to:\r\n');
                 term.write('  • Firewall blocking WebRTC traffic\r\n');
@@ -1043,8 +1121,8 @@ function renderTabs() {
         // Add new session button only when we have sessions
         tabsHTML += '<button class="session-tab-new" onclick="createNewSession()" title="New Session">+</button>';
     } else {
-        // No sessions available - show status message
-        tabsHTML = '<div style="color: #888; font-size: 0.85rem; padding: 6px 12px;">No sessions available</div>';
+        // No sessions - show connection status message
+        tabsHTML = `<div style="color: #888; font-size: 0.85rem; padding: 6px 12px;">${connectionStatusMessage}</div>`;
     }
 
     tabBar.innerHTML = tabsHTML;