genbox 1.0.77 → 1.0.79

package/dist/commands/create.js

@@ -555,6 +555,10 @@ exports.createCommand = new commander_1.Command('create')
         // Build payload
         const payloadResolved = { ...resolved };
         if (snapshotId && snapshotS3Key) {
+            // Extract database name from source URL for restore
+            const sourceDatabase = resolved.database?.url
+                ? (0, db_utils_1.extractDatabaseName)(resolved.database.url)
+                : undefined;
             // Use S3 snapshot mode
             payloadResolved.database = {
                 ...resolved.database,
@@ -562,6 +566,7 @@ exports.createCommand = new commander_1.Command('create')
                 mode: 'snapshot',
                 snapshotId,
                 s3Key: snapshotS3Key,
+                sourceDatabase, // Pass the database name for correct restore
             };
         }
         const payload = buildPayload(payloadResolved, config, publicKey, privateKeyContent, configLoader);

package/dist/commands/extend.js

@@ -7,17 +7,18 @@ exports.extendCommand = void 0;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
+const select_1 = __importDefault(require("@inquirer/select"));
+const input_1 = __importDefault(require("@inquirer/input"));
 const api_1 = require("../api");
 const genbox_selector_1 = require("../genbox-selector");
 exports.extendCommand = new commander_1.Command('extend')
     .description('Extend genbox and reset inactivity timer')
     .argument('[name]', 'Name of the Genbox (optional - will auto-select or prompt)')
-    .argument('[hours]', 'Hours to extend (default: 1)', '1')
+    .option('-h, --hours <hours>', 'Hours to extend (skip prompt)')
     .option('--no-auto-destroy', 'Disable auto-destroy on inactivity')
     .option('--enable-auto-destroy', 'Re-enable auto-destroy on inactivity')
-    .action(async (name, hoursArg, options) => {
+    .action(async (name, options) => {
     try {
-        const hours = parseInt(hoursArg, 10) || 1;
         // Select genbox
         const { genbox: target, cancelled } = await (0, genbox_selector_1.selectGenbox)(name, {
             selectMessage: 'Select a genbox to extend:',
@@ -33,6 +34,45 @@ exports.extendCommand = new commander_1.Command('extend')
             console.error(chalk_1.default.red(`Error: Genbox '${target.name}' is not running (status: ${target.status})`));
             return;
         }
+        // Determine hours - from option or prompt
+        let hours;
+        if (options.hours) {
+            hours = parseInt(options.hours, 10);
+            if (isNaN(hours) || hours < 1) {
+                console.error(chalk_1.default.red('Error: Hours must be a positive number'));
+                return;
+            }
+        }
+        else {
+            // Show selection prompt
+            const choice = await (0, select_1.default)({
+                message: 'How long do you want to extend?',
+                choices: [
+                    { name: '1 hour', value: 1 },
+                    { name: '2 hours', value: 2 },
+                    { name: '4 hours', value: 4 },
+                    { name: '8 hours', value: 8 },
+                    { name: 'Custom...', value: 0 },
+                ],
+            });
+            if (choice === 0) {
+                const customHours = await (0, input_1.default)({
+                    message: 'Enter number of hours:',
+                    validate: (val) => {
+                        const num = parseInt(val, 10);
+                        if (isNaN(num) || num < 1)
+                            return 'Please enter a positive number';
+                        if (num > 24)
+                            return 'Maximum 24 hours';
+                        return true;
+                    },
+                });
+                hours = parseInt(customHours, 10);
+            }
+            else {
+                hours = choice;
+            }
+        }
         // Determine disableAutoDestroy value
         let disableAutoDestroy;
         if (options.autoDestroy === false) {
@@ -41,7 +81,7 @@ exports.extendCommand = new commander_1.Command('extend')
         else if (options.enableAutoDestroy) {
             disableAutoDestroy = false; // --enable-auto-destroy flag
         }
-        const spinner = (0, ora_1.default)(`Extending ${target.name}...`).start();
+        const spinner = (0, ora_1.default)(`Extending ${target.name} by ${hours} hour${hours > 1 ? 's' : ''}...`).start();
         const result = await (0, api_1.fetchApi)(`/genboxes/${target._id}/extend`, {
             method: 'POST',
             body: JSON.stringify({
@@ -58,6 +98,7 @@ exports.extendCommand = new commander_1.Command('extend')
                 console.log(chalk_1.default.dim(`  Current hour ends in: ${minutesUntil} minutes`));
             }
             console.log(chalk_1.default.dim(`  Auto-destroy: ${result.autoDestroyEnabled ? 'enabled' : 'disabled'}`));
+            console.log(chalk_1.default.dim(`  Note: Credits charged at the end of each hour`));
         }
         else {
             console.error(chalk_1.default.red(`Error: ${result.message}`));

package/dist/commands/rebuild.js

@@ -328,6 +328,17 @@ async function runSoftRebuild(options) {
                     }
                     else {
                         log('✓ Database restored', 'success');
+                        // Update MONGODB_URI in app .env files to point to the correct database
+                        const sourceDatabase = resolved.database?.url
+                            ? (0, db_utils_1.extractDatabaseName)(resolved.database.url)
+                            : undefined;
+                        if (sourceDatabase) {
+                            log('Updating MONGODB_URI in app .env files...', 'info');
+                            const newMongoUri = `mongodb://localhost:${mongoPort}/${sourceDatabase}`;
+                            const updateCmd = `find /home/dev -name ".env" -type f -exec grep -l "^MONGODB_URI=" {} \\; | xargs -I{} sed -i 's|^MONGODB_URI=.*|MONGODB_URI=${newMongoUri}|' {}`;
+                            await sshExec(ip, keyPath, updateCmd, 30);
+                            log(`✓ MONGODB_URI updated to ${newMongoUri}`, 'success');
+                        }
                     }
                     // Cleanup
                     await sshExec(ip, keyPath, 'rm -f /tmp/db-snapshot.gz', 10);