ante-erp-cli 1.6.9 → 1.6.10

package/package.json

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

package/src/commands/clone-db.js

@@ -57,6 +57,7 @@ export async function cloneDb(sourceUrl, options = {}) {
     // Get ANTE installation directory
     const installDir = getInstallDir();
     const backupDir = join(installDir, 'backups');
+    const composeFile = join(installDir, 'docker-compose.yml');
 
     // Step 1: Parse source database URL
     console.log(chalk.yellow('Step 1/6: Parsing source database URL...'));
@@ -103,9 +104,9 @@ export async function cloneDb(sourceUrl, options = {}) {
     }
     sourceSpinner.succeed(chalk.green('Source database connection successful'));
 
-    // Test local connection
+    // Test local connection (use Docker Compose for installed ANTE)
     const localSpinner = ora('Testing local database connection...').start();
-    const localTest = await testConnection(localInfo);
+    const localTest = await testConnection(localInfo, composeFile);
     if (!localTest.success) {
       localSpinner.fail(chalk.red('Local database connection failed'));
       throw new Error(`Cannot connect to local database: ${localTest.error}`);
@@ -192,7 +193,7 @@ export async function cloneDb(sourceUrl, options = {}) {
     console.log('');
 
     const restoreSpinner = ora('Restoring database...').start();
-    const restoreResult = await restoreDatabase(dumpFile, localInfo, true);
+    const restoreResult = await restoreDatabase(dumpFile, localInfo, true, composeFile);
 
     if (!restoreResult.success) {
       restoreSpinner.fail(chalk.red('Database restore failed'));
@@ -205,7 +206,6 @@ export async function cloneDb(sourceUrl, options = {}) {
     // Step 7: Run Prisma operations (if not skipped)
     if (!options.noPrisma) {
       console.log(chalk.yellow('Step 6/6: Running Prisma operations...'));
-      const composeFile = join(installDir, 'docker-compose.yml');
 
       // Generate Prisma client
       const generateSpinner = ora('Generating Prisma client...').start();

package/src/utils/postgres.js

@@ -50,13 +50,34 @@ export function parsePostgresUrl(url) {
 /**
  * Test PostgreSQL connection using Docker
  * @param {Object} connectionInfo - Connection details from parsePostgresUrl
+ * @param {string} composeFile - Optional path to docker-compose.yml for Docker Compose network access
  * @returns {Promise<{success: boolean, error?: string}>}
  */
-export async function testConnection(connectionInfo) {
+export async function testConnection(connectionInfo, composeFile = null) {
   try {
     const { user, password, host, port, database } = connectionInfo;
 
-    // Determine Docker host (use host.docker.internal for localhost)
+    // If composeFile provided, use Docker Compose exec (for local database in Docker network)
+    if (composeFile) {
+      await execa('docker', [
+        'compose',
+        '-f', composeFile,
+        'exec',
+        '-T',
+        '-e', `PGPASSWORD=${password}`,
+        'postgres',
+        'psql',
+        '-U', user,
+        '-d', database,
+        '-c', 'SELECT 1'
+      ], {
+        timeout: 10000 // 10 second timeout
+      });
+
+      return { success: true };
+    }
+
+    // Standalone Docker for remote databases
     let testHost = host;
     const dockerArgs = ['run', '--rm', '-e', `PGPASSWORD=${password}`];
 
@@ -159,9 +180,10 @@ export async function dumpDatabase(connectionInfo, outputFile) {
  * @param {string} dumpFile - Path to dump file
  * @param {Object} connectionInfo - Target database connection details
  * @param {boolean} dropSchema - Whether to drop and recreate schema first (default: true)
+ * @param {string} composeFile - Optional path to docker-compose.yml for Docker Compose network access
  * @returns {Promise<{success: boolean, error?: string}>}
  */
-export async function restoreDatabase(dumpFile, connectionInfo, dropSchema = true) {
+export async function restoreDatabase(dumpFile, connectionInfo, dropSchema = true, composeFile = null) {
   try {
     const { user, password, host, port, database, schema } = connectionInfo;
 
@@ -170,6 +192,82 @@ export async function restoreDatabase(dumpFile, connectionInfo, dropSchema = tru
       throw new Error(`Dump file not found: ${dumpFile}`);
     }
 
+    const dumpFileName = dumpFile.split('/').pop();
+
+    // If using Docker Compose (for local database in Docker network)
+    if (composeFile) {
+      // Drop and recreate schema if requested
+      if (dropSchema) {
+        await execa('docker', [
+          'compose',
+          '-f', composeFile,
+          'exec',
+          '-T',
+          '-e', `PGPASSWORD=${password}`,
+          'postgres',
+          'psql',
+          '-U', user,
+          '-d', database,
+          '-c', `DROP SCHEMA IF EXISTS ${schema} CASCADE; CREATE SCHEMA ${schema};`
+        ], {
+          timeout: 30000 // 30 second timeout
+        });
+      }
+
+      // Copy dump file into postgres container
+      await execa('docker', [
+        'cp',
+        dumpFile,
+        'ante-postgres:/tmp/' + dumpFileName
+      ], {
+        timeout: 120000 // 2 minute timeout for large files
+      });
+
+      // Restore from inside the container
+      try {
+        await execa('docker', [
+          'compose',
+          '-f', composeFile,
+          'exec',
+          '-T',
+          '-e', `PGPASSWORD=${password}`,
+          'postgres',
+          'pg_restore',
+          '-U', user,
+          '-d', database,
+          '-v',           // Verbose
+          '--no-owner',   // Skip ownership commands
+          '--no-acl',     // Skip access control lists
+          '/tmp/' + dumpFileName
+        ], {
+          timeout: 600000, // 10 minute timeout
+          reject: false    // Don't reject on non-zero exit (pg_restore often exits with warnings)
+        });
+      } finally {
+        // Clean up: Remove dump file from container
+        try {
+          await execa('docker', [
+            'compose',
+            '-f', composeFile,
+            'exec',
+            '-T',
+            'postgres',
+            'rm',
+            '-f',
+            '/tmp/' + dumpFileName
+          ], {
+            timeout: 10000,
+            reject: false
+          });
+        } catch {
+          // Ignore cleanup errors
+        }
+      }
+
+      return { success: true };
+    }
+
+    // Standalone Docker for remote databases
     // Drop and recreate schema if requested
     if (dropSchema) {
       // Determine Docker host (use host.docker.internal for localhost)
@@ -216,7 +314,7 @@ export async function restoreDatabase(dumpFile, connectionInfo, dropSchema = tru
       '-v',           // Verbose
       '--no-owner',   // Skip ownership commands
       '--no-acl',     // Skip access control lists
-      `/backups/${join('/', dumpFile.split('/').pop())}`
+      `/backups/${join('/', dumpFileName)}`
     );
 
     try {