@kumologica/sdk 3.5.4 → 3.6.0-beta2

package/cli/commands/open.js

@@ -80,7 +80,9 @@ exports.desc = 'Open Kumologica Designer'
 
 exports.handler = async ({ project_directory }) => {
     const projectDir = project_directory? path.resolve(project_directory): undefined ;
-
-    await updater(projectDir);
+    if (process.env["KUMOLOGICA_AWS_SDK_SKIP_UPDATE"] &&  process.env["KUMOLOGICA_AWS_SDK_SKIP_UPDATE"].toLowerCase() !== "true" ){
+        await updater(projectDir);
+    }
+    
     startElectron(projectDir);
 }

package/cli/commands/start.js

@@ -0,0 +1,140 @@
+/**
+ * This command should be used to start the kumologica runtime in local mode. And it will
+ * be assisting the UI on all aspects of the project development.
+ *
+ * Example:
+ * kl start ./myproject
+ * kl start ./myproject/flow.json
+ * kl start (this will look for a flow.json in the current directory)
+ *
+ * If not flow is found, the process will be exited (with code 1)
+ *
+ * The Runtime API can be found in: packages/runtime/src/runtime/lib/api/rest/index.js
+ * The actual runtime is in: packages/runtime/src/runtime/lib/index.js
+ *
+ * Naming convention used during the code:
+ * - AdminApp (express app) is the server that serves the Runtime API
+ * - NodeApp (express app) is the server that runs the flow
+ *
+ * DEVELOPER NOTE:
+ * Current implementation seems to be mounting the runtime api in the NodeApp (see runtime/lib/index.js:534)
+ * Ideally we wouldl like to separate the two apps and have the AdminApp running on a different port.
+ *
+ */
+
+const path = require("path");
+const fs = require("fs");
+const { codegen } = require("@kumologica/builder");
+const { DesignerServer } = require("../../src/server/DesignerServer");
+const { logError, logNotice, logInfo, logFatal } = require("../utils/logger");
+// const opn = require('better-opn');
+
+exports.command = "start [project_directory]";
+exports.desc = `Run kumologica runtime in local mode`;
+
+exports.builder = (yargs) => {
+  yargs.positional(`project_directory`, {
+    type: "string",
+    describe:
+      "Path to a valid kumologica project directory or flow file. (Optional)",
+  });
+  yargs.option(`loglevel`, {
+    describe: "Logging level: [error, warn, info, debug, trace]",
+    type: "string",
+    nargs: 1,
+  });
+  yargs.option(`port`, {
+    describe: "Specifies the listening port utilized by the application",
+    type: "number",
+    nargs: 1,
+  });
+};
+
+exports.desc = "Starting Kumologica Runtime for Development";
+
+exports.handler = async ({ project_directory, loglevel, port, secured }) => {
+  logNotice(`Launching Kumologica Runtime...`);
+  // project_directory can point to a directory or a flow, so lets make sure that first the directory exists
+  let absProjectDirectory;
+
+  try {
+    absProjectDirectory = fs.realpathSync(project_directory);
+  } catch (err) {
+    logFatal(`Project not found: ${project_directory}`);
+    process.exit(1);
+  }
+
+  try {
+    // Resolve the path to the flow path
+    const [projectFlowDirname, projectFlowFullPath] =
+      resolveProjectFlowPath(absProjectDirectory);
+    logInfo(`> Flow file found: ${projectFlowFullPath}`);
+
+    // Gather all cli params
+    const cliParams = {
+      loglevel,
+      port,
+      noadmin: true,
+    };
+
+    // Start a server
+    let server = new DesignerServer({
+      flowPath: projectFlowFullPath,
+      cliParams,
+    });
+
+    await server.start();
+
+    // open("http://localhost:1880/hello");
+  } catch (e) {
+    console.log(e);
+    logFatal(e.message);
+  }
+};
+
+/**
+ * Resolve a given path to a new path that points to the project flow json file.
+ * Scenarios:
+ *  - If path undefined will resolve using current directory
+ *  - If path directory, it should look up for a valid flow.json file, if it does not exist create it
+ *  - If path is pointing to an actual flowFile, just return it.
+ *
+ * @param {string} projectDir
+ */
+function resolveProjectFlowPath(projectDir) {
+  // output
+  let projectFlowFullPath;
+  let projectFlowDirname;
+
+  let projectDirOrFile = projectDir || process.cwd();
+
+  let isDir = isDirectory(projectDirOrFile);
+  if (isDir) {
+    let flowFileName = codegen.findFlowFile(projectDirOrFile); // returns only the flowname
+
+    if (!flowFileName) {
+      logError(`No flow found in directory: ${projectDirOrFile}`);
+      process.exit(1);
+    } else {
+      projectFlowDirname = projectDirOrFile;
+      projectFlowFullPath = path.join(projectDirOrFile, flowFileName);
+    }
+  } else if (isDir === false) {
+    projectFlowDirname = path.dirname(projectDirOrFile);
+    projectFlowFullPath = projectDirOrFile;
+  } else {
+    logError(`Directory does not exist: ${project_directory}`);
+    process.exit(1);
+  }
+
+  return [projectFlowDirname, projectFlowFullPath];
+}
+
+function isDirectory(dir) {
+  try {
+    let stats = fs.statSync(dir);
+    return stats.isDirectory();
+  } catch (err) {
+    return undefined;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumologica/sdk",
-  "version": "3.5.4",
+  "version": "3.6.0-beta2",
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
@@ -82,9 +82,9 @@
     "@aws-sdk/credential-providers": "^3.556.0",
     "@aws-sdk/lib-dynamodb": "^3.549.0",
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.5.4",
-    "@kumologica/devkit": "3.5.4",
-    "@kumologica/runtime": "3.5.4",
+    "@kumologica/builder": "3.6.0-beta2",
+    "@kumologica/devkit": "3.6.0-beta2",
+    "@kumologica/runtime": "3.6.0-beta2",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",
@@ -102,7 +102,7 @@
     "dagre": "^0.8.5",
     "debounce": "^1.2.0",
     "decompress": "^4.2.1",
-    "electron": "19.0.0",
+    "electron": "30.0.0",
     "electron-tabs": "^1.0.1",
     "electron-updater": "4.3.9",
     "enquirer": "2.3.6",

package/src/app/main-process/main-window.js

@@ -42,6 +42,7 @@ class MainWindow {
       titleBarStyle: 'hiddenInset',
       icon: "./src/assets/kumologica-app.png",
       webPreferences: {
+        sandbox: false,
         webviewTag: true,
         nodeIntegration: false,
         preload: preloadJsPath,

package/src/app/main-process/modal-home.js

@@ -28,6 +28,7 @@ class ModalHome {
       resizable: false,
       backgroundColor: '#fff',
       webPreferences: {
+        sandbox: false,
         nodeIntegration: false,
         preload: preloadJsPath,
         contextIsolation: false,

package/src/app/main-process/modal-newproject.js

@@ -23,6 +23,7 @@ class ModalNewProject {
       titleBarStyle: 'hiddenInset',
       backgroundColor: '#fff',
       webPreferences: {
+        sandbox: false,
         nodeIntegration: false,
         preload: preloadJsPath,
         enableRemoteModule: true,

package/src/app/main-process/modal-newtab.js

@@ -24,6 +24,7 @@ class ModalNewTab {
       titleBarStyle: 'hiddenInset',
       backgroundColor: '#fff',
       webPreferences: {
+        sandbox: false,
         nodeIntegration: false,
         preload: preloadJsPath,
         enableRemoteModule: true,

package/src/app/main-process/modal-nodelibrary.js

@@ -26,6 +26,7 @@ class ModalNodeLibrary {
       backgroundColor: '#fff',
       icon: iconPath,
       webPreferences: {
+        sandbox: false,
         nodeIntegration: false,
         preload: preloadJsPath,
         contextIsolation: false,

package/src/app/main-process/modal-renameTab.js

@@ -26,6 +26,7 @@ class ModalRenameTab {
       titleBarStyle: 'hiddenInset',
       backgroundColor: '#fff',
       webPreferences: {
+        sandbox: false,
         nodeIntegration: false,
         preload: preloadJsPath,
         enableRemoteModule: true,

package/src/app/main-process/modal-welcome.js

@@ -26,6 +26,7 @@ class ModalWelcome {
       resizable: false,
       backgroundColor: '#fff',
       webPreferences: {
+        sandbox: false,
         nodeIntegration: false,
         preload: preloadJsPath,
         contextIsolation: false,

package/src/app/main.js

@@ -423,7 +423,9 @@ function runtimeEventListener(event) {
 }
 
 async function openProjectEditor(projectDir, onDidLoad) {
-  console.log('> openProjectDir:', projectDir)
+  console.log(`> Node.js version: ${process.versions.node}`);
+  console.log('> Project directory:', projectDir);
+
   try {
     let startupErrorEvent;
     startupEmitter = new EventEmitter();

package/src/app/preload.js

@@ -9,9 +9,7 @@
 // const { AppServer, lambdify } = require('./lib/runtime-loader');
 const { lambdify } = require('@kumologica/runtime');
 const { codegen } = require('@kumologica/builder');
-
 const { DesignerServer } = require('../server/DesignerServer')
-
 const { Terminal } = require('xterm');
 const { FitAddon } = require('xterm-addon-fit');
 const electron = require('electron');