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

package/index.js

@@ -1,38 +1,31 @@
-'use strict';
-
 /**
  * @namespace EeCore
  */
-
-/**
- * @member {Appliaction} EeCore#Appliaction
- * @since 1.0.0
- */
-const Appliaction = require('./lib/application');
+let app;
 
 /**
  * @member {Controller} EeCore#Controller
  * @since 1.0.0
  */
-const Controller = require('./core/lib/utils/base_context_class');
+const Controller = require('./module/controller');
 
 /**
  * @member {Service} EeCore#Service
  * @since 1.0.0
  */
-const Service = require('./core/lib/utils/base_context_class');
+const Service = require('./module/service');
 
 /**
  * @member {Storage}
  * @since 1.0.0
  */
-const Storage = require('./module/storage/index');
+const Storage = require('./module/storage');
 
 /**
  * @member {Utils}
  * @since 1.0.0
  */
-const Utils = require('./utils/index');
+const Utils = require('./module/oldUtils');
 
 /**
  * @member {Socket}
@@ -41,7 +34,13 @@ const Utils = require('./utils/index');
 const Socket = require('./module/socket/io');
 
 module.exports = {
-  Appliaction,
+  get Appliaction () {
+    if (app) {
+      return app;
+    }
+    app = require('./module/app/application');
+    return app;
+  },
   Controller,
   Service,
   Storage,

package/{lib → module/app}/application.js

@@ -1,3 +1,4 @@
+const Exception = require('../exception');
 const {app} = require('electron');
 const path = require('path');
 const debug = require('debug')('ee-core:Appliaction');
@@ -6,6 +7,7 @@ const EeApp = require('./eeApp');
 
 class Appliaction extends EeApp {
   constructor() {
+    Exception.start();
     const { env } = process;
     let options = {
       env: 'prod',
@@ -80,8 +82,6 @@ class Appliaction extends EeApp {
     await this.ready();
 
     await this.createElectronApp();
-
-    await this.catchLog();
   } 
 }
 

package/{lib → module/app}/baseApp.js

@@ -3,11 +3,11 @@ const EE_PATH = Symbol.for('ee#eePath');
 const path = require('path');
 const EE_LOADER = Symbol.for('ee#loader');
 const AppLoader = require('./appLoader');
-const HttpClient = require('../module/httpclient');
+const HttpClient = require('../httpclient');
 const HTTPCLIENT = Symbol('EeApplication#httpclient');
 const LOGGERS = Symbol('EeApplication#loggers');
-const Log = require('../module/log');
-const Storage = require('../module/storage');
+const Log = require('../log');
+const Storage = require('../storage');
 
 class BaseApp extends EeAppCore {
   constructor (options = {}) {

package/{lib → module/app}/eeApp.js

@@ -8,7 +8,7 @@ const Koa = require('koa');
 const koaServe = require('koa-static');
 const https = require('https');
 const BaseApp = require('./baseApp');
-const Log = require('../module/log');
+const Log = require('../log');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -51,7 +51,7 @@ class EeApp extends BaseApp {
    * 启动通信模块
    */
   async startSocket () {
-    const socket = require('../module/socket/start');
+    const socket = require('../socket/start');
     socket(this);
   }
   
