ee-core 1.5.2-beta.2 → 2.0.0-beta.2

package/module/log/logger.js

@@ -0,0 +1,61 @@
+const Loggers = require('egg-logger').EggLoggers;
+const assert = require('assert');
+const Ps = require('../utils/ps');
+const Storage = require('../storage');
+
+module.exports = {
+
+  /**
+   * 创建
+   */
+  create(config = {}) {
+    let opt = {};
+    
+    if (Object.keys(config).length == 0) {
+      const defaultConfig = {
+        logger: {
+          type: 'application',
+          dir: Ps.getLogDir(),
+          encoding: 'utf8',
+          env: Ps.env(),
+          level: 'INFO',
+          consoleLevel: 'INFO',
+          disableConsoleAfterReady: !Ps.isDev(),
+          outputJSON: false,
+          buffer: true,
+          appLogName: `ee.log`,
+          coreLogName: 'ee-core.log',
+          agentLogName: 'ee-agent.log',
+          errorLogName: `ee-error.log`,
+          coreLogger: {},
+          allowDebugAtProd: false,
+          enablePerformanceTimer: false,
+        },
+        customLogger: {}
+      }
+      const sysConfig = this._getCoreDB().getItem('config');
+      opt = Object.assign(defaultConfig, {
+        logger: sysConfig.logger,
+        customLogger: sysConfig.customLogger || {}
+      });
+    } else {
+      opt.logger = config.logger;
+      opt.customLogger = config.customLogger;
+    }
+    //console.log('log---------', config);
+
+    assert(Object.keys(opt).length != 0, `logger config is null`);
+
+    const loggers = new Loggers(opt);
+
+    return loggers;
+  },
+
+  /**
+   * 获取 coredb
+   */
+  _getCoreDB() {
+    const coreDB = Storage.connection('system');
+    return coreDB;
+  }
+};

package/module/message/index.js

@@ -0,0 +1,13 @@
+const { isDev, isRenderer, isMain } = require('../utils/ps');
+
+const m = {};
+
+if (isMain) {
+  m.d = require();
+}
+
+if (isRenderer) {
+  m.d = require();
+}
+
+module.exports = m;

package/module/message/ipcMain.js

