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

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

@@ -7,7 +7,7 @@ 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');
 
@@ -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/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/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/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/lib/eeApp.js

@@ -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/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] [module/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] [module/httpclient] config.httpclient.httpsAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
       config.httpsAgent.timeout);
     config.httpsAgent.timeout = 30000;
   }

package/module/jobs/child/app.js

@@ -1,23 +1,43 @@
+
 const Exception = require('ee-core/module/exception');
 Exception.start();
-
 const Loader = require('ee-core/module/loader');
 const Log = require('ee-core/module/log');
 
 class ChildApp {
   constructor() {
-    const args = process.argv[2];
-    this.opt = args ? JSON.parse(args) : {};
+    this._initEvents();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _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));
+  }
+
+  /**
+   * 监听消息
+   */
+  _handleMessage(message) {
+    Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${message} from the mainProcess`);
+
+    this.run(message);
   }
 
-  run () {
-    Log.info('[child-process] run');
-    
-    const jobFile = this.opt.jobPath;
+  run(msg = {}) {
+    Log.coreLogger.info('[ee-core] [child-process] run');
 
-    Loader.loadJobFile(jobFile);
+    Loader.loadJobFile(msg.jobPath, msg.params);
   }
 }
 
-const app = new ChildApp()
-app.run();
+new ChildApp();

package/module/jobs/child/forkProcess.js

@@ -1,104 +1,82 @@
 const path = require('path');
 const { fork } = require('child_process');
+const Log = require('../../log');
+const Ps = require('../../utils/ps');
 
 class ForkProcess {
-  constructor(host, modulePath, processArgs = [], processOptions = {}) {
+  constructor(host, opt = {}) {
+
+    let processCWD = Ps.getHomeDir();
+    // if (Ps.isDev()) {
+    //   cwd = path.join(Ps.getHomeDir());
+    // }
+
+    let options = Object.assign({
+      params: {},
+      processOptions: { 
+        cwd: processCWD,
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
     this.host = host;
-    this.modulePath = modulePath;
-    this.args;
-    this.options = processOptions;
+    this.args = [];
     this.sleeping = false;
-    this.activitiesCount = 0;
-    this.activitiesMap = new Map();
 
     // 传递给子进程的参数
-    let scriptArgs = {
-      jobPath: modulePath
-    }
-    processArgs.push(JSON.stringify(scriptArgs));
-    this.args = processArgs;
-    
+    this.args.push(JSON.stringify(options.params));
+
     const appPath = path.join(__dirname, 'app.js');
-    this.child = fork(appPath, this.args, this.options);
+    this.child = fork(appPath, this.args, options.processOptions);
 
     this.pid = this.child.pid;
     this._init();
   }
 
-  /**
-   * 进程挂起
-   */
-  sleep() {
-    if (this.activitiesCount) {
-      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;
-  }
-
   /**
    * 进程初始化
    */
   _init() {
     this.child.on('message', (data) => {
-      const id = data.id;
-      this.connectionsCountMinus(id);
-      delete data.id;
-      delete data.action;
-      //this.host.emit('forked_message', {data, id});
+      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-message ${data}`);
+    });
+
+    this.child.on('disconnect', () => {
+      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-disconnect !`);
+    });
+
+    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) => {
-      // if (code !== 0 && code !== null) {
-      //   this.host.emit('forked_error', code, this.pid);
-      // } else {
-      //   this.host.emit('forked_exit', this.pid);
-      // }
+      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-exit code:${code}, signal:${signal}`);
     });
