openkbs 0.0.63 → 0.0.65

package/src/actions.js

@@ -1935,7 +1935,7 @@ async function siteDeployAction(kbToken, kbId, siteDir, args) {
         }
 
         console.green(`\nUpload complete! ${uploaded}/${files.length} files uploaded.`);
-        console.log(`Files accessible at: https://files.openkbs.com/${kbId}/`);
+        // console.log(`Files accessible at: https://files.openkbs.com/${kbId}/`);
 
     } catch (error) {
         console.red('Upload failed:', error.message);
@@ -2184,9 +2184,12 @@ async function elasticDeployAction() {
         if (elasticRes.error) {
             console.red('Elastic deploy error:', elasticRes.error);
         } else {
-            if (elasticRes.pulse?.enabled) console.green('  ✓ Pulse enabled');
-            if (elasticRes.postgres?.enabled) console.green('  ✓ Postgres enabled');
-            if (elasticRes.storage?.enabled) console.green('  ✓ Storage enabled');
+            if (elasticRes.pulse?.enabled || elasticRes.pulse?.alreadyEnabled) console.green('  ✓ Pulse enabled');
+            if (elasticRes.pulse?.error) console.yellow('  ⚠ Pulse:', elasticRes.pulse.error);
+            if (elasticRes.postgres?.enabled || elasticRes.postgres?.alreadyEnabled || elasticRes.postgres?.host) console.green('  ✓ Postgres enabled');
+            if (elasticRes.postgres?.error) console.yellow('  ⚠ Postgres:', elasticRes.postgres.error);
+            if (elasticRes.storage?.enabled || elasticRes.storage?.alreadyEnabled || elasticRes.storage?.bucket) console.green('  ✓ Storage enabled');
+            if (elasticRes.storage?.error) console.yellow('  ⚠ Storage:', elasticRes.storage.error);
             if (elasticRes.storage?.cloudfront) console.green('  ✓ CloudFront configured');
         }
     }
@@ -2219,6 +2222,257 @@ async function elasticDeployAction() {
     console.green('\nDeploy complete!');
 }
 
+/**
+ * Destroy all resources defined in openkbs.json
+ */
+async function elasticDestroyAction() {
+    // Find openkbs.json
+    const configPaths = [
+        path.join(process.cwd(), 'openkbs.json'),
+        path.join(process.cwd(), '..', 'openkbs.json')
+    ];
+
+    let configPath = null;
+    for (const p of configPaths) {
+        if (fs.existsSync(p)) {
+            configPath = p;
+            break;
+        }
+    }
+
+    if (!configPath) {
+        return console.red('openkbs.json not found.');
+    }
+
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+
+    console.log(`Destroying ${config.name || 'project'} resources...`);
+    console.yellow('Warning: This will permanently delete all resources!\n');
+
+    // Get KB token
+    const settings = findSettings();
+    if (!settings?.kbId) {
+        return console.red('No kbId found. Run from a directory with settings.json');
+    }
+
+    const res = await fetchKBJWT(settings.kbId);
+    if (!res?.kbToken) {
+        return console.red(`KB ${settings.kbId} not found`);
+    }
+    const kbToken = res.kbToken;
+
+    // Delete functions
+    if (config.functions && config.functions.length > 0) {
+        console.log('Deleting functions...');
+        for (const fnName of config.functions) {
+            const name = typeof fnName === 'object' ? fnName.name : fnName;
+            try {
+                await fnDeleteAction(kbToken, name);
+                console.green(`  ✓ Deleted ${name}`);
+            } catch (e) {
+                console.yellow(`  ⚠ ${name}: ${e.message}`);
+            }
+        }
+    }
+
+    // Disable elastic services
+    if (config.elastic) {
+        console.log('\nDisabling Elastic services...');
+
+        if (config.elastic.storage) {
+            // First remove CloudFront behavior/origin if configured
+            const cloudfrontPath = typeof config.elastic.storage === 'object'
+                ? config.elastic.storage.cloudfront
+                : null;
+
+            if (cloudfrontPath) {
+                try {
+                    await makePostRequest(KB_API_URL, {
+                        token: kbToken,
+                        action: 'setStorageCloudFront',
+                        pathPrefix: cloudfrontPath,
+                        enable: false
+                    });
+                    console.green(`  ✓ CloudFront behavior removed (/${cloudfrontPath}/*)`);
+                } catch (e) {
+                    console.yellow(`  ⚠ CloudFront: ${e.message}`);
+                }
+            }
+
+            // Then delete storage bucket
+            try {
+                const storageRes = await makePostRequest(KB_API_URL, {
+                    token: kbToken,
+                    action: 'deleteElasticStorage',
+                    force: true
+                });
+                if (storageRes.error) {
+                    console.yellow(`  ⚠ Storage: ${storageRes.error}`);
+                } else {
+                    console.green('  ✓ Storage disabled');
+                }
+            } catch (e) {
+                console.yellow(`  ⚠ Storage: ${e.message}`);
+            }
+        }
+
+        if (config.elastic.postgres) {
+            try {
+                await makePostRequest(KB_API_URL, {
+                    token: kbToken,
+                    action: 'deleteElasticPostgres'
+                });
+                console.green('  ✓ Postgres disabled');
+            } catch (e) {
+                console.yellow(`  ⚠ Postgres: ${e.message}`);
+            }
+        }
+
+        if (config.elastic.pulse) {
+            try {
+                await makePostRequest(KB_API_URL, {
+                    token: kbToken,
+                    action: 'disableElasticPulse'
+                });
+                console.green('  ✓ Pulse disabled');
+            } catch (e) {
+                console.yellow(`  ⚠ Pulse: ${e.message}`);
+            }
+        }
+    }
+
+    console.green('\nDestroy complete!');
+}
+
+/**
+ * Show status of all resources defined in openkbs.json
+ */
+async function elasticStatusAction() {
+    // Find openkbs.json
+    const configPaths = [
+        path.join(process.cwd(), 'openkbs.json'),
+        path.join(process.cwd(), '..', 'openkbs.json')
+    ];
+
+    let configPath = null;
+    for (const p of configPaths) {
+        if (fs.existsSync(p)) {
+            configPath = p;
+            break;
+        }
+    }
+
+    if (!configPath) {
+        return console.red('openkbs.json not found.');
+    }
+
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+
+    console.log(`Stack: ${config.name || 'unnamed'}`);
+    console.log(`Region: ${config.region || 'us-east-1'}\n`);
+
+    // Get KB token
+    const settings = findSettings();
+    if (!settings?.kbId) {
+        return console.red('No kbId found. Run from a directory with settings.json');
+    }
+
+    const res = await fetchKBJWT(settings.kbId);
+    if (!res?.kbToken) {
+        return console.red(`KB ${settings.kbId} not found`);
+    }
+    const kbToken = res.kbToken;
+
+    // Check functions
+    if (config.functions && config.functions.length > 0) {
+        console.log('Functions:');
+        const listRes = await makePostRequest(KB_API_URL, {
+            token: kbToken,
+            action: 'listElasticFunctions'
+        });
+        const deployed = listRes.functions?.map(f => f.functionName) || [];
+
+        for (const fnName of config.functions) {
+            const name = typeof fnName === 'object' ? fnName.name : fnName;
+            if (deployed.includes(name)) {
+                const fn = listRes.functions.find(f => f.functionName === name);
+                console.green(`  ✓ ${name} (${fn.customUrl || fn.functionUrl})`);
+            } else {
+                console.yellow(`  ○ ${name} (not deployed)`);
+            }
+        }
+        console.log('');
+    }
+
+    // Check elastic services
+    if (config.elastic) {
+        console.log('Elastic Services:');
+
+        if (config.elastic.storage) {
+            const storageRes = await makePostRequest(KB_API_URL, {
+                token: kbToken,
+                action: 'getElasticStorage'
+            });
+            if (storageRes.enabled) {
+                console.green(`  ✓ Storage (${storageRes.bucket})`);
+            } else {
+                console.yellow('  ○ Storage (not enabled)');
+            }
+        }
+
+        if (config.elastic.postgres) {
+            const pgRes = await makePostRequest(KB_API_URL, {
+                token: kbToken,
+                action: 'getElasticPostgres'
+            });
+            if (pgRes.enabled) {
+                console.green(`  ✓ Postgres (${pgRes.host})`);
+            } else {
+                console.yellow('  ○ Postgres (not enabled)');
+            }
+        }
+
+        if (config.elastic.pulse) {
+            const pulseRes = await makePostRequest(KB_API_URL, {
+                token: kbToken,
+                action: 'getElasticPulse'
+            });
+            if (pulseRes.enabled) {
+                console.green(`  ✓ Pulse (${pulseRes.endpoint})`);
+            } else {
+                console.yellow('  ○ Pulse (not enabled)');
+            }
+        }
+    }
+
+    // Site info
+    if (config.site) {
+        console.log('');
+        console.log(`Site: https://files.openkbs.com/${settings.kbId}/`);
+    }
+}
+
+/**
+ * Stack command handler
+ */
+async function stackAction(subCommand, args = []) {
+    switch (subCommand) {
+        case 'deploy':
+            return await elasticDeployAction();
+        case 'destroy':
+            return await elasticDestroyAction();
+        case 'status':
+            return await elasticStatusAction();
+        default:
+            console.log('Usage: openkbs stack <command>');
+            console.log('');
+            console.log('Commands:');
+            console.log('  deploy     Deploy all resources from openkbs.json');
+            console.log('  destroy    Delete all resources (DANGEROUS)');
+            console.log('  status     Show status of all resources');
+    }
+}
+
 module.exports = {
     signAction,
     loginAction,
@@ -2245,5 +2499,7 @@ module.exports = {
     storageAction,
     postgresAction,
     pulseAction,
-    elasticDeployAction
+    stackAction,
+    elasticDeployAction,
+    elasticDestroyAction
 };

package/src/index.js

@@ -19,7 +19,9 @@ const {
     storageAction,
     postgresAction,
     pulseAction,
-    elasticDeployAction
+    stackAction,
+    elasticDeployAction,
+    elasticDestroyAction
 } = require('./actions');
 
 
@@ -127,6 +129,35 @@ Reads openkbs.json and deploys:
   - Site
 `);
 
+program
+    .command('destroy')
+    .description('Destroy all resources from openkbs.json (DANGEROUS)')
+    .action(elasticDestroyAction)
+    .addHelpText('after', `
+Examples:
+  $ openkbs destroy
+
+Reads openkbs.json and deletes:
+  - Functions
+  - Elastic services (storage, postgres, pulse)
+`);
+
+program
+    .command('stack <subcommand>')
+    .description('Manage stack resources (deploy, destroy, status)')
+    .action((subCommand) => stackAction(subCommand))
+    .addHelpText('after', `
+Commands:
+  deploy     Deploy all resources from openkbs.json
+  destroy    Delete all resources (DANGEROUS)
+  status     Show status of all resources
+
+Examples:
+  $ openkbs stack deploy
+  $ openkbs stack status
+  $ openkbs stack destroy
+`);
+
 // program
 //     .command('sign')
 //     .description('Signs a transaction to request OpenKBS service')

package/src/utils.js

@@ -166,14 +166,18 @@ function makePostRequest(url, data) {
                     try {
                         const parsed = JSON.parse(body);
                         if (parsed.error) {
-                            console.red(parsed.error);
+                            console.red(`Error: ${parsed.error}`);
                         } else if (parsed.message) {
-                            console.red(parsed.message);
+                            console.red(`Error: ${parsed.message}`);
                         } else {
-                            console.red(`Invalid Request`);
+                            // Show the full response body if no error/message field
+                            console.red(`Request failed (HTTP ${res.statusCode}):`);
+                            console.red(JSON.stringify(parsed, null, 2));
                         }
                     } catch (e) {
-                        console.red(`Invalid Request`);
+                        // Could not parse JSON, show raw body
+                        console.red(`Request failed (HTTP ${res.statusCode}):`);
+                        console.red(body || 'No response body');
                     }
 
                     process.exit(1);

package/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.61",
-  "releaseDate": "2025-12-30",
-  "releaseNotes": "OpenKBS CLI version 0.0.61"
+  "version": "0.0.65",
+  "releaseDate": "2026-01-02",
+  "releaseNotes": "OpenKBS CLI version 0.0.65"
 }