ee-core 2.7.0-beta.1 → 2.7.0-beta.3

package/config/cache.js

@@ -0,0 +1,39 @@
+const EE = require('../ee');
+
+const conf = {
+
+  /**
+   * 获取 内存中的config
+   */
+  _getConfig() {
+    const { CoreApp } = EE;
+    if (!CoreApp) {
+      throw new Error(`[ee-core] [config] Frame initialization is not complete !`);
+    }
+
+    return CoreApp.config;
+  },
+
+  /**
+   * all
+   */
+  all() {
+    return this._getConfig();
+  },
+
+  /**
+   * getValue
+   */
+  getValue(key) {
+    const v = this._objectGet(this._getConfig(), key);
+    return v;
+  }, 
+  
+  _objectGet(object, path, defaultValue) {
+    const pathParts = Array.isArray(path) ? path : path.split('.');
+    const value = pathParts.reduce((obj, key) => obj && key in obj ? obj[key] : undefined, object);
+    return value === undefined ? defaultValue : value;
+  }
+};
+
+module.exports = conf;

package/cross/index.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const crossSpawn = require('cross-spawn');
 const path = require('path');
 const is = require('is-type-of');
-const Conf = require('../config');
+const Conf = require('../config/cache');
 const UtilsHelper = require('../utils/helper');
 const UtilsIs = require('../utils/is');
 const UtilsPargv = require('../utils/pargv');
@@ -97,8 +97,11 @@ const CrossLanguageService = {
     return arr;
   },
 
-  getUrl(argv) {
-    const args = this.getArgs(argv);
+  getUrl(service) {
+    const cfg = Conf.getValue('cross');
+    const servicesCfg = cfg[service];
+
+    const args = this.getArgs(servicesCfg.args);
     let protocol = 'http://';
     if (args.hasOwnProperty('ssl') && (args.ssl == 'true' || args.ssl == '1')) {
       protocol = 'https://';

package/ee/eeApp.js

@@ -121,12 +121,13 @@ class EeApp extends BaseApp {
       let url;
       let load = 'url';
       const configFile = './electron/config/bin.js';
+      let electronCfg = {};
 
       const isBin = UtilsHelper.checkConfig(configFile);
       if (isBin) {
         const binConfig = UtilsHelper.loadConfig(configFile);
-        const { frontend } = binConfig.dev;
-        modeInfo = frontend;
+        modeInfo = binConfig.dev.frontend;
+        electronCfg = binConfig.dev.electron;
       } else {
         // 兼容旧的 developmentMode
         const developmentModeConfig = this.config.developmentMode;
@@ -142,8 +143,13 @@ class EeApp extends BaseApp {
 
       // 检查 UI serve是否启动，先加载一个boot page
       if (load == 'url') {
-        const bootPage = path.join(__dirname, '..', 'html', 'boot.html');
-        this.mainWindow.loadFile(bootPage);
+        // loading page
+        let lp = path.join(__dirname, '..', 'html', 'boot.html');
+        if (electronCfg.hasOwnProperty('loadingPage') && electronCfg.loadingPage != '') {
+          lp = path.join(this.config.homeDir, electronCfg.loadingPage);
+        }
+        this._loadingPage(lp);
+
         let count = 0;
         let frontendReady = false;
         const hc = new HttpClient();
@@ -197,15 +203,22 @@ class EeApp extends BaseApp {
     const crossConfig = this.config.cross;
 
     // loading page
-    this._loadingPage(mainCfg);
+    if (mainCfg.hasOwnProperty('loadingPage')) {
+      const lp = path.join(this.config.homeDir, mainCfg.loadingPage);
+      this._loadingPage(lp);
+    }
 
     // cross service url
-    if (!crossConfig.hasOwnProperty(mainCfg.takeover)) {
-      Log.coreLogger.error(`[ee-core] Please check cross config !`);
+    const service = mainCfg.takeover;
+    if (!crossConfig.hasOwnProperty(service)) {
       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);
+    // check service
+    if (crossConfig[service].enable != true) {
+      throw new Error(`[ee-core] Please Check the value of cross.${service} enable is true !`);
+    }
+
+    const url = Cross.getUrl(service);
 
     let count = 0;
     let serviceReady = false;
@@ -231,11 +244,10 @@ class EeApp extends BaseApp {
     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;
+      throw new Error(`[ee-core] Please check cross service [${service}] ${url} !`)
     }
 
-    Log.coreLogger.info(`[ee-core] cross service [${mainCfg.takeover}] is started successfully`);
+    Log.coreLogger.info(`[ee-core] cross service [${service}] is started successfully`);
     this.loadMainUrl('spa', url);
   }  
 
@@ -309,14 +321,12 @@ 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)) {
+  _loadingPage(name) {
+    if (!fs.existsSync(name)) {
       return
     }
 
-    this.mainWindow.loadFile(lp);
+    this.mainWindow.loadFile(name);
   }
 
   /**

package/html/cross-failure.html

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

package/html/failure.html

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.7.0-beta.1",
+  "version": "2.7.0-beta.3",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -15,6 +15,7 @@
     "agentkeepalive": "^4.2.0",
     "bytenode": "^1.3.6",
     "chalk": "^4.1.2",
+    "cross-spawn": "^7.0.3",
     "dayjs": "^1.11.7",
     "debug": "^4.3.3",
     "egg-errors": "^2.3.0",