replace into-stream with Readable.from

index.js

@@ -7,7 +7,7 @@ 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 { Readable } = require('readable-stream')
 const peek = require('peek-stream')
 const { Minipass } = require('minipass')
 const pumpify = require('pumpify')
@@ -273,7 +273,7 @@ function buildRouteCompress (fastify, params, routeOptions, decorateOnly) {
       if (Buffer.byteLength(payload) < params.threshold) {
         return next()
       }
-      payload = intoStream(payload)
+      payload = Readable.from(payload)
     }
 
     params.removeContentLengthHeader
@@ -398,7 +398,7 @@ function compress (params) {
       if (Buffer.byteLength(payload) < params.threshold) {
         return this.send(payload)
       }
-      payload = intoStream(payload)
+      payload = Readable.from(payload)
     }
 
     params.removeContentLengthHeader
@@ -506,7 +506,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(result)
 }
 
 function zipStream (deflate, encoding) {

package.json

@@ -8,7 +8,6 @@
   "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",
@@ -26,7 +25,8 @@
     "standard": "^17.1.0",
     "tap": "^16.3.7",
     "tsd": "^0.30.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.1.6",
+    "undici": "^5.28.3"
   },
   "scripts": {
     "coverage": "npm run test:unit -- --coverage-report=html",

test/issue-288.test.js

@@ -0,0 +1,40 @@
+'use strict'
+
+const { test } = require('tap')
+const Fastify = require('fastify')
+const fastifyCompress = require('..')
+const fsPromises = require("fs").promises
+const { join } = require('path')
+const { fetch } = require('undici')
+
+test('should not corrupt the file content', async (t) => {
+  const fastify = new Fastify()
+  t.teardown(() => fastify.close())
+
+  fastify.register(async (instance, opts) => {
+    await fastify.register(fastifyCompress)
+    instance.get('/issue', async (req, reply) => {
+      const longStringWithEmoji = await fsPromises.readFile(join(__dirname, "./test.txt"), "utf-8");
+
+      return longStringWithEmoji  // <--- the file content is corrupt
+      // search for "hydra.alibaba.com" will see 2 wired question marks instead of emoji
+    })
+  })
+
+  fastify.get('/good', async (req, reply) => {
+    const longStringWithEmoji = await fsPromises.readFile(join(__dirname, "./test.txt"), "utf-8");
+
+    return longStringWithEmoji  // <--- the file content is ok
+    // search for "hydra.alibaba.com" will see emoji
+  })
+
+  await fastify.listen({ port: 0 })
+
+  const { port } = fastify.server.address()
+  const url = `http://localhost:${port}`
+  const response = await fetch(`${url}/issue`)
+  const response2 = await fetch(`${url}/good`)
+  const body = await response.text()
+  const body2 = await response2.text()
+  t.equal(body, body2)
+})