fastify 4.25.0 → 4.25.2

package/README.md

@@ -377,10 +377,10 @@ to join this group by Lead Maintainers.
 
 [<img
 src="https://github.com/openjs-foundation/artwork/blob/main/openjs_foundation/openjs_foundation-logo-horizontal-color.png?raw=true"
-width="250px;"/>](https://openjsf.org/projects/#growth)
+width="250px;"/>](https://openjsf.org/projects)
 
-We are a [Growth
-Project](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/PROJECT_PROGRESSION.md#growth-stage)
+We are a [At-Large
+Project](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/PROJECT_PROGRESSION.md#at-large-projects)
 in the [OpenJS Foundation](https://openjsf.org/).
 
 ## Acknowledgements

package/docs/Reference/Server.md

@@ -1532,9 +1532,11 @@ handlers. *async-await* is supported as well.
 If the error `statusCode` is less than 400, Fastify will automatically
 set it to 500 before calling the error handler.
 
-> **Note** 
-> `setErrorHandler` will ***not*** catch any error inside
-> an `onResponse` hook because the response has already been sent to the client.
+`setErrorHandler` will ***not*** catch:
+- errors thrown in an `onResponse` hook because the response has already been
+  sent to the client. Use the `onSend` hook instead.
+- not found (404) errors. Use [`setNotFoundHandler`](#set-not-found-handler)
+  instead.
 
 ```js
 fastify.setErrorHandler(function (error, request, reply) {

package/fastify.js

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

package/lib/pluginUtils.js

@@ -136,14 +136,14 @@ function registerPluginName (fn) {
   return name
 }
 
-function checkPluginHealthiness (fn, pluginName = 'anonymous') {
+function checkPluginHealthiness (fn, pluginName) {
   if (fn.constructor.name === 'AsyncFunction' && fn.length === 3) {
-    FSTWRN002(pluginName)
+    FSTWRN002(pluginName || 'anonymous')
   }
 }
 
 function registerPlugin (fn) {
-  const pluginName = registerPluginName.call(this, fn)
+  const pluginName = registerPluginName.call(this, fn) || getPluginName(fn)
   checkPluginHealthiness.call(this, fn, pluginName)
   checkVersion.call(this, fn)
   checkDecorators.call(this, fn)

package/lib/reply.js

@@ -605,6 +605,10 @@ function onSendEnd (reply, payload) {
     reply.removeHeader('content-length')
     safeWriteHead(reply, statusCode)
     sendTrailer(undefined, res, reply)
+    if (typeof payload.resume === 'function') {
+      payload.on('error', noop)
+      payload.resume()
+    }
     return
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "4.25.0",
+  "version": "4.25.2",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -25,7 +25,7 @@
     "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 && tsd",
-    "test:watch": "npm run unit -- -w --no-coverage-report -R terse",
+    "test:watch": "npm run unit -- --watch --cov --no-coverage-report --reporter=terse",
     "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",

package/test/plugin.4.test.js

@@ -416,20 +416,27 @@ test('hasPlugin returns true when using encapsulation', async t => {
 })
 
 test('registering plugins with mixed style should return a warning', async t => {
-  t.plan(4)
+  t.plan(12)
+
+  const pluginNames = ['error-plugin', 'anonymous', 'anotherPlugin', 'anotherPluginNamed']
 
+  const oldWarnings = process.listeners('warning')
+  process.removeAllListeners('warning')
   process.on('warning', onWarning)
   function onWarning (warning) {
+    t.match(warning.message, new RegExp(`.*${pluginNames.shift()} plugin being registered mixes async and callback styles.*`))
     t.equal(warning.name, 'FastifyWarning')
     t.equal(warning.code, 'FSTWRN002')
   }
+  t.teardown(() => {
+    process.removeListener('warning', onWarning)
+    for (const warning of oldWarnings) {
+      process.on('warning', warning)
+    }
+  })
 
   const fastify = Fastify()
 
-  const anonymousPlugin = async (app, opts, done) => {
-    done()
-  }
-
   const pluginName = 'error-plugin'
   const errorPlugin = async (app, opts, done) => {
     done()
@@ -437,8 +444,20 @@ test('registering plugins with mixed style should return a warning', async t =>
 
   const namedPlugin = fp(errorPlugin, { name: pluginName })
 
+  async function anotherPlugin (app, opts, done) {
+    done()
+  }
+
+  const anotherPluginNamed = async function (app, opts, done) {
+    done()
+  }
+
   fastify.register(namedPlugin)
-  fastify.register(anonymousPlugin)
+  fastify.register(async (app, opts, done) => {
+    done()
+  })
+  fastify.register(anotherPlugin)
+  fastify.register(anotherPluginNamed)
 
   await fastify.ready()
 })

package/test/reply-code.test.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const t = require('tap')
+const { Readable } = require('stream')
 const test = t.test
 const Fastify = require('..')
 
@@ -59,7 +60,7 @@ test('code should handle null/undefined/float', t => {
 })
 
 test('code should handle 204', t => {
-  t.plan(8)
+  t.plan(13)
 
   const fastify = Fastify()
 
@@ -72,6 +73,18 @@ test('code should handle 204', t => {
     reply.status(204).send({ message: 'hello' })
   })
 
+  fastify.get('/stream/204', function (request, reply) {
+    const stream = new Readable({
+      read () {
+        this.push(null)
+      }
+    })
+    stream.on('end', () => {
+      t.pass('stream ended')
+    })
+    reply.status(204).send(stream)
+  })
+
   fastify.inject({
     method: 'GET',
     url: '/204'
@@ -91,6 +104,16 @@ test('code should handle 204', t => {
     t.equal(res.payload, '')
     t.equal(res.headers['content-length'], undefined)
   })
+
+  fastify.inject({
+    method: 'GET',
+    url: '/stream/204'
+  }, (error, res) => {
+    t.error(error)
+    t.equal(res.statusCode, 204)
+    t.equal(res.payload, '')
+    t.equal(res.headers['content-length'], undefined)
+  })
 })
 
 test('code should handle onSend hook on 204', t => {

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

@@ -444,19 +444,12 @@ expectType<boolean>(fastify().hasRoute({
   url: '/',
   method: 'GET',
   constraints: {
-    something: {
-      name: 'secret',
-      storage: function () {
-        return {
-          get: (type) => {
-            return null
-          },
-          set: (type, store) => {}
-        }
-      },
-      deriveConstraint: (req, ctx, done) => {},
-      mustMatchWhenDerived: true
-    }
+    // constraints value should accept any value
+    number: 12,
+    date: new Date(),
+    boolean: true,
+    function: () => {},
+    object: { foo: 'bar' }
   }
 }))
 

package/types/route.d.ts

@@ -1,4 +1,5 @@
 import { FastifyError } from '@fastify/error'
+import { ConstraintStrategy } from 'find-my-way'
 import { FastifyRequestContext } from './context'
 import { onErrorMetaHookHandler, onRequestAbortMetaHookHandler, onRequestMetaHookHandler, onResponseMetaHookHandler, onSendMetaHookHandler, onTimeoutMetaHookHandler, preHandlerMetaHookHandler, preParsingMetaHookHandler, preSerializationMetaHookHandler, preValidationMetaHookHandler } from './hooks'
 import { FastifyInstance } from './instance'
@@ -12,7 +13,6 @@ import {
   ResolveFastifyReplyReturnType
 } from './type-provider'
 import { ContextConfigDefault, HTTPMethods, RawReplyDefaultExpression, RawRequestDefaultExpression, RawServerBase, RawServerDefault } from './utils'
-import { ConstraintStrategy } from 'find-my-way'
 
 export interface FastifyRouteConfig {
   url: string;
@@ -25,6 +25,12 @@ export type RouteConstraintType = Omit<ConstraintStrategy<any>, 'deriveConstrain
   deriveConstraint<Context>(req: RawRequestDefaultExpression<RawServerDefault>, ctx?: Context, done?: (err: Error, ...args: any) => any): any,
 }
 
+export interface RouteConstraint {
+  version?: string
+  host?: RegExp | string
+  [name: string]: unknown
+}
+
 /**
  * Route shorthand options for the various shorthand methods
  */
@@ -48,7 +54,7 @@ export interface RouteShorthandOptions<
   logLevel?: LogLevel;
   config?: Omit<FastifyRequestContext<ContextConfig>['config'], 'url' | 'method'>;
   version?: string;
-  constraints?: { version: string } | {host: RegExp | string} | {[name: string]: RouteConstraintType },
+  constraints?: RouteConstraint,
   prefixTrailingSlash?: 'slash'|'no-slash'|'both';
   errorHandler?: (
     this: FastifyInstance<RawServer, RawRequest, RawReply, Logger, TypeProvider>,