@fastify/compress 7.0.1 → 7.0.3

package/index.js

@@ -7,12 +7,12 @@ const fp = require('fastify-plugin')
 const encodingNegotiator = require('@fastify/accept-negotiator')
 const pump = require('pump')
 const mimedb = require('mime-db')
-const intoStream = require('into-stream')
 const peek = require('peek-stream')
 const { Minipass } = require('minipass')
 const pumpify = require('pumpify')
+const { Readable } = require('readable-stream')
 
-const { isStream, isGzip, isDeflate } = require('./lib/utils')
+const { isStream, isGzip, isDeflate, intoAsyncIterator } = require('./lib/utils')
 
 const InvalidRequestEncodingError = createError('FST_CP_ERR_INVALID_CONTENT_ENCODING', 'Unsupported Content-Encoding: %s', 415)
 const InvalidRequestCompressedPayloadError = createError('FST_CP_ERR_INVALID_CONTENT', 'Could not decompress the request payload using the provided encoding', 400)
@@ -242,7 +242,6 @@ function buildRouteCompress (fastify, params, routeOptions, decorateOnly) {
       // response is already compressed
       return next()
     }
-    setVaryHeader(reply)
 
     let stream, encoding
     const noCompress =
@@ -277,14 +276,14 @@ function buildRouteCompress (fastify, params, routeOptions, decorateOnly) {
       if (Buffer.byteLength(payload) < params.threshold) {
         return next()
       }
-      payload = intoStream(payload)
+      payload = Readable.from(intoAsyncIterator(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))
@@ -360,7 +359,6 @@ function compress (params) {
       return
     }
 
-    setVaryHeader(this)
     let stream, encoding
     const noCompress =
       // don't compress on x-no-compression header
@@ -402,14 +400,14 @@ function compress (params) {
       if (Buffer.byteLength(payload) < params.threshold) {
         return this.send(payload)
       }
-      payload = intoStream(payload)
+      payload = Readable.from(intoAsyncIterator(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))
@@ -419,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')
@@ -510,7 +509,7 @@ function maybeUnzip (payload, serialize) {
   // handle case where serialize doesn't return a string or Buffer
   if (!Buffer.isBuffer(buf)) return result
   if (isCompressed(buf) === 0) return result
-  return intoStream(result)
+  return Readable.from(intoAsyncIterator(result))
 }
 
 function zipStream (deflate, encoding) {

package/lib/utils.js

@@ -35,4 +35,45 @@ function isStream (stream) {
   return stream !== null && typeof stream === 'object' && typeof stream.pipe === 'function'
 }
 
-module.exports = { isGzip, isDeflate, isStream }
+/**
+ * Provide a async iteratable for Readable.from
+ */
+async function * intoAsyncIterator (payload) {
+  if (typeof payload === 'object') {
+    if (Buffer.isBuffer(payload)) {
+      yield payload
+      return
+    }
+
+    if (
+      // ArrayBuffer
+      payload instanceof ArrayBuffer ||
+      // NodeJS.TypedArray
+      ArrayBuffer.isView(payload)
+    ) {
+      yield Buffer.from(payload)
+      return
+    }
+
+    // Iterator
+    if (Symbol.iterator in payload) {
+      for (const chunk of payload) {
+        yield chunk
+      }
+      return
+    }
+
+    // Async Iterator
+    if (Symbol.asyncIterator in payload) {
+      for await (const chunk of payload) {
+        yield chunk
+      }
+      return
+    }
+  }
+
+  // string
+  yield payload
+}
+
+module.exports = { isGzip, isDeflate, isStream, intoAsyncIterator }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/compress",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "Fastify compression utils",
   "main": "index.js",
   "type": "commonjs",
@@ -8,24 +8,24 @@
   "dependencies": {
     "@fastify/accept-negotiator": "^1.1.0",
     "fastify-plugin": "^4.5.0",
-    "into-stream": "^6.0.0",
     "mime-db": "^1.52.0",
     "minipass": "^7.0.2",
     "peek-stream": "^1.1.3",
     "pump": "^3.0.0",
-    "pumpify": "^2.0.1"
+    "pumpify": "^2.0.1",
+    "readable-stream": "^4.5.2"
   },
   "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",
     "standard": "^17.1.0",
     "tap": "^16.3.7",
-    "tsd": "^0.30.0",
+    "tsd": "^0.31.0",
     "typescript": "^5.1.6"
   },
   "scripts": {