fastify 5.3.2 → 5.4.0

package/test/diagnostics-channel/async-delay-request.test.js

@@ -2,13 +2,11 @@
 
 const diagnostics = require('node:diagnostics_channel')
 const { test } = require('node:test')
-const sget = require('simple-get').concat
 const Fastify = require('../..')
-const { getServerUrl } = require('../helper')
 const Request = require('../../lib/request')
 const Reply = require('../../lib/reply')
 
-test('diagnostics channel async events fire in expected order', (t, done) => {
+test('diagnostics channel async events fire in expected order', async t => {
   t.plan(19)
   let callOrder = 0
   let firstEncounteredMessage
@@ -56,19 +54,12 @@ test('diagnostics channel async events fire in expected order', (t, done) => {
     }
   })
 
-  fastify.listen({ port: 0 }, function (err) {
-    if (err) t.assert.ifError(err)
+  t.after(() => { fastify.close() })
 
-    t.after(() => { fastify.close() })
+  const fastifyServer = await fastify.listen({ port: 0 })
 
-    sget({
-      method: 'GET',
-      url: getServerUrl(fastify) + '/'
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      t.assert.deepStrictEqual(JSON.parse(body), { hello: 'world' })
-      done()
-    })
-  })
+  const result = await fetch(fastifyServer + '/')
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
+  t.assert.deepStrictEqual(await result.json(), { hello: 'world' })
 })

package/test/diagnostics-channel/sync-delay-request.test.js

@@ -2,13 +2,11 @@
 
 const { test } = require('node:test')
 const diagnostics = require('node:diagnostics_channel')
-const sget = require('simple-get').concat
 const Fastify = require('../..')
-const { getServerUrl } = require('../helper')
 const Request = require('../../lib/request')
 const Reply = require('../../lib/reply')
 
-test('diagnostics channel sync events fire in expected order', (t, done) => {
+test('diagnostics channel sync events fire in expected order', async t => {
   t.plan(10)
   let callOrder = 0
   let firstEncounteredMessage
@@ -40,19 +38,12 @@ test('diagnostics channel sync events fire in expected order', (t, done) => {
     }
   })
 
-  fastify.listen({ port: 0 }, function (err) {
-    if (err) t.assert.ifError(err)
+  t.after(() => { fastify.close() })
 
-    t.after(() => { fastify.close() })
+  const fastifyServer = await fastify.listen({ port: 0 })
 
-    sget({
-      method: 'GET',
-      url: getServerUrl(fastify) + '/'
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      t.assert.deepStrictEqual(JSON.parse(body), { hello: 'world' })
-      done()
-    })
-  })
+  const result = await fetch(fastifyServer + '/')
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
+  t.assert.deepStrictEqual(await result.json(), { hello: 'world' })
 })

package/test/helper.js

@@ -5,12 +5,14 @@ const dns = require('node:dns').promises
 const stream = require('node:stream')
 const { promisify } = require('node:util')
 const symbols = require('../lib/symbols')
+const { waitForCb } = require('./toolkit')
+const assert = require('node:assert')
 
 module.exports.sleep = promisify(setTimeout)
 
 /**
  * @param method HTTP request method
- * @param t tap instance
+ * @param t node:test instance
  * @param isSetErrorHandler true: using setErrorHandler
  */
 module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
@@ -19,8 +21,8 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
 
   if (isSetErrorHandler) {
     fastify.setErrorHandler(function (err, request, reply) {
-      t.type(request, 'object')
-      t.type(request, fastify[symbols.kRequest].parent)
+      assert.ok(request instanceof fastify[symbols.kRequest].parent)
+      assert.strictEqual(typeof request, 'object')
       reply
         .code(err.statusCode)
         .type('application/json; charset=utf-8')
@@ -52,9 +54,9 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
       fastify[loMethod]('/', schema, function (req, reply) {
         reply.code(200).send(req.body)
       })
-      t.pass()
+      t.assert.ok(true)
     } catch (e) {
-      t.fail()
+      t.assert.fail()
     }
   })
 
@@ -64,9 +66,9 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
       fastify[loMethod]('/missing', function (req, reply) {
         reply.code(200).send(req.body)
       })
-      t.pass()
+      t.assert.ok(true)
     } catch (e) {
-      t.fail()
+      t.assert.fail()
     }
   })
 
@@ -77,9 +79,9 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         req.body.hello = req.body.hello + req.query.foo
         reply.code(200).send(req.body)
       })
-      t.pass()
+      t.assert.ok(true)
     } catch (e) {
-      t.fail()
+      t.assert.fail()
     }
   })
 
@@ -89,21 +91,21 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
       fastify[loMethod]('/with-limit', { bodyLimit: 1 }, function (req, reply) {
         reply.send(req.body)
       })
