@fastify/compress 7.0.0 → 7.0.2

package/index.js

@@ -109,6 +109,13 @@ function fastifyCompress (fastify, opts, next) {
 }
 
 const defaultCompressibleTypes = /^text\/(?!event-stream)|(?:\+|\/)json(?:;|$)|(?:\+|\/)text(?:;|$)|(?:\+|\/)xml(?:;|$)|octet-stream(?:;|$)/u
+const recommendedDefaultBrotliOptions = {
+  params: {
+    // Default of 4 as 11 has a heavy impact on performance.
+    // https://blog.cloudflare.com/this-is-brotli-from-origin#testing
+    [zlib.constants.BROTLI_PARAM_QUALITY]: 4
+  }
+}
 
 function processCompressParams (opts) {
   /* istanbul ignore next */
@@ -117,16 +124,13 @@ function processCompressParams (opts) {
   }
 
   const params = {
-    global: (typeof opts.global === 'boolean') ? opts.global : true,
-    /**
-     * Default of 4 as 11 has a heavy impact on performance.
-     * @see {@link https://blog.cloudflare.com/this-is-brotli-from-origin#testing}
-     */
-    brotliOptions: { [zlib.constants.BROTLI_PARAM_QUALITY]: 4, ...opts.brotliOptions }
+    global: (typeof opts.global === 'boolean') ? opts.global : true
   }
 
   params.removeContentLengthHeader = typeof opts.removeContentLengthHeader === 'boolean' ? opts.removeContentLengthHeader : true
-  params.brotliOptions = opts.brotliOptions
+  params.brotliOptions = params.global
+    ? { ...recommendedDefaultBrotliOptions, ...opts.brotliOptions }
+    : opts.brotliOptions
   params.zlibOptions = opts.zlibOptions
   params.onUnsupportedEncoding = opts.onUnsupportedEncoding
   params.inflateIfDeflated = opts.inflateIfDeflated === true
@@ -238,7 +242,6 @@ function buildRouteCompress (fastify, params, routeOptions, decorateOnly) {
       // response is already compressed
       return next()
     }
-    setVaryHeader(reply)
 
     let stream, encoding
     const noCompress =
@@ -276,11 +279,11 @@ function buildRouteCompress (fastify, params, routeOptions, decorateOnly) {
       payload = intoStream(payload)
     }
 
-    params.removeContentLengthHeader
-      ? reply
-        .header('Content-Encoding', encoding)
-        .removeHeader('content-length')
-      : reply.header('Content-Encoding', encoding)
+    setVaryHeader(reply)
+    reply.header('Content-Encoding', encoding)
+    if (params.removeContentLengthHeader) {
+      reply.removeHeader('content-length')
+    }
 
     stream = zipStream(params.compressStream, encoding)
     pump(payload, stream, onEnd.bind(reply))
@@ -356,7 +359,6 @@ function compress (params) {
       return
     }
 
-    setVaryHeader(this)
     let stream, encoding
     const noCompress =
       // don't compress on x-no-compression header
@@ -401,11 +403,11 @@ function compress (params) {
       payload = intoStream(payload)
     }
 
-    params.removeContentLengthHeader
-      ? this
-        .header('Content-Encoding', encoding)
-        .removeHeader('content-length')
-      : this.header('Content-Encoding', encoding)
+    setVaryHeader(this)
+    this.header('Content-Encoding', encoding)
+    if (params.removeContentLengthHeader) {
+      this.removeHeader('content-length')
+    }
 
     stream = zipStream(params.compressStream, encoding)
     pump(payload, stream, onEnd.bind(this))
@@ -415,9 +417,10 @@ function compress (params) {
 
 function setVaryHeader (reply) {
   if (reply.hasHeader('Vary')) {
-    const varyHeader = Array.isArray(reply.getHeader('Vary')) ? reply.getHeader('Vary') : [reply.getHeader('Vary')]
-    if (!varyHeader.some((h) => h.includes('accept-encoding'))) {
-      reply.header('Vary', `${varyHeader.join(', ')}, accept-encoding`)
+    const rawHeaderValue = reply.getHeader('Vary')
+    const headerValueArray = Array.isArray(rawHeaderValue) ? rawHeaderValue : [rawHeaderValue]
+    if (!headerValueArray.some((h) => h.includes('accept-encoding'))) {
+      reply.header('Vary', headerValueArray.concat('accept-encoding').join(', '))
     }
   } else {
     reply.header('Vary', 'accept-encoding')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/compress",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Fastify compression utils",
   "main": "index.js",
   "type": "commonjs",
@@ -18,8 +18,8 @@
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
     "@types/node": "^20.4.2",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
     "adm-zip": "^0.5.10",
     "fastify": "^4.19.2",
     "jsonstream": "^1.0.3",