easy-devops 0.1.1 → 0.1.3

package/cli/index.js

@@ -11,6 +11,7 @@ import sslMenu from './menus/ssl.js';
 import domainsMenu from './menus/domains.js';
 import dashboardMenu from './menus/dashboard.js';
 import settingsMenu from './menus/settings.js';
+import updateMenu from './menus/update.js';
 
 const require = createRequire(import.meta.url);
 const { version } = require('../package.json');
@@ -44,6 +45,7 @@ async function showMainMenu() {
       '🔗 Domain Manager',
       '🎛️ Open Dashboard',
       '⚙️ Settings',
+      '🔄 Check for Updates',
       '✖ Exit',
     ],
   }]);
@@ -58,6 +60,7 @@ async function dispatch(choice) {
     case '🔗 Domain Manager': await domainsMenu(); break;
     case '🎛️ Open Dashboard': await dashboardMenu(); break;
     case '⚙️ Settings': await settingsMenu(); break;
+    case '🔄 Check for Updates': await updateMenu(); break;
     case '✖ Exit': process.exit(0);
   }
 }

package/cli/managers/nginx-manager.js

@@ -15,6 +15,7 @@ import inquirer from 'inquirer';
 import ora from 'ora';
 import { run, runLive } from '../../core/shell.js';
 import { loadConfig } from '../../core/config.js';
+import { ensureNginxInclude } from '../../core/nginx-conf-generator.js';
 
 const isWindows = process.platform === 'win32';
 
