fastify 5.2.0 → 5.2.1

package/README.md

@@ -284,34 +284,31 @@ listed in alphabetical order.
   <https://twitter.com/matteocollina>, <https://www.npmjs.com/~matteo.collina>
 * [__Tomas Della Vedova__](https://github.com/delvedor),
   <https://twitter.com/delvedor>, <https://www.npmjs.com/~delvedor>
+* [__KaKa Ng__](https://github.com/climba03003),
+  <https://www.npmjs.com/~climba03003>
 * [__Manuel Spigolon__](https://github.com/eomm),
   <https://twitter.com/manueomm>, <https://www.npmjs.com/~eomm>
 * [__James Sumners__](https://github.com/jsumners),
   <https://twitter.com/jsumners79>, <https://www.npmjs.com/~jsumners>
 
 ### Fastify Core team
-* [__Tommaso Allevi__](https://github.com/allevo),
-  <https://twitter.com/allevitommaso>, <https://www.npmjs.com/~allevo>
+* [__Aras Abbasi__](https://github.com/uzlopak),
+  <https://www.npmjs.com/~uzlopak>
 * [__Harry Brundage__](https://github.com/airhorns/),
   <https://twitter.com/harrybrundage>, <https://www.npmjs.com/~airhorns>
-* [__David Mark Clements__](https://github.com/davidmarkclements),
-  <https://twitter.com/davidmarkclem>,
-  <https://www.npmjs.com/~davidmarkclements>
 * [__Matteo Collina__](https://github.com/mcollina),
   <https://twitter.com/matteocollina>, <https://www.npmjs.com/~matteo.collina>
+* [__Gürgün Dayıoğlu__](https://github.com/gurgunday),
+  <https://www.npmjs.com/~gurgunday>
 * [__Tomas Della Vedova__](https://github.com/delvedor),
   <https://twitter.com/delvedor>, <https://www.npmjs.com/~delvedor>
-* [__Dustin Deus__](https://github.com/StarpTech),
-  <https://twitter.com/dustindeus>, <https://www.npmjs.com/~starptech>
-* [__Ayoub El Khattabi__](https://github.com/AyoubElk),
-  <https://twitter.com/ayoubelkh>, <https://www.npmjs.com/~ayoubelk>
-* [__Denis Fäcke__](https://github.com/SerayaEryn),
-  <https://twitter.com/serayaeryn>, <https://www.npmjs.com/~serayaeryn>
 * [__Carlos Fuentes__](https://github.com/metcoder95),
   <https://twitter.com/metcoder95>, <https://www.npmjs.com/~metcoder95>
 * [__Vincent Le Goff__](https://github.com/zekth)
 * [__Luciano Mammino__](https://github.com/lmammino),
   <https://twitter.com/loige>, <https://www.npmjs.com/~lmammino>
+* [__KaKa Ng__](https://github.com/climba03003),
+  <https://www.npmjs.com/~climba03003>
 * [__Luis Orbaiceta__](https://github.com/luisorbaiceta),
   <https://twitter.com/luisorbai>, <https://www.npmjs.com/~luisorbaiceta>
 * [__Maksim Sinik__](https://github.com/fox1t),
@@ -320,63 +317,65 @@ listed in alphabetical order.
   <https://twitter.com/manueomm>, <https://www.npmjs.com/~eomm>
 * [__James Sumners__](https://github.com/jsumners),
   <https://twitter.com/jsumners79>, <https://www.npmjs.com/~jsumners>
-* [__Aras Abbasi__](https://github.com/uzlopak),
-  <https://www.npmjs.com/~uzlopak>
-* [__Gürgün Dayıoğlu__](https://github.com/gurgunday),
-  <https://www.npmjs.com/~gurgunday>
 
 ### Fastify Plugins team
-* [__Matteo Collina__](https://github.com/mcollina),
-  <https://twitter.com/matteocollina>, <https://www.npmjs.com/~matteo.collina>
 * [__Harry Brundage__](https://github.com/airhorns/),
   <https://twitter.com/harrybrundage>, <https://www.npmjs.com/~airhorns>
+* [__Simone Busoli__](https://github.com/simoneb),
+  <https://twitter.com/simonebu>, <https://www.npmjs.com/~simoneb>
+* [__Dan Castillo__](https://github.com/dancastillo),
+  <https://www.npmjs.com/~dancastillo>
+* [__Matteo Collina__](https://github.com/mcollina),
+  <https://twitter.com/matteocollina>, <https://www.npmjs.com/~matteo.collina>
+* [__Gürgün Dayıoğlu__](https://github.com/gurgunday),
+  <https://www.npmjs.com/~gurgunday>
 * [__Tomas Della Vedova__](https://github.com/delvedor),
   <https://twitter.com/delvedor>, <https://www.npmjs.com/~delvedor>
-* [__Ayoub El Khattabi__](https://github.com/AyoubElk),
-  <https://twitter.com/ayoubelkh>, <https://www.npmjs.com/~ayoubelk>
 * [__Carlos Fuentes__](https://github.com/metcoder95),
   <https://twitter.com/metcoder95>, <https://www.npmjs.com/~metcoder95>
 * [__Vincent Le Goff__](https://github.com/zekth)
-* [__Salman Mitha__](https://github.com/salmanm),
-  <https://www.npmjs.com/~salmanm>
+* [__Jean Michelet__](https://github.com/jean-michelet),
+  <https://www.npmjs.com/~jean-michelet>
+* [__KaKa Ng__](https://github.com/climba03003),
+  <https://www.npmjs.com/~climba03003>
 * [__Maksim Sinik__](https://github.com/fox1t),
   <https://twitter.com/maksimsinik>, <https://www.npmjs.com/~fox1t>
 * [__Frazer Smith__](https://github.com/Fdawgs), <https://www.npmjs.com/~fdawgs>
 * [__Manuel Spigolon__](https://github.com/eomm),
   <https://twitter.com/manueomm>, <https://www.npmjs.com/~eomm>
-* [__Simone Busoli__](https://github.com/simoneb),
-  <https://twitter.com/simonebu>, <https://www.npmjs.com/~simoneb>
-* [__Gürgün Dayıoğlu__](https://github.com/gurgunday),
-  <https://www.npmjs.com/~gurgunday>
-* [__Dan Castillo__](https://github.com/dancastillo),
-  <https://www.npmjs.com/~dancastillo>
-* [__Jean Michelet__](https://github.com/jean-michelet),
-  <https://www.npmjs.com/~jean-michelet>
 
-### Great Contributors
+### Emeritus Contributors
 Great contributors on a specific area in the Fastify ecosystem will be invited
-to join this group by Lead Maintainers.
-
-* [__dalisoft__](https://github.com/dalisoft), <https://twitter.com/dalisoft>,
-  <https://www.npmjs.com/~dalisoft>
-* [__Luciano Mammino__](https://github.com/lmammino),
-  <https://twitter.com/loige>, <https://www.npmjs.com/~lmammino>
-* [__Evan Shortiss__](https://github.com/evanshortiss),
-  <https://twitter.com/evanshortiss>, <https://www.npmjs.com/~evanshortiss>
+to join this group by Lead Maintainers when they decide to step down from the
+active contributors group.
 
-**Past Collaborators**
+* [__Tommaso Allevi__](https://github.com/allevo),
+  <https://twitter.com/allevitommaso>, <https://www.npmjs.com/~allevo>
+* [__Ethan Arrowood__](https://github.com/Ethan-Arrowood/),
+  <https://twitter.com/arrowoodtech>, <https://www.npmjs.com/~ethan_arrowood>
 * [__Çağatay Çalı__](https://github.com/cagataycali),
   <https://twitter.com/cagataycali>, <https://www.npmjs.com/~cagataycali>
+* [__David Mark Clements__](https://github.com/davidmarkclements),
+  <https://twitter.com/davidmarkclem>,
+  <https://www.npmjs.com/~davidmarkclements>
+* [__dalisoft__](https://github.com/dalisoft), <https://twitter.com/dalisoft>,
+  <https://www.npmjs.com/~dalisoft>
+* [__Dustin Deus__](https://github.com/StarpTech),
+  <https://twitter.com/dustindeus>, <https://www.npmjs.com/~starptech>
+* [__Denis Fäcke__](https://github.com/SerayaEryn),
+  <https://twitter.com/serayaeryn>, <https://www.npmjs.com/~serayaeryn>
+* [__Rafael Gonzaga__](https://github.com/rafaelgss),
+  <https://twitter.com/_rafaelgss>, <https://www.npmjs.com/~rafaelgss>
 * [__Trivikram Kamat__](https://github.com/trivikr),
   <https://twitter.com/trivikram>, <https://www.npmjs.com/~trivikr>
+* [__Ayoub El Khattabi__](https://github.com/AyoubElk),
+  <https://twitter.com/ayoubelkh>, <https://www.npmjs.com/~ayoubelk>
 * [__Cemre Mengu__](https://github.com/cemremengu),
   <https://twitter.com/cemremengu>, <https://www.npmjs.com/~cemremengu>
+* [__Salman Mitha__](https://github.com/salmanm),
+  <https://www.npmjs.com/~salmanm>
 * [__Nathan Woltman__](https://github.com/nwoltman),
   <https://twitter.com/NathanWoltman>, <https://www.npmjs.com/~nwoltman>
-* [__Ethan Arrowood__](https://github.com/Ethan-Arrowood/),
-  <https://twitter.com/arrowoodtech>, <https://www.npmjs.com/~ethan_arrowood>
-* [__Rafael Gonzaga__](https://github.com/rafaelgss),
-  <https://twitter.com/_rafaelgss>, <https://www.npmjs.com/~rafaelgss>
 
 ## Hosted by
 

package/build/build-validation.js

@@ -8,7 +8,7 @@ const path = require('node:path')
 const factory = AjvStandaloneCompiler({
   readMode: false,
   storeFunction (routeOpts, schemaValidationCode) {
-    const moduleCode = `// This file is autogenerated by ${__filename.replace(__dirname, 'build')}, do not edit
+    const moduleCode = `// This file is autogenerated by build/build-validation.js, do not edit
 /* c8 ignore start */
 ${schemaValidationCode}
 

package/docs/Reference/Errors.md

@@ -49,6 +49,7 @@
     - [FST_ERR_LOG_LOGGER_AND_LOGGER_INSTANCE_PROVIDED](#fst_err_log_logger_and_logger_instance_provided)
     - [FST_ERR_REP_INVALID_PAYLOAD_TYPE](#fst_err_rep_invalid_payload_type)
     - [FST_ERR_REP_RESPONSE_BODY_CONSUMED](#fst_err_rep_response_body_consumed)
+    - [FST_ERR_REP_READABLE_STREAM_LOCKED](#fst_err_rep_readable_stream_locked)
     - [FST_ERR_REP_ALREADY_SENT](#fst_err_rep_already_sent)
     - [FST_ERR_REP_SENT_VALUE](#fst_err_rep_sent_value)
     - [FST_ERR_SEND_INSIDE_ONERR](#fst_err_send_inside_onerr)
@@ -321,6 +322,7 @@ Below is a table with all the error codes that Fastify uses.
 | <a id="fst_err_log_logger_and_logger_instance_provided">FST_ERR_LOG_LOGGER_AND_LOGGER_INSTANCE_PROVIDED</a> | You cannot provide both `'logger'` and `'loggerInstance'`. | Please provide only one option.  | [#5020](https://github.com/fastify/fastify/pull/5020) |
 | <a id="fst_err_rep_invalid_payload_type">FST_ERR_REP_INVALID_PAYLOAD_TYPE</a> | Reply payload can be either a `string` or a `Buffer`. | Use a `string` or a `Buffer` for the payload. | [#1168](https://github.com/fastify/fastify/pull/1168) |
 | <a id="fst_err_rep_response_body_consumed">FST_ERR_REP_RESPONSE_BODY_CONSUMED</a> | Using `Response` as reply payload, but the body is being consumed. | Make sure you don't consume the `Response.body` | [#5286](https://github.com/fastify/fastify/pull/5286) |
+| <a id="fst_err_rep_readable_stream_locked">FST_ERR_REP_READABLE_STREAM_LOCKED</a> | Using `ReadableStream` as reply payload, but locked with another reader. | Make sure you don't call the `Readable.getReader` before sending or release lock with `reader.releaseLock()` before sending. | [#5920](https://github.com/fastify/fastify/pull/5920) |
 | <a id="fst_err_rep_already_sent">FST_ERR_REP_ALREADY_SENT</a> | A response was already sent. | - | [#1336](https://github.com/fastify/fastify/pull/1336) |
 | <a id="fst_err_rep_sent_value">FST_ERR_REP_SENT_VALUE</a> | The only possible value for `reply.sent` is `true`. | - | [#1336](https://github.com/fastify/fastify/pull/1336) |
 | <a id="fst_err_send_inside_onerr">FST_ERR_SEND_INSIDE_ONERR</a> | You cannot use `send` inside the `onError` hook. | - | [#1348](https://github.com/fastify/fastify/pull/1348) |

package/docs/Reference/Request.md

@@ -23,13 +23,12 @@ Request is a core Fastify object containing the following fields:
 - `host` - the host of the incoming request (derived from `X-Forwarded-Host`
   header when the [`trustProxy`](./Server.md#factory-trust-proxy) option is
   enabled). For HTTP/2 compatibility it returns `:authority` if no host header
-  exists. The host header may return empty string when using
-  `requireHostHeader = false`, not suppied when connected with `HTTP/1.0` or
-  using schema validation that remove the extra headers.
-- `hostname` - the host of the `host` property, it may refers the incoming
-  request hostname
-- `port` - the port of the `host` property, it may refers the port thats
-  the server is listening on
+  exists. The host header may return an empty string if `requireHostHeader`
+  is false, not provided with HTTP/1.0, or removed by schema validation.
+- `hostname` - the hostname derived from the `host` property of
+  the incoming request
+- `port` - the port from the `host` property, which may refer to
+  the port the server is listening on
 - `protocol` - the protocol of the incoming request (`https` or `http`)
 - `method` - the method of the incoming request
 - `url` - the URL of the incoming request
@@ -88,8 +87,8 @@ request's headers with the `request.raw.headers` property.
 > Note: For performance reason on `not found` route, you may see that we will
 add an extra property `Symbol('fastify.RequestAcceptVersion')` on the headers.
 
-> Note: When using schema, it may mutate the `request.headers` and
-`request.raw.headers` object. So, you may found the headers becomes empty.
+> Note: Using schema validation may mutate the `request.headers` and
+`request.raw.headers` objects, causing the headers to become empty.
 
 ```js
 fastify.post('/:params', options, function (request, reply) {
@@ -162,7 +161,7 @@ This function will compile a validation schema and
 return a function that can be used to validate data.
 The function returned (a.k.a. _validation function_) is compiled
 by using the provided [`SchemaController#ValidationCompiler`](./Server.md#schema-controller).
-A `WeakMap` is used to cached this, reducing compilation calls.
+A `WeakMap` is used to cache this, reducing compilation calls.
 
 The optional parameter `httpPart`, if provided, is forwarded directly
 the `ValidationCompiler`, so it can be used to compile the validation

package/docs/Reference/Server.md

@@ -567,7 +567,7 @@ const fastify = Fastify({ trustProxy: true })
 ```
 
 For more examples, refer to the
-[`proxy-addr`](https://www.npmjs.com/package/proxy-addr) package.
+[`@fastify/proxy-addr`](https://www.npmjs.com/package/@fastify/proxy-addr) package.
 
 You may access the `ip`, `ips`, `host` and `protocol` values on the
 [`request`](./Request.md) object.

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '5.2.0'
+const VERSION = '5.2.1'
 
 const Avvio = require('avvio')
 const http = require('node:http')

package/lib/errors.js

@@ -241,6 +241,10 @@ const codes = {
     'FST_ERR_REP_RESPONSE_BODY_CONSUMED',
     'Response.body is already consumed.'
   ),
+  FST_ERR_REP_READABLE_STREAM_LOCKED: createError(
+    'FST_ERR_REP_READABLE_STREAM_LOCKED',
+    'ReadableStream was locked. You should call releaseLock() method on reader before sending.'
+  ),
   FST_ERR_REP_ALREADY_SENT: createError(
     'FST_ERR_REP_ALREADY_SENT',
     'Reply was already sent, did you forget to "return reply" in "%s" (%s)?'

package/lib/reply.js

@@ -45,6 +45,7 @@ const CONTENT_TYPE = {
 const {
   FST_ERR_REP_INVALID_PAYLOAD_TYPE,
   FST_ERR_REP_RESPONSE_BODY_CONSUMED,
+  FST_ERR_REP_READABLE_STREAM_LOCKED,
   FST_ERR_REP_ALREADY_SENT,
   FST_ERR_SEND_INSIDE_ONERR,
   FST_ERR_BAD_STATUS_CODE,
@@ -670,6 +671,9 @@ function logStreamError (logger, err, res) {
 }
 
 function sendWebStream (payload, res, reply) {
+  if (payload.locked) {
+    throw FST_ERR_REP_READABLE_STREAM_LOCKED()
+  }
   const nodeStream = Readable.fromWeb(payload)
   sendStream(nodeStream, res, reply)
 }

package/lib/request.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const proxyAddr = require('proxy-addr')
+const proxyAddr = require('@fastify/proxy-addr')
 const {
   kHasBeenDecorated,
   kSchemaBody,
@@ -117,10 +117,12 @@ function buildRequestWithTrustProxy (R, trustProxy) {
         if (this.ip !== undefined && this.headers['x-forwarded-host']) {
           return getLastEntryInMultiHeaderValue(this.headers['x-forwarded-host'])
         }
-        // the last fallback is used to support the following cases:
-        // 1. support http.requireHostHeader === false
-        // 2. support HTTP/1.0 without Host Header
-        // 3. support headers schema which may remove the Host Header
+        /**
+         * The last fallback supports the following cases:
+         * 1. http.requireHostHeader === false
+         * 2. HTTP/1.0 without a Host Header
+         * 3. Headers schema that may remove the Host Header
+         */
         return this.headers.host ?? this.headers[':authority'] ?? ''
       }
     },
@@ -213,10 +215,12 @@ Object.defineProperties(Request.prototype, {
   },
   host: {
     get () {
-      // the last fallback is used to support the following cases:
-      // 1. support http.requireHostHeader === false
-      // 2. support HTTP/1.0 without Host Header
-      // 3. support headers schema which may remove the Host Header
+      /**
+       * The last fallback supports the following cases:
+       * 1. http.requireHostHeader === false
+       * 2. HTTP/1.0 without a Host Header
+       * 3. Headers schema that may remove the Host Header
+       */
       return this.raw.headers.host ?? this.raw.headers[':authority'] ?? ''
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -10,22 +10,22 @@
     "benchmark": "concurrently -k -s first \"node ./examples/benchmark/simple.js\" \"autocannon -c 100 -d 30 -p 10 localhost:3000/\"",
     "benchmark:parser": "concurrently -k -s first \"node ./examples/benchmark/parser.js\" \"autocannon -c 100 -d 30 -p 10 -i ./examples/benchmark/body.json -H \"content-type:application/jsoff\" -m POST localhost:3000/\"",
     "build:validation": "node build/build-error-serializer.js && node build/build-validation.js",
-    "coverage": "c8 --reporter html borp --reporter=./test/test-reporter.mjs --coverage --check-coverage --lines 100 ",
-    "coverage:ci-check-coverage": "borp --reporter=./test/test-reporter.mjs --coverage --check-coverage --lines 100",
+    "coverage": "c8 --reporter html borp --reporter=@jsumners/line-reporter --coverage --check-coverage --lines 100 ",
+    "coverage:ci-check-coverage": "borp --reporter=@jsumners/line-reporter --coverage --check-coverage --lines 100",
     "lint": "npm run lint:eslint",
     "lint:fix": "eslint --fix",
     "lint:markdown": "markdownlint-cli2",
     "lint:eslint": "eslint",
-    "prepublishOnly": "cross-env PREPUBLISH=true borp --reporter=./test/test-reporter.mjs && npm run test:validator:integrity",
+    "prepublishOnly": "cross-env PREPUBLISH=true borp --reporter=@jsumners/line-reporter && npm run test:validator:integrity",
     "test": "npm run lint && npm run unit && npm run test:typescript",
     "test:ci": "npm run unit && npm run test:typescript",
     "test:report": "npm run lint && npm run unit:report && npm run test:typescript",
     "test:validator:integrity": "npm run build:validation && git diff --quiet --ignore-all-space --ignore-blank-lines --ignore-cr-at-eol lib/error-serializer.js && git diff --quiet --ignore-all-space --ignore-blank-lines --ignore-cr-at-eol lib/configValidator.js",
     "test:typescript": "tsc test/types/import.ts --target es2022 --moduleResolution node16 --module node16 --noEmit && tsd",
     "test:watch": "npm run unit -- --watch --coverage-report=none --reporter=terse",
-    "unit": "borp --reporter=./test/test-reporter.mjs --coverage --check-coverage",
-    "unit:report": "c8 --reporter html borp --reporter=./test/test-reporter.mjs",
-    "citgm": "borp --reporter=./test/test-reporter.mjs --coverage --check-coverage --concurrency=1"
+    "unit": "borp --reporter=@jsumners/line-reporter --coverage --check-coverage",
+    "unit:report": "c8 --reporter html borp --reporter=@jsumners/line-reporter",
+    "citgm": "borp --reporter=@jsumners/line-reporter --coverage --check-coverage --concurrency=1"
   },
   "repository": {
     "type": "git",
@@ -131,6 +131,16 @@
     {
       "name": "Aras Abbasi",
       "email": "aras.abbasi@gmail.com"
+    },
+    {
+      "name": "Frazer Smith",
+      "email": "frazer.dev@icloud.com",
+      "url": "https://github.com/fdawgs"
+    },
+    {
+      "name": "KaKa Ng",
+      "email": "kaka@kakang.dev",
+      "url": "https://github.com/climba03003"
     }
   ],
   "license": "MIT",
@@ -150,6 +160,7 @@
   ],
   "devDependencies": {
     "@fastify/pre-commit": "^2.1.0",
+    "@jsumners/line-reporter": "^1.0.1",
     "@sinclair/typebox": "^0.33.4",
     "@sinonjs/fake-timers": "^11.2.2",
     "@stylistic/eslint-plugin": "^2.1.0",
@@ -191,6 +202,7 @@
     "@fastify/ajv-compiler": "^4.0.0",
     "@fastify/error": "^4.0.0",
     "@fastify/fast-json-stringify-compiler": "^5.0.0",
+    "@fastify/proxy-addr": "^5.0.0",
     "abstract-logging": "^2.0.1",
     "avvio": "^9.0.0",
     "fast-json-stringify": "^6.0.0",
@@ -198,7 +210,6 @@
     "light-my-request": "^6.0.0",
     "pino": "^9.0.0",
     "process-warning": "^4.0.0",
-    "proxy-addr": "^2.0.7",
     "rfdc": "^1.3.1",
     "secure-json-parse": "^3.0.1",
     "semver": "^7.6.0",

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

@@ -1,9 +1,8 @@
 'use strict'
 
-const t = require('tap')
-const test = t.test
+const { test } = require('node:test')
 const sget = require('simple-get').concat
-const Fastify = require('../fastify')
+const Fastify = require('..')
 const { getServerUrl } = require('./helper')
 
 process.removeAllListeners('warning')
@@ -14,17 +13,17 @@ test('Wrong parseAs parameter', t => {
 
   try {
     fastify.addContentTypeParser('application/json', { parseAs: 'fireworks' }, () => {})
-    t.fail('should throw')
+    t.assert.fail('should throw')
   } catch (err) {
-    t.equal(err.code, 'FST_ERR_CTP_INVALID_PARSE_TYPE')
-    t.equal(err.message, "The body parser can only parse your data as 'string' or 'buffer', you asked 'fireworks' which is not supported.")
+    t.assert.strictEqual(err.code, 'FST_ERR_CTP_INVALID_PARSE_TYPE')
+    t.assert.strictEqual(err.message, "The body parser can only parse your data as 'string' or 'buffer', you asked 'fireworks' which is not supported.")
   }
 })
 
-test('Should allow defining the bodyLimit per parser', t => {
+test('Should allow defining the bodyLimit per parser', (t, done) => {
   t.plan(3)
   const fastify = Fastify()
-  t.teardown(() => fastify.close())
+  t.after(() => fastify.close())
 
   fastify.post('/', (req, reply) => {
     reply.send(req.body)
@@ -34,13 +33,13 @@ test('Should allow defining the bodyLimit per parser', t => {
     'x/foo',
     { parseAs: 'string', bodyLimit: 5 },
     function (req, body, done) {
-      t.fail('should not be invoked')
+      t.assert.fail('should not be invoked')
       done()
     }
   )
 
   fastify.listen({ port: 0 }, err => {
-    t.error(err)
+    t.assert.ifError(err)
 
     sget({
       method: 'POST',
@@ -50,22 +49,22 @@ test('Should allow defining the bodyLimit per parser', t => {
         'Content-Type': 'x/foo'
       }
     }, (err, response, body) => {
-      t.error(err)
-      t.strictSame(JSON.parse(body.toString()), {
+      t.assert.ifError(err)
+      t.assert.deepStrictEqual(JSON.parse(body.toString()), {
         statusCode: 413,
         code: 'FST_ERR_CTP_BODY_TOO_LARGE',
         error: 'Payload Too Large',
         message: 'Request body is too large'
       })
-      fastify.close()
+      done()
     })
   })
 })
 
-test('route bodyLimit should take precedence over a custom parser bodyLimit', t => {
+test('route bodyLimit should take precedence over a custom parser bodyLimit', (t, done) => {
   t.plan(3)
   const fastify = Fastify()
-  t.teardown(() => fastify.close())
+  t.after(() => fastify.close())
 
   fastify.post('/', { bodyLimit: 5 }, (request, reply) => {
     reply.send(request.body)
@@ -75,13 +74,13 @@ test('route bodyLimit should take precedence over a custom parser bodyLimit', t
     'x/foo',
     { parseAs: 'string', bodyLimit: 100 },
     function (req, body, done) {
-      t.fail('should not be invoked')
+      t.assert.fail('should not be invoked')
       done()
     }
   )
 
   fastify.listen({ port: 0 }, err => {
-    t.error(err)
+    t.assert.ifError(err)
 
     sget({
       method: 'POST',
@@ -89,14 +88,14 @@ test('route bodyLimit should take precedence over a custom parser bodyLimit', t
       body: '1234567890',
       headers: { 'Content-Type': 'x/foo' }
     }, (err, response, body) => {
-      t.error(err)
-      t.strictSame(JSON.parse(body.toString()), {
+      t.assert.ifError(err)
+      t.assert.deepStrictEqual(JSON.parse(body.toString()), {
         statusCode: 413,
         code: 'FST_ERR_CTP_BODY_TOO_LARGE',
         error: 'Payload Too Large',
         message: 'Request body is too large'
       })
-      fastify.close()
+      done()
     })
   })
 })