@@ -0,0 +1,160 @@
+
+class IpcMain  {
+  constructor() {
+    this.event = new EventEmitter();
+    this.services = {};
+    /* 根据name获取window id */
+    ipcMain.handle('MessageChannel.getIdFromName', (e, args) => {
+      return (this.services[args.name] || {}).id;
+    });
+    /* 使用name和window id注册一个服务 */
+    ipcMain.handle('MessageChannel.registryService', (e, args) => {
+      const { name, id } = args;
+      this.registry(name, id);
+      return this.services[name];
+    });
+
+  }
+
+  /**
+    * invoke [在主进程(main)中向另外一个服务进程(service)发送异步请求，并取得回调Promise]
+    * @param  {[String]} name [服务名]
+    * @param  {[String]} channel [服务监听的信号名]
+    * @param  {[Any]} args [携带参数(会被序列化，不会传递对象Proptype信息)]
+    * @return {[Promise]} [回调]
+    */
+  invoke (name, channel, args={}) {
+    const pid = getRandomString();
+    const { id } = this.services[name];
+
+    return new Promise((resolve, reject) => {
+      if (name === 'main') reject(new Error(`MessageChannel: the main process can not send a message to itself!`))
+      if (!id) reject(new Error(`MessageChannel: can not get the id of the window names ${name}`));
+      const win = BrowserWindow.fromId(id);
+      if (!win) reject(new Error(`MessageChannel: can not find a window with id: ${id}`));
+      win.webContents.send(channel, Object.assign(args, { pid, isFromMain: true }));
+      ipcMain.once(pid, function(event, rsp) {
+        resolve(rsp);
+      });
+
+    });
+  }
+
+  /**
+    * handle [在主进程中(main)监听来自其它渲染进程(service/window)的请求，将promiseFunc执行的结果返回]
+    * @param  {[String]} channel [服务监听的信号名]
+    * @param  {[Function]} promiseFunc [此函数执行的结果会被发送到消息发送者]
+    * @return {[Promise]} [回调]
+    */
+  handle(channel, promiseFunc) {
+    if (!promiseFunc instanceof Function) throw new Error('MessageChannel: promiseFunc must be a function!');
+    ipcMain.handle(channel, (event, ...args) => {
+      return promiseFunc(event, ...args).then((result) => {
+  
+        return result;
+      });
+    });
+  }
+
+  /**
+    * handle [在主进程中(main)监听一次来自其它渲染进程(service/window)的请求，将promiseFunc执行的结果返回]
+    * @param  {[String]} channel [服务监听的信号名]
+    * @param  {[Function]} promiseFunc [此函数执行的结果会被发送到消息发送者]
+    * @return {[Promise]} [回调]
+    */
+  handleOnce(channel, promiseFunc) {
+    if (!promiseFunc instanceof Function) throw new Error('MessageChannel: promiseFunc must be a function!');
+    ipcMain.handleOnce(channel, (event, ...args) => {
+      return promiseFunc(event, ...args).then(result => {
+
+        return result;
+      });
+    });
+  }
+
+  /**
+    * send [在主进程(main)向另外一个服务进程(service)发送异步请求，不可立即取得值，请配合on监听信号使用]
+    * @param  {[String]} name [服务名]
+    * @param  {[String]} channel [服务监听的信号名]
+    * @param  {[Any]} args [携带参数(会被序列化，不会传递对象Proptype信息)]
+    */
+  send(name, channel, args={}) {
+    const id = (this.services[name] || {}).id;
+
+
+    if (!id) throw new Error(`MessageChannel: can not get the id of the window names ${name}`);
+    const win = BrowserWindow.fromId(id);
+    if (!win) throw new Error(`MessageChannel: can not find a window with id: ${id}`);
+
+    win.webContents.send(channel, args);
+  }
+
+  /**
+    * send [在主进程中(main)向指定某个id的渲染进程窗口(service/window)发送请求，不可立即取得值，请配合on监听信号使用]
+    * @param  {[String]} id [window id]
+    * @param  {[String]} channel [服务监听的信号名]
+    * @param  {[Any]} args [携带参数(会被序列化，不会传递对象Proptype信息)]
+    */
+  sendTo(id, channel, args) {
+
+    if (!BrowserWindow.fromId(id)) throw new Error(`MessageChannel: can not find a window with id:${id}!`);
+    BrowserWindow.fromId(id).webContents.send(channel, args);
+  }
+
+  /**
+    * on [在主进程中(main)监听来自其它渲染进程(service/window)的请求]
+    * @param  {[String]} channel [服务监听的信号名]
+    * @param  {[Function]} func [消息到达后，此函数会被触发，同于原生ipcRenderer.on]
+    */
+  on(channel, func) {
+    if (!func instanceof Function) throw new Error('MessageChannel: func must be a function!');
+    ipcMain.on(channel, (event, ...args) => {
+
+      func(event, ...args);
+    });
+  }
+
+  /**
+    * once [在主进程中(main)监听一次来自其它渲染进程(service/window)的请求]
+    * @param  {[String]} channel [服务监听的信号名]
+    * @param  {[Function]} func [消息到达后，此函数会被触发，同于原生ipcRenderer.on]
+    */
+   once(channel, func) {
+    if (!func instanceof Function) throw new Error('MessageChannel: func must be a function!');
+    ipcMain.once(channel, (event, ...args) => {
+
+      func(event, ...args);
+    });
+  }
+  
+  /**
+     * registry [注册BrowserWindow和BrowserService]
+     * @param  {[String]} name [唯一的名字]
+     * @param  {[String]} id [window id]
+     * @param  {[String]} pid [process id]
+     */
+  registry(name, id, pid) {
+    if (name === 'main') throw new Error(`MessageChannel: you can not registry a service named:${name}, it's reserved for the main process!`)
+    if (this.services[name]) console.warn(`MessageChannel: the service - ${name} has been registeried!`)
+    this.services[name] = { name, id, pid };
+    this.event.emit('registry', this.services[name]);
+  }
+
+  /**
+     * unregistry [注册BrowserWindow和BrowserService]
+     * @param  {[String]} name [唯一的名字]
+     * @param  {[String]} id [window id]
+     * @param  {[String]} pid [process id]
+     */
+    unregistry(name) {
+      if (name === 'main') throw new Error(`MessageChannel: you can not unregistry a service named:${name}, it's reserved for the main process!`);
+      if (this.services[name]) console.warn(`MessageChannel: the service - ${name} will be unregisteried!`);
+      if (this.services[name]) {
+        this.event.emit('unregistry', this.services[name]);
+        delete this.services[name];
+      } else {
+        console.warn(`MessageChannel: unregistry -> the service - ${name} is not found!`);
+      }
+    }
+}
+

