genbox 1.0.64 → 1.0.66

package/dist/commands/create.js

@@ -43,15 +43,15 @@ const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const os = __importStar(require("os"));
+const child_process_1 = require("child_process");
 const config_loader_1 = require("../config-loader");
 const profile_resolver_1 = require("../profile-resolver");
 const api_1 = require("../api");
 const ssh_config_1 = require("../ssh-config");
 const schema_v4_1 = require("../schema-v4");
-const child_process_1 = require("child_process");
 const random_name_1 = require("../random-name");
 const db_utils_1 = require("../db-utils");
+const utils_1 = require("../utils");
 // Credits consumed per hour for each size (matches API billing.config.ts)
 const CREDITS_PER_HOUR = {
     cx22: 1,
@@ -104,55 +104,6 @@ async function provisionGenbox(payload) {
         body: JSON.stringify(payload),
     });
 }
-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;
-}
-/**
- * Get local git config for commits on genbox
- */
-function getGitConfig() {
-    const { execSync } = require('child_process');
-    let userName;
-    let userEmail;
-    try {
-        userName = execSync('git config --global user.name', { encoding: 'utf-8' }).trim();
-    }
-    catch {
-        // Git config not set
-    }
-    try {
-        userEmail = execSync('git config --global user.email', { encoding: 'utf-8' }).trim();
-    }
-    catch {
-        // Git config not set
-    }
-    return { userName, userEmail };
-}
 /**
  * Prompt user for environment name
  */
@@ -343,7 +294,7 @@ exports.createCommand = new commander_1.Command('create')
         // Interactive branch selection if no branch options were specified
         // Skip if: -b (existing branch), -f (new branch from source), -n (explicit new branch name), or -y (skip prompts)
         if (!options.branch && !options.fromBranch && !options.newBranch && !options.yes && resolved.repos.length > 0) {
-            resolved = await promptForBranchOptions(resolved, config, name);
+            resolved = await (0, utils_1.promptForBranchOptionsCreate)(resolved, config, name);
         }
         // Default behavior when -y (non-interactive) and no branch options: create new branch from configured default
         if (!options.branch && !options.fromBranch && !options.newBranch && options.yes && resolved.repos.length > 0) {
@@ -412,7 +363,7 @@ exports.createCommand = new commander_1.Command('create')
             }
         }
         // 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;
@@ -424,7 +375,7 @@ exports.createCommand = new commander_1.Command('create')
                 default: true,
             });
             if (injectKey) {
-                privateKeyContent = getPrivateSshKey();
+                privateKeyContent = (0, utils_1.getPrivateSshKey)();
                 if (privateKeyContent) {
                     console.log(chalk_1.default.dim('  Using local SSH private key'));
                 }
@@ -432,7 +383,7 @@ exports.createCommand = new commander_1.Command('create')
         }
         // Validate git credentials and warn if missing
         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:'));
@@ -736,225 +687,6 @@ function displayResolvedConfig(resolved) {
     console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
     console.log('');
 }
