@fastify/caching 8.1.0 → 8.3.0

package/index.js

@@ -75,7 +75,9 @@ function fastifyCaching (instance, options, next) {
     }
 
     instance.addHook('onRequest', (req, res, next) => {
-      res.header('Cache-control', value)
+      if (res.hasHeader('Cache-control') === false) {
+        res.header('Cache-control', value)
+      }
       next()
     })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/caching",
-  "version": "8.1.0",
+  "version": "8.3.0",
   "description": "A plugin for Fastify to enable management of cache control headers",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -38,7 +38,7 @@
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.0.0",
-    "tsd": "^0.25.0"
+    "tsd": "^0.28.0"
   },
   "dependencies": {
     "abstract-cache": "^1.0.1",

package/test/headers.test.js

@@ -139,6 +139,35 @@ test('sets public with max-age and s-maxage header', async (t) => {
   t.equal(response.headers['cache-control'], 'public, max-age=300, s-maxage=12345')
 })
 
+test('do not set headers if another upstream plugin already sets it', async (t) => {
+  t.plan(2)
+
+  const opts = {
+    privacy: plugin.privacy.PUBLIC,
+    expiresIn: 300,
+    serverExpiresIn: 12345
+  }
+
+  const fastify = Fastify()
+  fastify.addHook('onRequest', async (req, reply) => {
+    reply.header('cache-control', 'do not override')
+  })
+  await fastify.register(plugin, opts)
+
+  fastify.get('/', (req, reply) => {
+    reply.send({ hello: 'world' })
+  })
+
+  await fastify.ready()
+
+  const response = await fastify.inject({
+    method: 'GET',
+    path: '/'
+  })
+  t.ok(response.headers['cache-control'])
+  t.equal(response.headers['cache-control'], 'do not override')
+})
+
 test('only sets max-age and ignores s-maxage with private header', async (t) => {
   t.plan(2)