+
     this.child.on('error', (err) => {
-      console.log('forked error: ', err);
-      // this.host.emit('forked_error', err, this.pid);
+      Log.coreLogger.error(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-error :${err} !`);
     });
   }
 
   /**
-   * 向进程发消息
+   * 进程挂起
    */
-  send(params) {
-    if (this.sleeping) {
-      this.wakeup();
-    }
-    this.connectionsCountPlus(params.id);
-    this.child.send(params);
+  sleep() {
+    if (this.sleeping) return;
+    process.kill(this.pid, 'SIGSTOP');
+    this.sleeping = true;
   }
 
   /**
-   * 连接数+
+   * 进程唤醒
    */
-  _connectionsCountPlus(id) {
-    this.activitiesMap.set(id, 1);
-    this.activitiesCount += 1;
-    this.host.connectionsMap[this.pid] = this.activitiesCount;
+  wakeup() {
+    if (!this.sleeping) return;
+    process.kill(this.pid, 'SIGCONT');
+    this.sleeping = false;
   }
 
-  /**
-   * 连接数-
-   */
-  _connectionsCountMinus(id) {
-    if (this.activitiesMap.has(id)) {
-      this.activitiesCount = (this.activitiesCount > 0) ? (this.activitiesCount - 1) : 0;
-      this.activitiesMap.delete(id);
-    }
-    this.host.connectionsMap[this.pid] = this.activitiesCount;
-  }
 }
 
 module.exports = ForkProcess;

package/module/jobs/child/index.js

@@ -1,35 +1,61 @@
-//require('bytenode');
+const EventEmitter = require('events');
 const path = require('path');
+const fs = require('fs');
 const ForkProcess = require('./forkProcess');
 const Ps = require('../../utils/ps');
-const Constants = require('../../const');
+const Loader = require('../../loader');
 
-class ChildJob {
+class ChildJob extends EventEmitter {
+
+  constructor() {
+    super();
+    this.jobList = new Map();
+  }
 
   /**
-    * constructor
-    * @param  {String} name - job name
-    * @param  {String} filepath - filepath
-    * @param  {Object} opt - child process options 
-    */
-  constructor(name, filepath, opt = {}) {
-    // todo
-    //processArgs: Ps.isDev() ?  [`--inspect=${Constants.jobs.inspectStartIndex}`] : [],
+   * 运行任务
+   */  
+  run(name, filepath, opt = {}) {
+
+    const jobPath = this._getFullpath(filepath);
     let options = Object.assign({
-      processArgs: Ps.isDev() ?  [] : [],
-      processOptions: { 
-        //cwd: path.dirname(filepath),
-        env: Ps.allEnv(), 
-        stdio: 'pipe' 
+      times: 1,
+      params: {
+        jobPath
       }
     }, opt);
 
-    this.childProcess = new ForkProcess(this, filepath, options.processArgs, options.processOptions);
+    // 消息对象
+    let msg = {
+      jobPath: jobPath,
+      params: options.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);
+    }
+  
+    return subProcess;
+  }
+
+  _getFullpath(filepath) {
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
 
-    this.jobReady = false;
-    this.exec = filepath;
-    this.name = name;
+    const fullpath = Loader.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [module/jobs/child] file ${fullpath} not exists`);
+    }
+
+    return fullpath;
   }
+
 }
 
 module.exports = ChildJob;

package/module/jobs/child/pool.js

