shell-mirror 1.5.125 → 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.125",
+  "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

@@ -189,6 +189,7 @@ function clearConnectionTimeouts() {
     if (connectionTimeoutWarning) {
         clearTimeout(connectionTimeoutWarning.timeout10s);
         clearTimeout(connectionTimeoutWarning.timeout30s);
+        clearTimeout(connectionTimeoutWarning.timeout60s);
         connectionTimeoutWarning = null;
         console.log('[CLIENT] ✅ Connection timeout warnings cleared');
     }
@@ -310,8 +311,22 @@ function startConnection() {
         }
     }, 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 };
+    connectionTimeoutWarning = { timeout10s, timeout30s, timeout60s };
 
     initialize();
 }