genbox 1.0.64 → 1.0.66

package/dist/commands/rebuild.js

@@ -51,22 +51,10 @@ const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
 const schema_v4_1 = require("../schema-v4");
 const db_utils_1 = require("../db-utils");
+const utils_1 = require("../utils");
 // ============================================================================
 // SSH Utilities for Soft Rebuild
 // ============================================================================
-function getPrivateSshKeyPath() {
-    const home = os.homedir();
-    const potentialKeys = [
-        path.join(home, '.ssh', 'id_ed25519'),
-        path.join(home, '.ssh', 'id_rsa'),
-    ];
-    for (const keyPath of potentialKeys) {
-        if (fs.existsSync(keyPath)) {
-            return keyPath;
-        }
-    }
-    throw new Error('No SSH private key found in ~/.ssh/');
-}
 function sshExec(ip, keyPath, command, timeoutSecs = 30) {
     const sshOpts = `-i ${keyPath} -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -o ConnectTimeout=${timeoutSecs}`;
     try {
@@ -389,125 +377,12 @@ async function runSoftRebuild(options) {
         return { success: false, error: error.message };
     }
 }
-function getPublicSshKey() {
-    const home = os.homedir();
-    const potentialKeys = [
-        path.join(home, '.ssh', 'id_ed25519.pub'),
-        path.join(home, '.ssh', 'id_rsa.pub'),
-    ];
-    for (const keyPath of potentialKeys) {
-        if (fs.existsSync(keyPath)) {
-            const content = fs.readFileSync(keyPath, 'utf-8').trim();
-            if (content)
-                return content;
-        }
-    }
-    throw new Error('No public SSH key found in ~/.ssh/');
-}
-function getPrivateSshKey() {
-    const home = os.homedir();
-    const potentialKeys = [
-        path.join(home, '.ssh', 'id_ed25519'),
-        path.join(home, '.ssh', 'id_rsa'),
-    ];
-    for (const keyPath of potentialKeys) {
-        if (fs.existsSync(keyPath)) {
-            return fs.readFileSync(keyPath, 'utf-8');
-        }
-    }
-    return undefined;
-}
 async function rebuildGenbox(id, payload) {
     return (0, api_1.fetchApi)(`/genboxes/${id}/rebuild`, {
         method: 'POST',
         body: JSON.stringify(payload),
     });
 }
-/**
- * Parse .env.genbox file into segregated sections
- */
-function parseEnvGenboxSections(content) {
-    const sections = new Map();
-    let currentSection = 'GLOBAL';
-    let currentContent = [];
-    for (const line of content.split('\n')) {
-        const sectionMatch = line.match(/^# === ([^=]+) ===$/);
-        if (sectionMatch) {
-            if (currentContent.length > 0) {
-                sections.set(currentSection, currentContent.join('\n').trim());
-            }
-            currentSection = sectionMatch[1].trim();
-            currentContent = [];
-        }
-        else if (currentSection !== 'END') {
-            currentContent.push(line);
-        }
-    }
-    if (currentContent.length > 0 && currentSection !== 'END') {
-        sections.set(currentSection, currentContent.join('\n').trim());
-    }
-    return sections;
-}
-/**
- * Build a map of service URL variables based on connection type
- */
-function buildServiceUrlMap(envVarsFromFile, connectTo) {
-    const urlMap = {};
-    const prefix = connectTo ? `${connectTo.toUpperCase()}_` : 'LOCAL_';
-    const serviceNames = new Set();
-    for (const key of Object.keys(envVarsFromFile)) {
-        const match = key.match(/^(LOCAL|STAGING|PRODUCTION)_(.+_URL)$/);
-        if (match) {
-            serviceNames.add(match[2]);
-        }
-    }
-    for (const serviceName of serviceNames) {
-        const prefixedKey = `${prefix}${serviceName}`;
-        const localKey = `LOCAL_${serviceName}`;
-        const value = envVarsFromFile[prefixedKey] || envVarsFromFile[localKey];
-        if (value) {
-            urlMap[serviceName] = value;
-        }
-    }
-    if (!urlMap['API_URL']) {
-        const apiUrl = envVarsFromFile[`${prefix}API_URL`] ||
-            envVarsFromFile['LOCAL_API_URL'] ||
-            envVarsFromFile['STAGING_API_URL'];
-        if (apiUrl) {
-            urlMap['API_URL'] = apiUrl;
-        }
-    }
-    return urlMap;
-}
-/**
- * Build env content for a specific app
- */
-function buildAppEnvContent(sections, appName, serviceUrlMap) {
-    const parts = [];
-    const globalSection = sections.get('GLOBAL');
-    if (globalSection) {
-        parts.push(globalSection);
-    }
-    const appSection = sections.get(appName);
-    if (appSection) {
-        parts.push(appSection);
-    }
-    let envContent = parts.join('\n\n');
-    for (const [varName, value] of Object.entries(serviceUrlMap)) {
-        const pattern = new RegExp(`\\$\\{${varName}\\}`, 'g');
-        envContent = envContent.replace(pattern, value);
-    }
-    envContent = envContent
-        .split('\n')
-        .filter(line => {
-        const trimmed = line.trim();
-        return trimmed === '' || trimmed.includes('=') || !trimmed.startsWith('#');
-    })
-        .join('\n')
-        .replace(/\n{3,}/g, '\n\n')
-        .trim();
-    return envContent;
-}
 /**
  * Build rebuild payload from resolved config
  */
@@ -527,26 +402,15 @@ function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoad
     const envGenboxPath = path.join(process.cwd(), '.env.genbox');
     if (fs.existsSync(envGenboxPath)) {
         const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
-        const sections = parseEnvGenboxSections(rawEnvContent);
+        const sections = (0, utils_1.parseEnvGenboxSections)(rawEnvContent);
         const globalSection = sections.get('GLOBAL') || '';
-        const envVarsFromFile = {};
-        for (const line of globalSection.split('\n')) {
-            const match = line.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/);
-            if (match) {
-                let value = match[2].trim();
-                if ((value.startsWith('"') && value.endsWith('"')) ||
-                    (value.startsWith("'") && value.endsWith("'"))) {
-                    value = value.slice(1, -1);
-                }
-                envVarsFromFile[match[1]] = value;
-            }
-        }
+        const envVarsFromFile = (0, utils_1.parseEnvVarsFromSection)(globalSection);
         let connectTo;
         if (resolved.profile && config.profiles?.[resolved.profile]) {
             const profile = config.profiles[resolved.profile];
             connectTo = (0, config_loader_1.getProfileConnection)(profile);
         }
-        const serviceUrlMap = buildServiceUrlMap(envVarsFromFile, connectTo);
+        const serviceUrlMap = (0, utils_1.buildServiceUrlMap)(envVarsFromFile, connectTo);
         if (connectTo && Object.keys(serviceUrlMap).length > 0) {
             console.log(chalk_1.default.dim(`  Using ${connectTo} URLs for variable expansion`));
         }
@@ -558,7 +422,7 @@ function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoad
             if (servicesSections.length > 0) {
                 for (const serviceSectionName of servicesSections) {
                     const serviceName = serviceSectionName.split('/')[1];
-                    const serviceEnvContent = buildAppEnvContent(sections, serviceSectionName, serviceUrlMap);
+                    const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
                     const stagingName = `${app.name}-${serviceName}.env`;
                     const targetPath = `${repoPath}/apps/${serviceName}/.env`;
                     files.push({
@@ -570,7 +434,7 @@ function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoad
                 }
             }
             else {
-                const appEnvContent = buildAppEnvContent(sections, app.name, serviceUrlMap);
+                const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
                 files.push({
                     path: `/home/dev/.env-staging/${app.name}.env`,
                     content: appEnvContent,
@@ -600,6 +464,8 @@ function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoad
             sourceBranch: repo.sourceBranch,
         };
     }
+    // Get local git config for commits
+    const gitConfig = (0, utils_1.getGitConfig)();
     return {
         publicKey,
         services,
@@ -608,110 +474,10 @@ function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoad
         repos,
         privateKey,
         gitToken: envVars.GIT_TOKEN,
+        gitUserName: gitConfig.userName,
+        gitUserEmail: gitConfig.userEmail,
     };
 }
-/**
- * Validate git configuration and warn about missing credentials
- */
-function validateGitCredentials(repos, gitToken, privateKey) {
-    const warnings = [];
-    const errors = [];
-    for (const repo of repos) {
-        const isHttps = repo.url.startsWith('https://');
-        const isSsh = repo.url.startsWith('git@') || repo.url.includes('ssh://');
-        const isPrivateRepo = repo.url.includes('github.com') && !repo.url.includes('/public/');
-        if (isHttps && !gitToken && isPrivateRepo) {
-            warnings.push(`Repository '${repo.name}' uses HTTPS URL but GIT_TOKEN is not set.`);
-            warnings.push(`  Add GIT_TOKEN=<your-github-token> to .env.genbox for private repos.`);
-        }
-        if (isSsh && !privateKey) {
-            warnings.push(`Repository '${repo.name}' uses SSH URL but no SSH key was injected.`);
-        }
-    }
-    return { warnings, errors };
-}
-/**
- * Prompt for branch options interactively
- */
-async function promptForBranchOptions(resolved, config) {
-    // Get the default branch from config or first repo
-    const defaultBranch = config.defaults?.branch || resolved.repos[0]?.branch || 'main';
-    console.log(chalk_1.default.blue('=== Branch Configuration ==='));
-    console.log(chalk_1.default.dim(`Default branch: ${defaultBranch}`));
-    console.log('');
-    const branchChoice = await prompts.select({
-        message: 'Branch option:',
-        choices: [
-            {
-                name: `Use default branch (${defaultBranch})`,
-                value: 'default',
-            },
-            {
-                name: 'Use a different existing branch',
-                value: 'existing',
-            },
-            {
-                name: 'Create a new branch',
-                value: 'new',
-            },
-        ],
-        default: 'default',
-    });
-    if (branchChoice === 'default') {
-        return resolved;
-    }
-    if (branchChoice === 'existing') {
-        const branchName = await prompts.input({
-            message: 'Enter branch name:',
-            default: defaultBranch,
-            validate: (value) => {
-                if (!value.trim())
-                    return 'Branch name is required';
-                return true;
-            },
-        });
-        return {
-            ...resolved,
-            repos: resolved.repos.map(repo => ({
-                ...repo,
-                branch: branchName.trim(),
-                newBranch: undefined,
-                sourceBranch: undefined,
-            })),
-        };
-    }
-    if (branchChoice === 'new') {
-        const newBranchName = await prompts.input({
-            message: 'New branch name:',
-            validate: (value) => {
-                if (!value.trim())
-                    return 'Branch name is required';
-                if (!/^[\w\-./]+$/.test(value))
-                    return 'Invalid branch name (use letters, numbers, -, _, /, .)';
-                return true;
-            },
-        });
-        const sourceBranch = await prompts.input({
-            message: 'Create from branch:',
-            default: defaultBranch,
-            validate: (value) => {
-                if (!value.trim())
-                    return 'Source branch is required';
-                return true;
-            },
-        });
-        return {
-            ...resolved,
-            repos: resolved.repos.map(repo => ({
-                ...repo,
-                branch: newBranchName.trim(),
-                newBranch: newBranchName.trim(),
-                sourceBranch: sourceBranch.trim(),
-            })),
-        };
-    }
-    return resolved;
-}
 exports.rebuildCommand = new commander_1.Command('rebuild')
     .description('Rebuild an existing Genbox environment with updated configuration')
     .argument('[name]', 'Name of the Genbox to rebuild (optional - will prompt if not provided)')
@@ -822,7 +588,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         // Interactive branch selection only if no branch options specified and no stored branch
         // Skip if: -b, -f, -n, stored branch, or -y
         if (!options.branch && !options.fromBranch && !storedBranch && !options.newBranch && !options.yes && resolved.repos.length > 0) {
-            resolved = await promptForBranchOptions(resolved, config);
+            resolved = await (0, utils_1.promptForBranchOptionsRebuild)(resolved, config);
         }
         // Display what will be rebuilt
         console.log(chalk_1.default.bold('Rebuild Configuration:'));
@@ -882,7 +648,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
             }
         }
         // Get SSH keys
-        const publicKey = getPublicSshKey();
+        const publicKey = (0, utils_1.getPublicSshKey)();
         // Check if SSH auth is needed for git
         let privateKeyContent;
         const v3Config = config;
@@ -894,7 +660,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
                 default: true,
             });
             if (injectKey) {
-                privateKeyContent = getPrivateSshKey();
+                privateKeyContent = (0, utils_1.getPrivateSshKey)();
                 if (privateKeyContent) {
                     console.log(chalk_1.default.dim('  Using local SSH private key'));
                 }
@@ -1021,7 +787,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         }
         // Validate git credentials before rebuilding
         const envVarsForValidation = configLoader.loadEnvVars(process.cwd());