@@ -51,6 +52,7 @@ async function getNginxStatus(nginxDir) {
 // ─── testConfig ───────────────────────────────────────────────────────────────
 
 async function testConfig(nginxExe, nginxDir) {
+  await ensureNginxInclude(nginxDir);
   const cmd = isWindows ? `& "${nginxExe}" -t` : 'nginx -t';
   const result = await run(cmd, { cwd: nginxDir });
   return {

package/cli/managers/ssl-manager.js

@@ -242,25 +242,84 @@ async function renewExpiring(certs) {
 // ─── installCertbot ───────────────────────────────────────────────────────────
 
 async function installCertbot() {
-  if (isWindows) {
-    // Official EFF certbot package via winget — installs to
-    // C:\Program Files\Certbot\bin\ and adds it to the system PATH.
-    // pip install certbot is NOT used: it lands in a user Python Scripts
-    // folder that is not on PATH and cannot renew certs system-wide.
+  if (!isWindows) {
+    const exitCode = await runLive('sudo apt-get install -y certbot', { timeout: 180000 });
+    return { success: exitCode === 0 };
+  }
+
+  // ── Windows: winget → Chocolatey → direct EFF installer ──────────────────────
+
+  // 1. Try winget (Windows 10/11 desktop; not on Windows Server by default)
+  const wingetCheck = await run('where.exe winget 2>$null');
+  if (wingetCheck.success && wingetCheck.stdout.trim().length > 0) {
     console.log(chalk.gray('\n  Installing via winget (EFF.Certbot) ...\n'));
     const exitCode = await runLive(
       'winget install -e --id EFF.Certbot --accept-package-agreements --accept-source-agreements',
       { timeout: 180000 },
     );
-    if (exitCode !== 0) return { success: false };
-    // winget updates the system PATH but the current session won't see it yet.
-    // Verify via the known exe path directly.
-    const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
-    return { success: check.stdout.trim().toLowerCase() === 'true' };
+    if (exitCode === 0) {
+      const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
+      return { success: check.stdout.trim().toLowerCase() === 'true' };
+    }
+    console.log(chalk.yellow('  winget failed, trying Chocolatey...\n'));
   }
 
-  const exitCode = await runLive('sudo apt-get install -y certbot', { timeout: 180000 });
-  return { success: exitCode === 0 };
+  // 2. Try Chocolatey (common on Windows Server)
+  const chocoCheck = await run('where.exe choco 2>$null');
+  if (chocoCheck.success && chocoCheck.stdout.trim().length > 0) {
+    console.log(chalk.gray('\n  Installing via Chocolatey ...\n'));
+    const exitCode = await runLive('choco install certbot -y', { timeout: 180000 });
+    if (exitCode === 0) {
+      const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
+      return { success: check.stdout.trim().toLowerCase() === 'true' };
+    }
+    console.log(chalk.yellow('  Chocolatey failed, trying direct download...\n'));
+  }
+
+  // 3. Direct download — try multiple sources in order
+  const INSTALLER_FILENAME = 'certbot-beta-installer-win_amd64_signed.exe';
+  const downloadSources = [
+    `https://github.com/certbot/certbot/releases/latest/download/${INSTALLER_FILENAME}`,
+    `https://dl.eff.org/${INSTALLER_FILENAME}`,
+  ];
+
+  let downloaded = false;
+  for (const url of downloadSources) {
+    const label = new URL(url).hostname;
+    console.log(chalk.gray(`\n  Downloading certbot installer from ${label} ...\n`));
+
+    const downloadResult = await run(
+      `$ProgressPreference='SilentlyContinue'; Invoke-WebRequest -Uri '${url}' -OutFile "$env:TEMP\\certbot-installer.exe" -UseBasicParsing -TimeoutSec 120`,
+      { timeout: 130000 },
+    );
+
+    if (downloadResult.success) {
+      downloaded = true;
+      break;
+    }
+
+    console.log(chalk.yellow(`  Failed from ${label}: ${(downloadResult.stderr || downloadResult.stdout).split('\n')[0].trim()}`));
+  }
+
+  if (!downloaded) {
+    console.log(chalk.red('\n  Download failed from all sources.'));
+    console.log(chalk.gray('  Install manually: https://certbot.eff.org/instructions?ws=other&os=windows\n'));
+    return { success: false };
+  }
+
+  console.log(chalk.gray('  Running installer silently ...\n'));
+
+  await run(
+    `Start-Process -FilePath "$env:TEMP\\certbot-installer.exe" -ArgumentList '/S' -Wait -NoNewWindow`,
+    { timeout: 120000 },
+  );
+
+  // Cleanup installer
+  await run(`Remove-Item -Force "$env:TEMP\\certbot-installer.exe" -ErrorAction SilentlyContinue`);
+
+  // Verify
+  const check = await run(`Test-Path "${CERTBOT_WIN_EXE}"`);
+  return { success: check.stdout.trim().toLowerCase() === 'true' };
 }
 
 // ─── showSslManager ───────────────────────────────────────────────────────────

package/cli/menus/dashboard.js

@@ -69,7 +69,7 @@ function isPidAlive(pid) {
 
 // ─── Status ───────────────────────────────────────────────────────────────────
 
-async function getDashboardStatus() {
+export async function getDashboardStatus() {
   const { dashboardPort } = loadConfig();
   const storedPid  = dbGet('dashboard-pid');
   const storedPort = dbGet('dashboard-port') ?? dashboardPort;
@@ -91,7 +91,7 @@ async function getDashboardStatus() {
 
 // ─── Start ────────────────────────────────────────────────────────────────────
 
-async function startDashboard(port) {
+export async function startDashboard(port) {
   await fs.mkdir(path.dirname(LOG_PATH), { recursive: true });
 
   // openSync gives a real fd immediately — required by spawn's stdio option
@@ -118,7 +118,7 @@ async function startDashboard(port) {
 
 // ─── Stop ─────────────────────────────────────────────────────────────────────
 
-async function stopDashboard(pid) {
+export async function stopDashboard(pid) {
   if (!pid) return { success: false };
   try {
     if (isWindows) {

package/cli/menus/update.js

@@ -0,0 +1,178 @@
+/**
+ * cli/menus/update.js
+ *
+ * Check for updates and upgrade easy-devops in place.
+ *
+ * Flow:
+ *  1. Fetch latest version from npm registry
+ *  2. If an update is available, offer to install it
+ *  3. Before installing: record dashboard running state in DB
+ *     (key: 'update-pre-dashboard') so it survives a crash mid-update
+ *  4. Stop dashboard if it was running
+ *  5. Run: npm install -g easy-devops@<latest>
+ *  6. Re-start dashboard if it was running before
+ *  7. Clear the saved state key
+ */
+
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import ora from 'ora';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
+import { run } from '../../core/shell.js';
+import { dbGet, dbSet } from '../../core/db.js';
+import { loadConfig } from '../../core/config.js';
+import { getDashboardStatus, startDashboard, stopDashboard } from './dashboard.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require   = createRequire(import.meta.url);
+const { version: currentVersion } = require('../../package.json');
+
+// ─── Version helpers ──────────────────────────────────────────────────────────
+
+async function fetchLatestVersion() {
+  const result = await run('npm view easy-devops version', { timeout: 20000 });
+  if (result.success && result.stdout.trim()) return result.stdout.trim();
+  return null;
+}
+
+function isNewer(latest, current) {
+  const parse = v => v.replace(/^v/, '').split('.').map(Number);
+  const [la, lb, lc] = parse(latest);
+  const [ca, cb, cc] = parse(current);
+  if (la !== ca) return la > ca;
+  if (lb !== cb) return lb > cb;
+  return lc > cc;
+}
+
+// ─── Recover interrupted update ───────────────────────────────────────────────
+// If a previous update crashed after stopping the dashboard but before restarting
+// it, the key 'update-pre-dashboard' is still set. Offer to restart it.
+
+async function recoverIfNeeded() {
+  const saved = dbGet('update-pre-dashboard');
+  if (!saved?.wasRunning) return;
+
+  console.log(chalk.yellow('\n  A previous update left the dashboard stopped.'));
+  const { restart } = await inquirer.prompt([{
+    type:    'confirm',
+    name:    'restart',
+    message: 'Restart the dashboard now?',
+    default: true,
+  }]);
+
+  if (restart) {
+    const port = saved.port || loadConfig().dashboardPort;
+    const sp   = ora(`Starting dashboard on port ${port}...`).start();
+    const res  = await startDashboard(port);
+    res.success
+      ? sp.succeed(`Dashboard restarted on port ${port}`)
+      : sp.fail('Could not restart dashboard — use the Dashboard menu');
+  }
+
+  dbSet('update-pre-dashboard', null);
+}
+
+// ─── Perform update ───────────────────────────────────────────────────────────
+
+async function performUpdate(latestVersion) {
+  // Step 1 — snapshot dashboard state and persist it
+  const status = await getDashboardStatus();
+  dbSet('update-pre-dashboard', {
+    wasRunning: status.running,
+    pid:        status.pid,
+    port:       status.port,
+  });
+
+  // Step 2 — stop dashboard if running
+  if (status.running) {
+    const sp = ora('Stopping dashboard...').start();
+    await stopDashboard(status.pid);
+    sp.succeed('Dashboard stopped');
+  }
+
+  // Step 3 — install new version
+  const sp = ora(`Installing easy-devops@${latestVersion}...`).start();
+  const result = await run(`npm install -g easy-devops@${latestVersion}`, { timeout: 120000 });
+
+  if (!result.success) {
+    sp.fail('Update failed');
+    console.log(chalk.red('\n' + (result.stderr || result.stdout) + '\n'));
+    // Leave 'update-pre-dashboard' in DB so recovery runs on next launch
+    return false;
+  }
+
+  sp.succeed(`Updated to v${latestVersion}`);
+
+  // Step 4 — restart dashboard if it was running before
+  const saved = dbGet('update-pre-dashboard');
+  dbSet('update-pre-dashboard', null);
+
+  if (saved?.wasRunning) {
+    const port    = saved.port || loadConfig().dashboardPort;
+    const restSp  = ora(`Restarting dashboard on port ${port}...`).start();
+    const res     = await startDashboard(port);
+    res.success
+      ? restSp.succeed(`Dashboard restarted on port ${port}`)
+      : restSp.fail('Could not restart dashboard — use the Dashboard menu');
+  }
+
+  return true;
+}
+
+// ─── Menu ─────────────────────────────────────────────────────────────────────
+
+export default async function updateMenu() {
+  // Recover from a crashed previous update first
+  await recoverIfNeeded();
+
+  const spinner = ora('Checking for updates...').start();
+  const latestVersion = await fetchLatestVersion();
+  spinner.stop();
+
+  console.log(chalk.bold('\n  Check for Updates'));
+  console.log(chalk.gray('  ' + '─'.repeat(40)));
+  console.log(`  Current version : ${chalk.cyan('v' + currentVersion)}`);
+
+  if (!latestVersion) {
+    console.log(chalk.yellow('  Could not reach npm registry. Check your internet connection.\n'));
+    await inquirer.prompt([{ type: 'input', name: '_', message: 'Press Enter to go back...' }]);
+    return;
+  }
+
+  const updateAvailable = isNewer(latestVersion, currentVersion);
+
+  if (updateAvailable) {
+    console.log(`  Latest version  : ${chalk.green('v' + latestVersion)}  ${chalk.yellow('← update available')}\n`);
+  } else {
+    console.log(`  Latest version  : ${chalk.green('v' + latestVersion)}  ${chalk.gray('✓ up to date')}\n`);
+  }
+
+  const choices = updateAvailable
+    ? [`Update to v${latestVersion}`, new inquirer.Separator(), '← Back']
+    : ['← Back'];
+
+  let choice;
+  try {
+    ({ choice } = await inquirer.prompt([{
+      type:    'list',
+      name:    'choice',
+      message: 'Select an option:',
+      choices,
+    }]));
+  } catch (err) {
+    if (err.name === 'ExitPromptError') return;
+    throw err;
+  }
+
+  if (choice === `Update to v${latestVersion}`) {
+    const success = await performUpdate(latestVersion);
+    if (success) {
+      console.log(chalk.gray('\n  Restart easy-devops to use the new version.\n'));
+    }
+    try {
+      await inquirer.prompt([{ type: 'input', name: '_', message: 'Press Enter to continue...' }]);
+    } catch { /* ExitPromptError */ }
+  }
+}

package/core/nginx-conf-generator.js

@@ -11,6 +11,63 @@ import fs from 'fs/promises';
 import path from 'path';
 import { loadConfig } from './config.js';
 
+const isWindows = process.platform === 'win32';
+
+/** Returns the conf.d directory for domain config files. */
+function getConfDDir(nginxDir) {
+  return isWindows
+    ? path.join(nginxDir, 'conf', 'conf.d')
+    : path.join(nginxDir, 'conf.d');
+}
+
+/** Returns the path to nginx.conf. */
+function getNginxConfPath(nginxDir) {
+  return isWindows
+    ? path.join(nginxDir, 'conf', 'nginx.conf')
+    : path.join(nginxDir, 'nginx.conf');
+}
+
+/** Returns the include directive line for this platform. */
+function buildIncludeLine(nginxDir) {
+  if (isWindows) {
+    const fwd = nginxDir.replace(/\\/g, '/');
+    return `    include "${fwd}/conf/conf.d/*.conf";`;
+  }
+  return `    include ${nginxDir}/conf.d/*.conf;`;
+}
+
+/**
+ * Ensures that nginx.conf contains an include directive for conf.d/*.conf.
+ * If the line is missing it is inserted just before the closing } of the http block.
+ * @param {string} nginxDir
+ */
+export async function ensureNginxInclude(nginxDir) {
+  const confPath = getNginxConfPath(nginxDir);
+
+  let content;
+  try {
+    content = await fs.readFile(confPath, 'utf8');
+  } catch {
+    return; // nginx.conf not present yet — skip silently
+  }
+
+  // Already has a conf.d include
+  if (/include\s+[^\n]*conf\.d[^\n]*\*\.conf/.test(content)) return;
+
+  const includeLine = buildIncludeLine(nginxDir);
+
+  // Insert before the last } in the file (closes the http block)
+  const lastBrace = content.lastIndexOf('}');
+  if (lastBrace === -1) return;
+
+  const newContent =
+    content.slice(0, lastBrace) +
+    `${includeLine}\n` +
+    content.slice(lastBrace);
+
+  await fs.writeFile(confPath, newContent, 'utf8');
+}
+
 // ─── DOMAIN DEFAULTS (v2 schema) ─────────────────────────────────────────────
 
 export const DOMAIN_DEFAULTS = {
@@ -274,13 +331,17 @@ export function buildConf(domain, nginxDir, certbotDir) {
  */
 export async function generateConf(domain) {
   const { nginxDir, certbotDir } = loadConfig();
-  const confPath = path.join(nginxDir, 'conf.d', `${domain.name}.conf`);
+  const confDir = getConfDDir(nginxDir);
+  const confPath = path.join(confDir, `${domain.name}.conf`);
   const confContent = buildConf(domain, nginxDir, certbotDir);
 
   // Ensure conf.d directory exists
-  await fs.mkdir(path.dirname(confPath), { recursive: true });
+  await fs.mkdir(confDir, { recursive: true });
   await fs.writeFile(confPath, confContent, 'utf8');
 
+  // Ensure nginx.conf includes conf.d
+  await ensureNginxInclude(nginxDir);
+
   // Update domain with config file path
   domain.configFile = confPath;
   domain.updatedAt = new Date().toISOString();

package/dashboard/lib/nginx-service.js

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { run } from '../../core/shell.js';
 import { loadConfig } from '../../core/config.js';
+import { ensureNginxInclude } from '../../core/nginx-conf-generator.js';
 
 // ─── Error Types ──────────────────────────────────────────────────────────────
 
@@ -23,6 +24,12 @@ function getNginxDir() {
   return nginxDir;
 }
 
+function getConfDDir(nginxDir) {
+  return process.platform === 'win32'
+    ? path.join(nginxDir, 'conf', 'conf.d')
+    : path.join(nginxDir, 'conf.d');
+}
+
 /**
  * Returns the PS-safe invocation string for the nginx binary.
  * On Windows: checks PATH first, then falls back to configured nginxDir.
@@ -50,7 +57,7 @@ export function validateFilename(filename) {
     throw new InvalidFilenameError('Invalid filename');
   }
   const nginxDir = getNginxDir();
-  const confDir = path.join(nginxDir, 'conf.d');
+  const confDir = getConfDDir(nginxDir);
   const resolved = path.resolve(path.join(confDir, filename));
   if (!resolved.startsWith(path.resolve(confDir))) {
     throw new InvalidFilenameError('Invalid filename');
@@ -135,6 +142,7 @@ export async function start() {
   }
 
   // Test config before starting
+  await ensureNginxInclude(nginxDir);
   const testResult = await run(`${nginxExe} -t`);
   if (!testResult.success) {
     return { success: false, output: combineOutput(testResult) };
@@ -201,11 +209,13 @@ export async function stop() {
 
 export async function test() {
   const nginxExe = getNginxExe();
+  const nginxDir = getNginxDir();
   const versionResult = await run(`${nginxExe} -v`);
   if (!versionResult.success && !versionResult.stderr.includes('nginx/')) {
     throw new NginxNotFoundError('nginx binary not found');
   }
 
+  await ensureNginxInclude(nginxDir);
   const result = await run(`${nginxExe} -t`);
   return { success: result.success, output: combineOutput(result) };
 }
@@ -214,7 +224,7 @@ export async function test() {
 
 export async function listConfigs() {
   const nginxDir = getNginxDir();
-  const confDir = path.join(nginxDir, 'conf.d');
+  const confDir = getConfDDir(nginxDir);
   let entries;
   try {
     entries = await fs.readdir(confDir);
@@ -228,7 +238,7 @@ export async function listConfigs() {
 export async function getConfig(filename) {
   validateFilename(filename);
   const nginxDir = getNginxDir();
-  const confPath = path.join(nginxDir, 'conf.d', filename);
+  const confPath = path.join(getConfDDir(nginxDir), filename);
   const content = await fs.readFile(confPath, 'utf8');
   return { content };
 }
@@ -236,7 +246,7 @@ export async function getConfig(filename) {
 export async function saveConfig(filename, content) {
   validateFilename(filename);
   const nginxDir = getNginxDir();
-  const confPath = path.join(nginxDir, 'conf.d', filename);
+  const confPath = path.join(getConfDDir(nginxDir), filename);
   const backupPath = confPath + '.bak';
 
   // Backup only if the file already exists (it may be a new file)
@@ -252,6 +262,7 @@ export async function saveConfig(filename, content) {
   await fs.writeFile(confPath, content, 'utf8');
 
   const nginxExe = getNginxExe();
+  await ensureNginxInclude(nginxDir);
   const result = await run(`${nginxExe} -t`);
   if (!result.success) {
     if (hasBackup) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-devops",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "A unified DevOps management tool with CLI and web dashboard for managing Nginx, SSL certificates, and Node.js on Linux and Windows servers.",
   "keywords": [
     "devops",