@kumologica/sdk 3.3.0-beta9 → 3.4.0-beta2

package/src/app/lib/stores/workspace-preference-store.js

@@ -0,0 +1,42 @@
+// properties
+const defaultKeys = {
+  workspaceProjects: 'workspaceProjects',
+};
+
+
+const MAX_NUM_WORKSPACE_PROJECTS = 100;
+
+const Store = require('./store');
+class WorkspacePreferenceStore extends Store {
+  constructor(defaults) {
+    super({defaults: {}, configName: 'workspace-preferences' });
+  }
+
+  addProjectToWorkspace(projectDir) {
+    // make sure we dont include the untitled project to the list of
+    // recent projects
+    if (projectDir.startsWith(super.getUserDataPath())) {
+      console.log('[workspace-preference-store] skipping saving')
+      return;
+    }
+    super.addUnique(
+      defaultKeys.workspaceProjects, 
+      projectDir,
+      MAX_NUM_WORKSPACE_PROJECTS
+    );
+  }
+
+  removeProjectFromWorkspace(projectDir) {
+    super.remove(defaultKeys.workspaceProjects, projectDir);
+  }
+
+  getWorkspaceProjects() {
+    return super.get(defaultKeys.workspaceProjects);
+  }
+
+}
+
+module.exports = {
+  WorkspacePreferenceStore,
+  defaultKeys
+};

package/src/app/main-process/editor-manager.js

@@ -1,36 +1,21 @@
 const path = require('path');
 const fs = require('fs-extra');
 const { dialog } = require('electron');
-const tcpPortUsed = require('tcp-port-used');
+
 const { findAllFlowFiles } = require('../lib/utils/editor');
 
 const editorApi = require('../ui/editor-api/lib');
