@azteam/express 1.2.489 → 1.2.493

package/lib/Server.js

@@ -53,10 +53,9 @@ 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,
@@ -81,43 +80,10 @@ var Server = /*#__PURE__*/function () {
     });
     this.middlewares = [];
     this.controllers = [];
-    serviceDirs.map(function (dir) {
-      return _this.initController(dir);
-    });
+    this.socketEvents = [];
     this.callbackError = errorCallback;
   }
   _createClass(Server, [{
-    key: "addController",
-    value: function addController(name, version, controller) {
-      this.controllers.push({
-        name: name,
-        version: version,
-        controller: controller
-      });
-      return this;
-    }
-  }, {
-    key: "initController",
-    value: function initController(apiDir) {
-      var excludeList = this.options.excludeList;
-      if (_fs["default"].existsSync(apiDir)) {
-        var controllerDirs = _fs["default"].readdirSync(apiDir);
-        for (var i = 0; i < controllerDirs.length; i += 1) {
-          var dirName = controllerDirs[i];
-          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
-              var controller = require("".concat(apiDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
-              this.addController(dirName, versionName, controller);
-            }
-          }
-        }
-      }
-      return this;
-    }
-  }, {
     key: "createExpressApp",
     value: function createExpressApp() {
       var _this$options = this.options,
@@ -162,10 +128,45 @@ var Server = /*#__PURE__*/function () {
       }
       return app;
     }
+  }, {
+    key: "addController",
+    value: function addController(name, version, controller) {
+      this.controllers.push({
+        name: name,
+        version: version,
+        controller: controller
+      });
+      return this;
+    }
+  }, {
+    key: "initController",
+    value: function initController(apiDir) {
+      var excludeList = this.options.excludeList;
+      if (_fs["default"].existsSync(apiDir)) {
+        var controllerDirs = _fs["default"].readdirSync(apiDir);
+        for (var i = 0; i < controllerDirs.length; i += 1) {
+          var dirName = controllerDirs[i];
+          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
+              var controller = require("".concat(apiDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
+              this.addController(dirName, versionName, controller);
+            }
+          }
+        }
+      }
+      return this;
+    }
   }, {
     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 cookieOption = this.options.cookieOption;
         var app = this.createExpressApp();
@@ -291,7 +292,7 @@ var Server = /*#__PURE__*/function () {
           var controller = data.controller;
           var controllerName = data.name;
           var controllerVersion = data.version;
-          var listPublicRouter = controller.publicRouter();
+          var listPublicRouter = controller.getPublicRouters();
           _lodash["default"].map(listPublicRouter, function (method) {
             var name = method.name,
               type = method.type;
@@ -358,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);
@@ -402,18 +403,84 @@ var Server = /*#__PURE__*/function () {
       }
       throw new Error('No controllers in use API');
     }
+  }, {
+    key: "addSocketEvent",
+    value: function addSocketEvent(name, version, event) {
+      this.socketEvents.push({
+        name: name,
+        version: version,
+        SocketEvent: event
+      });
+      return this;
+    }
+  }, {
+    key: "initSocketEvent",
+    value: function initSocketEvent(socketDir) {
+      var excludeList = this.options.excludeList;
+      if (_fs["default"].existsSync(socketDir)) {
+        var socketDirs = _fs["default"].readdirSync(socketDir);
+        for (var i = 0; i < socketDirs.length; i += 1) {
+          var dirName = socketDirs[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) {
+              var versionName = versionDirs[j];
+              // eslint-disable-next-line global-require
+              var event = require("".concat(socketDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
+              this.addSocketEvent(dirName, versionName, event);
+            }
+          }
+        }
+      }
+      return this;
+    }
   }, {
     key: "startSocket",
     value: function startSocket(port) {
-      if (!_lodash["default"].isEmpty(this.controllers)) {
+      var _this4 = this;
+      var serviceDirs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      serviceDirs.map(function (dir) {
+        return _this4.initSocketEvent(dir);
+      });
+      var socketEvents = this.socketEvents;
+      if (!_lodash["default"].isEmpty(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));
+        });
+        var eventList = [];
+        var msg = [];
+        _lodash["default"].map(socketEvents, function (data) {
+          var SocketEvent = data.SocketEvent;
+          var eventName = data.name;
+          var eventVersion = data.version;
+          var obj = new SocketEvent(io);
+          var listPublicEvent = obj.getPublicEvents(io);
+          _lodash["default"].map(listPublicEvent, function (method) {
+            var name = method.name,
+              type = method.type;
+            eventList.push(obj[name]);
+            msg.push({
+              name: eventName,
+              version: eventVersion,
+              type: type,
+              method: name
+            });
+          });
+        });
+        console.table(msg);
+        io.on('connection', function (socket) {
+          _lodash["default"].map(eventList, function (func) {
+            func(socket);
+          });
+        });
         return io;
       }
-      throw new Error('No controllers in use SOCKET');
+      throw new Error('No events in use SOCKET');
     }
   }]);
   return Server;

