ee-core 2.11.1 → 4.0.0-beta.1

package/socket/index.js

@@ -3,80 +3,63 @@
 const IoServer = require('socket.io');
 const IoClient = require('socket.io-client');
 const Koa = require('koa');
-const EESocketServer = Symbol('Ee#SocketServer');
-const EEIpcServer = Symbol('Ee#IpcServer');
-const EEHttpServer = Symbol('Ee#HttpServer');
-
-const EeSocket = {
-
-  /**
-   * 提供基础库 - 避免用户重复安装
-   */
-  Koa,
-  IoServer,
-  IoClient,
-
-  /**
-   * 启动所有服务
-   */ 
-  startAll(app) {
-    this._createSocketServer(app);
-    this._createHttpServer(app);
-    this._createIpcServer(app);
-  },
-
-  /**
-   * 创建SocketServer
-   */ 
-  _createSocketServer(app) {
-    const SocketServer = require('./socketServer');
-    this[EESocketServer] = new SocketServer(app);
-
-    return this[EESocketServer];
-  },
-
-  /**
-   * 获取 Socket Server
-   */
-  getSocketServer() {
-    return this[EESocketServer] || null;
-  },  
-
-  /**
-   * 创建 Http Server
-   */ 
-  _createHttpServer(app) {
-    const HttpServer = require('./httpServer');
-    this[EEHttpServer] = new HttpServer(app);
-
-    return this[EEHttpServer];
-  },
+const { SocketServer } = require('./socketServer');
+const { HttpServer } = require('./httpServer');
+const { IpcServer } = require('./ipcServer');
+
+const Instance = {
+  socketServer: null,
+  httpServer: null,
+  coreLogger: null,
+};
+
+// create SocketServer
+function createSocketServer() {
+  Instance.socketServer = new SocketServer();
+  return Instance.socketServer;
+}
 
-  /**
-   * 获取 Http Server
-   */
-  getHttpServer() {
-    return this[EEHttpServer] || null;
-  }, 
+// socketServer
+function getSocketServer() {
+  return Instance.socketServer;
+}
 
-  /**
-   * 创建 IPC Server
-   */ 
-  _createIpcServer(app) {
-    const IpcServer = require('./ipcServer');
-    this[EEIpcServer] = new IpcServer(app);
+// create Http Server
+function createHttpServer() {
+  Instance.httpServer = new HttpServer();
+  return Instance.httpServer;
+}
 
-    return this[EEIpcServer];
-  },
+// httpServer
+function getHttpServer() {
+  return Instance.httpServer;
+} 
 
-  /**
-   * 获取 IPC Server
-   */
-  getIpcServer() {
-    return this[EEIpcServer] || null;
-  },   
+// create IPC Server
+function createIpcServer() {
+  Instance.ipcServer = new IpcServer();
+  return Instance.ipcServer;
+}
 
+// ipcServer
+function getIpcServer() {
+  return Instance.ipcServer;
 }
 
 
-module.exports = EeSocket;
+// load socket server
+function loadSocket() {
+  createSocketServer();
+  createHttpServer();
+  createIpcServer();
+} 
+
+module.exports = {
+  Koa,
+  IoServer,
+  IoClient,
+  loadSocket,
+  getSocketServer,
+  getHttpServer,
+  getIpcServer
+};

package/socket/ipcServer.js

@@ -1,113 +1,99 @@
-const debug = require('debug')('ee-core:ipcServer');
+'use strict';
+
+const debug = require('debug')('ee-core:socket: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');
+const { coreLogger } = require('../log');
+const { getController } = require('../controller');
+const { EXPORTS } = require('../core/loader/file_loader');
 
 class IpcServer {
-  constructor (app) {
-    this.app = app;
-    this.register();
+  constructor () {
+    this.directory = 'controller';
+    this.init();
   }
 
-  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);
-        //}
+  loop(obj, pathname) {
+    const keys = Object.keys(obj);
+    // debug("[loop] keys: %j", keys);
+    for (const key of keys) {
+      if (key === 'constructor') {
+        continue;
       }
+      let subObj = obj[key];
+      let propertyChain = pathname + '.' + key;
+      if (subObj && subObj[EXPORTS] === true) {
+        this.register(subObj, propertyChain);
+      } else if (typeof subObj === 'object') {
+        // 如果子对象依然是对象，则递归调用继续判断
+        this.loop(subObj, propertyChain);
+      }
+    }
+  }
 
-      debug('register class %s fns %j', pathName, fns);
+  register(exportObj, propertyChain) {
+    const controller = getController();
+    const keys = Object.keys(exportObj);
+    for (const key of keys) {
+      const channel = `${propertyChain}.${key}`;
+      debug('[register] channel %s', channel);
 
-      for (const key in fns) {
-        let channel = pathName + '.' + key;
-        debug('register channel %s', channel);
+      // send/on model
+      ipcMain.on(channel, async (event, params) => {
+        try {
+          const fn = this.findFn(controller, channel);
+          const result = await fn.call(controller, params, event);
 
-        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;
+          event.returnValue = result;
+          event.reply(`${channel}`, result);
+        } catch(e) {
+          coreLogger.error('[ee-core] [socket/IpcServer] send/on throw error:', e);
         }
+      });
 
-        // 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 model
+      ipcMain.handle(channel, async (event, params) => {
+        try {
+          const fn = this.findFn(controller, channel);
+          const result = await fn.call(controller, params, event);
 
-        // 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
-          }
+          return result;
+        } catch(e) {
+          coreLogger.error('[ee-core] [socket/IpcServer] invoke/handle throw error:', e);
+        }
+      });
+    }
+  }
+
+  findFn (controller, c) {
+    try {
+      // 找函数
+      const cmd = c;
+      let fn = null;
+      if (is.string(cmd)) {
+        const actions = cmd.split('.');
+        let obj = { controller };
+        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) {
+      coreLogger.error('[ee-core] [socket/IpcServer] throw error:', err);
     }
+    return null;
+  }
+
+  init() {
+    const controller = getController();
+    this.loop(controller, this.directory);
   }
 }
 
-module.exports = IpcServer;
+module.exports = {
+  IpcServer
+};

package/socket/socketServer.js

@@ -1,52 +1,57 @@
 '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');
+const { Server } = require('socket.io');
+const { coreLogger } = require('../log');
+const { getConfig } = require('../config');
+const { SocketIO } = require('../const/channel');
+const { getController } = require('../controller');
+const { getPort } = require('../utils/port');
 
 /**
  * socket server
  */
 class SocketServer {
-  constructor (app) {
-    this.app = app;
+  constructor () {
     this.socket = undefined;
-    const options = Conf.getValue('socketServer');
+    this.io = undefined;
+    this.config = getConfig().socketServer;
+    this.init();
+  }
 
-    if (options.enable == false) {
+  async init() {
+    if (this.config.enable == false) {
       return;
     }
 
-    let port = Ps.getSocketPort();
+    const port = await getPort({port: parseInt(this.config.port)});
     if (!port) {
       throw new Error('[ee-core] [socket/socketServer] socekt port required, and must be a number !');
     }
+    coreLogger.info('[ee-core] [socket/socketServer] port is:', port);
 
-    Log.coreLogger.info('[ee-core] [socket/socketServer] port is:', port);
-
-    this.io = new Server(port, options);
-    this.connec(options);
+    process.env.EE_SOCKET_PORT = port;
+    this.config.port = port;
+    this.io = new Server(port, this.config);
+    this.connect();
   }
 
-  connec (opt = {}) {
-    const app = this.app;
+  connect () {
+    const controller = getController();
     this.io.on('connection', (socket) => {
-      const channel = opt.channel || Channel.socketIo.partySoftware;
+      const channel = this.config.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);
+        coreLogger.info('[ee-core] [socket/socketServer] socket id:' + socket.id + ' message cmd: ' + message.cmd);
 
         try {
-          // 找函数
+          // find function
           const cmd = message.cmd;
-          const args = message.args || message.params;
+          const args = message.args;
           let fn = null;
           if (is.string(cmd)) {
             const actions = cmd.split('.');
-            let obj = app;
+            let obj = { controller };
             actions.forEach(key => {
               obj = obj[key];
               if (!obj) throw new Error(`class or function '${key}' not exists`);
@@ -55,16 +60,18 @@ class SocketServer {
           }
           if (!fn) throw new Error('function not exists');
 
-          const result = await fn.call(app, args);
+          const result = await fn.call(controller, args);
           if (callback) {
             callback(result);
           }
         } catch (err) {
-          Log.coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
+          coreLogger.error('[ee-core] [socket/socketServer] throw error:', err);
         }
       });
     });
   }
 }
 
-module.exports = SocketServer;
+module.exports = {
+  SocketServer,
+};

package/storage/index.js

@@ -1,39 +1,7 @@
-const assert = require('assert');
-const _ = require('lodash');
-const DB = {};
+'use strict';
 
-// jsondb 要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
+const { SqliteStorage } = require('./sqliteStorage'); 
 
-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;
+module.exports = {
+  SqliteStorage
+};

package/storage/sqliteStorage.js

@@ -4,8 +4,8 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 const Database = require('better-sqlite3');
-const Helper = require('../utils/helper');
-const Ps = require('../ps');
+const { mkdir } = require('../utils/helper');
+const { getDataDir } = require('../ps');
 
 class SqliteStorage {
   constructor (name, opt = {}) {
@@ -13,7 +13,7 @@ class SqliteStorage {
 
     this.name = name;
     this.mode = this.getMode(name);
-    this.storageDir = this._createStorageDir();
+    this.dbDir = this._createDatabaseDir();
     this.fileName = this._formatFileName(name);
     this.db = this._initDB(opt);
   }
@@ -36,7 +36,7 @@ class SqliteStorage {
 
     // 如果是文件类型，判断文件是否创建成功
     if (this.mode != 'memory') {
-      assert(fs.existsSync(dbPath), `error: storage ${dbPath} not exists`);
+      assert(fs.existsSync(dbPath), `error: db ${dbPath} not exists`);
     }
 
     return db;
@@ -57,19 +57,17 @@ class SqliteStorage {
   /**
    * 创建storage目录
    */
-  _createStorageDir () {
-    let storageDir = Ps.getStorageDir();
-
+  _createDatabaseDir () {
+    let dbDir = path.join(getDataDir(), 'db');
     if (this.mode == 'absolute') {
-      storageDir = path.dirname(this.name); 
+      dbDir = path.dirname(this.name); 
     }
 
-    if (!fs.existsSync(storageDir)) {
-      Helper.mkdir(storageDir);
-      Helper.chmodPath(storageDir, '777');
+    if (!fs.existsSync(dbDir)) {
+      mkdir(dbDir, { mode: 0o755 });
     }
 
-    return storageDir;
+    return dbDir;
   }
 
   /**
@@ -84,7 +82,7 @@ class SqliteStorage {
       return mode;
     }
 
-    assert(path.extname(name) == '.db', `error: storage ${name} file ext name must be .db`);
+    assert(path.extname(name) == '.db', `error: db ${name} file ext name must be .db`);
 
     // 路径模式
     name = name.replace(/[/\\]/g, '/');
@@ -105,20 +103,22 @@ class SqliteStorage {
   }
 
   /**
-   * 获取storage目录
+   * 获取 db 文件目录
    */
-  getStorageDir () {
-    return this.storageDir;
+  getDbDir () {
+    return this.dbDir;
   }
 
   /**
    * 获取文件绝对路径
    */
   getFilePath () {
-    const dbFile = path.join(this.storageDir, this.fileName);
+    const dbFile = path.join(this.dbDir, this.fileName);
 
     return dbFile;
   }
 }
 
-module.exports = SqliteStorage;
+module.exports = {
+  SqliteStorage
+};

package/utils/extend.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var hasOwn = Object.prototype.hasOwnProperty;
-var toStr = Object.prototype.toString;
+const hasOwn = Object.prototype.hasOwnProperty;
+const toStr = Object.prototype.toString;
 
-var isPlainObject = function isPlainObject(obj) {
+function isPlainObject(obj) {
   if (!obj || toStr.call(obj) !== '[object Object]') {
     return false;
   }
@@ -23,8 +23,8 @@ var isPlainObject = function isPlainObject(obj) {
   return typeof key === 'undefined' || hasOwn.call(obj, key);
 };
 
-module.exports = function extend() {
-  var options, name, src, copy, copyIsArray, clone;
+function extend() {
+  var options, name, src, copy, clone;
   var target = arguments[0];
   var i = 1;
   var length = arguments.length;
@@ -71,3 +71,8 @@ module.exports = function extend() {
   // Return the modified object
   return target;
 };
+
+module.exports = {
+  extend,
+  isPlainObject,
+};