ante-erp-cli 1.11.25 → 1.11.27

package/package.json

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

package/src/commands/clone-mongodb.js

@@ -4,6 +4,7 @@ import inquirer from 'inquirer';
 import { join } from 'path';
 import { existsSync, readFileSync, readdirSync } from 'fs';
 import { stat } from 'fs/promises';
+import { execa } from 'execa';
 import { getInstallDir } from '../utils/config.js';
 import {
   parseMongoUrl,
@@ -89,6 +90,22 @@ export async function cloneMongodb(sourceUrl, options = {}) {
     const backupDir = join(installDir, 'backups', 'mongodb');
     const composeFile = join(installDir, 'docker-compose.yml');
 
+    // Step 0: Ensure Docker image is available
+    console.log(chalk.yellow('Preparing Docker environment...'));
+    const imageSpinner = ora('Pulling MongoDB Docker image (this may take a few minutes on first run)...').start();
+
+    try {
+      await execa('docker', ['pull', 'mongo:latest'], {
+        timeout: 300000 // 5 minutes for image pull
+      });
+      imageSpinner.succeed(chalk.green('Docker image ready'));
+      console.log('');
+    } catch (imageError) {
+      // Non-fatal: Image might already exist
+      imageSpinner.info(chalk.gray('Using existing Docker image'));
+      console.log('');
+    }
+
     // Step 1: Parse source database URL
     console.log(chalk.yellow('Step 1/5: Parsing source database URL...'));
     let sourceInfo;

package/src/utils/docker.js

@@ -358,14 +358,24 @@ export async function runMigrations(composeFile) {
       'deploy'
     ]);
 
+    // Combine stdout and stderr for complete output
+    const combinedOutput = [stdout, stderr].filter(Boolean).join('\n').trim();
+
     return {
       success: true,
-      output: stdout || stderr
+      output: combinedOutput || 'Migration completed'
     };
   } catch (error) {
+    // Merge both stdout and stderr to show complete error messages
+    // This ensures error codes (like P3005) and resolution links are visible
+    const combinedError = [error.stdout, error.stderr]
+      .filter(Boolean)
+      .join('\n')
+      .trim();
+
     return {
       success: false,
-      output: error.stdout || error.stderr || error.message
+      output: combinedError || error.message
     };
   }
 }

package/src/utils/mongodb.js

@@ -68,71 +68,87 @@ export function buildMongoUrl(connectionInfo) {
 }
 
 /**
- * Test MongoDB connection using Docker
+ * Test MongoDB connection using Docker (with retry logic)
  * @param {Object} connectionInfo - Connection details from parseMongoUrl
  * @param {string} composeFile - Optional path to docker-compose.yml for Docker Compose network access
+ * @param {number} maxRetries - Maximum retry attempts (default: 2)
  * @returns {Promise<{success: boolean, error?: string}>}
  */
-export async function testConnection(connectionInfo, composeFile = null) {
-  try {
-    const mongoUrl = buildMongoUrl(connectionInfo);
+export async function testConnection(connectionInfo, composeFile = null, maxRetries = 2) {
+  let lastError = null;
 
-    // If composeFile provided, use Docker Compose exec (for local database in Docker network)
-    if (composeFile) {
-      await execa('docker', [
-        'compose',
-        '-f', composeFile,
-        'exec',
-        '-T',
-        'mongodb',
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      const mongoUrl = buildMongoUrl(connectionInfo);
+
+      // If composeFile provided, use Docker Compose exec (for local database in Docker network)
+      if (composeFile) {
+        await execa('docker', [
+          'compose',
+          '-f', composeFile,
+          'exec',
+          '-T',
+          'mongodb',
+          'mongosh',
+          mongoUrl,
+          '--quiet',
+          '--eval', 'db.adminCommand("ping")'
+        ], {
+          timeout: 120000 // 120 second timeout (2 minutes) - allows for Docker image pull
+        });
+
+        return { success: true };
+      }
+
+      // Standalone Docker for remote databases
+      let testUrl = mongoUrl;
+      const dockerArgs = ['run', '--rm'];
+
+      // Handle localhost connections
+      if (connectionInfo.host === 'localhost' || connectionInfo.host === '127.0.0.1') {
+        const protocol = connectionInfo.isSrv ? 'mongodb+srv://' : 'mongodb://';
+        const auth = connectionInfo.user && connectionInfo.password ?
+          `${connectionInfo.user}:${connectionInfo.password}@` : '';
+        const portPart = connectionInfo.port && !connectionInfo.isSrv ? `:${connectionInfo.port}` : '';
+        const authDbPart = connectionInfo.authDatabase && connectionInfo.authDatabase !== connectionInfo.database ?
+          `?authSource=${connectionInfo.authDatabase}` : '';
+
+        testUrl = `${protocol}${auth}host.docker.internal${portPart}/${connectionInfo.database}${authDbPart}`;
+        dockerArgs.push('--add-host=host.docker.internal:host-gateway');
+      }
+
+      dockerArgs.push(
+        'mongo:latest',
         'mongosh',
-        mongoUrl,
+        testUrl,
         '--quiet',
         '--eval', 'db.adminCommand("ping")'
-      ], {
-        timeout: 10000 // 10 second timeout
+      );
+
+      // Use Docker to test connection
+      await execa('docker', dockerArgs, {
+        timeout: 120000 // 120 second timeout (2 minutes) - allows for Docker image pull
       });
 
       return { success: true };
-    }
-
-    // Standalone Docker for remote databases
-    let testUrl = mongoUrl;
-    const dockerArgs = ['run', '--rm'];
-
-    // Handle localhost connections
-    if (connectionInfo.host === 'localhost' || connectionInfo.host === '127.0.0.1') {
-      const protocol = connectionInfo.isSrv ? 'mongodb+srv://' : 'mongodb://';
-      const auth = connectionInfo.user && connectionInfo.password ?
-        `${connectionInfo.user}:${connectionInfo.password}@` : '';
-      const portPart = connectionInfo.port && !connectionInfo.isSrv ? `:${connectionInfo.port}` : '';
-      const authDbPart = connectionInfo.authDatabase && connectionInfo.authDatabase !== connectionInfo.database ?
-        `?authSource=${connectionInfo.authDatabase}` : '';
-
-      testUrl = `${protocol}${auth}host.docker.internal${portPart}/${connectionInfo.database}${authDbPart}`;
-      dockerArgs.push('--add-host=host.docker.internal:host-gateway');
-    }
+    } catch (error) {
+      lastError = error;
 
-    dockerArgs.push(
-      'mongo:latest',
-      'mongosh',
-      testUrl,
-      '--quiet',
-      '--eval', 'db.adminCommand("ping")'
-    );
-
-    // Use Docker to test connection
-    await execa('docker', dockerArgs, {
-      timeout: 10000 // 10 second timeout
-    });
+      // If timeout and not last attempt, retry
+      if (error.timedOut && attempt < maxRetries) {
+        await new Promise(resolve => setTimeout(resolve, 2000)); // Wait 2s before retry
+        continue;
+      }
 
-    return { success: true };
-  } catch (error) {
-    return {
-      success: false,
-      error: error.message || 'Connection failed'
-    };
+      // If it's the last attempt or non-timeout error, break
+      break;
+    }
   }
+
+  return {
+    success: false,
+    error: lastError?.message || 'Connection failed'
+  };
 }
 
 /**