fastify 5.2.0 → 5.2.2

package/test/throw.test.js

@@ -1,20 +1,20 @@
 'use strict'
 
-const { test } = require('tap')
+const { test } = require('node:test')
 const Fastify = require('..')
 
-test('Fastify should throw on wrong options', t => {
+test('Fastify should throw on wrong options', (t) => {
   t.plan(2)
   try {
     Fastify('lol')
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.equal(e.message, 'Options must be an object')
-    t.pass()
+    t.assert.strictEqual(e.message, 'Options must be an object')
+    t.assert.ok(true)
   }
 })
 
-test('Fastify should throw on multiple assignment to the same route', t => {
+test('Fastify should throw on multiple assignment to the same route', (t) => {
   t.plan(1)
   const fastify = Fastify()
 
@@ -22,14 +22,14 @@ test('Fastify should throw on multiple assignment to the same route', t => {
 
   try {
     fastify.get('/', () => {})
-    t.fail('Should throw fastify duplicated route declaration')
+    t.assert.fail('Should throw fastify duplicated route declaration')
   } catch (error) {
-    t.equal(error.code, 'FST_ERR_DUPLICATED_ROUTE')
+    t.assert.strictEqual(error.code, 'FST_ERR_DUPLICATED_ROUTE')
   }
 })
 
-test('Fastify should throw for an invalid schema, printing the error route - headers', t => {
-  t.plan(2)
+test('Fastify should throw for an invalid schema, printing the error route - headers', async (t) => {
+  t.plan(1)
 
   const badSchema = {
     type: 'object',
@@ -39,20 +39,18 @@ test('Fastify should throw for an invalid schema, printing the error route - hea
       }
     }
   }
-
   const fastify = Fastify()
   fastify.get('/', { schema: { headers: badSchema } }, () => {})
   fastify.get('/not-loaded', { schema: { headers: badSchema } }, () => {})
 
-  fastify.ready(err => {
-    t.equal(err.code, 'FST_ERR_SCH_VALIDATION_BUILD')
-    t.match(err.message, /Failed building the validation schema for GET: \//)
+  await t.assert.rejects(fastify.ready(), {
+    code: 'FST_ERR_SCH_VALIDATION_BUILD',
+    message: /Failed building the validation schema for GET: \//
   })
 })
 
-test('Fastify should throw for an invalid schema, printing the error route - body', t => {
-  t.plan(2)
-
+test('Fastify should throw for an invalid schema, printing the error route - body', async (t) => {
+  t.plan(1)
   const badSchema = {
     type: 'object',
     properties: {
@@ -68,13 +66,13 @@ test('Fastify should throw for an invalid schema, printing the error route - bod
     done()
   }, { prefix: 'hello' })
 
-  fastify.ready(err => {
-    t.equal(err.code, 'FST_ERR_SCH_VALIDATION_BUILD')
-    t.match(err.message, /Failed building the validation schema for POST: \/hello\/form/)
+  await t.assert.rejects(fastify.ready(), {
+    code: 'FST_ERR_SCH_VALIDATION_BUILD',
+    message: /Failed building the validation schema for POST: \/hello\/form/
   })
 })
 
-test('Should throw on unsupported method', t => {
+test('Should throw on unsupported method', async (t) => {
   t.plan(1)
   const fastify = Fastify()
   try {
@@ -84,13 +82,13 @@ test('Should throw on unsupported method', t => {
       schema: {},
       handler: function (req, reply) {}
     })
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should throw on missing handler', t => {
+test('Should throw on missing handler', (t) => {
   t.plan(1)
   const fastify = Fastify()
   try {
@@ -98,15 +96,15 @@ test('Should throw on missing handler', t => {
       method: 'GET',
       url: '/'
     })
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should throw if one method is unsupported', t => {
-  const fastify = Fastify()
+test('Should throw if one method is unsupported', async (t) => {
   t.plan(1)
+  const fastify = Fastify()
   try {
     fastify.route({
       method: ['GET', 'TROLL'],
@@ -114,28 +112,27 @@ test('Should throw if one method is unsupported', t => {
       schema: {},
       handler: function (req, reply) {}
     })
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should throw on duplicate content type parser', t => {
+test('Should throw on duplicate content type parser', async (t) => {
   t.plan(1)
-
   const fastify = Fastify()
   function customParser (req, payload, done) { done(null, '') }
 
   fastify.addContentTypeParser('application/qq', customParser)
   try {
     fastify.addContentTypeParser('application/qq', customParser)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should throw on duplicate decorator', t => {
+test('Should throw on duplicate decorator', async (t) => {
   t.plan(1)
 
   const fastify = Fastify()
@@ -144,31 +141,30 @@ test('Should throw on duplicate decorator', t => {
   fastify.decorate('foo', fooObj)
   try {
     fastify.decorate('foo', fooObj)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should not throw on duplicate decorator encapsulation', t => {
+test('Should not throw on duplicate decorator encapsulation', async (t) => {
   t.plan(1)
-
   const fastify = Fastify()
   const foo2Obj = {}
 
   fastify.decorate('foo2', foo2Obj)
 
   fastify.register(function (fastify, opts, done) {
-    t.doesNotThrow(() => {
+    t.assert.doesNotThrow(() => {
       fastify.decorate('foo2', foo2Obj)
     })
     done()
   })
 
-  fastify.ready()
+  await fastify.ready()
 })
 
-test('Should throw on duplicate request decorator', t => {
+test('Should throw on duplicate request decorator', async (t) => {
   t.plan(2)
 
   const fastify = Fastify()
@@ -176,28 +172,28 @@ test('Should throw on duplicate request decorator', t => {
   fastify.decorateRequest('foo', null)
   try {
     fastify.decorateRequest('foo', null)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.equal(e.code, 'FST_ERR_DEC_ALREADY_PRESENT')
-    t.equal(e.message, 'The decorator \'foo\' has already been added!')
+    t.assert.strictEqual(e.code, 'FST_ERR_DEC_ALREADY_PRESENT')
+    t.assert.strictEqual(e.message, 'The decorator \'foo\' has already been added!')
   }
 })
 
-test('Should throw if request decorator dependencies are not met', t => {
+test('Should throw if request decorator dependencies are not met', async (t) => {
   t.plan(2)
 
   const fastify = Fastify()
 
   try {
     fastify.decorateRequest('bar', null, ['world'])
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.equal(e.code, 'FST_ERR_DEC_MISSING_DEPENDENCY')
-    t.equal(e.message, 'The decorator is missing dependency \'world\'.')
+    t.assert.strictEqual(e.code, 'FST_ERR_DEC_MISSING_DEPENDENCY')
+    t.assert.strictEqual(e.message, 'The decorator is missing dependency \'world\'.')
   }
 })
 
-test('Should throw on duplicate reply decorator', t => {
+test('Should throw on duplicate reply decorator', async (t) => {
   t.plan(1)
 
   const fastify = Fastify()
@@ -205,149 +201,149 @@ test('Should throw on duplicate reply decorator', t => {
   fastify.decorateReply('foo', null)
   try {
     fastify.decorateReply('foo', null)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.ok(/has already been added/.test(e.message))
+    t.assert.ok(/has already been added/.test(e.message))
   }
 })
 
-test('Should throw if reply decorator dependencies are not met', t => {
+test('Should throw if reply decorator dependencies are not met', async (t) => {
   t.plan(1)
 
   const fastify = Fastify()
 
   try {
     fastify.decorateReply('bar', null, ['world'])
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.ok(/missing dependency/.test(e.message))
+    t.assert.ok(/missing dependency/.test(e.message))
   }
 })
 
-test('Should throw if handler as the third parameter to the shortcut method is missing and the second parameter is not a function and also not an object', t => {
+test('Should throw if handler as the third parameter to the shortcut method is missing and the second parameter is not a function and also not an object', async (t) => {
   t.plan(5)
 
   const fastify = Fastify()
 
   try {
     fastify.get('/foo/1', '')
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/2', 1)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/3', [])
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/4', undefined)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/5', null)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should throw if handler as the third parameter to the shortcut method is missing and the second parameter is not a function and also not an object', t => {
+test('Should throw if handler as the third parameter to the shortcut method is missing and the second parameter is not a function and also not an object', async (t) => {
   t.plan(5)
 
   const fastify = Fastify()
 
   try {
     fastify.get('/foo/1', '')
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/2', 1)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/3', [])
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/4', undefined)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/5', null)
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should throw if there is handler function as the third parameter to the shortcut method and options as the second parameter is not an object', t => {
+test('Should throw if there is handler function as the third parameter to the shortcut method and options as the second parameter is not an object', async (t) => {
   t.plan(5)
 
   const fastify = Fastify()
 
   try {
     fastify.get('/foo/1', '', (req, res) => {})
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/2', 1, (req, res) => {})
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/3', [], (req, res) => {})
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/4', undefined, (req, res) => {})
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 
   try {
     fastify.get('/foo/5', null, (req, res) => {})
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })
 
-test('Should throw if found duplicate handler as the third parameter to the shortcut method and in options', t => {
+test('Should throw if found duplicate handler as the third parameter to the shortcut method and in options', async (t) => {
   t.plan(1)
 
   const fastify = Fastify()
@@ -356,8 +352,8 @@ test('Should throw if found duplicate handler as the third parameter to the shor
     fastify.get('/foo/abc', {
       handler: (req, res) => {}
     }, (req, res) => {})
-    t.fail()
+    t.assert.fail()
   } catch (e) {
-    t.pass()
+    t.assert.ok(true)
   }
 })

package/test/toolkit.js

@@ -0,0 +1,32 @@
+'use strict'
+
+exports.waitForCb = function (options) {
+  let count = null
+  let done = false
+  let iResolve
+  let iReject
+
+  function stepIn () {
+    if (done) {
+      iReject(new Error('Unexpected done call'))
+      return
+    }
+
+    if (--count) {
+      return
+    }
+
+    done = true
+    iResolve()
+  }
+
+  const patience = new Promise((resolve, reject) => {
+    iResolve = resolve
+    iReject = reject
+  })
+
+  count = options.steps || 1
+  done = false
+
+  return { stepIn, patience }
+}

package/test/trust-proxy.test.js

@@ -4,6 +4,7 @@ const { test, before } = require('node:test')
 const sget = require('simple-get').concat
 const fastify = require('..')
 const helper = require('./helper')
+const { waitForCb } = require('./toolkit')
 
 const noop = () => {}
 
@@ -69,18 +70,14 @@ test('trust proxy, not add properties to node req', (t, done) => {
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
 
-    sgetForwardedRequest(app, '1.1.1.1', '/trustproxy', undefined, completed)
-    sgetForwardedRequest(app, '2.2.2.2, 1.1.1.1', '/trustproxychain', undefined, completed)
+    const completion = waitForCb({ steps: 2 })
 
-    let pending = 2
-    function completed () {
-      if (--pending === 0) {
-        done()
-      }
-    }
+    sgetForwardedRequest(app, '1.1.1.1', '/trustproxy', undefined, completion.stepIn)
+    sgetForwardedRequest(app, '2.2.2.2, 1.1.1.1', '/trustproxychain', undefined, completion.stepIn)
+
+    completion.patience.then(done)
   })
 })
 
@@ -89,6 +86,7 @@ test('trust proxy chain', (t, done) => {
   const app = fastify({
     trustProxy: [localhost, '192.168.1.1']
   })
+  t.after(() => app.close())
 
   app.get('/trustproxychain', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', host: 'example.com', port: app.server.address().port })
@@ -96,9 +94,7 @@ test('trust proxy chain', (t, done) => {
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '192.168.1.1, 1.1.1.1', '/trustproxychain', undefined, done)
   })
 })
@@ -108,15 +104,15 @@ test('trust proxy function', (t, done) => {
   const app = fastify({
     trustProxy: (address) => address === localhost
   })
+  t.after(() => app.close())
+
   app.get('/trustproxyfunc', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '1.1.1.1', '/trustproxyfunc', undefined, done)
   })
 })
@@ -126,15 +122,15 @@ test('trust proxy number', (t, done) => {
   const app = fastify({
     trustProxy: 1
   })
+  t.after(() => app.close())
+
   app.get('/trustproxynumber', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', ips: [localhost, '1.1.1.1'], host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '2.2.2.2, 1.1.1.1', '/trustproxynumber', undefined, done)
   })
 })
@@ -144,15 +140,15 @@ test('trust proxy IP addresses', (t, done) => {
   const app = fastify({
     trustProxy: `${localhost}, 2.2.2.2`
   })
+  t.after(() => app.close())
+
   app.get('/trustproxyipaddrs', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', ips: [localhost, '1.1.1.1'], host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    t.after(() => app.close())
     sgetForwardedRequest(app, '3.3.3.3, 2.2.2.2, 1.1.1.1', '/trustproxyipaddrs', undefined, done)
   })
 })
@@ -162,6 +158,8 @@ test('trust proxy protocol', (t, done) => {
   const app = fastify({
     trustProxy: true
   })
+  t.after(() => app.close())
+
   app.get('/trustproxyprotocol', function (req, reply) {
     testRequestValues(t, req, { ip: '1.1.1.1', protocol: 'lorem', host: 'example.com', port: app.server.address().port })
     reply.code(200).send({ ip: req.ip, host: req.host })
@@ -175,14 +173,16 @@ test('trust proxy protocol', (t, done) => {
     reply.code(200).send({ ip: req.ip, host: req.host })
   })
 
-  t.after(() => app.close())
-
   app.listen({ port: 0 }, (err) => {
-    app.server.unref()
     t.assert.ifError(err)
-    sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocol', 'lorem')
-    sgetForwardedRequest(app, '1.1.1.1', '/trustproxynoprotocol')
+
+    const completion = waitForCb({ steps: 3 })
+    sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocol', 'lorem', completion.stepIn)
+    sgetForwardedRequest(app, '1.1.1.1', '/trustproxynoprotocol', undefined, completion.stepIn)
+
     // Allow for sgetForwardedRequest requests above to finish
-    setTimeout(() => sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocols', 'ipsum, dolor', done))
+    setTimeout(() => sgetForwardedRequest(app, '1.1.1.1', '/trustproxyprotocols', 'ipsum, dolor', completion.stepIn))
+
+    completion.patience.then(done)
   })
 })

package/test/types/instance.test-d.ts

@@ -36,6 +36,7 @@ expectType<unknown>(server.getSchema('SchemaId'))
 expectType<string>(server.printRoutes())
 expectType<string>(server.printPlugins())
 expectType<string>(server.listeningOrigin)
+expectType<string[]>(server.supportedMethods)
 
 expectAssignable<FastifyInstance>(
   server.setErrorHandler(function (error, request, reply) {