package/lib/controller/Controller.js

@@ -23,8 +23,8 @@ var Controller = /*#__PURE__*/function () {
     this.repository = repository;
   }
   _createClass(Controller, [{
-    key: "publicRouter",
-    value: function publicRouter() {
+    key: "getPublicRouters",
+    value: function getPublicRouters() {
       var child = this;
       var result = [];
 

package/lib/controller/SocketEvent.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var SocketEvent = /*#__PURE__*/function () {
+  function SocketEvent(io) {
+    _classCallCheck(this, SocketEvent);
+    this.io = io;
+  }
+  _createClass(SocketEvent, [{
+    key: "getPublicEvents",
+    value: function getPublicEvents() {
+      var child = this;
+      var result = [];
+
+      // eslint-disable-next-line no-proto
+      while (Object.getPrototypeOf(child.__proto__)) {
+        var data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
+        data.map(function (methodName) {
+          var matches = methodName.match(/^(schedule|listen)/);
+          if (matches) {
+            result.push({
+              type: matches[0],
+              name: methodName
+            });
+          }
+          return true;
+        });
+        // eslint-disable-next-line no-proto
+        child = child.__proto__;
+      }
+      return result;
+    }
+  }]);
+  return SocketEvent;
+}();
+var _default = exports["default"] = SocketEvent;

package/lib/controller/index.js

@@ -9,5 +9,12 @@ Object.defineProperty(exports, "Controller", {
     return _Controller["default"];
   }
 });
+Object.defineProperty(exports, "SocketEvent", {
+  enumerable: true,
+  get: function get() {
+    return _SocketEvent["default"];
+  }
+});
 var _Controller = _interopRequireDefault(require("./Controller"));
+var _SocketEvent = _interopRequireDefault(require("./SocketEvent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.489",
+    "version": "1.2.493",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",

package/src/Server.js

@@ -30,7 +30,7 @@ function compressJson(message) {
 }
 
 class Server {
-    constructor(serviceDirs, options = {}, errorCallback = () => {}) {
+    constructor(options = {}, errorCallback = () => {}) {
         this.options = {
             redis: null,
             whiteList: null,
@@ -54,46 +54,11 @@ class Server {
 
         this.middlewares = [];
         this.controllers = [];
-
-        serviceDirs.map((dir) => {
-            return this.initController(dir);
-        });
+        this.socketEvents = [];
 
         this.callbackError = errorCallback;
     }
 
-    addController(name, version, controller) {
-        this.controllers.push({
-            name,
-            version,
-            controller,
-        });
-        return this;
-    }
-
-    initController(apiDir) {
-        const {excludeList} = this.options;
-
-        if (fs.existsSync(apiDir)) {
-            const controllerDirs = fs.readdirSync(apiDir);
-
-            for (let i = 0; i < controllerDirs.length; i += 1) {
-                const dirName = controllerDirs[i];
-
-                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
-                        const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
-                        this.addController(dirName, versionName, controller);
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
     createExpressApp() {
         const {whiteList, systemUser} = this.options;
 
@@ -141,7 +106,43 @@ class Server {
         return app;
     }
 
-    startAPI(port) {
+    addController(name, version, controller) {
+        this.controllers.push({
+            name,
+            version,
+            controller,
+        });
+        return this;
+    }
+
+    initController(apiDir) {
+        const {excludeList} = this.options;
+
+        if (fs.existsSync(apiDir)) {
+            const controllerDirs = fs.readdirSync(apiDir);
+
+            for (let i = 0; i < controllerDirs.length; i += 1) {
+                const dirName = controllerDirs[i];
+
+                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
+                        const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
+                        this.addController(dirName, versionName, controller);
+                    }
+                }
+            }
+        }
+        return this;
+    }
+
+    startAPI(port, serviceDirs = []) {
+        serviceDirs.map((dir) => {
+            return this.initController(dir);
+        });
+
         if (!_.isEmpty(this.controllers)) {
             const {cookieOption} = this.options;
             const app = this.createExpressApp();
@@ -284,7 +285,7 @@ class Server {
                 const {controller} = data;
                 const controllerName = data.name;
                 const controllerVersion = data.version;
-                const listPublicRouter = controller.publicRouter();
+                const listPublicRouter = controller.getPublicRouters();
 
                 _.map(listPublicRouter, (method) => {
                     const {name, type} = method;
@@ -384,8 +385,45 @@ class Server {
         throw new Error('No controllers in use API');
     }
 
-    startSocket(port) {
-        if (!_.isEmpty(this.controllers)) {
+    addSocketEvent(name, version, event) {
+        this.socketEvents.push({
+            name,
+            version,
+            SocketEvent: event,
+        });
+        return this;
+    }
+
+    initSocketEvent(socketDir) {
+        const {excludeList} = this.options;
+
+        if (fs.existsSync(socketDir)) {
+            const socketDirs = fs.readdirSync(socketDir);
+
+            for (let i = 0; i < socketDirs.length; i += 1) {
+                const dirName = socketDirs[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
+                        const event = require(`${socketDir}/${dirName}/${versionName}/controller`).default;
+                        this.addSocketEvent(dirName, versionName, event);
+                    }
+                }
+            }
+        }
+        return this;
+    }
+
+    startSocket(port, serviceDirs = []) {
+        serviceDirs.map((dir) => {
+            return this.initSocketEvent(dir);
+        });
+
+        const {socketEvents} = this;
+        if (!_.isEmpty(socketEvents)) {
             const httpServer = createServer();
             const app = this.createExpressApp();
             httpServer.on('request', app);
@@ -393,10 +431,45 @@ class Server {
             const io = new SocketIO(httpServer);
             httpServer.listen(port);
 
+            httpServer.on('listening', () => {
+                console.log('listening', `ServerIO start at http://localhost:${httpServer.address().port}`);
+            });
+
+            const eventList = [];
+            const msg = [];
+
+            _.map(socketEvents, (data) => {
+                const {SocketEvent} = data;
+                const eventName = data.name;
+                const eventVersion = data.version;
+                const obj = new SocketEvent(io);
+                const listPublicEvent = obj.getPublicEvents(io);
+
+                _.map(listPublicEvent, (method) => {
+                    const {name, type} = method;
+                    eventList.push(obj[name]);
+
+                    msg.push({
+                        name: eventName,
+                        version: eventVersion,
+                        type,
+                        method: name,
+                    });
+                });
+            });
+
+            console.table(msg);
+
+            io.on('connection', (socket) => {
+                _.map(eventList, (func) => {
+                    func(socket);
+                });
+            });
+
             return io;
         }
 
-        throw new Error('No controllers in use SOCKET');
+        throw new Error('No events in use SOCKET');
     }
 }
 

package/src/controller/Controller.js

@@ -9,7 +9,7 @@ class Controller {
         this.repository = repository;
     }
 
-    publicRouter() {
+    getPublicRouters() {
         let child = this;
         const result = [];
 

package/src/controller/SocketEvent.js

@@ -0,0 +1,31 @@
+class SocketEvent {
+    constructor(io) {
+        this.io = io;
+    }
+
+    getPublicEvents() {
+        let child = this;
+        const result = [];
+
+        // eslint-disable-next-line no-proto
+        while (Object.getPrototypeOf(child.__proto__)) {
+            const data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
+
+            data.map(function (methodName) {
+                const matches = methodName.match(/^(schedule|listen)/);
+                if (matches) {
+                    result.push({
+                        type: matches[0],
+                        name: methodName,
+                    });
+                }
+                return true;
+            });
+            // eslint-disable-next-line no-proto
+            child = child.__proto__;
+        }
+        return result;
+    }
+}
+
+export default SocketEvent;

package/src/controller/index.js

@@ -1 +1,2 @@
 export {default as Controller} from './Controller';
+export {default as SocketEvent} from './SocketEvent';