ante-erp-cli 1.11.62 → 1.11.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ante-erp-cli",
-  "version": "1.11.62",
+  "version": "1.11.64",
   "description": "Comprehensive CLI tool for managing ANTE ERP self-hosted installations",
   "type": "module",
   "bin": {

package/src/commands/update.js

@@ -4,7 +4,7 @@ import { join } from 'path';
 import { readFileSync, writeFileSync, renameSync } from 'fs';
 import semver from 'semver';
 import { getInstallDir } from '../utils/config.js';
-import { pullImagesSilent, stopServicesSilent, startServicesSilent, waitForServiceHealthy, runMigrations, pruneDockerSilent, downServicesSilent, forceRecreateServicesSilent, removeVolumesSilent, listVolumes } from '../utils/docker.js';
+import { pullImagesSilent, stopServicesSilent, startServicesSilent, waitForServiceHealthy, runMigrations, pruneDockerSilent, downServicesSilent, forceRecreateServicesSilent, removeVolumesSilent, listVolumes, freeUpPorts } from '../utils/docker.js';
 import { backup } from './backup.js';
 import { getCurrentVersion, getLatestVersion } from './update-cli.js';
 import { generateDockerCompose } from '../templates/docker-compose.yml.js';
@@ -381,6 +381,45 @@ function formatStepTitle(step, total, description) {
   return `[${step}/${total}] ${description}`;
 }
 
+/**
+ * Extract all ports used by services from docker-compose.yml
+ * @param {string} composeFile - Path to docker-compose.yml
+ * @param {string} envFile - Path to .env file
+ * @returns {number[]} Array of port numbers
+ */
+function getRequiredPorts(composeFile, envFile) {
+  const envConfig = parseEnvFile(envFile);
+  const installed = detectInstalledApps(composeFile);
+
+  const ports = [];
+
+  // Core services - always needed
+  ports.push(parseInt(envConfig.BACKEND_PORT) || 3001);  // Backend
+  ports.push(parseInt(envConfig.FRONTEND_PORT) || 8080); // Frontend
+
+  // Optional services - only add if installed
+  if (installed.hasGateApp) {
+    ports.push(parseInt(envConfig.GATE_APP_PORT) || 8081);
+  }
+  if (installed.hasGuardianApp) {
+    ports.push(parseInt(envConfig.GUARDIAN_APP_PORT) || 8082);
+  }
+  if (installed.hasFacialWeb) {
+    ports.push(parseInt(envConfig.FACIAL_WEB_PORT) || 8083);
+  }
+  if (installed.hasPosApp) {
+    ports.push(parseInt(envConfig.POS_APP_PORT) || 8084);
+  }
+  if (installed.hasMlmApp) {
+    ports.push(parseInt(envConfig.MLM_APP_PORT) || 9005);
+  }
+  if (installed.hasBackendMlm) {
+    ports.push(parseInt(envConfig.BACKEND_MLM_PORT) || 4001);
+  }
+
+  return ports;
+}
+
 /**
  * Database volumes that should be preserved during rebuild
  * These contain critical data and should never be deleted
@@ -459,7 +498,7 @@ export async function update(options) {
     let servicesToInstall = { gateApp: false, guardianApp: false, facialWeb: false, posApp: false, mlmApp: false };
 
     // Calculate total steps dynamically
-    let totalSteps = 6; // Base steps: check services, pull, stop, start, backend health, migrations
+    let totalSteps = 7; // Base steps: check services, pull, stop, free ports, start, backend health, migrations
     if (!options.skipBackup) totalSteps += 2; // Pre-start + backup steps
     if (hasNewServices) totalSteps++; // Install new services step
     if (options.rebuild) totalSteps += 2; // Rebuild steps: down containers + remove volumes
@@ -499,6 +538,7 @@ export async function update(options) {
     const stepRebuildDown = options.rebuild ? ++currentStep : null;
     const stepRebuildVolumes = options.rebuild ? ++currentStep : null;
     const stepStop = !options.rebuild ? ++currentStep : null; // Skip if rebuild (already downed)
+    const stepFreePorts = ++currentStep; // Always free up ports before starting
     const stepStart = ++currentStep;
     const stepBackendHealth = ++currentStep;
     const stepGateHealth = (hasGateApp || missingServices.gateApp) ? ++currentStep : null;
@@ -620,6 +660,22 @@ export async function update(options) {
           await stopServicesSilent(composeFile);
         }
       },
+      {
+        title: formatStepTitle(stepFreePorts, totalSteps, 'Freeing up required ports'),
+        task: async (ctx, task) => {
+          // Get all ports that will be needed by our services
+          const requiredPorts = getRequiredPorts(composeFile, envFile);
+
+          // Kill any processes (like orphaned docker-proxy) using these ports
+          const result = await freeUpPorts(requiredPorts);
+
+          if (result.portsFreed.length > 0) {
+            task.title = formatStepTitle(stepFreePorts, totalSteps, `Freed ports: ${result.portsFreed.join(', ')} (killed ${result.totalKilled} processes)`);
+          } else {
+            task.title = formatStepTitle(stepFreePorts, totalSteps, 'All required ports are available');
+          }
+        }
+      },
       {
         title: formatStepTitle(stepStart, totalSteps, options.rebuild ? 'Starting with fresh containers' : 'Starting with new images'),
         task: async () => {

package/src/utils/docker.js

@@ -1,5 +1,66 @@
 import { execa } from 'execa';
 
+/**
+ * Kill processes using a specific port
+ * This is useful when docker-proxy processes are left behind after a failed container stop
+ * @param {number} port - Port number to free up
+ * @returns {Promise<{killed: boolean, pids: number[]}>}
+ */
+export async function killProcessesOnPort(port) {
+  const pids = [];
+
+  try {
+    // Use lsof to find processes using the port
+    const { stdout } = await execa('lsof', ['-i', `:${port}`, '-t'], {
+      stdout: 'pipe',
+      stderr: 'pipe',
+      reject: false
+    });
+
+    if (stdout && stdout.trim()) {
+      const foundPids = stdout.trim().split('\n').map(p => parseInt(p.trim())).filter(p => !isNaN(p));
+
+      for (const pid of foundPids) {
+        try {
+          await execa('kill', ['-9', pid.toString()], {
+            stdout: 'pipe',
+            stderr: 'pipe',
+            reject: false
+          });
+          pids.push(pid);
+        } catch {
+          // Ignore errors - process might have already exited
+        }
+      }
+    }
+
+    return { killed: pids.length > 0, pids };
+  } catch {
+    // lsof might not be installed or port not in use
+    return { killed: false, pids: [] };
+  }
+}
+
+/**
+ * Free up multiple ports by killing any processes using them
+ * @param {number[]} ports - Array of port numbers to free up
+ * @returns {Promise<{portsFreed: number[], totalKilled: number}>}
+ */
+export async function freeUpPorts(ports) {
+  const portsFreed = [];
+  let totalKilled = 0;
+
+  for (const port of ports) {
+    const result = await killProcessesOnPort(port);
+    if (result.killed) {
+      portsFreed.push(port);
+      totalKilled += result.pids.length;
+    }
+  }
+
+  return { portsFreed, totalKilled };
+}
+
 /**
  * Pull Docker images
  * @param {string} composeFile - Path to docker-compose.yml
@@ -32,14 +93,15 @@ export async function startServices(composeFile, services = []) {
  * Stop Docker services
  * @param {string} composeFile - Path to docker-compose.yml
  * @param {string[]} services - Specific services to stop (optional)
+ * @param {number} timeout - Timeout in seconds before force kill (default: 30)
  * @returns {Promise<void>}
  */
-export async function stopServices(composeFile, services = []) {
-  const args = ['compose', '-f', composeFile, 'stop'];
+export async function stopServices(composeFile, services = [], timeout = 30) {
+  const args = ['compose', '-f', composeFile, 'stop', '--timeout', timeout.toString()];
   if (services.length > 0) {
     args.push(...services);
   }
-  
+
   await execa('docker', args, {
     stdio: 'inherit'
   });
@@ -237,15 +299,16 @@ export async function waitForHealthy(composeFile, services, timeout = 60) {
  * Down all services and optionally remove volumes
  * @param {string} composeFile - Path to docker-compose.yml
  * @param {boolean} removeVolumes - Remove volumes
+ * @param {number} timeout - Timeout in seconds before force kill (default: 30)
  * @returns {Promise<void>}
  */
-export async function downServices(composeFile, removeVolumes = false) {
-  const args = ['compose', '-f', composeFile, 'down'];
-  
+export async function downServices(composeFile, removeVolumes = false, timeout = 30) {
+  const args = ['compose', '-f', composeFile, 'down', '--timeout', timeout.toString()];
+
   if (removeVolumes) {
     args.push('-v');
   }
-  
+
   await execa('docker', args, {
     stdio: 'inherit'
   });
@@ -313,10 +376,11 @@ export async function startServicesSilent(composeFile, services = []) {
  * Stop Docker services (silent version - no output)
  * @param {string} composeFile - Path to docker-compose.yml
  * @param {string[]} services - Specific services to stop (optional)
+ * @param {number} timeout - Timeout in seconds before force kill (default: 30)
  * @returns {Promise<void>}
  */
-export async function stopServicesSilent(composeFile, services = []) {
-  const args = ['compose', '-f', composeFile, 'stop'];
+export async function stopServicesSilent(composeFile, services = [], timeout = 30) {
+  const args = ['compose', '-f', composeFile, 'stop', '--timeout', timeout.toString()];
   if (services.length > 0) {
     args.push(...services);
   }
@@ -342,10 +406,11 @@ export async function pruneDockerSilent() {
  * Down all services (silent version - no output)
  * @param {string} composeFile - Path to docker-compose.yml
  * @param {boolean} removeVolumes - Remove volumes
+ * @param {number} timeout - Timeout in seconds before force kill (default: 30)
  * @returns {Promise<void>}
  */
-export async function downServicesSilent(composeFile, removeVolumes = false) {
-  const args = ['compose', '-f', composeFile, 'down'];
+export async function downServicesSilent(composeFile, removeVolumes = false, timeout = 30) {
+  const args = ['compose', '-f', composeFile, 'down', '--timeout', timeout.toString()];
 
   if (removeVolumes) {
     args.push('-v');