fastify 3.7.0 → 3.8.0

package/test/404s.test.js

@@ -1073,7 +1073,7 @@ test('404 inside onSend', t => {
 
   const fastify = Fastify()
 
-  var called = false
+  let called = false
 
   fastify.get('/', function (req, reply) {
     reply.send({ hello: 'world' })
@@ -1215,7 +1215,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { preHandler: true, hello: 'world' })
     })
   })
@@ -1244,7 +1244,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { preHandler: true, hello: 'world' })
     })
   })
@@ -1278,7 +1278,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { preHandler1: true, preHandler2: true, hello: 'world' })
     })
   })
@@ -1307,7 +1307,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { check: 'ab', hello: 'world' })
     })
   })
@@ -1339,7 +1339,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { hello: 'earth' })
     })
 
@@ -1349,7 +1349,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { hello: 'world' })
     })
   })
@@ -1372,7 +1372,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.equal(res.statusCode, 500)
       t.deepEqual(payload, {
         message: 'kaboom',
@@ -1401,7 +1401,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.equal(res.statusCode, 401)
       t.deepEqual(payload, {
         message: 'go away',
@@ -1436,7 +1436,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { preHandler: 'ab', hello: 'world' })
     })
   })
@@ -1473,7 +1473,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { check: 'ab', hello: 'world' })
     })
 
@@ -1483,7 +1483,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { check: 'a', hello: 'world' })
     })
   })
@@ -1511,7 +1511,7 @@ test('preHandler option for setNotFoundHandler', t => {
       payload: { hello: 'world' }
     }, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { foo: 43, hello: 'world' })
     })
   })
@@ -1627,7 +1627,7 @@ test('preValidation option', t => {
     payload: { hello: 'world' }
   }, (err, res) => {
     t.error(err)
-    var payload = JSON.parse(res.payload)
+    const payload = JSON.parse(res.payload)
     t.deepEqual(payload, { hello: 'world' })
   })
 })
@@ -1657,7 +1657,7 @@ t.test('preValidation option could accept an array of functions', t => {
     payload: { hello: 'world' }
   }, (err, res) => {
     t.error(err)
-    var payload = JSON.parse(res.payload)
+    const payload = JSON.parse(res.payload)
     t.deepEqual(payload, { hello: 'world' })
   })
 })

package/test/async-await.test.js

