ee-core 1.2.8-beta.4 → 1.2.9-bate.2

package/lib/socket/httpServer.js

@@ -1,103 +1,135 @@
-'use strict';
-
-const assert = require('assert');
-const is = require('is-type-of');
-const Koa = require('koa');
-const cors = require('koa2-cors');
-const koaBody = require('koa-body');
-
-/**
- * http server
- */
-class HttpServer {
-  constructor (app) {
-    this.app = app;
-    this.options = this.app.config.httpServer;
-
-    if (!this.options.enable) {
-      return;
-    }
-
-    let port = process.env.EE_HTTP_PORT ? parseInt(process.env.EE_HTTP_PORT) : parseInt(this.getHttpPort());
-    assert(typeof port === 'number', 'http port required, and must be a number');
-
-    this.create();
-  }
-
-  /**
-   * 创建服务
-   */
-  create () {
-    const self = this;
-    const httpServer = this.options;
-    const url = httpServer.protocol + httpServer.host + ':' + httpServer.port;
-    const corsOptions = httpServer.cors;
-
-    const koaApp = new Koa();
-    koaApp
-      .use(cors(corsOptions))
-      .use(koaBody(httpServer.body))
-      .use(async (ctx, next) => {
-        ctx.eeApp = self.app;
-        await next();
-      })
-      .use(this.dispatch);
-
-    koaApp.listen(httpServer.port, () => {
-      self.app.coreLogger.info('[ee-core:http:server] http server is:', url);
-    });
-  }
-
-  /**
-   * 路由分发
-   */
-  async dispatch (ctx, next) {
-    let uriPath = ctx.request.path;
-    const method = ctx.request.method;
-    let params = ctx.request.query;
-    params = is.object(params) ? JSON.parse(JSON.stringify(params)) : {};
-    const body = ctx.request.body;
-    // 添加到全局属性
-    ctx.eeApp.request = ctx.request;
-    ctx.eeApp.response = ctx.response;
-
-    try {
-      // 找函数
-      if (uriPath.indexOf('/') !== -1) {
-        uriPath = uriPath.substring(1);
-      }
-      const cmd = uriPath.split('/').join('.');
-      const args = (method == 'POST') ? body : params;
-      let fn = null;
-      if (is.string(cmd)) {
-        const actions = cmd.split('.');
-        let obj = ctx.eeApp;
-        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(ctx.eeApp, args);
-      ctx.response.status = 200;
-      ctx.response.body = result;
-    } catch (err) {
-      ctx.eeApp.console.error('[ee-core:http:server] throw error:', err);
-    }
-
-    await next();
-  }
-
-  /**
-   * 获取http端口
-   */  
-  getHttpPort () {
-    const cdb = this.getCoreDB();
-    const port = cdb.getItem('config').httpServer.port;
-    return parseInt(port);
-  } 
-}
-
+'use strict';
+
+const assert = require('assert');
+const is = require('is-type-of');
+const Koa = require('koa');
+const cors = require('koa2-cors');
+const koaBody = require('koa-body');
+const https = require('https');
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * http server
+ */
+class HttpServer {
+  constructor (app) {
+    this.app = app;
+    this.options = this.app.config.httpServer;
+
+    if (!this.options.enable) {
+      return;
+    }
+
+    let port = process.env.EE_HTTP_PORT ? parseInt(process.env.EE_HTTP_PORT) : parseInt(this.getHttpPort());
+    assert(typeof port === 'number', 'http port required, and must be a number');
+
+    this.create();
+  }
+
+  /**
+   * 创建服务
+   */
+  create () {
+    const self = this;
+    const httpServer = this.options;
+    const isHttps = httpServer?.https?.enable ?? false;
+    let sslOptions = {};
+
+    if (isHttps === true) {
+      httpServer.protocol = 'https://';
+      const keyFile = path.join(this.app.config.homeDir, httpServer.https.key);
+      const certFile = path.join(this.app.config.homeDir, httpServer.https.cert);
+      assert(fs.existsSync(keyFile), 'ssl key file is required');
+      assert(fs.existsSync(certFile), 'ssl cert file is required');
+
+      sslOptions.key = fs.readFileSync(keyFile);
+      sslOptions.cert = fs.readFileSync(certFile);
+    }
+    const url = httpServer.protocol + httpServer.host + ':' + httpServer.port;
+    const corsOptions = httpServer.cors;
+
+    const koaApp = new Koa();
+    koaApp
+      .use(cors(corsOptions))
+      .use(koaBody(httpServer.body))
+      .use(async (ctx, next) => {
+        ctx.eeApp = self.app;
+        await next();
+      })
+      .use(this.dispatch);
+
+    let msg = '[ee-core:http:server] server is: ' + url;
+    if (isHttps) {
+      https.createServer(sslOptions, koaApp.callback()).listen(httpServer.port, (err) => {
+        msg = err ? err : msg;
+        self.app.coreLogger.info(msg);
+      });
+    } else {
+      koaApp.listen(httpServer.port, (e) => {
+        msg = e ? e : msg;
+        self.app.coreLogger.info(msg);
+      });
+    }  
+  }
+
+  /**
+   * 路由分发
+   */
+  async dispatch (ctx, next) {
+    let uriPath = ctx.request.path;
+    const method = ctx.request.method;
+    let params = ctx.request.query;
+    params = is.object(params) ? JSON.parse(JSON.stringify(params)) : {};
+    const body = ctx.request.body;
+
+    // 默认
+    ctx.response.status = 200;
+
+    // 添加到全局属性
+    ctx.eeApp.request = ctx.request;
+    ctx.eeApp.response = ctx.response;
+
+    try {
+      // 找函数
+      // 去除开头的 '/'
+      if (uriPath.indexOf('/') == 0) {
+        uriPath = uriPath.substring(1);
+      }
+      if (uriPath.slice(0, 10) != 'controller') {
+        uriPath = 'controller/' + uriPath;
+      }
+      const cmd = uriPath.split('/').join('.');
+      const args = (method == 'POST') ? body : params;
+      let fn = null;
+      if (is.string(cmd)) {
+        const actions = cmd.split('.');
+        let obj = ctx.eeApp;
+        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(ctx.eeApp, args);
+      ctx.response.body = result;
+    } catch (err) {
+      ctx.eeApp.console.error('[ee-core:http:server] throw error:', err);
+    }
+
+    await next();
+  }
+
+  /**
+   * 获取http端口
+   */  
+  getHttpPort () {
+    const cdb = this.getCoreDB();
+    const port = cdb.getItem('config').httpServer.port;
+    return parseInt(port);
+  } 
+}
+
 module.exports = HttpServer;

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,129 +1,129 @@
-'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');
-const utility = require('utility');
-
-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 = (process.env.EE_TYPESCRIPT === 'true' && utils.extensions['.ts'])
-    ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
-    : [ '**/*.js' ];
-    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 = {};
-      if (is.function(fileObj) && !is.generatorFunction(fileObj) && !is.class(fileObj) && !is.asyncFunction(fileObj)) {
-        //obj = obj(this.app);
-      }
-      if (is.class(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);
-        //}
-      }
-      if (is.object(fileObj)) {
-        const keys = Object.keys(fileObj);
-        for (const key of keys) {
-          if (is.function(fileObj[key])) {
-            const names = utility.getParamNames(fileObj[key]);
-            if (names[0] === 'next') {
-              throw new Error(`controller \`${prefix || ''}${key}\` should not use next as argument from file ${path}`);
-            }
-            fns[key] = 1;
-          }
-          // else if (is.object(fileObj[key])) {
-          //   ret[key] = wrapObject(obj[key], path, `${prefix || ''}${key}.`);
-          // }
-        }
-      }
-      // if (is.generatorFunction(obj) || is.asyncFunction(obj)) {      
-      // }
-
-      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');
+const utility = require('utility');
+
+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 = (process.env.EE_TYPESCRIPT === 'true' && utils.extensions['.ts'])
+    ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
+    : [ '**/*.js' ];
+    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 = {};
+      if (is.function(fileObj) && !is.generatorFunction(fileObj) && !is.class(fileObj) && !is.asyncFunction(fileObj)) {
+        //obj = obj(this.app);
+      }
+      if (is.class(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);
+        //}
+      }
+      if (is.object(fileObj)) {
+        const keys = Object.keys(fileObj);
+        for (const key of keys) {
+          if (is.function(fileObj[key])) {
+            const names = utility.getParamNames(fileObj[key]);
+            if (names[0] === 'next') {
+              throw new Error(`controller \`${prefix || ''}${key}\` should not use next as argument from file ${path}`);
+            }
+            fns[key] = 1;
+          }
+          // else if (is.object(fileObj[key])) {
+          //   ret[key] = wrapObject(obj[key], path, `${prefix || ''}${key}.`);
+          // }
+        }
+      }
+      // if (is.generatorFunction(obj) || is.asyncFunction(obj)) {      
+      // }
+
+      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;