fastify 4.22.1 → 4.23.0

package/test/hooks.on-ready.test.js

@@ -2,7 +2,7 @@
 
 const t = require('tap')
 const Fastify = require('../fastify')
-const immediate = require('util').promisify(setImmediate)
+const immediate = require('node:util').promisify(setImmediate)
 
 t.test('onReady should be called in order', t => {
   t.plan(7)

package/test/hooks.test.js

@@ -3,16 +3,16 @@
 const t = require('tap')
 const test = t.test
 const sget = require('simple-get').concat
-const stream = require('stream')
+const stream = require('node:stream')
 const Fastify = require('..')
 const fp = require('fastify-plugin')
-const fs = require('fs')
+const fs = require('node:fs')
 const split = require('split2')
 const symbols = require('../lib/symbols.js')
 const payload = { hello: 'world' }
 const proxyquire = require('proxyquire')
-const { promisify } = require('util')
-const { connect } = require('net')
+const { promisify } = require('node:util')
+const { connect } = require('node:net')
 
 const sleep = promisify(setTimeout)
 

package/test/http2/closing.test.js

@@ -2,10 +2,10 @@
 
 const t = require('tap')
 const Fastify = require('../..')
-const http2 = require('http2')
-const { promisify } = require('util')
+const http2 = require('node:http2')
+const { promisify } = require('node:util')
 const connect = promisify(http2.connect)
-const { once } = require('events')
+const { once } = require('node:events')
 
 const { buildCertificate } = require('../build-certificate')
 t.before(buildCertificate)

package/test/http2/missing-http2-module.test.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const test = t.test
 const proxyquire = require('proxyquire')
-const server = proxyquire('../../lib/server', { http2: null })
+const server = proxyquire('../../lib/server', { 'node:http2': null })
 const Fastify = proxyquire('../..', { './lib/server.js': server })
 
 test('should throw when http2 module cannot be found', t => {

package/test/https/custom-https-server.test.js

@@ -3,9 +3,9 @@
 const t = require('tap')
 const test = t.test
 const Fastify = require('../..')
-const https = require('https')
+const https = require('node:https')
 const sget = require('simple-get').concat
-const dns = require('dns').promises
+const dns = require('node:dns').promises
 
 const { buildCertificate } = require('../build-certificate')
 t.before(buildCertificate)

package/test/inject.test.js

@@ -2,11 +2,11 @@
 
 const t = require('tap')
 const test = t.test
-const Stream = require('stream')
-const util = require('util')
+const Stream = require('node:stream')
+const util = require('node:util')
 const Fastify = require('..')
 const FormData = require('form-data')
-const { Readable } = require('stream')
+const { Readable } = require('node:stream')
 
 test('inject should exist', t => {
   t.plan(2)

package/test/internals/contentTypeParser.test.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const proxyquire = require('proxyquire')
 const test = t.test
-const { Readable } = require('stream')
+const { Readable } = require('node:stream')
 const { kTestInternals, kRouteContext } = require('../../lib/symbols')
 const Request = require('../../lib/request')
 const Reply = require('../../lib/reply')

package/test/internals/errors.test.js

@@ -2,8 +2,8 @@
 
 const { test } = require('tap')
 const errors = require('../../lib/errors')
-const { readFileSync } = require('fs')
-const { resolve } = require('path')
+const { readFileSync } = require('node:fs')
+const { resolve } = require('node:path')
 
 test('should expose 78 errors', t => {
   t.plan(1)

package/test/internals/initialConfig.test.js

@@ -3,7 +3,7 @@
 const { test, before } = require('tap')
 const Fastify = require('../..')
 const helper = require('../helper')
-const http = require('http')
+const http = require('node:http')
 const pino = require('pino')
 const split = require('split2')
 const deepClone = require('rfdc')({ circles: true, proto: false })

package/test/internals/logger.test.js

@@ -97,7 +97,7 @@ Queue.prototype.run = function run () {
 test('The logger should error if both stream and file destination are given', t => {
   t.plan(2)
 
-  const stream = require('stream').Writable
+  const stream = require('node:stream').Writable
 
   try {
     Fastify({

package/test/internals/reply.test.js

@@ -3,11 +3,11 @@
 const t = require('tap')
 const test = t.test
 const sget = require('simple-get').concat
-const http = require('http')
+const http = require('node:http')
 const NotFound = require('http-errors').NotFound
 const Reply = require('../../lib/reply')
 const Fastify = require('../..')
-const { Readable, Writable } = require('stream')
+const { Readable, Writable } = require('node:stream')
 const {
   kReplyErrorHandlerCalled,
   kReplyHeaders,
@@ -16,8 +16,8 @@ const {
   kReplySerializerDefault,
   kRouteContext
 } = require('../../lib/symbols')
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const warning = require('../../lib/warnings')
 
 const agent = new http.Agent({ keepAlive: false })
@@ -262,7 +262,7 @@ test('within an instance', t => {
     reply.code(200)
     reply.type('text/plain')
     reply.serializer(function (body) {
-      return require('querystring').stringify(body)
+      return require('node:querystring').stringify(body)
     })
     reply.send({ hello: 'world!' })
   })
@@ -612,8 +612,8 @@ test('stream using reply.raw.writeHead should return customize headers', t => {
   t.plan(6)
 
   const fastify = Fastify()
-  const fs = require('fs')
-  const path = require('path')
+  const fs = require('node:fs')
+  const path = require('node:path')
 
   const streamPath = path.join(__dirname, '..', '..', 'package.json')
   const stream = fs.createReadStream(streamPath)

package/test/internals/reqIdGenFactory.test.js

@@ -4,12 +4,16 @@ const { test } = require('tap')
 const { reqIdGenFactory } = require('../../lib/reqIdGenFactory')
 
 test('should create incremental ids deterministically', t => {
-  t.plan(9999)
+  t.plan(1)
   const reqIdGen = reqIdGenFactory()
 
   for (let i = 1; i < 1e4; ++i) {
-    t.equal(reqIdGen(), 'req-' + i.toString(36))
+    if (reqIdGen() !== 'req-' + i.toString(36)) {
+      t.fail()
+      break
+    }
   }
+  t.pass()
 })
 
 test('should have prefix "req-"', t => {

package/test/internals/server.test.js

@@ -20,7 +20,7 @@ test('start listening', async t => {
 
 test('DNS errors does not stop the main server on localhost - promise interface', async t => {
   const { createServer } = proxyquire('../../lib/server', {
-    dns: {
+    'node:dns': {
       lookup: (hostname, options, cb) => {
         cb(new Error('DNS error'))
       }
@@ -35,7 +35,7 @@ test('DNS errors does not stop the main server on localhost - promise interface'
 test('DNS errors does not stop the main server on localhost - callback interface', t => {
   t.plan(2)
   const { createServer } = proxyquire('../../lib/server', {
-    dns: {
+    'node:dns': {
       lookup: (hostname, options, cb) => {
         cb(new Error('DNS error'))
       }
@@ -52,7 +52,7 @@ test('DNS errors does not stop the main server on localhost - callback interface
 test('DNS returns empty binding', t => {
   t.plan(2)
   const { createServer } = proxyquire('../../lib/server', {
-    dns: {
+    'node:dns': {
       lookup: (hostname, options, cb) => {
         cb(null, [])
       }
@@ -69,7 +69,7 @@ test('DNS returns empty binding', t => {
 test('DNS returns more than two binding', t => {
   t.plan(2)
   const { createServer } = proxyquire('../../lib/server', {
-    dns: {
+    'node:dns': {
       lookup: (hostname, options, cb) => {
         cb(null, [
           { address: '::1', family: 6 },

package/test/keepAliveTimeout.test.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Fastify = require('..')
-const http = require('http')
+const http = require('node:http')
 const t = require('tap')
 const test = t.test
 

package/test/listen.deprecated.test.js

@@ -4,7 +4,7 @@
 // removed when the deprecation is complete.
 
 const { test, before } = require('tap')
-const dns = require('dns').promises
+const dns = require('node:dns').promises
 const Fastify = require('..')
 
 let localhost

package/test/listen.test.js

@@ -1,11 +1,11 @@
 'use strict'
 
-const os = require('os')
-const path = require('path')
-const fs = require('fs')
+const os = require('node:os')
+const path = require('node:path')
+const fs = require('node:fs')
 const { test, before } = require('tap')
-const dns = require('dns').promises
-const dnsCb = require('dns')
+const dns = require('node:dns').promises
+const dnsCb = require('node:dns')
 const sget = require('simple-get').concat
 const Fastify = require('..')
 
@@ -156,6 +156,20 @@ test('double listen errors callback with (err, address)', t => {
   })
 })
 
+test('nonlocalhost double listen errors callback with (err, address)', t => {
+  t.plan(4)
+  const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
+  fastify.listen({ host: '::1', port: 0 }, (err, address) => {
+    t.equal(address, `http://${'[::1]'}:${fastify.server.address().port}`)
+    t.error(err)
+    fastify.listen({ host: '::1', port: fastify.server.address().port }, (err2, address2) => {
+      t.equal(address2, null)
+      t.ok(err2)
+    })
+  })
+})
+
 test('listen twice on the same port', t => {
   t.plan(4)
   const fastify = Fastify()

package/test/maxRequestsPerSocket.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const net = require('net')
+const net = require('node:net')
 const { test } = require('tap')
 const semver = require('semver')
 const Fastify = require('../fastify')

package/test/plugin.name.display.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const assert = require('assert')
+const assert = require('node:assert')
 
 module.exports = function (fastify, opts, done) {
   assert.strictEqual(fastify.pluginName, 'test-plugin')

package/test/reply-error.test.js

@@ -2,12 +2,12 @@
 
 const t = require('tap')
 const test = t.test
-const net = require('net')
+const net = require('node:net')
 const Fastify = require('..')
-const statusCodes = require('http').STATUS_CODES
+const statusCodes = require('node:http').STATUS_CODES
 const split = require('split2')
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 
 const codes = Object.keys(statusCodes)
 codes.forEach(code => {

package/test/reply-trailers.test.js

@@ -3,9 +3,9 @@
 const t = require('tap')
 const test = t.test
 const Fastify = require('..')
-const { Readable } = require('stream')
-const { createHash } = require('crypto')
-const { promisify } = require('util')
+const { Readable } = require('node:stream')
+const { createHash } = require('node:crypto')
+const { promisify } = require('node:util')
 const sleep = promisify(setTimeout)
 
 test('send trailers when payload is empty string', t => {

package/test/request-error.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { connect } = require('net')
+const { connect } = require('node:net')
 const sget = require('simple-get').concat
 const t = require('tap')
 const test = t.test

package/test/request.deprecated.test.js

@@ -0,0 +1,38 @@
+'use strict'
+
+// Tests for some deprecated `request.*` keys. This file should be
+// removed when the deprecation is complete.
+
+process.removeAllListeners('warning')
+
+const test = require('tap').test
+const Fastify = require('../')
+
+test('Should expose router options via getters on request and reply', t => {
+  t.plan(7)
+  const fastify = Fastify()
+  const expectedSchema = {
+    params: {
+      id: { type: 'integer' }
+    }
+  }
+
+  fastify.get('/test/:id', {
+    schema: expectedSchema
+  }, (req, reply) => {
+    t.equal(req.routeConfig.url, '/test/:id')
+    t.equal(req.routeConfig.method, 'GET')
+    t.same(req.routeSchema, expectedSchema)
+    t.equal(req.routerPath, '/test/:id')
+    t.equal(req.routerMethod, 'GET')
+    reply.send()
+  })
+
+  fastify.inject({
+    method: 'GET',
+    url: '/test/123456789'
+  }, (error, res) => {
+    t.error(error)
+    t.equal(res.statusCode, 200)
+  })
+})

package/test/requestTimeout.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const http = require('http')
+const http = require('node:http')
 const { test } = require('tap')
 const Fastify = require('../fastify')
 

package/test/route-hooks.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { Readable } = require('stream')
+const { Readable } = require('node:stream')
 const test = require('tap').test
 const sget = require('simple-get').concat
 const Fastify = require('../')

package/test/route.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const stream = require('stream')
+const stream = require('node:stream')
 const split = require('split2')
 const t = require('tap')
 const test = t.test

package/test/router-options.test.js

@@ -92,7 +92,7 @@ test('Should honor maxParamLength option', t => {
 })
 
 test('Should expose router options via getters on request and reply', t => {
-  t.plan(10)
+  t.plan(9)
   const fastify = Fastify()
   const expectedSchema = {
     params: {
@@ -105,11 +105,10 @@ test('Should expose router options via getters on request and reply', t => {
   }, (req, reply) => {
     t.equal(reply.context.config.url, '/test/:id')
     t.equal(reply.context.config.method, 'GET')
-    t.equal(req.routeConfig.url, '/test/:id')
-    t.equal(req.routeConfig.method, 'GET')
-    t.same(req.routeSchema, expectedSchema)
-    t.equal(req.routerPath, '/test/:id')
-    t.equal(req.routerMethod, 'GET')
+    t.same(req.routeOptions.schema, expectedSchema)
+    t.equal(typeof req.routeOptions.handler, 'function')
+    t.equal(req.routeOptions.config.url, '/test/:id')
+    t.equal(req.routeOptions.config.method, 'GET')
     t.equal(req.is404, false)
     reply.send({ hello: 'world' })
   })

package/test/serial/logger.0.test.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const http = require('http')
-const stream = require('stream')
+const http = require('node:http')
+const stream = require('node:stream')
 
 const t = require('tap')
 const split = require('split2')

package/test/serial/logger.1.test.js

@@ -1,14 +1,14 @@
 'use strict'
 
-const http = require('http')
-const stream = require('stream')
-const os = require('os')
-const fs = require('fs')
+const http = require('node:http')
+const stream = require('node:stream')
+const os = require('node:os')
+const fs = require('node:fs')
 
 const t = require('tap')
 const split = require('split2')
 const pino = require('pino')
-const path = require('path')
+const path = require('node:path')
 const { streamSym } = require('pino/lib/symbols')
 
 const Fastify = require('../../fastify')

package/test/skip-reply-send.test.js

@@ -2,7 +2,7 @@
 
 const { test } = require('tap')
 const split = require('split2')
-const net = require('net')
+const net = require('node:net')
 const Fastify = require('../fastify')
 
 process.removeAllListeners('warning')

package/test/stream.test.js

@@ -4,15 +4,15 @@ const t = require('tap')
 const test = t.test
 const proxyquire = require('proxyquire')
 const sget = require('simple-get').concat
-const fs = require('fs')
-const resolve = require('path').resolve
-const zlib = require('zlib')
-const pipeline = require('stream').pipeline
+const fs = require('node:fs')
+const resolve = require('node:path').resolve
+const zlib = require('node:zlib')
+const pipeline = require('node:stream').pipeline
 const Fastify = require('..')
 const errors = require('http-errors')
 const JSONStream = require('JSONStream')
 const send = require('send')
-const Readable = require('stream').Readable
+const Readable = require('node:stream').Readable
 const split = require('split2')
 const semver = require('semver')
 const { kDisableRequestLogging } = require('../lib/symbols.js')
@@ -164,7 +164,7 @@ test('onSend hook stream should work even if payload is not a proper stream', t
   t.plan(1)
 
   const reply = proxyquire('../lib/reply', {
-    stream: {
+    'node:stream': {
       finished: (...args) => {
         if (args.length === 2) { args[1](new Error('test-error')) }
       }
@@ -205,7 +205,7 @@ test('onSend hook stream should work on payload with "close" ending function', t
   t.plan(1)
 
   const reply = proxyquire('../lib/reply', {
-    stream: {
+    'node:stream': {
       finished: (...args) => {
         if (args.length === 2) { args[1](new Error('test-error')) }
       }
@@ -251,8 +251,8 @@ test('Destroying streams prematurely', t => {
   } catch (e) {
     t.fail()
   }
-  const stream = require('stream')
-  const http = require('http')
+  const stream = require('node:stream')
+  const http = require('node:http')
 
   // Test that "premature close" errors are logged with level warn
   logStream.on('data', line => {
@@ -313,8 +313,8 @@ test('Destroying streams prematurely should call close method', t => {
   } catch (e) {
     t.fail()
   }
-  const stream = require('stream')
-  const http = require('http')
+  const stream = require('node:stream')
+  const http = require('node:http')
 
   // Test that "premature close" errors are logged with level warn
   logStream.on('data', line => {
@@ -375,8 +375,8 @@ test('Destroying streams prematurely should call close method when destroy is no
   } catch (e) {
     t.fail()
   }
-  const stream = require('stream')
-  const http = require('http')
+  const stream = require('node:stream')
+  const http = require('node:http')
 
   // Test that "premature close" errors are logged with level warn
   logStream.on('data', line => {
@@ -437,8 +437,8 @@ test('Destroying streams prematurely should call abort method', t => {
   } catch (e) {
     t.fail()
   }
-  const stream = require('stream')
-  const http = require('http')
+  const stream = require('node:stream')
+  const http = require('node:http')
 
   // Test that "premature close" errors are logged with level warn
   logStream.on('data', line => {
@@ -496,8 +496,8 @@ test('Destroying streams prematurely, log is disabled', t => {
   } catch (e) {
     t.fail()
   }
-  const stream = require('stream')
-  const http = require('http')
+  const stream = require('node:stream')
+  const http = require('node:http')
 
   fastify.get('/', function (request, reply) {
     reply.log[kDisableRequestLogging] = true
@@ -632,7 +632,7 @@ test('should support send module 200 and 404', { skip: semver.gte(process.versio
 
 test('should destroy stream when response is ended', t => {
   t.plan(4)
-  const stream = require('stream')
+  const stream = require('node:stream')
   const fastify = Fastify()
 
   fastify.get('/error', function (req, reply) {
@@ -729,7 +729,7 @@ test('reply.send handles aborted requests', t => {
     t.teardown(() => { fastify.close() })
 
     const port = fastify.server.address().port
-    const http = require('http')
+    const http = require('node:http')
     const req = http.get(`http://localhost:${port}`)
       .on('error', (err) => {
         t.equal(err.code, 'ECONNRESET')
@@ -782,7 +782,7 @@ test('request terminated should not crash fastify', t => {
     t.teardown(() => { fastify.close() })
 
     const port = fastify.server.address().port
-    const http = require('http')
+    const http = require('node:http')
     const req = http.get(`http://localhost:${port}`, function (res) {
       const { statusCode, headers } = res
       t.equal(statusCode, 200)

package/test/trust-proxy.test.js

@@ -4,7 +4,7 @@ const t = require('tap')
 const { test, before } = t
 const sget = require('simple-get').concat
 const fastify = require('..')
-const dns = require('dns').promises
+const dns = require('node:dns').promises
 
 const sgetForwardedRequest = (app, forHeader, path, protoHeader) => {
   const headers = {

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

@@ -142,6 +142,12 @@ server.addHook('onReady', function (done) {
   expectType<void>(done(new Error()))
 })
 
+server.addHook('onListen', function (done) {
+  expectType<FastifyInstance>(this)
+  expectAssignable<(err?: FastifyError) => void>(done)
+  expectAssignable<(err?: NodeJS.ErrnoException) => void>(done)
+})
+
 server.addHook('onClose', (instance, done) => {
   expectType<FastifyInstance>(instance)
   expectAssignable<(err?: FastifyError) => void>(done)
@@ -223,6 +229,10 @@ server.addHook('onReady', async function () {
   expectType<FastifyInstance>(this)
 })
 
+server.addHook('onListen', async function () {
+  expectType<FastifyInstance>(this)
+})
+
 server.addHook('onClose', async (instance) => {
   expectType<FastifyInstance>(instance)
 })
@@ -396,6 +406,7 @@ server.addHook('preClose', async function () {
 expectError(server.addHook('onClose', async function (instance, done) {}))
 expectError(server.addHook('onError', async function (request, reply, error, done) {}))
 expectError(server.addHook('onReady', async function (done) {}))
+expectError(server.addHook('onListen', async function (done) {}))
 expectError(server.addHook('onRequest', async function (request, reply, done) {}))
 expectError(server.addHook('onRequestAbort', async function (request, done) {}))
 expectError(server.addHook('onResponse', async function (request, reply, done) {}))

package/test/unsupported-httpversion.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const net = require('net')
+const net = require('node:net')
 const t = require('tap')
 const Fastify = require('../fastify')