package/{lib → module}/socket/ipcServer.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const debug = require('debug')('ee-core:ipcServer');
 const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
 const is = require('is-type-of');
@@ -7,8 +5,8 @@ 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 Utils = require('../../core/lib/utils');
+const Wrap = require('../utils/wrap');
 
 class IpcServer {
   constructor (app) {
@@ -24,7 +22,7 @@ class IpcServer {
 
     const self = this;
     // 遍历方法
-    const files = utils.filePatterns();
+    const files = Utils.filePatterns();
     const directory = path.join(this.app.config.baseDir, 'controller');
     const filepaths = globby.sync(files, { cwd: directory });
 
@@ -32,13 +30,13 @@ class IpcServer {
       const fullpath = path.join(directory, filepath);
       if (!fs.statSync(fullpath).isFile()) continue;
 
-      const properties = wrap.getProperties(filepath, {caseStyle: 'lower'});
+      const properties = Wrap.getProperties(filepath, {caseStyle: 'lower'});
       const pathName = directory.split(/[/\\]/).slice(-1) + '.' + properties.join('.');
 
-      let fileObj = utils.loadFile(fullpath);
+      let fileObj = Utils.loadFile(fullpath);
       const fns = {};
       // 为了统一，仅支持class文件
-      if (is.class(fileObj) || utils.isBytecodeClass(fileObj)) {
+      if (is.class(fileObj) || Utils.isBytecodeClass(fileObj)) {
         let proto = fileObj.prototype;
         // 不遍历父类的方法
         //while (proto !== Object.prototype) {

package/{lib → module}/socket/socketClient.js

@@ -2,8 +2,9 @@
 
 const assert = require('assert');
 const IoClient = require('socket.io-client');
-const constant = require('../constant');
+const Constants = require('../const');
 const EggConsoleLogger = require('egg-logger').EggConsoleLogger;
+const Storage = require('../storage');
 
 class SocketClient {
   constructor (port) {
@@ -29,7 +30,7 @@ class SocketClient {
   call (method = '', ...params) {
     return new Promise((resolve, reject) => {
       // 获取通信频道
-      const channel = constant.socketIo.channel.partySoftware;
+      const channel = Constants.socketIo.channel.partySoftware;
       this.client.emit(channel, { cmd: method, params: params }, (response) => {
         resolve(response);
       });
@@ -37,7 +38,7 @@ class SocketClient {
   }
 
   getCoreDB () {
-    const coreDB = require('../storage/index').JsonDB.connection('system');
+    const coreDB = Storage.connection('system');
     return coreDB;
   }
 

package/{lib → module}/socket/socketServer.js

@@ -2,9 +2,10 @@
 
 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');
+const Storage = require('../storage');
+const Constants = require('../const');
 
 /**
  * socket server
@@ -33,7 +34,7 @@ class SocketServer {
     const self = this;
     this.consoleLogger.info('[ee-core:socket:server] connection .....');
     this.io.on('connection', (socket) => {
-      const channel = constant.socketIo.channel.partySoftware;
+      const channel = Constants.socketIo.channel.partySoftware;
       socket.on(channel, async (message, callback) => {
         self.consoleLogger.info('[ee-core:socket:server] socket id:' + socket.id + ' message cmd: ' + message.cmd);
 
@@ -63,7 +64,7 @@ class SocketServer {
   }
 
   getCoreDB () {
-    const coreDB = require('../storage/index').JsonDB.connection('system');
+    const coreDB = Storage.connection('system');
     return coreDB;
   }
 

package/module/socket/start.js

@@ -0,0 +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);
+
+}
+

package/{lib → module}/storage/index.js

@@ -1,13 +1,15 @@
-'use strict';
-
 const assert = require('assert');
 const _ = require('lodash');
-const JsonDB = {};
+const DB = {};
+
+DB.connection = function (database, options = {}) {
+  let driver = options.driver || 'jsondb';
+  
+  // 兼容之前api
+  driver = driver == 'lowdb' ? 'jsondb' : driver;
 
-JsonDB.connection = function (database, options = {}) {
-  let driver = options.driver || 'lowdb';
   let opt = options.default || {};
-  if (!_.includes(['lowdb', 'sqlite'], driver)) {
+  if (!_.includes(['jsondb', 'sqlite'], driver)) {
     assert(database, `db driver ${driver} is not supported`);
   }
   if (_.isEmpty(database)) {
@@ -15,20 +17,21 @@ JsonDB.connection = function (database, options = {}) {
   }
   let storage;
   switch (driver)  {
-    case 'lowdb':
-      const LowdbStorage = require('./lowdbStorage');
-      storage = new LowdbStorage(database);
+    case 'jsondb':
+      const JsondbStorage = require('./jsondbStorage');
+      storage = new JsondbStorage(database);
       break;
     case 'sqlite':
       const SqliteStorage = require('./sqliteStorage');
       storage = new SqliteStorage(database, opt);
       break;
-    default:  
+    default:
   }
 
   return storage;
 }
 
-module.exports = {
-  JsonDB
-};
+// 兼容之前的api
+DB.JsonDB = DB;
+
+module.exports = DB;

package/module/storage/jsondb/adapters/Base.js

@@ -0,0 +1,14 @@
+class Base {
+  constructor(source) {
+    this.source = source
+    this.defaultValue = {}
+    this.serialize = this._stringify
+    this.deserialize = JSON.parse
+  }
+
+  _stringify(obj) {
+    return JSON.stringify(obj, null, 2)
+  }
+}
+
+module.exports = Base

package/module/storage/jsondb/adapters/FileSync.js

@@ -0,0 +1,32 @@
+const Base = require('./Base')
+const fs = require('fs')
+
+class FileSync extends Base {
+  
+  read() {
+    if (fs.existsSync(this.source)) {
+      // Read database
+      try {
+        const data = fs.readFileSync(this.source, {encoding: 'utf8'}).trim()
+
+        // 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}`
+        }
+        throw e
+      }
+    } else {
+      // Initialize
+      fs.writeFileSync(this.source, this.serialize(this.defaultValue), {flag:'w+'})
+      return this.defaultValue
+    }
+  }
+
+  write(data) {
+    return fs.writeFileSync(this.source, this.serialize(data), {flag:'w+'})
+  }
+}
+
+module.exports = FileSync

package/{lib/storage/lowdb → module/storage/jsondb}/main.js

@@ -1,12 +1,9 @@
-const lodash = require('lodash')
-const isPromise = require('./isPromise')
+const lodash = require('lodash');
+const assert = require('assert');
+const is = require('is-type-of');
 
 module.exports = function(adapter) {
-  if (typeof adapter !== 'object') {
-    throw new Error(
-      'An adapter must be provided, see https://github.com/typicode/lowdb/#usage'
-    )
-  }
+  assert(typeof adapter === 'object', 'An adapter must be provided');
 
   // Create a fresh copy of lodash
   const _ = lodash.runInContext()
@@ -24,18 +21,17 @@ module.exports = function(adapter) {
     return db
   }
 
-  // Lowdb API
   // Expose _ for mixins
   db._ = _
 
   db.read = () => {
     const r = adapter.read()
-    return isPromise(r) ? r.then(plant) : plant(r)
+    return is.promise(r) ? r.then(plant) : plant(r)
   }
 
   db.write = returnValue => {
     const w = adapter.write(db.getState())
-    return isPromise(w) ? w.then(() => returnValue) : returnValue
+    return is.promise(w) ? w.then(() => returnValue) : returnValue
   }
 
   db.getState = () => db.__wrapped__

package/{lib/storage/lowdbStorage.js → module/storage/jsondbStorage.js}

@@ -1,27 +1,25 @@
-'use strict';
-
 const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
-const lowdb = require('./lowdb/main');
-const FileSync = require('./lowdb/adapters/FileSync');
+const Jsondb = require('./jsondb/main');
+const FileSync = require('./jsondb/adapters/FileSync');
 const _ = require('lodash');
-const constant = require('../constant');
-const utilsCommon = require('../../utils/common');
+const Constants = require('../const');
+const Helper = require('../utils/helper');
+const Ps = require('../utils/ps');
 
-class LowdbStorage {
+class JsondbStorage {
   constructor (name, opt = {}) {
     assert(name, `db name ${name} Cannot be empty`);
 
     this.name = name;
 
     // 数据库key列表
-    this.storageKey = constant.storageKey;
+    this.storageKey = Constants.storageKey;
 
-    const storageDir = utilsCommon.getStorageDir();
+    const storageDir = Ps.getStorageDir();
     if (!fs.existsSync(storageDir)) {
-      utilsCommon.mkdir(storageDir);
-      utilsCommon.chmodPath(storageDir, '777');
+      Helper.mkdir(storageDir);
     }
 
     this.db = this.table(name);
@@ -35,7 +33,7 @@ class LowdbStorage {
 
     const dbFile = this.getFilePath(name);
     const adapter = new FileSync(dbFile);
-    const db = lowdb(adapter);
+    const db = Jsondb(adapter);
 
     assert(fs.existsSync(dbFile), `error: storage ${dbFile} not exists`);
 
@@ -53,7 +51,7 @@ class LowdbStorage {
    * 获取文件绝对路径
    */
   getFilePath (name) {
-    const storageDir = utilsCommon.getStorageDir();
+    const storageDir = Ps.getStorageDir();
     const dbFile = path.join(storageDir, this.getFileName(name));
     return dbFile;
   }
@@ -96,4 +94,4 @@ class LowdbStorage {
   }   
 }
 
-module.exports = LowdbStorage;
+module.exports = JsondbStorage;

package/{lib → module}/storage/sqliteStorage.js

@@ -4,7 +4,8 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 const Database = require('better-sqlite3');
-const utilsCommon = require('../../utils/common');
+const Helper = require('../utils/helper');
+const Ps = require('../utils/ps');
 
 class SqliteStorage {
   constructor (name, opt = {}) {
@@ -12,13 +13,8 @@ class SqliteStorage {
 
     this.name = name;
     this.mode = this.getMode(name);
-
-    const storageDir = this._createStorageDir();
-    this.storageDir = storageDir;
-
-    const fileName = this._formatFileName(name);
-    this.fileName = fileName;
-
+    this.storageDir = this._createStorageDir();
+    this.fileName = this._formatFileName(name);
     this.db = this._initDB(opt);
   }
 
@@ -62,15 +58,15 @@ class SqliteStorage {
    * 创建storage目录
    */
   _createStorageDir () {
-    let storageDir = utilsCommon.getStorageDir();
+    let storageDir = Ps.getStorageDir();
 
     if (this.mode == 'absolute') {
       storageDir = path.dirname(this.name); 
     }
 
     if (!fs.existsSync(storageDir)) {
-      utilsCommon.mkdir(storageDir);
-      utilsCommon.chmodPath(storageDir, '777');
+      Helper.mkdir(storageDir);
+      Helper.chmodPath(storageDir, '777');
     }
 
     return storageDir;