ee-core 2.9.2-beta.1 → 2.10.0

package/socket/ipcServer.js

@@ -1,113 +1,113 @@
-const debug = require('debug')('ee-core:ipcServer');
-const is = require('is-type-of');
-const { ipcMain } = require('electron');
-const path = require('path');
-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.register();
-  }
-
-  register () {
-    const self = this;
-    // 遍历方法
-    const files = Utils.filePatterns();
-    const directory = path.join(this.app.config.baseDir, 'controller');
-    const filepaths = globby.sync(files, { cwd: directory });
-
-    for (const filepath of filepaths) {
-      const fullpath = path.join(directory, filepath);
-      if (!fs.statSync(fullpath).isFile()) continue;
-
-      const properties = Wrap.getProperties(filepath, {caseStyle: 'lower'});
-      const pathName = directory.split(/[/\\]/).slice(-1) + '.' + properties.join('.');
-
-      let fileObj = Utils.loadFile(fullpath);
-      const fns = {};
-      // 为了统一，仅支持class文件
-      if (is.class(fileObj) || Utils.isBytecodeClass(fileObj)) {
-        let proto = fileObj.prototype;
-        // 不遍历父类的方法
-        //while (proto !== Object.prototype) {
-          const keys = Object.getOwnPropertyNames(proto);
-          for (const key of keys) {
-            if (key === 'constructor') {
-              continue;
-            }
-            const d = Object.getOwnPropertyDescriptor(proto, key);
-            if (is.function(d.value) && !fns.hasOwnProperty(key)) {
-              fns[key] = 1;
-            }
-          }
-          //proto = Object.getPrototypeOf(proto);
-        //}
-      }
-
-      debug('register class %s fns %j', pathName, fns);
-
-      for (const key in fns) {
-        let channel = pathName + '.' + key;
-        debug('register channel %s', channel);
-
-        function findFn (app, c) {
-          try {
-            // 找函数
-            const cmd = c;
-            let fn = null;
-            if (is.string(cmd)) {
-              const actions = cmd.split('.');
-              let obj = app;
-              actions.forEach(key => {
-                obj = obj[key];
-                if (!obj) throw new Error(`class or function '${key}' not exists`);
-              });
-              fn = obj;
-            }
-            if (!fn) throw new Error('function not exists');
-            
-            return fn;
-          } catch (err) {
-            Log.coreLogger.error('[ee-core] [socket/IpcServer] throw error:', err);
-          }
-          return null;
-        }
-
-        // send/on 模型
-        ipcMain.on(channel, async (event, params) => {
-          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) => {
-          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
-          }
-        });
-      }
-    }
-  }
-}
-
+const debug = require('debug')('ee-core:ipcServer');
+const is = require('is-type-of');
+const { ipcMain } = require('electron');
+const path = require('path');
+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.register();
+  }
+
+  register () {
+    const self = this;
+    // 遍历方法
+    const files = Utils.filePatterns();
+    const directory = path.join(this.app.config.baseDir, 'controller');
+    const filepaths = globby.sync(files, { cwd: directory });
+
+    for (const filepath of filepaths) {
+      const fullpath = path.join(directory, filepath);
+      if (!fs.statSync(fullpath).isFile()) continue;
+
+      const properties = Wrap.getProperties(filepath, {caseStyle: 'lower'});
+      const pathName = directory.split(/[/\\]/).slice(-1) + '.' + properties.join('.');
+
+      let fileObj = Utils.loadFile(fullpath);
+      const fns = {};
+      // 为了统一，仅支持class文件
+      if (is.class(fileObj) || Utils.isBytecodeClass(fileObj)) {
+        let proto = fileObj.prototype;
+        // 不遍历父类的方法
+        //while (proto !== Object.prototype) {
+          const keys = Object.getOwnPropertyNames(proto);
+          for (const key of keys) {
+            if (key === 'constructor') {
+              continue;
+            }
+            const d = Object.getOwnPropertyDescriptor(proto, key);
+            if (is.function(d.value) && !fns.hasOwnProperty(key)) {
+              fns[key] = 1;
+            }
+          }
+          //proto = Object.getPrototypeOf(proto);
+        //}
+      }
+
+      debug('register class %s fns %j', pathName, fns);
+
+      for (const key in fns) {
+        let channel = pathName + '.' + key;
+        debug('register channel %s', channel);
+
+        function findFn (app, c) {
+          try {
+            // 找函数
+            const cmd = c;
+            let fn = null;
+            if (is.string(cmd)) {
+              const actions = cmd.split('.');
+              let obj = app;
+              actions.forEach(key => {
+                obj = obj[key];
+                if (!obj) throw new Error(`class or function '${key}' not exists`);
+              });
+              fn = obj;
+            }
+            if (!fn) throw new Error('function not exists');
+            
+            return fn;
+          } catch (err) {
+            Log.coreLogger.error('[ee-core] [socket/IpcServer] throw error:', err);
+          }
+          return null;
+        }
+
+        // send/on 模型
+        ipcMain.on(channel, async (event, params) => {
+          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) => {
+          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
+          }
+        });
+      }
+    }
+  }
+}
+
 module.exports = IpcServer;

