ee-core 2.11.0 → 2.12.0

package/config/cache.js

@@ -1,27 +1,47 @@
 const EE = require('../ee');
+const { ConfigLoader } = require('./config_loader');
+
+const Instance = {
+  config: null,
+};
 
 const conf = {
 
+  loadConfig() {
+    const configLoader = new ConfigLoader();
+    Instance["config"] = configLoader.load();
+    return Instance["config"];
+  },
+
   /**
    * 获取 内存中的config
    */
-  _getConfig(withError = true) {
+  _getConfig() {
     const { CoreApp } = EE;
-    if (!CoreApp && withError) {
-      throw new Error(`[ee-core] [config] Frame initialization is not complete !`);
+
+    if (CoreApp && CoreApp.config) {
+      return CoreApp.config;
     }
-    if (!CoreApp) {
-      return null;
+
+    if (Instance["config"]) {
+      return Instance["config"];
+    }
+
+    // 重新加载 config
+    this.loadConfig();
+
+    if (!Instance["config"]) {
+      throw new Error('[ee-core] [config] config is not loaded!');
     }
 
-    return CoreApp.config;
+    return Instance["config"];
   },
 
   /**
    * all
    */
-  all(withError = true) {
-    return this._getConfig(withError);
+  all() {
+    return this._getConfig();
   },
 
   /**

package/config/config_loader.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const debug = require('debug')('ee-core:config:config_loader');
+const path = require('path');
+const Ps = require('../ps');
+const extend = require('../utils/extend');
+const Timing = require('../core/lib/utils/timing');
+const Loader= require('../loader');
+
+class ConfigLoader {
+  constructor() {
+    this.timing = new Timing();
+    this.config = {};
+  }
+
+  /**
+   * Load config/config.xxx.js
+   */
+  load() {
+    this.timing.start('Load Config');
+
+    // Load Application config
+    const appConfig = this._AppConfig();
+    debug("[load] appConfig: %o", appConfig);
+    this.config = appConfig;
+
+    this.timing.end('Load Config');
+    return this.config;
+  }
+
+  _AppConfig() {
+    const names = [
+      'config.default',
+      `config.${Ps.env()}`,
+    ];
+    const target = {};
+    for (const filename of names) {
+      const config = this._loadConfig(Ps.getElectronDir(), filename);
+      extend(true, target, config);
+    }
+    return target;
+  }
+
+  _loadConfig(dirpath, filename) {
+    const appInfo = {
+      name: Ps.appName(),
+      baseDir: Ps.getElectronDir(),
+      electronDir: Ps.getElectronDir(),
+      env: Ps.env(),
+      home: Ps.getHomeDir(),
+      root: Ps.getRootDir(),
+      appUserDataDir: Ps.getAppUserDataDir(),
+      userHome: Ps.getUserHomeDir(),
+      appVersion: Ps.appVersion(),
+      isPackaged: Ps.isPackaged(),
+      isEncrypted: Ps.isEncrypted(),
+      execDir: Ps.getExecDir(),
+    }
+    const filepath = path.join(dirpath, 'config', filename);
+    const config = Loader.loadOneFile(filepath, appInfo);
+    debug("[_loadConfig] filepath: %s", filepath);
+    if (!config) return null;
+
+    return config;
+  }
+}
+
+module.exports = {
+  ConfigLoader
+};

package/config/index.js

@@ -1,66 +1,21 @@
-const Storage = require('../storage');
 const ConfigCache = require('./cache');
-var SystemDb = undefined;
 
 const Cfg = {
 
-  /**
-   * 获取 coredb
-   */
-  _getCoreDB() {
-    // [todo] 要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
-    SystemDb = Storage.connection('system');
-    return SystemDb;
-  },
-
   /**
    * all
    */
-  all(fromCache = true) {
-    if (fromCache === true) {
-      // 如果子进程
-      const cacheValue = ConfigCache.all();
-      return cacheValue;
-    }
-    const cdb = this._getCoreDB();
-    const config = cdb.getItem('config');
-  
-    return config;
-  },
-
-  /**
-   * setAll
-   */
-  setAll(value) {
-    const cdb = this._getCoreDB();
-    cdb.setItem('config', value);
-  
-    return;
-  },
-
-  /**
-   * setValue
-   */
-  setValue(key, value) {
-    const cdb = this._getCoreDB();
-    cdb.setConfigItem(key, value);
-  
-    return;
+  all() {
+    const cacheValue = ConfigCache.all();
+    return cacheValue;
   },
 
   /**
    * getValue
    */
-  getValue(key, fromCache = true) {
-    if (fromCache === true) {
-      const cacheValue = ConfigCache.getValue(key);
-      return cacheValue;
-    }
-
-    const cdb = this._getCoreDB();
-    let v = cdb.getConfigItem(key);
-  
-    return v;
+  getValue(key) {
+    const cacheValue = ConfigCache.getValue(key);
+    return cacheValue;
   },  
 
   /**

package/core/lib/loader/file_loader.js

@@ -210,8 +210,11 @@ class FileLoader {
       for (const addonName of addonpaths) {
         if (filterAddons.includes(addonName)) continue;
 
-        let fullpath = path.join(directory, addonName, 'index');
-        fullpath = loader.resolveModule(fullpath);
+        const filepath = path.join(directory, addonName, 'index');
+        const fullpath = loader.resolveModule(filepath);
+        if (!fs.existsSync(fullpath)) {
+          throw new Error(`The ${filepath} file does not exist`);
+        }
         if (!fs.statSync(fullpath).isFile()) continue;
   
         let exports = getExports(fullpath, this.options, addonName);

package/ee/application.js

@@ -58,6 +58,7 @@ class Appliaction extends EeApp {
 
     // normalize env
     env.EE_APP_NAME = options.appName;
+    env.EE_APP_VERSION = options.appVersion;
     env.EE_HOME = options.homeDir;
     env.EE_BASE_DIR = options.baseDir;
     env.EE_SERVER_ENV = options.env;

package/ee/baseApp.js

@@ -7,7 +7,6 @@ const HttpClient = require('../httpclient');
 const HTTPCLIENT = Symbol('EeApplication#httpclient');
 const LOGGERS = Symbol('EeApplication#loggers');
 const Log = require('../log');
-const Conf = require('../config');
 
 class BaseApp extends EeAppCore {
   constructor (options = {}) {
@@ -15,10 +14,6 @@ class BaseApp extends EeAppCore {
     super(options);
 
     this.loader.loadConfig();
-    
-    
-    // [todo] 缓存配置
-    Conf.setAll(this.config);
 
     this.loader.load();
 

package/ee/eeApp.js

@@ -49,9 +49,6 @@ class EeApp extends BaseApp {
       process.env.EE_HTTP_PORT = httpPort;
       this.config.httpServer.port = httpPort;
     }
-    
-    // [todo] 更新db配置 (system.json 不再主进程中使用了，后续可能在子进程中使用）
-    Conf.setAll(this.config);
   }
 
   /**

package/jobs/child/app.js

@@ -58,7 +58,7 @@ class ChildApp {
 
     } else if (is.function(mod)) {
       mod(jobParams);
-    }
+    } 
   }
 }
 

package/jobs/child/forkProcess.js

@@ -7,6 +7,7 @@ const Ps = require('../../ps');
 const Channel = require('../../const/channel');
 const Helper = require('../../utils/helper');
 const Loader = require('../../loader');
+const extend = require('../../utils/extend');
 
 class ForkProcess {
   constructor(host, opt = {}) {
@@ -18,8 +19,7 @@ class ForkProcess {
       cwd = path.join(Ps.getHomeDir(), '..');
     }
 
-    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
-    let options = Object.assign({
+    let options = extend(true,{
       processArgs: {},
       processOptions: { 
         cwd: cwd,

package/loader/index.js

@@ -3,7 +3,6 @@ const fs = require('fs');
 const path = require('path');
 const UtilsCore = require('../core/lib/utils');
 const Ps = require('../ps');
-const Log = require('../log');
 
 module.exports = {
 
@@ -24,11 +23,10 @@ module.exports = {
     filepath = filepath && this.resolveModule(filepath);
     if (!fs.existsSync(filepath)) {
       let errorMsg = `[ee-core] [loader/index] loadOneFile ${filepath} does not exist`;
-      Log.coreLogger.error(errorMsg);
       throw new Error(errorMsg);
     }
 
-    const ret = UtilsCore.loadFile(filepath);
+    let ret = UtilsCore.loadFile(filepath);
     if (is.function(ret) && !is.class(ret) && !UtilsCore.isBytecodeClass(ret)) {
       ret = ret(...inject);
     }
@@ -45,8 +43,7 @@ module.exports = {
   loadJsFile (filepath) {
     if (!fs.existsSync(filepath)) {
       let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(errMsg);
-      return;
+      throw new Error(errMsg);
     }
 
     const ret = UtilsCore.loadFile(filepath);
@@ -64,8 +61,7 @@ module.exports = {
   execJsFile (filepath, ...inject) {
     if (!fs.existsSync(filepath)) {
       let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(errMsg);
-      return;
+      throw new Error(errMsg);
     }
 
     let ret = UtilsCore.loadFile(filepath);
@@ -97,7 +93,7 @@ module.exports = {
 
       if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
         let files = { filepath, fullpath }
-        Log.coreLogger.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
+        console.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
         return undefined;
       }
     }
@@ -122,7 +118,7 @@ module.exports = {
     fullpath = this.resolveModule(filepath);
     if (!fs.existsSync(fullpath)) {
       let errorMsg = `[ee-core] [loader] requireModule filepath: ${filepath} does not exist`;
-      Log.coreLogger.error(errorMsg);
+      throw new Error(errorMsg);
     }
     const ret = UtilsCore.loadFile(fullpath);
 

package/log/logger.js

@@ -3,8 +3,9 @@ const assert = require('assert');
 const dayjs = require('dayjs');
 const path = require('path');
 const Ps = require('../ps');
-const Conf = require('../config');
 const ConfigCache = require('../config/cache');
+const extend = require('../utils/extend');
+
 let LogDate = 0;
 const TmpFileName = {
   appLogName: '',
@@ -39,17 +40,13 @@ module.exports = {
           coreLogger: {},
           allowDebugAtProd: false,
           enablePerformanceTimer: false,
-          rotator: 'none',
+          rotator: 'day',
         },
         customLogger: {}
       }
 
-      // 先从 cache 中读配置且不能抛出错误，如果没有从文件中读（子进程无法获取 cache）
-      let sysConfig = ConfigCache.all(false);
-      if (!sysConfig) {
-        sysConfig = Conf.all(false);
-      }
-      opt = Object.assign(defaultConfig, {
+      const sysConfig = ConfigCache.all();
+      opt = extend(true, defaultConfig, {
         logger: sysConfig.logger,
         customLogger: sysConfig.customLogger || {}
       });

package/main/index.js

@@ -43,13 +43,13 @@ class ElectronEgg {
       baseDir = Ps.getEncryptDir(app.getAppPath());
     }
 
-    let indexFile = path.join(baseDir, 'index');
-    indexFile = Loader.resolveModule(indexFile);
-    if (!fs.existsSync(indexFile)) {
+    const indexFile = path.join(baseDir, 'index');
+    const indexModulePath = Loader.resolveModule(indexFile);
+    if (!fs.existsSync(indexModulePath)) {
       throw new Error(`The ${indexFile} file does not exist`);
     }
 
-    const EEApp = UtilsCore.loadFile(indexFile);
+    const EEApp = UtilsCore.loadFile(indexModulePath);
     EE.app = new EEApp();
   }
 }

package/message/childMessage.js

@@ -40,7 +40,6 @@ class ChildMessage {
    */
   sendErrorToTerminal(err) {
     let errTips = (err && typeof err == 'object') ? err.toString() : '';
-    errTips += ' Error !!! Please See file ee-core.log or ee-error-xxx.log for details !'
     let message = {
       channel: Channel.process.showException,
       data: errTips

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/ps/index.js

@@ -134,6 +134,13 @@ exports.appName = function() {
   return process.env.EE_APP_NAME;
 }
 
+/**
+ * app version
+ */
+exports.appVersion = function() {
+  return process.env.EE_APP_VERSION;
+}
+
 /**
  * 获取home路径
  */

package/storage/jsondb/adapters/FileSync.js

@@ -19,7 +19,7 @@ class FileSync extends Base {
       let canDeserialized = this._canDeserialized(data);
       if (!canDeserialized) {
         let errMessage = `[ee-core] [storage/jsondb] malformed json in file: ${this.source}\n${data}`;
-        Log.coreLogger.error(errMessage);
+        console.error(errMessage);
 
         // 是否文件结尾多一个括号，尝试处理
         data = data.trim().slice(0, -1);
@@ -34,7 +34,7 @@ class FileSync extends Base {
             this._fsWrite(this.defaultValue);
           }
           errMessage = '[ee-core] [storage/jsondb] malformed json that cannot be handled!';
-          Log.coreLogger.error(errMessage);
+          console.error(errMessage);
         }
       }
       const value = canDeserialized ? this.deserialize(data) : this.defaultValue;
@@ -53,7 +53,7 @@ class FileSync extends Base {
   _fsWrite(data) {
     const isObject = Object.prototype.toString.call(data) === '[object Object]';
     if (!isObject) {
-      Log.coreLogger.error('[ee-core] [storage/jsondb] Variable is not an object :', data);
+      console.error('[ee-core] [storage/jsondb] Variable is not an object :', data);
       return
     }