@@ -402,8 +402,8 @@ test('does not call reply.send() twice if 204 reponse is already sent', t => {
 test('error is logged because promise was fulfilled with undefined', t => {
   t.plan(3)
 
-  var fastify = null
-  var stream = split(JSON.parse)
+  let fastify = null
+  const stream = split(JSON.parse)
   try {
     fastify = Fastify({
       logger: {
@@ -442,8 +442,8 @@ test('error is logged because promise was fulfilled with undefined', t => {
 test('error is not logged because promise was fulfilled with undefined but statusCode 204 was set', t => {
   t.plan(3)
 
-  var fastify = null
-  var stream = split(JSON.parse)
+  let fastify = null
+  const stream = split(JSON.parse)
   try {
     fastify = Fastify({
       logger: {
@@ -482,9 +482,9 @@ test('error is not logged because promise was fulfilled with undefined but statu
 test('error is not logged because promise was fulfilled with undefined but response was sent before promise resolution', t => {
   t.plan(4)
 
-  var fastify = null
-  var stream = split(JSON.parse)
-  var payload = { hello: 'world' }
+  let fastify = null
+  const stream = split(JSON.parse)
+  const payload = { hello: 'world' }
   try {
     fastify = Fastify({
       logger: {

package/test/custom-parser-async.test.js

@@ -20,7 +20,7 @@ test('contentTypeParser should add a custom async parser', t => {
   })
 
   fastify.addContentTypeParser('application/jsoff', async function (req, payload) {
-    var res = await new Promise((resolve, reject) => resolve(payload))
+    const res = await new Promise((resolve, reject) => resolve(payload))
     return res
   })
 
@@ -84,7 +84,7 @@ test('contentTypeParser should add a custom async parser - deprecated syntax', t
   })
 
   fastify.addContentTypeParser('application/jsoff', async function (req) {
-    var res = await new Promise((resolve, reject) => resolve(req))
+    const res = await new Promise((resolve, reject) => resolve(req))
     return res
   })
 

package/test/custom-parser.test.js

@@ -9,7 +9,7 @@ const Fastify = require('..')
 const jsonParser = require('fast-json-body')
 
 function plainTextParser (request, callback) {
-  var body = ''
+  let body = ''
   request.setEncoding('utf8')
   request.on('error', onError)
   request.on('data', onData)
@@ -436,7 +436,7 @@ test('catch all content type parser', t => {
   })
 
   fastify.addContentTypeParser('*', function (req, payload, done) {
-    var data = ''
+    let data = ''
     payload.on('data', chunk => { data += chunk })
     payload.on('end', () => {
       done(null, data)
@@ -484,7 +484,7 @@ test('catch all content type parser should not interfere with other conte type p
   })
 
   fastify.addContentTypeParser('*', function (req, payload, done) {
-    var data = ''
+    let data = ''
     payload.on('data', chunk => { data += chunk })
     payload.on('end', () => {
       done(null, data)
@@ -538,7 +538,7 @@ test('\'*\' catch undefined Content-Type requests', t => {
   t.tearDown(fastify.close.bind(fastify))
 
   fastify.addContentTypeParser('*', function (req, payload, done) {
-    var data = ''
+    let data = ''
     payload.on('data', chunk => { data += chunk })
     payload.on('end', () => {
       done(null, data)
@@ -754,7 +754,7 @@ test('Should get the body as string', t => {
     t.ok('called')
     t.ok(typeof body === 'string')
     try {
-      var json = JSON.parse(body)
+      const json = JSON.parse(body)
       done(null, json)
     } catch (err) {
       err.statusCode = 400
@@ -900,7 +900,7 @@ test('Should get the body as string', t => {
     t.ok('called')
     t.ok(typeof body === 'string')
     try {
-      var plainText = body
+      const plainText = body
       done(null, plainText)
     } catch (err) {
       err.statusCode = 400
@@ -939,7 +939,7 @@ test('Should get the body as buffer', t => {
     t.ok('called')
     t.ok(body instanceof Buffer)
     try {
-      var json = JSON.parse(body)
+      const json = JSON.parse(body)
       done(null, json)
     } catch (err) {
       err.statusCode = 400
@@ -978,7 +978,7 @@ test('Should get the body as buffer', t => {
     t.ok('called')
     t.ok(body instanceof Buffer)
     try {
-      var plainText = body
+      const plainText = body
       done(null, plainText)
     } catch (err) {
       err.statusCode = 400

package/test/helper.js

@@ -282,7 +282,7 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
 
       // Node errors for OPTIONS requests with a stream body and no Content-Length header
       if (upMethod !== 'OPTIONS') {
-        var chunk = Buffer.alloc(1024 * 1024 + 1, 0)
+        let chunk = Buffer.alloc(1024 * 1024 + 1, 0)
         const largeStream = new stream.Readable({
           read () {
             this.push(chunk)

package/test/hooks.test.js

@@ -197,7 +197,7 @@ test('onRequest hook should support encapsulation / 1', t => {
 test('onRequest hook should support encapsulation / 2', t => {
   t.plan(3)
   const fastify = Fastify()
-  var pluginInstance
+  let pluginInstance
 
   fastify.addHook('onRequest', () => {})
 
@@ -813,7 +813,7 @@ test('onResponse hook should support encapsulation / 1', t => {
 test('onResponse hook should support encapsulation / 2', t => {
   t.plan(3)
   const fastify = Fastify()
-  var pluginInstance
+  let pluginInstance
 
   fastify.addHook('onResponse', () => {})
 
@@ -890,7 +890,7 @@ test('onResponse hook should support encapsulation / 3', t => {
 test('onSend hook should support encapsulation / 1', t => {
   t.plan(3)
   const fastify = Fastify()
-  var pluginInstance
+  let pluginInstance
 
   fastify.addHook('onSend', () => {})
 
@@ -1015,7 +1015,7 @@ test('onSend hook is called after payload is serialized and headers are set', t
   })
 
   fastify.register((instance, opts, done) => {
-    var chunk = 'stream payload'
+    let chunk = 'stream payload'
     const thePayload = new stream.Readable({
       read () {
         this.push(chunk)
@@ -2163,7 +2163,7 @@ test('preValidation hook should support encapsulation / 1', t => {
 test('preValidation hook should support encapsulation / 2', t => {
   t.plan(3)
   const fastify = Fastify()
-  var pluginInstance
+  let pluginInstance
 
   fastify.addHook('preValidation', () => {})
 
@@ -2582,7 +2582,7 @@ test('preParsing hook should support encapsulation / 1', t => {
 test('preParsing hook should support encapsulation / 2', t => {
   t.plan(3)
   const fastify = Fastify()
-  var pluginInstance
+  let pluginInstance
 
   fastify.addHook('preParsing', function a () {})
 

package/test/http2/head.test.js

@@ -6,7 +6,7 @@ const Fastify = require('../..')
 const h2url = require('h2url')
 const msg = { hello: 'world' }
 
-var fastify
+let fastify
 try {
   fastify = Fastify({
     http2: true

package/test/http2/plain.test.js

@@ -6,7 +6,7 @@ const Fastify = require('../..')
 const h2url = require('h2url')
 const msg = { hello: 'world' }
 
-var fastify
+let fastify
 try {
   fastify = Fastify({
     http2: true

package/test/http2/secure-with-fallback.test.js

@@ -9,7 +9,7 @@ const h2url = require('h2url')
 const sget = require('simple-get').concat
 const msg = { hello: 'world' }
 
-var fastify
+let fastify
 try {
   fastify = Fastify({
     http2: true,

package/test/http2/secure.test.js

@@ -8,7 +8,7 @@ const Fastify = require('../..')
 const h2url = require('h2url')
 const msg = { hello: 'world' }
 
-var fastify
+let fastify
 try {
   fastify = Fastify({
     http2: true,

package/test/http2/unknown-http-method.test.js

@@ -6,7 +6,7 @@ const Fastify = require('../..')
 const h2url = require('h2url')
 const msg = { hello: 'world' }
 
-var fastify
+let fastify
 try {
   fastify = Fastify({
     http2: true

package/test/https/https.test.js

@@ -7,8 +7,9 @@ const fs = require('fs')
 const path = require('path')
 const Fastify = require('../..')
 
+let fastify
 try {
-  var fastify = Fastify({
+  fastify = Fastify({
     https: {
       key: fs.readFileSync(path.join(__dirname, 'fastify.key')),
       cert: fs.readFileSync(path.join(__dirname, 'fastify.cert'))

package/test/inject.test.js

@@ -329,7 +329,7 @@ test('inject a multipart request using form-body', t => {
   const fastify = Fastify()
 
   fastify.addContentTypeParser('*', function (req, payload, done) {
-    var body = ''
+    let body = ''
     payload.on('data', d => {
       body += d
     })
@@ -362,7 +362,7 @@ function getStream () {
   }
   util.inherits(Read, Stream.Readable)
   const word = '{"hello":"world"}'
-  var i = 0
+  let i = 0
 
   Read.prototype._read = function (size) {
     this.push(word[i] ? word[i++] : null)

package/test/internals/all.test.js

@@ -28,7 +28,7 @@ test('fastify.all should add all the methods to the same url', t => {
 
     fastify.inject(options, (err, res) => {
       t.error(err)
-      var payload = JSON.parse(res.payload)
+      const payload = JSON.parse(res.payload)
       t.deepEqual(payload, { method: method })
     })
   }

package/test/internals/hookRunner.test.js

@@ -139,7 +139,7 @@ test('hookRunner - In case of error should skip to done (with promises)', t => {
 test('hookRunner - Be able to exit before its natural end', t => {
   t.plan(4)
 
-  var shouldStop = false
+  let shouldStop = false
   hookRunner([fn1, fn2, fn3], iterator, 'a', 'b', done)
 
   function iterator (fn, a, b, next) {

package/test/internals/logger.test.js

@@ -23,7 +23,7 @@ test('The logger should add a unique id for every request', t => {
   fastify.listen(0, err => {
     t.error(err)
     const queue = new Queue()
-    for (var i = 0; i < 10; i++) {
+    for (let i = 0; i < 10; i++) {
       queue.add(checkId)
     }
     queue.add(() => {

package/test/internals/reply.test.js

@@ -79,7 +79,7 @@ test('reply.send throw with circular JSON', t => {
   }
   const reply = new Reply(response, { context: { onSend: [] } })
   t.throws(() => {
-    var obj = {}
+    const obj = {}
     obj.obj = obj
     reply.send(JSON.stringify(obj))
   }, 'Converting circular structure to JSON')
@@ -430,9 +430,9 @@ test('stream with content type should not send application/octet-stream', t => {
   const fs = require('fs')
   const path = require('path')
 
-  var streamPath = path.join(__dirname, '..', '..', 'package.json')
-  var stream = fs.createReadStream(streamPath)
-  var buf = fs.readFileSync(streamPath)
+  const streamPath = path.join(__dirname, '..', '..', 'package.json')
+  const stream = fs.createReadStream(streamPath)
+  const buf = fs.readFileSync(streamPath)
 
   fastify.get('/', function (req, reply) {
     reply.header('Content-Type', 'text/plain').send(stream)
@@ -459,9 +459,9 @@ test('stream using reply.raw.writeHead should return customize headers', t => {
   const fs = require('fs')
   const path = require('path')
 
-  var streamPath = path.join(__dirname, '..', '..', 'package.json')
-  var stream = fs.createReadStream(streamPath)
-  var buf = fs.readFileSync(streamPath)
+  const streamPath = path.join(__dirname, '..', '..', 'package.json')
+  const stream = fs.createReadStream(streamPath)
+  const buf = fs.readFileSync(streamPath)
 
   fastify.get('/', function (req, reply) {
     reply.log.warn = function mockWarn (message) {
@@ -781,6 +781,61 @@ test('undefined payload should be sent as-is', t => {
   })
 })
 
+test('for HEAD method, no body should be sent but content-length should be', t => {
+  t.plan(11)
+
+  const fastify = require('../..')()
+  const contentType = 'application/json; charset=utf-8'
+  const bodySize = JSON.stringify({ foo: 'bar' }).length
+
+  fastify.head('/', {
+    onSend: function (request, reply, payload, next) {
+      t.strictEqual(payload, undefined)
+      next()
+    }
+  }, function (req, reply) {
+    reply.header('content-length', bodySize)
+    reply.header('content-type', contentType)
+    reply.code(200).send()
+  })
+
+  fastify.head('/with/null', {
+    onSend: function (request, reply, payload, next) {
+      t.strictEqual(payload, 'null')
+      next()
+    }
+  }, function (req, reply) {
+    reply.header('content-length', bodySize)
+    reply.header('content-type', contentType)
+    reply.code(200).send(null)
+  })
+
+  fastify.listen(0, err => {
+    t.error(err)
+    fastify.server.unref()
+
+    sget({
+      method: 'HEAD',
+      url: `http://localhost:${fastify.server.address().port}`
+    }, (err, response, body) => {
+      t.error(err)
+      t.strictEqual(response.headers['content-type'], contentType)
+      t.strictEqual(response.headers['content-length'], bodySize.toString())
+      t.strictEqual(body.length, 0)
+    })
+
+    sget({
+      method: 'HEAD',
+      url: `http://localhost:${fastify.server.address().port}/with/null`
+    }, (err, response, body) => {
+      t.error(err)
+      t.strictEqual(response.headers['content-type'], contentType)
+      t.strictEqual(response.headers['content-length'], bodySize.toString())
+      t.strictEqual(body.length, 0)
+    })
+  })
+})
+
 test('reply.send(new NotFound()) should not invoke the 404 handler', t => {
   t.plan(9)
 

package/test/internals/request.test.js

@@ -157,3 +157,26 @@ test('Request with trust proxy - x-forwarded-host header has precedence over hos
   t.type(request, TpRequest)
   t.strictEqual(request.hostname, 'example.com')
 })
+
+test('Request with trust proxy - handles multiple entries in x-forwarded-host/proto', t => {
+  t.plan(3)
+  const headers = {
+    'x-forwarded-host': 'example2.com, example.com',
+    'x-forwarded-proto': 'http, https'
+  }
+  const req = {
+    method: 'GET',
+    url: '/',
+    // Some dependencies (proxy-addr, forwarded) still depend on the deprecated
+    // .connection property, we use .socket. Include both to satisfy everyone.
+    socket: { remoteAddress: 'ip' },
+    connection: { remoteAddress: 'ip' },
+    headers
+  }
+
+  const TpRequest = Request.buildRequest(Request, true)
+  const request = new TpRequest('id', 'params', req, 'query', 'log')
+  t.type(request, TpRequest)
+  t.strictEqual(request.hostname, 'example.com')
+  t.strictEqual(request.protocol, 'https')
+})

package/test/listen.test.js

@@ -62,6 +62,18 @@ test('listen accepts options and a callback', t => {
   })
 })
 
+test('listen accepts options, backlog and a callback', t => {
+  t.plan(1)
+  const fastify = Fastify()
+  t.tearDown(fastify.close.bind(fastify))
+  fastify.listen({
+    port: 0,
+    host: 'localhost'
+  }, 511, (err) => {
+    t.error(err)
+  })
+})
+
 test('listen accepts a port, address and a callback with (err, address)', t => {
   t.plan(2)
   const fastify = Fastify()

package/test/logger.test.js

@@ -32,8 +32,8 @@ tearDown(() => {
 
 test('defaults to info level', t => {
   t.plan(13)
-  var fastify = null
-  var stream = split(JSON.parse)
+  let fastify = null
+  const stream = split(JSON.parse)
   try {
     fastify = Fastify({
       logger: {
@@ -80,8 +80,8 @@ test('defaults to info level', t => {
 
 test('test log stream', t => {
   t.plan(12)
-  var fastify = null
-  var stream = split(JSON.parse)
+  let fastify = null
+  const stream = split(JSON.parse)
   try {
     fastify = Fastify({
       logger: {
@@ -127,8 +127,8 @@ test('test log stream', t => {
 
 test('test error log stream', t => {
   t.plan(11)
-  var fastify = null
-  var stream = split(JSON.parse)
+  let fastify = null
+  const stream = split(JSON.parse)
   try {
     fastify = Fastify({
       logger: {
@@ -248,8 +248,8 @@ test('can use external logger instance with custom serializer', t => {
 
 test('expose the logger', t => {
   t.plan(2)
-  var fastify = null
-  var stream = split(JSON.parse)
+  let fastify = null
+  const stream = split(JSON.parse)
   try {
     fastify = Fastify({
       logger: {
@@ -1190,8 +1190,8 @@ test('Do not wrap IPv4 address', t => {
 
 test('file option', t => {
   t.plan(13)
-  var fastify = null
-  var dest = file()
+  let fastify = null
+  const dest = file()
 
   fastify = Fastify({
     logger: {