easy-devops 0.1.0 → 0.1.2

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 {
@@ -222,23 +224,95 @@ async function stopNginx(nginxDir) {
 // ─── installNginx ─────────────────────────────────────────────────────────────
 
 async function installNginx() {
-  const spinner = ora('Installing nginx…').start();
-
-  const cmd = isWindows
-    ? 'winget install -e --id Nginx.Nginx --accept-package-agreements --accept-source-agreements'
-    : 'sudo apt-get install -y nginx';
-
-  const result = await run(cmd, { timeout: 120000 });
-
-  if (result.success) {
-    spinner.succeed('nginx installed successfully');
-    return { success: true, message: 'nginx installed successfully', output: result.stdout };
-  } else {
+  if (!isWindows) {
+    const spinner = ora('Installing nginx…').start();
+    const result = await run('sudo apt-get install -y nginx', { timeout: 120000 });
+    if (result.success) {
+      spinner.succeed('nginx installed successfully');
+      return { success: true, message: 'nginx installed successfully', output: result.stdout };
+    }
     spinner.fail('Installation failed');
     console.log(chalk.red(result.stderr || result.stdout));
     console.log(chalk.gray('\n  Manual instructions: https://nginx.org/en/docs/install.html\n'));
     return { success: false, message: 'Installation failed', output: result.stderr || result.stdout };
   }
+
+  // ── Windows ──────────────────────────────────────────────────────────────────
+  const spinner = ora('Checking for winget…').start();
+
+  // Try winget first (available on Windows 10/11 desktop; not on Windows Server by default)
+  const wingetCheck = await run('where.exe winget 2>$null');
+  const hasWinget = wingetCheck.success && wingetCheck.stdout.trim().length > 0;
+
+  if (hasWinget) {
+    spinner.text = 'Installing nginx via winget…';
+    const result = await run(
+      'winget install -e --id Nginx.Nginx --accept-package-agreements --accept-source-agreements',
+      { timeout: 120000 },
+    );
+    if (result.success) {
+      spinner.succeed('nginx installed successfully');
+      return { success: true, message: 'nginx installed successfully', output: result.stdout };
+    }
+    spinner.fail('winget install failed');
+    console.log(chalk.red(result.stderr || result.stdout));
+    console.log(chalk.gray('\n  Manual instructions: https://nginx.org/en/docs/install.html\n'));
+    return { success: false, message: 'Installation failed', output: result.stderr || result.stdout };
+  }
+
+  // ── Fallback: direct download from nginx.org ─────────────────────────────────
+  spinner.text = 'Fetching latest nginx version…';
+
+  // Try to resolve the current stable version; fall back to a known-good release
+  const FALLBACK_VERSION = '1.26.3';
+  let nginxVersion = FALLBACK_VERSION;
+
+  const fetchVersionResult = await run(
+    `try { $p=(Invoke-WebRequest -Uri 'https://nginx.org/en/download.html' -UseBasicParsing -TimeoutSec 15).Content; if($p -match 'nginx-(\\d+\\.\\d+\\.\\d+)\\.zip'){$Matches[1]}else{''} } catch { '' }`,
+    { timeout: 20000 },
+  );
+  const fetched = (fetchVersionResult.stdout || '').trim();
+  if (/^\d+\.\d+\.\d+$/.test(fetched)) nginxVersion = fetched;
+
+  const { nginxDir } = loadConfig();
+  const zipUrl = `https://nginx.org/download/nginx-${nginxVersion}.zip`;
+
+  spinner.text = `Downloading nginx ${nginxVersion}…`;
+
+  const downloadResult = await run(
+    `$ProgressPreference='SilentlyContinue'; Invoke-WebRequest -Uri '${zipUrl}' -OutFile "$env:TEMP\\nginx-${nginxVersion}.zip" -UseBasicParsing -TimeoutSec 120`,
+    { timeout: 130000 },
+  );
+
+  if (!downloadResult.success) {
+    spinner.fail('Download failed');
+    console.log(chalk.red(downloadResult.stderr || downloadResult.stdout));
+    console.log(chalk.gray(`\n  Download nginx manually from: https://nginx.org/en/download.html\n`));
+    return { success: false, message: 'Download failed', output: downloadResult.stderr || downloadResult.stdout };
+  }
+
+  spinner.text = 'Extracting nginx…';
+
+  const extractResult = await run(
+    `$ProgressPreference='SilentlyContinue'; $tmp="$env:TEMP\\nginx-extract-${nginxVersion}"; if(Test-Path $tmp){Remove-Item -Recurse -Force $tmp}; Expand-Archive -Path "$env:TEMP\\nginx-${nginxVersion}.zip" -DestinationPath $tmp -Force; $src=Join-Path $tmp 'nginx-${nginxVersion}'; if(-not(Test-Path '${nginxDir}')){New-Item -ItemType Directory -Force '${nginxDir}'|Out-Null}; Copy-Item -Path "$src\\*" -Destination '${nginxDir}' -Recurse -Force; Remove-Item -Recurse -Force $tmp -ErrorAction SilentlyContinue; Remove-Item -Force "$env:TEMP\\nginx-${nginxVersion}.zip" -ErrorAction SilentlyContinue`,
+    { timeout: 60000 },
+  );
+
+  if (!extractResult.success) {
+    spinner.fail('Extraction failed');
+    console.log(chalk.red(extractResult.stderr || extractResult.stdout));
+    return { success: false, message: 'Extraction failed', output: extractResult.stderr || extractResult.stdout };
+  }
+
+  // Verify nginx.exe is present
+  const verifyResult = await run(`Test-Path '${nginxDir}\\nginx.exe'`);
+  if (!verifyResult.success || !verifyResult.stdout.trim().toLowerCase().includes('true')) {
+    spinner.fail(`nginx.exe not found in ${nginxDir} after extraction`);
+    return { success: false, message: 'nginx.exe not found after extraction' };
+  }
+
+  spinner.succeed(`nginx ${nginxVersion} installed to ${nginxDir}`);
+  return { success: true, message: `nginx ${nginxVersion} installed successfully`, output: '' };
 }
 
 // ─── showNginxManager ─────────────────────────────────────────────────────────

package/cli/managers/ssl-manager.js

@@ -242,25 +242,68 @@ 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'));
+  }
+
+  // 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'));
   }
 
-  const exitCode = await runLive('sudo apt-get install -y certbot', { timeout: 180000 });
-  return { success: exitCode === 0 };
+  // 3. Direct download — official EFF installer (NSIS, supports /S silent flag)
+  const installerUrl = 'https://dl.eff.org/certbot-beta-installer-win_amd64_signed.exe';
+
+  console.log(chalk.gray('\n  Downloading certbot installer from dl.eff.org ...\n'));
+
+  const downloadResult = await run(
+    `$ProgressPreference='SilentlyContinue'; Invoke-WebRequest -Uri '${installerUrl}' -OutFile "$env:TEMP\\certbot-installer.exe" -UseBasicParsing -TimeoutSec 120`,
+    { timeout: 130000 },
+  );
+
+  if (!downloadResult.success) {
+    console.log(chalk.red('  Download failed: ' + (downloadResult.stderr || downloadResult.stdout)));
+    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/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/install.ps1

@@ -63,8 +63,54 @@ function Write-Err  { param([string]$msg) Write-Host "      ERROR   $msg" -Foreg
 function Write-Info { param([string]$msg) Write-Host "             $msg"  -ForegroundColor Gray   }
 
 function Refresh-Path {
-  $env:Path = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' +
-              [System.Environment]::GetEnvironmentVariable('Path', 'User')
+  # Read NVM vars from User scope, fall back to Machine scope
+  # (nvm-windows writes to Machine on system-wide installs)
+  $nvmHome = [System.Environment]::GetEnvironmentVariable('NVM_HOME', 'User')
+  if (-not $nvmHome) { $nvmHome = [System.Environment]::GetEnvironmentVariable('NVM_HOME', 'Machine') }
+  $nvmSymlink = [System.Environment]::GetEnvironmentVariable('NVM_SYMLINK', 'User')
+  if (-not $nvmSymlink) { $nvmSymlink = [System.Environment]::GetEnvironmentVariable('NVM_SYMLINK', 'Machine') }
+
+  if ($nvmHome)    { $env:NVM_HOME    = $nvmHome }
+  if ($nvmSymlink) { $env:NVM_SYMLINK = $nvmSymlink }
+
+  $raw = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' +
+         [System.Environment]::GetEnvironmentVariable('Path', 'User')
+
+  # Expand literal %NVM_HOME% / %NVM_SYMLINK% tokens nvm-windows may have written
+  if ($nvmHome)    { $raw = $raw -ireplace [regex]::Escape('%NVM_HOME%'),    $nvmHome }
+  if ($nvmSymlink) { $raw = $raw -ireplace [regex]::Escape('%NVM_SYMLINK%'), $nvmSymlink }
+
+  $env:Path = $raw
+
+  # Ensure NVM_SYMLINK is in PATH even if the registry entry was already absolute
+  if ($nvmSymlink -and (Test-Path $nvmSymlink -ErrorAction SilentlyContinue)) {
+    if ($env:Path -notlike "*$([regex]::Escape($nvmSymlink))*") {
+      $env:Path = "$nvmSymlink;$env:Path"
+    }
+  }
+}
+
+# Find nvm.exe: checks PATH first, then known install locations
+function Find-NvmExe {
+  try {
+    $f = (& where.exe nvm 2>$null)
+    if ($LASTEXITCODE -eq 0 -and $f) { return 'nvm' }
+  } catch {}
+
+  $candidates = @()
+  if ($env:NVM_HOME)    { $candidates += Join-Path $env:NVM_HOME    'nvm.exe' }
+  if ($env:APPDATA)     { $candidates += Join-Path $env:APPDATA     'nvm\nvm.exe' }
+  if ($env:ProgramData) { $candidates += Join-Path $env:ProgramData 'nvm\nvm.exe' }
+  $candidates += 'C:\ProgramData\nvm\nvm.exe'
+
+  foreach ($c in $candidates) {
+    if (Test-Path $c -ErrorAction SilentlyContinue) {
+      $dir = Split-Path $c -Parent
+      if ($env:Path -notlike "*$dir*") { $env:Path = "$dir;$env:Path" }
+      return $c
+    }
+  }
+  return $null
 }
 
 function Get-NodeMajor {
@@ -204,18 +250,29 @@ function Select-NodeVersion {
 }
 
 # ─── Detect install mode ──────────────────────────────────────────────────────
-# Source mode  = running from a git-cloned directory -> need npm install + link
-# Package mode = easy-devops already globally installed via npm
+# source  = running from a git-cloned project directory  -> npm install + npm link
+# update  = easy-devops already on PATH                  -> skip install steps
+# npm     = downloaded installer standalone              -> npm install -g easy-devops
+
+$scriptDir   = Split-Path -Parent $MyInvocation.MyCommand.Path
+$packageJson = Join-Path $scriptDir 'package.json'
 
-$scriptDir    = Split-Path -Parent $MyInvocation.MyCommand.Path
-$isSourceMode = $true
-$existingCmd  = $null
+$isSourceMode       = $false
+$isAlreadyInstalled = $false
+$existingCmd        = $null
 
+# Source mode: script dir has this project's package.json
+if (Test-Path $packageJson) {
+  try {
+    $pkg = Get-Content $packageJson -Raw | ConvertFrom-Json
+    if ($pkg.name -eq 'easy-devops') { $isSourceMode = $true }
+  } catch {}
+}
+
+# Already installed: easy-devops on PATH
 try {
   $existingCmd = (& where.exe easy-devops 2>$null)
-  if ($LASTEXITCODE -eq 0 -and $existingCmd) {
-    $isSourceMode = $false
-  }
+  if ($LASTEXITCODE -eq 0 -and $existingCmd) { $isAlreadyInstalled = $true }
 } catch {}
 
 # ─── Banner ───────────────────────────────────────────────────────────────────
@@ -225,13 +282,14 @@ Write-Host "  ==========================================" -ForegroundColor Cyan
 Write-Host "    Easy DevOps  --  Windows Installer" -ForegroundColor Cyan
 Write-Host "  ==========================================" -ForegroundColor Cyan
 
-if (-not $isSourceMode) {
-  Write-Host ""
-  Write-Host "  Mode: package  (easy-devops already installed at $existingCmd)" -ForegroundColor DarkGray
-  Write-Host "        Skipping npm install / npm link steps." -ForegroundColor DarkGray
+Write-Host ""
+if ($isAlreadyInstalled) {
+  Write-Host "  Mode: update  (easy-devops already installed at $existingCmd)" -ForegroundColor DarkGray
+  Write-Host "        Node.js will still be managed; npm steps skipped." -ForegroundColor DarkGray
+} elseif ($isSourceMode) {
+  Write-Host "  Mode: source  (project directory -- npm install + npm link)" -ForegroundColor DarkGray
 } else {
-  Write-Host ""
-  Write-Host "  Mode: source  (installing from project directory)" -ForegroundColor DarkGray
+  Write-Host "  Mode: npm     (will run: npm install -g easy-devops)" -ForegroundColor DarkGray
 }
 
 # ─── Step 1: Detect system ───────────────────────────────────────────────────
@@ -307,7 +365,7 @@ if ($KeepNode) {
     Write-Warn "Using fallback version $NODE_FALLBACK."
     $script:ltsVersions = @([PSCustomObject]@{ version = "v$NODE_FALLBACK.0.0"; lts = "LTS" })
   }
-  Add-Result "Node.js release list" $true "@($script:ltsVersions).Count LTS versions"
+  Add-Result "Node.js release list" $true "$(@($script:ltsVersions).Count) LTS versions fetched"
 }
 
 # ─── Step 3: Node.js version selection ───────────────────────────────────────
@@ -404,15 +462,35 @@ if ($NODE_ACTION -eq "keep") {
 } else {
   Write-Step "Installing nvm-windows"
 
-  # Check if nvm-windows is already present
-  try {
-    $nvmVersion = (& nvm version 2>$null).Trim()
-    if ($LASTEXITCODE -eq 0 -and $nvmVersion) {
-      Write-OK "nvm-windows $nvmVersion already installed"
-      Add-Result "nvm-windows" $true $nvmVersion
-      $nvmReady = $true
+  # Check if nvm-windows is already present (check PATH + known locations)
+  Refresh-Path
+  $nvmExeCheck = Find-NvmExe
+  if ($nvmExeCheck) {
+    try {
+      $nvmVersion = (& $nvmExeCheck version 2>$null).Trim()
+      if ($nvmVersion) {
+        Write-OK "nvm-windows $nvmVersion already installed"
+        Add-Result "nvm-windows" $true $nvmVersion
+        $nvmReady = $true
+      }
+    } catch {}
+  }
+
+  if (-not $nvmReady) {
+    # After Refresh-Path, try locating nvm at known paths
+    Refresh-Path
+    $nvmExePath = Find-NvmExe
+    if ($nvmExePath) {
+      try {
+        $nvmVersion = (& $nvmExePath version 2>$null).Trim()
+        if ($nvmVersion) {
+          Write-OK "nvm-windows $nvmVersion already installed (found after PATH refresh)"
+          Add-Result "nvm-windows" $true $nvmVersion
+          $nvmReady = $true
+        }
+      } catch {}
     }
-  } catch {}
+  }
 
   if (-not $nvmReady) {
     $skipNvm  = $false
@@ -480,53 +558,60 @@ if ($NODE_ACTION -eq "keep") {
 } else {
   Write-Step "Installing Node.js via nvm"
 
-  if ($nvmReady -and -not $nodeOK) {
-    # No compatible Node.js: install chosen version
+  if ($nvmReady -and (-not $nodeOK -or $NODE_ACTION -eq "upgrade" -or $NODE_ACTION -eq "switch")) {
     Write-Info "Installing Node.js $NODE_TARGET via nvm..."
-    try {
-      & nvm install $NODE_TARGET 2>&1 | ForEach-Object { Write-Info "  $_" }
-      & nvm use     $NODE_TARGET 2>&1 | ForEach-Object { Write-Info "  $_" }
-      Refresh-Path
-
-      $raw = (& node --version 2>$null).Trim()
-      if ($raw -match '^v') {
-        $nodeVersion = $raw
-        Write-OK "Node.js $nodeVersion installed and active"
-        Add-Result "Node.js install" $true $nodeVersion
-        $nodeOK = $true
-      } else {
-        Write-Warn "nvm install ran but node is not yet on PATH"
-        Write-Warn "Open a NEW terminal, then run:  nvm use $NODE_TARGET"
-        Add-Result "Node.js install" $false "PATH refresh needed -- open a new terminal"
+    $nvmExe = Find-NvmExe
+    if (-not $nvmExe) {
+      Write-Warn "nvm not found -- open a new terminal and run: nvm install $NODE_TARGET"
+      Add-Result "Node.js install" $false "nvm not found"
+    } else {
+      # IMPORTANT: do NOT pipe nvm output (2>&1 | ...).
+      # nvm.exe checks if its stdout is a real console; piping makes it think
+      # it is not in a terminal and it shows a GUI dialog instead of running.
+      $nvmRunOK = $true
+      try {
+        & $nvmExe install $NODE_TARGET
+        & $nvmExe use     $NODE_TARGET
+      } catch {
+        Write-Warn "nvm error: $_"
+        Add-Result "Node.js install" $false "nvm error -- see above"
+        $nvmRunOK = $false
       }
-    } catch {
-      Write-Warn "nvm node install error: $_"
-      Write-Warn "Open a new terminal and run:  nvm install $NODE_TARGET"
-      Add-Result "Node.js install" $false "Manual step needed"
-    }
-  } elseif ($nvmReady -and $nodeOK -and ($NODE_ACTION -eq "upgrade" -or $NODE_ACTION -eq "switch")) {
-    # Upgrade or switch: install the selected version
-    Write-Info "Installing Node.js $NODE_TARGET via nvm..."
-    try {
-      & nvm install $NODE_TARGET 2>&1 | ForEach-Object { Write-Info "  $_" }
-      & nvm use     $NODE_TARGET 2>&1 | ForEach-Object { Write-Info "  $_" }
-      Refresh-Path
-
-      $raw = (& node --version 2>$null).Trim()
-      if ($raw -match '^v') {
-        $nodeVersion = $raw
-        Write-OK "Node.js $nodeVersion active"
-        Add-Result "Node.js install" $true $nodeVersion
-        $nodeOK = $true
-      } else {
-        Write-Warn "node not yet on PATH -- open a new terminal and run: nvm use $NODE_TARGET"
-        Add-Result "Node.js install" $false "PATH refresh needed"
-        $nodeOK = $false
+
+      if ($nvmRunOK) {
+        # PATH in this session may still be stale after nvm use.
+        # Read NVM_SYMLINK directly from registry and call node.exe by full path.
+        Refresh-Path
+        $raw = ""
+        try { $raw = (& node --version 2>&1).Trim() } catch {}
+
+        if (-not ($raw -match '^v')) {
+          $nvmSym = [System.Environment]::GetEnvironmentVariable('NVM_SYMLINK', 'Machine')
+          if (-not $nvmSym) { $nvmSym = [System.Environment]::GetEnvironmentVariable('NVM_SYMLINK', 'User') }
+          if ($nvmSym) {
+            $nodeExe = Join-Path $nvmSym 'node.exe'
+            if (Test-Path $nodeExe -ErrorAction SilentlyContinue) {
+              # Add to PATH so npm also works in the rest of this script
+              if ($env:Path -notlike "*$([regex]::Escape($nvmSym))*") {
+                $env:Path = "$nvmSym;$env:Path"
+              }
+              try { $raw = (& $nodeExe --version 2>&1).Trim() } catch {}
+            }
+          }
+        }
+
+        if ($raw -match '^v') {
+          $nodeVersion = $raw
+          Write-OK "Node.js $nodeVersion installed and active"
+          Add-Result "Node.js install" $true $nodeVersion
+          $nodeOK = $true
+        } else {
+          Write-Warn "Node.js installed but PATH not yet updated in this session"
+          Write-Warn "Open a new terminal and run:  nvm use $NODE_TARGET"
+          Add-Result "Node.js install" $false "PATH refresh needed -- open a new terminal"
+          $nodeOK = $false
+        }
       }
-    } catch {
-      Write-Warn "nvm error: $_ -- open a new terminal and run: nvm use $NODE_TARGET"
-      Add-Result "Node.js install" $false "Manual step needed"
-      $nodeOK = $false
     }
   } elseif (-not $nvmReady -and $nodeOK) {
     # nvm not available but Node >= 18 already present: skip
@@ -539,82 +624,106 @@ if ($NODE_ACTION -eq "keep") {
   }
 }
 
-# ─── Source-mode steps ────────────────────────────────────────────────────────
+# ─── Steps 6 + 7: Install Easy DevOps & register CLI ─────────────────────────
 
-if (-not $isSourceMode) {
-  # Package mode: steps 6+7 skipped
-  Write-Step "Installing Easy DevOps dependencies"
-  Write-OK "Skipped (package mode -- easy-devops already installed)"
-  Add-Result "npm install" $true "Skipped (package mode)"
+if ($isAlreadyInstalled) {
+  # ── Already installed: skip both steps ──────────────────────────────────────
+  Write-Step "Installing Easy DevOps"
+  Write-OK "Skipped (easy-devops already installed at $existingCmd)"
+  Add-Result "npm install" $true "Skipped (already installed)"
 
   Write-Step "Registering global command"
-  Write-OK "Skipped (package mode)"
-  Add-Result "CLI registered" $true "Skipped (package mode)"
-} else {
-
-# ─── Step 6: npm install ─────────────────────────────────────────────────────
-
-Write-Step "Installing Easy DevOps dependencies"
+  Write-OK "Skipped (already registered)"
+  Add-Result "CLI registered" $true "Skipped (already installed)"
 
-$packageJson = Join-Path $scriptDir "package.json"
-if (-not (Test-Path $packageJson)) {
-  Write-Err "package.json not found at: $packageJson"
-  Write-Err "Run this installer from the Easy DevOps project root."
-  exit 1
-}
+} elseif ($isSourceMode) {
+  # ── Source mode: npm install in project dir + npm link ───────────────────────
+  Write-Step "Installing Easy DevOps dependencies"
 
-if (-not $nodeOK) {
-  Write-Warn "Skipping -- Node.js is not ready. Re-run install.ps1 after setting up Node.js."
-  Add-Result "npm install" $false "Skipped -- Node.js not ready"
-} else {
-  try {
-    Push-Location $scriptDir
-    Write-Info "Running npm install..."
-    & npm install
-    if ($LASTEXITCODE -ne 0) {
-      Write-Err "npm install failed (exit code $LASTEXITCODE)"
-      Add-Result "npm install" $false "Exit code $LASTEXITCODE"
+  if (-not $nodeOK) {
+    Write-Warn "Skipping -- Node.js is not ready. Open a new terminal and re-run install.ps1."
+    Add-Result "npm install" $false "Skipped -- Node.js not ready"
+  } else {
+    try {
+      Push-Location $scriptDir
+      Write-Info "Running npm install..."
+      & npm install
+      if ($LASTEXITCODE -ne 0) {
+        Write-Err "npm install failed (exit code $LASTEXITCODE)"
+        Add-Result "npm install" $false "Exit code $LASTEXITCODE"
+        exit 1
+      }
+      Write-OK "All dependencies installed"
+      Add-Result "npm install" $true ""
+    } catch {
+      Write-Err "npm install error: $_"
+      Add-Result "npm install" $false "$_"
       exit 1
+    } finally {
+      Pop-Location
     }
-    Write-OK "All dependencies installed"
-    Add-Result "npm install" $true ""
-  } catch {
-    Write-Err "npm install error: $_"
-    Add-Result "npm install" $false "$_"
-    exit 1
-  } finally {
-    Pop-Location
   }
-}
 
-# ─── Step 7: npm link ────────────────────────────────────────────────────────
+  Write-Step "Registering global command"
 
-Write-Step "Registering global command"
+  if (-not $nodeOK) {
+    Write-Warn "Skipping -- Node.js is not ready"
+    Add-Result "CLI registered" $false "Skipped -- Node.js not ready"
+  } else {
+    try {
+      Push-Location $scriptDir
+      & npm link
+      if ($LASTEXITCODE -ne 0) {
+        Write-Warn "npm link failed -- CLI won't be globally available"
+        Write-Warn "You can still run:  node cli/index.js"
+        Add-Result "CLI registered" $false "Exit code $LASTEXITCODE"
+      } else {
+        Write-OK "easy-devops command linked globally"
+        Add-Result "CLI registered" $true ""
+      }
+    } catch {
+      Write-Warn "npm link failed: $_ -- run: node cli/index.js"
+      Add-Result "CLI registered" $false "$_"
+    } finally {
+      Pop-Location
+    }
+  }
 
-if (-not $nodeOK) {
-  Write-Warn "Skipping -- Node.js is not ready"
-  Add-Result "CLI registered" $false "Skipped -- Node.js not ready"
 } else {
-  try {
-    Push-Location $scriptDir
-    & npm link
-    if ($LASTEXITCODE -ne 0) {
-      Write-Warn "npm link failed -- CLI won't be globally available"
-      Write-Warn "You can still run:  node cli/index.js"
-      Add-Result "CLI registered" $false "Exit code $LASTEXITCODE"
-    } else {
-      Write-OK "easy-devops command linked globally"
-      Add-Result "CLI registered" $true ""
+  # ── npm global mode: npm install -g easy-devops ──────────────────────────────
+  Write-Step "Installing Easy DevOps"
+
+  if (-not $nodeOK) {
+    Write-Warn "Skipping -- Node.js is not ready."
+    Write-Warn "Open a new terminal and run:  npm install -g easy-devops"
+    Add-Result "npm install" $false "Skipped -- Node.js not ready"
+  } else {
+    try {
+      Write-Info "Running npm install -g easy-devops..."
+      & npm install -g easy-devops
+      if ($LASTEXITCODE -ne 0) {
+        Write-Err "npm install -g easy-devops failed (exit code $LASTEXITCODE)"
+        Add-Result "npm install" $false "Exit code $LASTEXITCODE"
+        exit 1
+      }
+      Write-OK "easy-devops installed globally"
+      Add-Result "npm install" $true "npm install -g easy-devops"
+    } catch {
+      Write-Err "npm install -g error: $_"
+      Add-Result "npm install" $false "$_"
+      exit 1
     }
-  } catch {
-    Write-Warn "npm link failed: $_ -- run: node cli/index.js"
-    Add-Result "CLI registered" $false "$_"
-  } finally {
-    Pop-Location
   }
-}
 
-} # end source-mode block
+  Write-Step "Registering global command"
+  if ($nodeOK) {
+    Write-OK "Registered via npm install -g"
+    Add-Result "CLI registered" $true "npm install -g"
+  } else {
+    Write-Warn "Skipped -- Node.js not ready"
+    Add-Result "CLI registered" $false "Skipped -- Node.js not ready"
+  }
+}
 
 # ─── Summary (mirrors install.sh summary block) ───────────────────────────────
 

package/install.sh

@@ -23,11 +23,35 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 EASYDEVOPS_DIR="${EASYDEVOPS_DIR:-$SCRIPT_DIR}"
 
 # ---------------------------------------------------------------------------
-# Source lib modules
+# Source lib modules (auto-download if running standalone)
 # ---------------------------------------------------------------------------
 LIB_DIR="$SCRIPT_DIR/lib/installer"
+_LIB_BASE="https://raw.githubusercontent.com/omar00050/Easy-DevOps/main/lib/installer"
+_LIB_MODULES="progress.sh detect.sh node-versions.sh picker.sh nvm-bootstrap.sh"
+
+if [ ! -f "$LIB_DIR/progress.sh" ]; then
+  printf 'Lib modules not found locally — downloading from GitHub...\n'
+  mkdir -p "$LIB_DIR"
+  _dl_ok=true
+  for _module in $_LIB_MODULES; do
+    if command -v curl >/dev/null 2>&1; then
+      curl -fsSL "$_LIB_BASE/$_module" -o "$LIB_DIR/$_module" 2>/dev/null || _dl_ok=false
+    elif command -v wget >/dev/null 2>&1; then
+      wget -q "$_LIB_BASE/$_module" -O "$LIB_DIR/$_module" 2>/dev/null || _dl_ok=false
+    else
+      printf 'Error: curl or wget is required to download installer modules.\n' >&2
+      exit 1
+    fi
+  done
+  if [ "$_dl_ok" = "false" ]; then
+    printf 'Error: Failed to download one or more installer modules from GitHub.\n' >&2
+    printf 'Check your internet connection and try again.\n' >&2
+    exit 1
+  fi
+  printf 'Modules downloaded.\n\n'
+fi
 
-for _module in progress.sh detect.sh node-versions.sh picker.sh nvm-bootstrap.sh; do
+for _module in $_LIB_MODULES; do
   if [ ! -f "$LIB_DIR/$_module" ]; then
     printf 'Error: Required module not found: %s/%s\n' "$LIB_DIR" "$_module" >&2
     exit 1
@@ -147,19 +171,35 @@ while [ "$#" -gt 0 ]; do
 done
 
 # ---------------------------------------------------------------------------
-# Source mode / package mode detection (mirrors install.ps1)
+# Install mode detection (mirrors install.ps1 3-mode logic)
 #
-#   Package mode: easy-devops already on PATH (installed via npm -g)
-#                 -> skip npm install + npm link
-#   Source mode:  running from cloned repo or fresh directory
-#                 -> run all 7 steps
+#   source  : package.json with name=easy-devops found in script dir
+#             -> npm install + npm link
+#   update  : easy-devops already on PATH
+#             -> skip install steps
+#   npm     : standalone download, not in project dir
+#             -> npm install -g easy-devops
 # ---------------------------------------------------------------------------
-PACKAGE_MODE=false
+SOURCE_MODE=false
+ALREADY_INSTALLED=false
 EXISTING_CMD=""
 
+# Source mode: script is running from the project directory
+if [ -f "$SCRIPT_DIR/package.json" ]; then
+  if command -v node >/dev/null 2>&1; then
+    _pkg_name="$(node -e "try{process.stdout.write(require('$SCRIPT_DIR/package.json').name)}catch(e){}" 2>/dev/null || true)"
+  else
+    _pkg_name="$(grep -o '"name"[[:space:]]*:[[:space:]]*"[^"]*"' "$SCRIPT_DIR/package.json" 2>/dev/null | grep -o '"[^"]*"$' | tr -d '"' || true)"
+  fi
+  if [ "$_pkg_name" = "easy-devops" ]; then
+    SOURCE_MODE=true
+  fi
+fi
+
+# Already installed: easy-devops command is on PATH
 if command -v easy-devops >/dev/null 2>&1; then
   EXISTING_CMD="$(command -v easy-devops)"
-  PACKAGE_MODE=true
+  ALREADY_INSTALLED=true
 fi
 
 # ---------------------------------------------------------------------------
@@ -171,12 +211,15 @@ printf '║   Easy DevOps -- Bootstrap Installer ║\n'
 printf '╚══════════════════════════════════════╝\n'
 printf '\n'
 
-if [ "$PACKAGE_MODE" = "true" ]; then
-  printf '  Mode: package  (easy-devops already installed at %s)\n' "$EXISTING_CMD"
-  printf '        Skipping npm install / npm link steps.\n'
+if [ "$ALREADY_INSTALLED" = "true" ]; then
+  printf '  Mode: update  (easy-devops already installed at %s)\n' "$EXISTING_CMD"
+  printf '        Node.js will still be managed; npm steps skipped.\n'
+  printf '\n'
+elif [ "$SOURCE_MODE" = "true" ]; then
+  printf '  Mode: source  (project directory -- npm install + npm link)\n'
   printf '\n'
 else
-  printf '  Mode: source  (installing from project directory)\n'
+  printf '  Mode: npm     (will run: npm install -g easy-devops)\n'
   printf '\n'
 fi
 
@@ -369,40 +412,31 @@ else
 fi
 
 # ---------------------------------------------------------------------------
-# Step 6: npm install
+# Steps 6 + 7: Install Easy DevOps & register CLI
 # ---------------------------------------------------------------------------
-if [ "$PACKAGE_MODE" = "true" ]; then
-  step_done "${STEPS[5]}  (skipped -- package mode)"
-  add_result "npm install" "ok" "Skipped (package mode)"
-else
+
+if [ "$ALREADY_INSTALLED" = "true" ]; then
+  # ── Already installed: skip both steps ──────────────────────────────────────
+  step_done "${STEPS[5]}  (skipped -- easy-devops already installed)"
+  add_result "npm install" "ok" "Skipped (already installed)"
+  step_done "${STEPS[6]}  (skipped -- already registered)"
+  add_result "CLI registered" "ok" "Skipped (already installed)"
+
+elif [ "$SOURCE_MODE" = "true" ]; then
+  # ── Source mode: npm install in project dir + npm link ───────────────────────
   step_running "${STEPS[5]}"
   printf 'Running npm install in %s...\n' "$EASYDEVOPS_DIR"
-  if ! npm install --prefix "$EASYDEVOPS_DIR" 2>&1; then
+  if ! (cd "$EASYDEVOPS_DIR" && npm install 2>&1); then
     die "${STEPS[5]}" "npm install failed" \
       "cd $EASYDEVOPS_DIR && npm install" \
       "npm link"
   fi
   step_done "${STEPS[5]}"
   add_result "npm install" "ok" ""
-fi
 
-# ---------------------------------------------------------------------------
-# Step 7: npm link -- register global command
-# ---------------------------------------------------------------------------
-if [ "$PACKAGE_MODE" = "true" ]; then
-  step_done "${STEPS[6]}  (skipped -- package mode)"
-  add_result "CLI registered" "ok" "Skipped (package mode)"
-else
   step_running "${STEPS[6]}"
   printf 'Registering global command via npm link...\n'
-  _link_ok=false
-  if npm link --prefix "$EASYDEVOPS_DIR" 2>&1; then
-    _link_ok=true
-  elif (cd "$EASYDEVOPS_DIR" && npm link 2>&1); then
-    _link_ok=true
-  fi
-
-  if [ "$_link_ok" = "false" ]; then
+  if ! (cd "$EASYDEVOPS_DIR" && npm link 2>&1); then
     die "${STEPS[6]}" "npm link failed -- could not register global command" \
       "cd $EASYDEVOPS_DIR && npm link" \
       "If permission denied, try: sudo npm link"
@@ -410,13 +444,26 @@ else
 
   # Verify the command is on PATH
   if ! command -v easy-devops >/dev/null 2>&1; then
-    printf 'Warning: easy-devops command not found on PATH yet.\n' >&2
-    printf 'You may need to open a new terminal or run:\n' >&2
+    printf 'Warning: easy-devops not yet on PATH. Open a new terminal or run:\n' >&2
     printf '  export PATH="$(npm bin -g):$PATH"\n' >&2
   fi
-
   step_done "${STEPS[6]}"
   add_result "CLI registered" "ok" ""
+
+else
+  # ── npm global mode: npm install -g easy-devops ──────────────────────────────
+  step_running "${STEPS[5]}"
+  printf 'Running npm install -g easy-devops...\n'
+  if ! npm install -g easy-devops 2>&1; then
+    die "${STEPS[5]}" "npm install -g easy-devops failed" \
+      "npm install -g easy-devops" \
+      "If permission denied, try: sudo npm install -g easy-devops"
+  fi
+  step_done "${STEPS[5]}"
+  add_result "npm install" "ok" "npm install -g easy-devops"
+
+  step_done "${STEPS[6]}  (registered via npm install -g)"
+  add_result "CLI registered" "ok" "npm install -g"
 fi
 
 # ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-devops",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "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",