@kumologica/sdk 4.0.0-beta5 → 4.0.0-beta7

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

@@ -0,0 +1,37 @@
+const path = require('path');
+
+exports.command = 'request [email]';
+exports.desc = `Requests a kumologica license for the specified email address.`;
+
+exports.builder = (yargs) => {
+  yargs
+    .positional('email', {
+      describe: 'The email address to request the license for.',
+      type: 'string',
+
+      demandOption: true // Makes the positional argument required
+    });
+};
+
+function isValidEmail(email) {
+  return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
+}
+
+exports.handler = async function (argv) {
+
+	if(!argv.email || !isValidEmail(argv.email)) {
+		console.error('Invalid or missing email address. Please provide a valid email address.');
+		process.exit(1);
+	}
+
+	try {
+		const tools = require('../../../src/app/lib/utils/tools.min.js');
+       
+		await tools.license.subscribe(argv.email);
+        console.log(`Follow the instructions in your email to complete the license request process.`);
+		
+	} catch (e) {
+		console.log(`${e.message}`);
+		process.exit(1);
+	}
+}

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

@@ -1,10 +1,7 @@
 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.desc = `Saves kumologica license in local file system.`;
 
 exports.builder = (yargs) => {
   yargs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumologica/sdk",
-  "version": "4.0.0-beta5",
+  "version": "4.0.0-beta7",
   "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-beta5",
-    "@kumologica/devkit": "4.0.0-beta5",
-    "@kumologica/runtime": "4.0.0-beta5",
+    "@kumologica/builder": "4.0.0-beta7",
+    "@kumologica/devkit": "4.0.0-beta7",
+    "@kumologica/runtime": "4.0.0-beta7",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",

package/src/app/lib/aws/index.js

@@ -511,7 +511,10 @@ if (s.cwevents && s.cwevents.length > 0) {
         settings.flowName
       );
       
-      // NEW 
+      if (!params.environment.some(e => e.key === "KUMOLOGICA_LICENSE")) {
+        params.environment.push({ key: "KUMOLOGICA_LICENSE", value: process.env.KUMOLOGICA_LICENSE });
+      }
+
       const args = this.mapParams(params); 
       args.region =  this.region;
       args["bucket-name"] = settings.deploymentBucketName; 
@@ -519,7 +522,6 @@ if (s.cwevents && s.cwevents.length > 0) {
 		  args["flow-file-name"] = projectInfo.projectFlowName;
       args["zip-file-name"] = settings.zipFileName;
 
-      console.log(`args: ${JSON.stringify(args)}`);
       const scriptFileName = exp("cloudformation", "aws", args);
 
       this.log(`Cloudformation script has been created: ${scriptFileName}`);
@@ -562,6 +564,10 @@ if (s.cwevents && s.cwevents.length > 0) {
       Body: body
     });
 
+    if (!params.environment.some(e => e.key === "KUMOLOGICA_LICENSE")) {
+      params.environment.push({ key: "KUMOLOGICA_LICENSE", value: process.env.KUMOLOGICA_LICENSE });
+    }
+    
     const args = this.mapParams(params); 
     args.region = this.region;
     args["bucket-name"] = settings.deploymentBucketName; 
@@ -569,7 +575,7 @@ if (s.cwevents && s.cwevents.length > 0) {
     args["flow-file-name"] = projectInfo.projectFlowName;
     args["zip-file-name"] = settings.zipFileName;
     args.skipPrepare = "true"; // no need for cloudformation prepare
-    
+
     const scriptFileName = exp("cloudformation", "aws", args);
  
     const lambdaCfTemplate = this.loadJsonFile(scriptFileName);

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

@@ -1 +1 @@
-var e,o,n,t,r=require("crypto"),i=require("fs"),s=require("path");function l(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function c(){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&&("Perpetual"===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=c();return n={license:e}})(),u=l(a);module.exports=u;
+var e,o,n,t,r=require("crypto"),s=require("fs"),i=require("path");function l(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function c(){if(!o){o=1;let l="base64";e={subscribe:async function(e){console.log("Requesting 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 For:   "+(e.name||e.email)),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&&("Perpetual"===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=s,t=i,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=s,o=i.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=c();return n={license:e}})(),u=l(a);module.exports=u;

package/src/server/DesignerServer.js

@@ -51,19 +51,6 @@ class DesignerServer {
     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
@@ -79,8 +66,6 @@ class DesignerServer {
       process.exit(1);
     } 
 
-    this.verifyLicense(licenseKey);
-
     process.env.KUMOLOGICA_LICENSE = licenseKey;
 
     this.config.port = await this.allocatePort(this.config.port);
@@ -91,6 +76,7 @@ class DesignerServer {
     );
 
     await this.flowServer.start();
+    
     this.flowServer.log.debug(
       `Runtime Configuration:${JSON.stringify(this.config, null, 2)}`
     );