ee-core 2.9.0-beta.1 → 2.9.1

package/cross/index.js

@@ -85,6 +85,10 @@ const CrossLanguageService = {
     // format params
     let tmpArgs = targetConf.args;
     let confPort = parseInt(Helper.getValueFromArgv(tmpArgs, 'port'));
+    // 某些程序给它传入不存在的参数时会报错
+    if (isNaN(confPort) && targetConf.port > 0) {
+      confPort = targetConf.port;
+    }
     if (confPort > 0) {
       // 动态生成port，传入的端口必须为int
       confPort = await GetPort({ port: confPort });

package/cross/spawnProcess.js

@@ -27,12 +27,7 @@ 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;
@@ -159,6 +154,10 @@ class SpawnProcess {
     return obj;
   }
 
+  setPort(port) {
+    this.port = parseInt(port);
+  }
+
   _generateId() {
     const rid = Helper.getRandomString();
     return `node:${this.pid}:${rid}`;

package/ee/eeApp.js

@@ -17,6 +17,7 @@ const GetPort = require('../utils/get-port');
 const UtilsHelper = require('../utils/helper');
 const HttpClient = require('../httpclient');
 const Cross = require('../cross');
+const Html = require('../html');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -146,16 +147,17 @@ class EeApp extends BaseApp {
       // 检查 UI serve是否启动，先加载一个boot page
       if (load == 'url') {
         // loading page
-        let lp = path.join(__dirname, '..', 'html', 'boot.html');
+        let lp = Html.getFilepath('boot.html');
         if (electronCfg.hasOwnProperty('loadingPage') && electronCfg.loadingPage != '') {
           lp = path.join(this.config.homeDir, electronCfg.loadingPage);
         }
         this._loadingPage(lp);
 
+        const retryTimes = modeInfo.force === true ? 3 : 60;
         let count = 0;
         let frontendReady = false;
         const hc = new HttpClient();
-        while(!frontendReady && count < 60){
+        while(!frontendReady && count < retryTimes){
           await UtilsHelper.sleep(1 * 1000);
           try {
             await hc.request(url, {
@@ -170,8 +172,8 @@ class EeApp extends BaseApp {
           count++;
         }
 
-        if (frontendReady == false) {
-          const bootFailurePage = path.join(__dirname, '..', 'html', 'failure.html');
+        if (frontendReady == false && modeInfo.force !== true) {
+          const bootFailurePage = Html.getFilepath('failure.html');
           this.mainWindow.loadFile(bootFailurePage);
           Log.coreLogger.error(`[ee-core] Please check the ${url} !`);
           return;
@@ -248,7 +250,7 @@ class EeApp extends BaseApp {
     }
     //console.log('count:', count)
     if (serviceReady == false) {
-      const bootFailurePage = path.join(__dirname, '..', 'html', 'cross-failure.html');
+      const bootFailurePage = Html.getFilepath('cross-failure.html');
       this.mainWindow.loadFile(bootFailurePage);
       throw new Error(`[ee-core] Please check cross service [${service}] ${url} !`)
     }
@@ -331,7 +333,6 @@ class EeApp extends BaseApp {
     if (!UtilsHelper.fileIsExist(name)) {
       return
     }
-
     this.mainWindow.loadFile(name);
   }
 

package/package.json

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