npm - shell-mirror - Versions diffs - 1.1.0 → 1.2.1 - Mend

shell-mirror 1.1.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/auto-start.js CHANGED Viewed

@@ -3,6 +3,8 @@ const path = require('path');
 const os = require('os');
 const crypto = require('crypto');
 const { spawn } = require('child_process');
+const https = require('https');
+const querystring = require('querystring');
 class AutoStart {
   constructor() {
@@ -11,11 +13,11 @@ class AutoStart {
     this.configFile = path.join(this.configDir, 'config.json');
     this.envFile = path.join(process.cwd(), '.env');
-    // Shell Mirror OAuth App credentials (shared for all users)
+    // Shell Mirror OAuth App credentials (production)
     this.oauthConfig = {
-      clientId: 'your-shell-mirror-oauth-client-id', // TODO: Replace with actual
-      clientSecret: 'your-shell-mirror-oauth-client-secret', // TODO: Replace with actual
-      redirectUri: 'http://localhost:3000/auth/google/callback'
+      clientId: '804759223392-i5nv5csn1o6siqr760c99l2a9k4sammp.apps.googleusercontent.com',
+      clientSecret: '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',
+      redirectUri: 'http://localhost:8080/auth/google/callback'
     };
   }
@@ -66,13 +68,28 @@ class AutoStart {
   async initiateLogin() {
     console.log('');
-    console.log('📱 Setting up Google authentication...');
+    console.log('🔐 Opening browser for Google authentication...');
     console.log('');
-    // For now, we'll use a simplified setup that creates minimal config
-    // and directs user to use the web interface
-    await this.createMinimalConfig();
-    await this.startServerForLogin();
+    try {
+      // Start OAuth callback server
+      console.log('🔄 Starting OAuth callback server...');
+      const server = await this.createOAuthCallbackServer();
+      // Open browser for OAuth
+      const authUrl = this.buildAuthUrl();
+      console.log('🌐 Opening browser for login...');
+      await this.openBrowser(authUrl);
+      console.log('');
+      console.log('👤 Please complete the Google login in your browser');
+      console.log('   (If browser didn\'t open, visit: ' + authUrl + ')');
+      console.log('');
+    } catch (error) {
+      console.error('❌ Failed to start OAuth flow:', error.message);
+      process.exit(1);
+    }
   }
   buildAuthUrl() {
@@ -88,69 +105,114 @@ class AutoStart {
     return `https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`;
   }
-  async createTempOAuthServer() {
-    // This would create a temporary Express server to handle OAuth callback
-    // For now, we'll use a simplified approach
+  async createOAuthCallbackServer() {
     const express = require('express');
     const app = express();
     return new Promise((resolve, reject) => {
+      let serverInstance;
       app.get('/auth/google/callback', async (req, res) => {
         try {
           const code = req.query.code;
+          const error = req.query.error;
+          if (error) {
+            throw new Error(`OAuth error: ${error}`);
+          }
           if (code) {
+            console.log('📝 Received authorization code, exchanging for tokens...');
             // Exchange code for tokens
             const tokens = await this.exchangeCodeForTokens(code);
             await this.saveAuth(tokens);
             res.send(`
               <html>
-                <body style="font-family: Arial; text-align: center; padding: 50px;">
-                  <h2>✅ Login Successful!</h2>
-                  <p>You can close this window and return to your terminal.</p>
-                  <script>window.close();</script>
+                <head>
+                  <title>Shell Mirror - Login Successful</title>
+                  <style>
+                    body { font-family: Arial, sans-serif; text-align: center; padding: 50px; background: #f5f5f5; }
+                    .container { background: white; padding: 40px; border-radius: 10px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); max-width: 500px; margin: 0 auto; }
+                    h2 { color: #4CAF50; margin-bottom: 20px; }
+                    p { color: #666; margin-bottom: 15px; }
+                    .email { color: #333; font-weight: bold; }
+                  </style>
+                </head>
+                <body>
+                  <div class="container">
+                    <h2>✅ Login Successful!</h2>
+                    <p>Welcome, <span class="email">${tokens.email}</span></p>
+                    <p>Shell Mirror is now starting with your account.</p>
+                    <p>You can close this window and return to your terminal.</p>
+                    <p><small>Or visit <strong>https://shellmirror.app</strong> on your phone to access your terminal.</small></p>
+                  </div>
+                  <script>
+                    setTimeout(() => {
+                      window.close();
+                    }, 3000);
+                  </script>
                 </body>
               </html>
             `);
-            // Restart the main process
+            // Close the temporary server and restart with authenticated state
             setTimeout(() => {
-              console.log('✅ Login successful! Starting Shell Mirror...');
-              this.run();
+              console.log(`✅ Login successful! Welcome ${tokens.email}`);
+              serverInstance.close(() => {
+                this.startAuthenticatedServer(tokens);
+              });
             }, 1000);
           } else {
             throw new Error('No authorization code received');
           }
         } catch (error) {
+          console.error('❌ OAuth callback error:', error.message);
           res.send(`
             <html>
-              <body style="font-family: Arial; text-align: center; padding: 50px;">
-                <h2>❌ Login Failed</h2>
-                <p>Error: ${error.message}</p>
-                <p>Please try running 'shell-mirror' again.</p>
+              <head>
+                <title>Shell Mirror - Login Failed</title>
+                <style>
+                  body { font-family: Arial, sans-serif; text-align: center; padding: 50px; background: #f5f5f5; }
+                  .container { background: white; padding: 40px; border-radius: 10px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); max-width: 500px; margin: 0 auto; }
+                  h2 { color: #f44336; margin-bottom: 20px; }
+                  p { color: #666; margin-bottom: 15px; }
+                </style>
+              </head>
+              <body>
+                <div class="container">
+                  <h2>❌ Login Failed</h2>
+                  <p>Error: ${error.message}</p>
+                  <p>Please try running 'shell-mirror' again.</p>
+                </div>
               </body>
             </html>
           `);
         }
       });
-      const server = app.listen(3000, () => {
-        resolve(server);
+      serverInstance = app.listen(8080, (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(serverInstance);
+        }
       });
     });
   }
-  async createMinimalConfig() {
-    // Create a basic environment file that allows the server to start
+  async createProductionConfig() {
+    // Create production environment file with real OAuth credentials
     const envContent = `# Shell Mirror Configuration
 # Auto-generated on ${new Date().toISOString()}
-BASE_URL=http://localhost:3000
-PORT=3000
+BASE_URL=http://localhost:8080
+PORT=8080
 HOST=0.0.0.0
-GOOGLE_CLIENT_ID=placeholder-will-be-set-after-login
-GOOGLE_CLIENT_SECRET=placeholder-will-be-set-after-login
+GOOGLE_CLIENT_ID=${this.oauthConfig.clientId}
+GOOGLE_CLIENT_SECRET=${this.oauthConfig.clientSecret}
 SESSION_SECRET=${crypto.randomBytes(32).toString('hex')}
 NODE_ENV=development
 `;
@@ -162,16 +224,21 @@ NODE_ENV=development
     console.log('🔄 Starting Shell Mirror server...');
     console.log('');
+    // Find the package root directory (where server.js is located)
+    const packageRoot = path.resolve(__dirname, '..');
+    const serverPath = path.join(packageRoot, 'server.js');
     // Start the server in background
-    const serverProcess = spawn('node', ['server.js'], {
+    const serverProcess = spawn('node', [serverPath], {
       stdio: 'pipe',
-      cwd: path.dirname(this.envFile)
+      cwd: path.dirname(this.envFile),
+      env: { ...process.env }
     });
     // Wait a moment for server to start
     setTimeout(() => {
       this.displayLoginInstructions();
-      this.openBrowser('http://localhost:3000');
+      this.openBrowser('http://localhost:8080');
     }, 2000);
     // Handle Ctrl+C gracefully
@@ -193,7 +260,7 @@ NODE_ENV=development
   displayLoginInstructions() {
     console.log('✅ Shell Mirror server is running');
-    console.log('🌐 Local server: http://localhost:3000');
+    console.log('🌐 Local server: http://localhost:8080');
     console.log('📱 Access from phone: https://shellmirror.app');
     console.log('');
     console.log('🔐 First-time setup:');
@@ -211,15 +278,95 @@ NODE_ENV=development
   }
   async exchangeCodeForTokens(code) {
-    // This would exchange the OAuth code for access tokens
-    // For now, return mock data (this needs real OAuth implementation)
-    return {
-      accessToken: 'mock-access-token',
-      refreshToken: 'mock-refresh-token',
-      email: 'user@example.com',
-      name: 'User Name',
-      expiresAt: Date.now() + (3600 * 1000) // 1 hour
-    };
+    return new Promise((resolve, reject) => {
+      const postData = querystring.stringify({
+        code: code,
+        client_id: this.oauthConfig.clientId,
+        client_secret: this.oauthConfig.clientSecret,
+        redirect_uri: this.oauthConfig.redirectUri,
+        grant_type: 'authorization_code'
+      });
+      const options = {
+        hostname: 'oauth2.googleapis.com',
+        port: 443,
+        path: '/token',
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Length': Buffer.byteLength(postData)
+        }
+      };
+      const req = https.request(options, (res) => {
+        let data = '';
+        res.on('data', (chunk) => {
+          data += chunk;
+        });
+        res.on('end', async () => {
+          try {
+            const tokens = JSON.parse(data);
+            if (tokens.access_token) {
+              // Get user info
+              const userInfo = await this.getUserInfo(tokens.access_token);
+              resolve({
+                accessToken: tokens.access_token,
+                refreshToken: tokens.refresh_token,
+                email: userInfo.email,
+                name: userInfo.name,
+                expiresAt: Date.now() + (tokens.expires_in * 1000)
+              });
+            } else {
+              reject(new Error('Failed to get access token: ' + data));
+            }
+          } catch (error) {
+            reject(error);
+          }
+        });
+      });
+      req.on('error', (error) => {
+        reject(error);
+      });
+      req.write(postData);
+      req.end();
+    });
+  }
+  async getUserInfo(accessToken) {
+    return new Promise((resolve, reject) => {
+      const options = {
+        hostname: 'www.googleapis.com',
+        port: 443,
+        path: '/oauth2/v2/userinfo',
+        method: 'GET',
+        headers: {
+          'Authorization': `Bearer ${accessToken}`
+        }
+      };
+      const req = https.request(options, (res) => {
+        let data = '';
+        res.on('data', (chunk) => {
+          data += chunk;
+        });
+        res.on('end', () => {
+          try {
+            const userInfo = JSON.parse(data);
+            resolve(userInfo);
+          } catch (error) {
+            reject(error);
+          }
+        });
+      });
+      req.on('error', (error) => {
+        reject(error);
+      });
+      req.end();
+    });
   }
   async saveAuth(authData) {
@@ -235,10 +382,15 @@ NODE_ENV=development
     console.log('🔄 Starting server...');
     console.log('');
+    // Find the package root directory (where server.js is located)
+    const packageRoot = path.resolve(__dirname, '..');
+    const serverPath = path.join(packageRoot, 'server.js');
     // Start the main server process
-    const serverProcess = spawn('node', ['server.js'], {
+    const serverProcess = spawn('node', [serverPath], {
       stdio: 'inherit',
-      cwd: path.dirname(this.envFile)
+      cwd: path.dirname(this.envFile),
+      env: { ...process.env }
     });
     // Display status information
@@ -265,8 +417,8 @@ NODE_ENV=development
     const envContent = `# Shell Mirror Configuration
 # Auto-generated on ${new Date().toISOString()}
-BASE_URL=http://localhost:3000
-PORT=3000
+BASE_URL=http://localhost:8080
+PORT=8080
 HOST=0.0.0.0
 GOOGLE_CLIENT_ID=${this.oauthConfig.clientId}
 GOOGLE_CLIENT_SECRET=${this.oauthConfig.clientSecret}
@@ -285,7 +437,7 @@ ACCESS_TOKEN=${authInfo.accessToken}
   displayStatus(authInfo) {
     console.log('✅ Shell Mirror is running');
     console.log(`👤 Logged in as: ${authInfo.email}`);
-    console.log('🌐 Local server: http://localhost:3000');
+    console.log('🌐 Local server: http://localhost:8080');
     console.log('📱 Access from phone: https://shellmirror.app');
     console.log('');
     console.log('ℹ️  To use from your phone:');
@@ -297,6 +449,44 @@ ACCESS_TOKEN=${authInfo.accessToken}
     console.log('');
   }
+  async startAuthenticatedServer(authInfo) {
+    console.log('');
+    console.log('🚀 Starting authenticated Shell Mirror server...');
+    // Create .env file with authentication
+    await this.createEnvFile(authInfo);
+    // Find the package root directory (where server.js is located)
+    const packageRoot = path.resolve(__dirname, '..');
+    const serverPath = path.join(packageRoot, 'server.js');
+    // Start the main server process
+    const serverProcess = spawn('node', [serverPath], {
+      stdio: 'inherit',
+      cwd: path.dirname(this.envFile),
+      env: { ...process.env }
+    });
+    // Display status information
+    this.displayStatus(authInfo);
+    // Handle Ctrl+C gracefully
+    process.on('SIGINT', () => {
+      console.log('');
+      console.log('🛑 Stopping Shell Mirror...');
+      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);
+      }
+    });
+  }
   async openBrowser(url) {
     const platform = os.platform();
     let command;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "shell-mirror",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "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/index.html CHANGED Viewed

@@ -729,7 +729,7 @@
         // Check if local server is running
         async function checkLocalServer() {
             try {
-                const response = await fetch('http://localhost:3000/api/auth/status', {
+                const response = await fetch('http://localhost:8080/api/auth/status', {
                     method: 'GET',
                     timeout: 2000
                 });
@@ -749,7 +749,7 @@
             }
             // Redirect to Google OAuth
-            window.location.href = 'http://localhost:3000/auth/google';
+            window.location.href = 'http://localhost:8080/auth/google';
         }
         // Show installation reminder modal

package/server.js CHANGED Viewed

@@ -100,15 +100,6 @@ if (missingEnvVars.length > 0) {
   process.exit(1);
 }
-// Check if OAuth credentials are placeholders (first-time setup)
-const isFirstTimeSetup = process.env.GOOGLE_CLIENT_ID === 'placeholder-will-be-set-after-login';
-if (isFirstTimeSetup) {
-  console.log('ℹ️  First-time setup detected. OAuth authentication is not yet configured.');
-  console.log('   The server will start, but Google login will not work until configured.');
-  console.log('   Please visit the web interface to complete setup.');
-  console.log('');
-}
 // 4. WebSocket Connection Handler with Authentication
 wss.on('connection', function connection(ws, request) {