-const { AppServer } = require('../lib/runtime-loader');
-
-
-async function allocatePort(port) {
-    let inUse = await tcpPortUsed.check(port);
-    if (inUse){
-      let newPort = port + 1;
-      console.log(`> Port: ${port} in use. Trying with port: ${newPort}...`);
-      return await allocatePort(newPort);
-    } else{
-      return port;
-    }
-    
-}
+const { DesignerServer } = require('../../server/DesignerServer');
 
 class EditorManagerClass {
   currentUserProjectDir = null;
   previousUserProjectDir = null;
   appServer = null;
-  port = 1880;
 
   constructor() {
     this.start = this.start.bind(this);
     this.readEnv = this.readEnv.bind(this);
     this.getPort = this.getPort.bind(this);
-    this.setPort = this.setPort.bind(this);
     this.stop = this.stop.bind(this);
 
   }
@@ -47,7 +32,6 @@ class EditorManagerClass {
     // Update state of the object
     this.previousUserProjectDir = this.currentUserProjectDir;
     this.currentUserProjectDir = userProjectDir;
-    
 
     try{
       let flowFilePath = await this._findFlowFile(userProjectDir);
@@ -56,35 +40,15 @@ class EditorManagerClass {
       if (this.appServer !== null) {
         await this.appServer.stop();
       }
-      // Check ports availability
-      let portAllocated = await allocatePort(this.getPort());
-      this.setPort(portAllocated);
-      console.log(`> Starting editor on port: ${this.getPort()}...`);
-
-      // Backwards compatibility check
-      const constParams = AppServer.length;
-      if (constParams === 6) {
-        // Runtime <= 2.0.11
-        this.appServer = new AppServer(
-          flowFilePath, // full path of the flow.json file
-          this.getPort(), // port
-          AppServer.mode.KUMOLOGICA_DESIGNER,
-          undefined, //loglevel
-          editorApi,
-          startupEmitter);
-      } else if (constParams === 1) {
-        this.appServer = new AppServer({
-          projectDir: this.currentUserProjectDir,
-          flowFilePath: flowFilePath,
-          port: this.getPort(),
-          serverMode: AppServer.mode.KUMOLOGICA_DESIGNER,
-          logLevel: undefined,
-          editorApi: editorApi,
-          startupEmitter: startupEmitter
-        });
-      } else {
-        throw new Error('Runtime version is incompatible with this designer');
+
+      let options = {
+        flowPath: flowFilePath,
+        safe: false,
+        cliParams: {},
+        editorApi: editorApi,
+        startupEmitter: startupEmitter
       }
+      this.appServer = new DesignerServer(options);
 
       // Persist the server settings in the window global scope for the ui to access.
       await this.appServer.start();
@@ -111,11 +75,7 @@ class EditorManagerClass {
   }
 
   getPort() {
-    return this.port;
-  }
-
-  setPort(newPort) {
-    this.port = newPort;
+    return this.appServer.getListeningPort();
   }
 
   /**

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

@@ -53,9 +53,12 @@ class MainWindow {
       icon: path.join(__dirname, '../ui/editor-client/src/kumologica-app.png'),
     };
 
+    
     this.window = new BrowserWindow(windowOptions);
     this.window.maximize();
 
+    require('@electron/remote/main').enable(this.window.webContents);
+
     this.window.on('focus', () => this.window.webContents.send('focus'));
     this.window.on('blur', () => this.window.webContents.send('blur'));
     this.window.on('resize', () => {
@@ -86,6 +89,8 @@ class MainWindow {
     this.window.webContents.on('did-finish-load', () => {
       // this.checkForUpdates();
       this.updateProjectInfo(this.lastUserProjectDir, this.lastFlowfile || "__untitled__");
+      this.sendUserPreferencesToRenderer(this.store);
+
       this.emitter.emit('did-load', null);
 
       if (this.startupErrorEvent) {
@@ -144,6 +149,11 @@ class MainWindow {
     autoUpdater.checkForUpdates().catch(console.error);
   }
 
+  sendUserPreferencesToRenderer(store){
+     // Pass the userPreference store to the renderer to handle the workspace projects.
+     this.window.webContents.send('user-preferences:set', store);
+  }
+
   // TODO: #javier - show error if flow file is not found
   updateProjectInfo(newProjectDir, flowFilePath) {
     this.lastUserProjectDir = newProjectDir;

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

@@ -1,6 +1,8 @@
 let { Menu, app, ipcMain } = require('electron');
 
 const isMac = process.platform === 'darwin';
+const isWindows = process.platform === 'win32';
+const isLinux = process.platform === 'linux';
 
 let dockTemplate = [
   {
@@ -104,7 +106,7 @@ let productionTemplate = [
       },
       { type: 'separator' },
       {
-        label: 'Find Node...',
+        label: 'Search Node...',
         accelerator: 'CmdOrCtrl+F',
         click() {
           ipcMain.emit('core:search');
@@ -296,7 +298,7 @@ let devTemplate = [
       },
       { type: 'separator' },
       {
-        label: 'Find Node...',
+        label: 'Search Node...',
         accelerator: 'CmdOrCtrl+F',
         click() {
           ipcMain.emit('core:search');

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

@@ -2,20 +2,18 @@ const electron = require('electron');
 const path = require('path');
 const url = require('url');
 const EventEmitter = require('events');
+
 const dependencies = require('../lib/dependencies.js');
 const editorManager = require('./editor-manager');
-const PORT = editorManager.getPort();
 
-const { BrowserWindow } = electron;
+const { BrowserWindow, app } = electron;
 const preloadJsPath = path.join(__dirname, '..', 'preload.js');
-const {app} = require('electron');
 
 class ModalHome {
-  // Properties
   window = null;
 
-  // Methods
   constructor(listRecentProjects) {
+    this.port = editorManager.getPort();
     this.headless = false;
     this.listRecentProjects = listRecentProjects;
     this.emitter = new EventEmitter();
@@ -34,7 +32,7 @@ class ModalHome {
         preload: preloadJsPath,
         contextIsolation: false,
         enableRemoteModule: true,
-        additionalArguments: [`--port=${PORT}`]
+        additionalArguments: [`--port=${this.port}`]
       },
       show: false
     };
@@ -83,7 +81,7 @@ class ModalHome {
   load() {
     this.window.loadURL(
       url.format({
-        pathname: `127.0.0.1:${PORT}/__home`,
+        pathname: `127.0.0.1:${this.port}/__home`,
         protocol: 'http:',
         slashes: true
       }),

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

@@ -4,14 +4,12 @@ const url = require('url');
 const { BrowserWindow } = electron;
 const preloadJsPath = path.join(__dirname, '..', 'preload.js');
 const editorManager = require('./editor-manager');
-const PORT = editorManager.getPort();
 
 class ModalNewProject {
-  // Properties
   window = null;
-
-  // Methods
+  
   constructor(parentWindow, cancellable) {
+    this.port = editorManager.getPort();
     this.cancellable = cancellable;
     let windowOptions = {
       parent: parentWindow,
@@ -29,7 +27,7 @@ class ModalNewProject {
         preload: preloadJsPath,
         enableRemoteModule: true,
         contextIsolation: false,
-        additionalArguments: [`--port=${PORT}`]
+        additionalArguments: [`--port=${this.port}`]
       },
       show: false,
     };
@@ -60,7 +58,7 @@ class ModalNewProject {
   load() {
     this.window.loadURL(
       url.format({
-        pathname: `127.0.0.1:${PORT}/__newProject`,
+        pathname: `127.0.0.1:${this.port}/__newProject`,
         protocol: 'http:',
         slashes: true,
       }),

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

@@ -5,14 +5,12 @@ const { BrowserWindow } = electron;
 const { isMac, isWin } = require('../util');
 const preloadJsPath = path.join(__dirname, '..', 'preload.js');
 const editorManager = require('./editor-manager');
-const PORT = editorManager.getPort();
 
 class ModalNewTab {
-  // Properties
   window = null;
-
-  // Methods
+  
   constructor(parentWindow, cancellable) {
+    this.port = editorManager.getPort();
     this.cancellable = cancellable;
     let windowOptions = {
       parent: parentWindow,
@@ -30,7 +28,7 @@ class ModalNewTab {
         preload: preloadJsPath,
         enableRemoteModule: true,
         contextIsolation: false,
-        additionalArguments: [`--port=${PORT}`]
+        additionalArguments: [`--port=${this.port}`]
       },
       show: false,
     };
@@ -65,7 +63,7 @@ class ModalNewTab {
   load() {
     this.window.loadURL(
       url.format({
-        pathname: `127.0.0.1:${PORT}/__newTab`,
+        pathname: `127.0.0.1:${this.port}/__newTab`,
         protocol: 'http:',
         slashes: true,
       }),

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

@@ -4,16 +4,14 @@ const url = require('url');
 const { BrowserWindow } = electron;
 const preloadJsPath = path.join(__dirname, '..', 'preload.js');
 const editorManager = require('./editor-manager');
-const PORT = editorManager.getPort();
 
 class ModalNodeLibrary {
-  // Properties
   window = null;
 
-  // Methods
   constructor(parentWindow, cancellable) {
+    this.port = editorManager.getPort();
     let iconPath = path.join(__dirname, 'favicon.ico');
-
+    
     this.cancellable = cancellable;
     let windowOptions = {
       parent: parentWindow,
@@ -32,7 +30,7 @@ class ModalNodeLibrary {
         preload: preloadJsPath,
         contextIsolation: false,
         enableRemoteModule: true,
-        additionalArguments: [`--port=${PORT}`]
+        additionalArguments: [`--port=${this.port}`]
       },
       show: false
     };
@@ -63,7 +61,7 @@ class ModalNodeLibrary {
   load() {
     this.window.loadURL(
       url.format({
-        pathname: `127.0.0.1:${PORT}/__nodeLibrary`,
+        pathname: `127.0.0.1:${this.port}/__nodeLibrary`,
         protocol: 'http:',
         slashes: true
       }),

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

@@ -4,19 +4,16 @@ const url = require('url');
 const EventEmitter = require('events');
 const dependencies = require('../lib/dependencies.js');
 
-const { BrowserWindow } = electron;
+const { BrowserWindow, app } = electron;
 const preloadJsPath = path.join(__dirname, '..', 'preload.js');
 const editorManager = require('./editor-manager');
-const PORT = editorManager.getPort();
-
-const { app } = require('electron');
 
 class ModalWelcome {
-  // Properties
   window = null;
-
+  
   // Methods
   constructor() {
+    this.port = editorManager.getPort();
     this.emitter = new EventEmitter();
     let windowOptions = {
       modal: true,
@@ -33,7 +30,7 @@ class ModalWelcome {
         preload: preloadJsPath,
         contextIsolation: false,
         enableRemoteModule: true,
-        additionalArguments: [`--port=${PORT}`]
+        additionalArguments: [`--port=${this.port}`]
       },
       show: false
     };
@@ -80,7 +77,7 @@ class ModalWelcome {
   load() {
     this.window.loadURL(
       url.format({
-        pathname: `127.0.0.1:${PORT}/__welcome`,
+        pathname: `127.0.0.1:${this.port}/__welcome`,
         protocol: 'http:',
         slashes: true
       }),

package/src/app/main.js

@@ -120,7 +120,8 @@ ipcMain.on('modal-home:show-dialog-openproject', () => {
 });
 
 ipcMain.on('modal-home:open-project-in-editor', async (event, msg) => {
-  currentModalWindow.close();
+  console.log('[main] msg requested to open project:', msg);
+  if (currentModalWindow) currentModalWindow.close();
   await openProjectEditor(msg.payload.projectLocation);
 });
 
@@ -399,6 +400,7 @@ function runtimeEventListener(event) {
 }
 
 async function openProjectEditor(projectDir, onDidLoad) {
+  console.log('[main] openProjectDir:', projectDir)
   try {
     let startupErrorEvent;
     startupEmitter = new EventEmitter();

package/src/app/preload.js

@@ -6,7 +6,11 @@
  */
 
 
-const { AppServer, lambdify } = require('./lib/runtime-loader');
+// 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');
@@ -39,6 +43,8 @@ const AWSDeployer = require('./lib/aws');
 const ServerlessDeployer = require('./lib/serverless');
 const GithubDeployer = require('./lib/github');
 
+const { WorkspacePreferenceStore } = require('./lib/stores/workspace-preference-store');
+
 const Kumohub = require('./lib/kumohub');
 const deployCli = require('@kumologica/builder');
 const Azure = require('./lib/azure');
@@ -552,12 +558,12 @@ function dispatch(type, payload) {
   ipcRenderer.send(type, payload);
 }
 
+
 window.__kumologica = {};
 window.__kumologica.electron = electron;
 window.__kumologica.electron.remote = remote;
 
 
-
 // Present a contract to interact with main process
 window.__kumologica.main = {};
 window.__kumologica.main.dispatch = dispatch;
@@ -583,11 +589,18 @@ window.__kumologica.settings.loadConfigs = loadConfigs;
 
 window.__kumologica.settings.cloudConfigStore = cloudConfigStore;
 window.__kumologica.settings.networkConfigStore = networkConfigStore;
+window.__kumologica.settings.workspacePreferenceStore = new WorkspacePreferenceStore();
+
+window.__kumologica.settings.platform = {};
+window.__kumologica.settings.platform.isMac = process.platform === 'darwin';
+window.__kumologica.settings.platform.isWindows = process.platform === 'win32';
+window.__kumologica.settings.platform.isLinux = process.platform === 'linux';
+
 
 // Present a contract to interact with runtime project
 window.__kumologica.runtime = {};
-window.__kumologica.runtime.version = AppServer.version();
-window.__kumologica.runtime.RED = AppServer;
+window.__kumologica.runtime.version = DesignerServer.version();
+window.__kumologica.runtime.RED = DesignerServer;
 window.__kumologica.runtime.port = port;
 
 // cloud capability
@@ -632,6 +645,17 @@ window.__kumologica.libs.openFolder = openFolder;
 window.__kumologica.libs.dagre = dagre;
 window.__kumologica.libs.simpleGit = simpleGit;
 
+/**
+ * Return the name of the valid kumologica flow or undefined otherwise.
+ * @param {} projectDir 
+ * @returns 
+ */
+function findValidKumologicaFlowInDir(projectDir) {
+  return codegen.findFlowFile(projectDir);
+}
+
+window.__kumologica.libs.findKumologicaFlowInDir = findValidKumologicaFlowInDir;
+
 // Node Library
 window.__kumologica.nodeLibrary = {};
 window.__kumologica.nodeLibrary.baseURL = KUMOLOGICA_NODE_LIB_BASEURL;

package/src/app/ui/editor-api/lib/index.js

@@ -76,16 +76,13 @@ function init(userSettings, _server, storage, runtimeAPI) {
     }
 
     // Editor
-    if (!settings.disableEditor) {
-      editor = require('./editor');
-      var editorApp = editor.init(server, settings, runtimeAPI);
-      adminApp.use(editorApp);
-    }
+    
+    editor = require('./editor');
+    var editorApp = editor.init(server, settings, runtimeAPI);
+    adminApp.use(editorApp);
 
-    if (settings.httpAdminCors) {
-      var corsHandler = cors(settings.httpAdminCors);
-      adminApp.use(corsHandler);
-    }
+    // var corsHandler = cors(settings.httpAdminCors);
+    // adminApp.use(corsHandler);
 
     var adminApiApp = require('./admin').init(runtimeAPI);
     adminApp.use(adminApiApp);