@@ -0,0 +1,67 @@
+const EventEmitter = require('events');
+const path = require('path');
+const fs = require('fs');
+const ForkProcess = require('./forkProcess');
+const Ps = require('../../utils/ps');
+const Loader = require('../../loader');
+const Log = require('../../log');
+
+class ChildJob {
+
+  /**
+    * constructor
+    */
+  constructor(name, filepath, opt) {
+    this.pools = new Map();
+    this.create(name, filepath, opt);
+  }
+
+  _initEvents() {
+    // ddd
+
+  }
+
+  create(name, filepath, opt = {}) {
+
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    const fullpath = Loader.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [module/jobs/child] file ${fullpath} not exists`);
+    }
+
+    let options = Object.assign({
+      scriptArgs: {
+        name: name,
+        jobPath: fullpath
+      },
+      processArgs: [],
+      processOptions: { 
+        //cwd: path.dirname(filepath),
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
+    const subProcess = new ForkProcess(this, options);
+    this.pools.set(subProcess.pid, subProcess);
+
+    return subProcess;
+  }
+
+  sendToChild(pid, message, ...other) {
+    if (!this.pools.has(pid)) {
+      Log.coreLogger.warn(`[ee-core] [module/jobs/child] process dose not exist  ${pid}`);
+      return;
+    }
+    const subProcess = this.pools.get(pid);
+    subProcess.child.send(message, ...other);
+    return
+  }
+
+}
+
+module.exports = ChildJob;

package/module/jobs/index.js

@@ -1,56 +1,7 @@
-const path = require('path');
-const fs = require('fs');
-const RendererJob = require('./renderer');
 const ChildJob = require('./child');
-const Utils = require('../utils');
-const Loader = require('../loader');
-
-class Jobs  {
-  constructor() {
-    this.type = undefined;
-    this.instance = undefined;
-  }
-
-  /**
-   * 创建 job
-   */
-  create (name, opt = {}) {
-    this.type = opt.type || 'child';
-    this.dev = opt.dev || false;
-    this.winOptions = opt.winOptions || {};
-    this.childOptions = opt.childOptions || {};
-    this.path = opt.path || null;
-
-
-    const isAbsolute = path.isAbsolute(this.path);
-    if (!isAbsolute) {
-      this.path = path.join(Utils.getBaseDir(), this.path);
-    }
-    const filepath = Loader.resolveModule(this.path);
-
-    if (!fs.existsSync(filepath)) {
-      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
-    }
-    
-    this.path = filepath;
-    if (this.type == 'child') {
-      this.instance = new ChildJob(name, filepath, this.childOptions);
-    } else if (this.type == 'renderer') {
-      this.instance = new RendererJob(name, filepath, this.winOptions);
-      if (this.dev) {
-        this.openDevTools();
-      }
-    }
-    
-    return;
-  }
-
-  /**
-   * 显示开发者工具栏（仅支持 RendererJob)
-   */
-  openDevTools () {
-    this.instance.openDevTools();
-  }
-}
+const RendererJob = require('./renderer');
 
-module.exports = Jobs;
+module.exports = {
+  ChildJob,
+  RendererJob
+};

package/module/jobs/unification.js

@@ -0,0 +1,64 @@
+const path = require('path');
+const fs = require('fs');
+const RendererJob = require('./renderer');
+const ChildJob = require('./child/pool');
+const Ps = require('../utils/ps');
+const Loader = require('../loader');
+
+class Jobs  {
+  constructor() {
+    this.type;
+    this.dev;
+    this.path;
+    this.instance;
+    this.child;
+    this.childOptions;
+    this.renderer;
+    this.winOptions;
+  }
+
+  /**
+   * 创建 job
+   */
+  create (name, opt = {}) {
+    this.type = opt.type || 'child';
+    this.dev = opt.dev || false;
+    this.winOptions = opt.winOptions || {};
+    this.childOptions = opt.childOptions || {};
+    this.path = opt.path || null;
+
+    const isAbsolute = path.isAbsolute(this.path);
+    if (!isAbsolute) {
+      this.path = path.join(Ps.getBaseDir(), this.path);
+    }
+    const filepath = Loader.resolveModule(this.path);
+
+    if (!fs.existsSync(filepath)) {
+      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
+    }
+    
+    this.path = filepath;
+    if (this.type == 'child') {
+      this.instance = new ChildJob(name, filepath, this.childOptions);
+      this.child = this.instance;
+    } else if (this.type == 'renderer') {
+      this.instance = new RendererJob(name, filepath, this.winOptions);
+      this.renderer = this.instance;
+
+      if (this.dev) {
+        this.openDevTools();
+      }
+    }
+    
+    return;
+  }
+
+  /**
+   * 显示开发者工具栏（仅支持 RendererJob)
+   */
+  openDevTools () {
+    this.instance.openDevTools();
+  }
+}
+
+module.exports = Jobs;

package/module/loader/index.js

@@ -45,7 +45,7 @@ module.exports = {
    */
   loadJobFile (filepath, ...inject) {
     if (!fs.existsSync(filepath)) {
-      let warnMsg = `[ee-core] [module/loader/index] loadJobFile ${filepath} does not exist`;
+      let warnMsg = `[ee-core] [module/loader] loadJobFile ${filepath} does not exist`;
       Log.coreLogger.error(warnMsg);
     }
 
@@ -75,7 +75,7 @@ module.exports = {
 
       if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
         let files = { filepath, fullpath }
-        Log.coreLogger.warn(`[ee-core] [module-loader-resolveModule] unknow filepath: ${files}`)
+        Log.coreLogger.warn(`[ee-core] [module/loader] resolveModule unknow filepath: ${files}`)
         return undefined;
       }
     }
@@ -99,7 +99,7 @@ module.exports = {
 
     fullpath = this.resolveModule(filepath);
     if (!fs.existsSync(fullpath)) {
-      let errorMsg = `[ee-core] [module-loader-index] requireModule filepath: ${filepath} does not exist`;
+      let errorMsg = `[ee-core] [module/loader] requireModule filepath: ${filepath} does not exist`;
       Log.coreLogger.error(errorMsg);
     }
     const ret = UtilsCore.loadFile(fullpath);

package/module/message/childMessage.js

@@ -0,0 +1,63 @@
+const Log = require('../log');
+
+/**
+  * ChildMessage
+  */
+class ChildMessage {
+  constructor() {
+    // ...
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  initEvents() {
+    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} !`);
+    });
+  }
+
+  /**
+   * 监听消息
+   */
+  onMessage(handle) {
+    Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${params} from the mainProcess`);
+
+    process.on('message', handle.bind(this));
+  }
+
+  /**
+   * 消息处理
+   */
+  // _handleMessage(params = {}) {
+  //   Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${params} from the mainProcess`);
+  // }
+
+  /**
+   * 向主进程发消息
+   */
+  sendToMain(message, ...other) {
+    return process.send(message, ...other);
+  }
+
+  /**
+   * 断开连接
+   */
+  disconnect() {
+    process.disconnect();
+  }
+
+  /**
+   * 进程退出
+   */
+  exit() {
+    process.exit();
+  }
+}
+
+
+
+module.exports = ChildMessage;

