ee-core 2.0.0-beta.3 → 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);
   }
   

package/module/app/index.js

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

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/ee_loader.js

@@ -9,7 +9,7 @@ const FileLoader = require('./file_loader');
 const ContextLoader = require('./context_loader');
 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');
 

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/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-core] [module/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-core] [module/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,8 +1,24 @@
 
-const Exception = require('ee-core/module/exception');
+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();
-const Loader = require('ee-core/module/loader');
-const Log = require('ee-core/module/log');
 
 class ChildApp {
   constructor() {
@@ -13,30 +29,34 @@ class ChildApp {
    * 初始化事件监听
    */
   _initEvents() {
-    Log.info('[ee-core] [child-process] init Events');
-
-    process.on('disconnect', () => {
-      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process disconnected:${process.pid} !`);
-    });
-    process.on('exit', () => {
-      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process exited:${process.pid} !`);
-    });
     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(message) {
-    Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${message} from the mainProcess`);
-
-    this.run(message);
+  _handleMessage(m) {
+    this.run(m);
+    Log.coreLogger.info(`[ee-core] [jobs/child] received a message from main-process, message: ${JSON.stringify(m)}`);
   }
 
+  /**
+   * 运行脚本
+   */  
   run(msg = {}) {
-    Log.coreLogger.info('[ee-core] [child-process] run');
-
-    Loader.loadJobFile(msg.jobPath, msg.params);
+    let filepath = msg.jobPath;
+    let params = msg.jobParams;
+
+    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);
+    }
   }
 }
 

package/module/jobs/child/forkProcess.js

@@ -1,20 +1,16 @@
 const path = require('path');
 const { fork } = require('child_process');
+const serialize = require('serialize-javascript');
 const Log = require('../../log');
-const Ps = require('../../utils/ps');
+const Ps = require('../../ps');
+const Channel = require('../../const/channel');
 
 class ForkProcess {
   constructor(host, opt = {}) {
-
-    let processCWD = Ps.getHomeDir();
-    // if (Ps.isDev()) {
-    //   cwd = path.join(Ps.getHomeDir());
-    // }
-
+    
     let options = Object.assign({
-      params: {},
       processOptions: { 
-        cwd: processCWD,
+        cwd: Ps.getHomeDir(),
         env: Ps.allEnv(), 
         stdio: 'pipe' 
       }
@@ -25,7 +21,7 @@ class ForkProcess {
     this.sleeping = false;
 
     // 传递给子进程的参数
-    this.args.push(JSON.stringify(options.params));
+    //this.args.push(JSON.stringify(options.params));
 
     const appPath = path.join(__dirname, 'app.js');
     this.child = fork(appPath, this.args, options.processOptions);
@@ -38,45 +34,28 @@ class ForkProcess {
    * 进程初始化
    */
   _init() {
-    this.child.on('message', (data) => {
-      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-message ${data}`);
-    });
+    this.child.on('message', (m) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child] received a message from child-process, message: ${serialize(m)}`);
+      if (m.channel == Channel.process.showException) {
+        Log.coreLogger.error(`${m.data}`);
+      }
 
-    this.child.on('disconnect', () => {
-      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-disconnect !`);
-    });
+      // 收到子进程消息，转发到 event 
+      if (m.channel == Channel.process.sendToMain) {
+        this.host.emit(m.event, m.data);
+      }
 
