rushdeploy 1.0.9 → 1.2.1

package/README.md

@@ -17,10 +17,11 @@ npm install -g rushdeploy
 ## Quickstart
 
 ### 1. Authenticate with your server
-Generate a CLI token in Settings inside the Web Dashboard and log in:
+Run the login command to authenticate directly in your browser:
 ```bash
-rushdeploy login <token>
+rushdeploy login
 ```
+*(Or provide a token directly in headless/CI environments: `rushdeploy login <token>`)*
 
 ### 2. Check Workspace Status
 ```bash
@@ -38,7 +39,7 @@ rushdeploy deploy git https://github.com/my-username/my-react-app.git --branch m
 
 ## Commands Reference
 
-* **`rushdeploy login <token>`**: Authenticate CLI session.
+* **`rushdeploy login [token]`**: Authenticate via browser (or pass access token).
 * **`rushdeploy logout`**: Clear local auth details.
 * **`rushdeploy whoami`**: View details of the active user profile.
 * **`rushdeploy status`**: Render resource metrics cards.

package/bin/index.js

@@ -7,13 +7,26 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+let crypto;
+try {
+  crypto = require('node:crypto');
+} catch {
+  try {
+    crypto = require('crypto');
+  } catch {}
+}
 const http = require('http');
 const https = require('https');
-const { exec } = require('child_process');
+const { exec, spawn } = require('child_process');
 
 const CONFIG_DIR = path.join(os.homedir(), '.rushdeploy');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 
+let CLI_VERSION = '1.2.1';
+try {
+  CLI_VERSION = require('../package.json').version;
+} catch {}
+
 // Domain Hardcoding: Always default to rushdeploy.com
 const DEFAULT_SERVER = 'https://rushdeploy.com';
 
@@ -92,8 +105,8 @@ const ui = {
   },
 
   box(fields, options = {}) {
-    const fieldPairs = Array.isArray(fields) 
-      ? fields 
+    const fieldPairs = Array.isArray(fields)
+      ? fields
       : Object.entries(fields).map(([label, value]) => ({ label, value }));
 
     const labelWidth = 14;
@@ -110,7 +123,7 @@ const ui = {
     const innerWidth = Math.max(options.minWidth || 66, leftIndent + labelWidth + gap + maxValLen + rightMargin);
 
     const topBorder = `┌${'─'.repeat(innerWidth)}┐`;
-    const emptyRow  = `│${' '.repeat(innerWidth)}│`;
+    const emptyRow = `│${' '.repeat(innerWidth)}│`;
     const bottomBorder = `└${'─'.repeat(innerWidth)}┘`;
 
     console.log(`\n${colors.gray}${topBorder}${colors.reset}`);
@@ -192,10 +205,18 @@ function loadConfig() {
 function saveConfig(server, token) {
   try {
     if (!fs.existsSync(CONFIG_DIR)) {
-      fs.mkdirSync(CONFIG_DIR, { recursive: true });
+      fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
     }
     const cleanServer = (server || DEFAULT_SERVER).replace(/\/$/, '');
-    fs.writeFileSync(CONFIG_FILE, JSON.stringify({ server: cleanServer, token }, null, 2), 'utf8');
+    fs.writeFileSync(CONFIG_FILE, JSON.stringify({ server: cleanServer, token }, null, 2), { encoding: 'utf8', mode: 0o600 });
+    try {
+      fs.chmodSync(CONFIG_FILE, 0o600);
+    } catch (chmodErr) {
+      try {
+        fs.unlinkSync(CONFIG_FILE);
+      } catch {}
+      throw chmodErr;
+    }
     return true;
   } catch (err) {
     ui.stepError(`Error saving configuration: ${err.message}`);
@@ -210,8 +231,9 @@ function makeRequest(apiPath, method = 'GET', data = null) {
     const isPlansPath = apiPath.endsWith('/subscriptions/plans') && method === 'GET';
 
     if (!config && !isLoginPath && !isPlansPath) {
-      ui.stepError(`You are not logged in. Run 'rushdeploy login <token>' first.`);
-      process.exit(1);
+      const err = new Error(`You are not logged in. Run 'rushdeploy login <token>' first.`);
+      err.statusCode = 401;
+      return reject(err);
     }
 
     const serverUrl = getServerUrl();
@@ -255,25 +277,27 @@ function makeRequest(apiPath, method = 'GET', data = null) {
           } else if (jsonResponse && jsonResponse.detail) {
             errorMsg = typeof jsonResponse.detail === 'object' ? jsonResponse.detail.message : jsonResponse.detail;
           }
-          
+
+          let formattedError;
           if (res.statusCode === 401) {
-            ui.stepError(`Unauthorized (401). Your token may have expired or been revoked.`);
-            console.log(`  Please log in again using: ${colors.green}rushdeploy login <token>${colors.reset}`);
+            formattedError = `Unauthorized (401). Your token may have expired or been revoked.\n  Please log in again using: ${colors.green}rushdeploy login <token>${colors.reset}`;
           } else if (res.statusCode === 429) {
-            ui.stepError(`Rate Limit Exceeded (429): You are sending commands too quickly.`);
-            console.log(`  Please wait a minute before running more CLI commands.`);
+            formattedError = `Rate Limit Exceeded (429): You are sending commands too quickly.\n  Please wait a minute before running more CLI commands.`;
           } else {
-            ui.stepError(`Error (${res.statusCode}): ${errorMsg}`);
+            formattedError = `Request failed (${res.statusCode}): ${errorMsg}`;
           }
-          process.exit(1);
+          const err = new Error(formattedError);
+          err.statusCode = res.statusCode;
+          err.response = jsonResponse;
+          reject(err);
         }
       });
     });
 
     req.on('error', (err) => {
-      ui.stepError(`Connection Error: Unable to connect to server at ${serverUrl}`);
-      console.log(`  Details: ${colors.gray}${err.message}${colors.reset}`);
-      process.exit(1);
+      const connErr = new Error(`Connection Error: Unable to connect to server at ${serverUrl} (${err.message})`);
+      connErr.cause = err;
+      reject(connErr);
     });
 
     if (data) {
@@ -312,24 +336,31 @@ function formatDate(isoStr) {
 
 function openBrowser(url) {
   let command;
+  let args = [];
   switch (process.platform) {
     case 'darwin':
-      command = `open "${url}"`;
+      command = 'open';
+      args = [url];
       break;
     case 'win32':
-      command = `start "" "${url}"`;
+      command = 'explorer.exe';
+      args = [url];
       break;
     default:
-      command = `xdg-open "${url}"`;
+      command = 'xdg-open';
+      args = [url];
       break;
   }
-  exec(command, (err) => {
-    if (err) {
+  try {
+    const child = spawn(command, args, { stdio: 'ignore', detached: true });
+    child.on('error', (err) => {
       ui.stepError(`Failed to open browser: ${err.message}`);
-    } else {
-      ui.step(`Opening browser: ${colors.brightCyan}${url}${colors.reset}`);
-    }
-  });
+    });
+    child.unref();
+    ui.step(`Opening browser: ${colors.brightCyan}${url}${colors.reset}`);
+  } catch (err) {
+    ui.stepError(`Failed to open browser: ${err.message}`);
+  }
 }
 
 function extractRepoName(url) {
@@ -342,19 +373,135 @@ function extractRepoName(url) {
   }
 }
 
-async function cmdLogin(token, serverArg) {
+function generateRandomState() {
+  if (crypto && typeof crypto.randomBytes === 'function') {
+    try {
+      return crypto.randomBytes(16).toString('hex');
+    } catch {}
+  }
+  if (typeof globalThis !== 'undefined' && globalThis.crypto?.getRandomValues) {
+    try {
+      const array = new Uint8Array(16);
+      globalThis.crypto.getRandomValues(array);
+      return Array.from(array, (b) => b.toString(16).padStart(2, '0')).join('');
+    } catch {}
+  }
+  if (typeof globalThis !== 'undefined' && typeof globalThis.crypto?.randomUUID === 'function') {
+    try {
+      return globalThis.crypto.randomUUID().replace(/-/g, '');
+    } catch {}
+  }
+  return Array.from({ length: 32 }, () => Math.floor(Math.random() * 16).toString(16)).join('');
+}
+
+function loginViaBrowser(server) {
+  return new Promise((resolve, reject) => {
+    const state = generateRandomState();
+
+    const localServer = http.createServer((req, res) => {
+      try {
+        const parsed = new URL(req.url, 'http://127.0.0.1');
+        if (parsed.pathname === '/callback') {
+          const returnedToken = parsed.searchParams.get('token');
+          const returnedState = parsed.searchParams.get('state');
+
+          if (!returnedToken || returnedState !== state) {
+            res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.end('<h1>Authentication Failed</h1><p>Invalid state or token parameter received.</p>');
+            return;
+          }
+
+          res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+          res.end(`
+            <!DOCTYPE html>
+            <html>
+            <head>
+              <meta charset="utf-8">
+              <title>RushDeploy CLI - Authenticated</title>
+              <style>
+                body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; background: #09090b; color: #fff; display: flex; align-items: center; justify-content: center; height: 100vh; margin: 0; }
+                .card { background: #18181b; border: 1px solid #27272a; padding: 36px; border-radius: 16px; text-align: center; max-width: 400px; box-shadow: 0 20px 40px rgba(0,0,0,0.6); }
+                .icon { width: 48px; height: 48px; background: rgba(16,185,129,0.15); color: #10b981; border-radius: 50%; display: inline-flex; align-items: center; justify-content: center; font-size: 24px; margin-bottom: 16px; }
+                h1 { color: #fafafa; font-size: 20px; font-weight: 600; margin: 0 0 8px 0; }
+                p { color: #a1a1aa; font-size: 13px; line-height: 1.5; margin: 0; }
+              </style>
+            </head>
+            <body>
+              <div class="card">
+                <div class="icon">&#10003;</div>
+                <h1>Authentication Successful!</h1>
+                <p>Your CLI terminal has been successfully connected to RushDeploy. You can close this tab and return to your terminal.</p>
+              </div>
+            </body>
+            </html>
+          `);
+
+          if (timer) clearTimeout(timer);
+          localServer.close();
+          resolve(returnedToken);
+        } else {
+          res.writeHead(404);
+          res.end();
+        }
+      } catch (err) {
+        res.writeHead(500);
+        res.end('Internal server error');
+      }
+    });
+
+    let timer;
+
+    localServer.listen(0, '127.0.0.1', () => {
+      const address = localServer.address();
+      const port = address.port;
+      const callbackUrl = `http://127.0.0.1:${port}/callback`;
+      const authUrl = `${server}/auth/cli-auth?callback=${encodeURIComponent(callbackUrl)}&state=${state}&client=cli`;
+
+      ui.stepInfo(`Opening your browser to authenticate with RushDeploy...`);
+      console.log(`  Waiting for authorization at:\n  ${colors.brightCyan}${authUrl}${colors.reset}\n`);
+
+      openBrowser(authUrl);
+    });
+
+    // 2-minute timeout
+    timer = setTimeout(() => {
+      try {
+        localServer.close();
+      } catch { }
+      reject(new Error('Authentication timed out after 2 minutes'));
+    }, 120000);
+    if (timer.unref) {
+      timer.unref();
+    }
+  });
+}
+
+async function cmdLogin(tokenArg, serverArg) {
   const server = serverArg || getServerUrl();
-  ui.stepInfo(`Connecting to ${colors.brightWhite}${server}${colors.reset}...`);
-  
+  let token = tokenArg;
+
+  if (!token) {
+    ui.stepInfo(`Connecting to ${colors.brightWhite}${server}${colors.reset}...`);
+    try {
+      token = await loginViaBrowser(server);
+    } catch (err) {
+      ui.stepError(`Browser login failed: ${err.message}`);
+      console.log(`  You can also log in manually using: ${colors.green}rushdeploy login <token>${colors.reset}`);
+      process.exit(1);
+    }
+  } else {
+    ui.stepInfo(`Connecting to ${colors.brightWhite}${server}${colors.reset}...`);
+  }
+
   saveConfig(server, token);
-  
+
   try {
     ui.stepInfo(`Validating authentication token...`);
     const res = await makeRequest('/auth/me');
     if (res.success) {
       const user = res.user;
       ui.step(`Authentication successful!`);
-      
+
       ui.box([
         { label: 'Account', value: `${colors.bold}${user.name}${colors.reset} (${colors.gray}${user.email}${colors.reset})` },
         { label: 'Role', value: user.role.toUpperCase() },
@@ -364,7 +511,7 @@ async function cmdLogin(token, serverArg) {
     }
   } catch (err) {
     if (fs.existsSync(CONFIG_FILE)) fs.unlinkSync(CONFIG_FILE);
-    ui.stepError(`Authentication failed. Check your token or server URL.`);
+    ui.stepError(`Authentication failed: ${err.message || 'Check your token or server URL.'}`);
     process.exit(1);
   }
 }
@@ -421,7 +568,7 @@ async function cmdPlans() {
 function drawCards(cards, cardsPerRow = 2) {
   const cardWidth = 34;
   const rows = [];
-  
+
   for (let i = 0; i < cards.length; i += cardsPerRow) {
     rows.push(cards.slice(i, i + cardsPerRow));
   }
@@ -440,19 +587,19 @@ function drawCards(cards, cardsPerRow = 2) {
 
       const label = card.label || '';
       let value = card.value !== undefined ? String(card.value) : '';
-      
+
       let valColor = colors.bold;
       if (card.status === 'online') valColor = colors.green + colors.bold;
       else if (card.status === 'offline') valColor = colors.red + colors.bold;
       else if (card.status === 'warn') valColor = colors.yellow + colors.bold;
-      
+
       const valStr = `${valColor}${value}${colors.reset}`;
       const rawVal = stripAnsi(value);
-      
+
       const textLen = label.length + rawVal.length;
       const padLen = cardWidth - 6 - textLen;
       const pad = ' '.repeat(Math.max(1, padLen));
-      
+
       labelValLine += space + `${colors.gray}│${colors.reset}  ${colors.brightCyan}${label}${colors.reset}${pad}${valStr}  ${colors.gray}│${colors.reset}`;
       sepLine += space + colors.gray + '├' + '─'.repeat(cardWidth - 2) + '┤' + colors.reset;
 
@@ -460,7 +607,7 @@ function drawCards(cards, cardsPerRow = 2) {
       const rawHint = stripAnsi(hint);
       const hintPadLen = cardWidth - 6 - rawHint.length;
       const hintPad = ' '.repeat(Math.max(0, hintPadLen));
-      
+
       hintLine += space + `${colors.gray}│${colors.reset}  ${colors.gray}${hint}${colors.reset}${hintPad}  ${colors.gray}│${colors.reset}`;
       bottomBorder += space + colors.gray + '└' + '─'.repeat(cardWidth - 2) + '┘' + colors.reset;
     });
@@ -499,7 +646,7 @@ async function cmdStatus() {
         const byStatus = stats.projects_by_status || {};
         const celery = stats.celery || {};
         const workerOnline = (celery.workers ?? 0) > 0;
-        
+
         const activeBuildingProjects = (byStatus.building || byStatus.BUILDING || 0) + (byStatus.pending || byStatus.PENDING || 0);
         const activeTasksCount = (celery.active && celery.active > 0) ? celery.active : activeBuildingProjects;
         const pendingInQueue = stats.redis_queue_len ?? celery.queued ?? 0;
@@ -517,23 +664,23 @@ async function cmdStatus() {
         const adminCards = [
           { label: 'Users', value: stats.users ?? 0, hint: 'Total registered users' },
           { label: 'Databases', value: stats.databases ?? 0, hint: 'Total workspace databases' },
-          { 
-            label: 'Projects', 
-            value: stats.projects ?? 0, 
-            hint: `${colors.green}${runCount} run${colors.reset} · ${colors.yellow}${buildCount} build${colors.reset} · ${colors.red}${failCount} fail${colors.reset}` 
+          {
+            label: 'Projects',
+            value: stats.projects ?? 0,
+            hint: `${colors.green}${runCount} run${colors.reset} · ${colors.yellow}${buildCount} build${colors.reset} · ${colors.red}${failCount} fail${colors.reset}`
           },
-          { 
-            label: 'App Containers', 
-            value: stats.running_containers ?? 0, 
+          {
+            label: 'App Containers',
+            value: stats.running_containers ?? 0,
             status: stats.docker_available ? 'online' : 'offline',
             hint: stats.docker_available ? 'Active running containers' : 'Engine offline'
           },
           { label: 'CPU Usage', value: cpuVal, hint: 'Host CPU load' },
           { label: 'RAM Usage', value: ramVal, hint: 'Host memory allocation' },
           { label: 'Disk Usage', value: diskVal, hint: 'Host storage capacity' },
-          { 
-            label: 'Task Queue', 
-            value: workerOnline ? 'Online' : 'Offline', 
+          {
+            label: 'Task Queue',
+            value: workerOnline ? 'Online' : 'Offline',
             status: workerOnline ? 'online' : 'offline',
             hint: `${activeTasksCount} active · ${pendingInQueue} pending`
           }
@@ -835,14 +982,14 @@ async function resolveProjectId(idOrSlug) {
   if (/^\d+$/.test(idOrSlug)) {
     return parseInt(idOrSlug, 10);
   }
-  
+
   const res = await makeRequest('/projects/');
   const projects = res.projects || [];
   const matched = projects.find(p => p.slug === idOrSlug || p.name.toLowerCase() === idOrSlug.toLowerCase());
   if (matched) {
     return matched.id;
   }
-  
+
   ui.stepError(`No project found matching name or slug "${idOrSlug}".`);
   process.exit(1);
 }
@@ -912,7 +1059,7 @@ async function cmdProject(idOrSlug, subcommand, subArgs) {
       const stats = statsRes.stats;
 
       ui.stepInfo(`Resource metrics for Project ${id}`);
-      
+
       const fields = [
         { label: 'Current Status', value: ui.badge(info.status) }
       ];
@@ -1193,13 +1340,13 @@ async function cmdWorkspace() {
 
 function printHelp() {
   console.log(`
-${colors.bold}${colors.brightWhite}RushDeploy CLI${colors.reset} ${colors.gray}v1.0.9${colors.reset} - Modern PaaS Command Line Interface
+${colors.bold}${colors.brightWhite}RushDeploy CLI${colors.reset} ${colors.gray}v${CLI_VERSION}${colors.reset} - Modern PaaS Command Line Interface
 
 ${colors.bold}USAGE:${colors.reset}
   ${colors.brightCyan}rushdeploy${colors.reset} <command> [arguments] [options]
 
 ${colors.bold}GLOBAL COMMANDS:${colors.reset}
-  ${colors.green}login <token>${colors.reset}                  Authenticate with your access token
+  ${colors.green}login [token]${colors.reset}                  Authenticate with browser (or provide access token)
   ${colors.green}logout${colors.reset}                         Clear your stored CLI session token
   ${colors.green}whoami${colors.reset}                         Display active profile details
   ${colors.green}plans${colors.reset}                          List subscription plans and limits
@@ -1249,21 +1396,26 @@ async function main() {
     process.exit(0);
   }
 
+  if (command === '--version' || command === '-v' || command === 'version') {
+    console.log(CLI_VERSION);
+    process.exit(0);
+  }
+
   switch (command) {
     case 'login': {
-      const token = args[1];
-      if (!token) {
-        ui.stepError(`Please provide your access token.`);
-        console.log(`  Usage: ${colors.green}rushdeploy login <token> [--server <url>]${colors.reset}`);
-        process.exit(1);
-      }
-      
+      let token = null;
       let server = null;
+
       const serverIndex = args.indexOf('--server');
       if (serverIndex !== -1 && args[serverIndex + 1]) {
         server = args[serverIndex + 1];
       }
-      
+
+      // Check if user passed a token (first argument after 'login' that isn't --server or a flag)
+      if (args[1] && !args[1].startsWith('--')) {
+        token = args[1];
+      }
+
       await cmdLogin(token, server);
       break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rushdeploy",
-  "version": "1.0.9",
+  "version": "1.2.1",
   "description": "CLI tool to manage your self-hosted RushDeploy PaaS account.",
   "main": "bin/index.js",
   "bin": {
@@ -21,4 +21,4 @@
     "bin",
     "README.md"
   ]
-}
+}