fastify 4.24.0 → 4.24.2

package/fastify.js

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

package/lib/route.js

@@ -182,8 +182,14 @@ function buildRouting (options) {
     const { exposeHeadRoute } = opts
     const hasRouteExposeHeadRouteFlag = exposeHeadRoute != null
     const shouldExposeHead = hasRouteExposeHeadRouteFlag ? exposeHeadRoute : globalExposeHeadRoutes
+
+    const isGetRoute = opts.method === 'GET' ||
+      (Array.isArray(opts.method) && opts.method.includes('GET'))
+    const isHeadRoute = opts.method === 'HEAD' ||
+      (Array.isArray(opts.method) && opts.method.includes('HEAD'))
+
     // we need to clone a set of initial options for HEAD route
-    const headOpts = shouldExposeHead && options.method === 'GET' ? { ...options } : null
+    const headOpts = shouldExposeHead && isGetRoute ? { ...options } : null
 
     throwIfAlreadyStarted('Cannot add route!')
 
@@ -326,8 +332,8 @@ function buildRouting (options) {
       const hasHEADHandler = headHandler !== null
 
       // remove the head route created by fastify
-      if (hasHEADHandler && !context[kRouteByFastify] && headHandler.store[kRouteByFastify]) {
-        router.off('HEAD', opts.url, { constraints })
+      if (isHeadRoute && hasHEADHandler && !context[kRouteByFastify] && headHandler.store[kRouteByFastify]) {
+        router.off('HEAD', opts.url, constraints)
       }
 
       try {
@@ -407,7 +413,7 @@ function buildRouting (options) {
       // register head route in sync
       // we must place it after the `this.after`
 
-      if (shouldExposeHead && options.method === 'GET' && !hasHEADHandler) {
+      if (shouldExposeHead && isGetRoute && !isHeadRoute && !hasHEADHandler) {
         const onSendHandlers = parseHeadOnSendHandlers(headOpts.onSend)
         prepareRoute.call(this, { method: 'HEAD', url: path, options: { ...headOpts, onSend: onSendHandlers }, isFastify: true })
       } else if (hasHEADHandler && exposeHeadRoute) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "4.24.0",
+  "version": "4.24.2",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -29,7 +29,7 @@
     "unit": "c8 tap",
     "unit:junit": "tap-mocha-reporter xunit < out.tap > test/junit-testresults.xml",
     "unit:report": "tap --cov --coverage-report=html --coverage-report=cobertura | tee out.tap",
-    "citgm": "tap"
+    "citgm": "tap --jobs=1"
   },
   "repository": {
     "type": "git",
@@ -144,66 +144,66 @@
   "homepage": "https://www.fastify.dev/",
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
-    "@sinclair/typebox": "^0.31.1",
-    "@sinonjs/fake-timers": "^11.0.0",
-    "@types/node": "^20.1.0",
-    "@typescript-eslint/eslint-plugin": "^6.3.0",
-    "@typescript-eslint/parser": "^6.3.0",
+    "@sinclair/typebox": "^0.31.17",
+    "@sinonjs/fake-timers": "^11.1.0",
+    "@types/node": "^20.8.4",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^2.1.1",
     "ajv-i18n": "^4.2.0",
     "ajv-merge-patch": "^5.0.1",
     "branch-comparer": "^1.1.0",
-    "c8": "^8.0.0",
+    "c8": "^8.0.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.39.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-import-resolver-node": "^0.3.7",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^16.0.1",
+    "eslint": "^8.51.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-n": "^16.2.0",
     "eslint-plugin-promise": "^6.1.1",
     "fast-json-body": "^1.1.0",
-    "fastify-plugin": "^4.5.0",
-    "fluent-json-schema": "^4.1.0",
+    "fastify-plugin": "^4.5.1",
+    "fluent-json-schema": "^4.1.2",
     "form-data": "^4.0.0",
     "h2url": "^0.2.0",
     "http-errors": "^2.0.0",
-    "joi": "^17.9.2",
-    "json-schema-to-ts": "^2.9.1",
+    "joi": "^17.11.0",
+    "json-schema-to-ts": "^2.9.2",
     "JSONStream": "^1.3.5",
-    "markdownlint-cli2": "^0.9.2",
+    "markdownlint-cli2": "^0.10.0",
+    "node-forge": "^1.3.1",
     "proxyquire": "^2.1.3",
-    "self-cert": "^2.0.0",
     "send": "^0.18.0",
     "simple-get": "^4.0.1",
     "snazzy": "^9.0.0",
     "split2": "^4.2.0",
-    "standard": "^17.0.0",
-    "tap": "^16.3.4",
+    "standard": "^17.1.0",
+    "tap": "^16.3.9",
     "tsd": "^0.29.0",
-    "typescript": "^5.0.4",
-    "undici": "^5.22.0",
+    "typescript": "^5.2.2",
+    "undici": "^5.26.0",
     "vary": "^1.1.2",
-    "yup": "^1.1.1"
+    "yup": "^1.3.2"
   },
   "dependencies": {
     "@fastify/ajv-compiler": "^3.5.0",
-    "@fastify/error": "^3.2.0",
+    "@fastify/error": "^3.4.0",
     "@fastify/fast-json-stringify-compiler": "^4.3.0",
     "abstract-logging": "^2.0.1",
     "avvio": "^8.2.1",
-    "fast-content-type-parse": "^1.0.0",
-    "fast-json-stringify": "^5.7.0",
+    "fast-content-type-parse": "^1.1.0",
+    "fast-json-stringify": "^5.8.0",
     "find-my-way": "^7.7.0",
-    "light-my-request": "^5.9.1",
-    "pino": "^8.12.0",
+    "light-my-request": "^5.11.0",
+    "pino": "^8.16.0",
     "process-warning": "^2.2.0",
     "proxy-addr": "^2.0.7",
     "rfdc": "^1.3.0",
-    "secure-json-parse": "^2.5.0",
-    "semver": "^7.5.0",
-    "toad-cache": "^3.2.0"
+    "secure-json-parse": "^2.7.0",
+    "semver": "^7.5.4",
+    "toad-cache": "^3.3.0"
   },
   "standard": {
     "ignore": [

package/test/404s.test.js

@@ -8,15 +8,7 @@ const errors = require('http-errors')
 const split = require('split2')
 const FormData = require('form-data')
 const Fastify = require('..')
-
-function getUrl (app) {
-  const { address, port } = app.server.address()
-  if (address === '::1') {
-    return `http://[${address}]:${port}`
-  } else {
-    return `http://${address}:${port}`
-  }
-}
+const { getServerUrl } = require('./helper')
 
 test('default 404', t => {
   t.plan(5)
@@ -37,7 +29,7 @@ test('default 404', t => {
       t.plan(3)
       sget({
         method: 'PUT',
-        url: getUrl(fastify),
+        url: getServerUrl(fastify),
         body: {},
         json: true
       }, (err, response, body) => {
@@ -52,7 +44,7 @@ test('default 404', t => {
       t.plan(3)
       sget({
         method: 'PROPFIND',
-        url: getUrl(fastify),
+        url: getServerUrl(fastify),
         body: {},
         json: true
       }, (err, response, body) => {
@@ -66,7 +58,7 @@ test('default 404', t => {
       t.plan(3)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/notSupported',
+        url: getServerUrl(fastify) + '/notSupported',
         body: {},
         json: true
       }, (err, response, body) => {
@@ -83,7 +75,7 @@ test('default 404', t => {
 
       sget({
         method: 'POST',
-        url: getUrl(fastify) + '/notSupported',
+        url: getServerUrl(fastify) + '/notSupported',
         body: form,
         json: false
       }, (err, response, body) => {
@@ -128,7 +120,7 @@ test('customized 404', t => {
       t.plan(3)
       sget({
         method: 'PUT',
-        url: getUrl(fastify),
+        url: getServerUrl(fastify),
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -142,7 +134,7 @@ test('customized 404', t => {
       t.plan(3)
       sget({
         method: 'PROPFIND',
-        url: getUrl(fastify),
+        url: getServerUrl(fastify),
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -156,7 +148,7 @@ test('customized 404', t => {
       t.plan(3)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/notSupported'
+        url: getServerUrl(fastify) + '/notSupported'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -168,7 +160,7 @@ test('customized 404', t => {
       t.plan(3)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/with-error'
+        url: getServerUrl(fastify) + '/with-error'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -184,7 +176,7 @@ test('customized 404', t => {
       t.plan(4)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/with-error-custom-header'
+        url: getServerUrl(fastify) + '/with-error-custom-header'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -218,7 +210,7 @@ test('custom header in notFound handler', t => {
       t.plan(4)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/notSupported'
+        url: getServerUrl(fastify) + '/notSupported'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -405,7 +397,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PUT',
-        url: getUrl(fastify),
+        url: getServerUrl(fastify),
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -419,7 +411,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PROPFIND',
-        url: getUrl(fastify),
+        url: getServerUrl(fastify),
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -433,7 +425,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/notSupported'
+        url: getServerUrl(fastify) + '/notSupported'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -445,7 +437,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PUT',
-        url: getUrl(fastify) + '/test',
+        url: getServerUrl(fastify) + '/test',
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -459,7 +451,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PROPFIND',
-        url: getUrl(fastify) + '/test',
+        url: getServerUrl(fastify) + '/test',
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -473,7 +465,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/test/notSupported'
+        url: getServerUrl(fastify) + '/test/notSupported'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -485,7 +477,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PUT',
-        url: getUrl(fastify) + '/test2',
+        url: getServerUrl(fastify) + '/test2',
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -499,7 +491,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PROPFIND',
-        url: getUrl(fastify) + '/test2',
+        url: getServerUrl(fastify) + '/test2',
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -513,7 +505,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/test2/notSupported'
+        url: getServerUrl(fastify) + '/test2/notSupported'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -525,7 +517,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PUT',
-        url: getUrl(fastify) + '/test3/',
+        url: getServerUrl(fastify) + '/test3/',
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -539,7 +531,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'PROPFIND',
-        url: getUrl(fastify) + '/test3/',
+        url: getServerUrl(fastify) + '/test3/',
         body: JSON.stringify({ hello: 'world' }),
         headers: { 'Content-Type': 'application/json' }
       }, (err, response, body) => {
@@ -553,7 +545,7 @@ test('encapsulated 404', t => {
       t.plan(3)
       sget({
         method: 'GET',
-        url: getUrl(fastify) + '/test3/notSupported'
+        url: getServerUrl(fastify) + '/test3/notSupported'
       }, (err, response, body) => {
         t.error(err)
         t.equal(response.statusCode, 404)
@@ -717,7 +709,7 @@ test('run hooks on default 404', t => {
 
     sget({
       method: 'PUT',
-      url: getUrl(fastify),
+      url: getServerUrl(fastify),
       body: JSON.stringify({ hello: 'world' }),
       headers: { 'Content-Type': 'application/json' }
     }, (err, response, body) => {
@@ -878,7 +870,7 @@ test('run hook with encapsulated 404', t => {
 
     sget({
       method: 'PUT',
-      url: getUrl(fastify) + '/test',
+      url: getServerUrl(fastify) + '/test',
       body: JSON.stringify({ hello: 'world' }),
       headers: { 'Content-Type': 'application/json' }
     }, (err, response, body) => {
@@ -948,7 +940,7 @@ test('run hook with encapsulated 404 and framework-unsupported method', t => {
 
     sget({
       method: 'PROPFIND',
-      url: getUrl(fastify) + '/test',
+      url: getServerUrl(fastify) + '/test',
       body: JSON.stringify({ hello: 'world' }),
       headers: { 'Content-Type': 'application/json' }
     }, (err, response, body) => {
@@ -988,7 +980,7 @@ test('hooks check 404', t => {
 
     sget({
       method: 'PUT',
-      url: getUrl(fastify) + '?foo=asd',
+      url: getServerUrl(fastify) + '?foo=asd',
       body: JSON.stringify({ hello: 'world' }),
       headers: { 'Content-Type': 'application/json' }
     }, (err, response, body) => {
@@ -998,7 +990,7 @@ test('hooks check 404', t => {
 
     sget({
       method: 'GET',
-      url: getUrl(fastify) + '/notSupported?foo=asd'
+      url: getServerUrl(fastify) + '/notSupported?foo=asd'
     }, (err, response, body) => {
       t.error(err)
       t.equal(response.statusCode, 404)
@@ -1095,7 +1087,7 @@ test('Unknown method', t => {
 
     sget({
       method: 'UNKNWON_METHOD',
-      url: getUrl(fastify)
+      url: getServerUrl(fastify)
     }, (err, response, body) => {
       t.error(err)
       t.equal(response.statusCode, 400)
@@ -1129,7 +1121,7 @@ test('recognizes errors from the http-errors module', t => {
       t.error(err)
       t.equal(res.statusCode, 404)
 
-      sget(getUrl(fastify), (err, response, body) => {
+      sget(getServerUrl(fastify), (err, response, body) => {
         t.error(err)
         const obj = JSON.parse(body.toString())
         t.strictSame(obj, {
@@ -1276,7 +1268,7 @@ test('404 inside onSend', t => {
 
     sget({
       method: 'GET',
-      url: getUrl(fastify)
+      url: getServerUrl(fastify)
     }, (err, response, body) => {
       t.error(err)
       t.equal(response.statusCode, 404)

package/test/async-await.test.js

@@ -6,8 +6,8 @@ const sget = require('simple-get').concat
 const Fastify = require('..')
 const split = require('split2')
 const pino = require('pino')
+const { sleep } = require('./helper')
 const statusCodes = require('node:http').STATUS_CODES
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 
 const opts = {
   schema: {

package/test/build-certificate.js

@@ -1,6 +1,95 @@
 'use strict'
 
-const selfCert = require('self-cert')
+const os = require('os')
+const forge = require('node-forge')
+
+// from self-cert module
+function selfCert (opts) {
+  const options = opts || {}
+  const log = opts.logger || require('abstract-logging')
+  const now = new Date()
+
+  if (!options.attrs) options.attrs = {}
+  if (!options.expires) {
+    options.expires = new Date(
+      now.getFullYear() + 5, now.getMonth() + 1, now.getDate()
+    )
+  }
+
+  log.debug('generating key pair')
+  const keys = forge.pki.rsa.generateKeyPair(options.bits || 2048)
+  log.debug('key pair generated')
+
+  log.debug('generating self-signed certificate')
+  const cert = forge.pki.createCertificate()
+  cert.publicKey = keys.publicKey
+  cert.serialNumber = '01'
+  cert.validity.notBefore = now
+  cert.validity.notAfter = options.expires
+
+  const attrs = [
+    { name: 'commonName', value: options.attrs.commonName || os.hostname() },
+    { name: 'countryName', value: options.attrs.countryName || 'US' },
+    { name: 'stateOrProvinceName', value: options.attrs.stateName || 'Georgia' },
+    { name: 'localityName', value: options.attrs.locality || 'Atlanta' },
+    { name: 'organizationName', value: options.attrs.orgName || 'None' },
+    { shortName: 'OU', value: options.attrs.shortName || 'example' }
+  ]
+  cert.setSubject(attrs)
+  cert.setIssuer(attrs)
+
+  cert.setExtensions([
+    { name: 'basicConstraints', cA: true },
+    {
+      name: 'keyUsage',
+      keyCertSign: true,
+      digitalSignature: true,
+      nonRepudiation: true,
+      keyEncipherment: true,
+      dataEncipherment: true
+    },
+    {
+      name: 'extKeyUsage',
+      serverAuth: true,
+      clientAuth: true,
+      codeSigning: true,
+      emailProtection: true,
+      timeStamping: true
+    },
+    {
+      name: 'nsCertType',
+      client: true,
+      server: true,
+      email: true,
+      objsign: true,
+      sslCA: true,
+      emailCA: true,
+      objCA: true
+    },
+    { name: 'subjectKeyIdentifier' },
+    {
+      name: 'subjectAltName',
+      altNames: [{ type: 6 /* URI */, value: 'DNS: ' + attrs[0].value }].concat((function () {
+        const interfaces = os.networkInterfaces()
+
+        // fix citgm: skip invalid ips (aix72-ppc64)
+        const ips = Object.values(interfaces).flat()
+          .filter(i => !!forge.util.bytesFromIP(i.address))
+          .map(i => ({ type: 7 /* IP */, ip: i.address }))
+
+        return ips
+      }()))
+    }
+  ])
+
+  cert.sign(keys.privateKey)
+  log.debug('certificate generated')
+  return {
+    privateKey: forge.pki.privateKeyToPem(keys.privateKey),
+    publicKey: forge.pki.publicKeyToPem(keys.publicKey),
+    certificate: forge.pki.certificateToPem(cert)
+  }
+}
 
 async function buildCertificate () {
   // "global" is used in here because "t.context" is only supported by "t.beforeEach" and "t.afterEach"

package/test/close-pipelining.test.js

@@ -36,8 +36,8 @@ test('Should return 503 while closing - pipelining', async t => {
   await instance.close()
 })
 
-const isV19plus = semver.gte(process.version, '19.0.0')
-test('Should not return 503 while closing - pipelining - return503OnClosing: false, skip Node >= v19.x', { skip: isV19plus }, async t => {
+const isVgte19 = semver.gte(process.version, '19.0.0')
+test('Should not return 503 while closing - pipelining - return503OnClosing: false, skip Node >= v19.x', { skip: isVgte19 }, async t => {
   const fastify = Fastify({
     return503OnClosing: false,
     forceCloseConnections: false
@@ -67,7 +67,7 @@ test('Should not return 503 while closing - pipelining - return503OnClosing: fal
   await instance.close()
 })
 
-test('Should close the socket abruptly - pipelining - return503OnClosing: false, skip Node < v19.x', { skip: !isV19plus }, async t => {
+test('Should close the socket abruptly - pipelining - return503OnClosing: false, skip Node < v19.x', { skip: !isVgte19 }, async t => {
   // Since Node v19, we will always invoke server.closeIdleConnections()
   // therefore our socket will be closed
   const fastify = Fastify({
@@ -75,9 +75,9 @@ test('Should close the socket abruptly - pipelining - return503OnClosing: false,
     forceCloseConnections: false
   })
 
-  fastify.get('/', (req, reply) => {
-    fastify.close()
+  fastify.get('/', async (req, reply) => {
     reply.send({ hello: 'world' })
+    fastify.close()
   })
 
   await fastify.listen({ port: 0 })

package/test/close.test.js

@@ -7,6 +7,7 @@ const Fastify = require('..')
 const { Client } = require('undici')
 const semver = require('semver')
 const split = require('split2')
+const { sleep } = require('./helper')
 
 test('close callback', t => {
   t.plan(4)
@@ -687,11 +688,6 @@ test('preClose async', async t => {
 
 test('preClose execution order', t => {
   t.plan(4)
-  async function sleep (ms) {
-    return new Promise((resolve) => {
-      setTimeout(resolve, ms)
-    })
-  }
   const fastify = Fastify()
   const order = []
   fastify.addHook('onClose', onClose)