@@ -80,7 +80,7 @@ class EeApp extends BaseApp {
     
     app.on('window-all-closed', () => {
       if (process.platform !== 'darwin') {
-        Log.coreLogger.info('[Appliaction] [initialize] window-all-closed quit');
+        Log.coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
         self.appQuit();
       }
     })
@@ -105,7 +105,7 @@ class EeApp extends BaseApp {
     const protocolName = 'eefile';
     protocol.registerFileProtocol(protocolName, (request, callback) => {
       const url = request.url.substring(protocolName.length + 3);
-      console.log('[ee-core:job] ----url: ', url);
+      console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
       callback({ path: path.normalize(decodeURIComponent(url)) })
     });
 
@@ -220,7 +220,7 @@ class EeApp extends BaseApp {
       };
       https.createServer(sslOpt, koaApp.callback()).listen(mainServer.port, (err) => {
         if (err) {
-          Log.coreLogger.info('[error] ', err);
+          Log.coreLogger.info('[ee-core] [lib/eeApp] createServer error: ', err);
           return
         }
         self.loadMainUrl(mode, url);
@@ -237,8 +237,8 @@ class EeApp extends BaseApp {
    */
   loadMainUrl (type, url) {
     const mainServer = this.config.mainServer;
-    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);
+    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);
   }
 

package/module/app/index.js

@@ -0,0 +1,5 @@
+const App = {
+
+}  
+
+module.exports = App;

package/{bin → module/bin}/tools.js

@@ -7,7 +7,7 @@ const encrypt = require('../tools/encrypt');
 const args = process.argv;
 // console.log('[ee-core] args:', args);
 const cmd = args[2];
-console.log('[ee-core] cmd:', cmd);
+console.log('[ee-core] [bin/tools] cmd:', cmd);
 
 if (cmd == 'rd') {
   replaceDist.run();

package/{config → module/config}/config.default.js

@@ -1,4 +1,3 @@
-'use strict';
 const path = require('path');
 
 /**
@@ -222,7 +221,7 @@ module.exports = appInfo => {
       cert: ''
     },
     protocol: 'http://',
-    host: '127.0.0.1',
+    host: 'localhost',
     port: 7071, // 默认端口（如果端口被使用，则随机获取一个）
     cors: {
       origin: "*"
@@ -239,7 +238,7 @@ module.exports = appInfo => {
   /* 主进程加载的地址 */
   config.mainServer = {
     protocol: 'http://',
-    host: '127.0.0.1',
+    host: 'localhost',
     port: 7072, // 默认端口（如果端口被使用，则随机获取一个）
     options: {},
     ssl: {

package/module/const/channel.js

@@ -0,0 +1,6 @@
+module.exports = {
+  process: {
+    showException: 'ee#showException',
+    sendToMain: 'ee#sendToMain'
+  }
+};

package/{core → module/core}/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const EeCore = require('./lib/ee');
 const EeLoader = require('./lib/loader/ee_loader');
 const BaseContextClass = require('./lib/utils/base_context_class');

package/{core → module/core}/lib/ee.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const assert = require('assert');
 const fs = require('fs');
 const KoaApplication = require('koa');

package/{core → module/core}/lib/loader/context_loader.js

@@ -5,7 +5,7 @@ const is = require('is-type-of');
 const FileLoader = require('./file_loader');
 const CLASSLOADER = Symbol('classLoader');
 const EXPORTS = FileLoader.EXPORTS;
-const utils = require('../utils');
+const Utils = require('../utils');
 
 class ClassLoader {
 
@@ -89,7 +89,7 @@ function getInstance(values, ctx) {
   const Class = values[EXPORTS] ? values : null;
   let instance;
   if (Class) {
-    if (is.class(Class) || utils.isBytecodeClass(Class)) {
+    if (is.class(Class) || Utils.isBytecodeClass(Class)) {
       instance = new Class(ctx);
     } else {
       // it's just an object

package/{core → module/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 utils = require('../utils');
+const Utils = require('../utils');
 const Timing = require('../utils/timing');
-const Ps = require('../../../module/utils/ps');
+const Ps = require('../../../ps');
 
 const REQUIRE_COUNT = Symbol('EeLoader#requireCount');
 
@@ -255,7 +255,7 @@ class EeLoader {
     if (inject.length === 0) inject = [ this.app ];
 
     let ret = this.requireFile(filepath);
-    if (is.function(ret) && !is.class(ret) && !utils.isBytecodeClass(ret)) {
+    if (is.function(ret) && !is.class(ret) && !Utils.isBytecodeClass(ret)) {
       ret = ret(...inject);
     }
     return ret;
@@ -267,9 +267,9 @@ class EeLoader {
    * @private
    */
   requireFile(filepath) {
-    const timingKey = `Require(${this[REQUIRE_COUNT]++}) ${utils.getResolvedFilename(filepath, this.options.baseDir)}`;
+    const timingKey = `Require(${this[REQUIRE_COUNT]++}) ${Utils.getResolvedFilename(filepath, this.options.baseDir)}`;
     this.timing.start(timingKey);
-    const ret = utils.loadFile(filepath);
+    const ret = Utils.loadFile(filepath);
     this.timing.end(timingKey);
     return ret;
   }

package/{core → module/core}/lib/loader/file_loader.js

@@ -7,7 +7,7 @@ const path = require('path');
 const globby = require('globby');
 const is = require('is-type-of');
 const deprecate = require('depd')('ee');
-const utils = require('../utils');
+const Utils = require('../utils');
 const FULLPATH = Symbol('EE_LOADER_ITEM_FULLPATH');
 const EXPORTS = Symbol('EE_LOADER_ITEM_EXPORTS');
 
@@ -125,7 +125,7 @@ class FileLoader {
   parse() {
     let files = this.options.match;
     if (!files) {
-      files = (process.env.EE_TYPESCRIPT === 'true' && utils.extensions['.ts'])
+      files = (process.env.EE_TYPESCRIPT === 'true' && Utils.extensions['.ts'])
         ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
         : [ '**/*.js', '**/*.jsc'];
     } else {
@@ -164,7 +164,7 @@ class FileLoader {
         if (exports == null || (filter && filter(exports) === false)) continue;
 
         // set properties of class
-        if (is.class(exports) || utils.isBytecodeClass(exports)) {
+        if (is.class(exports) || Utils.isBytecodeClass(exports)) {
           exports.prototype.pathName = pathName;
           exports.prototype.fullPath = fullpath;
         }
@@ -217,7 +217,7 @@ class FileLoader {
         if (exports == null) continue;
   
         const properties = [addonName];
-        if (is.class(exports) || utils.isBytecodeClass(exports)) {
+        if (is.class(exports) || Utils.isBytecodeClass(exports)) {
           exports.prototype.pathName = addonName;
           exports.prototype.fullPath = fullpath;
         }
@@ -261,7 +261,7 @@ function getProperties(filepath, { caseStyle }) {
 // Get exports from filepath
 // If exports is null/undefined, it will be ignored
 function getExports(fullpath, { initializer, call, inject }, pathName) {
-  let exports = utils.loadFile(fullpath);
+  let exports = Utils.loadFile(fullpath);
 
   // process exports as you like
   if (initializer) {
@@ -275,7 +275,7 @@ function getExports(fullpath, { initializer, call, inject }, pathName) {
   // module.exports = function*() {}
   //new exports;
 
-  if (is.class(exports) || is.generatorFunction(exports) || is.asyncFunction(exports) || utils.isBytecodeClass(exports)) {
+  if (is.class(exports) || is.generatorFunction(exports) || is.asyncFunction(exports) || Utils.isBytecodeClass(exports)) {
     return exports;
   }
 

package/{core → module/core}/lib/loader/mixin/addon.js

@@ -13,7 +13,7 @@ module.exports = {
 
     // 加载ee-core的插件 和 用户插件
     const directorys = [
-      path.join(this.options.framework, 'addon'),
+      path.join(this.options.framework, 'module', 'addon'),
       path.join(this.options.baseDir, 'addon'),
     ]
     opt = Object.assign({

package/{core → module/core}/lib/loader/mixin/config.js

@@ -102,7 +102,7 @@ module.exports = {
       this._setConfigMeta(envConfig, '<process.env.EE_APP_CONFIG>');
       return envConfig;
     } catch (err) {
-      this.options.logger.warn('[ee-loader] process.env.EE_APP_CONFIG is not invalid JSON: %s', envConfigStr);
+      this.options.logger.warn('[ee-core] [core/.../config] process.env.EE_APP_CONFIG is not invalid JSON: %s', envConfigStr);
     }
   },
 

package/{core → module/core}/lib/loader/mixin/controller.js

@@ -2,8 +2,8 @@
 
 const path = require('path');
 const is = require('is-type-of');
-const utilsFn = require('../../utils/function');
-const utils = require('../../utils');
+const UtilsFn = require('../../utils/function');
+const Utils = require('../../utils');
 const FULLPATH = require('../file_loader').FULLPATH;
 
 module.exports = {
@@ -26,10 +26,10 @@ module.exports = {
         // }
         // ```
         
-        if (is.function(obj) && !is.generatorFunction(obj) && !is.class(obj) && !is.asyncFunction(obj) && !utils.isBytecodeClass(obj)) {
+        if (is.function(obj) && !is.generatorFunction(obj) && !is.class(obj) && !is.asyncFunction(obj) && !Utils.isBytecodeClass(obj)) {
           obj = obj(this.app);
         }
-        if (is.class(obj) || utils.isBytecodeClass(obj)) {
+        if (is.class(obj) || Utils.isBytecodeClass(obj)) {
           obj.prototype.pathName = opt.pathName;
           obj.prototype.fullPath = opt.path;
           return wrapClass(obj);
@@ -47,7 +47,7 @@ module.exports = {
     const controllerBase = opt.directory;
 
     this.loadToApp(controllerBase, 'controller', opt);
-    this.options.logger.info('[ee-core:loader] Controller loaded: %s', controllerBase);
+    this.options.logger.info('[ee-core] [core/.../controller] loaded: %s', controllerBase);
     this.timing.end('Load Controller');
   },
 
@@ -86,7 +86,7 @@ function wrapClass(Controller) {
       //   args = [ this ];
       // }
       //args = [ this ];
-      return utils.callFn(controller[key], args, controller);
+      return Utils.callFn(controller[key], args, controller);
     };
   }
 }
@@ -97,7 +97,7 @@ function wrapObject(obj, path, prefix) {
   const ret = {};
   for (const key of keys) {
     if (is.function(obj[key])) {
-      const names = utilsFn.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}`);
       }
@@ -114,7 +114,7 @@ function wrapObject(obj, path, prefix) {
       // if (!this.app.config.controller || !this.app.config.controller.supportParams) {
       //   args = [ this ];
       // }
-      return await utils.callFn(func, args, this);
+      return await Utils.callFn(func, args, this);
     };
     for (const key in func) {
       objectControllerMiddleware[key] = func[key];

package/module/core/lib/utils/base_context_class.js

@@ -0,0 +1,34 @@
+'use strict';
+
+/**
+ * BaseContextClass is a base class that can be extended,
+ * it's instantiated in context level,
+ * {@link Helper}, {@link Service} is extending it.
+ */
+class BaseContextClass {
+
+  /**
+   * @class
+   * @param {Context} ctx - context instance
+   * @since 1.0.0
+   */
+  constructor(ctx) {
+    /**
+     * @member {Application} BaseContextClass#app
+     * @since 1.0.0
+     */
+    this.app = ctx;
+    /**
+     * @member {Config} BaseContextClass#config
+     * @since 1.0.0
+     */
+    this.config = ctx.config;
+    /**
+     * @member {Service} BaseContextClass#service
+     * @since 1.0.0
+     */
+    this.service = ctx.service;
+  }
+}
+
+module.exports = BaseContextClass;

package/module/exception/index.js

@@ -1,16 +1,85 @@
 const Log = require('../log');
+const Ps = require('../ps');
+const Channel = require('../const/channel');
 
 /**
  * 捕获异常
  */
 exports.start = function() {
-  process.on('uncaughtException', this.uncaughtExceptionHandler);
+  this.uncaughtExceptionHandler();
+  this.unhandledRejectionHandler();
 }
 
-exports.uncaughtExceptionHandler = function(err) {
-  if (!(err instanceof Error)) {
-    err = new Error(String(err));
+/**
+ * 当进程上抛出异常而没有被捕获时触发该事件，并且使异常静默。
+ */
+exports.uncaughtExceptionHandler = function() {
+  process.on('uncaughtException', function(err) {
+    if (!(err instanceof Error)) {
+      err = new Error(String(err));
+    }
+
+    if (err.name === 'Error') {
+      err.name = 'unhandledExceptionError';
+    }
+
+    Log.coreLogger.error(err);
+
+    devError(err);
+  });
+}
+
+/**
+ * 当进程上抛出异常而没有被捕获时触发该事件。
+ */
+exports.uncaughtExceptionMonitorHandler = function() {
+  // process.on('uncaughtExceptionMonitor', function(err, origin) {
+  //   if (!(err instanceof Error)) {
+  //     err = new Error(String(err));
+  //   }
+   
+  //   Log.coreLogger.error('uncaughtExceptionMonitor:',err);
+  // });
+}
+
+/**
+ * 当promise中reject的异常在同步任务中没有使用catch捕获就会触发该事件，
+ * 即便是在异步情况下使用了catch也会触发该事件
+ */
+exports.unhandledRejectionHandler = function() {
+  process.on('unhandledRejection', function(err) {
+    if (!(err instanceof Error)) {
+      const newError = new Error(String(err));
+      // err maybe an object, try to copy the name, message and stack to the new error instance
+      if (err) {
+        if (err.name) newError.name = err.name;
+        if (err.message) newError.message = err.message;
+        if (err.stack) newError.stack = err.stack;
+      }
+      err = newError;
+    }
+    if (err.name === 'Error') {
+      err.name = 'unhandledRejectionError';
+    }
+
+    Log.coreLogger.error(err);
+
+    devError(err);
+  });
+}
+
+/**
+ * 如果是子进程，发送错误到主进程控制台
+ */
+function devError (err) {
+  if (Ps.isForkedChild() && Ps.isDev()) {
+    let msgChannel = Channel.process.showException;
+    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: msgChannel,
+      data: errTips
+    }
+    process.send(message);
   }
- 
-  Log.coreLogger.error(err);
 }

package/module/httpclient/index.js

@@ -152,12 +152,12 @@ function normalizeConfig(httpConfig) {
   }
 
   if (config.httpAgent.timeout < 30000) {
-    Log.coreLogger.warn('[ee:httpclient] config.httpclient.httpAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
+    Log.coreLogger.warn('[ee-core] [httpclient] config.httpclient.httpAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
       config.httpAgent.timeout);
     config.httpAgent.timeout = 30000;
   }
   if (config.httpsAgent.timeout < 30000) {
-    Log.coreLogger.warn('[ee:httpclient] config.httpclient.httpsAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
+    Log.coreLogger.warn('[ee-core] [httpclient] config.httpclient.httpsAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
       config.httpsAgent.timeout);
     config.httpsAgent.timeout = 30000;
   }

package/module/jobs/baseJobClass.js

@@ -0,0 +1,16 @@
+/**
+ * BaseJobClass
+ */
+class BaseJobClass {
+
+  /**
+   * @class
+   * @param {Object} params - job基础类
+   * @since 1.0.0
+   */
+  constructor(params = {}) {
+    // todo
+  }
+}
+
+module.exports = BaseJobClass;

package/module/jobs/child/app.js

@@ -1,23 +1,63 @@
-const Exception = require('ee-core/module/exception');
-Exception.start();
 
-const Loader = require('ee-core/module/loader');
-const Log = require('ee-core/module/log');
+const is = require('is-type-of');
+let Exception;
+let Loader;
+let Log;
+let UtilsCore;
+
+// 开发环境下，ee-core是soft link
+if (__dirname.indexOf("node_modules") == -1) {
+  Exception = require('../../exception');
+  Loader = require('../../loader');
+  Log = require('../../log');
+  UtilsCore = require('../../core/lib/utils');
+} else {
+  Exception = require('ee-core/module/exception');
+  Loader = require('ee-core/module/loader');
+  Log = require('ee-core/module/log');
+  UtilsCore = require('../../core/lib/utils');
+}
+
+Exception.start();
 
 class ChildApp {
   constructor() {
-    const args = process.argv[2];
-    this.opt = args ? JSON.parse(args) : {};
+    this._initEvents();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _initEvents() {
+    process.on('message', this._handleMessage.bind(this));
+    process.on('exit', (code) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from main-process, code:${code}, pid:${process.pid}`);
+    });
+  }
+
+  /**
+   * 监听消息
+   */
+  _handleMessage(m) {
+    this.run(m);
+    Log.coreLogger.info(`[ee-core] [jobs/child] received a message from main-process, message: ${JSON.stringify(m)}`);
   }
 
-  run () {
-    Log.info('[child-process] run');
-    
-    const jobFile = this.opt.jobPath;
+  /**
+   * 运行脚本
+   */  
+  run(msg = {}) {
+    let filepath = msg.jobPath;
+    let params = msg.jobParams;
 
-    Loader.loadJobFile(jobFile);
+    let mod = Loader.loadJsFile(filepath);
+    if (is.class(mod) || UtilsCore.isBytecodeClass(mod)) {
+      let jobClass = new mod(params);
+      jobClass.handle();
+    } else if (is.function(mod)) {
+      mod(params);
+    }
   }
 }
 
-const app = new ChildApp()
-app.run();
+new ChildApp();