@azteam/express 1.2.379 → 1.2.381

package/lib/Server.js

@@ -52,7 +52,6 @@ var Server = /*#__PURE__*/function () {
     _classCallCheck(this, Server);
     this.options = _objectSpread({
       redis: null,
-      isAllowEmptyOrigin: true,
       whiteList: null,
       cookieOption: {},
       debug: process.env.NODE_ENV === 'development',
@@ -60,7 +59,6 @@ var Server = /*#__PURE__*/function () {
     }, options);
     this.systemUser = this.options.systemUser;
     this.redis = this.options.redis;
-    this.isAllowEmptyOrigin = this.options.isAllowEmptyOrigin;
     this.whiteList = this.options.whiteList;
     this.debug = this.options.debug;
     this.cookieOption = _objectSpread({
@@ -115,7 +113,6 @@ var Server = /*#__PURE__*/function () {
       if (!_lodash["default"].isEmpty(this.controllers)) {
         var WHITE_LIST = this.whiteList,
           COOKIE_OPTION = this.cookieOption,
-          IS_ALLOW_EMPTY = this.isAllowEmptyOrigin,
           SYSTEM_USER = this.systemUser,
           app = (0, _express["default"])();
         app.use((0, _helmet["default"])({
@@ -137,11 +134,7 @@ var Server = /*#__PURE__*/function () {
             agent = req.header('User-Agent');
           var error = null;
           if (!authorization && !agent.startsWith(SYSTEM_USER)) {
-            if (!origin) {
-              if (!IS_ALLOW_EMPTY) {
-                error = new _error.ErrorException(_error.CORS, "Not allowed by CORS");
-              }
-            } else if (WHITE_LIST && !WHITE_LIST.some(function (re) {
+            if (origin && WHITE_LIST && !WHITE_LIST.some(function (re) {
               return origin.endsWith(re);
             })) {
               error = new _error.ErrorException(_error.CORS, "".concat(origin, " Not allowed by CORS"));

package/lib/middleware/etagMiddleware.js

@@ -19,26 +19,27 @@ 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.379",
+    "version": "1.2.381",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",

package/src/Server.js

@@ -25,7 +25,6 @@ class Server {
     constructor(serviceDirs, options = {}, errorCallback = null) {
         this.options = {
             redis: null,
-            isAllowEmptyOrigin: true,
             whiteList: null,
             cookieOption: {},
             debug: process.env.NODE_ENV === 'development',
@@ -36,7 +35,6 @@ class Server {
         this.systemUser = this.options.systemUser;
 
         this.redis = this.options.redis;
-        this.isAllowEmptyOrigin = this.options.isAllowEmptyOrigin;
         this.whiteList = this.options.whiteList;
         this.debug = this.options.debug;
 
@@ -94,7 +92,6 @@ class Server {
         if (!_.isEmpty(this.controllers)) {
             const WHITE_LIST = this.whiteList,
                 COOKIE_OPTION = this.cookieOption,
-                IS_ALLOW_EMPTY = this.isAllowEmptyOrigin,
                 SYSTEM_USER = this.systemUser,
                 app = express();
 
@@ -120,11 +117,7 @@ class Server {
 
                     let error = null;
                     if (!authorization && !agent.startsWith(SYSTEM_USER)) {
-                        if (!origin) {
-                            if (!IS_ALLOW_EMPTY) {
-                                error = new ErrorException(CORS, `Not allowed by CORS`);
-                            }
-                        } else if (WHITE_LIST && !WHITE_LIST.some((re) => origin.endsWith(re))) {
+                        if (origin && WHITE_LIST && !WHITE_LIST.some((re) => origin.endsWith(re))) {
                             error = new ErrorException(CORS, `${origin} Not allowed by CORS`);
                         }
                     }

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();
     };