package/module/message/index.js

@@ -1,13 +1,28 @@
-const { isDev, isRenderer, isMain } = require('../utils/ps');
+const Ps = require('../utils/ps');
+const EEChildMessage = Symbol('EeCore#Module#ChildMessage');
 
-const m = {};
+const message = {
 
-if (isMain) {
-  m.d = require();
-}
+  /**
+   * 
+   */
+  create () {
 
-if (isRenderer) {
-  m.d = require();
-}
+  },
 
-module.exports = m;
+  /**
+   * childMessage
+   */
+  get childMessage() {
+    if (!this[EEChildMessage]) {
+      this[EEChildMessage] = Logger.create();
+    }
+
+    return this[EEChildMessage] || null;
+  },
+
+};
+
+
+
+module.exports = message;

package/module/socket/httpServer.js

@@ -9,6 +9,7 @@ const https = require('https');
 const fs = require('fs');
 const path = require('path');
 const _ = require('lodash');
+const Log = require('../log');
 
 /**
  * http server
@@ -60,16 +61,16 @@ class HttpServer {
       })
       .use(this.dispatch);
 
-    let msg = '[ee-core:http:server] server is: ' + url;
+    let msg = '[ee-core] [module/socket/httpServer] server is: ' + url;
     if (isHttps) {
       https.createServer(sslOptions, koaApp.callback()).listen(httpServer.port, (err) => {
         msg = err ? err : msg;
-        self.app.coreLogger.info(msg);
+        Log.coreLogger.info(msg);
       });
     } else {
       koaApp.listen(httpServer.port, (e) => {
         msg = e ? e : msg;
-        self.app.coreLogger.info(msg);
+        Log.coreLogger.info(msg);
       });
     }  
   }

package/module/socket/ipcServer.js

@@ -1,5 +1,4 @@
 const debug = require('debug')('ee-core:ipcServer');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const is = require('is-type-of');
 const { ipcMain } = require('electron');
 const path = require('path');
@@ -7,18 +6,16 @@ const fs = require('fs');
 const globby = require('globby');
 const Utils = require('../../core/lib/utils');
 const Wrap = require('../utils/wrap');
+const Log = require('../log');
 
 class IpcServer {
   constructor (app) {
-
     this.app = app;
-    this.consoleLogger = new EggConsoleLogger();
-    this.consoleLogger.info('[ee-core:socket:ipcMain] start ipcMain');
     this.register();
   }
 
   register () {
-    this.consoleLogger.info('[ee-core:socket:ipcMain] register channels');
+    console.log('[ee-core] [module/socket/IpcServer] register channels');
 
     const self = this;
     // 遍历方法
@@ -78,7 +75,7 @@ class IpcServer {
             
             return fn;
           } catch (err) {
-            app.logger.error('[ee:socket:ipcMain] throw error:', err);
+            Log.coreLogger.error('[ee-core] [module/socket/IpcServer] throw error:', err);
           }
           return null;
         }

package/module/socket/socketClient.js

@@ -3,19 +3,16 @@
 const assert = require('assert');
 const IoClient = require('socket.io-client');
 const Constants = require('../const');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const Storage = require('../storage');
 
 class SocketClient {
   constructor (port) {
-    this.consoleLogger = new EggConsoleLogger();
     port = port ? parseInt(port) : this.getSocketcPort();
 
     assert(typeof port === 'number', 'port required, and must be a number');
-    this.consoleLogger.info('[ee-core:socket:client] start client');
     
     const url  = 'http://127.0.0.1:' + port;
-    this.consoleLogger.info('[ee-core:socket:client] url:', url);
+    console.log('[ee-core] [module/socket/socketClient] url:', url);
     this.client = IoClient(url);
   }
 

package/module/socket/socketServer.js

@@ -2,10 +2,10 @@
 
 const assert = require('assert');
 const { Server } = require('socket.io');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const is = require('is-type-of');
 const Storage = require('../storage');
 const Constants = require('../const');
+const Log = require('../log');
 
 /**
  * socket server
@@ -14,7 +14,6 @@ class SocketServer {
   constructor (app) {
     this.app = app;
     const options = this.app.config.socketServer;
-    this.consoleLogger = new EggConsoleLogger();
 
     if (!options.enable) {
       return;
@@ -22,7 +21,7 @@ class SocketServer {
 
     let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketPort());
     assert(typeof port === 'number', 'socekt port required, and must be a number');
-    this.consoleLogger.info('[ee-core:socket:server] socket server port is:', port);
+    this.consoleLogger.info('[ee-core] [module/socket/socketServer] port is:', port);
 
     // let opt = Object.assign({}, options);
     // delete opt.enable;
@@ -32,11 +31,10 @@ class SocketServer {
 
   connec () {
     const self = this;
-    this.consoleLogger.info('[ee-core:socket:server] connection .....');
     this.io.on('connection', (socket) => {
       const channel = Constants.socketIo.channel.partySoftware;
       socket.on(channel, async (message, callback) => {
-        self.consoleLogger.info('[ee-core:socket:server] socket id:' + socket.id + ' message cmd: ' + message.cmd);
+        console.log('[ee-core] [module/socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
 
         try {
           // 找函数
@@ -57,7 +55,7 @@ class SocketServer {
           const result = await fn.call(self.app, args);
           callback(result);
         } catch (err) {
-          self.app.console.error('[ee-core:socket:server] throw error:', err);
+          Log.coreLogger.error('[ee-core] [module/socket/socketServer] throw error:', err);
         }
       });
     });

package/module/utils/index.js

@@ -1,24 +1,14 @@
 const path = require('path');
-const eis = require('electron-is');
 const Storage = require('../storage');
 const Constants = require('../const');
 const Ps = require('./ps');
-const Helper = require('./helper');
 const UtilsJson = require('./json');
-const Copy = require('./copyto');
-
-/**
- * other module
- */
-Copy(Ps)
-.and(Helper)
-.to(exports);
 
 /**
  * 获取项目根目录package.json
  */
 exports.getPackage = function() {
-  const json = UtilsJson.readSync(path.join(this.getHomeDir(), 'package.json'));
+  const json = UtilsJson.readSync(path.join(Ps.getHomeDir(), 'package.json'));
   
   return json;
 };
