@kumologica/sdk 4.0.0-beta1 → 4.0.0-beta4

package/cli/commands/license-commands/save.js

@@ -1,35 +1,39 @@
-exports.command = 'save';
+const path = require('path');
+
+exports.command = 'save [key]';
 exports.desc = `Saves kumologica license in local file system.\n
 
 Documentation: 
   https://docs.kumologica.com/docs/references/cli/LicenseSave.html`;
 
-exports.builder = {
-	"key": {
-		describe: "The license key received in email from kumologica.com.\n ",
-		type: 'string',
-		alias: 'l',
-		nargs: 1
-	}
-}
+exports.builder = (yargs) => {
+  yargs
+    .positional('key', {
+      describe: 'The license key received in email from kumologica.com.',
+      type: 'string',
+
+      demandOption: true // Makes the positional argument required
+    });
+};
 		
 function display(argv) {
-	console.log(`\nSaving license key \n`);
+	console.log(`\nSaving license key ${argv.key}\n`);
 }
 
-const { saveLicense } = require('../../../../tools/src/license/index');
-
 exports.handler = function (argv) {
 	display(argv);
 
 	try {
 		
 		if (argv.key) {
-			const electron = require('electron');
+			const tools = require('../../../src/app/lib/utils/tools.min.js');
+            const utils = require("../../utils/license.js");
+  
+			const userDataPath = utils.getHomeDir();
 
+			console.log(`User data path: ${userDataPath}`);
 			// Get the userDataPath directory
-			const userDataPath = (electron.app || electron.remote.app).getPath('userData');
-			saveLicense(userDataPath, argv.key);
+			tools.license.save(userDataPath, argv.key);
 			console.log('License key saved successfully.');
 		} else {
 			console.log('No license key provided. Use the --key option to specify the license key.');

package/cli/commands/open.js

@@ -165,6 +165,12 @@ async function runUpdater(projectDir) {
   await updater.update(updates);
 }
 
+async function licenseCheck() {
+
+  const license = require("../utils/license.js");
+  return await license.licenseCheck();
+}
+
 exports.command = "open [project_directory]";
 exports.builder = (yargs) => {
   yargs.positional(`project_directory`, {
@@ -176,9 +182,15 @@ exports.builder = (yargs) => {
 exports.desc = "Open Kumologica Designer";
 
 exports.handler = async ({ project_directory }) => {
+  
   const projectDir = project_directory
     ? path.resolve(project_directory)
     : undefined;
+
+if (!await licenseCheck(project_directory)) {
+     process.exit(1);
+  }
+  
   await runUpdater(projectDir);
 
   startElectron(projectDir);

package/cli/utils/license.js

@@ -0,0 +1,110 @@
+const path = require("path");
+const os = require("os");
+const { Confirm, Input } = require('enquirer');
+const tools = require('../../src/app/lib/utils/tools.min.js');
+
+function getHomeDir() {
+	const platform = process.platform;
+  let homeDir; 
+  switch (platform) {
+		case 'win32':
+			homeDir = process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming');
+      break
+		case 'darwin':
+			homeDir = path.join(os.homedir(), 'Library', 'Application Support');
+      break;
+		default:
+			homeDir = path.join(os.homedir(), '.config');
+	}
+	return path.join(homeDir, "Kumologica Designer");
+}
+
+
+async function promptForLicenseKey() {
+  try {
+    // Step 1: Ask if user has a license key
+    const hasKey = await new Confirm({
+      name: 'hasLicense',
+      message: 'Do you have a license key?',
+      initial: true
+    }).run();
+
+    if (hasKey) {
+      // Step 2: Prompt for license key
+      const licenseKey = await new Input({
+        name: 'licenseKey',
+        message: 'Enter your license key:',
+        }).run();
+
+      try {
+        console.log(`Validating license key`);
+        tools.license.verify(licenseKey);
+        console.log(`License key is valid`);
+    
+      } catch (e) {
+        console.error(`Invalid license key: ${e.message}`);
+        process.exit(1);
+    
+      }
+
+      console.log(`✅ License key entered: ${licenseKey}`);
+
+      tools.license.save(getHomeDir(), licenseKey);
+      return true;
+    } else {
+      // Step 3: Ask if user wants to request a developer license
+      const requestDev = await new Confirm({
+        name: 'requestDevLicense',
+        message: 'Do you want to request a developer license key?',
+        initial: true
+      }).run();
+
+      if (requestDev) {
+        // Step 4: Ask for email address
+        const email = await new Input({
+          name: 'email',
+          message: 'Enter your email address:',
+          validate: value =>
+            /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value) ? true : 'Please enter a valid email address'
+        }).run();
+
+        console.log(`📧 Developer license will be requested for: ${email}`);
+
+        await tools.license.subscribe(email);
+        console.log(`Follow the instructions in your email to complete the process.`);
+
+        return false;
+      } else {
+        console.log('❌ License key is required to continue. Exiting...');
+        return false;
+      }
+    }
+  } catch (err) {
+    console.error('❌ Prompt error:', err.message || err);
+    return false;
+  }
+}
+
+async function licenseCheck() {
+
+  console.log("Checking for valid license...");
+
+  console.log("Reading license data...");
+  try {
+    const licenseData = tools.license.read(getHomeDir());
+    return true;
+  } catch (e) {
+    console.error("Error reading license data:", e.message);
+  }
+
+  console.log("No license data...");
+  await promptForLicenseKey();
+
+  return false;
+}
+
+
+module.exports = {
+  licenseCheck,
+  getHomeDir
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumologica/sdk",
-  "version": "4.0.0-beta1",
+  "version": "4.0.0-beta4",
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
@@ -84,9 +84,9 @@
     "@aws-sdk/credential-providers": "^3.556.0",
     "@aws-sdk/lib-dynamodb": "^3.549.0",
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "4.0.0-beta1",
-    "@kumologica/devkit": "4.0.0-beta1",
-    "@kumologica/runtime": "4.0.0-beta1",
+    "@kumologica/builder": "4.0.0-beta4",
+    "@kumologica/devkit": "4.0.0-beta4",
+    "@kumologica/runtime": "4.0.0-beta4",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",

package/src/app/lib/utils/tools.min.js

@@ -1 +1 @@
-require("crypto");var e,o,n,r,l=require("fs"),c=require("path");function s(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function t(){return o?e:(o=1,e={display:function(e){var o,l,r,n;e&&e.sub&&e.licenseType?({sub:e,email:o,licenseType:l,iat:r,exp:n}=e,console.log("--- License Details ---"),console.log("Subscriber: "+e),console.log("Email: "+o),console.log("License Type: "+l),console.log("Issued At: "+new Date(r).toLocaleString()),console.log("Expiry: "+("perpetual"===n?"Perpetual":new Date(n).toLocaleString())),console.log("------------------------")):console.error("Invalid license data.")},verify:function(e,o,l){return!0},save:function(e,o){var r=l,n=c.join(e,"kumologica.license");try{r.writeFileSync(n,o,"utf-8"),console.log("License saved successfully at: "+n)}catch(e){console.error("Failed to save license: "+e.message)}},read:function(e){var o=l,r=c.join(e,"kumologica.license");try{let e=o.readFileSync(r,"utf-8");return console.log("License read successfully from: "+r),e}catch(e){return console.error("Failed to read license: "+e.message),null}}})}var i=(()=>{if(r)return n;r=1;var e=t();return n={license:e}})(),u=s(i);module.exports=u;
+var e,o,n,t,r=require("crypto"),i=require("fs"),s=require("path");function c(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function l(){if(!o){o=1;let l="base64";e={subscribe:async function(e){console.log("Requesting developer license for email: "+e);var r=await fetch("https://api.infra.kumologica.com/p/signup?x-api-key=RjibYF3qZb2AzmTrPOnV35LfRV798e3Z87vp4izo",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({email:e})});if(r.ok)return!0;{let e=await r.text();return console.error(`License request failed: ${r.status} `+e),!1}},display:function(e){e?(console.log("--- License Details ---"),console.log("Subscriber: "+e.sub),console.log("Email: "+e.email),console.log("License Type: "+e.licenseType),console.log("Issued By: "+e.iss),console.log("Issued At: "+new Date(e.iat).toLocaleString()),console.log("Expiry: "+("perpetual"===e.exp?"Perpetual":new Date(e.exp).toLocaleString())),console.log("------------------------")):console.error("Invalid license data.")},verify:function(e){publicKeyPem=(()=>{var o=Buffer.from("XkI1bxBWOXhHBztkdXIuEXlKLBcSIWstZlEzOEADPyFCCVkUeQNIIxwWDU4QEiEyLHpfOjwHCVNlL3tTFiIvMGkcZCkOBnNgIjtybUckA3x7BRARDElXRxECPlB4OgF4aWIRDQAGLBI2Jns3eTINDkx+XSN9bAAFDHllInIdCEg8SzICC2JJJyl4CGk5JAB/EBQcLW4+dzcuMGxhLglhbHUZF2ZwFQMJEl08cAVfWGd5ADtje34SDUJCHxUlWh83aghXDnJXXwxxCFsUNANhCzJ0MHoiVyEvLlh2OC5gf2UwdGZhDxAvMllUcCgSWl1w",l).toString().split("").reverse().join("");let t="";for(let r=0;r<o.length;r++){let e="34jfd#d-cDFG23@W096ml".charCodeAt(r%21);t+=String.fromCharCode(o.charCodeAt(r)^e)}return Buffer.from(t,l).toString()})();var o=r,[e,t]=e.split(".");if(!e||!t)throw new Error("Invalid license format. License may have been tampered.");var e=Buffer.from(e,"base64url").toString("utf-8"),n=JSON.parse(e),e=Buffer.from(e,"utf-8"),t=Buffer.from(t,l),o=o.createVerify("SHA256");if(o.update(e),o.end(),!o.verify(publicKeyPem,t))throw new Error("Invalid license signature. License may have been tampered.");if(!(n&&n.sub&&n.email&&n.iss&&n.iat))throw new Error("Invalid license data. License may have been tampered.");if(n.exp&&Date.now()>n.exp)throw new Error("License has expired. Please renew your license, contact Kumologica support at contact@kumologica.com.");return n},save:function(e,r){var o=i,t=s,t=(console.log("saving key to: "+e),t.join(e,"kumologica.license"));try{o.writeFileSync(t,r,"utf-8"),console.log("License saved successfully at: "+t)}catch(e){console.error("Failed to save license: "+e.message)}},read:function(e){var r=i,o=s.join(e,"kumologica.license");try{let e=r.readFileSync(o,"utf-8");return console.log("License read successfully from: "+o),e}catch(e){return null}}}}return e}var a=(()=>{if(t)return n;t=1;var e=l();return n={license:e}})(),u=c(a);module.exports=u;

package/src/server/DesignerServer.js

@@ -5,11 +5,11 @@ const {
 } = require("@kumologica/runtime");
 const tcpPortUsed = require("tcp-port-used");
 
-const os = require("os");
+const tools = require('../app/lib/utils/tools.min.js');
 /**
  * This class will encapsulate the adminApp and FlowApp into two servers.
  * It will be the one running on the development box of the user (either local or remote),
- * and it will serve all the functioanlity to the Kumologica Cloud Editor.
+ * and it will serve all the functionality to the Kumologica Cloud Editor.
  */
 
 class DesignerServer {
@@ -27,7 +27,7 @@ class DesignerServer {
       console.log(
         "[ERROR] Flow is not defined. Make sure you pass the flow file to the constructor of FlowBuilder"
       );
-      os.exit(1);
+      process.exit(1);
     }
 
     this.editorApi = options.editorApi;
@@ -40,8 +40,49 @@ class DesignerServer {
     );
   }
 
+  readLicense() {
+    const electron = require('electron');
+    const licensePath = (electron.app || electron.remote.app).getPath('userData');
+
+    console.debug(`License path: ${licensePath}`);
+    console.debug(`platform: ${this.config.platform}`);
+    
+    const licenseData = tools.license.read(licensePath);
+    return licenseData;
+  }
+
+  verifyLicense(licenseData) {
+
+    if (licenseData) {
+      const lData = tools.license.verify(licenseData);
+      if (lData) {
+        tools.license.display(lData);
+      }
+      return lData;
+    } else {
+      console.error("[ERROR] License data is not available. Please provide a valid license key.");
+      return null;
+    }
+  }
+
   async start() {
     // Check if port passed by parameter is available otherwise allocate a new one
+  
+    let licenseKey = process.env.KUMOLOGICA_LICENSE;
+
+    if (!licenseKey) {
+      licenseKey = this.readLicense();
+    }
+
+    if (!licenseKey) {
+      console.error("[ERROR] Missing license key. Please provide a valid license key.");
+      process.exit(1);
+    } 
+
+    this.verifyLicense(licenseKey);
+
+    process.env.KUMOLOGICA_LICENSE = licenseKey;
+
     this.config.port = await this.allocatePort(this.config.port);
     this.flowServer = new AbstractServerfulServer(
       this.config,

package/cli/commands/license-commands/license.js

@@ -1,115 +0,0 @@
-exports.command = 'kumohub';
-exports.desc = `Deploy kumologica flow to kumohub.io account`;
-
-exports.builder = {
-	"flow-file-name": {
-		describe: "The name of kumologica flow file.\n Auto search if not provided.\n",
-		type: 'string',
-		alias: 'f',
-		nargs: 1
-	},
-	"service-name": {
-		describe: "The name of service.\n flow file name without extension if not provided.\n Service name will be sanitized to be compatible with aws lambda name restrictions.\n",
-		type: 'string',
-		nargs: 1
-	},
-	"project-directory": {
-		describe: "The root directory of project.\n Process working directory if not provided.\n",
-		type: 'string',
-		alias: 'd',
-		nargs: 1
-	},
-	"environment": {
-		describe: `Environment variables, JSON Syntax: '{"Variables": {"key": "value", ...}}'\n`,
-		type: 'string',
-		nargs: 1
-	},
-	"account": {
-		describe: "The name of kumohub.io account\n",
-		type: 'string',
-		required: true,
-		alias: 'a',
-		nargs: 1
-	},
-	"username": {
-		describe: "The username to login to kumohub.io account\n",
-		type: 'string',
-		required: true,
-		alias: 'u',
-		nargs: 1
-	},
-	"password": {
-		describe: "The username password to login to kumohub.io account\n",
-		type: 'string',
-		required: true,
-		alias: 'p',
-		nargs: 1
-	},
-	"workspace": {
-		describe: "The name of the workspace where flow to be deployed.\n",
-		type: 'string',
-		required: true,
-		alias: 'w',
-		nargs: 1
-	},
-	"stage": {
-		describe: "The name of the stage where flow to be deployed\n",
-		type: 'string',
-		required: true,
-		alias: 's',
-		nargs: 1
-	},
-	"policy": {
-		describe: "The name of security policy to assign to the flow.\n",
-		type: 'string',
-		required: true,
-		default: "Public",
-		nargs: 1
-	},
-	"memory": {
-		describe: "The amount of memory (MB) to be allocated to the flow. 128 MB to 10240 MB\n",
-		type: 'string',
-		nargs: 1,
-		default: "512"
-    },
-	"timeout": {
-		describe: "The amount of seconds flow should be run before timing out. Up to 900 seconds\n",
-		type: 'string',
-		nargs: 1,
-		default: "30" 
-	},
-	"description": {
-		describe: "The description of function.\n",
-		type: 'string',
-		nargs: 1
-	}
-}
-
-function display(argv) {
-	console.log(`\nDeploying flow to kumohub.io with following parameters: \n`);
-	console.log('project-directory: %s', argv["project-directory"] || '');
-	console.log('flow-file-name:    %s', argv["flow-file-name"] || '');
-	console.log('service-name:      %s', argv["service-name"] || '');
-	console.log('environment vars:  %s', argv["environment"] || '');
-	console.log('username:          %s', argv["username"] || '');
-	console.log('password:          %s', argv["password"]? "provided": "missing");
-	console.log('workspace:         %s', argv["workspace"] || '');
-	console.log('stage:             %s', argv["stage"] || '');
-	console.log('policy:            %s', argv["policy"] || '');
-	console.log('memory:            %s', argv["memory"] || '');
-	console.log('timeout:           %s', argv["timeout"] || '');
-	console.log('description:       %s', argv["description"] || '');
-}
-
-exports.handler = function (argv) {
-	display(argv);
-
-	try {
-		const { deploy } = require('@kumologica/builder');
-		deploy('kumohub', argv);
-	} catch (e) {
-		console.log(`${e.message}`);
-		process.exit(1);
-	}
-}
-