-    this.child.on('close', (code, signal) => {
-      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-close code:${code}, signal:${signal}`);
     });
 
     this.child.on('exit', (code, signal) => {
-      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-exit code:${code}, signal:${signal}`);
+      Log.coreLogger.info(`[ee-core] [jobs/child] received a exit from child-process, code:${code}, signal:${signal}`);
     });
 
     this.child.on('error', (err) => {
-      Log.coreLogger.error(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-error :${err} !`);
+      Log.coreLogger.error(`[ee-core] [jobs/child] received a error from child-process, error: ${err} !`);
     });
   }
 
-  /**
-   * 进程挂起
-   */
-  sleep() {
-    if (this.sleeping) return;
-    process.kill(this.pid, 'SIGSTOP');
-    this.sleeping = true;
-  }
-
-  /**
-   * 进程唤醒
-   */
-  wakeup() {
-    if (!this.sleeping) return;
-    process.kill(this.pid, 'SIGCONT');
-    this.sleeping = false;
-  }
-
 }
 
 module.exports = ForkProcess;

package/module/jobs/child/index.js

@@ -2,46 +2,63 @@ const EventEmitter = require('events');
 const path = require('path');
 const fs = require('fs');
 const ForkProcess = require('./forkProcess');
-const Ps = require('../../utils/ps');
+const Ps = require('../../ps');
 const Loader = require('../../loader');
+const Helper = require('../../utils/helper');
 
 class ChildJob extends EventEmitter {
 
   constructor() {
     super();
-    this.jobList = new Map();
+    this.initEvents();
   }
 
   /**
-   * 运行任务
+   * 初始化监听
    */  
-  run(name, filepath, opt = {}) {
+  initEvents = () => {
+
+    // this.on('forked_message', ({data, id}) => {
+    //   this.onMessage({data, id});
+    // });
+  }
 
+  /**
+   * 执行一个job文件
+   */  
+  exec(filepath, params = {}, opt = {}) {
     const jobPath = this._getFullpath(filepath);
-    let options = Object.assign({
-      times: 1,
-      params: {
-        jobPath
-      }
-    }, opt);
 
     // 消息对象
+    const mid = Helper.getRandomString();
     let msg = {
-      jobPath: jobPath,
-      params: options.params
+      mid,
+      jobPath,
+      jobParams: params
     }
-    let subProcess;
-    for (let i = 1; i <= options.times; i++) {
-      subProcess = new ForkProcess(this, options);
-      this.jobList.set(name, i);
 
-      // 发消息到子进程
-      subProcess.child.send(msg);
-    }
+    let subProcess = new ForkProcess(this, opt);
+
+    // todo 是否会发生监听未完成时，接收不到消息？
+    // 发消息到子进程
+    subProcess.child.send(msg);
   
     return subProcess;
   }
 
+  /**
+   * todo 运行job
+   */  
+  run(name, filepath, opt = {}) {
+    let times = opt.times || 1;
+
+    for (let i = 1; i <= times; i++) {
+      this.exec(filepath, opt);
+    }
+  
+    return;
+  }
+
   _getFullpath(filepath) {
     const isAbsolute = path.isAbsolute(filepath);
     if (!isAbsolute) {
@@ -50,7 +67,7 @@ class ChildJob extends EventEmitter {
 
     const fullpath = Loader.resolveModule(filepath);
     if (!fs.existsSync(fullpath)) {
-      throw new Error(`[ee-core] [module/jobs/child] file ${fullpath} not exists`);
+      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
     }
 
     return fullpath;

package/module/jobs/childPool/app.js

@@ -0,0 +1,68 @@
+
+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() {
+    this._initEvents();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _initEvents() {
+    process.on('message', this._handleMessage.bind(this));
+    process.on('disconnect', () => {
+      Log.coreLogger.info(`[ee-core] [jobs/child] child process disconnected, pid:${process.pid}`);
+    });
+    process.on('exit', (code) => {
+      Log.coreLogger.info(`[ee-core] [jobs/child] child process exit code:${code}, pid:${process.pid}`);
+    });
+  }
+
+  /**
+   * 监听消息
+   */
+  _handleMessage(m) {
+    this.run(m);
+    Log.coreLogger.info(`[ee-core] [jobs/child] Received a message ${JSON.stringify(m)} from the mainProcess`);
+  }
+
+  /**
+   * 运行脚本
+   */  
+  run(msg = {}) {
+    let filepath = msg.jobPath;
+    let params = msg.params;
+
+    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);
+    }
+
+    Log.coreLogger.info('[ee-core] [child-process] job run');
+  }
+}
+
+new ChildApp();