shell-mirror 1.5.23 → 1.5.24

package/lib/auto-start.js

@@ -445,68 +445,25 @@ WS_URL=${wsConfig.wsUrl}` : ''}
 
   async startAuthenticatedServer(authInfo) {
     console.log('');
-    console.log('🚀 Starting authenticated Shell Mirror with local WebSocket server...');
+    console.log('🚀 Starting authenticated Shell Mirror with cloud WebSocket connection...');
     
     try {
-      // Set up local WebSocket server configuration
-      const wsPort = await NetworkUtils.findAvailablePort(8080, 10);
-      const wsConfig = NetworkUtils.generateWebSocketConfig(wsPort);
+      // Register this agent with the cloud backend
+      await this.registerAsMacAgent(authInfo);
       
-      // Display network information
-      NetworkUtils.displayNetworkInfo(wsConfig);
-      
-      // Create .env file with authentication and WebSocket config
-      await this.createEnvFile(authInfo, wsConfig);
-      
-      // Register this server as a Mac agent with WebSocket endpoint
-      await this.registerAsMacAgent(authInfo, wsConfig);
-      
-      // Start the local WebSocket server process
-      const packageRoot = path.resolve(__dirname, '..');
-      const serverPath = path.join(packageRoot, 'server.js');
-      
-      console.log('🔄 Starting local WebSocket server...');
-      const serverProcess = spawn('node', [serverPath], {
-        stdio: 'inherit',
-        cwd: path.dirname(this.envFile),
-        env: { 
-          ...process.env,
-          WS_PORT: wsConfig.port.toString(),
-          WS_HOST: wsConfig.host,
-          LOCAL_IP: wsConfig.localIP
-        }
-      });
-
-      // Display status information
-      this.displayStatus(authInfo, wsConfig);
-
-      // Handle Ctrl+C gracefully
-      process.on('SIGINT', () => {
-        console.log('');
-        console.log('🛑 Stopping Shell Mirror and WebSocket server...');
-        serverProcess.kill('SIGINT');
-        process.exit(0);
-      });
-
-      // Wait for server process
-      serverProcess.on('close', (code) => {
-        if (code !== 0) {
-          console.error(`❌ Server exited with code ${code}`);
-          process.exit(code);
-        }
-      });
+      // Start the terminal agent with cloud WebSocket connection
+      await this.startTerminalAgent(authInfo);
       
     } catch (error) {
-      console.error('❌ Failed to start WebSocket server:', error.message);
+      console.error('❌ Failed to start Shell Mirror:', error.message);
       process.exit(1);
     }
   }
 
-  async registerAsMacAgent(authInfo, wsConfig) {
-    console.log('🔗 Registering as Mac agent with WebSocket endpoint...');
+  async registerAsMacAgent(authInfo) {
+    console.log('🔗 Registering as Mac agent with cloud WebSocket...');
     console.log(`   User: ${authInfo.email}`);
     console.log(`   Machine: ${os.hostname()}`);
-    console.log(`   WebSocket: ${wsConfig.wsUrl}`);
     
     try {
       const agentId = `local-${os.hostname()}-${Date.now()}`;
@@ -516,11 +473,9 @@ WS_URL=${wsConfig.wsUrl}` : ''}
         ownerName: authInfo.name,
         ownerToken: authInfo.accessToken,
         machineName: os.hostname(),
-        agentVersion: '1.5.17',
-        capabilities: ['terminal', 'websocket'],
-        serverPort: wsConfig.port,
-        websocketUrl: wsConfig.wsUrl,
-        localIP: wsConfig.localIP
+        agentVersion: '1.5.23',
+        capabilities: ['terminal', 'cloud-websocket'],
+        connectionType: 'cloud-websocket'
       };
 
       console.log(`   Agent ID: ${agentId}`);
