ee-core 1.5.0 → 1.5.1

package/lib/socket/io.js

@@ -1,24 +1,24 @@
-'use strict';
-
-const IoServer = require('socket.io');
-const IoClient = require('socket.io-client');
-//const socketServer = require('./socketServer');
-const socketClient = require('./socketClient');
-const Koa = require('koa');
-
-const EeSocket = {
-  getServer: () => {
-    //return socketServer.getInstance();
-  },
-  getClient: () => {
-    return socketClient.getInstance();
-  }
-}
-
-
-module.exports = {
-  IoServer,
-  IoClient,
-  EeSocket,
-  Koa
+'use strict';
+
+const IoServer = require('socket.io');
+const IoClient = require('socket.io-client');
+//const socketServer = require('./socketServer');
+const socketClient = require('./socketClient');
+const Koa = require('koa');
+
+const EeSocket = {
+  getServer: () => {
+    //return socketServer.getInstance();
+  },
+  getClient: () => {
+    return socketClient.getInstance();
+  }
+}
+
+
+module.exports = {
+  IoServer,
+  IoClient,
+  EeSocket,
+  Koa
 };

package/lib/socket/ipcServer.js

@@ -1,109 +1,109 @@
-'use strict';
-
-const debug = require('debug')('ee-core:ipcServer');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
-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');
-
-class IpcServer {
-  constructor (app) {
-
-    this.app = app;
-    this.consoleLogger = new EggConsoleLogger();
-    this.consoleLogger.info('[ee-core:socket:ipcMain] start ipcMain');
-    this.register();
-  }
-
-  register () {
-    this.consoleLogger.info('[ee-core:socket:ipcMain] register channels');
-
-    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) {
-            app.logger.error('[ee:socket:ipcMain] throw error:', err);
-          }
-          return null;
-        }
-
-        // 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);
-        });
-
-        // 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;
-        });
-      }
-    }
-  }
-}
-
+'use strict';
+
+const debug = require('debug')('ee-core:ipcServer');
+const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
+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');
+
+class IpcServer {
+  constructor (app) {
+
+    this.app = app;
+    this.consoleLogger = new EggConsoleLogger();
+    this.consoleLogger.info('[ee-core:socket:ipcMain] start ipcMain');
+    this.register();
+  }
+
+  register () {
+    this.consoleLogger.info('[ee-core:socket:ipcMain] register channels');
+
+    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) {
+            app.logger.error('[ee:socket:ipcMain] throw error:', err);
+          }
+          return null;
+        }
+
+        // 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);
+        });
+
+        // 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;
+        });
+      }
+    }
+  }
+}
+
 module.exports = IpcServer;

package/lib/socket/socketClient.js

@@ -1,51 +1,51 @@
-'use strict';
-
-const assert = require('assert');
-const IoClient = require('socket.io-client');
-const constant = require('../constant');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
-
-class SocketClient {
-  constructor (port) {
-    this.consoleLogger = new EggConsoleLogger();
-    port = port ? parseInt(port) : this.getSocketcPort();
-
-    assert(typeof port === 'number', 'port required, and must be a number');
-    this.consoleLogger.info('[ee-core:socket:client] start client');
-    
-    const url  = 'http://127.0.0.1:' + port;
-    this.consoleLogger.info('[ee-core:socket:client] url:', url);
-    this.client = IoClient(url);
-  }
-
-  static getInstance (port) {
-    if (typeof this.instance === 'object') {
-      return this.instance;
-    }
-    this.instance = new SocketClient(port);
-    return this.instance;
-  }
-
-  call (method = '', ...params) {
-    return new Promise((resolve, reject) => {
-      // 获取通信频道
-      const channel = constant.socketIo.channel.partySoftware;
-      this.client.emit(channel, { cmd: method, params: params }, (response) => {
-        resolve(response);
-      });
-    });
-  }
-
-  getCoreDB () {
-    const coreDB = require('../storage/index').JsonDB.connection('system');
-    return coreDB;
-  }
-
-  getSocketcPort () {
-    const cdb = this.getCoreDB();
-    const port = cdb.getItem('config').socketServer.port;
-    return parseInt(port);
-  }
-}
-
+'use strict';
+
+const assert = require('assert');
+const IoClient = require('socket.io-client');
+const constant = require('../constant');
+const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
+
+class SocketClient {
+  constructor (port) {
+    this.consoleLogger = new EggConsoleLogger();
+    port = port ? parseInt(port) : this.getSocketcPort();
+
+    assert(typeof port === 'number', 'port required, and must be a number');
+    this.consoleLogger.info('[ee-core:socket:client] start client');
+    
+    const url  = 'http://127.0.0.1:' + port;
+    this.consoleLogger.info('[ee-core:socket:client] url:', url);
+    this.client = IoClient(url);
+  }
+
+  static getInstance (port) {
+    if (typeof this.instance === 'object') {
+      return this.instance;
+    }
+    this.instance = new SocketClient(port);
+    return this.instance;
+  }
+
+  call (method = '', ...params) {
+    return new Promise((resolve, reject) => {
+      // 获取通信频道
+      const channel = constant.socketIo.channel.partySoftware;
+      this.client.emit(channel, { cmd: method, params: params }, (response) => {
+        resolve(response);
+      });
+    });
+  }
+
+  getCoreDB () {
+    const coreDB = require('../storage/index').JsonDB.connection('system');
+    return coreDB;
+  }
+
+  getSocketcPort () {
+    const cdb = this.getCoreDB();
+    const port = cdb.getItem('config').socketServer.port;
+    return parseInt(port);
+  }
+}
+
 module.exports = SocketClient;

