ee-core 2.10.1 → 2.11.0-beta.1

package/addon/window/index.js

@@ -1,4 +1,5 @@
 const { BrowserWindow } = require('electron');
+const extend = require('../../utils/extend');
 
 /**
  * 窗口插件
@@ -23,9 +24,8 @@ class WinAddon {
     // if (this.windowContentsIdMap.hasOwnProperty(name)) {
     //   throw new Error(`[addon] [window] Name: ${name} already exists!`);
     // }
-
-    // [todo] 使用 extend, 避免多维对象被覆盖 
-    const options = Object.assign({
+ 
+    const options = extend(true, {}, {
       x: 10,
       y: 10,
       width: 980, 

package/controller/baseContextClass.js

@@ -3,31 +3,22 @@
 /**
  * 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
+   * @since 1.1.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;
+
+    // todo 兼容旧版本，后续废弃ctx
+    if (typeof ctx === 'object') {
+      this.app = ctx;
+      this.config = ctx.config;
+      this.service = ctx.service;
+    }
   }
 }
 

package/controller/index.js

@@ -3,31 +3,22 @@
 /**
  * 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
+   * @since 1.1.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;
+
+    // todo 兼容旧版本，后续废弃ctx
+    if (typeof ctx === 'object') {
+      this.app = ctx;
+      this.config = ctx.config;
+      this.service = ctx.service;
+    }
   }
 }
 

package/cross/spawnProcess.js

@@ -95,7 +95,8 @@ class SpawnProcess {
         pid: this.pid
       }
       this.host.emitter.emit(Channel.events.childProcessExit, data);
-      Log.coreLogger.info(`[ee-core] [corss/process] received a exit from child-process, code:${code}, signal:${signal}, pid:${this.pid}`);
+      // Child process closed: The child process was killed externally or an internal error caused the application to stop, resulting in the application exiting
+      Log.coreLogger.info(`[ee-core] [corss/process] received a exit from child-process, code:${code}, signal:${signal}, pid:${this.pid}, cmd:${cmdPath}, args: ${cmdArgs}`);
       this._exitElectron();
     });
 

package/jobs/child/app.js

@@ -11,6 +11,7 @@ const commands = ['run'];
 class ChildApp {
   constructor() {
     this._initEvents();
+    this.jobMap = new Map();
   }
 
   /**
@@ -43,15 +44,20 @@ class ChildApp {
    * 运行脚本
    */  
   run(msg = {}) {
-    let filepath = msg.jobPath;
-    let params = msg.jobParams;
-
-    let mod = Loader.loadJsFile(filepath);
+    const {jobPath, jobParams, jobFunc, jobFuncParams} = msg;
+    let mod = Loader.loadJsFile(jobPath);
     if (is.class(mod) || UtilsCore.isBytecodeClass(mod)) {
-      let jobClass = new mod(params);
-      jobClass.handle();
+      if (!this.jobMap.has(jobPath)) {
+        const instance = new mod(...jobParams);
+        instance.handle(...jobParams);
+        this.jobMap.set(jobPath, instance);
+      } else {
+        const instance = this.jobMap.get(jobPath);
+        instance[jobFunc](...jobFuncParams);
+      }
+
     } else if (is.function(mod)) {
-      mod(params);
+      mod(jobParams);
     }
   }
 }

package/jobs/child/forkProcess.js

@@ -6,6 +6,7 @@ const Log = require('../../log');
 const Ps = require('../../ps');
 const Channel = require('../../const/channel');
 const Helper = require('../../utils/helper');
+const Loader = require('../../loader');
 
 class ForkProcess {
   constructor(host, opt = {}) {
@@ -98,7 +99,7 @@ class ForkProcess {
   /**
    * 分发任务
    */
-  dispatch(cmd, jobPath = '', params = {}) {
+  dispatch(cmd, jobPath = '', ...params) {
     // 消息对象
     const mid = Helper.getRandomString();
     let msg = {
@@ -113,6 +114,24 @@ class ForkProcess {
     this.child.send(msg);
   }
 
+  /**
+   * 调用job的方法
+   */
+  callFunc(jobPath = '', funcName = '', ...params) {
+    jobPath = Loader.getFullpath(jobPath);
+
+    // 消息对象
+    const mid = Helper.getRandomString();
+    let msg = {
+      mid,
+      cmd:'run',
+      jobPath,
+      jobFunc: funcName,
+      jobFuncParams: params
+    }
+    this.child.send(msg);
+  }
+
   /**
    * kill
    */

package/log/logger.js

@@ -6,6 +6,11 @@ const Ps = require('../ps');
 const Conf = require('../config');
 const ConfigCache = require('../config/cache');
 let LogDate = 0;
+const TmpFileName = {
+  appLogName: '',
+  coreLogName: '',
+  errorLogName: '',
+}
 
 module.exports = {
 
@@ -73,9 +78,20 @@ module.exports = {
     let now = parseInt(dayjs().format('YYYYMMDD'));
     if (LogDate != now) {
       LogDate = now;
-      let appLogName = logOpt.logger.appLogName;
-      let coreLogName = logOpt.logger.coreLogName;
-      let errorLogName = logOpt.logger.errorLogName;
+
+      // 保存一个临时文件名，防止文件名按日期累加
+      if (TmpFileName.appLogName.length == 0) {
+        TmpFileName.appLogName = logOpt.logger.appLogName;
+      }
+      if (TmpFileName.coreLogName.length == 0) {
+        TmpFileName.coreLogName = logOpt.logger.coreLogName;
+      }
+      if (TmpFileName.errorLogName.length == 0) {
+        TmpFileName.errorLogName = logOpt.logger.errorLogName;
+      }
+      let appLogName = TmpFileName.appLogName;
+      let coreLogName = TmpFileName.coreLogName;
+      let errorLogName = TmpFileName.errorLogName;
       let appLogExtname = path.extname(appLogName);
       let coreLogExtname = path.extname(coreLogName);
       let errorLogExtname = path.extname(errorLogName);

package/message/childMessage.js

@@ -6,7 +6,7 @@ class ChildMessage {
   }
 
   /**
-   * 向主进程发消息
+   * 向主进程发消息 for ChildJob 实例
    */
   sendToMain(eventName, params = {}) {
     let receiver = Channel.receiver.childJob;
@@ -14,7 +14,7 @@ class ChildMessage {
   }
 
   /**
-   * 向主进程发消息
+   * 向主进程发消息 for task 实例
    */
   send(eventName, params = {}, receiver) {
     let eventReceiver = receiver || Channel.receiver.forkProcess;

package/package.json

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

package/services/baseContextClass.js

@@ -2,32 +2,22 @@
 
 /**
  * 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
+   * @since 1.1.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;
+
+    // todo 兼容旧版本，后续废弃ctx
+    if (typeof ctx === 'object') {
+      this.app = ctx;
+      this.config = ctx.config;
+      this.service = ctx.service;
+    }
   }
 }