-/**
- * Prompt for branch options interactively
- * Default behavior: create new branch from configured default (or 'main') with branch name = environment name
- */
-async function promptForBranchOptions(resolved, config, envName) {
-    // Get the default/base branch from config (used as source for new branches)
-    const baseBranch = config.defaults?.branch || 'main';
-    console.log(chalk_1.default.blue('=== Branch Configuration ==='));
-    console.log('');
-    const branchChoice = await prompts.select({
-        message: 'Branch option:',
-        choices: [
-            {
-                name: `${chalk_1.default.green('Create new branch')} '${chalk_1.default.cyan(envName)}' from '${baseBranch}' ${chalk_1.default.dim('(recommended)')}`,
-                value: 'new-from-default',
-            },
-            {
-                name: `Create new branch from a different source`,
-                value: 'new-custom',
-            },
-            {
-                name: 'Use an existing branch',
-                value: 'existing',
-            },
-            {
-                name: `Use '${baseBranch}' directly without creating new branch`,
-                value: 'default',
-            },
-        ],
-        default: 'new-from-default',
-    });
-    if (branchChoice === 'new-from-default') {
-        // Create new branch from configured default with name = environment name
-        return {
-            ...resolved,
-            repos: resolved.repos.map(repo => ({
-                ...repo,
-                branch: envName,
-                newBranch: envName,
-                sourceBranch: baseBranch,
-            })),
-        };
-    }
-    if (branchChoice === 'new-custom') {
-        const newBranchName = await prompts.input({
-            message: 'New branch name:',
-            default: envName,
-            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: 'main',
-            validate: (value) => {
-                if (!value.trim())
-                    return 'Source branch is required';
-                return true;
-            },
-        });
-        // Update all repos with new branch info
-        return {
-            ...resolved,
-            repos: resolved.repos.map(repo => ({
-                ...repo,
-                branch: newBranchName.trim(),
-                newBranch: newBranchName.trim(),
-                sourceBranch: sourceBranch.trim(),
-            })),
-        };
-    }
-    if (branchChoice === 'existing') {
-        const branchName = await prompts.input({
-            message: 'Enter branch name:',
-            default: baseBranch,
-            validate: (value) => {
-                if (!value.trim())
-                    return 'Branch name is required';
-                return true;
-            },
-        });
-        // Update all repos with the selected branch
-        return {
-            ...resolved,
-            repos: resolved.repos.map(repo => ({
-                ...repo,
-                branch: branchName.trim(),
-                newBranch: undefined,
-                sourceBranch: undefined,
-            })),
-        };
-    }
-    if (branchChoice === 'default') {
-        // Keep resolved repos as-is (no new branch)
-        return resolved;
-    }
-    return resolved;
-}
-/**
- * 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) {
-            // Save previous section
-            if (currentContent.length > 0) {
-                sections.set(currentSection, currentContent.join('\n').trim());
-            }
-            currentSection = sectionMatch[1].trim();
-            currentContent = [];
-        }
-        else if (currentSection !== 'END') {
-            currentContent.push(line);
-        }
-    }
-    // Save last section
-    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
- * e.g., if connectTo=staging: GATEWAY_URL → STAGING_GATEWAY_URL value
- */
-function buildServiceUrlMap(envVarsFromFile, connectTo) {
-    const urlMap = {};
-    const prefix = connectTo ? `${connectTo.toUpperCase()}_` : 'LOCAL_';
-    // Find all service URL variables (LOCAL_*_URL and STAGING_*_URL patterns)
-    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]);
-        }
-    }
-    // Build mapping: VARNAME → value from appropriate prefix
-    for (const serviceName of serviceNames) {
-        const prefixedKey = `${prefix}${serviceName}`;
-        const localKey = `LOCAL_${serviceName}`;
-        // Use prefixed value if available, otherwise fall back to local
-        const value = envVarsFromFile[prefixedKey] || envVarsFromFile[localKey];
-        if (value) {
-            urlMap[serviceName] = value;
-        }
-    }
-    // Also handle legacy API_URL for backwards compatibility
-    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 by combining GLOBAL + app-specific sections
- */
-function buildAppEnvContent(sections, appName, serviceUrlMap) {
-    const parts = [];
-    // Always include GLOBAL section
-    const globalSection = sections.get('GLOBAL');
-    if (globalSection) {
-        parts.push(globalSection);
-    }
-    // Include app-specific section if exists
-    const appSection = sections.get(appName);
-    if (appSection) {
-        parts.push(appSection);
-    }
-    let envContent = parts.join('\n\n');
-    // Expand all ${VARNAME} references using the service URL map
-    for (const [varName, value] of Object.entries(serviceUrlMap)) {
-        const pattern = new RegExp(`\\$\\{${varName}\\}`, 'g');
-        envContent = envContent.replace(pattern, value);
-    }
-    // Keep only actual env vars (filter out pure comment lines but keep var definitions)
-    envContent = envContent
-        .split('\n')
-        .filter(line => {
-        const trimmed = line.trim();
-        // Keep empty lines, lines with = (even if commented), and non-comment lines
-        return trimmed === '' || trimmed.includes('=') || !trimmed.startsWith('#');
-    })
-        .join('\n')
-        .replace(/\n{3,}/g, '\n\n')
-        .trim();
-    return envContent;
-}
-/**
- * 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 };
-}
 /**
  * Build API payload from resolved config
  */
