@azteam/express 1.2.489 → 1.2.492

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();
@@ -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,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)) {
+      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.489",
+    "version": "1.2.492",
     "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();
@@ -384,8 +385,35 @@ class Server {
         throw new Error('No controllers in use API');
     }
 
-    startSocket(port) {
-        if (!_.isEmpty(this.controllers)) {
+    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);
+                    }
+                }
+            }
+        }
+        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);
@@ -393,10 +421,14 @@ class Server {
             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 controllers in use SOCKET');
+        throw new Error('No events in use SOCKET');
     }
 }