launchbase 1.0.5 → 1.0.7

package/bin/launchbase.js

@@ -1,14 +1,46 @@
 #!/usr/bin/env node
 
 const path = require('path');
+const net = require('net');
 const { Command } = require('commander');
 const crypto = require('crypto');
 const fs = require('fs-extra');
 const { execSync, spawn } = require('child_process');
 
-const VERSION = '1.0.5';
+const VERSION = '1.0.7';
 const program = new Command();
 
+function findAvailablePort(startPort = 5432, maxAttempts = 100) {
+  return new Promise((resolve, reject) => {
+    const tryPort = (port, attempts) => {
+      if (attempts >= maxAttempts) {
+        reject(new Error('Could not find available port'));
+        return;
+      }
+      
+      const server = net.createServer();
+      server.once('error', () => {
+        tryPort(port + 1, attempts + 1);
+      });
+      server.once('listening', () => {
+        server.close();
+        resolve(port);
+      });
+      server.listen(port);
+    };
+    
+    tryPort(startPort, 0);
+  });
+}
+
+function findAvailablePorts() {
+  return Promise.all([
+    findAvailablePort(5432, 100),  // Database port
+    findAvailablePort(3000, 100),  // API port
+    findAvailablePort(5173, 100),  // Frontend port
+  ]);
+}
+
 function replaceInFile(filePath, replacements) {
   let content = fs.readFileSync(filePath, 'utf8');
   for (const [from, to] of Object.entries(replacements)) {
@@ -264,32 +296,34 @@ async function startDatabase(projectDir) {
   
   console.log('🐳 Starting database with Docker Compose...\n');
   
-  try {
-    // Check if containers are already running
-    const psOutput = execSync('docker compose ps -q', { 
-      cwd: projectDir,
-      stdio: 'pipe',
-      encoding: 'utf8'
-    }).trim();
-    
-    if (psOutput) {
-      console.log('✅ Database containers already running\n');
-      return true;
-    }
-  } catch {
-    // Containers not running, proceed to start
-  }
+  // Get project name from directory
+  const projectName = path.basename(projectDir);
   
   try {
-    // Stop any existing containers first to avoid port conflicts
+    // First, stop any containers with this project name (from previous runs)
     try {
-      execSync('docker compose down', { 
+      execSync(`docker compose -p ${projectName} down --remove-orphans`, { 
         cwd: projectDir,
         stdio: 'pipe'
       });
     } catch {}
     
-    execSync('docker compose up -d --wait', { 
+    // Also try to remove any containers with similar names
+    try {
+      const containers = execSync('docker ps -a --format "{{.Names}}"', { 
+        stdio: 'pipe',
+        encoding: 'utf8'
+      });
+      const containerList = containers.trim().split('\n').filter(c => c.includes(projectName));
+      for (const container of containerList) {
+        try {
+          execSync(`docker rm -f ${container}`, { stdio: 'pipe' });
+        } catch {}
+      }
+    } catch {}
+    
+    // Start fresh containers with explicit project name
+    execSync(`docker compose -p ${projectName} up -d --wait --force-recreate`, { 
       cwd: projectDir,
       stdio: 'inherit'
     });
@@ -301,10 +335,10 @@ async function startDatabase(projectDir) {
     
     // Check for port conflict
     if (error.message && error.message.includes('port is already allocated')) {
-      console.log('   Port conflict detected. Another PostgreSQL may be running.\n');
-      console.log('💡 Solutions:');
-      console.log('   1. Stop the other PostgreSQL: docker stop <container>');
-      console.log('   2. Or change the port in docker-compose.yml\n');
+      console.log('   Port conflict detected. Another service is using this port.\n');
+      console.log('💡 Try stopping other databases:');
+      console.log('   docker ps                    # list running containers');
+      console.log('   docker stop <container_id>   # stop the conflicting container\n');
     } else {
       console.log('   Check Docker logs: docker compose logs\n');
     }
@@ -331,6 +365,11 @@ program
     console.log('\n🚀 LaunchBase CLI v' + VERSION + '\n');
     console.log('📁 Creating project:', appName);
     
+    // Find available ports first
+    console.log('🔍 Finding available ports...');
+    const [dbPort, apiPort, frontendPort] = await findAvailablePorts();
+    console.log(`   Database: ${dbPort}, API: ${apiPort}, Frontend: ${frontendPort}\n`);
+    
     const templateDir = path.resolve(__dirname, '..', 'template');
     const targetDir = path.resolve(process.cwd(), appName);
 
@@ -380,13 +419,23 @@ program
       }
     });
 
-    // Replace placeholders
+    // Replace placeholders with dynamic ports
     const replacements = {
       '__APP_NAME__': appName,
       '"name": "launchbase-template"': `"name": "${appName}"`,
+      '"PORT=3000"': `"PORT=${apiPort}"`,
+      'PORT=3000': `PORT=${apiPort}`,
+      'localhost:3000': `localhost:${apiPort}`,
+      'localhost:5173': `localhost:${frontendPort}`,
+      'localhost:5433': `localhost:${dbPort}`,
+      'localhost:5432': `localhost:${dbPort}`,
+      '"5433:5432"': `"${dbPort}:5432"`,
+      '"5432:5432"': `"${dbPort}:5432"`,
+      '"3000:3000"': `"${apiPort}:3000"`,
     };
 
-    const filesToReplace = ['package.json', '.env.example', 'README.md'];
+    // Update files with port replacements
+    const filesToReplace = ['package.json', '.env.example', 'README.md', 'docker-compose.yml', '.env'];
     for (const rel of filesToReplace) {
       const fp = path.join(targetDir, rel);
       if (await fs.pathExists(fp)) {
@@ -402,9 +451,21 @@ program
       let env = await fs.readFile(envExamplePath, 'utf8');
       env = env.replace('JWT_ACCESS_SECRET=__CHANGE_ME__', `JWT_ACCESS_SECRET=${randomSecret(32)}`);
       env = env.replace('JWT_REFRESH_SECRET=__CHANGE_ME__', `JWT_REFRESH_SECRET=${randomSecret(32)}`);
+      // Ensure ports are correct
+      env = env.replace(/PORT=\d+/, `PORT=${apiPort}`);
+      env = env.replace(/localhost:\d+.*__APP_NAME__/g, `localhost:${dbPort}/${appName}`);
       await fs.writeFile(envPath, env, 'utf8');
     }
 
+    // Update docker-compose.yml with correct ports
+    const dockerComposePath = path.join(targetDir, 'docker-compose.yml');
+    if (await fs.pathExists(dockerComposePath)) {
+      let compose = await fs.readFile(dockerComposePath, 'utf8');
+      compose = compose.replace(/"(\d+):5432"/, `"${dbPort}:5432"`);
+      compose = compose.replace(/"(\d+):3000"/, `"${apiPort}:3000"`);
+      await fs.writeFile(dockerComposePath, compose, 'utf8');
+    }
+
     console.log('✅ Project files created\n');
 
     // Install dependencies
@@ -444,20 +505,22 @@ program
     // Start dev server
     console.log('\n🚀 Starting development server...\n');
     console.log('━'.repeat(50));
-    console.log('  API:     http://localhost:3000');
-    console.log('  Docs:    http://localhost:3000/docs');
-    console.log('  Health:  http://localhost:3000/health');
+    console.log(`  API:     http://localhost:${apiPort}`);
+    console.log(`  Docs:    http://localhost:${apiPort}/docs`);
+    console.log(`  Health:  http://localhost:${apiPort}/health`);
     if (options.template) {
-      console.log('  Frontend: http://localhost:5173');
+      console.log(`  Frontend: http://localhost:${frontendPort}`);
     }
+    console.log(`  Database: localhost:${dbPort}`);
     console.log('━'.repeat(50));
     console.log('\nPress Ctrl+C to stop\n');
     
-    // Start backend
+    // Start backend with correct port
     const backend = spawn('npm', ['run', 'start:dev'], { 
       cwd: targetDir, 
       stdio: 'inherit',
-      shell: true 
+      shell: true,
+      env: { ...process.env, PORT: apiPort.toString() }
     });
     
     // Start frontend after delay if included
@@ -468,7 +531,8 @@ program
           const frontend = spawn('npm', ['run', 'dev'], { 
             cwd: frontendPath, 
             stdio: 'inherit',
-            shell: true 
+            shell: true,
+            env: { ...process.env, VITE_API_URL: `http://localhost:${apiPort}`, PORT: frontendPort.toString() }
           });
         }, 5000);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "launchbase",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Generate production-ready NestJS backends with authentication, multi-tenancy, billing, and deployment in minutes",
   "author": "LaunchBase",
   "keywords": [