ee-core 2.0.0-beta.3 → 2.0.0-beta.6

package/module/message/childMessage.js

@@ -1,63 +0,0 @@
-const Log = require('../log');
-
-/**
-  * ChildMessage
-  */
-class ChildMessage {
-  constructor() {
-    // ...
-  }
-
-  /**
-   * 初始化事件监听
-   */
-  initEvents() {
-    process.on('disconnect', () => {
-      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process disconnected:${process.pid} !`);
-    });
-    process.on('exit', () => {
-      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process exited:${process.pid} !`);
-    });
-  }
-
-  /**
-   * 监听消息
-   */
-  onMessage(handle) {
-    Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${params} from the mainProcess`);
-
-    process.on('message', handle.bind(this));
-  }
-
-  /**
-   * 消息处理
-   */
-  // _handleMessage(params = {}) {
-  //   Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${params} from the mainProcess`);
-  // }
-
-  /**
-   * 向主进程发消息
-   */
-  sendToMain(message, ...other) {
-    return process.send(message, ...other);
-  }
-
-  /**
-   * 断开连接
-   */
-  disconnect() {
-    process.disconnect();
-  }
-
-  /**
-   * 进程退出
-   */
-  exit() {
-    process.exit();
-  }
-}
-
-
-
-module.exports = ChildMessage;

package/module/message/ipcMain.js

@@ -1,160 +0,0 @@
-
-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/module/socket/socketClient.js

@@ -1,49 +0,0 @@
-'use strict';
-
-const assert = require('assert');
-const IoClient = require('socket.io-client');
-const Constants = require('../const');
-const Storage = require('../storage');
-
-class SocketClient {
-  constructor (port) {
-    port = port ? parseInt(port) : this.getSocketcPort();
-
-    assert(typeof port === 'number', 'port required, and must be a number');
-    
-    const url  = 'http://127.0.0.1:' + port;
-    console.log('[ee-core] [module/socket/socketClient] 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 = Constants.socketIo.channel.partySoftware;
-      this.client.emit(channel, { cmd: method, params: params }, (response) => {
-        resolve(response);
-      });
-    });
-  }
-
-  getCoreDB () {
-    const coreDB = Storage.connection('system');
-    return coreDB;
-  }
-
-  getSocketcPort () {
-    const cdb = this.getCoreDB();
-    const port = cdb.getItem('config').socketServer.port;
-    return parseInt(port);
-  }
-}
-
-module.exports = SocketClient;

package/module/socket/socketServer.js

@@ -1,76 +0,0 @@
-'use strict';
-
-const assert = require('assert');
-const { Server } = require('socket.io');
-const is = require('is-type-of');
-const Storage = require('../storage');
-const Constants = require('../const');
-const Log = require('../log');
-
-/**
- * socket server
- */
-class SocketServer {
-  constructor (app) {
-    this.app = app;
-    const options = this.app.config.socketServer;
-
-    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] [module/socket/socketServer] port is:', port);
-
-    // let opt = Object.assign({}, options);
-    // delete opt.enable;
-    this.io = new Server(port, options);
-    this.connec();
-  }
-
-  connec () {
-    const self = this;
-    this.io.on('connection', (socket) => {
-      const channel = Constants.socketIo.channel.partySoftware;
-      socket.on(channel, async (message, callback) => {
-        console.log('[ee-core] [module/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 = 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) {
-          Log.coreLogger.error('[ee-core] [module/socket/socketServer] throw error:', err);
-        }
-      });
-    });
-  }
-
-  getCoreDB () {
-    const coreDB = Storage.connection('system');
-    return coreDB;
-  }
-
-  getSocketPort () {
-    const cdb = this.getCoreDB();
-    const port = cdb.getItem('config').socketServer.port;
-    return port;
-  }
-}
-
-module.exports = SocketServer;

package/module/socket/start.js

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