ee-core 2.8.1 → 2.9.0-beta.1

package/cross/spawnProcess.js

@@ -27,7 +27,13 @@ class SpawnProcess {
   _init(options = {}) {
     const { targetConf, port } = options;
     this.config = targetConf;
+
     this.port = port;
+    // 某些程序给它传入不存在的参数时会报错
+    if (isNaN(port) && targetConf.port > 0) {
+      this.port = targetConf.port;
+    }
+
     // 该名称如果在childrenMap重复，会被重写
     this.name = targetConf.name;
 
@@ -39,6 +45,9 @@ class SpawnProcess {
     if (Ps.isPackaged()) {
       standardOutput = ['ignore', 'ignore', 'ignore', 'ipc'];
     }
+    if (targetConf.stdio) {
+      standardOutput = targetConf.stdio;
+    }
     
     const { cmd, directory } = targetConf;
     // use cmd first

package/ee/eeApp.js

@@ -190,6 +190,9 @@ class EeApp extends BaseApp {
     }
 
     // 主进程
+    if (mainServer.protocol == "") {
+      return
+    }
     if (Conf.isFileProtocol(mainServer)) {
       url = path.join(this.config.homeDir, mainServer.indexPath);
       this.loadMainUrl('spa', url, 'file');
@@ -220,7 +223,8 @@ class EeApp extends BaseApp {
       throw new Error(`[ee-core] Please Check the value of cross.${service} enable is true !`);
     }
 
-    const url = Cross.getUrl(service);
+    const entityName = crossConfig[service].name;
+    const url = Cross.getUrl(entityName);
 
     let count = 0;
     let serviceReady = false;
@@ -324,7 +328,7 @@ class EeApp extends BaseApp {
    * loading page
    */  
   _loadingPage(name) {
-    if (!fs.existsSync(name)) {
+    if (!UtilsHelper.fileIsExist(name)) {
       return
     }
 

package/html/index.js

@@ -0,0 +1,14 @@
+const path = require('path');
+
+/**
+ * Html
+ */
+const Html = {
+  getFilepath(name){
+    const pagePath = path.join(__dirname, name);
+    return pagePath;
+  },
+
+}
+
+module.exports = Html;

package/package.json

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

package/utils/helper.js

@@ -211,4 +211,11 @@ exports.getValueFromArgv = function(argv, key) {
   }
 
   return value;
+};
+
+exports.fileIsExist = function(filepath) {
+  if (fs.existsSync(filepath) && fs.statSync(filepath).isFile()) {
+    return true;
+  }
+  return false;
 };