ee-core 2.6.0 → 2.7.0-beta.1

package/config/config.default.js

@@ -294,11 +294,6 @@ module.exports = appInfo => {
     dir: path.join(appInfo.root, 'data'),
   };
 
-  /**
-   * loading页（废弃）
-   */
-  config.loadingPage = false;
-
   /**
    * addons
    */
@@ -317,5 +312,19 @@ module.exports = appInfo => {
     rendererExit: true,
   };
 
+  /**
+   * Cross-language service
+   * 跨语言服务
+   * 例如：执行go的二进制程序
+   */
+  config.cross = {};   
+  
+  /**
+   * jobs
+   */
+  config.jobs = {
+    messageLog: true
+  };  
+  
   return config;
 };

package/cross/index.js

@@ -0,0 +1,134 @@
+const fs = require('fs');
+const crossSpawn = require('cross-spawn');
+const path = require('path');
+const is = require('is-type-of');
+const Conf = require('../config');
+const UtilsHelper = require('../utils/helper');
+const UtilsIs = require('../utils/is');
+const UtilsPargv = require('../utils/pargv');
+const Ps = require('../ps');
+const Log = require('../log');
+const GetPort = require('../utils/get-port');
+const CoreElectronApp = require('../electron/app');
+
+/**
+ * Cross-language service
+ * 跨语言服务
+ */
+const CrossLanguageService = {
+
+  execProcess: {},
+
+  /**
+   * create
+   */
+  async create() {
+    if (!Ps.isProd()) {
+      return
+    }
+
+    // init dir
+    this._initPath();
+
+    // boot services
+    const servicesCfg = Conf.getValue('cross');
+    //await UtilsHelper.sleep(5 * 1000);
+
+    for (let key of Object.keys(servicesCfg)) {
+      let cfg = servicesCfg[key];
+      if (cfg.enable == true) {
+        this.run(cfg)
+      }
+    }
+  },
+
+  /**
+   * run
+   */
+  async run(conf = {}) {
+    const cmdName = conf.name;
+    const cmdPath = this._getCmdPath(cmdName);
+    let cmdArgs = is.string(conf.args) ? [conf.args] : conf.args;
+
+    // 动态生成port
+    // if (Ps.isProd() || this.workspaces.length > 0) {
+    let confPort = this.getArgs(cmdArgs, 'port');
+    if (!confPort) {
+      throw new Error(`[ee-core] [cross/run]  --port parameter does not exist!`);
+    }
+    confPort = await GetPort({ port: confPort });
+    // 替换port
+    cmdArgs = this.replaceValue(cmdArgs, "--port=", confPort)
+
+    Log.coreLogger.info(`[ee-core] [cross/run] cmd: ${cmdPath}, args: ${cmdArgs}`);
+
+    // Launch executable program
+    const coreProcess = crossSpawn(cmdPath, cmdArgs, { stdio: 'inherit', detached: false });
+    coreProcess.on('close', (code, signal) => {
+      Log.coreLogger.info(`[ee-core] [cross/run] [pid=${coreProcess.pid}, port=${port}] exited with code: ${code}, signal: ${signal}`);
+      if (0 !== code) {
+        // 弹错误窗口
+      }
+
+      CoreElectronApp.quit();
+    });
+    this.execProcess[cmdName] = coreProcess;
+  },
+
+  getArgs(argv, key) {
+    // parse args
+    let value = UtilsPargv(argv);
+    if (key) {
+      value = value[key];
+    }
+
+    return value;
+  },
+
+  replaceValue(arr, key, value) {
+    arr = arr.map(item => {
+      if (item.startsWith(key)) {
+          let newItem = key + value;
+          return newItem;
+      } else {
+          return item;
+      }
+    });
+    return arr;
+  },
+
+  getUrl(argv) {
+    const args = this.getArgs(argv);
+    let protocol = 'http://';
+    if (args.hasOwnProperty('ssl') && (args.ssl == 'true' || args.ssl == '1')) {
+      protocol = 'https://';
+    }
+    const hostname = args.hostname ? args.hostname : '127.0.0.1';
+    const url = protocol + hostname + ":" + args.port;
+
+    return url;
+  },
+
+  _getCmdPath(name) {
+    const coreName =  UtilsIs.windows() ? name + ".exe" : name;
+    const p = path.join(Ps.getExtraResourcesDir(), coreName);
+    return p;
+  },
+
+  /**
+   * init path
+   */  
+  _initPath() {
+    try {
+      const pathname = Ps.getUserHomeConfigDir();
+      if (!fs.existsSync(pathname)) {
+        UtilsHelper.mkdir(pathname, {mode: 0o755});
+      }
+    } catch (e) {
+      Log.coreLogger.error(e);
+      throw new Error(`[ee-core] [cross] mkdir ${pathname} failed !`);
+    }
+  }    
+}
+
+module.exports = CrossLanguageService;

