@azteam/express 1.2.488 → 1.2.492

package/lib/Server.js

@@ -13,14 +13,18 @@ var _express = _interopRequireDefault(require("express"));
 require("express-async-errors");
 var _fs = _interopRequireDefault(require("fs"));
 var _helmet = _interopRequireDefault(require("helmet"));
-var _http = _interopRequireDefault(require("http"));
+var _http = _interopRequireWildcard(require("http"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _methodOverride = _interopRequireDefault(require("method-override"));
 var _morgan = _interopRequireDefault(require("morgan"));
+var _pako = _interopRequireDefault(require("pako"));
 var _path = _interopRequireDefault(require("path"));
 var _psl = _interopRequireDefault(require("psl"));
+var _socket = require("socket.io");
 var _error = require("@azteam/error");
 var _util = require("@azteam/util");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -45,11 +49,13 @@ var RES_TYPE = {
   OBJECT: 'OBJECT',
   DOCS: 'DOCS'
 };
+function compressJson(message) {
+  return _pako["default"].deflate(JSON.stringify(message));
+}
 var Server = /*#__PURE__*/function () {
-  function Server(serviceDirs) {
-    var _this = this;
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var errorCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
+  function Server() {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var errorCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
     _classCallCheck(this, Server);
     this.options = _objectSpread(_objectSpread({
       redis: null,
@@ -74,12 +80,55 @@ var Server = /*#__PURE__*/function () {
     });
     this.middlewares = [];
     this.controllers = [];
-    serviceDirs.map(function (dir) {
-      return _this.initController(dir);
-    });
+    this.socketEvents = [];
     this.callbackError = errorCallback;
   }
   _createClass(Server, [{
+    key: "createExpressApp",
+    value: function createExpressApp() {
+      var _this$options = this.options,
+        whiteList = _this$options.whiteList,
+        systemUser = _this$options.systemUser;
+      var app = (0, _express["default"])();
+      app.use((0, _helmet["default"])({
+        frameguard: false
+      }));
+      app.set('view engine', 'ejs');
+      app.use((0, _methodOverride["default"])());
+      app.use(_bodyParser["default"].urlencoded({
+        limit: '5mb',
+        extended: true
+      }));
+      app.use(_bodyParser["default"].json({
+        limit: '5mb'
+      }));
+      app.set('trust proxy', 1);
+      app.use((0, _cookieParser["default"])(process.env.SECRET_KEY));
+      app.use((0, _compression["default"])());
+      app.use((0, _cors["default"])(function (req, callback) {
+        var origin = req.get('Origin');
+        var authorization = req.get('Authorization');
+        var agent = req.get('User-Agent') || 'null';
+        var error = null;
+        if (!authorization && !agent.startsWith(systemUser)) {
+          if (origin && whiteList && !whiteList.some(function (re) {
+            return origin.endsWith(re);
+          })) {
+            console.error("CORS ".concat(agent, " ").concat(origin));
+            error = new _error.ErrorException(_error.CORS, "".concat(origin, " Not allowed by CORS"));
+          }
+        }
+        callback(error, {
+          credentials: true,
+          origin: true
+        });
+      }));
+      if (this.options.debug) {
+        app.use((0, _morgan["default"])('dev'));
+      }
+      return app;
+    }
+  }, {
     key: "addController",
     value: function addController(name, version, controller) {
       this.controllers.push({
@@ -100,9 +149,9 @@ var Server = /*#__PURE__*/function () {
           if (_fs["default"].statSync("".concat(apiDir, "/").concat(dirName)).isDirectory()) {
             var versionDirs = _lodash["default"].differenceWith(_fs["default"].readdirSync("".concat(apiDir, "/").concat(dirName)), excludeList);
             for (var j = 0; j < versionDirs.length; j += 1) {
-              var versionName = versionDirs[j],
-                // eslint-disable-next-line global-require,import/no-dynamic-require
-                controller = require("".concat(apiDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
+              var versionName = versionDirs[j];
+              // eslint-disable-next-line global-require,import/no-dynamic-require
+              var controller = require("".concat(apiDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
               this.addController(dirName, versionName, controller);
             }
           }
@@ -113,49 +162,14 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "startAPI",
     value: function startAPI(port) {
-      var _this4 = this;
+      var _this = this;
+      var serviceDirs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      serviceDirs.map(function (dir) {
+        return _this.initController(dir);
+      });
       if (!_lodash["default"].isEmpty(this.controllers)) {
-        var _this$options = this.options,
-          whiteList = _this$options.whiteList,
-          cookieOption = _this$options.cookieOption,
-          systemUser = _this$options.systemUser,
-          app = (0, _express["default"])();
-        app.use((0, _helmet["default"])({
-          frameguard: false
-        }));
-        app.set('view engine', 'ejs');
-        app.use((0, _methodOverride["default"])());
-        app.use(_bodyParser["default"].urlencoded({
-          limit: '5mb',
-          extended: true
-        }));
-        app.use(_bodyParser["default"].json({
-          limit: '5mb'
-        }));
-        app.set('trust proxy', 1);
-        app.use((0, _cookieParser["default"])(process.env.SECRET_KEY));
-        app.use((0, _compression["default"])());
-        app.use((0, _cors["default"])(function (req, callback) {
-          var origin = req.get('Origin'),
-            authorization = req.get('Authorization'),
-            agent = req.get('User-Agent') || 'null';
-          var error = null;
-          if (!authorization && !agent.startsWith(systemUser)) {
-            if (origin && whiteList && !whiteList.some(function (re) {
-              return origin.endsWith(re);
-            })) {
-              console.error("CORS ".concat(agent, " ").concat(origin));
-              error = new _error.ErrorException(_error.CORS, "".concat(origin, " Not allowed by CORS"));
-            }
-          }
-          callback(error, {
-            credentials: true,
-            origin: true
-          });
-        }));
-        if (this.options.debug) {
-          app.use((0, _morgan["default"])('dev'));
-        }
+        var cookieOption = this.options.cookieOption;
+        var app = this.createExpressApp();
         app.get('/robots.txt', function (req, res) {
           res.type('text/plain');
           res.send('User-agent: *\nDisallow: /');
@@ -275,14 +289,14 @@ var Server = /*#__PURE__*/function () {
         });
         var msg = [];
         _lodash["default"].map(this.controllers, function (data) {
-          var controller = data.controller,
-            controllerName = data.name,
-            controllerVersion = data.version,
-            listPublicRouter = controller.publicRouter();
+          var controller = data.controller;
+          var controllerName = data.name;
+          var controllerVersion = data.version;
+          var listPublicRouter = controller.publicRouter();
           _lodash["default"].map(listPublicRouter, function (method) {
             var name = method.name,
-              type = method.type,
-              router = controller[name]();
+              type = method.type;
+            var router = controller[name]();
             if (!router.disabled) {
               router.path = "/".concat(method.path, "/").concat(router.path);
               router.path = controller.pathName ? "/".concat(controller.pathName).concat(router.path) : router.path;
@@ -345,8 +359,8 @@ var Server = /*#__PURE__*/function () {
           if (process.env.NODE_ENV === 'development') {
             console.log(error.errors);
           }
-          if (_this4.callbackError) {
-            _this4.callbackError(error, req.originalUrl);
+          if (_this.callbackError) {
+            _this.callbackError(error, req.originalUrl);
           }
           if (req.callbackError) {
             req.callbackError(error);
@@ -389,13 +403,47 @@ var Server = /*#__PURE__*/function () {
       }
       throw new Error('No controllers in use API');
     }
+  }, {
+    key: "initSocketEvent",
+    value: function initSocketEvent(socketDir) {
+      var excludeList = this.options.excludeList;
+      if (_fs["default"].existsSync(socketDir)) {
+        var controllerDirs = _fs["default"].readdirSync(socketDir);
+        for (var i = 0; i < controllerDirs.length; i += 1) {
+          var dirName = controllerDirs[i];
+          if (_fs["default"].statSync("".concat(socketDir, "/").concat(dirName)).isDirectory()) {
+            var versionDirs = _lodash["default"].differenceWith(_fs["default"].readdirSync("".concat(socketDir, "/").concat(dirName)), excludeList);
+            for (var j = 0; j < versionDirs.length; j += 1) {
+              // const versionName = versionDirs[j];
+              // // eslint-disable-next-line global-require,import/no-dynamic-require
+              // const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
+              // this.addController(dirName, versionName, controller);
+            }
+          }
+        }
+      }
+      return this;
+    }
   }, {
     key: "startSocket",
     value: function startSocket(port) {
-      if (!_lodash["default"].isEmpty(this.controllers)) {
-        return this;
+      var _this4 = this;
+      var serviceDirs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      serviceDirs.map(function (dir) {
+        return _this4.initSocketEvent(dir);
+      });
+      if (!_lodash["default"].isEmpty(this.socketEvents)) {
+        var httpServer = (0, _http.createServer)();
+        var app = this.createExpressApp();
+        httpServer.on('request', app);
+        var io = new _socket.Server(httpServer);
+        httpServer.listen(port);
+        httpServer.on('listening', function () {
+          console.log('listening', "ServerIO start at http://localhost:".concat(httpServer.address().port));
+        });
+        return io;
       }
-      throw new Error('No controllers in use SOCKET');
+      throw new Error('No events in use SOCKET');
     }
   }]);
   return Server;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.488",
+    "version": "1.2.492",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",
@@ -37,6 +37,7 @@
         "pluralize": "8.0.0",
         "psl": "1.8.0",
         "socket.io": "4.4.1",
-        "ua-parser-js": "1.0.32"
+        "ua-parser-js": "1.0.32",
+        "pako": "2.0.4"
     }
 }

package/src/Server.js

@@ -7,12 +7,14 @@ import express from 'express';
 import 'express-async-errors';
 import fs from 'fs';
 import helmet from 'helmet';
-import http from 'http';
+import http, {createServer} from 'http';
 import _ from 'lodash';
 import methodOverride from 'method-override';
 import morgan from 'morgan';
+import pako from 'pako';
 import path from 'path';
 import psl from 'psl';
+import {Server as SocketIO} from 'socket.io';
 
 import {CORS, ErrorException, NOT_FOUND, UNKNOWN, errorCatch} from '@azteam/error';
 import {omitArrayItem, omitItem} from '@azteam/util';
@@ -23,8 +25,12 @@ const RES_TYPE = {
     DOCS: 'DOCS',
 };
 
+function compressJson(message) {
+    return pako.deflate(JSON.stringify(message));
+}
+
 class Server {
-    constructor(serviceDirs, options = {}, errorCallback = () => {}) {
+    constructor(options = {}, errorCallback = () => {}) {
         this.options = {
             redis: null,
             whiteList: null,
@@ -48,14 +54,58 @@ class Server {
 
         this.middlewares = [];
         this.controllers = [];
-
-        serviceDirs.map((dir) => {
-            return this.initController(dir);
-        });
+        this.socketEvents = [];
 
         this.callbackError = errorCallback;
     }
 
+    createExpressApp() {
+        const {whiteList, systemUser} = this.options;
+
+        const app = express();
+
+        app.use(
+            helmet({
+                frameguard: false,
+            })
+        );
+
+        app.set('view engine', 'ejs');
+        app.use(methodOverride());
+        app.use(bodyParser.urlencoded({limit: '5mb', extended: true}));
+        app.use(bodyParser.json({limit: '5mb'}));
+
+        app.set('trust proxy', 1);
+
+        app.use(cookieParser(process.env.SECRET_KEY));
+        app.use(compression());
+        app.use(
+            cors(function (req, callback) {
+                const origin = req.get('Origin');
+                const authorization = req.get('Authorization');
+                const agent = req.get('User-Agent') || 'null';
+
+                let error = null;
+                if (!authorization && !agent.startsWith(systemUser)) {
+                    if (origin && whiteList && !whiteList.some((re) => origin.endsWith(re))) {
+                        console.error(`CORS ${agent} ${origin}`);
+                        error = new ErrorException(CORS, `${origin} Not allowed by CORS`);
+                    }
+                }
+                callback(error, {
+                    credentials: true,
+                    origin: true,
+                });
+            })
+        );
+
+        if (this.options.debug) {
+            app.use(morgan('dev'));
+        }
+
+        return app;
+    }
+
     addController(name, version, controller) {
         this.controllers.push({
             name,
@@ -77,9 +127,9 @@ class Server {
                 if (fs.statSync(`${apiDir}/${dirName}`).isDirectory()) {
                     const versionDirs = _.differenceWith(fs.readdirSync(`${apiDir}/${dirName}`), excludeList);
                     for (let j = 0; j < versionDirs.length; j += 1) {
-                        const versionName = versionDirs[j],
-                            // eslint-disable-next-line global-require,import/no-dynamic-require
-                            controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
+                        const versionName = versionDirs[j];
+                        // eslint-disable-next-line global-require,import/no-dynamic-require
+                        const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
                         this.addController(dirName, versionName, controller);
                     }
                 }
@@ -88,50 +138,14 @@ class Server {
         return this;
     }
 
-    startAPI(port) {
-        if (!_.isEmpty(this.controllers)) {
-            const {whiteList, cookieOption, systemUser} = this.options,
-                app = express();
-
-            app.use(
-                helmet({
-                    frameguard: false,
-                })
-            );
-
-            app.set('view engine', 'ejs');
-
-            app.use(methodOverride());
-            app.use(bodyParser.urlencoded({limit: '5mb', extended: true}));
-            app.use(bodyParser.json({limit: '5mb'}));
-
-            app.set('trust proxy', 1);
-
-            app.use(cookieParser(process.env.SECRET_KEY));
-            app.use(compression());
-            app.use(
-                cors(function (req, callback) {
-                    const origin = req.get('Origin'),
-                        authorization = req.get('Authorization'),
-                        agent = req.get('User-Agent') || 'null';
-
-                    let error = null;
-                    if (!authorization && !agent.startsWith(systemUser)) {
-                        if (origin && whiteList && !whiteList.some((re) => origin.endsWith(re))) {
-                            console.error(`CORS ${agent} ${origin}`);
-                            error = new ErrorException(CORS, `${origin} Not allowed by CORS`);
-                        }
-                    }
-                    callback(error, {
-                        credentials: true,
-                        origin: true,
-                    });
-                })
-            );
+    startAPI(port, serviceDirs = []) {
+        serviceDirs.map((dir) => {
+            return this.initController(dir);
+        });
 
-            if (this.options.debug) {
-                app.use(morgan('dev'));
-            }
+        if (!_.isEmpty(this.controllers)) {
+            const {cookieOption} = this.options;
+            const app = this.createExpressApp();
 
             app.get('/robots.txt', function (req, res) {
                 res.type('text/plain');
@@ -268,14 +282,14 @@ class Server {
 
             const msg = [];
             _.map(this.controllers, (data) => {
-                const {controller} = data,
-                    controllerName = data.name,
-                    controllerVersion = data.version,
-                    listPublicRouter = controller.publicRouter();
+                const {controller} = data;
+                const controllerName = data.name;
+                const controllerVersion = data.version;
+                const listPublicRouter = controller.publicRouter();
 
                 _.map(listPublicRouter, (method) => {
-                    const {name, type} = method,
-                        router = controller[name]();
+                    const {name, type} = method;
+                    const router = controller[name]();
                     if (!router.disabled) {
                         router.path = `/${method.path}/${router.path}`;
                         router.path = controller.pathName ? `/${controller.pathName}${router.path}` : router.path;
@@ -371,11 +385,50 @@ class Server {
         throw new Error('No controllers in use API');
     }
 
-    startSocket(port) {
-        if (!_.isEmpty(this.controllers)) {
-            return this;
+    initSocketEvent(socketDir) {
+        const {excludeList} = this.options;
+
+        if (fs.existsSync(socketDir)) {
+            const controllerDirs = fs.readdirSync(socketDir);
+
+            for (let i = 0; i < controllerDirs.length; i += 1) {
+                const dirName = controllerDirs[i];
+
+                if (fs.statSync(`${socketDir}/${dirName}`).isDirectory()) {
+                    const versionDirs = _.differenceWith(fs.readdirSync(`${socketDir}/${dirName}`), excludeList);
+                    for (let j = 0; j < versionDirs.length; j += 1) {
+                        // const versionName = versionDirs[j];
+                        // // eslint-disable-next-line global-require,import/no-dynamic-require
+                        // const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
+                        // this.addController(dirName, versionName, controller);
+                    }
+                }
+            }
         }
-        throw new Error('No controllers in use SOCKET');
+        return this;
+    }
+
+    startSocket(port, serviceDirs = []) {
+        serviceDirs.map((dir) => {
+            return this.initSocketEvent(dir);
+        });
+
+        if (!_.isEmpty(this.socketEvents)) {
+            const httpServer = createServer();
+            const app = this.createExpressApp();
+            httpServer.on('request', app);
+
+            const io = new SocketIO(httpServer);
+            httpServer.listen(port);
+
+            httpServer.on('listening', () => {
+                console.log('listening', `ServerIO start at http://localhost:${httpServer.address().port}`);
+            });
+
+            return io;
+        }
+
+        throw new Error('No events in use SOCKET');
     }
 }