rushdeploy 1.0.7 → 1.0.9

package/README.md

@@ -1,68 +1,68 @@
-# RushDeploy CLI (Node.js Package)
-
-A zero-dependency Node.js command-line utility to manage your self-hosted RushDeploy PaaS account.
-
----
-
-## Installation
-
-Install the package globally via npm:
-
-```bash
-npm install -g rushdeploy
-```
-
----
-
-## Quickstart
-
-### 1. Authenticate with your server
-Generate a CLI token in Settings inside the Web Dashboard and log in:
-```bash
-rushdeploy login <token>
-```
-
-### 2. Check Workspace Status
-```bash
-# Displays workspace resource quotas and allocations
-rushdeploy status
-```
-
-### 3. Deploy a project
-Deploy a public Git repository:
-```bash
-rushdeploy deploy git https://github.com/my-username/my-react-app.git --branch main --type react
-```
-
----
-
-## Commands Reference
-
-* **`rushdeploy login <token>`**: Authenticate CLI session.
-* **`rushdeploy logout`**: Clear local auth details.
-* **`rushdeploy whoami`**: View details of the active user profile.
-* **`rushdeploy status`**: Render resource metrics cards.
-* **`rushdeploy plans`**: Show plan pricing quotas.
-* **`rushdeploy projects`**: List active projects.
-* **`rushdeploy repos`**: List repos in connected GitHub profile.
-* **`rushdeploy workspace`**: Display resource usage limits and quotas.
-* **`rushdeploy help`**: Show the CLI help dialog.
-
-### Deployments
-* **`rushdeploy deploy git <url> [opts]`**: Trigger deployment from a Git clone URL.
-  * *Options: `--name <name>`, `--branch <branch>`, `--type <framework>`*
-* **`rushdeploy deploy repo <owner/repo> [opts]`**: Trigger deployment from your connected GitHub account.
-  * *Options: `--name <name>`, `--branch <branch>`, `--type <framework>`*
-* **`rushdeploy deploy wordpress <name> --email <e> [opts]`**: Provision a new WordPress site instance.
-  * *Options: `--title <title>`, `--user <user>`, `--password <pass>`*
-
-### Project Control
-* **`rushdeploy project <slug> start|stop|redeploy`**: Control container run state.
-* **`rushdeploy project <slug> rollback [deployment_id]`**: Rollback project to a previous deployment build.
-* **`rushdeploy project <slug> visit`**: Open the project's URL in your default browser.
-* **`rushdeploy project <slug> stats`**: Stream container CPU & RAM telemetry.
-* **`rushdeploy project <slug> logs`**: Tail container build and running output.
-  * *Options: `--lines <N>`*
-* **`rushdeploy project <slug> env [set|remove]`**: Configure environment variables.
-* **`rushdeploy project <slug> autoscale`**: Read/write auto-scaling replica properties.
-* **`rushdeploy project <slug> autodeploy <on|off>`**: Toggle webhook push deployments.
+# RushDeploy CLI (Node.js Package)
+
+A zero-dependency Node.js command-line utility to manage your self-hosted RushDeploy PaaS account.
+
+---
+
+## Installation
+
+Install the package globally via npm:
+
+```bash
+npm install -g rushdeploy
+```
+
+---
+
+## Quickstart
+
+### 1. Authenticate with your server
+Generate a CLI token in Settings inside the Web Dashboard and log in:
+```bash
+rushdeploy login <token>
+```
+
+### 2. Check Workspace Status
+```bash
+# Displays workspace resource quotas and allocations
+rushdeploy status
+```
+
+### 3. Deploy a project
+Deploy a public Git repository:
+```bash
+rushdeploy deploy git https://github.com/my-username/my-react-app.git --branch main --type react
+```
+
+---
+
+## Commands Reference
+
+* **`rushdeploy login <token>`**: Authenticate CLI session.
+* **`rushdeploy logout`**: Clear local auth details.
+* **`rushdeploy whoami`**: View details of the active user profile.
+* **`rushdeploy status`**: Render resource metrics cards.
+* **`rushdeploy plans`**: Show plan pricing quotas.
+* **`rushdeploy projects`**: List active projects.
+* **`rushdeploy repos`**: List repos in connected GitHub profile.
+* **`rushdeploy workspace`**: Display resource usage limits and quotas.
+* **`rushdeploy help`**: Show the CLI help dialog.
+
+### Deployments
+* **`rushdeploy deploy git <url> [opts]`**: Trigger deployment from a Git clone URL.
+  * *Options: `--name <name>`, `--branch <branch>`, `--type <framework>`*
+* **`rushdeploy deploy repo <owner/repo> [opts]`**: Trigger deployment from your connected GitHub account.
+  * *Options: `--name <name>`, `--branch <branch>`, `--type <framework>`*
+* **`rushdeploy deploy wordpress <name> --email <e> [opts]`**: Provision a new WordPress site instance.
+  * *Options: `--title <title>`, `--user <user>`, `--password <pass>`*
+
+### Project Control
+* **`rushdeploy project <slug> start|stop|redeploy`**: Control container run state.
+* **`rushdeploy project <slug> rollback [deployment_id]`**: Rollback project to a previous deployment build.
+* **`rushdeploy project <slug> visit`**: Open the project's URL in your default browser.
+* **`rushdeploy project <slug> stats`**: Stream container CPU & RAM telemetry.
+* **`rushdeploy project <slug> logs`**: Tail container build and running output.
+  * *Options: `--lines <N>`*
+* **`rushdeploy project <slug> env [set|remove]`**: Configure environment variables.
+* **`rushdeploy project <slug> autoscale`**: Read/write auto-scaling replica properties.
+* **`rushdeploy project <slug> autodeploy <on|off>`**: Toggle webhook push deployments.

