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

package/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/jobs/child/app.js

@@ -0,0 +1,63 @@
+
+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/exception');
+  Loader = require('ee-core/loader');
+  Log = require('ee-core/log');
+  UtilsCore = require('../../core/lib/utils');
+}
+
+Exception.start();
+
+class ChildApp {
+  constructor() {
+    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(msg = {}) {
+    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);
+    }
+  }
+}
+
+new ChildApp();

package/jobs/child/forkProcess.js

@@ -0,0 +1,61 @@
+const path = require('path');
+const { fork } = require('child_process');
+const serialize = require('serialize-javascript');
+const Log = require('../../log');
+const Ps = require('../../ps');
+const Channel = require('../../const/channel');
+
+class ForkProcess {
+  constructor(host, opt = {}) {
+    
+    let options = Object.assign({
+      processOptions: { 
+        cwd: Ps.getHomeDir(),
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
+    this.host = host;
+    this.args = [];
+    this.sleeping = false;
+
+    // 传递给子进程的参数
+    //this.args.push(JSON.stringify(options.params));
+
+    const appPath = path.join(__dirname, 'app.js');
+    this.child = fork(appPath, this.args, options.processOptions);
+
+    this.pid = this.child.pid;
+    this._init();
+  }
+
+  /**
+   * 进程初始化
+   */
+  _init() {
+    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}`);
+      }
+
+      // 收到子进程消息，转发到 event 
+      if (m.channel == Channel.process.sendToMain) {
+        this.host.emit(m.event, m.data);
+      }
+
+    });
+
+    this.child.on('exit', (code, 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] [jobs/child] received a error from child-process, error: ${err} !`);
+    });
+  }
+
+}
+
+module.exports = ForkProcess;

package/jobs/child/index.js

@@ -0,0 +1,78 @@
+const EventEmitter = require('events');
+const path = require('path');
+const fs = require('fs');
+const ForkProcess = require('./forkProcess');
+const Ps = require('../../ps');
+const Loader = require('../../loader');
+const Helper = require('../../utils/helper');
+
+class ChildJob extends EventEmitter {
+
+  constructor() {
+    super();
+    this.initEvents();
+  }
+
+  /**
+   * 初始化监听
+   */  
+  initEvents = () => {
+
+    // this.on('forked_message', ({data, id}) => {
+    //   this.onMessage({data, id});
+    // });
+  }
+
+  /**
+   * 执行一个job文件
+   */  
+  exec(filepath, params = {}, opt = {}) {
+    const jobPath = this._getFullpath(filepath);
+
+    // 消息对象
+    const mid = Helper.getRandomString();
+    let msg = {
+      mid,
+      jobPath,
+      jobParams: params
+    }
+
+    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) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
+    const fullpath = Loader.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      throw new Error(`[ee-core] [jobs/child] file ${fullpath} not exists`);
+    }
+
+    return fullpath;
+  }
+
+}
+
+module.exports = ChildJob;

