genbox 1.0.82 → 1.0.84

package/dist/commands/create.js

@@ -406,6 +406,8 @@ exports.createCommand = new commander_1.Command('create')
         let snapshotId;
         let snapshotS3Key;
         let localDumpPath;
+        let localSetupStartTime;
+        let localSetupDuration; // in seconds
         const projectCache = loadProjectCache(process.cwd());
         const needsLocalDbCopy = resolved.database.mode === 'copy' &&
             resolved.database.url &&
@@ -500,6 +502,8 @@ exports.createCommand = new commander_1.Command('create')
                         console.log(chalk_1.default.dim(`  Source: ${resolved.database.source}`));
                     }
                     console.log(chalk_1.default.dim(`  URL: ${dbUrl.replace(/\/\/[^:]+:[^@]+@/, '//***:***@')}`));
+                    // Start timing for local setup (dump + upload)
+                    localSetupStartTime = Date.now();
                     const dumpSpinner = (0, ora_1.default)('Creating database dump...').start();
                     const dumpResult = await (0, db_utils_1.runLocalMongoDump)(dbUrl, {
                         onProgress: (msg) => dumpSpinner.text = msg,
@@ -528,6 +532,10 @@ exports.createCommand = new commander_1.Command('create')
                         uploadSpinner.succeed(chalk_1.default.green('Database snapshot uploaded'));
                         snapshotId = snapshotResult.snapshotId;
                         snapshotS3Key = snapshotResult.s3Key;
+                        // Calculate local setup duration (dump + upload time)
+                        if (localSetupStartTime) {
+                            localSetupDuration = Math.round((Date.now() - localSetupStartTime) / 1000);
+                        }
                         // Cleanup local dump since it's now in S3
                         if (localDumpPath)
                             (0, db_utils_1.cleanupDump)(localDumpPath);
@@ -570,6 +578,10 @@ exports.createCommand = new commander_1.Command('create')
             };
         }
         const payload = buildPayload(payloadResolved, config, publicKey, privateKeyContent, configLoader);
