ee-core 2.5.0-beta.3 → 2.6.0-beta.1

package/electron/app/index.js

@@ -1,5 +1,4 @@
 const { app } = require('electron');
-const Window = require('../window');
 const EE = require('../../ee');
 const Log = require('../../log');
 const Electron = require('../index');

package/jobs/child/forkProcess.js

@@ -44,8 +44,12 @@ class ForkProcess {
    * 初始化事件监听
    */
   _init() {
+    const { messageLog } = this.host.config;
     this.child.on('message', (m) => {
-      Log.coreLogger.info(`[ee-core] [jobs/child] received a message from child-process, message: ${serialize(m)}`);
+      if (messageLog == true) {
+        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}`);
       }

package/jobs/child/index.js

@@ -2,12 +2,20 @@ const EventEmitter = require('events');
 const ForkProcess = require('./forkProcess');
 const Loader = require('../../loader');
 const Channel = require('../../const/channel');
+const Conf = require('../../config');
 
 class ChildJob extends EventEmitter {
 
   constructor() {
     super();
     this.jobs = {};
+    this.config = {};
+
+    const cfg = Conf.getValue('jobs');
+    if (cfg) {
+      this.config = cfg;
+    }
+
     this._initEvents();
   }
 

package/jobs/child-pool/index.js

@@ -4,6 +4,7 @@ const Loader = require('../../loader');
 const ForkProcess = require('../child/forkProcess');
 const Channel = require('../../const/channel');
 const Helper = require('../../utils/helper');
+const Conf = require('../../config');
 
 class ChildPoolJob extends EventEmitter {
 
@@ -13,6 +14,7 @@ class ChildPoolJob extends EventEmitter {
       weights: [],
     }, opt);
 
+    this.config = {};
     this.boundMap = new Map();
     this.children = {};
     this.min = 3;
@@ -28,6 +30,12 @@ class ChildPoolJob extends EventEmitter {
       targets: [],
     }
     this.LB = new LoadBalancer(lbOpt);
+
+    const cfg = Conf.getValue('jobs');
+    if (cfg) {
+      this.config = cfg;
+    }
+
     this._initEvents();
   }
 

package/package.json

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

package/socket/ipcServer.js

@@ -80,19 +80,30 @@ class IpcServer {
 
         // send/on 模型
         ipcMain.on(channel, async (event, params) => {
-          const fn = findFn(self.app, channel);
-          const result = await fn.call(self.app, params, event);
-
-          event.returnValue = result;
-          event.reply(`${channel}`, result);
+          try {
+            const fn = findFn(self.app, channel);
+            const result = await fn.call(self.app, params, event);
+  
+            event.returnValue = result;
+            event.reply(`${channel}`, result);
+          } catch(e) {
+            Log.coreLogger.error('[ee-core] [socket/IpcServer] send/on throw error:', e);
+            // event.returnValue = e;
+            // event.reply(`${channel}`, e);
+          }
         });
 
         // invoke/handle 模型
         ipcMain.handle(channel, async (event, params) => {
-          const fn = findFn(self.app, channel);
-          const result = await fn.call(self.app, params, event);
-
-          return result;
+          try {
+            const fn = findFn(self.app, channel);
+            const result = await fn.call(self.app, params, event);
+  
+            return result;
+          } catch(e) {
+            Log.coreLogger.error('[ee-core] [socket/IpcServer] invoke/handle throw error:', e);
+            return e
+          }
         });
       }
     }

package/storage/index.js

@@ -2,6 +2,8 @@ const assert = require('assert');
 const _ = require('lodash');
 const DB = {};
 
+// jsondb 要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
+
 DB.connection = function (database, options = {}) {
   let driver = options.driver || 'jsondb';
   

package/storage/jsondb/adapters/Base.js

@@ -6,6 +6,15 @@ class Base {
     this.deserialize = JSON.parse
   }
 
+  _canDeserialized(obj) {
+    try {
+      this.deserialize(obj)
+      return true
+    } catch (e) {
+      return false
+    }
+  }
+
   _stringify(obj) {
     return JSON.stringify(obj, null, 2)
   }

package/storage/jsondb/adapters/FileSync.js

@@ -1,30 +1,50 @@
 const Base = require('./Base')
 const fs = require('fs')
+const Log = require('../../../log')
 
 class FileSync extends Base {
+
+  constructor(options = {}) {
+    const { source,  isSysDB } = options;
+    super(source);
+    this.isSysDB = isSysDB;
+  }
   
   read() {
     if (fs.existsSync(this.source)) {
       // Read database
-      try {
-        const data = fs.readFileSync(this.source, {encoding: 'utf8'}).trim()
+      const data = fs.readFileSync(this.source, {encoding: 'utf8'}).trim();
+      
+      const canDeserialized = this._canDeserialized(data);
+      if (!canDeserialized) {
+        const errMessage = `Malformed JSON in file: ${this.source}\n${data}`;
+        console.error(errMessage)
 
-        // Handle blank file
-        return data ? this.deserialize(data) : this.defaultValue
-      } catch (e) {
-        if (e instanceof SyntaxError) {
-          e.message = `Malformed JSON in file: ${this.source}\n${e.message}`
+        //  reset system.json
+        if (this.isSysDB) {
+          this._fsWrite(this.defaultValue);
         }
-        throw e
       }
+      const value = canDeserialized ? this.deserialize(data) : this.defaultValue;
+      return value;
     } else {
       // Initialize
-      fs.writeFileSync(this.source, this.serialize(this.defaultValue), {flag:'w+'})
+      this._fsWrite(this.defaultValue);
       return this.defaultValue
     }
   }
 
   write(data) {
+    return this._fsWrite(data);
+  }
+
+  _fsWrite(data) {
+    const isObject = Object.prototype.toString.call(data) === '[object Object]';
+    if (!isObject) {
+      Log.coreLogger.error('[ee-core] [storage/jsondb] Variable is not an object :', data);
+      return
+    }
+
     return fs.writeFileSync(this.source, this.serialize(data), {flag:'w+'})
   }
 }

package/storage/jsondbStorage.js

@@ -28,7 +28,12 @@ class JsondbStorage {
    */
   table() {
     const dbFile = this.getFilePath();
-    const adapter = new FileSync(dbFile);
+    const isSysDB = this.isSystemDB();
+    const opt = {
+      source: dbFile,
+      isSysDB: isSysDB
+    }
+    const adapter = new FileSync(opt);
     const db = Jsondb(adapter);
 
     assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
@@ -36,7 +41,7 @@ class JsondbStorage {
     return db;
   }
 
-  /**
+  /** 
    * 补全扩展名
    */
   _addExtname(name) {
@@ -73,6 +78,13 @@ class JsondbStorage {
     return fileName;
   }
 
+  /**
+   * is system db
+   */
+  isSystemDB() {
+    return (this.name == 'system.json') ? true : false;
+  }
+
   /**
    * 获取文件绝对路径
    */