package/lib/socket/socketServer.js

@@ -1,77 +1,77 @@
-'use strict';
-
-const assert = require('assert');
-const { Server } = require('socket.io');
-const constant = require('../constant');
-const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
-const is = require('is-type-of');
-
-/**
- * socket server
- */
-class SocketServer {
-  constructor (app) {
-    this.app = app;
-    const options = this.app.config.socketServer;
-    this.consoleLogger = new EggConsoleLogger();
-
-    if (!options.enable) {
-      return;
-    }
-
-    let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketPort());
-    assert(typeof port === 'number', 'socekt port required, and must be a number');
-    this.consoleLogger.info('[ee-core:socket:server] socket server port is:', port);
-
-    // let opt = Object.assign({}, options);
-    // delete opt.enable;
-    this.io = new Server(port, options);
-    this.connec();
-  }
-
-  connec () {
-    const self = this;
-    this.consoleLogger.info('[ee-core:socket:server] connection .....');
-    this.io.on('connection', (socket) => {
-      const channel = constant.socketIo.channel.partySoftware;
-      socket.on(channel, async (message, callback) => {
-        self.consoleLogger.info('[ee-core:socket:server] 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 = self.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(self.app, args);
-          callback(result);
-        } catch (err) {
-          self.app.console.error('[ee-core:socket:server] throw error:', err);
-        }
-      });
-    });
-  }
-
-  getCoreDB () {
-    const coreDB = require('../storage/index').JsonDB.connection('system');
-    return coreDB;
-  }
-
-  getSocketPort () {
-    const cdb = this.getCoreDB();
-    const port = cdb.getItem('config').socketServer.port;
-    return port;
-  }
-}
-
+'use strict';
+
+const assert = require('assert');
+const { Server } = require('socket.io');
+const constant = require('../constant');
+const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
+const is = require('is-type-of');
+
+/**
+ * socket server
+ */
+class SocketServer {
+  constructor (app) {
+    this.app = app;
+    const options = this.app.config.socketServer;
+    this.consoleLogger = new EggConsoleLogger();
+
+    if (!options.enable) {
+      return;
+    }
+
+    let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketPort());
+    assert(typeof port === 'number', 'socekt port required, and must be a number');
+    this.consoleLogger.info('[ee-core:socket:server] socket server port is:', port);
+
+    // let opt = Object.assign({}, options);
+    // delete opt.enable;
+    this.io = new Server(port, options);
+    this.connec();
+  }
+
+  connec () {
+    const self = this;
+    this.consoleLogger.info('[ee-core:socket:server] connection .....');
+    this.io.on('connection', (socket) => {
+      const channel = constant.socketIo.channel.partySoftware;
+      socket.on(channel, async (message, callback) => {
+        self.consoleLogger.info('[ee-core:socket:server] 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 = self.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(self.app, args);
+          callback(result);
+        } catch (err) {
+          self.app.console.error('[ee-core:socket:server] throw error:', err);
+        }
+      });
+    });
+  }
+
+  getCoreDB () {
+    const coreDB = require('../storage/index').JsonDB.connection('system');
+    return coreDB;
+  }
+
+  getSocketPort () {
+    const cdb = this.getCoreDB();
+    const port = cdb.getItem('config').socketServer.port;
+    return port;
+  }
+}
+
 module.exports = SocketServer;

package/lib/socket/start.js

@@ -1,22 +1,22 @@
-'use strict';
-
-const socketServer = require('./socketServer');
-const ipcServer = require('./ipcServer');
-const httpServer = require('./httpServer');
-
-/**
- * server
- */
- module.exports = (app) => {
-
-  // 启动 socket server
-  new socketServer(app);
-
-  // 启动 http server
-  new httpServer(app);  
-
-  // 启动 electron ipc server
-  new ipcServer(app);
-
-}
-
+'use strict';
+
+const socketServer = require('./socketServer');
+const ipcServer = require('./ipcServer');
+const httpServer = require('./httpServer');
+
+/**
+ * server
+ */
+ module.exports = (app) => {
+
+  // 启动 socket server
+  new socketServer(app);
+
+  // 启动 http server
+  new httpServer(app);  
+
+  // 启动 electron ipc server
+  new ipcServer(app);
+
+}
+

package/lib/storage/index.js

@@ -1,34 +1,34 @@
-'use strict';
-
-const assert = require('assert');
-const _ = require('lodash');
-const JsonDB = {};
-
-JsonDB.connection = function (database, options = {}) {
-  let driver = options.driver || 'lowdb';
-  let opt = options.default || {};
-  if (!_.includes(['lowdb', '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 'lowdb':
-      const LowdbStorage = require('./lowdbStorage');
-      storage = new LowdbStorage(database);
-      break;
-    case 'sqlite':
-      const SqliteStorage = require('./sqliteStorage');
-      storage = new SqliteStorage(database, opt);
-      break;
-    default:  
-  }
-
-  return storage;
-}
-
-module.exports = {
-  JsonDB
+'use strict';
+
+const assert = require('assert');
+const _ = require('lodash');
+const JsonDB = {};
+
+JsonDB.connection = function (database, options = {}) {
+  let driver = options.driver || 'lowdb';
+  let opt = options.default || {};
+  if (!_.includes(['lowdb', '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 'lowdb':
+      const LowdbStorage = require('./lowdbStorage');
+      storage = new LowdbStorage(database);
+      break;
+    case 'sqlite':
+      const SqliteStorage = require('./sqliteStorage');
+      storage = new SqliteStorage(database, opt);
+      break;
+    default:  
+  }
+
+  return storage;
+}
+
+module.exports = {
+  JsonDB
 };