@@ -977,22 +709,10 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
     if (fs.existsSync(envGenboxPath)) {
         const rawEnvContent = fs.readFileSync(envGenboxPath, 'utf-8');
         // Parse into sections
-        const sections = parseEnvGenboxSections(rawEnvContent);
+        const sections = (0, utils_1.parseEnvGenboxSections)(rawEnvContent);
         // Parse GLOBAL section to get API URL values
         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();
-                // Remove quotes if present
-                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);
         // Determine connection type from profile's connect_to (v3) or default_connection (v4)
         let connectTo;
         if (resolved.profile && config.profiles?.[resolved.profile]) {
@@ -1002,7 +722,7 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
         // Build service URL map for variable expansion
         // This maps GATEWAY_URL → STAGING_GATEWAY_URL value (if connectTo=staging)
         // or GATEWAY_URL → LOCAL_GATEWAY_URL value (if local)
-        const serviceUrlMap = buildServiceUrlMap(envVarsFromFile, connectTo);
+        const serviceUrlMap = (0, utils_1.buildServiceUrlMap)(envVarsFromFile, connectTo);
         // Log what's being expanded for debugging
         if (connectTo && Object.keys(serviceUrlMap).length > 0) {
             console.log(chalk_1.default.dim(`  Using ${connectTo} URLs for variable expansion`));
@@ -1019,7 +739,7 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
                 for (const serviceSectionName of servicesSections) {
                     const serviceName = serviceSectionName.split('/')[1];
                     // Build service-specific env content (GLOBAL + service section)
-                    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({
@@ -1032,7 +752,7 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
             }
             else {
                 // Regular app - build app-specific env content (GLOBAL + app section)
-                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,
@@ -1071,7 +791,7 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
         };
     }
     // Get local git config for commits
-    const gitConfig = getGitConfig();
+    const gitConfig = (0, utils_1.getGitConfig)();
     // Load project cache to get project ID
     const projectCache = loadProjectCache(process.cwd());
     return {
@@ -1211,7 +931,7 @@ async function createLegacy(name, options) {
     const { loadConfig, loadEnvVars } = await Promise.resolve().then(() => __importStar(require('../config')));
     const config = loadConfig();
     const size = options.size || config.system?.server_size || 'small';
-    const publicKey = getPublicSshKey();
+    const publicKey = (0, utils_1.getPublicSshKey)();
     // Check if SSH auth needed
     let privateKeyContent;
     const usesSSH = config.git_auth?.method === 'ssh' ||
@@ -1222,7 +942,7 @@ async function createLegacy(name, options) {
             default: true,
         });
         if (injectKey) {
-            privateKeyContent = getPrivateSshKey();
+            privateKeyContent = (0, utils_1.getPrivateSshKey)();
         }
     }
     const spinner = (0, ora_1.default)(`Creating Genbox '${name}'...`).start();

package/dist/commands/db-sync.js

@@ -147,7 +147,34 @@ exports.dbSyncCommand
                     if (snapshotChoice === 'existing') {
                         snapshotId = existingSnapshot._id;
                         snapshotS3Key = existingSnapshot.s3Key;
-                        console.log(chalk_1.default.green(`  ✓ Using existing snapshot`));
+                        // Download the existing snapshot from S3
+                        const downloadSpinner = (0, ora_1.default)('Downloading existing snapshot...').start();
+                        try {
+                            const downloadUrlResponse = await (0, api_1.getSnapshotDownloadUrl)(snapshotId);
+                            const downloadResult = await (0, db_utils_1.downloadSnapshotFromS3)(downloadUrlResponse.downloadUrl, {
+                                onProgress: (msg) => downloadSpinner.text = msg,
+                            });
+                            if (!downloadResult.success) {
+                                downloadSpinner.fail(chalk_1.default.red('Failed to download snapshot'));
+                                console.log(chalk_1.default.dim(`  Error: ${downloadResult.error}`));
+                                console.log(chalk_1.default.dim('  Creating fresh snapshot instead...'));
+                                // Reset to create fresh
+                                snapshotId = undefined;
+                                snapshotS3Key = undefined;
+                            }
+                            else {
+                                downloadSpinner.succeed(chalk_1.default.green('Snapshot downloaded'));
+                                localDumpPath = downloadResult.dumpPath;
+                            }
+                        }
+                        catch (error) {
+                            downloadSpinner.fail(chalk_1.default.red('Failed to download snapshot'));
+                            console.log(chalk_1.default.dim(`  Error: ${error.message}`));
+                            console.log(chalk_1.default.dim('  Creating fresh snapshot instead...'));
+                            // Reset to create fresh
+                            snapshotId = undefined;
+                            snapshotS3Key = undefined;
+                        }
                     }
                 }
             }
@@ -215,20 +242,37 @@ exports.dbSyncCommand
                 }
             }
         }
