@azteam/express 1.2.332 → 1.2.334

package/lib/Server.js

@@ -43,8 +43,8 @@ var RES_TYPE = {
   DOCS: 'DOCS'
 };
 var Server = /*#__PURE__*/function () {
-  function Server() {
-    var currentDir = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  function Server(controllerDirs) {
+    var _this = this;
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var errorCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     _classCallCheck(this, Server);
@@ -69,7 +69,9 @@ var Server = /*#__PURE__*/function () {
     }, this.options.cookieOption);
     this.middlewares = [];
     this.controllers = [];
-    this.initController(currentDir);
+    controllerDirs.map(function (dir) {
+      _this.initController(dir);
+    });
     this.callbackError = errorCallback;
   }
   _createClass(Server, [{
@@ -112,7 +114,7 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "startAPI",
     value: function startAPI(port) {
-      var _this3 = this;
+      var _this4 = this;
       if (!_lodash["default"].isEmpty(this.controllers)) {
         var WHITE_LIST = this.whiteList;
         var COOKIE_OPTION = this.cookieOption;
@@ -233,18 +235,18 @@ var Server = /*#__PURE__*/function () {
           return this.json(resData);
         };
         app.response.cleanCookie = function (data) {
-          var _this = this;
+          var _this2 = this;
           _lodash["default"].map(data, function (name) {
-            _this.clearCookie(name, {
+            _this2.clearCookie(name, {
               domain: COOKIE_OPTION.domain
             });
           });
         };
         app.response.addCookie = function (data) {
-          var _this2 = this;
+          var _this3 = this;
           _lodash["default"].map(data, function (value, key) {
             var maxAge = 86400000 * 365; // 1 year
-            _this2.cookie(key, value, _objectSpread(_objectSpread({}, COOKIE_OPTION), {}, {
+            _this3.cookie(key, value, _objectSpread(_objectSpread({}, COOKIE_OPTION), {}, {
               maxAge: maxAge,
               expires: new Date(Date.now() + maxAge)
             }));
@@ -341,8 +343,8 @@ var Server = /*#__PURE__*/function () {
           } else if (error.errors[0].code === _error.UNKNOWN) {
             console.error(req.originalUrl, err);
           }
-          if (_this3.callbackError) {
-            _this3.callbackError(error, req.originalUrl);
+          if (_this4.callbackError) {
+            _this4.callbackError(error, req.originalUrl);
           }
           return res.status(error.status).json({
             success: false,
@@ -351,7 +353,7 @@ var Server = /*#__PURE__*/function () {
         });
         var server = _http["default"].Server(app);
         server.on('listening', function () {
-          _this3._alert('listening', "Server start at http://localhost:".concat(server.address().port));
+          _this4._alert('listening', "Server start at http://localhost:".concat(server.address().port));
         });
         server.on('error', function (error) {
           if (error.syscall !== 'listen') {
@@ -360,11 +362,11 @@ var Server = /*#__PURE__*/function () {
           var bind = typeof port === 'string' ? "Pipe ".concat(port) : "Port ".concat(port);
           switch (error.code) {
             case 'EACCES':
-              _this3._alert('EACCES', "".concat(bind, " requires elevated privileges"));
+              _this4._alert('EACCES', "".concat(bind, " requires elevated privileges"));
               process.exit(1);
               break;
             case 'EADDRINUSE':
-              _this3._alert('EACCES', "".concat(bind, " is already in use"));
+              _this4._alert('EACCES', "".concat(bind, " is already in use"));
               process.exit(1);
               break;
             default:

package/lib/middleware/cacheMiddleware.js

@@ -29,7 +29,7 @@ function _default(key) {
             case 0:
               redis = req.redis;
               if (!redis) {
-                _context.next = 16;
+                _context.next = 18;
                 break;
               }
               cacheKey = key;
@@ -55,18 +55,27 @@ function _default(key) {
             case 12:
               cacheData = _context.sent;
               if (!cacheData) {
-                _context.next = 15;
+                _context.next = 17;
+                break;
+              }
+              if (cacheData.success) {
+                _context.next = 16;
                 break;
               }
+              return _context.abrupt("return", res.json({
+                success: true,
+                data: cacheData
+              }));
+            case 16:
               return _context.abrupt("return", res.json(cacheData));
-            case 15:
+            case 17:
               res.cache = {
                 key: cacheKey,
                 ttl: options.ttl
               };
-            case 16:
+            case 18:
               return _context.abrupt("return", next());
-            case 17:
+            case 19:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.332",
+    "version": "1.2.334",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {

package/src/Server.js

@@ -22,7 +22,7 @@ const RES_TYPE = {
 };
 
 class Server {
-    constructor(currentDir = '', options = {}, errorCallback = null) {
+    constructor(controllerDirs, options = {}, errorCallback = null) {
         this.options = {
             redis: null,
             isAllowEmptyOrigin: true,
@@ -50,7 +50,9 @@ class Server {
         this.middlewares = [];
         this.controllers = [];
 
-        this.initController(currentDir);
+        controllerDirs.map((dir) => {
+            this.initController(dir);
+        });
 
         this.callbackError = errorCallback;
     }

package/src/middleware/cacheMiddleware.js

@@ -25,6 +25,10 @@ export default function (key, options = {}) {
             }
             const cacheData = await redis.get(cacheKey);
             if (cacheData) {
+                if (!cacheData.success) {
+                    return res.json({success: true, data: cacheData});
+                }
+
                 return res.json(cacheData);
             }
             res.cache = {