fastify 5.8.4 → 5.9.0

package/lib/reply.js

@@ -60,6 +60,7 @@ const {
 const decorators = require('./decorate')
 
 const toString = Object.prototype.toString
+const HTTP2_WRITE_CHUNK_SIZE = 64 * 1024
 
 function Reply (res, request, log) {
   this.raw = res
@@ -75,6 +76,7 @@ function Reply (res, request, log) {
   this.log = log
 }
 Reply.props = []
+Reply.instanceProperties = new Set(['raw', 'request', 'log'])
 
 Object.defineProperties(Reply.prototype, {
   [kRouteContext]: {
@@ -167,7 +169,7 @@ Reply.prototype.send = function (payload) {
       // node:stream/web
       typeof payload.getReader === 'function' ||
       // Response
-      toString.call(payload) === '[object Response]'
+      (typeof payload === 'object' && toString.call(payload) === '[object Response]')
     ) {
       onSendHook(this, payload)
       return this
@@ -593,7 +595,7 @@ function onSendEnd (reply, payload) {
   // since Response contain status code, headers and body,
   // we need to update the status, add the headers and use it's body as payload
   // before continuing
-  if (toString.call(payload) === '[object Response]') {
+  if (payload != null && typeof payload === 'object' && toString.call(payload) === '[object Response]') {
     // https://developer.mozilla.org/en-US/docs/Web/API/Response/status
     if (typeof payload.status === 'number') {
       reply.code(payload.status)
@@ -677,9 +679,52 @@ function onSendEnd (reply, payload) {
 
   safeWriteHead(reply, statusCode)
   // write payload first
-  res.write(payload)
-  // then send trailers
-  sendTrailer(payload, res, reply)
+  writePayload(payload, res, reply)
+}
+
+function isHttp2Reply (reply) {
+  return reply.request.raw?.httpVersionMajor === 2
+}
+
+function writePayload (payload, res, reply) {
+  if (!isHttp2Reply(reply) || Buffer.byteLength(payload) <= HTTP2_WRITE_CHUNK_SIZE) {
+    res.write(payload)
+    // then send trailers
+    sendTrailer(payload, res, reply)
+    return
+  }
+
+  writeHttp2Payload(payload, res, () => {
+    // then send trailers
+    sendTrailer(payload, res, reply)
+  })
+}
+
+function writeHttp2Payload (payload, res, done) {
+  const buffer = Buffer.isBuffer(payload) ? payload : Buffer.from(payload)
+  let offset = 0
+
+  function writeChunk () {
+    while (offset < buffer.length) {
+      /* c8 ignore next 3 - defensive guard for aborted responses */
+      if (res.destroyed || res.writableEnded) {
+        return
+      }
+
+      const end = Math.min(offset + HTTP2_WRITE_CHUNK_SIZE, buffer.length)
+      const shouldContinue = res.write(buffer.subarray(offset, end))
+      offset = end
+
+      if (shouldContinue === false) {
+        res.once('drain', writeChunk)
+        return
+      }
+    }
+
+    done()
+  }
+
+  writeChunk()
 }
 
 function logStreamError (logger, err, res) {
@@ -830,10 +875,12 @@ function sendTrailer (payload, res, reply) {
   const trailers = {}
   let handled = 0
   let skipped = true
+  let sent = false
   function send () {
     // add trailers when all handler handled
     /* istanbul ignore else */
-    if (handled === 0) {
+    if (handled === 0 && !sent) {
+      sent = true
       res.addTrailers(trailers)
       // we need to properly close the stream
       // after trailers sent
@@ -846,9 +893,10 @@ function sendTrailer (payload, res, reply) {
     skipped = false
     handled--
 
+    let cbAlreadyCalled = false
     function cb (err, value) {
-      // TODO: we may protect multiple callback calls
-      //       or mixing async-await with callback
+      if (cbAlreadyCalled) return
+      cbAlreadyCalled = true
       handled++
 
       // we can safely ignore error for trailer
@@ -914,6 +962,13 @@ function setupResponseListeners (reply) {
       }
     }
 
+    // Fix: release socket._meta so request/reply objects are not retained
+    // past the response on keep-alive connections.
+    const socket = reply.request.raw.socket
+    if (socket && socket._meta && socket._meta.request === reply.request) {
+      socket._meta = null
+    }
+
     if (ctx && ctx.onResponse !== null) {
       onResponseHookRunner(
         ctx.onResponse,

package/lib/request.js

@@ -10,6 +10,7 @@ const {
   kSchemaController,
   kOptions,
   kRequestCacheValidateFns,
+  kRequestContentType,
   kRouteContext,
   kRequestOriginalUrl,
   kRequestSignal,
@@ -36,6 +37,7 @@ function Request (id, params, req, query, log, context) {
   this.body = undefined
 }
 Request.props = []
+Request.instanceProperties = new Set(['id', 'params', 'raw', 'query', 'log', 'body'])
 
 function getTrustProxyFn (tp) {
   if (typeof tp === 'function') {
@@ -47,16 +49,14 @@ function getTrustProxyFn (tp) {
   }
   if (typeof tp === 'number') {
     // Support trusting hop count
-    return function (a, i) { return a != null && i < tp }
+    return function (a, i) { return i < tp }
   }
   if (typeof tp === 'string') {
     // Support comma-separated tps
     const values = tp.split(',').map(it => it.trim())
-    const trust = proxyAddr.compile(values)
-    return function (a, i) { return a != null && trust(a, i) }
+    return proxyAddr.compile(values)
   }
-  const trust = proxyAddr.compile(tp)
-  return function (a, i) { return a != null && trust(a, i) }
+  return proxyAddr.compile(tp)
 }
 
 function buildRequest (R, trustProxy) {
@@ -119,7 +119,8 @@ function buildRequestWithTrustProxy (R, trustProxy) {
     },
     host: {
       get () {
-        if (this.headers['x-forwarded-host'] && proxyFn(this.raw.socket?.remoteAddress, 0)) {
+        const socket = this.raw.socket
+        if (this.headers['x-forwarded-host'] && socket != null && proxyFn(socket.remoteAddress, 0)) {
           return getLastEntryInMultiHeaderValue(this.headers['x-forwarded-host'])
         }
         /**
@@ -133,7 +134,8 @@ function buildRequestWithTrustProxy (R, trustProxy) {
     },
     protocol: {
       get () {
-        if (this.headers['x-forwarded-proto'] && proxyFn(this.raw.socket?.remoteAddress, 0)) {
+        const socket = this.raw.socket
+        if (this.headers['x-forwarded-proto'] && socket != null && proxyFn(socket.remoteAddress, 0)) {
           return getLastEntryInMultiHeaderValue(this.headers['x-forwarded-proto'])
         }
         if (this.socket) {
@@ -255,19 +257,13 @@ Object.defineProperties(Request.prototype, {
   },
   port: {
     get () {
-      // first try taking port from host
-      const portFromHost = parseInt(this.host.split(':').slice(-1)[0])
-      if (!isNaN(portFromHost)) {
-        return portFromHost
+      const portReg = /(?<port>:\d+)$/
+      const host = this.headers.host ?? this.headers[':authority'] ?? ''
+      const matches = portReg.exec(host)
+      if (matches === null || matches[1] === undefined) {
+        return null
       }
-      // now fall back to port from host/:authority header
-      const host = (this.headers.host ?? this.headers[':authority'] ?? '')
-      const portFromHeader = parseInt(host.split(':').slice(-1)[0])
-      if (!isNaN(portFromHeader)) {
-        return portFromHeader
-      }
-      // fall back to null
-      return null
+      return parseInt(matches.groups.port.slice(1), 10)
     }
   },
   protocol: {
@@ -288,6 +284,14 @@ Object.defineProperties(Request.prototype, {
       this.additionalHeaders = headers
     }
   },
+  mediaType: {
+    get () {
+      if (!this[kRequestContentType] && this.headers['content-type'] !== undefined) {
+        this[kRequestContentType] = this[kRouteContext].contentTypeParser.getContentType(this.headers['content-type'])
+      }
+      return this[kRequestContentType]?.mediaType
+    }
+  },
   getValidationFunction: {
     value: function (httpPartOrSchema) {
       if (typeof httpPartOrSchema === 'string') {

package/lib/route.js

@@ -24,6 +24,7 @@ const {
   FST_ERR_ROUTE_MISSING_HANDLER,
   FST_ERR_ROUTE_METHOD_NOT_SUPPORTED,
   FST_ERR_ROUTE_METHOD_INVALID,
+  FST_ERR_ROUTE_LOG_LEVEL_INVALID,
   FST_ERR_ROUTE_BODY_VALIDATION_SCHEMA_NOT_SUPPORTED,
   FST_ERR_ROUTE_BODY_LIMIT_OPTION_NOT_INT,
   FST_ERR_ROUTE_HANDLER_TIMEOUT_OPTION_NOT_INT,
@@ -68,6 +69,7 @@ const routerKeys = [
   'ignoreTrailingSlash',
   'maxParamLength',
   'onBadUrl',
+  'onMaxParamLength',
   'querystringParser',
   'useSemicolonDelimiter'
 ]
@@ -284,6 +286,7 @@ function buildRouting (options) {
       opts.routePath = path
       opts.prefix = prefix
       opts.logLevel = opts.logLevel || this[kLogLevel]
+      validateLogLevelOption(opts.logLevel, opts.method, opts.url, logger)
 
       if (this[kLogSerializers] || opts.logSerializers) {
         opts.logSerializers = Object.assign(Object.create(this[kLogSerializers]), opts.logSerializers)
@@ -365,7 +368,8 @@ function buildRouting (options) {
         // any route insertion error created by fastify can be safely ignore
         // because it only duplicate route for head
         if (!context[kRouteByFastify]) {
-          const isDuplicatedRoute = error.message.includes(`Method '${opts.method}' already declared for route`)
+          const methods = Array.isArray(opts.method) ? opts.method : [opts.method]
+          const isDuplicatedRoute = methods.some(method => error.message.includes(`Method '${method}' already declared for route`))
           if (isDuplicatedRoute) {
             throw new FST_ERR_DUPLICATED_ROUTE(opts.method, opts.url)
           }
@@ -476,12 +480,13 @@ function buildRouting (options) {
         res.setHeader('Connection', 'close')
       }
 
-      // TODO remove return503OnClosing after Node v18 goes EOL
-      /* istanbul ignore else */
+      // Load-shedding fast path during drain. server.close() and
+      // closeIdleConnections() only reap idle sockets; requests already
+      // pipelined or arriving on an active keep-alive connection still reach
+      // this point with closing === true. Short-circuiting with 503 avoids
+      // running the full handler chain (and any downstream calls) for work
+      // the load balancer should redirect elsewhere.
       if (return503OnClosing) {
-        // On Node v19 we cannot test this behavior as it won't be necessary
-        // anymore. It will close all the idle connections before they reach this
-        // stage.
         const headers = {
           'Content-Type': 'application/json',
           'Content-Length': '80'
@@ -635,6 +640,15 @@ function validateHandlerTimeoutOption (handlerTimeout) {
   }
 }
 
+function validateLogLevelOption (logLevel, method, path, logger) {
+  if (logLevel == null || logLevel === '') return
+  if (logger?.levels?.values == null) return
+
+  if (typeof logLevel !== 'string' || logger.levels.values[logLevel] === undefined) {
+    throw new FST_ERR_ROUTE_LOG_LEVEL_INVALID(method, path, logLevel)
+  }
+}
+
 function runPreParsing (err, request, reply) {
   if (reply.sent === true) return
   if (err != null) {

package/lib/schema-controller.js

@@ -31,7 +31,7 @@ function buildSchemaController (parentSchemaCtrl, opts) {
     bucket: (opts && opts.bucket) || buildSchemas,
     compilersFactory,
     isCustomValidatorCompiler: typeof opts?.compilersFactory?.buildValidator === 'function',
-    isCustomSerializerCompiler: typeof opts?.compilersFactory?.buildValidator === 'function'
+    isCustomSerializerCompiler: typeof opts?.compilersFactory?.buildSerializer === 'function'
   }
 
   return new SchemaController(undefined, option)

package/lib/schemas.js

@@ -10,6 +10,7 @@ const {
   FST_ERR_SCH_DUPLICATE,
   FST_ERR_SCH_CONTENT_MISSING_SCHEMA
 } = require('./errors')
+const ContentType = require('./content-type')
 
 const SCHEMAS_SOURCE = ['params', 'body', 'querystring', 'query', 'headers']
 
@@ -147,52 +148,58 @@ function getSchemaSerializer (context, statusCode, contentType) {
     return false
   }
   if (responseSchemaDef[statusCode]) {
-    if (responseSchemaDef[statusCode].constructor === Object && contentType) {
-      const mediaName = contentType.split(';', 1)[0]
-      if (responseSchemaDef[statusCode][mediaName]) {
-        return responseSchemaDef[statusCode][mediaName]
-      }
+    if (responseSchemaDef[statusCode].constructor === Object) {
+      const ct = new ContentType(contentType)
+      if (ct.isValid) {
+        if (responseSchemaDef[statusCode][ct.mediaType]) {
+          return responseSchemaDef[statusCode][ct.mediaType]
+        }
 
-      // fallback to match all media-type
-      if (responseSchemaDef[statusCode]['*/*']) {
-        return responseSchemaDef[statusCode]['*/*']
-      }
+        // fallback to match all media-type
+        if (responseSchemaDef[statusCode]['*/*']) {
+          return responseSchemaDef[statusCode]['*/*']
+        }
 
-      return false
+        return false
+      }
     }
     return responseSchemaDef[statusCode]
   }
   const fallbackStatusCode = (statusCode + '')[0] + 'xx'
   if (responseSchemaDef[fallbackStatusCode]) {
-    if (responseSchemaDef[fallbackStatusCode].constructor === Object && contentType) {
-      const mediaName = contentType.split(';', 1)[0]
-      if (responseSchemaDef[fallbackStatusCode][mediaName]) {
-        return responseSchemaDef[fallbackStatusCode][mediaName]
-      }
+    if (responseSchemaDef[fallbackStatusCode].constructor === Object) {
+      const ct = new ContentType(contentType)
+      if (ct.isValid) {
+        if (responseSchemaDef[fallbackStatusCode][ct.mediaType]) {
+          return responseSchemaDef[fallbackStatusCode][ct.mediaType]
+        }
 
-      // fallback to match all media-type
-      if (responseSchemaDef[fallbackStatusCode]['*/*']) {
-        return responseSchemaDef[fallbackStatusCode]['*/*']
-      }
+        // fallback to match all media-type
+        if (responseSchemaDef[fallbackStatusCode]['*/*']) {
+          return responseSchemaDef[fallbackStatusCode]['*/*']
+        }
 
-      return false
+        return false
+      }
     }
 
     return responseSchemaDef[fallbackStatusCode]
   }
   if (responseSchemaDef.default) {
-    if (responseSchemaDef.default.constructor === Object && contentType) {
-      const mediaName = contentType.split(';', 1)[0]
-      if (responseSchemaDef.default[mediaName]) {
-        return responseSchemaDef.default[mediaName]
-      }
+    if (responseSchemaDef.default.constructor === Object) {
+      const ct = new ContentType(contentType)
+      if (ct.isValid) {
+        if (responseSchemaDef.default[ct.mediaType]) {
+          return responseSchemaDef.default[ct.mediaType]
+        }
 
-      // fallback to match all media-type
-      if (responseSchemaDef.default['*/*']) {
-        return responseSchemaDef.default['*/*']
-      }
+        // fallback to match all media-type
+        if (responseSchemaDef.default['*/*']) {
+          return responseSchemaDef.default['*/*']
+        }
 
-      return false
+        return false
+      }
     }
 
     return responseSchemaDef.default

package/lib/symbols.js

@@ -32,6 +32,7 @@ const keys = {
   kRequestPayloadStream: Symbol('fastify.RequestPayloadStream'),
   kRequestAcceptVersion: Symbol('fastify.RequestAcceptVersion'),
   kRequestCacheValidateFns: Symbol('fastify.request.cache.validateFns'),
+  kRequestContentType: Symbol('fastify.request.contentType'),
   kRequestOriginalUrl: Symbol('fastify.request.originalUrl'),
   kRequestSignal: Symbol('fastify.request.signal'),
   kHandlerTimeout: Symbol('fastify.handlerTimeout'),
@@ -65,7 +66,8 @@ const keys = {
   kChildLoggerFactory: Symbol('fastify.childLoggerFactory'),
   kHasBeenDecorated: Symbol('fastify.hasBeenDecorated'),
   kKeepAliveConnections: Symbol('fastify.keepAliveConnections'),
-  kRouteByFastify: Symbol('fastify.routeByFastify')
+  kRouteByFastify: Symbol('fastify.routeByFastify'),
+  kDiagnosticsStore: Symbol('fastify.diagnosticsStore')
 }
 
 module.exports = keys

package/lib/validation.js

@@ -162,9 +162,7 @@ function validate (context, request, execution) {
     if (typeof context[bodySchema] === 'function') {
       validatorFunction = context[bodySchema]
     } else if (context[bodySchema]) {
-      // TODO: add request.contentType and reuse it here
-      const contentType = getEssenceMediaType(request.headers['content-type'])
-      const contentSchema = context[bodySchema][contentType]
+      const contentSchema = context[bodySchema][request.mediaType]
       if (contentSchema) {
         validatorFunction = contentSchema
       }
@@ -262,16 +260,6 @@ function wrapValidationError (result, dataVar, schemaErrorFormatter) {
   return error
 }
 
-/**
- * simple function to retrieve the essence media type
- * @param {string} header
- * @returns {string} Mimetype string.
- */
-function getEssenceMediaType (header) {
-  if (!header) return ''
-  return header.split(/[ ;]/, 1)[0].trim().toLowerCase()
-}
-
 module.exports = {
   symbols: { bodySchema, querystringSchema, responseSchema, paramsSchema, headersSchema },
   compileSchemasForValidation,

package/lib/warnings.js

@@ -8,9 +8,9 @@ const { createWarning } = require('process-warning')
  *   - FSTSEC001
  *   - FSTDEP022
  *
- * Deprecation Codes FSTDEP001 - FSTDEP021 were used by v4 and MUST NOT not be reused.
+ * Deprecation Codes FSTDEP001 - FSTDEP021 were used by v4 and MUST NOT be reused.
  *                             - FSTDEP022 is used by v5 and MUST NOT be reused.
- * Warning Codes FSTWRN001 - FSTWRN002 were used by v4 and MUST NOT not be reused.
+ * Warning Codes FSTWRN001 - FSTWRN002 were used by v4 and MUST NOT be reused.
  */
 
 const FSTWRN001 = createWarning({
@@ -30,7 +30,7 @@ const FSTWRN003 = createWarning({
 const FSTWRN004 = createWarning({
   name: 'FastifyWarning',
   code: 'FSTWRN004',
-  message: 'It seems that you are overriding an errorHandler in the same scope, which can lead to subtle bugs.',
+  message: 'It seems that you are overriding an errorHandler in the same scope, which can lead to subtle bugs. To disable this behavior, set \'allowErrorHandlerOverride\' to false. For more information, visit: https://fastify.dev/docs/latest/Reference/Server/#allowerrorhandleroverride',
   unlimited: true
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "5.8.4",
+  "version": "5.9.0",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -19,11 +19,11 @@
     "lint:markdown": "markdownlint-cli2",
     "lint:eslint": "eslint",
     "prepublishOnly": "cross-env PREPUBLISH=true borp --reporter=@jsumners/line-reporter && npm run test:validator:integrity && npm run build:sync-version",
-    "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": "npm run lint && npm run unit && npm run test:types",
+    "test:ci": "npm run unit && npm run test:types",
+    "test:report": "npm run lint && npm run unit:report && npm run test:types",
     "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/config-validator.js",
-    "test:typescript": "tsc test/types/import.ts --target es2022 --moduleResolution node16 --module node16 --noEmit && tsd",
+    "test:types": "tstyche",
     "test:watch": "npm run unit -- --watch --coverage-report=none --reporter=terse",
     "unit": "borp",
     "unit:report": "c8 --reporter html borp --reporter=@jsumners/line-reporter",
@@ -45,7 +45,7 @@
   "contributors": [
     {
       "name": "Tomas Della Vedova",
-      "url": "http://delved.org",
+      "url": "https://delvedor.dev",
       "author": true
     },
     {
@@ -59,7 +59,7 @@
     },
     {
       "name": "Dustin Deus",
-      "url": "http://starptech.de",
+      "url": "https://starptech.com",
       "email": "deusdustin@gmail.com"
     },
     {
@@ -74,7 +74,7 @@
     },
     {
       "name": "Trivikram Kamat",
-      "url": "http://trivikr.github.io",
+      "url": "https://trivikr.github.io",
       "email": "trivikr.dev@gmail.com"
     },
     {
@@ -177,27 +177,28 @@
     "ajv-i18n": "^4.2.0",
     "ajv-merge-patch": "^5.0.1",
     "autocannon": "^8.0.0",
-    "borp": "^0.21.0",
+    "borp": "^1.0.0",
     "branch-comparer": "^1.1.0",
-    "concurrently": "^9.1.2",
+    "concurrently": "^10.0.0",
     "cross-env": "^10.0.0",
     "eslint": "^9.0.0",
     "fast-json-body": "^1.1.0",
-    "fastify-plugin": "^5.0.0",
+    "fastify-plugin": "^6.0.0",
+    "fastify-tsconfig": "^3.0.0",
     "fluent-json-schema": "^6.0.0",
     "h2url": "^0.2.0",
     "http-errors": "^2.0.0",
     "joi": "^18.0.1",
     "json-schema-to-ts": "^3.0.1",
     "JSONStream": "^1.3.5",
-    "markdownlint-cli2": "^0.21.0",
+    "markdownlint-cli2": "^0.22.0",
     "neostandard": "^0.12.0",
     "node-forge": "^1.3.1",
     "proxyquire": "^2.1.3",
     "split2": "^4.2.0",
-    "tsd": "^0.33.0",
+    "tstyche": "^7.0.0",
     "typebox": "^1.0.81",
-    "typescript": "~5.9.2",
+    "typescript": "~6.0.2",
     "undici": "^7.11.0",
     "vary": "^1.1.2",
     "yup": "^1.4.0"
@@ -210,7 +211,7 @@
     "abstract-logging": "^2.0.1",
     "avvio": "^9.0.0",
     "fast-json-stringify": "^6.0.0",
-    "find-my-way": "^9.0.0",
+    "find-my-way": "^9.6.0",
     "light-my-request": "^6.0.0",
     "pino": "^9.14.0 || ^10.1.0",
     "process-warning": "^5.0.0",
@@ -218,8 +219,5 @@
     "secure-json-parse": "^4.0.0",
     "semver": "^7.6.0",
     "toad-cache": "^3.7.0"
-  },
-  "tsd": {
-    "directory": "test/types"
   }
 }

package/scripts/validate-ecosystem-links.js

@@ -14,6 +14,7 @@
 
 const fs = require('node:fs')
 const path = require('node:path')
+const { fetch } = require('undici')
 
 const ECOSYSTEM_FILE = path.join(__dirname, '../docs/Guides/Ecosystem.md')
 const GITHUB_OWNER_REGEX = /^[a-z\d](?:[a-z\d-]{0,38})$/i

package/test/bundler/esbuild/package.json

@@ -5,6 +5,6 @@
     "test": "npm run bundle && node bundler-test.js"
   },
   "devDependencies": {
-    "esbuild": "^0.25.0"
+    "esbuild": "^0.28.1"
   }
 }

package/test/close-pipelining.test.js

@@ -41,8 +41,7 @@ test('Should return 503 while closing - pipelining', async t => {
 })
 
 test('Should close the socket abruptly - pipelining - return503OnClosing: false', async t => {
-  // Since Node v20, we will always invoke server.closeIdleConnections()
-  // therefore our socket will be closed
+  // Node.js will always invoke server.closeIdleConnections() therefore our socket will be closed
   const fastify = Fastify({
     return503OnClosing: false,
     forceCloseConnections: false

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

@@ -63,6 +63,44 @@ async function setup () {
     )
   })
 
+  test('Should not make an extra closeIdleConnections call for native servers', async t => {
+    const fastify = Fastify({
+      forceCloseConnections: 'idle'
+    })
+
+    await fastify.listen({ port: 0 })
+
+    let called = 0
+    fastify.server.closeIdleConnections = function () {
+      called++
+    }
+
+    await fastify.close()
+
+    t.assert.strictEqual(called, 1)
+  })
+
+  test('Should preserve the extra closeIdleConnections call for custom servers', async t => {
+    let called = 0
+    const fastify = Fastify({
+      forceCloseConnections: 'idle',
+      serverFactory (handler) {
+        const server = http.createServer(handler)
+        const originalCloseIdleConnections = server.closeIdleConnections.bind(server)
+        server.closeIdleConnections = function () {
+          called++
+          return originalCloseIdleConnections()
+        }
+        return server
+      }
+    })
+
+    await fastify.listen({ port: 0 })
+    await fastify.close()
+
+    t.assert.strictEqual(called, 2)
+  })
+
   test('Should accept user defined serverFactory and ignore secondary server creation', async t => {
     const server = http.createServer(() => { })
     t.after(() => new Promise(resolve => server.close(resolve)))