+        // Add local setup duration if we did a local dump+upload
+        if (localSetupDuration) {
+            payload.localSetupDuration = localSetupDuration;
+        }
         // Create genbox
         const spinner = (0, ora_1.default)(`Creating Genbox '${name}'...`).start();
         try {
@@ -716,7 +728,9 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
     const files = [];
     // Track env files to move in setup script (staging approach to avoid blocking git clone)
     const envFilesToMove = [];
-    // Send .env.genbox content to server for each app
+    // Send .env.genbox content to server for processing
+    // OPTIMIZATION: Instead of duplicating GLOBAL section for each app,
+    // send ONE .env.genbox file and let server extract app-specific content
     const envGenboxPath = path.join(process.cwd(), '.env.genbox');
     if (fs.existsSync(envGenboxPath)) {
         const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
@@ -739,42 +753,77 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
         if (connectTo && Object.keys(serviceUrlMap).length > 0) {
             console.log(chalk_1.default.dim(`  Using ${connectTo} URLs for variable expansion`));
         }
-        // Add env file for each app - filtered by selected apps only
-        for (const app of resolved.apps) {
-            const appPath = config.apps[app.name]?.path || app.name;
-            const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
-                (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
-            // Check if this app has microservices (sections like api/gateway, api/auth)
-            const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
-            if (servicesSections.length > 0) {
-                // App has microservices - create env file for each service
-                for (const serviceSectionName of servicesSections) {
-                    const serviceName = serviceSectionName.split('/')[1];
-                    // Build service-specific env content (GLOBAL + service section)
-                    const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
-                    const stagingName = `${app.name}-${serviceName}.env`;
-                    const targetPath = `${repoPath}/apps/${serviceName}/.env`;
+        // For projects with many apps, send ONE processed .env file to avoid duplicating GLOBAL
+        // This significantly reduces cloud-init size (Hetzner has 32KB limit)
+        if (resolved.apps.length > 3) {
+            // Send single .env.genbox with expansions applied, let server split into app files
+            let expandedEnvContent = rawEnvContent;
+            for (const [varName, value] of Object.entries(serviceUrlMap)) {
+                const pattern = new RegExp(`\\$\\{${varName}\\}`, 'g');
+                expandedEnvContent = expandedEnvContent.replace(pattern, value);
+            }
+            files.push({
+                path: '/home/dev/.env.genbox',
+                content: expandedEnvContent,
+                permissions: '0644',
+            });
+            // Track which apps need .env files (server will process)
+            for (const app of resolved.apps) {
+                const appPath = config.apps[app.name]?.path || app.name;
+                const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
+                    (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
+                const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
+                if (servicesSections.length > 0) {
+                    for (const serviceSectionName of servicesSections) {
+                        const serviceName = serviceSectionName.split('/')[1];
+                        envFilesToMove.push({
+                            stagingName: serviceSectionName, // e.g., "api/gateway" - server will parse
+                            targetPath: `${repoPath}/apps/${serviceName}/.env`,
+                        });
+                    }
+                }
+                else {
+                    envFilesToMove.push({
+                        stagingName: app.name,
+                        targetPath: `${repoPath}/.env`,
+                    });
+                }
+            }
+        }
+        else {
+            // For small projects, use the original per-app approach (simpler)
+            for (const app of resolved.apps) {
+                const appPath = config.apps[app.name]?.path || app.name;
+                const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
+                    (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
+                const servicesSections = Array.from(sections.keys()).filter(s => s.startsWith(`${app.name}/`));
+                if (servicesSections.length > 0) {
+                    for (const serviceSectionName of servicesSections) {
+                        const serviceName = serviceSectionName.split('/')[1];
+                        const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
+                        const stagingName = `${app.name}-${serviceName}.env`;
+                        const targetPath = `${repoPath}/apps/${serviceName}/.env`;
+                        files.push({
+                            path: `/home/dev/.env-staging/${stagingName}`,
+                            content: serviceEnvContent,
+                            permissions: '0644',
+                        });
+                        envFilesToMove.push({ stagingName, targetPath });
+                    }
+                }
+                else {
+                    const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
                     files.push({
-                        path: `/home/dev/.env-staging/${stagingName}`,
-                        content: serviceEnvContent,
+                        path: `/home/dev/.env-staging/${app.name}.env`,
+                        content: appEnvContent,
                         permissions: '0644',
                     });
-                    envFilesToMove.push({ stagingName, targetPath });
+                    envFilesToMove.push({
+                        stagingName: `${app.name}.env`,
+                        targetPath: `${repoPath}/.env`,
+                    });
                 }
             }
-            else {
-                // Regular app - build app-specific env content (GLOBAL + app section)
-                const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
-                files.push({
-                    path: `/home/dev/.env-staging/${app.name}.env`,
-                    content: appEnvContent,
-                    permissions: '0644',
-                });
-                envFilesToMove.push({
-                    stagingName: `${app.name}.env`,
-                    targetPath: `${repoPath}/.env`,
-                });
-            }
         }
     }
     // Add setup script if generated
@@ -858,9 +907,45 @@ function generateSetupScript(resolved, config, envFilesToMove = []) {
         'set -e',
         '',
     ];
-    // Move .env files from staging to their correct locations
-    // This runs after git clone has completed
-    if (envFilesToMove.length > 0) {
+    // Check if we're using the optimized single-file approach (for projects with many apps)
+    // or the legacy per-app staging approach
+    const useOptimizedEnv = resolved.apps.length > 3;
+    if (useOptimizedEnv && envFilesToMove.length > 0) {
+        // OPTIMIZED: Parse single .env.genbox and create app-specific .env files
+        lines.push('# Process .env.genbox and create app-specific .env files');
+        lines.push('if [ -f "/home/dev/.env.genbox" ]; then');
+        lines.push('  echo "Processing .env.genbox for app-specific .env files..."');
+        lines.push('');
+        lines.push('  # Function to extract section content');
+        lines.push('  extract_section() {');
+        lines.push('    local section="$1"');
+        lines.push('    local file="$2"');
+        lines.push('    awk -v section="$section" \'');
+        lines.push('      BEGIN { in_global=0; in_section=0; }');
+        lines.push('      /^# === GLOBAL ===/ { in_global=1; next }');
+        lines.push('      /^# === [^=]+ ===/ {');
+        lines.push('        in_global=0;');
+        lines.push('        if ($0 ~ "# === "section" ===") { in_section=1 }');
+        lines.push('        else { in_section=0 }');
+        lines.push('        next');
+        lines.push('      }');
+        lines.push('      in_global || in_section { print }');
+        lines.push('    \' "$file" | grep -v "^$" | head -n -1');
+        lines.push('  }');
+        lines.push('');
+        for (const { stagingName, targetPath } of envFilesToMove) {
+            lines.push(`  # Create .env for ${stagingName}`);
+            lines.push(`  mkdir -p "$(dirname "${targetPath}")"`);
+            lines.push(`  extract_section "${stagingName}" /home/dev/.env.genbox > "${targetPath}"`);
+            lines.push(`  echo "  Created ${targetPath}"`);
+        }
+        lines.push('');
+        lines.push('  rm -f /home/dev/.env.genbox');
+        lines.push('fi');
+        lines.push('');
+    }
+    else if (envFilesToMove.length > 0) {
+        // LEGACY: Move pre-staged .env files
         lines.push('# Move .env files from staging to app directories');
         for (const { stagingName, targetPath } of envFilesToMove) {
             lines.push(`if [ -f "/home/dev/.env-staging/${stagingName}" ]; then`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genbox",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "description": "Genbox CLI - AI-Powered Development Environments",
   "main": "dist/index.js",
   "bin": {