-        // Trigger restore on genbox
-        if (!snapshotId || !snapshotS3Key) {
-            console.log(chalk_1.default.red('No snapshot available to restore'));
+        // Restore directly via SCP/SSH (user's own SSH key, more reliable than API async job)
+        if (!localDumpPath) {
+            console.log(chalk_1.default.red('No dump file available to restore'));
             return;
         }
-        const restoreSpinner = (0, ora_1.default)('Restoring database on genbox...').start();
+        const ipAddress = genbox.ipAddress;
+        if (!ipAddress) {
+            console.log(chalk_1.default.red('Genbox has no IP address'));
+            return;
+        }
+        const restoreSpinner = (0, ora_1.default)('Uploading dump to genbox...').start();
         try {
-            await (0, api_1.fetchApi)(`/genboxes/${genboxId}/db/restore`, {
-                method: 'POST',
-                body: JSON.stringify({
-                    snapshotId,
-                    s3Key: snapshotS3Key,
-                }),
+            // SCP dump file to genbox
+            const uploadResult = await (0, db_utils_1.uploadDumpToGenbox)(localDumpPath, ipAddress, {
+                onProgress: (msg) => restoreSpinner.text = msg,
             });
+            if (!uploadResult.success) {
+                restoreSpinner.fail(chalk_1.default.red('Upload failed'));
+                console.error(chalk_1.default.red(`  Error: ${uploadResult.error}`));
+                return;
+            }
+            restoreSpinner.text = 'Restoring database...';
+            // SSH to run mongorestore with dynamic port detection
+            const restoreResult = await (0, db_utils_1.runRemoteMongoRestoreDynamic)(ipAddress, {
+                onProgress: (msg) => restoreSpinner.text = msg,
+            });
+            if (!restoreResult.success) {
+                restoreSpinner.fail(chalk_1.default.red('Restore failed'));
+                console.error(chalk_1.default.red(`  Error: ${restoreResult.error}`));
+                return;
+            }
             restoreSpinner.succeed(chalk_1.default.green('Database sync completed!'));
             console.log('');
             console.log(chalk_1.default.dim(`  Database has been restored from ${source} snapshot.`));
@@ -236,9 +280,6 @@ exports.dbSyncCommand
         catch (error) {
             restoreSpinner.fail(chalk_1.default.red('Database restore failed'));
             console.error(chalk_1.default.red(`  Error: ${error.message}`));
-            if (error instanceof api_1.AuthenticationError) {
-                console.log(chalk_1.default.yellow('\nRun: genbox login'));
-            }
         }
     }
     catch (error) {