@azteam/express 1.2.380 → 1.2.381

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

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