package/bin/index.js

@@ -92,8 +92,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 +110,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}`);
@@ -255,7 +255,7 @@ function makeRequest(apiPath, method = 'GET', data = null) {
           } else if (jsonResponse && jsonResponse.detail) {
             errorMsg = typeof jsonResponse.detail === 'object' ? jsonResponse.detail.message : jsonResponse.detail;
           }
-
+          
           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}`);
@@ -345,16 +345,16 @@ function extractRepoName(url) {
 async function cmdLogin(token, serverArg) {
   const server = serverArg || getServerUrl();
   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() },
@@ -421,7 +421,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 +440,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 +460,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 +499,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 +517,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`
           }
@@ -785,42 +785,39 @@ async function cmdDeploy(type, args) {
     const keyIdx = args.indexOf('--key');
     if (keyIdx !== -1 && args[keyIdx + 1]) encryptionKey = args[keyIdx + 1];
 
-    let basicAuthActive = false;
-    let basicAuthUser = 'admin';
-    let basicAuthPass = null;
+    let authUser = null;
+    const userIdx = args.indexOf('--auth-user');
+    if (userIdx !== -1 && args[userIdx + 1]) authUser = args[userIdx + 1];
 
-    const authUserIdx = args.indexOf('--auth-user');
-    if (authUserIdx !== -1 && args[authUserIdx + 1]) {
-      basicAuthActive = true;
-      basicAuthUser = args[authUserIdx + 1];
-    }
-    const authPassIdx = args.indexOf('--auth-pass');
-    if (authPassIdx !== -1 && args[authPassIdx + 1]) {
-      basicAuthActive = true;
-      basicAuthPass = args[authPassIdx + 1];
-    }
+    let authPass = null;
+    const passIdx = args.indexOf('--auth-pass');
+    if (passIdx !== -1 && args[passIdx + 1]) authPass = args[passIdx + 1];
 
     ui.step(`Preparing n8n autonomous workflow environment for ${name}`);
-    ui.step(`Configuring persistent volume storage and container security`);
     ui.step(`Queueing 1-click n8n instance deployment`);
 
-    const res = await makeRequest('/projects/n8n', 'POST', {
-      name,
-      encryption_key: encryptionKey,
-      basic_auth_active: basicAuthActive,
-      basic_auth_user: basicAuthUser,
-      basic_auth_password: basicAuthPass
-    });
+    const payload = { name };
+    if (encryptionKey) payload.encryption_key = encryptionKey;
+    if (authUser || authPass) {
+      payload.basic_auth_active = true;
+      if (authUser) payload.basic_auth_user = authUser;
+      if (authPass) payload.basic_auth_password = authPass;
+    }
 
+    const res = await makeRequest('/projects/n8n', 'POST', payload);
     if (res.success) {
       ui.step(`n8n deployment queued successfully!`);
-      ui.box([
-        { label: 'Site Name', value: colors.bold + name + colors.reset },
+      const n8nFields = [
+        { label: 'Instance', value: colors.bold + name + colors.reset },
         { label: 'State', value: ui.badge('QUEUED') },
         { label: 'Project ID', value: String(res.project_id) },
         { label: 'Deployment ID', value: String(res.deployment_id) },
         { label: 'Public URL', value: colors.brightCyan + colors.bold + res.url + colors.reset }
-      ]);
+      ];
+      if (res.encryption_key) {
+        n8nFields.push({ label: 'Encryption Key', value: res.encryption_key });
+      }
+      ui.box(n8nFields);
     }
 
   } else {
@@ -834,19 +831,18 @@ async function cmdDeploy(type, args) {
   }
 }
 
-
 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);
 }
@@ -916,7 +912,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) }
       ];
@@ -1197,7 +1193,7 @@ async function cmdWorkspace() {
 
 function printHelp() {
   console.log(`
-${colors.bold}${colors.brightWhite}RushDeploy CLI${colors.reset} ${colors.gray}v1.0.7${colors.reset} - Modern PaaS Command Line Interface
+${colors.bold}${colors.brightWhite}RushDeploy CLI${colors.reset} ${colors.gray}v1.0.9${colors.reset} - Modern PaaS Command Line Interface
 
 ${colors.bold}USAGE:${colors.reset}
   ${colors.brightCyan}rushdeploy${colors.reset} <command> [arguments] [options]
@@ -1220,6 +1216,8 @@ ${colors.bold}DEPLOYMENT COMMANDS:${colors.reset}
                                   Options: ${colors.gray}--name <name> --branch <branch> --type <type>${colors.reset}
   ${colors.green}deploy wordpress <name>${colors.reset}        Deploy a new one-click WordPress site
                                   Options: ${colors.gray}--email <e> [--title <t>] [--user <u>] [--password <p>]${colors.reset}
+  ${colors.green}deploy n8n <name>${colors.reset}              Deploy a 1-click n8n workflow engine
+                                  Options: ${colors.gray}[--key <key>] [--auth-user <u>] [--auth-pass <p>]${colors.reset}
 
 ${colors.bold}PROJECT CONTROL:${colors.reset}
   ${colors.green}project <slug|id>${colors.reset}               Show project overview
@@ -1251,11 +1249,6 @@ async function main() {
     process.exit(0);
   }
 
-  if (command === 'version' || command === '-v' || command === '--version') {
-    console.log(`${colors.bold}${colors.brightWhite}RushDeploy CLI${colors.reset} ${colors.gray}v1.0.7${colors.reset}`);
-    process.exit(0);
-  }
-
   switch (command) {
     case 'login': {
       const token = args[1];
@@ -1264,13 +1257,13 @@ async function main() {
         console.log(`  Usage: ${colors.green}rushdeploy login <token> [--server <url>]${colors.reset}`);
         process.exit(1);
       }
-
+      
       let server = null;
       const serverIndex = args.indexOf('--server');
       if (serverIndex !== -1 && args[serverIndex + 1]) {
         server = args[serverIndex + 1];
       }
-
+      
       await cmdLogin(token, server);
       break;
     }
@@ -1287,7 +1280,6 @@ async function main() {
       await cmdStatus();
       break;
     case 'projects':
-    case 'ls':
       await cmdProjects();
       break;
     case 'repos':
@@ -1299,68 +1291,6 @@ async function main() {
       await cmdDeploy(type, deployArgs);
       break;
     }
-    case 'open':
-    case 'visit': {
-      const target = args[1];
-      if (!target) {
-        ui.stepError(`Usage: rushdeploy open <slug|id>`);
-        process.exit(1);
-      }
-      await cmdProject(target, 'visit', []);
-      break;
-    }
-    case 'logs': {
-      const target = args[1];
-      if (!target) {
-        ui.stepError(`Usage: rushdeploy logs <slug|id> [--lines <N>]`);
-        process.exit(1);
-      }
-      await cmdProject(target, 'logs', args.slice(2));
-      break;
-    }
-    case 'start': {
-      const target = args[1];
-      if (!target) {
-        ui.stepError(`Usage: rushdeploy start <slug|id>`);
-        process.exit(1);
-      }
-      await cmdProject(target, 'start', []);
-      break;
-    }
-    case 'stop': {
-      const target = args[1];
-      if (!target) {
-        ui.stepError(`Usage: rushdeploy stop <slug|id>`);
-        process.exit(1);
-      }
-      await cmdProject(target, 'stop', []);
-      break;
-    }
-    case 'restart':
-    case 'redeploy': {
-      const target = args[1];
-      if (!target) {
-        ui.stepError(`Usage: rushdeploy restart <slug|id>`);
-        process.exit(1);
-      }
-      await cmdProject(target, 'redeploy', []);
-      break;
-    }
-    case 'delete':
-    case 'remove': {
-      const target = args[1];
-      if (!target) {
-        ui.stepError(`Usage: rushdeploy delete <slug|id>`);
-        process.exit(1);
-      }
-      const id = await resolveProjectId(target);
-      ui.stepInfo(`Deleting project ${id}...`);
-      const res = await makeRequest(`/projects/${id}`, 'DELETE');
-      if (res.success) {
-        ui.step(`Project deleted successfully.`);
-      }
-      break;
-    }
     case 'project': {
       const idOrSlug = args[1];
       if (!idOrSlug) {
@@ -1383,7 +1313,6 @@ async function main() {
   }
 }
 
-
 main().catch(err => {
   ui.stepError(`Fatal Error: ${err.message}`);
   process.exit(1);

package/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "rushdeploy",
-  "version": "1.0.7",
-  "description": "CLI tool to manage your self-hosted RushDeploy PaaS account.",
-  "main": "bin/index.js",
-  "bin": {
-    "rushdeploy": "bin/index.js"
-  },
-  "type": "commonjs",
-  "scripts": {
-    "start": "node bin/index.js"
-  },
-  "keywords": [
-    "rushdeploy",
-    "paas",
-    "cli"
-  ],
-  "author": "RushDeploy Team",
-  "license": "MIT",
-  "files": [
-    "bin",
-    "README.md"
-  ]
+{
+  "name": "rushdeploy",
+  "version": "1.0.9",
+  "description": "CLI tool to manage your self-hosted RushDeploy PaaS account.",
+  "main": "bin/index.js",
+  "bin": {
+    "rushdeploy": "bin/index.js"
+  },
+  "type": "commonjs",
+  "scripts": {
+    "start": "node bin/index.js"
+  },
+  "keywords": [
+    "rushdeploy",
+    "paas",
+    "cli"
+  ],
+  "author": "RushDeploy Team",
+  "license": "MIT",
+  "files": [
+    "bin",
+    "README.md"
+  ]
 }