rushdeploy 1.2.0 → 1.2.1

package/bin/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * RushDeploy CLI
  * A zero-dependency Node.js CLI utility to manage your RushDeploy account.
@@ -7,6 +7,14 @@
 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, spawn } = require('child_process');
@@ -14,6 +22,11 @@ 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}`);
@@ -352,9 +373,30 @@ function extractRepoName(url) {
   }
 }
 
+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 = crypto.randomBytes(16).toString('hex');
+    const state = generateRandomState();
 
     const localServer = http.createServer((req, res) => {
       try {
@@ -425,7 +467,7 @@ function loginViaBrowser(server) {
     timer = setTimeout(() => {
       try {
         localServer.close();
-      } catch {}
+      } catch { }
       reject(new Error('Authentication timed out after 2 minutes'));
     }, 120000);
     if (timer.unref) {
@@ -450,16 +492,16 @@ async function cmdLogin(tokenArg, serverArg) {
   } 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() },
@@ -526,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));
   }
@@ -545,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;
 
@@ -565,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;
     });
@@ -604,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;
@@ -622,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`
           }
@@ -940,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);
 }
@@ -1017,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) }
       ];
@@ -1298,7 +1340,7 @@ async function cmdWorkspace() {
 
 function printHelp() {
   console.log(`
-${colors.bold}${colors.brightWhite}RushDeploy CLI${colors.reset} ${colors.gray}v1.1.0${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]
@@ -1355,7 +1397,7 @@ async function main() {
   }
 
   if (command === '--version' || command === '-v' || command === 'version') {
-    console.log('1.1.0');
+    console.log(CLI_VERSION);
     process.exit(0);
   }
 
@@ -1363,7 +1405,7 @@ async function main() {
     case 'login': {
       let token = null;
       let server = null;
-      
+
       const serverIndex = args.indexOf('--server');
       if (serverIndex !== -1 && args[serverIndex + 1]) {
         server = args[serverIndex + 1];
@@ -1373,7 +1415,7 @@ async function main() {
       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.2.0",
+  "version": "1.2.1",
   "description": "CLI tool to manage your self-hosted RushDeploy PaaS account.",
   "main": "bin/index.js",
   "bin": {