@@ -93,28 +83,4 @@ exports.getSocketChannel = function() {
   return Constants.socketIo.channel;
 }
 
-/**
- * 获取 额外资源目录
- */
-exports.getExtraResourcesDir = function() {
-  const execDir = this.getExecDir();
-  const isPackaged = this.isPackaged();
-
-
-  // 资源路径不同
-  let dir = '';
-  if (isPackaged) {
-    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
-    // windows和MacOs不一样
-    dir = path.join(execDir, "resources", "extraResources");
-    if (eis.macOS()) {
-      dir = path.join(execDir, "..", "Resources", "extraResources");
-    }
-  } else {
-    // 打包前
-    dir = path.join(execDir, "build", "extraResources");
-  }
-  return dir;
-}
-
 

package/module/utils/ps.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const eis = require('electron-is');
 
 /**
  * 当前进程的所有env
@@ -125,6 +126,30 @@ exports.getElectronDir = function() {
   return process.env.EE_BASE_DIR;
 }
 
+/**
+ * 获取 额外资源目录
+ */
+exports.getExtraResourcesDir = function() {
+  const execDir = this.getExecDir();
+  const isPackaged = this.isPackaged();
+
+
+  // 资源路径不同
+  let dir = '';
+  if (isPackaged) {
+    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
+    // windows和MacOs不一样
+    dir = path.join(execDir, "resources", "extraResources");
+    if (eis.macOS()) {
+      dir = path.join(execDir, "..", "Resources", "extraResources");
+    }
+  } else {
+    // 打包前
+    dir = path.join(execDir, "build", "extraResources");
+  }
+  return dir;
+}
+
 /**
  * 获取 appUserData目录
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/tools/encrypt.js

@@ -7,7 +7,7 @@ const is = require('is-type-of');
 const bytenode = require('bytenode');
 const crypto = require('crypto');
 const JavaScriptObfuscator = require('javascript-obfuscator');
-const utilsJson = require('../module/utils/json');
+const UtilsJson = require('../module/utils/json');
 
 class Encrypt {
   constructor() {
@@ -41,20 +41,20 @@ class Encrypt {
         this.dirs.push(directory[i]);
       }
     }
-    console.log('[ee-core] [encrypt] dirs:', this.dirs);
+    console.log('[ee-core] [tools/encrypt] dirs:', this.dirs);
   }
 
   /**
    * 备份 electron 目录代码
    */
   backup () {
-    console.log('[ee-core] [encrypt] backup start');
+    console.log('[ee-core] [tools/encrypt] backup start');
 
     for (let i = 0; i < this.dirs.length; i++) {
       // check code dir
       let codeDirPath = path.join(this.basePath, this.dirs[i]);
       if (!fs.existsSync(codeDirPath)) {
-        console.log('[ee-core] [encrypt] ERROR: backup %s is not exist', codeDirPath);
+        console.log('[ee-core] [tools/encrypt] ERROR: backup %s is not exist', codeDirPath);
         return
       }
 
@@ -64,7 +64,7 @@ class Encrypt {
       this.rmBackup(targetDir);
 
       // copy
-      console.log('[ee-core] [encrypt] backup target Dir:', targetDir);
+      console.log('[ee-core] [tools/encrypt] backup target Dir:', targetDir);
       if (!fs.existsSync(targetDir)) {
         this.mkdir(targetDir);
         this.chmodPath(targetDir, '777');
@@ -72,7 +72,7 @@ class Encrypt {
 
       fsPro.copySync(codeDirPath, targetDir);
     }
-    console.log('[ee-core] [encrypt] backup end');
+    console.log('[ee-core] [tools/encrypt] backup end');
     return true;
   }
   
@@ -86,7 +86,7 @@ class Encrypt {
         const content = {
           nameMap: {}
         };
-        utilsJson.writeSync(this.tmpFile, content);
+        UtilsJson.writeSync(this.tmpFile, content);
       }
     }
 
@@ -97,13 +97,13 @@ class Encrypt {
    * 加密代码
    */
   encrypt () {
-    console.log('[ee-core] [encrypt] start ciphering');
+    console.log('[ee-core] [tools/encrypt] start ciphering');
     for (let i = 0; i < this.dirs.length; i++) {
       let codeDirPath = path.join(this.encryptCodeDir, this.dirs[i]);
       this.loop(codeDirPath);
     }
 
-    console.log('[ee-core] [encrypt] end ciphering');
+    console.log('[ee-core] [tools/encrypt] end ciphering');
   };
 
   /**
@@ -183,7 +183,7 @@ class Encrypt {
    */
   rmBackup (dir) {
     if (fs.existsSync(dir)) {
-      console.log('[ee-core] [encrypt] clean old directory:', dir);
+      console.log('[ee-core] [tools/encrypt] clean old directory:', dir);
       fsPro.removeSync(dir);
     }
     return;

package/tools/replaceDist.js

@@ -14,7 +14,7 @@ const fsPro = require('fs-extra');
    * 执行
    */  
   run () {
-    console.log('[ee-core] [replace_dist] 开始移动资源');
+    console.log('[ee-core] [tools/rd] 开始移动资源');
     const homeDir = process.cwd();
 
     // argv
@@ -30,7 +30,7 @@ const fsPro = require('fs-extra');
       try {
         return fs.statSync(filePath).isFile();
       } catch (err) {
-        console.error('[ee-core] [replace_dist] ERROR ', err);
+        console.error('[ee-core] [tools/rd] ERROR ', err);
         return false;
       }
     };
@@ -39,7 +39,7 @@ const fsPro = require('fs-extra');
     const sourceIndexFile = path.join(sourceDir, 'index.html');
     
     if (!fileExist(sourceIndexFile)) {
-      console.error('[ee-core] [replace_dist] ERROR 前端资源不存在，请构建!!!');
+      console.error('[ee-core] [tools/rd] ERROR 前端资源不存在，请构建!!!');
       return
     }
     
@@ -48,12 +48,12 @@ const fsPro = require('fs-extra');
 
     // 清空历史资源
     fs.rmdirSync(eeResourceDir, {recursive: true});
-    console.log('[ee-core] [replace_dist] 清空历史资源:', eeResourceDir);
+    console.log('[ee-core] [tools/rd] 清空历史资源:', eeResourceDir);
 
     fsPro.copySync(sourceDir, eeResourceDir);
-    console.log('[ee-core] [replace_dist] 复制资源到:', eeResourceDir);
+    console.log('[ee-core] [tools/rd] 复制资源到:', eeResourceDir);
 
-    console.log('[ee-core] [replace_dist] 结束');
+    console.log('[ee-core] [tools/rd] 结束');
   }
 }
 

package/utils/index.js

@@ -3,7 +3,6 @@
  */
 
 const path = require('path');
-const eis = require('electron-is');
 const UtilsJson = require('../module/utils/json');
 const UtilsPs = require('../module/utils/ps');
 const UtilsHelper = require('../module/utils/helper');
@@ -105,25 +104,3 @@ exports.getSocketPort = function() {
 exports.getSocketChannel = function() {
   return Constants.socketIo.channel;
 }
-
-/**
- * 获取 额外资源目录
- */
-exports.getExtraResourcesDir = function() {
-  const execDir = this.getExecDir();
-
-  // 资源路径不同
-  let dir = '';
-  if (config.isPackaged) {
-    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
-    // windows和MacOs不一样
-    dir = path.join(execDir, "resources", "extraResources");
-    if (eis.macOS()) {
-      dir = path.join(execDir, "..", "Resources", "extraResources");
-    }
-  } else {
-    // 打包前
-    dir = path.join(execDir, "build", "extraResources");
-  }
-  return dir;
-}