shell-mirror 1.5.22 → 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.22",
+  "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-http.html

@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Terminal Mirror (HTTP)</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@4.15.0/css/xterm.css" />
+    <script src="https://cdn.jsdelivr.net/npm/xterm@4.15.0/lib/xterm.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.5.0/lib/xterm-addon-fit.js"></script>
+    <style>
+      body, html { 
+        margin: 0; 
+        padding: 0; 
+        height: 100%; 
+        overflow: hidden; 
+        background-color: #1e1e1e; 
+        color: #ccc; 
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+      }
+      #terminal-container { 
+        display: none; 
+        height: 100%; 
+        width: 100%; 
+        background-color: #000000;
+      }
+      #terminal {
+        padding: 8px;  /* Mac Terminal.app padding */
+        background-color: #000000;
+        height: calc(100% - 16px);
+        width: calc(100% - 16px);
+      }
+      #connect-container { 
+        padding: 2em; 
+        text-align: center; 
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        color: white;
+        min-height: 100vh;
+      }
+      #connect-container h2 {
+        margin-bottom: 2em;
+        font-size: 2.5rem;
+      }
+      .http-notice {
+        background: rgba(255, 255, 255, 0.1);
+        border: 1px solid rgba(255, 255, 255, 0.3);
+        border-radius: 10px;
+        padding: 20px;
+        margin: 20px auto;
+        max-width: 600px;
+      }
+      .http-notice h3 {
+        color: #4CAF50;
+        margin-bottom: 10px;
+      }
+      #agent-id-input { font-size: 1.2em; padding: 8px; width: 400px; margin-bottom: 1em; }
+      #connect-btn { font-size: 1.2em; padding: 10px 20px; }
+    </style>
+  </head>
+  <body>
+    <div id="connect-container">
+        <h2>Terminal Mirror</h2>
+        
+        <div class="http-notice">
+            <h3>🌐 HTTP Terminal Mode</h3>
+            <p>This HTTP version allows secure connections to your local Mac WebSocket server.</p>
+            <p>Perfect for local network terminal access!</p>
+        </div>
+        
+        <div id="agent-discovery">
+            <p>Discovering available Mac agents...</p>
+            <div id="agent-list"></div>
+        </div>
+        <div id="manual-connect" style="display: none; margin-top: 20px;">
+            <p>Or manually enter Agent ID:</p>
+            <input type="text" id="agent-id-input" placeholder="e.g., agent-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx">
+            <br>
+            <button id="connect-btn">Connect</button>
+        </div>
+        <button id="show-manual" style="margin-top: 10px;">Manual Connect</button>
+    </div>
+    <div id="terminal-container">
+        <div id="terminal"></div>
+    </div>
+    
+    <!-- Version Footer -->
+    <footer style="background: #ff6b35; color: white; text-align: center; padding: 10px 0; font-size: 0.8rem; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;">
+        <div style="max-width: 1200px; margin: 0 auto;">
+            <p id="terminal-version-info">Terminal Mirror (HTTP) • Loading version...</p>
+        </div>
+    </footer>
+    
+    <script src="/app/terminal.js"></script>
+  </body>
+</html>

package/public/app/terminal.js

@@ -228,16 +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] 🌐 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`);