Merge pull request #46 from fastify/support-compress

Support compressed assets

Author: mcollina

.travis.yml

@@ -4,7 +4,6 @@ node_js:
   - "9"
   - "8"
   - "6"
-  - "4"
 
 script:
   - npm run coveralls

example/server-compress.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const path = require('path')
+const fastify = require('fastify')({ logger: { level: 'trace' } })
+
+fastify
+  // compress everything
+  .register(require('fastify-compress'), { threshold: 0 })
+  .register(require('../'), { root: path.join(__dirname, '/public') })
+  .listen(3000, err => {
+    if (err) throw err
+  })

index.js

@@ -2,6 +2,7 @@
 
 const path = require('path')
 const statSync = require('fs').statSync
+const { PassThrough } = require('readable-stream')
 
 const send = require('send')
 
@@ -31,17 +32,46 @@ function fastifyStatic (fastify, opts, next) {
   }
 
   function pumpSendToReply (request, reply, pathname) {
-    const stream = send(request.req, pathname, sendOptions)
-
-    // this is needed because fastify automatically
-    // set the type to application/octet-stream
-    stream.on('headers', removeType)
+    const stream = send(request.raw, pathname, sendOptions)
+
+    const wrap = new PassThrough({
+      flush (cb) {
+        this.finished = true
+        cb()
+      }
+    })
+
+    wrap.getHeader = reply.getHeader.bind(reply)
+    wrap.setHeader = reply.header.bind(reply)
+    wrap.socket = request.raw.socket
+    wrap.finished = false
+
+    Object.defineProperty(wrap, 'statusCode', {
+      get () {
+        return reply.res.statusCode
+      },
+      set (code) {
+        reply.code(code)
+      }
+    })
+
+    wrap.on('pipe', function () {
+      reply.send(wrap)
+    })
 
     if (setHeaders !== undefined) {
       stream.on('headers', setHeaders)
     }
 
-    reply.send(stream)
+    stream.on('error', function (err) {
+      if (err) {
+        reply.send(err)
+      }
+    })
+
+    // we cannot use pump, because send error
+    // handling is not compatible
+    stream.pipe(wrap)
   }
 
   if (opts.prefix === undefined) opts.prefix = '/'
@@ -82,11 +112,7 @@ function checkRootPathForErrors (rootPath) {
   }
 }
 
-function removeType (res) {
-  res.setHeader('Content-Type', '')
-}
-
 module.exports = fp(fastifyStatic, {
-  fastify: '>= 0.42.0',
+  fastify: '>= 1.2.0',
   name: 'fastify-static'
 })

package.json

@@ -27,14 +27,16 @@
   "homepage": "https://github.com/fastify/fastify-static",
   "dependencies": {
     "fastify-plugin": "^0.2.1",
+    "readable-stream": "^2.3.6",
     "send": "^0.16.0"
   },
   "devDependencies": {
     "coveralls": "^3.0.0",
     "fastify": "^1.1.1",
+    "fastify-compress": "^0.5.1",
     "pre-commit": "^1.2.2",
     "proxyquire": "^2.0.0",
-    "request": "2.83.0",
+    "simple-get": "^2.7.0",
     "snazzy": "^7.0.0",
     "standard": "^11.0.0",
     "tap": "^11.0.1"