@@ -577,6 +532,58 @@ WS_URL=${wsConfig.wsUrl}` : ''}
     }
   }
 
+  async startTerminalAgent(authInfo) {
+    console.log('');
+    console.log('🔄 Starting terminal agent with cloud WebSocket connection...');
+    
+    // Find the package root directory (where agent files are located)
+    const packageRoot = path.resolve(__dirname, '..');
+    const agentPath = path.join(packageRoot, 'mac-agent', 'agent.js');
+    
+    // Create environment for agent
+    const agentEnv = {
+      ...process.env,
+      USER_EMAIL: authInfo.email,
+      USER_NAME: authInfo.name,
+      ACCESS_TOKEN: authInfo.accessToken,
+      WEBSOCKET_URL: 'wss://shellmirror.app',
+      CONNECTION_TYPE: 'cloud-websocket'
+    };
+    
+    console.log('🌐 Connecting to: wss://shellmirror.app');
+    console.log('📱 Access from browser: https://shellmirror.app/app/terminal.html');
+    console.log('');
+    
+    // Start the terminal agent process
+    const agentProcess = spawn('node', [agentPath], {
+      stdio: 'inherit',
+      env: agentEnv
+    });
+
+    // Display final status
+    const pkg = require('../package.json');
+    console.log(`✅ Shell Mirror v${pkg.version} - Running (${authInfo.email})`);
+    console.log('🌐 Connection: Cloud WebSocket (wss://shellmirror.app)');
+    console.log('Press Ctrl+C to stop');
+    console.log('');
+
+    // Handle Ctrl+C gracefully
+    process.on('SIGINT', () => {
+      console.log('');
+      console.log('🛑 Stopping Shell Mirror agent...');
+      agentProcess.kill('SIGINT');
+      process.exit(0);
+    });
+
+    // Wait for agent process
+    agentProcess.on('close', (code) => {
+      if (code !== 0) {
+        console.error(`❌ Agent exited with code ${code}`);
+        process.exit(code);
+      }
+    });
+  }
+
   async makeHttpsRequest(options, postData = null) {
     return new Promise((resolve, reject) => {
       const req = https.request(options, (res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shell-mirror",
-  "version": "1.5.23",
+  "version": "1.5.24",
   "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

@@ -228,46 +228,9 @@ async function initialize() {
     console.log('[CLIENT] 🚀 Initializing WebRTC connection to agent:', AGENT_ID);
     console.log('[CLIENT] 📋 Selected agent data:', SELECTED_AGENT);
     
-    // Determine WebSocket URL - use agent's local WebSocket server if available
-    let signalingUrl;
-    if (SELECTED_AGENT && SELECTED_AGENT.websocketUrl) {
-        signalingUrl = SELECTED_AGENT.websocketUrl;
-        console.log('[CLIENT] 🌐 Agent WebSocket URL:', signalingUrl);
-        
-        // Check for mixed content issue (HTTPS page + WS:// URL)
-        const isHttpsPage = window.location.protocol === 'https:';
-        const isInsecureWebSocket = signalingUrl.startsWith('ws://');
-        
-        if (isHttpsPage && isInsecureWebSocket) {
-            console.warn('[CLIENT] ⚠️ Mixed content detected: HTTPS page cannot connect to insecure WebSocket');
-            console.log('[CLIENT] 💡 Solution: Use HTTP terminal page for local WebSocket connections');
-            
-            // Provide user with HTTP terminal URL
-            const httpTerminalUrl = `http://shellmirror.app/app/terminal-http.html`;
-            console.log(`[CLIENT] 🔗 Redirect to HTTP terminal: ${httpTerminalUrl}`);
-            
-            // Show user-friendly error message
-            term.write('\r\n\x1b[33m⚠️ Mixed Content Security Issue\x1b[0m\r\n');
-            term.write('\r\nHTTPS pages cannot connect to local WebSocket servers.\r\n');
-            term.write('\r\n\x1b[32mSolution:\x1b[0m\r\n');
-            term.write(`1. Open: \x1b[36m${httpTerminalUrl}\x1b[0m\r\n`);
-            term.write('2. Click on your agent again\r\n');
-            term.write('\r\nThis will allow the local WebSocket connection.\r\n');
-            
-            // Auto-redirect after showing message
-            setTimeout(() => {
-                window.location.href = httpTerminalUrl;
-            }, 5000);
-            
-            return; // Don't attempt WebSocket connection
-        }
-        
-        console.log('[CLIENT] ✅ Using agent\'s local WebSocket server:', signalingUrl);
-    } else {
-        // Fallback to web app domain (old behavior)
-        signalingUrl = (window.location.protocol === 'https:' ? 'wss://' : 'ws://') + window.location.host;
-        console.log('[CLIENT] 🌐 Using fallback WebSocket server:', signalingUrl);
-    }
+    // Use cloud WebSocket for all connections (solves HTTPS mixed content issue)
+    const signalingUrl = (window.location.protocol === 'https:' ? 'wss://' : 'ws://') + window.location.host;
+    console.log('[CLIENT] 🌐 Using cloud WebSocket server:', signalingUrl);
     
     ws = new WebSocket(`${signalingUrl}?role=client`);