fastify 3.9.2 → 3.12.0

package/test/internals/reply.test.js

@@ -106,6 +106,31 @@ test('reply.serializer should set a custom serializer', t => {
   t.equal(reply[kReplySerializer], 'serializer')
 })
 
+test('reply.serializer should support running preSerialization hooks', t => {
+  t.plan(3)
+  const fastify = require('../..')()
+
+  fastify.addHook('preSerialization', async (request, reply, payload) => { t.ok('called', 'preSerialization') })
+  fastify.route({
+    method: 'GET',
+    url: '/',
+    handler: (req, reply) => {
+      reply
+        .type('application/json')
+        .serializer(JSON.stringify)
+        .send({ foo: 'bar' })
+    }
+  })
+
+  fastify.inject({
+    method: 'GET',
+    url: '/'
+  }, (err, res) => {
+    t.error(err)
+    t.strictEqual(res.payload, '{"foo":"bar"}')
+  })
+})
+
 test('reply.serialize should serialize payload', t => {
   t.plan(1)
   const response = { statusCode: 200 }
@@ -212,15 +237,15 @@ test('within an instance', t => {
     reply.send({ hello: 'world!' })
   })
 
-  fastify.register(function (instance, options, next) {
-    fastify.addHook('onSend', function (req, reply, payload, next) {
+  fastify.register(function (instance, options, done) {
+    fastify.addHook('onSend', function (req, reply, payload, done) {
       reply.header('x-onsend', 'yes')
-      next()
+      done()
     })
     fastify.get('/redirect-onsend', function (req, reply) {
       reply.redirect('/')
     })
-    next()
+    done()
   })
 
   fastify.listen(0, err => {
@@ -756,9 +781,9 @@ test('undefined payload should be sent as-is', t => {
 
   const fastify = require('../..')()
 
-  fastify.addHook('onSend', function (request, reply, payload, next) {
+  fastify.addHook('onSend', function (request, reply, payload, done) {
     t.strictEqual(payload, undefined)
-    next()
+    done()
   })
 
   fastify.get('/', function (req, reply) {
@@ -789,9 +814,9 @@ test('for HEAD method, no body should be sent but content-length should be', t =
   const bodySize = JSON.stringify({ foo: 'bar' }).length
 
   fastify.head('/', {
-    onSend: function (request, reply, payload, next) {
+    onSend: function (request, reply, payload, done) {
       t.strictEqual(payload, undefined)
-      next()
+      done()
     }
   }, function (req, reply) {
     reply.header('content-length', bodySize)
@@ -800,9 +825,9 @@ test('for HEAD method, no body should be sent but content-length should be', t =
   })
 
   fastify.head('/with/null', {
-    onSend: function (request, reply, payload, next) {
+    onSend: function (request, reply, payload, done) {
       t.strictEqual(payload, 'null')
-      next()
+      done()
     }
   }, function (req, reply) {
     reply.header('content-length', bodySize)
@@ -849,12 +874,12 @@ test('reply.send(new NotFound()) should not invoke the 404 handler', t => {
     reply.send(new NotFound())
   })
 
-  fastify.register(function (instance, options, next) {
+  fastify.register(function (instance, options, done) {
     instance.get('/not-found', function (req, reply) {
       reply.send(new NotFound())
     })
 
-    next()
+    done()
   }, { prefix: '/prefixed' })
 
   fastify.listen(0, err => {
@@ -1166,9 +1191,9 @@ test('Content type and charset set previously', t => {
 
   const fastify = require('../../')()
 
-  fastify.addHook('onRequest', function (req, reply, next) {
+  fastify.addHook('onRequest', function (req, reply, done) {
     reply.header('content-type', 'application/json; charset=utf-16')
-    next()
+    done()
   })
 
   fastify.get('/', function (req, reply) {
@@ -1357,7 +1382,7 @@ test('reply should use the right serializer in encapsulated context', t => {
     handler: (req, reply) => { reply.send({ foo: 'bar' }) }
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.route({
       method: 'GET',
       url: '/sub',
@@ -1368,10 +1393,10 @@ test('reply should use the right serializer in encapsulated context', t => {
       payload.john = 'too too'
       return JSON.stringify(payload)
     })
-    next()
+    done()
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.route({
       method: 'GET',
       url: '/sub',
@@ -1382,7 +1407,7 @@ test('reply should use the right serializer in encapsulated context', t => {
       payload.sweet = 'potato potato'
       return JSON.stringify(payload)
     })
-    next()
+    done()
   }, { prefix: 'sub' })
 
   fastify.inject({
@@ -1421,7 +1446,7 @@ test('reply should use the right serializer in deep encapsulated context', t =>
     handler: (req, reply) => { reply.send({ foo: 'bar' }) }
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.route({
       method: 'GET',
       url: '/sub',
@@ -1433,7 +1458,7 @@ test('reply should use the right serializer in deep encapsulated context', t =>
       return JSON.stringify(payload)
     })
 
-    instance.register(function (subInstance, opts, next) {
+    instance.register(function (subInstance, opts, done) {
       subInstance.route({
         method: 'GET',
         url: '/deep',
@@ -1444,9 +1469,9 @@ test('reply should use the right serializer in deep encapsulated context', t =>
         payload.john = 'deep deep'
         return JSON.stringify(payload)
       })
-      next()
+      done()
     })
-    next()
+    done()
   })
 
   fastify.inject({

package/test/internals/request.test.js

@@ -75,10 +75,7 @@ test('Request with trust proxy', t => {
   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
   }
 
@@ -109,7 +106,7 @@ test('Request with trust proxy - no x-forwarded-host header', t => {
   const req = {
     method: 'GET',
     url: '/',
-    connection: { remoteAddress: 'ip' },
+    socket: { remoteAddress: 'ip' },
     headers
   }
 
@@ -128,7 +125,7 @@ test('Request with trust proxy - no x-forwarded-host header and fallback to auth
   const req = {
     method: 'GET',
     url: '/',
-    connection: { remoteAddress: 'ip' },
+    socket: { remoteAddress: 'ip' },
     headers
   }
 
@@ -148,7 +145,7 @@ test('Request with trust proxy - x-forwarded-host header has precedence over hos
   const req = {
     method: 'GET',
     url: '/',
-    connection: { remoteAddress: 'ip' },
+    socket: { remoteAddress: 'ip' },
     headers
   }
 
@@ -167,10 +164,7 @@ test('Request with trust proxy - handles multiple entries in x-forwarded-host/pr
   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
   }
 

package/test/internals/version.test.js

@@ -37,7 +37,7 @@ test('should skip the version check if the version is undefined', t => {
     t.pass('everything right')
   })
 
-  function plugin (instance, opts, next) {
-    next()
+  function plugin (instance, opts, done) {
+    done()
   }
 })

package/test/logger.test.js

@@ -450,12 +450,12 @@ test('The logger should accept custom serializer', t => {
       stream.once('data', line => {
         t.ok(line.req, 'req is defined')
         t.equal(line.msg, 'incoming request', 'message is set')
-        t.deepEqual(line.req, { url: '/custom' }, 'custom req serialiser is use')
+        t.deepEqual(line.req, { url: '/custom' }, 'custom req serializer is use')
 
         stream.once('data', line => {
           t.ok(line.res, 'res is defined')
           t.equal(line.msg, 'kaboom', 'message is set')
-          t.deepEqual(line.res, { statusCode: 500 }, 'default res serialiser is use')
+          t.deepEqual(line.res, { statusCode: 500 }, 'default res serializer is use')
         })
       })
     })
@@ -540,12 +540,12 @@ test('Should set a custom logLevel for a plugin', t => {
     reply.send({ hello: 'world' })
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/plugin', (req, reply) => {
       req.log.info('Hello') // we should see this log
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logLevel: 'info' })
 
   fastify.inject({
@@ -583,12 +583,12 @@ test('Should set a custom logSerializers for a plugin', t => {
     logger
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/plugin', (req, reply) => {
       req.log.info({ test: 'Hello' }) // we should see this log
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logLevel: 'info', logSerializers: { test: value => 'X' + value } })
 
   fastify.inject({
@@ -622,22 +622,22 @@ test('Should set a custom logLevel for every plugin', t => {
     reply.send({ hello: 'world' })
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/info', (req, reply) => {
       req.log.info('info') // we should see this log
       req.log.debug('hidden log')
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logLevel: 'info' })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/debug', (req, reply) => {
       req.log.debug('debug') // we should see this log
       req.log.trace('hidden log')
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logLevel: 'debug' })
 
   fastify.inject({
@@ -689,20 +689,20 @@ test('Should set a custom logSerializers for every plugin', async t => {
     reply.send({ hello: 'world' })
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/test1', (req, reply) => {
       req.log.info({ test: 'Hello' })
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logSerializers: { test: value => 'X' + value } })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/test2', (req, reply) => {
       req.log.info({ test: 'Hello' })
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logSerializers: { test: value => 'Z' + value } })
 
   let res = await fastify.inject({
@@ -739,7 +739,7 @@ test('Should override serializers from route', t => {
     logger
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/', {
       logSerializers: {
         test: value => 'Z' + value // should override
@@ -748,7 +748,7 @@ test('Should override serializers from route', t => {
       req.log.info({ test: 'Hello' })
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logSerializers: { test: value => 'X' + value } })
 
   fastify.inject({
@@ -776,21 +776,21 @@ test('Should override serializers from plugin', t => {
     logger
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.register(context1, {
       logSerializers: {
         test: value => 'Z' + value // should override
       }
     })
-    next()
+    done()
   }, { logSerializers: { test: value => 'X' + value } })
 
-  function context1 (instance, opts, next) {
+  function context1 (instance, opts, done) {
     instance.get('/', (req, reply) => {
       req.log.info({ test: 'Hello' })
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }
 
   fastify.inject({
@@ -825,7 +825,7 @@ test('Should use serializers from plugin and route', t => {
     logSerializers: { test: value => 'X' + value }
   })
 
-  function context1 (instance, opts, next) {
+  function context1 (instance, opts, done) {
     instance.get('/', {
       logSerializers: {
         test2: value => 'Z' + value
@@ -834,7 +834,7 @@ test('Should use serializers from plugin and route', t => {
       req.log.info({ test: 'Hello', test2: 'Hello' }) // { test: 'XHello', test2: 'ZHello' }
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }
 
   fastify.inject({
@@ -912,7 +912,7 @@ test('Should use serializers inherit from contexts', t => {
   const fastify = Fastify({ logger })
   fastify.register(context1, { logSerializers: { test2: value => 'Y' + value } })
 
-  function context1 (instance, opts, next) {
+  function context1 (instance, opts, done) {
     instance.get('/', {
       logSerializers: {
         test3: value => 'Z' + value
@@ -921,7 +921,7 @@ test('Should use serializers inherit from contexts', t => {
       req.log.info({ test: 'Hello', test2: 'Hello', test3: 'Hello' }) // { test: 'XHello', test2: 'YHello', test3: 'ZHello' }
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }
 
   fastify.inject({
@@ -949,12 +949,12 @@ test('Should increase the log level for a specific plugin', t => {
     logger
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/', (req, reply) => {
       req.log.error('Hello') // we should see this log
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { logLevel: 'error' })
 
   fastify.inject({
@@ -982,12 +982,12 @@ test('Should set the log level for the customized 404 handler', t => {
     logger
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.setNotFoundHandler(function (req, reply) {
       req.log.error('Hello')
       reply.code(404).send()
     })
-    next()
+    done()
   }, { logLevel: 'error' })
 
   fastify.inject({
@@ -1014,7 +1014,7 @@ test('Should set the log level for the customized 500 handler', t => {
     logger
   })
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/', (req, reply) => {
       req.log.error('kaboom')
       reply.send(new Error('kaboom'))
@@ -1024,7 +1024,7 @@ test('Should set the log level for the customized 500 handler', t => {
       reply.log.fatal('Hello')
       reply.code(500).send()
     })
-    next()
+    done()
   }, { logLevel: 'fatal' })
 
   fastify.inject({

package/test/middleware.test.js

@@ -41,20 +41,20 @@ test('Encapsulation works', t => {
   t.plan(2)
   const fastify = Fastify()
 
-  fastify.register((instance, opts, next) => {
+  fastify.register((instance, opts, done) => {
     instance.decorate('use', () => true)
     t.strictEqual(instance.use(), true)
-    next()
+    done()
   })
 
-  fastify.register((instance, opts, next) => {
+  fastify.register((instance, opts, done) => {
     try {
       instance.use()
       t.fail('Should throw')
     } catch (err) {
       t.ok(err instanceof FST_ERR_MISSING_MIDDLEWARE)
     }
-    next()
+    done()
   })
 
   fastify.ready()

package/test/plugin.helper.js

@@ -2,7 +2,7 @@
 
 const fp = require('fastify-plugin')
 
-module.exports = fp(function (fastify, opts, next) {
+module.exports = fp(function (fastify, opts, done) {
   fastify.decorate('test', () => {})
-  next()
+  done()
 })