ee-core 1.5.2-beta.2 → 2.0.0-beta.2

package/config/config.default.js

@@ -134,6 +134,7 @@ module.exports = appInfo => {
    * @property {Boolean} enablePerformanceTimer - using performance.now() timer instead of Date.now() for more more precise milliseconds, defaults to false. e.g.: logger will set 1.456ms instead of 1ms.
    */
   config.logger = {
+    type: 'application',
     dir: path.join(appInfo.root, 'logs'),
     encoding: 'utf8',
     env: appInfo.env,
@@ -151,6 +152,13 @@ module.exports = appInfo => {
     enablePerformanceTimer: false,
   };
 
+  /**
+   * customLogger options
+   * @member Config#customLogger
+   * 
+   */  
+  config.customLogger = {}
+
   /**
    * The option for httpclient
    * @member Config#httpclient
@@ -173,7 +181,6 @@ module.exports = appInfo => {
     enableDNSCache: false,
     dnsCacheLookupInterval: 10000,
     dnsCacheMaxLength: 1000,
-
     request: {
       timeout: 5000,
     },

package/core/lib/ee.js

@@ -33,7 +33,7 @@ class EeCore extends KoaApplication {
 
     this.timing = new Timing();
 
-    this.console = new EggConsoleLogger();
+    this.console = new EggConsoleLogger({level: 'INFO'});
 
     /**
      * @member {Object} EeCore#options

package/core/lib/loader/ee_loader.js

@@ -7,9 +7,9 @@ const is = require('is-type-of');
 const debug = require('debug')('ee-core:EeLoader');
 const FileLoader = require('./file_loader');
 const ContextLoader = require('./context_loader');
-const utility = require('utility');
 const utils = require('../utils');
 const Timing = require('../utils/timing');
+const Ps = require('../../../module/utils/ps');
 
 const REQUIRE_COUNT = Symbol('EeLoader#requireCount');
 
@@ -83,25 +83,8 @@ class EeLoader {
   getServerEnv() {
     let serverEnv = this.options.env;
 
-    const envPath = path.join(this.options.baseDir, 'config/env');
-    if (!serverEnv && fs.existsSync(envPath)) {
-      serverEnv = fs.readFileSync(envPath, 'utf8').trim();
-    }
-
     if (!serverEnv) {
-      serverEnv = process.env.EE_SERVER_ENV;
-    }
-
-    if (!serverEnv) {
-      if (process.env.NODE_ENV === 'test') {
-        serverEnv = 'unittest';
-      } else if (process.env.NODE_ENV === 'production') {
-        serverEnv = 'prod';
-      } else {
-        serverEnv = 'local';
-      }
-    } else {
-      serverEnv = serverEnv.trim();
+      throw new Error('[core] [lib] [loader] getServerEnv serverEnv can not be empty!');
     }
 
     return serverEnv;
@@ -199,7 +182,7 @@ class EeLoader {
        * The directory whether is homeDir or appUserData depend on env.
        * @member {String} AppInfo#root
        */
-      root: env === 'local' || env === 'unittest' ? this.getHomedir() : this.options.appUserData,
+      root: Ps.getRootDir(),
 
       /**
        * electron application data dir
@@ -313,15 +296,6 @@ class EeLoader {
 
     const dirs = this.dirs = [];
 
-    if (this.orderPlugins) {
-      for (const plugin of this.orderPlugins) {
-        dirs.push({
-          path: plugin.path,
-          type: 'plugin',
-        });
-      }
-    }
-
     // framework or Ee path
     for (const EePath of this.EePaths) {
       dirs.push({
@@ -404,36 +378,40 @@ class EeLoader {
 
   getTypeFiles(filename) {
     const files = [ `${filename}.default` ];
-    if (this.serverScope) files.push(`${filename}.${this.serverScope}`);
-    if (this.serverEnv === 'default') return files;
-
     files.push(`${filename}.${this.serverEnv}`);
-    if (this.serverScope) files.push(`${filename}.${this.serverScope}_${this.serverEnv}`);
+
     return files;
   }
 
   resolveModule(filepath) {
-    let fullPath;
+    let fullpath;
     try {
-      fullPath = require.resolve(filepath);
+      fullpath = require.resolve(filepath);
     } catch (e) {
-      let jscFile = filepath + '.jsc';
-      if (fs.existsSync(jscFile)) {
-        return jscFile;
-      }
-      return undefined;
-    }
 
-    if (process.env.Ee_TYPESCRIPT !== 'true' && fullPath.endsWith('.ts')) {
-      return undefined;
+      // 特殊后缀处理
+      if (filepath && (filepath.endsWith('.defalut') || filepath.endsWith('.prod'))) {
+        fullpath = filepath + '.jsc';
+      } else if (filepath && filepath.endsWith('.js')) {
+        fullpath = filepath + 'c';
+      }
+      
+      if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
+        this.options.logger.warn(`[ee-core] [core/lib/loader/ee_loader] resolveModule unknow filepath: ${filepath}`)
+        return undefined;
+      }
     }
 
-    return fullPath;
+    return fullpath;
   }
 
   getPkg() {
     const filePath = path.join(this.options.homeDir, 'package.json');
-    const json = utility.readJSONSync(filePath);
+    if (!fs.existsSync(filePath)) {
+      throw new Error(filePath + ' is not found');
+    }
+    const json = JSON.parse(fs.readFileSync(filePath));
+
     return json;
   }  
 }

package/core/lib/loader/mixin/config.js

@@ -24,14 +24,7 @@ module.exports = {
 
     // Load Application config first
     const appConfig = this._preloadAppConfig();
-    //console.log('----------------------- appConfig:', appConfig);
-
-    //   plugin config.default
-    //     framework config.default
-    //       app config.default
-    //         plugin config.{env}
-    //           framework config.{env}
-    //             app config.{env}
+
     for (const filename of this.getTypeFiles('config')) {
       for (const unit of this.getLoadUnits()) {
         const isApp = unit.type === 'app';
@@ -64,6 +57,8 @@ module.exports = {
       'config.default',
       `config.${this.serverEnv}`,
     ];
+
+
     const target = {};
     for (const filename of names) {
       const config = this._loadConfig(this.options.baseDir, filename, undefined, 'app');
@@ -78,9 +73,9 @@ module.exports = {
     let filepath = this.resolveModule(path.join(dirpath, 'config', filename));
 
     // let config.js compatible
-    if (filename === 'config.default' && !filepath) {
-      filepath = this.resolveModule(path.join(dirpath, 'config/config'));
-    }
+    // if (filename === 'config.default' && !filepath) {
+    //   filepath = this.resolveModule(path.join(dirpath, 'config/config'));
+    // }
   
     const config = this.loadFile(filepath, this.appInfo, extraInject);
 

package/core/lib/loader/mixin/controller.js

@@ -2,7 +2,7 @@
 
 const path = require('path');
 const is = require('is-type-of');
-const utility = require('utility');
+const utilsFn = require('../../utils/function');
 const utils = require('../../utils');
 const FULLPATH = require('../file_loader').FULLPATH;
 
@@ -97,7 +97,7 @@ function wrapObject(obj, path, prefix) {
   const ret = {};
   for (const key of keys) {
     if (is.function(obj[key])) {
-      const names = utility.getParamNames(obj[key]);
+      const names = utilsFn.getParamNames(obj[key]);
       if (names[0] === 'next') {
         throw new Error(`controller \`${prefix || ''}${key}\` should not use next as argument from file ${path}`);
       }
@@ -122,3 +122,4 @@ function wrapObject(obj, path, prefix) {
     return objectControllerMiddleware;
   }
 }
+

package/core/lib/utils/function.js

@@ -0,0 +1,30 @@
+const assert = require('assert');
+
+/**
+ * A empty function.
+ *
+ * @return {Function}
+ * @public
+ */
+exports.noop = function noop() {};
+
+/**
+ * Get a function parameter's names.
+ *
+ * @param {Function} func
+ * @param {Boolean} [useCache], default is true
+ * @return {Array} names
+ */
+exports.getParamNames = function getParamNames(func, cache) {
+  var type = typeof func;
+  assert(type === 'function', 'The "func" must be a function. Received type "' + type + '"');
+
+  cache = cache !== false;
+  if (cache && func.__cache_names) {
+    return func.__cache_names;
+  }
+  var str = func.toString();
+  var names = str.slice(str.indexOf('(') + 1, str.indexOf(')')).match(/([^\s,]+)/g) || [];
+  func.__cache_names = names;
+  return names;
+};

package/core/lib/utils/index.js

@@ -14,6 +14,12 @@ const Module = module.constructor.length > 1
   /* istanbul ignore next */
   : BuiltinModule;
 
+// Module._extensions:
+// '.js': [Function (anonymous)],
+// '.json': [Function (anonymous)],
+// '.node': [Function: func],
+// '.jsc': [Function (anonymous)]
+
 module.exports = {
   extensions: Module._extensions,
 

package/index.js

@@ -26,7 +26,7 @@ const Service = require('./core/lib/utils/base_context_class');
  * @member {Storage}
  * @since 1.0.0
  */
-const Storage = require('./lib/storage/index');
+const Storage = require('./module/storage/index');
 
 /**
  * @member {Utils}
@@ -38,7 +38,7 @@ const Utils = require('./utils/index');
  * @member {Socket}
  * @since 1.0.0
  */
-const Socket = require('./lib/socket/io');
+const Socket = require('./module/socket/io');
 
 module.exports = {
   Appliaction,

package/lib/appLoader.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const EeLoader = require('../core/index').EeLoader;
 
 /**
@@ -43,9 +41,6 @@ class AppLoader extends EeLoader {
    * @since 1.0.0
    */
   loadElectron() {
-
-    // 预加载功能模块
-    //this.loadPreload();
     
   }
 }

package/lib/application.js

@@ -1,8 +1,8 @@
 const {app} = require('electron');
 const path = require('path');
-const EeApp = require('./eeApp');
 const debug = require('debug')('ee-core:Appliaction');
 const fs = require('fs');
+const EeApp = require('./eeApp');
 
 class Appliaction extends EeApp {
   constructor() {
@@ -18,10 +18,10 @@ class Appliaction extends EeApp {
       userHome: app.getPath('home'),
       appData: app.getPath('appData'),
       appUserData: app.getPath('userData'),
-      //logsDir: app.getPath('logs'),
       appVersion: app.getVersion(),
       isPackaged: app.isPackaged,
-      execDir: app.getAppPath()
+      execDir: app.getAppPath(),
+      isEncrypted: false
     }
 
     // argv
@@ -43,25 +43,28 @@ class Appliaction extends EeApp {
 
     // Use encryption, base directory is public/electron
     const encryptDir = path.join(app.getAppPath(), 'public', 'electron');
-    let isEncrypted = fs.existsSync(encryptDir);
-    if (options.env == 'prod' && isEncrypted) {
+    if (options.env == 'prod' && fs.existsSync(encryptDir)) {
       options.baseDir = encryptDir;
+      options.isEncrypted = true;
     }
 
     // normalize env
-    env.NODE_ENV = 'production';
+    env.NODE_ENV = options.env;
     env.EE_HOME = options.homeDir;
+    env.EE_BASE_DIR = options.baseDir;
     env.EE_SERVER_ENV = options.env;
     env.EE_SERVER_SCOPE = options.serverScope;
     env.EE_USER_HOME = options.userHome;
     env.EE_APP_DATA = options.appData;
     env.EE_APP_USER_DATA = options.appUserData;
-    env.EE_MAIN_PORT = null;
-    env.EE_SOCKET_PORT = null;
-    env.EE_HTTP_PORT = null;
     env.HOT_RELOAD = hotReload;
     env.EE_EXEC_DIR = options.execDir;
+    env.EE_IS_PACKAGED = options.isPackaged;
+    env.EE_IS_ENCRYPTED = options.isEncrypted;
     env.EE_DATABASE_DIR = null;
+    env.EE_MAIN_PORT = null;
+    env.EE_SOCKET_PORT = null;
+    env.EE_HTTP_PORT = null;
     debug('options:%j', options)
 
     super(options);

package/lib/baseApp.js

@@ -1,35 +1,30 @@
-'use strict';
-
 const EeAppCore = require('../core/index').EeCore;
 const EE_PATH = Symbol.for('ee#eePath');
 const path = require('path');
 const EE_LOADER = Symbol.for('ee#loader');
 const AppLoader = require('./appLoader');
-const LOGGERS = Symbol('EeApplication#loggers');
-const ELoggers = require('./logger');
-const HttpClient = require('./httpclient');
+const HttpClient = require('../module/httpclient');
 const HTTPCLIENT = Symbol('EeApplication#httpclient');
+const LOGGERS = Symbol('EeApplication#loggers');
+const Log = require('../module/log');
+const Storage = require('../module/storage');
 
 class BaseApp extends EeAppCore {
   constructor (options = {}) {
 
     super(options);
-    
-    this.HttpClient = HttpClient;
 
     this.loader.loadConfig();
     
-    // todo
-    //this.setDatabaseDir();
-
     // 缓存配置
     this.getCoreDB().setItem('config', this.config);
 
     this.loader.load();
 
+    this.HttpClient = HttpClient;
+
     // TODO 这个不行，要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
     //this.coreDB = this.getCoreDB();
-
   }
 
   get [EE_PATH]() {
@@ -47,7 +42,7 @@ class BaseApp extends EeAppCore {
    */
   get loggers() {
     if (!this[LOGGERS]) {
-      this[LOGGERS] = ELoggers.getInstance(this.config);
+      this[LOGGERS] = Log.create(this.config);
     }
     return this[LOGGERS];
   }
@@ -85,7 +80,7 @@ class BaseApp extends EeAppCore {
    * @since 1.0.0
    */
   getCoreDB () {
-    const db = require('./storage/index').JsonDB.connection('system');
+    const db = Storage.connection('system');
     return db;
   }
   
@@ -104,23 +99,11 @@ class BaseApp extends EeAppCore {
    */
   get httpclient() {
     if (!this[HTTPCLIENT]) {
-      this[HTTPCLIENT] = new this.HttpClient(this);
+      this[HTTPCLIENT] = new this.HttpClient(this.config.httpclient);
     }
     return this[HTTPCLIENT];
   }
 
-  /**
-   * todo 设置db存储目录
-   */
-  setDatabaseDir (dirPath) {
-    if (dirPath) {
-      assert(typeof dirPath === 'string', ` ${dirPath} dirPath required, and must be a string`);
-      process.env.EE_DATABASE_DIR = dirPath;
-    } else {
-      process.env.EE_DATABASE_DIR = this.config.database.dir;
-    }
-  }
-
   /**
    * core app have been loaded
    */

package/lib/eeApp.js

@@ -2,13 +2,13 @@ const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
 const getPort = require('get-port');
-const {app, BrowserWindow, BrowserView, Menu} = require('electron');
-const BaseApp = require('./baseApp');
+const {app, BrowserWindow, Menu, protocol} = require('electron');
 const is = require('is-type-of');
 const Koa = require('koa');
 const koaServe = require('koa-static');
 const https = require('https');
-const utilsCommon = require('../utils/common');
+const BaseApp = require('./baseApp');
+const Log = require('../module/log');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -51,7 +51,7 @@ class EeApp extends BaseApp {
    * 启动通信模块
    */
   async startSocket () {
-    const socket = require('./socket/start');
+    const socket = require('../module/socket/start');
     socket(this);
   }
   
@@ -80,7 +80,7 @@ class EeApp extends BaseApp {
     
     app.on('window-all-closed', () => {
       if (process.platform !== 'darwin') {
-        self.coreLogger.info('[Appliaction] [initialize] window-all-closed quit');
+        Log.coreLogger.info('[Appliaction] [initialize] window-all-closed quit');
         self.appQuit();
       }
     })
@@ -100,6 +100,15 @@ class EeApp extends BaseApp {
    * 创建应用主窗口
    */
   async createWindow () {
+
+    // todo
+    const protocolName = 'eefile';
+    protocol.registerFileProtocol(protocolName, (request, callback) => {
+      const url = request.url.substring(protocolName.length + 3);
+      console.log('[ee-core:job] ----url: ', url);
+      callback({ path: path.normalize(decodeURIComponent(url)) })
+    });
+
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
     let win = this.electron.mainWindow;
@@ -114,8 +123,6 @@ class EeApp extends BaseApp {
       // nothing 
     }
 
-    this.loadingView(winOptions);
-
     await this.windowReady();
   
     await this._loderAddons();
@@ -142,45 +149,6 @@ class EeApp extends BaseApp {
     }
   }
 
-  /**
-   * 加载已经实现的功能
-   */
-  async loadPreference () {
-    const preferences = require('./preferences');
-    return await preferences(this);
-  }
-
-  /**
-   * 加载loading页面
-   */
-  loadingView (winOptions) {
-    let currentV = process.versions.electron;
-    if (utilsCommon.compareVersion(currentV, '12.2.3') == 1) {
-      return;
-    }
-    if (!this.config.loadingPage) {
-      return;
-    }
-    const self = this;
-    const loadingBrowserView = new BrowserView();
-    this.electron.mainWindow.setBrowserView(loadingBrowserView);
-    loadingBrowserView.setBounds({
-      x: 0,
-      y: 0,
-      width: winOptions.width,
-      height: winOptions.height
-    });
-
-    // loading html
-    const loadingHtml = path.join('file://', this.config.homeDir, 'public', 'html', 'loading.html');
-    loadingBrowserView.webContents.loadURL(loadingHtml);
-    this.logger.info('loadingHtml:', loadingHtml);
-    
-    this.electron.mainWindow.webContents.on('dom-ready', async (event) => {
-      self.electron.mainWindow.removeBrowserView(loadingBrowserView);
-    });
-  }
-
   /**
    * 应用类型 （远程、html、单页应用）
    */
@@ -252,7 +220,7 @@ class EeApp extends BaseApp {
       };
       https.createServer(sslOpt, koaApp.callback()).listen(mainServer.port, (err) => {
         if (err) {
-          self.coreLogger.info('[error] ', err);
+          Log.coreLogger.info('[error] ', err);
           return
         }
         self.loadMainUrl(mode, url);
@@ -269,8 +237,8 @@ class EeApp extends BaseApp {
    */
   loadMainUrl (type, url) {
     const mainServer = this.config.mainServer;
-    this.logger.info('[ee-core:main] Env: %s, Type: %s', this.config.env, type);
-    this.logger.info('[ee-core:main] App running at: %s', url);
+    Log.coreLogger.info('[ee-core:main] Env: %s, Type: %s', this.config.env, type);
+    Log.coreLogger.info('[ee-core:main] App running at: %s', url);
     this.electron.mainWindow.loadURL(url, mainServer.options);
   }
 
@@ -328,10 +296,8 @@ class EeApp extends BaseApp {
    * 捕获异常
    */
   async catchLog () {
-    const self = this;
-
     process.on('uncaughtException', function(err) {
-      self.logger.error(err);
+      Log.coreLogger.error(err);
     });
   }
 

package/{lib/constant.js → module/const/index.js}

@@ -6,5 +6,8 @@ module.exports = {
     channel: {
       partySoftware: 'c1',
     }
+  },
+  jobs: {
+    inspectStartIndex: 5858
   }
 };

package/module/exception/index.js

@@ -0,0 +1,16 @@
+const Log = require('../log');
+
+/**
+ * 捕获异常
+ */
+exports.start = function() {
+  process.on('uncaughtException', this.uncaughtExceptionHandler);
+}
+
+exports.uncaughtExceptionHandler = function(err) {
+  if (!(err instanceof Error)) {
+    err = new Error(String(err));
+  }
+ 
+  Log.coreLogger.error(err);
+}