Merge pull request #17 from fastify/update-fastify

Updated to support the latest version of fastify

Author: delvedor

index.js

@@ -28,7 +28,7 @@ function compressPlugin (fastify, opts, next) {
   next()
 
   function compress (payload) {
-    if (!payload) {
+    if (payload == null) {
       this.res.log.warn('compress: missing payload')
       this.send(new Error('Internal server error'))
       return
@@ -55,7 +55,7 @@ function compressPlugin (fastify, opts, next) {
       return
     }
 
-    if (payload._readableState === undefined) {
+    if (typeof payload.pipe !== 'function') {
       if (typeof payload !== 'string') {
         payload = this.serialize(payload)
       }
@@ -72,7 +72,7 @@ function compressPlugin (fastify, opts, next) {
   }
 
   function onSend (req, reply, payload, next) {
-    if (!payload) {
+    if (payload == null) {
       reply.res.log.warn('compress: missing payload')
       return next()
     }
@@ -99,10 +99,7 @@ function compressPlugin (fastify, opts, next) {
       return next()
     }
 
-    if (payload._readableState === undefined) {
-      if (typeof payload !== 'string') {
-        payload = reply.serialize(payload)
-      }
+    if (typeof payload.pipe !== 'function') {
       if (Buffer.byteLength(payload) < threshold) {
         return next()
       }
@@ -153,6 +150,6 @@ function shouldCompress (type) {
 }
 
 module.exports = fp(compressPlugin, {
-  fastify: '>=0.39.1',
+  fastify: '>=0.40.0',
   name: 'fastify-compress'
 })

package.json

@@ -6,12 +6,13 @@
   "dependencies": {
     "fastify-plugin": "^0.2.1",
     "mime-db": "^1.32.0",
-    "pump": "^2.0.0",
+    "pump": "^2.0.1",
     "string-to-stream": "^1.1.0"
   },
   "devDependencies": {
-    "fastify": "^0.39.1",
+    "fastify": "^0.40.0",
     "iltorb": "^2.0.3",
+    "jsonstream": "^1.0.3",
     "standard": "^10.0.3",
     "tap": "^11.0.1"
   },

test.js

@@ -5,6 +5,7 @@ const test = t.test
 const brotli = require('iltorb')
 const zlib = require('zlib')
 const fs = require('fs')
+const JSONStream = require('jsonstream')
 const createReadStream = fs.createReadStream
 const readFileSync = fs.readFileSync
 const Fastify = require('fastify')
@@ -639,3 +640,55 @@ test('identity header (hook)', t => {
     t.deepEqual({ hello: 'world' }, payload)
   })
 })
+
+test('should support stream1 (reply compress)', t => {
+  t.plan(3)
+  const fastify = Fastify()
+  fastify.register(compressPlugin, { global: false })
+
+  fastify.get('/', (req, reply) => {
+    const stream = JSONStream.stringify()
+    reply.type('text/plain').compress(stream)
+    stream.write({ hello: 'world' })
+    stream.end({ a: 42 })
+  })
+
+  fastify.inject({
+    url: '/',
+    method: 'GET',
+    headers: {
+      'accept-encoding': 'gzip'
+    }
+  }, (err, res) => {
+    t.error(err)
+    t.strictEqual(res.headers['content-encoding'], 'gzip')
+    const payload = zlib.gunzipSync(res.rawPayload)
+    t.deepEqual(JSON.parse(payload.toString()), [{ hello: 'world' }, { a: 42 }])
+  })
+})
+
+test('should support stream1 (global hook)', t => {
+  t.plan(3)
+  const fastify = Fastify()
+  fastify.register(compressPlugin, { threshold: 0 })
+
+  fastify.get('/', (req, reply) => {
+    const stream = JSONStream.stringify()
+    reply.type('text/plain').send(stream)
+    stream.write({ hello: 'world' })
+    stream.end({ a: 42 })
+  })
+
+  fastify.inject({
+    url: '/',
+    method: 'GET',
+    headers: {
+      'accept-encoding': 'gzip'
+    }
+  }, (err, res) => {
+    t.error(err)
+    t.strictEqual(res.headers['content-encoding'], 'gzip')
+    const payload = zlib.gunzipSync(res.rawPayload)
+    t.deepEqual(JSON.parse(payload.toString()), [{ hello: 'world' }, { a: 42 }])
+  })
+})