-      t.pass()
+      t.assert.ok(true)
     } catch (e) {
-      t.fail()
+      t.assert.fail()
     }
   })
 
   fastify.listen({ port: 0 }, function (err) {
     if (err) {
-      t.error(err)
+      t.assert.ifError(err)
       return
     }
 
-    t.teardown(() => { fastify.close() })
+    t.after(() => { fastify.close() })
 
-    test(`${upMethod} - correctly replies`, t => {
+    test(`${upMethod} - correctly replies`, (t, testDone) => {
       t.plan(3)
       sget({
         method: upMethod,
@@ -113,13 +115,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         },
         json: true
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 200)
-        t.same(body, { hello: 'world' })
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 200)
+        t.assert.deepStrictEqual(body, { hello: 'world' })
+        testDone()
       })
     })
 
-    test(`${upMethod} - correctly replies with very large body`, t => {
+    test(`${upMethod} - correctly replies with very large body`, (t, testDone) => {
       t.plan(3)
 
       const largeString = 'world'.repeat(13200)
@@ -129,13 +132,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         body: { hello: largeString },
         json: true
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 200)
-        t.same(body, { hello: largeString })
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 200)
+        t.assert.deepStrictEqual(body, { hello: largeString })
+        testDone()
       })
     })
 
-    test(`${upMethod} - correctly replies if the content type has the charset`, t => {
+    test(`${upMethod} - correctly replies if the content type has the charset`, (t, testDone) => {
       t.plan(3)
       sget({
         method: upMethod,
@@ -145,13 +149,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
           'content-type': 'application/json; charset=utf-8'
         }
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 200)
-        t.same(body.toString(), JSON.stringify({ hello: 'world' }))
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 200)
+        t.assert.deepStrictEqual(body.toString(), JSON.stringify({ hello: 'world' }))
+        testDone()
       })
     })
 
-    test(`${upMethod} without schema - correctly replies`, t => {
+    test(`${upMethod} without schema - correctly replies`, (t, testDone) => {
       t.plan(3)
       sget({
         method: upMethod,
@@ -161,13 +166,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         },
         json: true
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 200)
-        t.same(body, { hello: 'world' })
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 200)
+        t.assert.deepStrictEqual(body, { hello: 'world' })
+        testDone()
       })
     })
 
-    test(`${upMethod} with body and querystring - correctly replies`, t => {
+    test(`${upMethod} with body and querystring - correctly replies`, (t, testDone) => {
       t.plan(3)
       sget({
         method: upMethod,
@@ -177,23 +183,27 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         },
         json: true
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 200)
-        t.same(body, { hello: 'worldhello' })
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 200)
+        t.assert.deepStrictEqual(body, { hello: 'worldhello' })
+        testDone()
       })
     })
 
     test(`${upMethod} with no body - correctly replies`, t => {
       t.plan(6)
 
+      const { stepIn, patience } = waitForCb({ steps: 2 })
+
       sget({
         method: upMethod,
         url: 'http://localhost:' + fastify.server.address().port + '/missing',
         headers: { 'Content-Length': '0' }
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 200)
-        t.equal(body.toString(), '')
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 200)
+        t.assert.strictEqual(body.toString(), '')
+        stepIn()
       })
 
       // Must use inject to make a request without a Content-Length header
@@ -201,13 +211,16 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         method: upMethod,
         url: '/missing'
       }, (err, res) => {
-        t.error(err)
-        t.equal(res.statusCode, 200)
-        t.equal(res.payload.toString(), '')
+        t.assert.ifError(err)
+        t.assert.strictEqual(res.statusCode, 200)
+        t.assert.strictEqual(res.payload.toString(), '')
+        stepIn()
       })
+
+      return patience
     })
 
-    test(`${upMethod} returns 415 - incorrect media type if body is not json`, t => {
+    test(`${upMethod} returns 415 - incorrect media type if body is not json`, (t, testDone) => {
       t.plan(2)
       sget({
         method: upMethod,
@@ -215,13 +228,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         body: 'hello world'
 
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 415)
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 415)
+        testDone()
       })
     })
 
     if (loMethod === 'options') {
-      test('OPTIONS returns 415 - should return 415 if Content-Type is not json or plain text', t => {
+      test('OPTIONS returns 415 - should return 415 if Content-Type is not json or plain text', (t, testDone) => {
         t.plan(2)
         sget({
           method: upMethod,
@@ -231,8 +245,9 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
             'Content-Type': 'text/xml'
           }
         }, (err, response, body) => {
-          t.error(err)
-          t.equal(response.statusCode, 415)
+          t.assert.ifError(err)
+          t.assert.strictEqual(response.statusCode, 415)
+          testDone()
         })
       })
     }
@@ -240,6 +255,8 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
     test(`${upMethod} returns 400 - Bad Request`, t => {
       t.plan(4)
 
+      const { stepIn, patience } = waitForCb({ steps: 2 })
+
       sget({
         method: upMethod,
         url: 'http://localhost:' + fastify.server.address().port,
@@ -248,8 +265,9 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
           'Content-Type': 'application/json'
         }
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 400)
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 400)
+        stepIn()
       })
 
       sget({
@@ -260,13 +278,19 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
           'Content-Length': '0'
         }
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 400)
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 400)
+        stepIn()
       })
