Merge pull request #5 from jkyberneees/fix-nottl

Fixes an issue when TTL is not found and Cache-Control is provided

Author: jkyberneees

index.js

@@ -75,7 +75,11 @@ const middleware = (opts) => async (req, res, next) => {
         ttl = cacheControl(payload.headers[CACHE_CONTROL]).maxAge
       }
       if (!ttl) {
-        ttl = Math.max(ms(payload.headers[X_CACHE_TIMEOUT]), 1000) / 1000 // min value: 1 second
+        if (payload.headers[X_CACHE_TIMEOUT]) {
+          ttl = Math.max(ms(payload.headers[X_CACHE_TIMEOUT]), 1000) / 1000 // min value: 1 second
+        } else {
+          return // no TTL found, we don't cache
+        }
       }
 
       // setting cache-control header if absent

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "http-cache-middleware",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "HTTP Cache Middleware",
   "main": "index.js",
   "scripts": {
@@ -26,12 +26,12 @@
     "got": "^9.6.0",
     "mocha": "^6.1.4",
     "nyc": "^14.1.1",
-    "restana": "^3.2.2",
+    "restana": "^3.2.3",
     "standard": "^12.0.1"
   },
   "dependencies": {
     "@tusbar/cache-control": "^0.3.1",
-    "cache-manager": "^2.9.1",
+    "cache-manager": "^2.10.0",
     "matcher": "^2.0.0",
     "middleware-if-unless": "^1.2.1",
     "ms": "^2.1.2",

package.json

@@ -43,6 +43,12 @@ describe('cache middleware', () => {
       }, 50)
     })
 
+    server.get('/cache-no-maxage', (req, res) => {
+      res.setHeader('etag', '1')
+      res.setHeader('cache-control', 'no-cache')
+      res.send('!maxage')
+    })
+
     server.get('/cache-control', (req, res) => {
       res.setHeader('cache-control', 'max-age=60')
       res.setHeader('etag', '1')
@@ -98,6 +104,13 @@ describe('cache middleware', () => {
     expect(res.headers['x-cache-hit']).to.equal(undefined)
   })
 
+  it('no TTL detected', async () => {
+    await got('http://localhost:3000/cache-no-maxage')
+    const res = await got('http://localhost:3000/cache-no-maxage')
+    expect(res.body).to.equal('!maxage')
+    expect(res.headers['x-cache-hit']).to.equal(undefined)
+  })
+
   it('cache hit (buffer)', async () => {
     const res = await got('http://localhost:3000/cache-buffer')
     expect(res.body).to.equal('world')