openkbs 0.0.60 → 0.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openkbs",
-  "version": "0.0.60",
+  "version": "0.0.63",
   "description": "OpenKBS - Command Line Interface",
   "main": "src/index.js",
   "scripts": {

package/src/actions.js

@@ -931,7 +931,7 @@ async function fnAction(subCommand, args = []) {
     switch (subCommand) {
         case 'list':
             return await fnListAction(kbToken);
-        case 'deploy':
+        case 'push':
             return await fnDeployAction(kbToken, args[0], args.slice(1));
         case 'delete':
             return await fnDeleteAction(kbToken, args[0]);
@@ -946,13 +946,13 @@ async function fnAction(subCommand, args = []) {
             console.log('');
             console.log('Commands:');
             console.log('  list                    List all elastic functions');
-            console.log('  deploy <name>           Deploy a function from ./functions/<name>/');
+            console.log('  push <name>             Push a function from ./functions/<name>/');
             console.log('  delete <name>           Delete a function');
             console.log('  logs <name>             View function logs');
             console.log('  env <name> [KEY=value]  View or set environment variables');
             console.log('  invoke <name> [payload] Invoke a function');
             console.log('');
-            console.log('Options for deploy:');
+            console.log('Options for push:');
             console.log('  --region <region>       Region (us-east-1, eu-central-1, ap-southeast-1)');
             console.log('  --memory <mb>           Memory size (128-3008 MB)');
             console.log('  --timeout <seconds>     Timeout (1-900 seconds)');
@@ -1005,6 +1005,8 @@ async function fnDeployAction(kbToken, functionName, args) {
     let region = findRegion();
     let memorySize = 256;
     let timeout = 30;
+    let runtime = null;  // null = use default (nodejs24.x)
+    let handler = null;  // null = use default (index.handler)
 
     for (let i = 0; i < args.length; i++) {
         if (args[i] === '--region' && args[i + 1]) {
@@ -1013,6 +1015,10 @@ async function fnDeployAction(kbToken, functionName, args) {
             memorySize = parseInt(args[++i]);
         } else if (args[i] === '--timeout' && args[i + 1]) {
             timeout = parseInt(args[++i]);
+        } else if (args[i] === '--runtime' && args[i + 1]) {
+            runtime = args[++i];
+        } else if (args[i] === '--handler' && args[i + 1]) {
+            handler = args[++i];
         }
     }
 
@@ -1082,7 +1088,7 @@ async function fnDeployAction(kbToken, functionName, args) {
         } else {
             // Create new function
             console.log('Creating new function...');
-            response = await makePostRequest(KB_API_URL, {
+            const createParams = {
                 token: kbToken,
                 action: 'createElasticFunction',
                 functionName,
@@ -1090,7 +1096,10 @@ async function fnDeployAction(kbToken, functionName, args) {
                 region,
                 memorySize,
                 timeout
-            });
+            };
+            if (runtime) createParams.runtime = runtime;
+            if (handler) createParams.handler = handler;
+            response = await makePostRequest(KB_API_URL, createParams);
         }
 
         if (response.error) {
@@ -1837,11 +1846,20 @@ async function siteAction(subCommand, args = []) {
     const { kbToken } = await fetchKBJWT(kbId);
 
     switch (subCommand) {
-        case 'deploy':
+        case 'push':
+            // If a folder path is provided, use it
+            if (args.length > 0 && args[0] && !args[0].startsWith('-')) {
+                const customDir = path.resolve(process.cwd(), args[0]);
+                if (fs.existsSync(customDir) && fs.statSync(customDir).isDirectory()) {
+                    siteDir = customDir;
+                } else {
+                    return console.red(`Directory not found: ${args[0]}`);
+                }
+            }
             return await siteDeployAction(kbToken, kbId, siteDir, args);
         default:
             console.log('Site management commands:\n');
-            console.log('  openkbs site deploy     Upload all files to S3');
+            console.log('  openkbs site push [folder]    Upload files to S3 (defaults to current dir or site/)');
             console.log('\nRun from a folder containing settings.json with kbId, or from parent with site/ subdirectory');
     }
 }
@@ -2113,6 +2131,94 @@ async function pulsePublishAction(kbToken, channel, message) {
     }
 }
 
+/**
+ * Deploy from openkbs.json config file
+ * Enables elastic services and deploys functions/site
+ */
+async function elasticDeployAction() {
+    // 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. Create one with your deployment config.');
+    }
+
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    const projectDir = path.dirname(configPath);
+    const region = config.region || findRegion() || 'us-east-1';
+
+    console.log(`Deploying ${config.name || 'project'} to ${region}...`);
+
+    // 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;
+
+    // Deploy elastic services if configured
+    if (config.elastic) {
+        console.log('\nEnabling Elastic services...');
+        const elasticRes = await makePostRequest(KB_API_URL, {
+            token: kbToken,
+            action: 'deployElastic',
+            elastic: config.elastic
+        });
+
+        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.storage?.cloudfront) console.green('  ✓ CloudFront configured');
+        }
+    }
+
+    // Deploy functions if configured
+    if (config.functions && config.functions.length > 0) {
+        console.log('\nDeploying functions...');
+        for (const fnName of config.functions) {
+            const fnConfig = typeof fnName === 'object' ? fnName : { name: fnName };
+            const name = fnConfig.name || fnName;
+
+            const args = ['--region', region];
+            if (fnConfig.memory) args.push('--memory', String(fnConfig.memory));
+            if (fnConfig.timeout) args.push('--timeout', String(fnConfig.timeout));
+            if (fnConfig.runtime) args.push('--runtime', fnConfig.runtime);
+            if (fnConfig.handler) args.push('--handler', fnConfig.handler);
+
+            console.log(`  Deploying ${name}...`);
+            await fnDeployAction(kbToken, name, args);
+        }
+    }
+
+    // Deploy site if configured
+    if (config.site) {
+        console.log('\nDeploying site...');
+        const sitePath = path.resolve(projectDir, config.site);
+        await siteDeployAction(kbToken, settings.kbId, sitePath, []);
+    }
+
+    console.green('\nDeploy complete!');
+}
+
 module.exports = {
     signAction,
     loginAction,
@@ -2138,5 +2244,6 @@ module.exports = {
     siteAction,
     storageAction,
     postgresAction,
-    pulseAction
+    pulseAction,
+    elasticDeployAction
 };

package/src/index.js

@@ -18,7 +18,8 @@ const {
     siteAction,
     storageAction,
     postgresAction,
-    pulseAction
+    pulseAction,
+    elasticDeployAction
 } = require('./actions');
 
 
@@ -113,16 +114,17 @@ program
     .action(describeAction);
 
 program
-    .command('deploy [moduleName]')
-    .description('Builds and deploys a specified moduleName to "dist" module folder. If moduleName is not provided, deploys all modules.')
-    .action(deployAction)
+    .command('deploy')
+    .description('Deploy from openkbs.json - enables elastic services, deploys functions and site')
+    .action(elasticDeployAction)
     .addHelpText('after', `
 Examples:
   $ openkbs deploy
-  $ openkbs deploy onRequest
-  $ openkbs deploy onResponse
-  $ openkbs deploy onAddMessages
-  $ openkbs deploy contentRender
+
+Reads openkbs.json and deploys:
+  - Elastic services (pulse, postgres, storage)
+  - Functions
+  - Site
 `);
 
 // program
@@ -210,7 +212,7 @@ program
     .addHelpText('after', `
 Examples:
   $ openkbs fn list                           List all functions
-  $ openkbs fn deploy hello --region us-east-1  Deploy function from ./functions/hello/
+  $ openkbs fn push hello --region us-east-1  Push function from ./functions/hello/
   $ openkbs fn delete hello                   Delete a function
   $ openkbs fn logs hello                     View function logs
   $ openkbs fn env hello                      View environment variables
@@ -224,10 +226,10 @@ program
     .action((subCommand, args) => siteAction(subCommand, args))
     .addHelpText('after', `
 Examples:
-  $ openkbs site deploy                       Deploy all files to S3
+  $ openkbs site push              Push site/ folder (or current dir) to S3
+  $ openkbs site push ./dist       Push specific folder to S3
 
 Run from a directory containing settings.json with kbId.
-Files are uploaded to the whitelabel domain's files bucket.
 `);
 
 program

package/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.60",
-  "releaseDate": "2025-12-29",
-  "releaseNotes": "OpenKBS CLI version 0.0.60"
+  "version": "0.0.61",
+  "releaseDate": "2025-12-30",
+  "releaseNotes": "OpenKBS CLI version 0.0.61"
 }