@azteam/express 1.2.380 → 1.2.382

package/lib/Server.js

@@ -50,25 +50,22 @@ var Server = /*#__PURE__*/function () {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var errorCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     _classCallCheck(this, Server);
-    this.options = _objectSpread({
+    this.options = _objectSpread(_objectSpread({
       redis: null,
       whiteList: null,
-      cookieOption: {},
+      excludeList: [],
       debug: process.env.NODE_ENV === 'development',
       systemUser: 'toda'
-    }, options);
-    this.systemUser = this.options.systemUser;
-    this.redis = this.options.redis;
-    this.whiteList = this.options.whiteList;
-    this.debug = this.options.debug;
-    this.cookieOption = _objectSpread({
-      domain: null,
-      path: '/',
-      secure: process.env.NODE_ENV !== 'development',
-      httpOnly: true,
-      signed: true,
-      sameSite: 'Lax'
-    }, this.options.cookieOption);
+    }, options), {}, {
+      cookieOption: _objectSpread({
+        domain: null,
+        path: '/',
+        secure: process.env.NODE_ENV !== 'development',
+        httpOnly: true,
+        signed: true,
+        sameSite: 'Lax'
+      }, options.cookieOption)
+    });
     this.middlewares = [];
     this.controllers = [];
     serviceDirs.map(function (dir) {
@@ -89,11 +86,12 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "initController",
     value: function initController(apiDir) {
+      var excludeList = this.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()) {
+          if (!excludeList.include(dirName) && _fs["default"].statSync("".concat(apiDir, "/").concat(dirName)).isDirectory()) {
             var versionDirs = _fs["default"].readdirSync("".concat(apiDir, "/").concat(dirName));
             for (var j = 0; j < versionDirs.length; j += 1) {
               var versionName = versionDirs[j],
@@ -111,9 +109,10 @@ var Server = /*#__PURE__*/function () {
     value: function startAPI(port) {
       var _this4 = this;
       if (!_lodash["default"].isEmpty(this.controllers)) {
-        var WHITE_LIST = this.whiteList,
-          COOKIE_OPTION = this.cookieOption,
-          SYSTEM_USER = this.systemUser,
+        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
@@ -133,8 +132,8 @@ var Server = /*#__PURE__*/function () {
             authorization = req.header('Authorization'),
             agent = req.header('User-Agent');
           var error = null;
-          if (!authorization && !agent.startsWith(SYSTEM_USER)) {
-            if (origin && WHITE_LIST && !WHITE_LIST.some(function (re) {
+          if (!authorization && !agent.startsWith(systemUser)) {
+            if (origin && whiteList && !whiteList.some(function (re) {
               return origin.endsWith(re);
             })) {
               error = new _error.ErrorException(_error.CORS, "".concat(origin, " Not allowed by CORS"));
@@ -145,7 +144,7 @@ var Server = /*#__PURE__*/function () {
             origin: true
           });
         }));
-        if (this.debug) {
+        if (this.options.debug) {
           app.use((0, _morgan["default"])('dev'));
         }
         app.get('/robots.txt', function (req, res) {
@@ -155,7 +154,7 @@ var Server = /*#__PURE__*/function () {
         app.get('/favicon.ico', function (req, res) {
           return res.status(204).json({});
         });
-        var redis = this.redis;
+        var redis = this.options.redis;
         if (redis) {
           app.request.redis = redis;
           app.response.redis = redis;
@@ -229,7 +228,7 @@ var Server = /*#__PURE__*/function () {
           var _this2 = this;
           _lodash["default"].map(data, function (name) {
             _this2.clearCookie(name, {
-              domain: COOKIE_OPTION.domain
+              domain: cookieOption.domain
             });
           });
         };
@@ -237,7 +236,7 @@ var Server = /*#__PURE__*/function () {
           var _this3 = this;
           _lodash["default"].map(data, function (value, key) {
             var maxAge = 86400000 * 365; // 1 year
-            _this3.cookie(key, value, _objectSpread(_objectSpread({}, COOKIE_OPTION), {}, {
+            _this3.cookie(key, value, _objectSpread(_objectSpread({}, cookieOption), {}, {
               maxAge: maxAge,
               expires: new Date(Date.now() + maxAge)
             }));

package/lib/middleware/etagMiddleware.js

@@ -12,33 +12,33 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function floorToMinute(time, minutes) {
   var roundSecond = minutes * 60;
-  time = time - time % (Math.floor(time / roundSecond) * roundSecond);
-  return time;
+  return time - time % (Math.floor(time / roundSecond) * roundSecond);
 }
 function _default() {
   var mTimeout = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 5;
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
-      var etag_hash;
+      var etagHash;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!(req.method === 'GET')) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
-              etag_hash = (0, _etag["default"])(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
-              if (!(req.headers['if-none-match'] === etag_hash)) {
+              etagHash = (0, _etag["default"])(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
+              if (!(req.headers['if-none-match'] === etagHash)) {
                 _context.next = 4;
                 break;
               }
               return _context.abrupt("return", res.status(304).send());
             case 4:
-              res.setHeader('ETag', etag_hash);
-            case 5:
-              return _context.abrupt("return", next());
+              res.setHeader('ETag', etagHash);
+              res.setHeader('Cache-Control', "max-age=".concat(mTimeout * 60));
             case 6:
+              return _context.abrupt("return", next());
+            case 7:
             case "end":
               return _context.stop();
           }

package/package.json

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

package/src/Server.js

@@ -26,26 +26,19 @@ class Server {
         this.options = {
             redis: null,
             whiteList: null,
-            cookieOption: {},
+            excludeList: [],
             debug: process.env.NODE_ENV === 'development',
             systemUser: 'toda',
             ...options,
-        };
-
-        this.systemUser = this.options.systemUser;
-
-        this.redis = this.options.redis;
-        this.whiteList = this.options.whiteList;
-        this.debug = this.options.debug;
-
-        this.cookieOption = {
-            domain: null,
-            path: '/',
-            secure: process.env.NODE_ENV !== 'development',
-            httpOnly: true,
-            signed: true,
-            sameSite: 'Lax',
-            ...this.options.cookieOption,
+            cookieOption: {
+                domain: null,
+                path: '/',
+                secure: process.env.NODE_ENV !== 'development',
+                httpOnly: true,
+                signed: true,
+                sameSite: 'Lax',
+                ...options.cookieOption,
+            },
         };
 
         this.middlewares = [];
@@ -68,12 +61,14 @@ class Server {
     }
 
     initController(apiDir) {
+        const {excludeList} = this;
+
         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()) {
+                if (!excludeList.include(dirName) && fs.statSync(`${apiDir}/${dirName}`).isDirectory()) {
                     const versionDirs = fs.readdirSync(`${apiDir}/${dirName}`);
 
                     for (let j = 0; j < versionDirs.length; j += 1) {
@@ -90,9 +85,7 @@ class Server {
 
     startAPI(port) {
         if (!_.isEmpty(this.controllers)) {
-            const WHITE_LIST = this.whiteList,
-                COOKIE_OPTION = this.cookieOption,
-                SYSTEM_USER = this.systemUser,
+            const {whiteList, cookieOption, systemUser} = this.options,
                 app = express();
 
             app.use(
@@ -116,8 +109,8 @@ class Server {
                         agent = req.header('User-Agent');
 
                     let error = null;
-                    if (!authorization && !agent.startsWith(SYSTEM_USER)) {
-                        if (origin && WHITE_LIST && !WHITE_LIST.some((re) => origin.endsWith(re))) {
+                    if (!authorization && !agent.startsWith(systemUser)) {
+                        if (origin && whiteList && !whiteList.some((re) => origin.endsWith(re))) {
                             error = new ErrorException(CORS, `${origin} Not allowed by CORS`);
                         }
                     }
@@ -128,7 +121,7 @@ class Server {
                 })
             );
 
-            if (this.debug) {
+            if (this.options.debug) {
                 app.use(morgan('dev'));
             }
 
@@ -138,7 +131,7 @@ class Server {
             });
             app.get('/favicon.ico', (req, res) => res.status(204).json({}));
 
-            const {redis} = this;
+            const {redis} = this.options;
 
             if (redis) {
                 app.request.redis = redis;
@@ -218,7 +211,7 @@ class Server {
             app.response.cleanCookie = function (data) {
                 _.map(data, (name) => {
                     this.clearCookie(name, {
-                        domain: COOKIE_OPTION.domain,
+                        domain: cookieOption.domain,
                     });
                 });
             };
@@ -227,7 +220,7 @@ class Server {
                 _.map(data, (value, key) => {
                     const maxAge = 86400000 * 365; // 1 year
                     this.cookie(key, value, {
-                        ...COOKIE_OPTION,
+                        ...cookieOption,
                         maxAge,
                         expires: new Date(Date.now() + maxAge),
                     });

package/src/middleware/etagMiddleware.js

@@ -2,18 +2,18 @@ import etag from 'etag';
 
 function floorToMinute(time, minutes) {
     const roundSecond = minutes * 60;
-    time = time - (time % (Math.floor(time / roundSecond) * roundSecond));
-    return time;
+    return time - (time % (Math.floor(time / roundSecond) * roundSecond));
 }
 
 export default function (mTimeout = 5) {
     return async function (req, res, next) {
         if (req.method === 'GET') {
-            const etag_hash = etag(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
-            if (req.headers['if-none-match'] === etag_hash) {
+            const etagHash = etag(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
+            if (req.headers['if-none-match'] === etagHash) {
                 return res.status(304).send();
             }
-            res.setHeader('ETag', etag_hash);
+            res.setHeader('ETag', etagHash);
+            res.setHeader('Cache-Control', `max-age=${mTimeout * 60}`);
         }
         return next();
     };