+
+      return patience
     })
 
     test(`${upMethod} returns 413 - Payload Too Large`, t => {
-      t.plan(upMethod === 'OPTIONS' ? 4 : 6)
+      const isOptions = upMethod === 'OPTIONS'
+      t.plan(isOptions ? 4 : 6)
+
+      const { stepIn, patience } = waitForCb({ steps: isOptions ? 2 : 3 })
 
       sget({
         method: upMethod,
@@ -276,12 +300,13 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
           'Content-Length': 1024 * 1024 + 1
         }
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 413)
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 413)
+        stepIn()
       })
 
       // Node errors for OPTIONS requests with a stream body and no Content-Length header
-      if (upMethod !== 'OPTIONS') {
+      if (!isOptions) {
         let chunk = Buffer.alloc(1024 * 1024 + 1, 0)
         const largeStream = new stream.Readable({
           read () {
@@ -295,8 +320,9 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
           headers: { 'Content-Type': 'application/json' },
           body: largeStream
         }, (err, response, body) => {
-          t.error(err)
-          t.equal(response.statusCode, 413)
+          t.assert.ifError(err)
+          t.assert.strictEqual(response.statusCode, 413)
+          stepIn()
         })
       }
 
@@ -307,16 +333,21 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         body: {},
         json: true
       }, (err, response, body) => {
-        t.error(err)
-        t.equal(response.statusCode, 413)
+        t.assert.ifError(err)
+        t.assert.strictEqual(response.statusCode, 413)
+        stepIn()
       })
+
+      return patience
     })
 
     test(`${upMethod} should fail with empty body and application/json content-type`, t => {
-      if (upMethod === 'OPTIONS') return t.end()
+      if (upMethod === 'OPTIONS') return
 
       t.plan(12)
 
+      const { stepIn, patience } = waitForCb({ steps: 5 })
+
       fastify.inject({
         method: `${upMethod}`,
         url: '/',
@@ -324,8 +355,8 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
           'Content-Type': 'application/json'
         }
       }, (err, res) => {
-        t.error(err)
-        t.same(JSON.parse(res.payload), {
+        t.assert.ifError(err)
+        t.assert.deepStrictEqual(JSON.parse(res.payload), {
           error: 'Bad Request',
           code: 'FST_ERR_CTP_EMPTY_JSON_BODY',
           message: 'Body cannot be empty when content-type is set to \'application/json\'',
@@ -340,13 +371,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
           'Content-Type': 'application/json'
         }
       }, (err, res, body) => {
-        t.error(err)
-        t.same(JSON.parse(body.toString()), {
+        t.assert.ifError(err)
+        t.assert.deepStrictEqual(JSON.parse(body.toString()), {
           error: 'Bad Request',
           code: 'FST_ERR_CTP_EMPTY_JSON_BODY',
           message: 'Body cannot be empty when content-type is set to \'application/json\'',
           statusCode: 400
         })
+        stepIn()
       })
 
       fastify.inject({
@@ -357,13 +389,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         },
         payload: null
       }, (err, res) => {
-        t.error(err)
-        t.same(JSON.parse(res.payload), {
+        t.assert.ifError(err)
+        t.assert.deepStrictEqual(JSON.parse(res.payload), {
           error: 'Bad Request',
           code: 'FST_ERR_CTP_EMPTY_JSON_BODY',
           message: 'Body cannot be empty when content-type is set to \'application/json\'',
           statusCode: 400
         })
+        stepIn()
       })
 
       sget({
@@ -374,13 +407,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         },
         payload: null
       }, (err, res, body) => {
-        t.error(err)
-        t.same(JSON.parse(body.toString()), {
+        t.assert.ifError(err)
+        t.assert.deepStrictEqual(JSON.parse(body.toString()), {
           error: 'Bad Request',
           code: 'FST_ERR_CTP_EMPTY_JSON_BODY',
           message: 'Body cannot be empty when content-type is set to \'application/json\'',
           statusCode: 400
         })
+        stepIn()
       })
 
       fastify.inject({
@@ -391,13 +425,14 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         },
         payload: undefined
       }, (err, res) => {
-        t.error(err)
-        t.same(JSON.parse(res.payload), {
+        t.assert.ifError(err)
+        t.assert.deepStrictEqual(JSON.parse(res.payload), {
           error: 'Bad Request',
           code: 'FST_ERR_CTP_EMPTY_JSON_BODY',
           message: 'Body cannot be empty when content-type is set to \'application/json\'',
           statusCode: 400
         })
+        stepIn()
       })
 
       sget({
@@ -408,14 +443,17 @@ module.exports.payloadMethod = function (method, t, isSetErrorHandler = false) {
         },
         payload: undefined
       }, (err, res, body) => {
-        t.error(err)
-        t.same(JSON.parse(body.toString()), {
+        t.assert.ifError(err)
+        t.assert.deepStrictEqual(JSON.parse(body.toString()), {
           error: 'Bad Request',
           code: 'FST_ERR_CTP_EMPTY_JSON_BODY',
           message: 'Body cannot be empty when content-type is set to \'application/json\'',
           statusCode: 400
         })
+        stepIn()
       })
+
+      return patience
     })
   })
 }