package/socket/socketServer.js

@@ -1,66 +1,70 @@
-'use strict';
-
-const { Server } = require('socket.io');
-const is = require('is-type-of');
-const Log = require('../log');
-const Conf = require('../config');
-const Ps = require('../ps');
-const Channel = require('../const/channel');
-
-/**
- * socket server
- */
-class SocketServer {
-  constructor (app) {
-    this.app = app;
-    const options = Conf.getValue('socketServer');
-
-    if (options.enable == false) {
-      return;
-    }
-
-    let port = Ps.getSocketPort();
-    if (!port) {
-      throw new Error('[ee-core] [socket/socketServer] socekt port required, and must be a number !');
-    }
-
-    Log.coreLogger.info('[ee-core] [socket/socketServer] port is:', port);
-
-    this.io = new Server(port, options);
-    this.connec();
-  }
-
-  connec () {
-    const app = this.app;
-    this.io.on('connection', (socket) => {
-      const channel = Channel.socketIo.partySoftware;
-      socket.on(channel, async (message, callback) => {
-        Log.coreLogger.info('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
-
-        try {
-          // 找函数
-          const cmd = message.cmd;
-          const args = message.params;
-          let fn = null;
-          if (is.string(cmd)) {
-            const actions = cmd.split('.');
-            let obj = app;
-            actions.forEach(key => {
-              obj = obj[key];
-              if (!obj) throw new Error(`class or function '${key}' not exists`);
-            });
-            fn = obj;
-          }
-          if (!fn) throw new Error('function not exists');
-
-          const result = await fn.call(app, args);
-          callback(result);
-        } catch (err) {
-          Log.coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
-        }
-      });
-    });
-  }
-}
-
+'use strict';
+
+const { Server } = require('socket.io');
+const is = require('is-type-of');
+const Log = require('../log');
+const Conf = require('../config/cache');
+const Ps = require('../ps');
+const Channel = require('../const/channel');
+
+/**
+ * socket server
+ */
+class SocketServer {
+  constructor (app) {
+    this.app = app;
+    this.socket = undefined;
+    const options = Conf.getValue('socketServer');
+
+    if (options.enable == false) {
+      return;
+    }
+
+    let port = Ps.getSocketPort();
+    if (!port) {
+      throw new Error('[ee-core] [socket/socketServer] socekt port required, and must be a number !');
+    }
+
+    Log.coreLogger.info('[ee-core] [socket/socketServer] port is:', port);
+
+    this.io = new Server(port, options);
+    this.connec(options);
+  }
+
+  connec (opt = {}) {
+    const app = this.app;
+    this.io.on('connection', (socket) => {
+      const channel = opt.channel || Channel.socketIo.partySoftware;
+      this.socket = socket;
+      socket.on(channel, async (message, callback) => {
+        Log.coreLogger.info('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
+
+        try {
+          // 找函数
+          const cmd = message.cmd;
+          const args = message.args || message.params;
+          let fn = null;
+          if (is.string(cmd)) {
+            const actions = cmd.split('.');
+            let obj = app;
+            actions.forEach(key => {
+              obj = obj[key];
+              if (!obj) throw new Error(`class or function '${key}' not exists`);
+            });
+            fn = obj;
+          }
+          if (!fn) throw new Error('function not exists');
+
+          const result = await fn.call(app, args);
+          if (callback) {
+            callback(result);
+          }
+        } catch (err) {
+          Log.coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
+        }
+      });
+    });
+  }
+}
+
 module.exports = SocketServer;

package/storage/index.js

@@ -1,39 +1,39 @@
-const assert = require('assert');
-const _ = require('lodash');
-const DB = {};
-
-// jsondb 要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
-
-DB.connection = function (database, options = {}) {
-  let driver = options.driver || 'jsondb';
-  
-  // 兼容之前api
-  driver = driver == 'lowdb' ? 'jsondb' : driver;
-
-  let opt = options.default || {};
-  if (!_.includes(['jsondb', 'sqlite'], driver)) {
-    assert(database, `db driver ${driver} is not supported`);
-  }
-  if (_.isEmpty(database)) {
-    assert(database, `db name ${database} Cannot be empty`);
-  }
-  let storage;
-  switch (driver)  {
-    case 'jsondb':
-      const JsondbStorage = require('./jsondbStorage');
-      storage = new JsondbStorage(database);
-      break;
-    case 'sqlite':
-      const SqliteStorage = require('./sqliteStorage');
-      storage = new SqliteStorage(database, opt);
-      break;
-    default:
-  }
-
-  return storage;
-}
-
-// 兼容之前的api
-DB.JsonDB = DB;
-
+const assert = require('assert');
+const _ = require('lodash');
+const DB = {};
+
+// jsondb 要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
+
+DB.connection = function (database, options = {}) {
+  let driver = options.driver || 'jsondb';
+  
+  // 兼容之前api
+  driver = driver == 'lowdb' ? 'jsondb' : driver;
+
+  let opt = options.default || {};
+  if (!_.includes(['jsondb', 'sqlite'], driver)) {
+    assert(database, `db driver ${driver} is not supported`);
+  }
+  if (_.isEmpty(database)) {
+    assert(database, `db name ${database} Cannot be empty`);
+  }
+  let storage;
+  switch (driver)  {
+    case 'jsondb':
+      const JsondbStorage = require('./jsondbStorage');
+      storage = new JsondbStorage(database);
+      break;
+    case 'sqlite':
+      const SqliteStorage = require('./sqliteStorage');
+      storage = new SqliteStorage(database, opt);
+      break;
+    default:
+  }
+
+  return storage;
+}
+
+// 兼容之前的api
+DB.JsonDB = DB;
+
 module.exports = DB;

package/storage/jsondb/adapters/Base.js

@@ -1,23 +1,23 @@
-class Base {
-  constructor(source) {
-    this.source = source
-    this.defaultValue = {}
-    this.serialize = this._stringify
-    this.deserialize = JSON.parse
-  }
-
-  _canDeserialized(obj) {
-    try {
-      this.deserialize(obj)
-      return true
-    } catch (e) {
-      return false
-    }
-  }
-
-  _stringify(obj) {
-    return JSON.stringify(obj, null, 2)
-  }
-}
-
-module.exports = Base
+class Base {
+  constructor(source) {
+    this.source = source
+    this.defaultValue = {}
+    this.serialize = this._stringify
+    this.deserialize = JSON.parse
+  }
+
+  _canDeserialized(obj) {
+    try {
+      this.deserialize(obj)
+      return true
+    } catch (e) {
+      return false
+    }
+  }
+
+  _stringify(obj) {
+    return JSON.stringify(obj, null, 2)
+  }
+}
+
+module.exports = Base

package/storage/jsondb/adapters/FileSync.js

@@ -1,52 +1,64 @@
-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
-      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)
-
-        //  reset system.json
-        if (this.isSysDB) {
-          this._fsWrite(this.defaultValue);
-        }
-      }
-      const value = canDeserialized ? this.deserialize(data) : this.defaultValue;
-      return value;
-    } else {
-      // Initialize
-      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+'})
-  }
-}
-
-module.exports = FileSync
+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
+      let data = fs.readFileSync(this.source, {encoding: 'utf8'}).trim();
+
+      // 是否可以正常解析
+      let canDeserialized = this._canDeserialized(data);
+      if (!canDeserialized) {
+        let errMessage = `[ee-core] [storage/jsondb] malformed json in file: ${this.source}\n${data}`;
+        Log.coreLogger.error(errMessage);
+
+        // 是否文件结尾多一个括号，尝试处理
+        data = data.trim().slice(0, -1);
+        canDeserialized = this._canDeserialized(data);
+        if (canDeserialized) {
+          // 转换为对象，并写入
+          const newData = JSON.parse(data);
+          this._fsWrite(newData);
+        } else {
+          //  [todo] 重置 system.json ，不处理用户数据
+          if (this.isSysDB) {
+            this._fsWrite(this.defaultValue);
+          }
+          errMessage = '[ee-core] [storage/jsondb] malformed json that cannot be handled!';
+          Log.coreLogger.error(errMessage);
+        }
+      }
+      const value = canDeserialized ? this.deserialize(data) : this.defaultValue;
+      return value;
+    } else {
+      // Initialize
+      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+'})
+  }
+}
+
+module.exports = FileSync