package/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/exception');
+  Loader = require('ee-core/loader');
+  Log = require('ee-core/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();

package/{module/jobs/child → jobs/childPool}/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,24 +34,27 @@ 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/forkProcess] from childProcess event-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 !`);
+      Log.coreLogger.info(`[ee-core] [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}`);
+      Log.coreLogger.info(`[ee-core] [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/forkProcess] from childProcess event-exit 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/forkProcess] from childProcess event-error: ${err} !`);
     });
   }
 

package/{module/jobs/child → jobs/childPool}/index.js

@@ -2,8 +2,9 @@ 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 {
 
@@ -13,35 +14,44 @@ class ChildJob extends EventEmitter {
   }
 
   /**
-   * 运行任务
+   * 执行一个job文件
    */  
-  run(name, filepath, opt = {}) {
-
+  exec(filepath, opt = {}) {
     const jobPath = this._getFullpath(filepath);
     let options = Object.assign({
-      times: 1,
-      params: {
-        jobPath
-      }
+      params: {},
     }, opt);
 
     // 消息对象
+    const mid = Helper.getRandomString();
     let msg = {
-      jobPath: jobPath,
+      mid,
+      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);
-    }
+    let subProcess = new ForkProcess(this, options);
+
+    // 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 +60,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/child → jobs/childPool}/pool.js

@@ -2,7 +2,7 @@ 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 Log = require('../../log');
 
@@ -30,7 +30,7 @@ class ChildJob {
 
     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`);
     }
 
     let options = Object.assign({
@@ -54,7 +54,7 @@ class ChildJob {
 
   sendToChild(pid, message, ...other) {
     if (!this.pools.has(pid)) {
-      Log.coreLogger.warn(`[ee-core] [module/jobs/child] process dose not exist  ${pid}`);
+      Log.coreLogger.warn(`[ee-core] [jobs/child] process dose not exist  ${pid}`);
       return;
     }
     const subProcess = this.pools.get(pid);

package/{module/jobs → jobs}/renderer/loadView.js

@@ -1,4 +1,4 @@
-const Ps = require('../../utils/ps');
+const Ps = require('../../ps');
 
 /**
   * loadView 生成BrowserWindow的html content

package/{module/jobs → jobs}/unification.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const RendererJob = require('./renderer');
 const ChildJob = require('./child/pool');
-const Ps = require('../utils/ps');
+const Ps = require('../ps');
 const Loader = require('../loader');
 
 class Jobs  {

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

@@ -1,8 +1,8 @@
 const is = require('is-type-of');
 const fs = require('fs');
 const path = require('path');
-const UtilsCore = require('../../core/lib/utils');
-const Ps = require('../utils/ps');
+const UtilsCore = require('../core/lib/utils');
+const Ps = require('../ps');
 const Log = require('../log');
 
 module.exports = {
@@ -23,7 +23,7 @@ module.exports = {
 
     filepath = filepath && this.resolveModule(filepath);
     if (!fs.existsSync(filepath)) {
-      let errorMsg = `[ee-core] [module/loader/index] loadOneFile ${filepath} does not exist`;
+      let errorMsg = `[ee-core] [loader/index] loadOneFile ${filepath} does not exist`;
       Log.coreLogger.error(errorMsg);
       throw new Error(errorMsg);
     }
@@ -36,26 +36,48 @@ module.exports = {
   },
 
   /**
-   * 加载job文件
+   * 加载js文件
    *
    * @param {String} filepath - fullpath
-   * @param {Array} inject - pass rest arguments into the function when invoke
-   * @return {Object} exports
+   * @return {Any} exports
    * @since 1.0.0
    */
-  loadJobFile (filepath, ...inject) {
+  loadJsFile (filepath) {
     if (!fs.existsSync(filepath)) {
-      let warnMsg = `[ee-core] [module/loader] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(warnMsg);
+      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(errMsg);
+      return;
     }
 
     const ret = UtilsCore.loadFile(filepath);
-    if (is.function(ret) && !is.class(ret) && !UtilsCore.isBytecodeClass(ret)) {
-      ret = ret(...inject);
-    }
     return ret;
   },  
 
+  /**
+   * 加载并运行js文件
+   *
+   * @param {String} filepath - fullpath
+   * @param {Array} inject - pass rest arguments into the function when invoke
+   * @return {Any}
+   * @since 1.0.0
+   */
+  execJsFile (filepath, ...inject) {
+    if (!fs.existsSync(filepath)) {
+      let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(errMsg);
+      return;
+    }
+
+    let ret = UtilsCore.loadFile(filepath);
+    if (is.class(ret) || UtilsCore.isBytecodeClass(ret)) {
+      ret = new ret(inject);
+    } else if (is.function(ret)) {
+      ret = ret(inject);
+    }
+
+    return ret;
+  }, 
+
   /**
    * 模块的绝对路径
    * @param {String} filepath - fullpath
@@ -75,7 +97,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] [loader] resolveModule unknow filepath: ${files}`)
         return undefined;
       }
     }
@@ -99,7 +121,7 @@ module.exports = {
 
     fullpath = this.resolveModule(filepath);
     if (!fs.existsSync(fullpath)) {
-      let errorMsg = `[ee-core] [module/loader] requireModule filepath: ${filepath} does not exist`;
+      let errorMsg = `[ee-core] [loader] requireModule filepath: ${filepath} does not exist`;
       Log.coreLogger.error(errorMsg);
     }
     const ret = UtilsCore.loadFile(fullpath);

package/{module/log → log}/logger.js

@@ -1,6 +1,6 @@
 const Loggers = require('egg-logger').EggLoggers;
 const assert = require('assert');
-const Ps = require('../utils/ps');
+const Ps = require('../ps');
 const Storage = require('../storage');
 
 module.exports = {

package/message/childMessage.js

@@ -0,0 +1,31 @@
+const Channel = require('../const/channel');
+
+class ChildMessage {
+  constructor() {
+    // ...
+  }
+
+  /**
+   * 向主进程发消息
+   */
+  sendToMain(eventName, params = {}) {
+    let message = {
+      channel: Channel.process.sendToMain,
+      event: eventName,
+      data: params,
+    }
+
+    return process.send(message);
+  }
+
+  /**
+   * 进程退出
+   */
+  exit(code = 0) {
+    return process.exit(code);
+  }
+}
+
+
+
+module.exports = ChildMessage;

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

@@ -1,21 +1,14 @@
-const Ps = require('../utils/ps');
+const ChildMessage = require('./childMessage');
 const EEChildMessage = Symbol('EeCore#Module#ChildMessage');
 
 const message = {
 
-  /**
-   * 
-   */
-  create () {
-
-  },
-
   /**
    * childMessage
    */
   get childMessage() {
     if (!this[EEChildMessage]) {
-      this[EEChildMessage] = Logger.create();
+      this[EEChildMessage] = new ChildMessage();
     }
 
     return this[EEChildMessage] || null;
@@ -23,6 +16,4 @@ const message = {
 
 };
 
-
-
 module.exports = message;