-        const gitValidation = validateGitCredentials(resolved.repos.map(r => ({ url: r.url, name: r.name })), envVarsForValidation.GIT_TOKEN, privateKeyContent);
+        const gitValidation = (0, utils_1.validateGitCredentials)(resolved.repos.map(r => ({ url: r.url, name: r.name })), envVarsForValidation.GIT_TOKEN, privateKeyContent);
         if (gitValidation.warnings.length > 0) {
             console.log('');
             console.log(chalk_1.default.yellow('⚠ Git Authentication Warnings:'));
@@ -1058,7 +824,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
             // Get SSH key path
             let sshKeyPath;
             try {
-                sshKeyPath = getPrivateSshKeyPath();
+                sshKeyPath = (0, utils_1.getPrivateSshKeyPath)();
             }
             catch (error) {
                 console.log(chalk_1.default.red(error.message));
@@ -1080,7 +846,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
             const envGenboxPath = path.join(process.cwd(), '.env.genbox');
             if (fs.existsSync(envGenboxPath)) {
                 const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
-                const sections = parseEnvGenboxSections(rawEnvContent);
+                const sections = (0, utils_1.parseEnvGenboxSections)(rawEnvContent);
                 const globalSection = sections.get('GLOBAL') || '';
                 const envVarsFromFile = {};
                 for (const line of globalSection.split('\n')) {
@@ -1099,7 +865,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
                     const profile = config.profiles[resolved.profile];
                     connectTo = (0, config_loader_1.getProfileConnection)(profile);
                 }
-                const serviceUrlMap = buildServiceUrlMap(envVarsFromFile, connectTo);
+                const serviceUrlMap = (0, utils_1.buildServiceUrlMap)(envVarsFromFile, connectTo);
                 for (const app of resolved.apps) {
                     const appConfig = config.apps[app.name];
                     const appPath = appConfig?.path || app.name;
@@ -1109,7 +875,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
                     if (servicesSections.length > 0) {
                         for (const serviceSectionName of servicesSections) {
                             const serviceName = serviceSectionName.split('/')[1];
-                            const serviceEnvContent = buildAppEnvContent(sections, serviceSectionName, serviceUrlMap);
+                            const serviceEnvContent = (0, utils_1.buildAppEnvContent)(sections, serviceSectionName, serviceUrlMap);
                             envFilesForSoftRebuild.push({
                                 stagingName: `${app.name}-${serviceName}.env`,
                                 remotePath: `${repoPath}/apps/${serviceName}/.env`,
@@ -1118,7 +884,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
                         }
                     }
                     else {
-                        const appEnvContent = buildAppEnvContent(sections, app.name, serviceUrlMap);
+                        const appEnvContent = (0, utils_1.buildAppEnvContent)(sections, app.name, serviceUrlMap);
                         envFilesForSoftRebuild.push({
                             stagingName: `${app.name}.env`,
                             remotePath: `${repoPath}/.env`,

package/dist/db-utils.js

@@ -47,9 +47,11 @@ exports.getMongoDumpInstallInstructions = getMongoDumpInstallInstructions;
 exports.runLocalMongoDump = runLocalMongoDump;
 exports.uploadDumpToGenbox = uploadDumpToGenbox;
 exports.runRemoteMongoRestore = runRemoteMongoRestore;
+exports.runRemoteMongoRestoreDynamic = runRemoteMongoRestoreDynamic;
 exports.cleanupDump = cleanupDump;
 exports.formatBytes = formatBytes;
 exports.waitForSshAccess = waitForSshAccess;
+exports.downloadSnapshotFromS3 = downloadSnapshotFromS3;
 exports.uploadDumpToS3 = uploadDumpToS3;
 exports.createAndUploadSnapshot = createAndUploadSnapshot;
 const child_process_1 = require("child_process");
@@ -276,6 +278,94 @@ async function runRemoteMongoRestore(ipAddress, dbName, options = {}) {
         });
     });
 }
+/**
+ * Run mongorestore on genbox via SSH with dynamic port detection
+ * This version doesn't hardcode container names or ports - it detects them dynamically
+ */
+async function runRemoteMongoRestoreDynamic(ipAddress, options = {}) {
+    return new Promise((resolve) => {
+        options.onProgress?.('Detecting MongoDB and restoring database...');
+        // The restore command - detects MongoDB port dynamically
+        const restoreCmd = `
+set -e
+
+# Detect MongoDB port from running docker containers
+# Different projects use different port mappings (e.g., 27037, 27117, etc.)
+MONGO_PORT=$(docker ps --format '{{.Ports}}' | grep -oP '\\d+(?=->27017)' | head -1)
+
+if [ -z "$MONGO_PORT" ]; then
+  echo "ERROR: Could not detect MongoDB port from running containers"
+  docker ps
+  exit 1
+fi
+
+echo "MongoDB detected on port: $MONGO_PORT"
+
+# Wait for MongoDB to be responsive
+for i in {1..30}; do
+  if mongosh --quiet --host localhost --port $MONGO_PORT --eval "db.runCommand({ping:1})" 2>/dev/null; then
+    echo "MongoDB is ready"
+    break
+  fi
+  if [ $i -eq 30 ]; then
+    echo "ERROR: MongoDB not responding after 30 attempts"
+    exit 1
+  fi
+  echo "Waiting for MongoDB... ($i/30)"
+  sleep 2
+done
+
+# Restore the database from the uploaded dump
+if [ -f /home/dev/.db-dump.gz ]; then
+  echo "Restoring database..."
+  # The dump is a raw mongodump --archive file (gzipped), not a tar archive
+  # Don't use --db flag with --archive as it causes issues
+  mongorestore --host localhost:$MONGO_PORT --drop --gzip --archive=/home/dev/.db-dump.gz
+  rm -f /home/dev/.db-dump.gz
+  echo "Database restored successfully"
+else
+  echo "Error: Dump file not found at /home/dev/.db-dump.gz"
+  exit 1
+fi
+    `;
+        const proc = (0, child_process_1.spawn)('ssh', [
+            '-o', 'StrictHostKeyChecking=no',
+            '-o', 'UserKnownHostsFile=/dev/null',
+            '-o', 'ConnectTimeout=30',
+            `dev@${ipAddress}`,
+            'bash', '-c', `'${restoreCmd.replace(/'/g, "'\\''")}'`,
+        ], {
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        let stdout = '';
+        let stderr = '';
+        proc.stdout?.on('data', (data) => {
+            const line = data.toString();
+            stdout += line;
+            // Report progress
+            if (line.includes('MongoDB detected') || line.includes('Restoring') || line.includes('restored') || line.includes('Waiting')) {
+                options.onProgress?.(line.trim());
+            }
+        });
+        proc.stderr?.on('data', (data) => {
+            stderr += data.toString();
+        });
+        proc.on('close', (code) => {
+            if (code === 0) {
+                resolve({ success: true });
+            }
+            else {
+                resolve({
+                    success: false,
+                    error: stderr || stdout || 'Restore failed',
+                });
+            }
+        });
+        proc.on('error', (err) => {
+            resolve({ success: false, error: `Failed to run ssh: ${err.message}` });
+        });
+    });
+}
 /**
  * Clean up temporary dump files
  */
@@ -324,6 +414,36 @@ async function waitForSshAccess(ipAddress, maxWaitSeconds = 300, onProgress) {
     }
     return false;
 }
+/**
+ * Download a snapshot from S3 using pre-signed URL
+ */
+async function downloadSnapshotFromS3(downloadUrl, options = {}) {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'genbox-dbdump-'));
+    const dumpPath = path.join(tempDir, 'dump.gz');
+    options.onProgress?.('Downloading snapshot from cloud...');
+    try {
+        const response = await fetch(downloadUrl);
+        if (!response.ok) {
+            fs.rmSync(tempDir, { recursive: true, force: true });
+            return {
+                success: false,
+                error: `Download failed: ${response.status} ${response.statusText}`,
+            };
+        }
+        const buffer = await response.arrayBuffer();
+        fs.writeFileSync(dumpPath, Buffer.from(buffer));
+        const stats = fs.statSync(dumpPath);
+        options.onProgress?.(`Downloaded snapshot (${formatBytes(stats.size)})`);
+        return { success: true, dumpPath };
+    }
+    catch (error) {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+        return {
+            success: false,
+            error: `Download failed: ${error.message}`,
+        };
+    }
+}
 /**
  * Upload dump file to S3 using pre-signed URL
  */