package/ee/application.js

@@ -57,7 +57,7 @@ class Appliaction extends EeApp {
     }
 
     // normalize env
-    //env.NODE_ENV = options.env;
+    env.EE_APP_NAME = options.appName;
     env.EE_HOME = options.homeDir;
     env.EE_BASE_DIR = options.baseDir;
     env.EE_SERVER_ENV = options.env;
@@ -89,6 +89,8 @@ class Appliaction extends EeApp {
 
     await this.startSocket();
 
+    await this.crossService();
+    
     await this.ready();
 
     await this.createElectronApp();

package/ee/eeApp.js

@@ -16,6 +16,7 @@ const Socket = require('../socket');
 const GetPort = require('../utils/get-port');
 const UtilsHelper = require('../utils/helper');
 const HttpClient = require('../httpclient');
+const Cross = require('../cross');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -59,6 +60,13 @@ class EeApp extends BaseApp {
     Socket.startAll(this);
   }
   
+  /**
+   * 启动跨语言服务
+   */
+  async crossService() {
+    Cross.create();
+  }
+
   /**
    * 创建electron应用
    */
@@ -105,6 +113,8 @@ class EeApp extends BaseApp {
       return;
     }
 
+    const mainServer = this.config.mainServer;
+
     // 开发环境
     if (Ps.isDev()) {
       let modeInfo;
@@ -137,7 +147,7 @@ class EeApp extends BaseApp {
         let count = 0;
         let frontendReady = false;
         const hc = new HttpClient();
-        while(!frontendReady && count < 30){
+        while(!frontendReady && count < 60){
           await UtilsHelper.sleep(1 * 1000);
           try {
             await hc.request(url, {
@@ -165,7 +175,13 @@ class EeApp extends BaseApp {
     }
 
     // 生产环境
-    const mainServer = this.config.mainServer;
+    // cross service takeover web
+    if (mainServer.hasOwnProperty('takeover')) {
+      await this._crossTakeover(mainServer)
+      return
+    }
+
+    // 主进程
     if (Conf.isFileProtocol(mainServer)) {
       url = path.join(this.config.homeDir, mainServer.indexPath);
       this.loadMainUrl('spa', url, 'file');
@@ -174,6 +190,55 @@ class EeApp extends BaseApp {
     }
   }
 
+  /**
+   * cross service takeover web
+   */
+  async _crossTakeover(mainCfg = {}) {
+    const crossConfig = this.config.cross;
+
+    // loading page
+    this._loadingPage(mainCfg);
+
+    // cross service url
+    if (!crossConfig.hasOwnProperty(mainCfg.takeover)) {
+      Log.coreLogger.error(`[ee-core] Please check cross config !`);
+      throw new Error(`[ee-core] Please Check the value of mainServer.takeover in the config file !`);
+    }
+    const servicesCfg = crossConfig[mainCfg.takeover];
+    const url = Cross.getUrl(servicesCfg.args);
+
+    let count = 0;
+    let serviceReady = false;
+    const hc = new HttpClient();
+
+    // 循环检查
+    const times = Ps.isDev() ? 20 : 100;
+    const sleeptime = Ps.isDev() ? 1000 : 100;
+    while(!serviceReady && count < times){
+      await UtilsHelper.sleep(sleeptime);
+      try {
+        await hc.request(url, {
+          method: 'GET',
+          timeout: 100,
+        });
+        serviceReady = true;
+      } catch(err) {
+        //console.log('The cross service is starting');
+      }
+      count++;
+    }
+    //console.log('count:', count)
+    if (serviceReady == false) {
+      const bootFailurePage = path.join(__dirname, '..', 'html', 'cross-failure.html');
+      this.mainWindow.loadFile(bootFailurePage);
+      Log.coreLogger.error(`[ee-core] Please check cross service [${mainCfg.takeover}] ${url} !`);
+      return;
+    }
+
+    Log.coreLogger.info(`[ee-core] cross service [${mainCfg.takeover}] is started successfully`);
+    this.loadMainUrl('spa', url);
+  }  
+
   /**
    * 加载本地前端资源
    */
@@ -241,6 +306,19 @@ class EeApp extends BaseApp {
     }
   }
 
+  /**
+   * loading page
+   */  
+  _loadingPage(mainCfg = {}) {
+    const p = mainCfg.hasOwnProperty('loadingPage') ? mainCfg.loadingPage : 'unknown';
+    const lp = path.join(this.config.homeDir, p);
+    if (!fs.existsSync(lp)) {
+      return
+    }
+
+    this.mainWindow.loadFile(lp);
+  }
+
   /**
    * electron app退出
    */  

package/html/cross-failure.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0, minimum-scale=1.0" />
+    <title>Booting failure</title>
+    <style>
+      #failure {
+        background-color: #dedede;
+        font-size: 14px;
+      }
+      .base {
+        position: absolute;            
+        top: 50%;            
+        left: 50%;            
+        transform: translate(-50%, -50%);   
+      }
+    </style>
+  </head>
+  <body>
+    <div id="failure">
+      <div class='base'>
+        Booting failure, please check cross service is runing !
+      </div>
+    </div>
+  </body>
+</html>

package/html/failure.html

@@ -21,7 +21,7 @@
   <body>
     <div id="failure">
       <div class='base'>
-        Booting failure, please check frontend serve is runing !
+        Booting failure, please check frontend service is runing !
       </div>
     </div>
   </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.6.0",
+  "version": "2.7.0-beta.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/ps/index.js

@@ -127,6 +127,13 @@ exports.processType = function() {
   return type;
 };
 
+/**
+ * app name
+ */
+exports.appName = function() {
+  return process.env.EE_APP_NAME;
+}
+
 /**
  * 获取home路径
  */
@@ -230,10 +237,35 @@ exports.getExecDir = function() {
 /**
  * 获取操作系统用户目录
  */
-exports.getUserHomeDir = function () {
+exports.getUserHomeDir = function() {
   return process.env.EE_USER_HOME;
 }
 
+/**
+ * 获取用户目录配置数据目录
+ */
+exports.getUserHomeConfigDir = function() {
+  // const filePath = path.join(this.getHomeDir(), 'package.json');
+  // if (!fs.existsSync(filePath)) {
+  //   throw new Error(filePath + ' is not found');
+  // }
+  // const pkg = JSON.parse(fs.readFileSync(filePath));
+  // if (!pkg.name || pkg.name == "") {
+  //   throw new Error(`name is required from ${filePath}`);
+  // }
+  const appname = this.appName();
+  const cfgDir = path.join(this.getUserHomeDir(), ".config", appname);
+  return cfgDir;
+}
+
+/**
+ * 获取基础数据路径
+ */
+exports.getUserHomeAppFilePath = function() {
+  const p = path.join(this.getUserHomeConfigDir(), "app.json");
+  return p;
+}
+
 /**
  * 获取主进程端口
  */

package/utils/pargv.js

@@ -0,0 +1,263 @@
+'use strict';
+
+function hasKey(obj, keys) {
+	var o = obj;
+	keys.slice(0, -1).forEach(function (key) {
+		o = o[key] || {};
+	});
+
+	var key = keys[keys.length - 1];
+	return key in o;
+}
+
+function isNumber(x) {
+	if (typeof x === 'number') { return true; }
+	if ((/^0x[0-9a-f]+$/i).test(x)) { return true; }
+	return (/^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/).test(x);
+}
+
+function isConstructorOrProto(obj, key) {
+	return (key === 'constructor' && typeof obj[key] === 'function') || key === '__proto__';
+}
+
+module.exports = function (args, opts) {
+	if (!opts) { opts = {}; }
+
+	var flags = {
+		bools: {},
+		strings: {},
+		unknownFn: null,
+	};
+
+	if (typeof opts.unknown === 'function') {
+		flags.unknownFn = opts.unknown;
+	}
+
+	if (typeof opts.boolean === 'boolean' && opts.boolean) {
+		flags.allBools = true;
+	} else {
+		[].concat(opts.boolean).filter(Boolean).forEach(function (key) {
+			flags.bools[key] = true;
+		});
+	}
+
+	var aliases = {};
+
+	function aliasIsBoolean(key) {
+		return aliases[key].some(function (x) {
+			return flags.bools[x];
+		});
+	}
+
+	Object.keys(opts.alias || {}).forEach(function (key) {
+		aliases[key] = [].concat(opts.alias[key]);
+		aliases[key].forEach(function (x) {
+			aliases[x] = [key].concat(aliases[key].filter(function (y) {
+				return x !== y;
+			}));
+		});
+	});
+
+	[].concat(opts.string).filter(Boolean).forEach(function (key) {
+		flags.strings[key] = true;
+		if (aliases[key]) {
+			[].concat(aliases[key]).forEach(function (k) {
+				flags.strings[k] = true;
+			});
+		}
+	});
+
+	var defaults = opts.default || {};
+
+	var argv = { _: [] };
+
+	function argDefined(key, arg) {
+		return (flags.allBools && (/^--[^=]+$/).test(arg))
+			|| flags.strings[key]
+			|| flags.bools[key]
+			|| aliases[key];
+	}
+
+	function setKey(obj, keys, value) {
+		var o = obj;
+		for (var i = 0; i < keys.length - 1; i++) {
+			var key = keys[i];
+			if (isConstructorOrProto(o, key)) { return; }
+			if (o[key] === undefined) { o[key] = {}; }
+			if (
+				o[key] === Object.prototype
+				|| o[key] === Number.prototype
+				|| o[key] === String.prototype
+			) {
+				o[key] = {};
+			}
+			if (o[key] === Array.prototype) { o[key] = []; }
+			o = o[key];
+		}
+
+		var lastKey = keys[keys.length - 1];
+		if (isConstructorOrProto(o, lastKey)) { return; }
+		if (
+			o === Object.prototype
+			|| o === Number.prototype
+			|| o === String.prototype
+		) {
+			o = {};
+		}
+		if (o === Array.prototype) { o = []; }
+		if (o[lastKey] === undefined || flags.bools[lastKey] || typeof o[lastKey] === 'boolean') {
+			o[lastKey] = value;
+		} else if (Array.isArray(o[lastKey])) {
+			o[lastKey].push(value);
+		} else {
+			o[lastKey] = [o[lastKey], value];
+		}
+	}
+
+	function setArg(key, val, arg) {
+		if (arg && flags.unknownFn && !argDefined(key, arg)) {
+			if (flags.unknownFn(arg) === false) { return; }
+		}
+
+		var value = !flags.strings[key] && isNumber(val)
+			? Number(val)
+			: val;
+		setKey(argv, key.split('.'), value);
+
+		(aliases[key] || []).forEach(function (x) {
+			setKey(argv, x.split('.'), value);
+		});
+	}
+
+	Object.keys(flags.bools).forEach(function (key) {
+		setArg(key, defaults[key] === undefined ? false : defaults[key]);
+	});
+
+	var notFlags = [];
+
+	if (args.indexOf('--') !== -1) {
+		notFlags = args.slice(args.indexOf('--') + 1);
+		args = args.slice(0, args.indexOf('--'));
+	}
+
+	for (var i = 0; i < args.length; i++) {
+		var arg = args[i];
+		var key;
+		var next;
+
+		if ((/^--.+=/).test(arg)) {
+			// Using [\s\S] instead of . because js doesn't support the
+			// 'dotall' regex modifier. See:
+			// http://stackoverflow.com/a/1068308/13216
+			var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
+			key = m[1];
+			var value = m[2];
+			if (flags.bools[key]) {
+				value = value !== 'false';
+			}
+			setArg(key, value, arg);
+		} else if ((/^--no-.+/).test(arg)) {
+			key = arg.match(/^--no-(.+)/)[1];
+			setArg(key, false, arg);
+		} else if ((/^--.+/).test(arg)) {
+			key = arg.match(/^--(.+)/)[1];
+			next = args[i + 1];
+			if (
+				next !== undefined
+				&& !(/^(-|--)[^-]/).test(next)
+				&& !flags.bools[key]
+				&& !flags.allBools
+				&& (aliases[key] ? !aliasIsBoolean(key) : true)
+			) {
+				setArg(key, next, arg);
+				i += 1;
+			} else if ((/^(true|false)$/).test(next)) {
+				setArg(key, next === 'true', arg);
+				i += 1;
+			} else {
+				setArg(key, flags.strings[key] ? '' : true, arg);
+			}
+		} else if ((/^-[^-]+/).test(arg)) {
+			var letters = arg.slice(1, -1).split('');
+
+			var broken = false;
+			for (var j = 0; j < letters.length; j++) {
+				next = arg.slice(j + 2);
+
+				if (next === '-') {
+					setArg(letters[j], next, arg);
+					continue;
+				}
+
+				if ((/[A-Za-z]/).test(letters[j]) && next[0] === '=') {
+					setArg(letters[j], next.slice(1), arg);
+					broken = true;
+					break;
+				}
+
+				if (
+					(/[A-Za-z]/).test(letters[j])
+					&& (/-?\d+(\.\d*)?(e-?\d+)?$/).test(next)
+				) {
+					setArg(letters[j], next, arg);
+					broken = true;
+					break;
+				}
+
+				if (letters[j + 1] && letters[j + 1].match(/\W/)) {
+					setArg(letters[j], arg.slice(j + 2), arg);
+					broken = true;
+					break;
+				} else {
+					setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
+				}
+			}
+
+			key = arg.slice(-1)[0];
+			if (!broken && key !== '-') {
+				if (
+					args[i + 1]
+					&& !(/^(-|--)[^-]/).test(args[i + 1])
+					&& !flags.bools[key]
+					&& (aliases[key] ? !aliasIsBoolean(key) : true)
+				) {
+					setArg(key, args[i + 1], arg);
+					i += 1;
+				} else if (args[i + 1] && (/^(true|false)$/).test(args[i + 1])) {
+					setArg(key, args[i + 1] === 'true', arg);
+					i += 1;
+				} else {
+					setArg(key, flags.strings[key] ? '' : true, arg);
+				}
+			}
+		} else {
+			if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
+				argv._.push(flags.strings._ || !isNumber(arg) ? arg : Number(arg));
+			}
+			if (opts.stopEarly) {
+				argv._.push.apply(argv._, args.slice(i + 1));
+				break;
+			}
+		}
+	}
+
+	Object.keys(defaults).forEach(function (k) {
+		if (!hasKey(argv, k.split('.'))) {
+			setKey(argv, k.split('.'), defaults[k]);
+
+			(aliases[k] || []).forEach(function (x) {
+				setKey(argv, x.split('.'), defaults[k]);
+			});
+		}
+	});
+
+	if (opts['--']) {
+		argv['--'] = notFlags.slice();
+	} else {
+		notFlags.forEach(function (k) {
+			argv._.push(k);
+		});
+	}
+
+	return argv;
+};