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

package/module/jobs/child/index.js

@@ -1,33 +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 = {}) {
+   * 运行任务
+   */  
+  run(name, filepath, opt = {}) {
+
+    const jobPath = this._getFullpath(filepath);
     let options = Object.assign({
-      processArgs: Ps.isDev() ?  [`--inspect=${Constants.jobs.inspectStartIndex}`] : [],
-      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,55 +1,7 @@
-const path = require('path');
-const fs = require('fs');
-const assert = require('assert');
-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(), 'jobs', this.path);
-    }
-    const filepath = Loader.resolveModule(this.path);
-
-    assert(fs.existsSync(filepath), `file ${filepath} 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

@@ -3,6 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const UtilsCore = require('../../core/lib/utils');
 const Ps = require('../utils/ps');
+const Log = require('../log');
 
 module.exports = {
 
@@ -14,10 +15,17 @@ module.exports = {
    * @return {Object} exports
    * @since 1.0.0
    */
-  loadFile (filepath, ...inject) {
+  loadOneFile (filepath, ...inject) {
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
     filepath = filepath && this.resolveModule(filepath);
-    if (!filepath) {
-      return null;
+    if (!fs.existsSync(filepath)) {
+      let errorMsg = `[ee-core] [module/loader/index] loadOneFile ${filepath} does not exist`;
+      Log.coreLogger.error(errorMsg);
+      throw new Error(errorMsg);
     }
 
     const ret = UtilsCore.loadFile(filepath);
@@ -28,26 +36,51 @@ module.exports = {
   },
 
   /**
-   * 模块的绝对路径
+   * 加载job文件
+   *
+   * @param {String} filepath - fullpath
+   * @param {Array} inject - pass rest arguments into the function when invoke
+   * @return {Object} exports
+   * @since 1.0.0
    */
-  resolveModule(filepath) {
-    const isAbsolute = path.isAbsolute(filepath);
-    if (!isAbsolute) {
-      filepath = path.join(Ps.getBaseDir(), 'jobs', filepath);
+  loadJobFile (filepath, ...inject) {
+    if (!fs.existsSync(filepath)) {
+      let warnMsg = `[ee-core] [module/loader] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(warnMsg);
+    }
+
+    const ret = UtilsCore.loadFile(filepath);
+    if (is.function(ret) && !is.class(ret) && !UtilsCore.isBytecodeClass(ret)) {
+      ret = ret(...inject);
     }
+    return ret;
+  },  
 
-    let fullPath;
+  /**
+   * 模块的绝对路径
+   * @param {String} filepath - fullpath
+   */
+  resolveModule(filepath) {
+    let fullpath;
     try {
-      fullPath = require.resolve(filepath);
+      fullpath = require.resolve(filepath);
     } catch (e) {
-      let jscFile = filepath + '.jsc';
-      if (fs.existsSync(jscFile)) {
-        return jscFile;
+
+      // 特殊后缀处理
+      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)) {
+        let files = { filepath, fullpath }
+        Log.coreLogger.warn(`[ee-core] [module/loader] resolveModule unknow filepath: ${files}`)
+        return undefined;
       }
-      return undefined;
     }
 
-    return fullPath;
+    return fullpath;
   },
 
   /**
@@ -57,16 +90,35 @@ module.exports = {
    * @return {Object} exports
    * @since 1.0.0
    */
-  requireModule (filepath) {
-    filepath = filepath && this.resolveModule(filepath);
-    if (!filepath) {
-      return null;
+  requireModule (filepath, type = '') {
+    let fullpath;
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), type, filepath);
     }
-    const ret = UtilsCore.loadFile(filepath);
+
+    fullpath = this.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      let errorMsg = `[ee-core] [module/loader] requireModule filepath: ${filepath} does not exist`;
+      Log.coreLogger.error(errorMsg);
+    }
+    const ret = UtilsCore.loadFile(fullpath);
 
     return ret;
   },  
 
+  /**
+   * 加载jobs模块(子进程中使用)
+   *
+   * @param {String} filepath - fullpath
+   * @return {Object} exports
+   * @since 1.0.0
+   */
+  requireJobsModule (filepath) {
+    const ret = this.requireModule(filepath, 'jobs');
+
+    return ret;
+  }, 
 }
 
 

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/storage/index.js

@@ -4,8 +4,12 @@ const DB = {};
 
 DB.connection = function (database, options = {}) {
   let driver = options.driver || 'jsondb';
+  
+  // 兼容之前api
+  driver = driver == 'lowdb' ? 'jsondb' : driver;
+
   let opt = options.default || {};
-  if (!_.includes(['jsondb', 'lowdb', 'sqlite'], driver)) {
+  if (!_.includes(['jsondb', 'sqlite'], driver)) {
     assert(database, `db driver ${driver} is not supported`);
   }
   if (_.isEmpty(database)) {
@@ -21,9 +25,7 @@ DB.connection = function (database, options = {}) {
       const SqliteStorage = require('./sqliteStorage');
       storage = new SqliteStorage(database, opt);
       break;
-    default:  
-      const JsondbStorage = require('./jsondbStorage');
-      storage = new JsondbStorage(database);
+    default:
   }
 
   return storage;