fastify 5.2.1 → 5.3.0

package/test/stream.5.test.js

@@ -1,14 +1,13 @@
 'use strict'
 
-const t = require('tap')
-const test = t.test
+const { test } = require('node:test')
 const proxyquire = require('proxyquire')
 const fs = require('node:fs')
 const Readable = require('node:stream').Readable
 const sget = require('simple-get').concat
 const Fastify = require('..')
 
-test('should destroy stream when response is ended', t => {
+test('should destroy stream when response is ended', (t, done) => {
   t.plan(4)
   const stream = require('node:stream')
   const fastify = Fastify()
@@ -17,7 +16,7 @@ test('should destroy stream when response is ended', t => {
     const reallyLongStream = new stream.Readable({
       read: function () { },
       destroy: function (err, callback) {
-        t.ok('called')
+        t.assert.ok('called')
         callback(err)
       }
     })
@@ -26,23 +25,25 @@ test('should destroy stream when response is ended', t => {
   })
 
   fastify.listen({ port: 0 }, err => {
-    t.error(err)
-    t.teardown(() => { fastify.close() })
+    t.assert.ifError(err)
+    t.after(() => fastify.close())
 
     sget(`http://localhost:${fastify.server.address().port}/error`, function (err, response) {
-      t.error(err)
-      t.equal(response.statusCode, 200)
+      t.assert.ifError(err)
+      t.assert.strictEqual(response.statusCode, 200)
+      done()
     })
   })
 })
 
-test('should mark reply as sent before pumping the payload stream into response for async route handler', t => {
+test('should mark reply as sent before pumping the payload stream into response for async route handler', (t, done) => {
   t.plan(3)
+  t.after(() => fastify.close())
 
   const handleRequest = proxyquire('../lib/handleRequest', {
     './wrapThenable': (thenable, reply) => {
       thenable.then(function (payload) {
-        t.equal(reply.sent, true)
+        t.assert.strictEqual(reply.sent, true)
       })
     }
   })
@@ -66,20 +67,20 @@ test('should mark reply as sent before pumping the payload stream into response
     url: '/',
     method: 'GET'
   }, (err, res) => {
-    t.error(err)
-    t.equal(res.payload, fs.readFileSync(__filename, 'utf8'))
-    fastify.close()
+    t.assert.ifError(err)
+    t.assert.strictEqual(res.payload, fs.readFileSync(__filename, 'utf8'))
+    done()
   })
 })
 
-test('reply.send handles aborted requests', t => {
+test('reply.send handles aborted requests', (t, done) => {
   t.plan(2)
 
   const spyLogger = {
     level: 'error',
     fatal: () => { },
     error: () => {
-      t.fail('should not log an error')
+      t.assert.fail('should not log an error')
     },
     warn: () => { },
     info: () => { },
@@ -103,31 +104,31 @@ test('reply.send handles aborted requests', t => {
   })
 
   fastify.listen({ port: 0 }, err => {
-    t.error(err)
-    t.teardown(() => { fastify.close() })
+    t.assert.ifError(err)
+    t.after(() => fastify.close())
 
     const port = fastify.server.address().port
     const http = require('node:http')
     const req = http.get(`http://localhost:${port}`)
       .on('error', (err) => {
-        t.equal(err.code, 'ECONNRESET')
-        fastify.close()
+        t.assert.strictEqual(err.code, 'ECONNRESET')
+        done()
       })
 
     setTimeout(() => {
-      req.abort()
+      req.destroy()
     }, 1)
   })
 })
 
-test('request terminated should not crash fastify', t => {
+test('request terminated should not crash fastify', (t, done) => {
   t.plan(10)
 
   const spyLogger = {
     level: 'error',
     fatal: () => { },
     error: () => {
-      t.fail('should not log an error')
+      t.assert.fail('should not log an error')
     },
     warn: () => { },
     info: () => { },
@@ -156,18 +157,18 @@ test('request terminated should not crash fastify', t => {
   })
 
   fastify.listen({ port: 0 }, err => {
-    t.error(err)
-    t.teardown(() => { fastify.close() })
+    t.assert.ifError(err)
+    t.after(() => fastify.close())
 
     const port = fastify.server.address().port
     const http = require('node:http')
     const req = http.get(`http://localhost:${port}`, function (res) {
       const { statusCode, headers } = res
-      t.equal(statusCode, 200)
-      t.equal(headers['content-type'], 'text/html; charset=utf-8')
-      t.equal(headers['transfer-encoding'], 'chunked')
+      t.assert.strictEqual(statusCode, 200)
+      t.assert.strictEqual(headers['content-type'], 'text/html; charset=utf-8')
+      t.assert.strictEqual(headers['transfer-encoding'], 'chunked')
       res.on('data', function (chunk) {
-        t.equal(chunk.toString(), '<h1>HTML</h1>')
+        t.assert.strictEqual(chunk.toString(), '<h1>HTML</h1>')
       })
 
       setTimeout(() => {
@@ -176,16 +177,17 @@ test('request terminated should not crash fastify', t => {
         // the server is not crash, we can connect it
         http.get(`http://localhost:${port}`, function (res) {
           const { statusCode, headers } = res
-          t.equal(statusCode, 200)
-          t.equal(headers['content-type'], 'text/html; charset=utf-8')
-          t.equal(headers['transfer-encoding'], 'chunked')
+          t.assert.strictEqual(statusCode, 200)
+          t.assert.strictEqual(headers['content-type'], 'text/html; charset=utf-8')
+          t.assert.strictEqual(headers['transfer-encoding'], 'chunked')
           let payload = ''
           res.on('data', function (chunk) {
             payload += chunk.toString()
           })
           res.on('end', function () {
-            t.equal(payload, '<h1>HTML</h1><h1>should display on second stream</h1>')
-            t.pass('should end properly')
+            t.assert.strictEqual(payload, '<h1>HTML</h1><h1>should display on second stream</h1>')
+            t.assert.ok('should end properly')
+            done()
           })
         })
       }, 1)

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 }
+}