fastify 3.9.2 → 3.12.0

package/test/route-hooks.test.js

@@ -6,11 +6,11 @@ const Fastify = require('../')
 
 process.removeAllListeners('warning')
 
-function endMiddleware (nextOrPayload, next) {
-  if (typeof nextOrPayload === 'function') {
-    nextOrPayload()
+function endRouteHook (doneOrPayload, done) {
+  if (typeof doneOrPayload === 'function') {
+    doneOrPayload()
   } else {
-    next()
+    done()
   }
 }
 
@@ -20,9 +20,9 @@ function testExecutionHook (hook) {
     const fastify = Fastify()
 
     fastify.post('/', {
-      [hook]: (req, reply, nextOrPayload, next) => {
+      [hook]: (req, reply, doneOrPayload, done) => {
         t.pass('hook called')
-        endMiddleware(nextOrPayload, next)
+        endRouteHook(doneOrPayload, done)
       }
     }, (req, reply) => {
       reply.send(req.body)
@@ -46,15 +46,15 @@ function testExecutionHook (hook) {
       get: function () { return ++this.calledTimes }
     })
 
-    fastify.addHook(hook, (req, reply, nextOrPayload, next) => {
+    fastify.addHook(hook, (req, reply, doneOrPayload, done) => {
       t.equal(checker.check, 1)
-      endMiddleware(nextOrPayload, next)
+      endRouteHook(doneOrPayload, done)
     })
 
     fastify.post('/', {
-      [hook]: (req, reply, nextOrPayload, next) => {
+      [hook]: (req, reply, doneOrPayload, done) => {
         t.equal(checker.check, 2)
-        endMiddleware(nextOrPayload, next)
+        endRouteHook(doneOrPayload, done)
       }
     }, (req, reply) => {
       reply.send({})
@@ -78,13 +78,13 @@ function testExecutionHook (hook) {
 
     fastify.post('/', {
       [hook]: [
-        (req, reply, nextOrPayload, next) => {
+        (req, reply, doneOrPayload, done) => {
           t.equal(checker.check, 1)
-          endMiddleware(nextOrPayload, next)
+          endRouteHook(doneOrPayload, done)
         },
-        (req, reply, nextOrPayload, next) => {
+        (req, reply, doneOrPayload, done) => {
           t.equal(checker.check, 2)
-          endMiddleware(nextOrPayload, next)
+          endRouteHook(doneOrPayload, done)
         }
       ]
     }, (req, reply) => {
@@ -107,15 +107,15 @@ function testExecutionHook (hook) {
       get: function () { return ++this.calledTimes }
     })
 
-    fastify.addHook(hook, (req, reply, nextOrPayload, next) => {
+    fastify.addHook(hook, (req, reply, doneOrPayload, done) => {
       t.equal(checker.check, 1)
-      endMiddleware(nextOrPayload, next)
+      endRouteHook(doneOrPayload, done)
     })
 
     fastify.post('/', {
-      [hook]: (req, reply, nextOrPayload, next) => {
+      [hook]: (req, reply, doneOrPayload, done) => {
         t.equal(checker.check, 2)
-        endMiddleware(nextOrPayload, next)
+        endRouteHook(doneOrPayload, done)
       }
     }, handler)
 
@@ -365,9 +365,9 @@ test('preValidation option should be called before preHandler hook', t => {
   t.plan(3)
   const fastify = Fastify()
 
-  fastify.addHook('preHandler', (req, reply, next) => {
+  fastify.addHook('preHandler', (req, reply, done) => {
     t.true(req.called)
-    next()
+    done()
   })
 
   fastify.post('/', {
@@ -416,9 +416,9 @@ test('preParsing option should be called before preValidation hook', t => {
   t.plan(3)
   const fastify = Fastify()
 
-  fastify.addHook('preValidation', (req, reply, next) => {
+  fastify.addHook('preValidation', (req, reply, done) => {
     t.true(req.called)
-    next()
+    done()
   })
 
   fastify.post('/', {
@@ -472,9 +472,9 @@ test('onRequest option should be called before preParsing', t => {
   t.plan(3)
   const fastify = Fastify()
 
-  fastify.addHook('preParsing', (req, reply, next) => {
+  fastify.addHook('preParsing', (req, reply, done) => {
     t.true(req.called)
-    next()
+    done()
   })
 
   fastify.post('/', {

package/test/route-prefix.test.js

@@ -12,19 +12,19 @@ test('Prefix options should add a prefix for all the routes inside a register /
     reply.send({ route: '/first' })
   })
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/first', (req, reply) => {
       reply.send({ route: '/v1/first' })
     })
 
-    fastify.register(function (fastify, opts, next) {
+    fastify.register(function (fastify, opts, done) {
       fastify.get('/first', (req, reply) => {
         reply.send({ route: '/v1/v2/first' })
       })
-      next()
+      done()
     }, { prefix: '/v2' })
 
-    next()
+    done()
   }, { prefix: '/v1' })
 
   fastify.inject({
@@ -56,7 +56,7 @@ test('Prefix options should add a prefix for all the routes inside a register /
   t.plan(4)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/first', (req, reply) => {
       reply.send({ route: '/v1/first' })
     })
@@ -64,7 +64,7 @@ test('Prefix options should add a prefix for all the routes inside a register /
     fastify.get('/second', (req, reply) => {
       reply.send({ route: '/v1/second' })
     })
-    next()
+    done()
   }, { prefix: '/v1' })
 
   fastify.inject({
@@ -89,7 +89,7 @@ test('Prefix options should add a prefix for all the chained routes inside a reg
 
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify
       .get('/first', (req, reply) => {
         reply.send({ route: '/v1/first' })
@@ -97,7 +97,7 @@ test('Prefix options should add a prefix for all the chained routes inside a reg
       .get('/second', (req, reply) => {
         reply.send({ route: '/v1/second' })
       })
-    next()
+    done()
   }, { prefix: '/v1' })
 
   fastify.inject({
@@ -121,11 +121,11 @@ test('Prefix should support parameters as well', t => {
   t.plan(2)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/hello', (req, reply) => {
       reply.send({ id: req.params.id })
     })
-    next()
+    done()
   }, { prefix: '/v1/:id' })
 
   fastify.inject({
@@ -141,11 +141,11 @@ test('Prefix should support /', t => {
   t.plan(2)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/', (req, reply) => {
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { prefix: '/v1' })
 
   fastify.inject({
@@ -161,11 +161,11 @@ test('Prefix without /', t => {
   t.plan(2)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/', (req, reply) => {
       reply.send({ hello: 'world' })
     })
-    next()
+    done()
   }, { prefix: 'v1' })
 
   fastify.inject({
@@ -181,7 +181,7 @@ test('Prefix with trailing /', t => {
   t.plan(6)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/route1', (req, reply) => {
       reply.send({ hello: 'world1' })
     })
@@ -189,14 +189,14 @@ test('Prefix with trailing /', t => {
       reply.send({ hello: 'world2' })
     })
 
-    fastify.register(function (fastify, opts, next) {
+    fastify.register(function (fastify, opts, done) {
       fastify.get('/route3', (req, reply) => {
         reply.send({ hello: 'world3' })
       })
-      next()
+      done()
     }, { prefix: '/inner/' })
 
-    next()
+    done()
   }, { prefix: '/v1/' })
 
   fastify.inject({
@@ -228,20 +228,20 @@ test('Prefix works multiple levels deep', t => {
   t.plan(2)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
-    fastify.register(function (fastify, opts, next) {
-      fastify.register(function (fastify, opts, next) {
-        fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
+    fastify.register(function (fastify, opts, done) {
+      fastify.register(function (fastify, opts, done) {
+        fastify.register(function (fastify, opts, done) {
           fastify.get('/', (req, reply) => {
             reply.send({ hello: 'world' })
           })
-          next()
+          done()
         }, { prefix: '/v3' })
-        next()
+        done()
       }) // No prefix on this level
-      next()
+      done()
     }, { prefix: 'v2' })
-    next()
+    done()
   }, { prefix: '/v1' })
 
   fastify.inject({
@@ -261,24 +261,24 @@ test('Different register - encapsulation check', t => {
     reply.send({ route: '/first' })
   })
 
-  fastify.register(function (instance, opts, next) {
-    instance.register(function (f, opts, next) {
+  fastify.register(function (instance, opts, done) {
+    instance.register(function (f, opts, done) {
       f.get('/', (req, reply) => {
         reply.send({ route: '/v1/v2' })
       })
-      next()
+      done()
     }, { prefix: '/v2' })
-    next()
+    done()
   }, { prefix: '/v1' })
 
-  fastify.register(function (instance, opts, next) {
-    instance.register(function (f, opts, next) {
+  fastify.register(function (instance, opts, done) {
+    instance.register(function (f, opts, done) {
       f.get('/', (req, reply) => {
         reply.send({ route: '/v3/v4' })
       })
-      next()
+      done()
     }, { prefix: '/v4' })
-    next()
+    done()
   }, { prefix: '/v3' })
 
   fastify.inject({
@@ -302,19 +302,19 @@ test('Can retrieve prefix within encapsulated instances', t => {
   t.plan(4)
   const fastify = Fastify()
 
-  fastify.register(function (instance, opts, next) {
+  fastify.register(function (instance, opts, done) {
     instance.get('/one', function (req, reply) {
       reply.send(instance.prefix)
     })
 
-    instance.register(function (instance, opts, next) {
+    instance.register(function (instance, opts, done) {
       instance.get('/two', function (req, reply) {
         reply.send(instance.prefix)
       })
-      next()
+      done()
     }, { prefix: '/v2' })
 
-    next()
+    done()
   }, { prefix: '/v1' })
 
   fastify.inject({
@@ -338,12 +338,12 @@ test('matches both /prefix and /prefix/ with a / route', t => {
   t.plan(4)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/', (req, reply) => {
       reply.send({ hello: 'world' })
     })
 
-    next()
+    done()
   }, { prefix: '/prefix' })
 
   fastify.inject({
@@ -367,12 +367,12 @@ test('prefix "/prefix/" does not match "/prefix" with a / route', t => {
   t.plan(4)
   const fastify = Fastify()
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/', (req, reply) => {
       reply.send({ hello: 'world' })
     })
 
-    next()
+    done()
   }, { prefix: '/prefix/' })
 
   fastify.inject({
@@ -398,12 +398,12 @@ test('matches both /prefix and /prefix/ with a / route - ignoreTrailingSlash: tr
     ignoreTrailingSlash: true
   })
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.get('/', (req, reply) => {
       reply.send({ hello: 'world' })
     })
 
-    next()
+    done()
   }, { prefix: '/prefix' })
 
   fastify.inject({
@@ -429,7 +429,7 @@ test('matches both /prefix and /prefix/  with a / route - prefixTrailingSlash: "
     ignoreTrailingSlash: false
   })
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.route({
       method: 'GET',
       url: '/',
@@ -439,7 +439,7 @@ test('matches both /prefix and /prefix/  with a / route - prefixTrailingSlash: "
       }
     })
 
-    next()
+    done()
   }, { prefix: '/prefix' })
 
   fastify.inject({
@@ -465,7 +465,7 @@ test('returns 404 status code with /prefix/ and / route - prefixTrailingSlash: "
     ignoreTrailingSlash: true
   })
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.route({
       method: 'GET',
       url: '/',
@@ -474,7 +474,7 @@ test('returns 404 status code with /prefix/ and / route - prefixTrailingSlash: "
       }
     })
 
-    next()
+    done()
   }, { prefix: '/prefix/' })
 
   fastify.inject({
@@ -496,7 +496,7 @@ test('matches only /prefix  with a / route - prefixTrailingSlash: "no-slash", ig
     ignoreTrailingSlash: false
   })
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.route({
       method: 'GET',
       url: '/',
@@ -506,7 +506,7 @@ test('matches only /prefix  with a / route - prefixTrailingSlash: "no-slash", ig
       }
     })
 
-    next()
+    done()
   }, { prefix: '/prefix' })
 
   fastify.inject({
@@ -532,7 +532,7 @@ test('matches only /prefix/  with a / route - prefixTrailingSlash: "slash", igno
     ignoreTrailingSlash: false
   })
 
-  fastify.register(function (fastify, opts, next) {
+  fastify.register(function (fastify, opts, done) {
     fastify.route({
       method: 'GET',
       url: '/',
@@ -542,7 +542,7 @@ test('matches only /prefix/  with a / route - prefixTrailingSlash: "slash", igno
       }
     })
 
-    next()
+    done()
   }, { prefix: '/prefix' })
 
   fastify.inject({
@@ -561,3 +561,32 @@ test('matches only /prefix/  with a / route - prefixTrailingSlash: "slash", igno
     t.equal(JSON.parse(res.payload).statusCode, 404)
   })
 })
+
+test('calls onRoute only once when prefixing', async t => {
+  t.plan(1)
+  const fastify = Fastify({
+    ignoreTrailingSlash: false
+  })
+
+  let onRouteCalled = 0
+  fastify.register(function (fastify, opts, next) {
+    fastify.addHook('onRoute', () => {
+      onRouteCalled++
+    })
+
+    fastify.route({
+      method: 'GET',
+      url: '/',
+      prefixTrailingSlash: 'both',
+      handler: (req, reply) => {
+        reply.send({ hello: 'world' })
+      }
+    })
+
+    next()
+  }, { prefix: '/prefix' })
+
+  await fastify.ready()
+
+  t.deepEqual(onRouteCalled, 1)
+})