fastify 3.28.0 → 3.29.2

package/docs/Guides/Ecosystem.md

@@ -8,105 +8,105 @@ section.
 
 #### [Core](#core)
 
-- [`fastify-accepts`](https://github.com/fastify/fastify-accepts) to have
+- [`@fastify/accepts`](https://github.com/fastify/fastify-accepts) to have
   [accepts](https://www.npmjs.com/package/accepts) in your request object.
-- [`fastify-accepts-serializer`](https://github.com/fastify/fastify-accepts-serializer)
+- [`@fastify/accepts-serializer`](https://github.com/fastify/fastify-accepts-serializer)
   to serialize to output according to `Accept` header.
-- [`fastify-auth`](https://github.com/fastify/fastify-auth) Run multiple auth
+- [`@fastify/auth`](https://github.com/fastify/fastify-auth) Run multiple auth
   functions in Fastify.
-- [`fastify-autoload`](https://github.com/fastify/fastify-autoload) Require all
+- [`@fastify/autoload`](https://github.com/fastify/fastify-autoload) Require all
   plugins in a directory.
 - [`fastify-awilix`](https://github.com/fastify/fastify-awilix) Dependency
   injection support for Fastify, based on
   [awilix](https://github.com/jeffijoe/awilix).
-- [`fastify-bankai`](https://github.com/fastify/fastify-bankai)
+- [`@fastify/bankai`](https://github.com/fastify/fastify-bankai)
   [Bankai](https://github.com/yoshuawuyts/bankai) assets compiler for Fastify.
-- [`fastify-basic-auth`](https://github.com/fastify/fastify-basic-auth) Basic
+- [`@fastify/basic-auth`](https://github.com/fastify/fastify-basic-auth) Basic
   auth plugin for Fastify.
-- [`fastify-bearer-auth`](https://github.com/fastify/fastify-bearer-auth) Bearer
+- [`@fastify/bearer-auth`](https://github.com/fastify/fastify-bearer-auth) Bearer
   auth plugin for Fastify.
-- [`fastify-caching`](https://github.com/fastify/fastify-caching) General
+- [`@fastify/caching`](https://github.com/fastify/fastify-caching) General
   server-side cache and ETag support.
-- [`fastify-circuit-breaker`](https://github.com/fastify/fastify-circuit-breaker)
+- [`@fastify/circuit-breaker`](https://github.com/fastify/fastify-circuit-breaker)
   A low overhead circuit breaker for your routes.
-- [`fastify-compress`](https://github.com/fastify/fastify-compress) Fastify
+- [`@fastify/compress`](https://github.com/fastify/fastify-compress) Fastify
   compression utils.
-- [`fastify-cookie`](https://github.com/fastify/fastify-cookie) Parse and set
+- [`@fastify/cookie`](https://github.com/fastify/fastify-cookie) Parse and set
   cookie headers.
-- [`fastify-cors`](https://github.com/fastify/fastify-cors) Enables the use of
+- [`@fastify/cors`](https://github.com/fastify/fastify-cors) Enables the use of
   CORS in a Fastify application.
 - [`fastify-csrf`](https://github.com/fastify/fastify-csrf) A plugin for adding
   [CSRF](https://en.wikipedia.org/wiki/Cross-site_request_forgery) protection to
   Fastify.
-- [`fastify-diagnostics-channel`](https://github.com/fastify/fastify-diagnostics-channel)
+- [`@fastify/diagnostics-channel`](https://github.com/fastify/fastify-diagnostics-channel)
   Plugin to deal with `diagnostics_channel` on Fastify
-- [`fastify-elasticsearch`](https://github.com/fastify/fastify-elasticsearch)
+- [`@fastify/elasticsearch`](https://github.com/fastify/fastify-elasticsearch)
   Plugin to share the same ES client.
-- [`fastify-env`](https://github.com/fastify/fastify-env) Load and check
+- [`@fastify/env`](https://github.com/fastify/fastify-env) Load and check
   configuration.
-- [`fastify-etag`](https://github.com/fastify/fastify-etag) Automatically
+- [`@fastify/etag`](https://github.com/fastify/fastify-etag) Automatically
   generate ETags for HTTP responses.
-- [`fastify-flash`](https://github.com/fastify/fastify-flash) Set and get flash
+- [`@fastify/flash`](https://github.com/fastify/fastify-flash) Set and get flash
   messages using the session.
-- [`fastify-formbody`](https://github.com/fastify/fastify-formbody) Plugin to
+- [`@fastify/formbody`](https://github.com/fastify/fastify-formbody) Plugin to
   parse x-www-form-urlencoded bodies.
-- [`fastify-funky`](https://github.com/fastify/fastify-funky) Makes functional
+- [`@fastify/funky`](https://github.com/fastify/fastify-funky) Makes functional
   programming in Fastify more convenient. Adds support for Fastify routes
   returning functional structures, such as Either, Task or plain parameterless
   function.
-- [`fastify-helmet`](https://github.com/fastify/fastify-helmet) Important
+- [`@fastify/helmet`](https://github.com/fastify/fastify-helmet) Important
   security headers for Fastify.
-- [`fastify-http-proxy`](https://github.com/fastify/fastify-http-proxy) Proxy
+- [`@fastify/http-proxy`](https://github.com/fastify/fastify-http-proxy) Proxy
   your HTTP requests to another server, with hooks.
-- [`fastify-jwt`](https://github.com/fastify/fastify-jwt) JWT utils for Fastify,
+- [`@fastify/jwt`](https://github.com/fastify/fastify-jwt) JWT utils for Fastify,
   internally uses [fast-jwt](https://github.com/nearform/fast-jwt).
-- [`fastify-leveldb`](https://github.com/fastify/fastify-leveldb) Plugin to
+- [`@fastify/leveldb`](https://github.com/fastify/fastify-leveldb) Plugin to
   share a common LevelDB connection across Fastify.
-- [`fastify-mongodb`](https://github.com/fastify/fastify-mongodb) Fastify
+- [`@fastify/mongodb`](https://github.com/fastify/fastify-mongodb) Fastify
   MongoDB connection plugin, with which you can share the same MongoDB
   connection pool across every part of your server.
-- [`fastify-multipart`](https://github.com/fastify/fastify-multipart) Multipart
+- [`@fastify/multipart`](https://github.com/fastify/fastify-multipart) Multipart
   support for Fastify.
-- [`fastify-oauth2`](https://github.com/fastify/fastify-oauth2) Wrap around
+- [`@fastify/oauth2`](https://github.com/fastify/fastify-oauth2) Wrap around
   [`simple-oauth2`](https://github.com/lelylan/simple-oauth2).
-- [`fastify-postgres`](https://github.com/fastify/fastify-postgres) Fastify
+- [`@fastify/postgres`](https://github.com/fastify/fastify-postgres) Fastify
   PostgreSQL connection plugin, with this you can share the same PostgreSQL
   connection pool in every part of your server.
-- [`fastify-rate-limit`](https://github.com/fastify/fastify-rate-limit) A low
+- [`@fastify/rate-limit`](https://github.com/fastify/fastify-rate-limit) A low
   overhead rate limiter for your routes.
-- [`fastify-request-context`](https://github.com/fastify/fastify-request-context)
+- [`@fastify/request-context`](https://github.com/fastify/fastify-request-context)
   Request-scoped storage, based on
   [AsyncLocalStorage](https://nodejs.org/api/async_hooks.html#async_hooks_class_asynclocalstorage)
   (with fallback to [cls-hooked](https://github.com/Jeff-Lewis/cls-hooked)),
   providing functionality similar to thread-local storages.
-- [`fastify-response-validation`](https://github.com/fastify/fastify-response-validation)
+- [`@fastify/response-validation`](https://github.com/fastify/fastify-response-validation)
   A simple plugin that enables response validation for Fastify.
-- [`fastify-nextjs`](https://github.com/fastify/fastify-nextjs) React
+- [`@fastify/nextjs`](https://github.com/fastify/fastify-nextjs) React
   server-side rendering support for Fastify with
   [Next](https://github.com/zeit/next.js/).
-- [`fastify-redis`](https://github.com/fastify/fastify-redis) Fastify Redis
+- [`@fastify/redis`](https://github.com/fastify/fastify-redis) Fastify Redis
   connection plugin, with which you can share the same Redis connection across
   every part of your server.
-- [`fastify-reply-from`](https://github.com/fastify/fastify-reply-from) Plugin
+- [`@fastify/reply-from`](https://github.com/fastify/fastify-reply-from) Plugin
   to forward the current HTTP request to another server.
-- [`fastify-routes`](https://github.com/fastify/fastify-routes) Plugin that
+- [`@fastify/routes`](https://github.com/fastify/fastify-routes) Plugin that
   provides a `Map` of routes.
 - [`fastify-schedule`](https://github.com/fastify/fastify-schedule) Plugin for
   scheduling periodic jobs, based on
   [toad-scheduler](https://github.com/kibertoad/toad-scheduler).
-- [`fastify-sensible`](https://github.com/fastify/fastify-sensible) Defaults for
+- [`@fastify/sensible`](https://github.com/fastify/fastify-sensible) Defaults for
   Fastify that everyone can agree on. It adds some useful decorators such as
   HTTP errors and assertions, but also more request and reply methods.
 - [`@fastify/session`](https://github.com/fastify/session) a session plugin for
   Fastify.
-- [`fastify-static`](https://github.com/fastify/fastify-static) Plugin for
+- [`@fastify/static`](https://github.com/fastify/fastify-static) Plugin for
   serving static files as fast as possible.
-- [`fastify-swagger`](https://github.com/fastify/fastify-swagger) Plugin for
+- [`@fastify/swagger`](https://github.com/fastify/fastify-swagger) Plugin for
   serving Swagger/OpenAPI documentation for Fastify, supporting dynamic
   generation.
-- [`fastify-websocket`](https://github.com/fastify/fastify-websocket) WebSocket
+- [`@fastify/websocket`](https://github.com/fastify/fastify-websocket) WebSocket
   support for Fastify. Built upon [ws](https://github.com/websockets/ws).
-- [`fastify-url-data`](https://github.com/fastify/fastify-url-data) Decorate the
+- [`@fastify/url-data`](https://github.com/fastify/fastify-url-data) Decorate the
   `Request` object with a method to access raw URL components.
 - [`middie`](https://github.com/fastify/middie) Middleware engine for Fastify.
 - [`point-of-view`](https://github.com/fastify/point-of-view) Templates

package/docs/Guides/Getting-Started.md

@@ -195,10 +195,10 @@ Fastify handles this internally, with minimum effort!
 Let's rewrite the above example with a database connection.
 
 
-First, install `fastify-plugin` and `fastify-mongodb`:
+First, install `fastify-plugin` and `@fastify/mongodb`:
 
 ```
-npm i --save fastify-plugin fastify-mongodb
+npm i --save fastify-plugin @fastify/mongodb
 ```
 
 **server.js**
@@ -246,7 +246,7 @@ fastify.listen(3000, function (err, address) {
 ```js
 // ESM
 import fastifyPlugin from 'fastify-plugin'
-import fastifyMongo from 'fastify-mongodb'
+import fastifyMongo from '@fastify/mongodb'
 
 async function dbConnector (fastify, options) {
   fastify.register(fastifyMongo, {
@@ -265,7 +265,7 @@ module.exports = fastifyPlugin(dbConnector)
 const fastifyPlugin = require('fastify-plugin')
 
 async function dbConnector (fastify, options) {
-  fastify.register(require('fastify-mongodb'), {
+  fastify.register(require('@fastify/mongodb'), {
     url: 'mongodb://localhost:27017/test_database'
   })
 }

package/docs/Guides/Migration-Guide-V3.md

@@ -14,7 +14,7 @@ From Fastify v3, middleware support does not come out-of-the-box with the
 framework itself.
 
 If you use Express middleware in your application, please install and register
-the [`fastify-express`](https://github.com/fastify/fastify-express) or
+the [`@fastify/express`](https://github.com/fastify/fastify-express) or
 [`middie`](https://github.com/fastify/middie) plugin before doing so.
 
 **v2:**
@@ -28,7 +28,7 @@ fastify.use(require('cors')());
 
 ```js
 // Using the Express `cors` middleware in Fastify v3.
-await fastify.register(require('fastify-express'));
+await fastify.register(require('@fastify/express'));
 fastify.use(require('cors')());
 ```
 

package/docs/Guides/Plugins-Guide.md

@@ -445,10 +445,10 @@ fastify
 
 If your plugin needs to expose custom errors, you can easily generate consistent
 error objects across your codebase and plugins with the
-[`fastify-error`](https://github.com/fastify/fastify-error) module.
+[`@fastify/error`](https://github.com/fastify/fastify-error) module.
 
 ```js
-const createError = require('fastify-error')
+const createError = require('@fastify/error')
 const CustomError = createError('ERROR_CODE', 'message')
 console.log(new CustomError())
 ```
@@ -477,12 +477,12 @@ section of our documentation!
 If you want to see some real-world examples, check out:
 - [`point-of-view`](https://github.com/fastify/point-of-view) Templates
   rendering (*ejs, pug, handlebars, marko*) plugin support for Fastify.
-- [`fastify-mongodb`](https://github.com/fastify/fastify-mongodb) Fastify
+- [`@fastify/mongodb`](https://github.com/fastify/fastify-mongodb) Fastify
   MongoDB connection plugin, with this you can share the same MongoDB connection
   pool in every part of your server.
-- [`fastify-multipart`](https://github.com/fastify/fastify-multipart) Multipart
+- [`@fastify/multipart`](https://github.com/fastify/fastify-multipart) Multipart
   support for Fastify
-- [`fastify-helmet`](https://github.com/fastify/fastify-helmet) Important
+- [`@fastify/helmet`](https://github.com/fastify/fastify-helmet) Important
   security headers for Fastify
 
 

package/docs/Guides/Write-Plugin.md

@@ -33,9 +33,9 @@ unused.
 
 If you want to see some good examples on how to document a plugin take a look
 at:
-- [`fastify-caching`](https://github.com/fastify/fastify-caching)
-- [`fastify-compress`](https://github.com/fastify/fastify-compress)
-- [`fastify-cookie`](https://github.com/fastify/fastify-cookie)
+- [`@fastify/caching`](https://github.com/fastify/fastify-caching)
+- [`@fastify/compress`](https://github.com/fastify/fastify-compress)
+- [`@fastify/cookie`](https://github.com/fastify/fastify-cookie)
 - [`point-of-view`](https://github.com/fastify/point-of-view)
 - [`under-pressure`](https://github.com/fastify/under-pressure)
 
@@ -93,10 +93,10 @@ our documentation!
 If you want to see some real world examples, check out:
 - [`point-of-view`](https://github.com/fastify/point-of-view) Templates
   rendering (*ejs, pug, handlebars, marko*) plugin support for Fastify.
-- [`fastify-mongodb`](https://github.com/fastify/fastify-mongodb) Fastify
+- [`@fastify/mongodb`](https://github.com/fastify/fastify-mongodb) Fastify
   MongoDB connection plugin, with this you can share the same MongoDB connection
   pool in every part of your server.
-- [`fastify-multipart`](https://github.com/fastify/fastify-multipart) Multipart
+- [`@fastify/multipart`](https://github.com/fastify/fastify-multipart) Multipart
   support for Fastify.
-- [`fastify-helmet`](https://github.com/fastify/fastify-helmet) Important
+- [`@fastify/helmet`](https://github.com/fastify/fastify-helmet) Important
   security headers for Fastify.

package/docs/Reference/Encapsulation.md

@@ -33,7 +33,7 @@ this example into concrete terms, consider a basic scenario of a REST API
 server that has three routes: the first route (`/one`) requires authentication,
 the second route (`/two`) does not, and the third route (`/three`) has
 access to the same context as the second route. Using
-[fastify-bearer-auth][bearer] to provide the authentication, the code for this
+[@fastify/bearer-auth][bearer] to provide the authentication, the code for this
 example is as follows:
 
 ```js
@@ -44,7 +44,7 @@ const fastify = require('fastify')()
 fastify.decorateRequest('answer', 42)
 
 fastify.register(async function authenticatedContext (childServer) {
-  childServer.register(require('fastify-bearer-auth'), { keys: ['abc123'] })
+  childServer.register(require('@fastify/bearer-auth'), { keys: ['abc123'] })
 
   childServer.route({
     path: '/one',
@@ -103,7 +103,7 @@ original diagram:
 1. Each _child context_ (`authenticatedContext`, `publicContext`, and
 `grandchildContext`) has access to the `answer` request decorator defined in
 the _root context_.
-2. Only the `authenticatedContext` has access to the `fastify-bearer-auth`
+2. Only the `authenticatedContext` has access to the `@fastify/bearer-auth`
 plugin.
 3. Both the `publicContext` and `grandchildContext` have access to the `foo`
 request decorator.

package/docs/Reference/Hooks.md

@@ -351,7 +351,7 @@ fastify.addHook('preHandler', async (request, reply) => {
 })
 
 fastify.addHook('preHandler', async (request, reply) => {
-  // the fastify-static plugin will send a file asynchronously,
+  // the @fastify/static plugin will send a file asynchronously,
   // so we should return reply
   reply.sendFile('myfile')
   return reply

package/docs/Reference/Middleware.md

@@ -4,16 +4,16 @@
 
 Starting with Fastify v3.0.0, middleware is not supported out of the box and
 requires an external plugin such as
-[`fastify-express`](https://github.com/fastify/fastify-express) or
+[`@fastify/express`](https://github.com/fastify/fastify-express) or
 [`middie`](https://github.com/fastify/middie).
 
 
 An example of registering the
-[`fastify-express`](https://github.com/fastify/fastify-express) plugin to `use`
+[`@fastify/express`](https://github.com/fastify/fastify-express) plugin to `use`
 Express middleware:
 
 ```js
-await fastify.register(require('fastify-express'))
+await fastify.register(require('@fastify/express'))
 fastify.use(require('cors')())
 fastify.use(require('dns-prefetch-control')())
 fastify.use(require('frameguard')())
@@ -70,9 +70,9 @@ fastify.use(['/css', '/js'], serveStatic(path.join(__dirname, '/assets')))
 ### Alternatives
 
 Fastify offers some alternatives to the most commonly used middleware, such as
-[`fastify-helmet`](https://github.com/fastify/fastify-helmet) in case of
+[`@fastify/helmet`](https://github.com/fastify/fastify-helmet) in case of
 [`helmet`](https://github.com/helmetjs/helmet),
-[`fastify-cors`](https://github.com/fastify/fastify-cors) for
+[`@fastify/cors`](https://github.com/fastify/fastify-cors) for
 [`cors`](https://github.com/expressjs/cors), and
-[`fastify-static`](https://github.com/fastify/fastify-static) for
+[`@fastify/static`](https://github.com/fastify/fastify-static) for
 [`serve-static`](https://github.com/expressjs/serve-static).

package/docs/Reference/Reply.md

@@ -483,7 +483,7 @@ be used to enhance the HTTP response.
 
 Tip: you can simplify errors by using the
 [`http-errors`](https://npm.im/http-errors) module or
-[`fastify-sensible`](https://github.com/fastify/fastify-sensible) plugin to
+[`@fastify/sensible`](https://github.com/fastify/fastify-sensible) plugin to
 generate errors:
 
 ```js

package/docs/Reference/TypeScript.md

@@ -604,7 +604,7 @@ newer, automatically adds `.default` property and a named export to the exported
 plugin. Be sure to `export default` and `export const myPlugin` in your typings
 to provide the best developer experience. For a complete example you can check
 out
-[fastify-swagger](https://github.com/fastify/fastify-swagger/blob/master/index.d.ts).
+[@fastify/swagger](https://github.com/fastify/fastify-swagger/blob/master/index.d.ts).
 
 With those files completed, the plugin is now ready to be consumed by any
 TypeScript project!

package/fastify.d.ts

@@ -9,7 +9,7 @@ import { FastifyLoggerInstance, FastifyLoggerOptions } from './types/logger'
 import { FastifyInstance } from './types/instance'
 import { FastifyServerFactory } from './types/serverFactory'
 import { Options as AjvOptions } from '@fastify/ajv-compiler'
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 import { FastifyReply } from './types/reply'
 import { FastifySchemaValidationError } from './types/schema'
 import { ConstructorAction, ProtoAction } from "./types/content-type-parser";
@@ -163,7 +163,7 @@ export type FastifyServerOptions<
 
 type TrustProxyFunction = (address: string, hop: number) => boolean
 
-declare module 'fastify-error' {
+declare module '@fastify/error' {
   interface FastifyError {
     validation?: ValidationResult[];
   }
@@ -188,7 +188,7 @@ export { FastifyContext, FastifyContextConfig } from './types/context'
 export { RouteHandler, RouteHandlerMethod, RouteOptions, RouteShorthandMethod, RouteShorthandOptions, RouteShorthandOptionsWithHandler } from './types/route'
 export * from './types/register'
 export { FastifyBodyParser, FastifyContentTypeParser, AddContentTypeParser, hasContentTypeParser, getDefaultJsonParser, ProtoAction, ConstructorAction } from './types/content-type-parser'
-export { FastifyError } from 'fastify-error'
+export { FastifyError } from '@fastify/error'
 export { FastifySchema, FastifySchemaCompiler } from './types/schema'
 export { HTTPMethods, RawServerBase, RawRequestDefaultExpression, RawReplyDefaultExpression, RawServerDefault, ContextConfigDefault, RequestBodyDefault, RequestQuerystringDefault, RequestParamsDefault, RequestHeadersDefault } from './types/utils'
 export * from './types/hooks'

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '3.28.0'
+const VERSION = '3.29.2'
 
 const Avvio = require('avvio')
 const http = require('http')
@@ -584,7 +584,7 @@ function fastify (options) {
     // https://github.com/nodejs/node/blob/6ca23d7846cb47e84fd344543e394e50938540be/lib/_http_server.js#L666
 
     // If the socket is not writable, there is no reason to try to send data.
-    if (socket.writable && socket.bytesWritten === 0) {
+    if (socket.writable) {
       socket.write(`HTTP/1.1 400 Bad Request\r\nContent-Length: ${body.length}\r\nContent-Type: application/json\r\n\r\n${body}`)
     }
     socket.destroy(err)

package/lib/errors.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const createError = require('fastify-error')
+const createError = require('@fastify/error')
 const codes = {
   /**
    * Basic

package/lib/reply.js

@@ -545,7 +545,7 @@ function sendStream (payload, res, reply) {
   eos(payload, { readable: true, writable: false }, function (err) {
     sourceOpen = false
     if (err != null) {
-      if (res.headersSent) {
+      if (res.headersSent || reply.request.raw.aborted === true) {
         if (!errorLogged) {
           errorLogged = true
           logStreamError(reply.log, err, res)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "3.28.0",
+  "version": "3.29.2",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -127,9 +127,8 @@
     "@sinonjs/fake-timers": "^9.1.0",
     "@types/node": "^16.0.0",
     "@types/pino": "^6.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "JSONStream": "^1.3.5",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
     "ajv": "^6.0.0",
     "ajv-errors": "^1.0.1",
     "ajv-formats": "^2.1.1",
@@ -140,11 +139,11 @@
     "cors": "^2.8.5",
     "coveralls": "^3.1.0",
     "dns-prefetch-control": "^0.3.0",
-    "eslint": "^8.0.1",
+    "eslint": "^8.14.0",
     "eslint-config-standard": "^17.0.0-1",
-    "eslint-import-resolver-node": "^0.3.2",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-n": "^14.0.0",
+    "eslint-import-resolver-node": "^0.3.6",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.2.0",
     "eslint-plugin-promise": "^6.0.0",
     "fast-json-body": "^1.1.0",
     "fastify-plugin": "^3.0.0",
@@ -157,6 +156,7 @@
     "hsts": "^2.2.0",
     "http-errors": "^2.0.0",
     "ienoopen": "^1.1.0",
+    "JSONStream": "^1.3.5",
     "license-checker": "^25.0.1",
     "pem": "^1.14.4",
     "proxyquire": "^2.1.3",
@@ -166,7 +166,7 @@
     "simple-get": "^4.0.0",
     "snazzy": "^9.0.0",
     "split2": "^4.1.0",
-    "standard": "^17.0.0-2",
+    "standard": "^17.0.0",
     "tap": "^15.1.1",
     "tap-mocha-reporter": "^5.0.1",
     "then-sleep": "^1.0.1",
@@ -178,15 +178,15 @@
   },
   "dependencies": {
     "@fastify/ajv-compiler": "^1.0.0",
+    "@fastify/error": "^2.0.0",
     "abstract-logging": "^2.0.0",
     "avvio": "^7.1.2",
     "fast-json-stringify": "^2.5.2",
-    "fastify-error": "^0.3.0",
-    "process-warning": "^1.0.0",
     "find-my-way": "^4.5.0",
     "flatstr": "^1.0.12",
     "light-my-request": "^4.2.0",
     "pino": "^6.13.0",
+    "process-warning": "^1.0.0",
     "proxy-addr": "^2.0.7",
     "rfdc": "^1.1.4",
     "secure-json-parse": "^2.0.0",

package/test/request-error.test.js

@@ -2,6 +2,7 @@
 
 const { connect } = require('net')
 const t = require('tap')
+const semver = require('semver')
 const test = t.test
 const Fastify = require('..')
 const { kRequest } = require('../lib/symbols.js')
@@ -153,7 +154,7 @@ test('default clientError handler ignores sockets in destroyed state', t => {
 })
 
 test('default clientError handler destroys sockets in writable state', t => {
-  t.plan(1)
+  t.plan(2)
 
   const fastify = Fastify({
     bodyLimit: 1,
@@ -169,6 +170,9 @@ test('default clientError handler destroys sockets in writable state', t => {
     },
     destroy () {
       t.pass('destroy should be called')
+    },
+    write (response) {
+      t.match(response, /^HTTP\/1.1 400 Bad Request/)
     }
   })
 })
@@ -189,6 +193,9 @@ test('default clientError handler destroys http sockets in non-writable state',
     },
     destroy () {
       t.pass('destroy should be called')
+    },
+    write (response) {
+      t.fail('write should not be called')
     }
   })
 })
@@ -273,3 +280,42 @@ test('encapsulated error handler binding', t => {
     t.equal(fastify.hello, undefined)
   })
 })
+
+const skip = semver.lt(process.versions.node, '11.0.0')
+
+test('default clientError replies with bad request on reused keep-alive connection', { skip }, t => {
+  t.plan(2)
+
+  let response = ''
+
+  const fastify = Fastify({
+    bodyLimit: 1,
+    keepAliveTimeout: 100
+  })
+
+  fastify.get('/', (request, reply) => {
+    reply.send('OK\n')
+  })
+
+  fastify.listen({ port: 0 }, function (err) {
+    t.error(err)
+    fastify.server.unref()
+
+    const client = connect(fastify.server.address().port)
+
+    client.on('data', chunk => {
+      response += chunk.toString('utf-8')
+    })
+
+    client.on('end', () => {
+      t.match(response, /^HTTP\/1.1 200 OK.*HTTP\/1.1 400 Bad Request/s)
+    })
+
+    client.resume()
+    client.write('GET / HTTP/1.1\r\n')
+    client.write('\r\n\r\n')
+    client.write('GET /?a b HTTP/1.1\r\n')
+    client.write('Connection: close\r\n')
+    client.write('\r\n\r\n')
+  })
+})

package/test/stream.test.js

@@ -683,3 +683,51 @@ test('should mark reply as sent before pumping the payload stream into response
     fastify.close()
   })
 })
+
+test('reply.send handles aborted requests', t => {
+  t.plan(2)
+
+  const spyLogger = {
+    level: 'error',
+    fatal: () => { },
+    error: () => {
+      t.fail('should not log an error')
+    },
+    warn: () => { },
+    info: () => { },
+    debug: () => { },
+    trace: () => { },
+    child: () => { return spyLogger }
+  }
+  const fastify = Fastify({
+    logger: spyLogger
+  })
+
+  fastify.get('/', (req, reply) => {
+    setTimeout(() => {
+      const stream = new Readable({
+        read: function () {
+          this.push(null)
+        }
+      })
+      reply.send(stream)
+    }, 6)
+  })
+
+  fastify.listen({ port: 0 }, err => {
+    t.error(err)
+    fastify.server.unref()
+
+    const port = fastify.server.address().port
+    const http = require('http')
+    const req = http.get(`http://localhost:${port}`)
+      .on('error', (err) => {
+        t.equal(err.code, 'ECONNRESET')
+        fastify.close()
+      })
+
+    setTimeout(() => {
+      req.abort()
+    }, 1)
+  })
+})

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

@@ -1,4 +1,4 @@
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 import { expectAssignable, expectError, expectType } from 'tsd'
 import fastify, {
   FastifyInstance,

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

@@ -1,4 +1,4 @@
-import { expectType } from 'tsd'
+import { expectError, expectType } from 'tsd'
 import fastify, { FastifyLogFn, LogLevel, FastifyLoggerInstance, FastifyError, FastifyRequest, FastifyReply } from '../../fastify'
 import { Server, IncomingMessage, ServerResponse } from 'http'
 import pino from 'pino'
@@ -183,3 +183,15 @@ const passStreamAsOption = fastify({
     stream: fs.createWriteStream('/tmp/stream.out')
   }
 })
+
+const childParent = fastify().log
+// we test different option variant here
+expectType<FastifyLoggerInstance>(childParent.child({}, { level: 'info' }))
+expectType<FastifyLoggerInstance>(childParent.child({}, { redact: ['pass', 'pin'] }))
+expectType<FastifyLoggerInstance>(childParent.child({}, { serializers: { key: () => {} } }))
+expectType<FastifyLoggerInstance>(childParent.child({}, { level: 'info', redact: ['pass', 'pin'], serializers: { key: () => {} } }))
+
+// no option pass
+expectError(childParent.child())
+// wrong option
+expectError(childParent.child({}, { nonExist: true }))

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

@@ -3,7 +3,7 @@ import * as http from 'http'
 import * as https from 'https'
 import { expectType, expectError, expectAssignable } from 'tsd'
 import { FastifyPluginCallback, FastifyPluginAsync } from '../../types/plugin'
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 
 // FastifyPlugin & FastifyRegister
 interface TestOptions extends FastifyPluginOptions {

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

@@ -3,7 +3,7 @@ import { expectType, expectError, expectAssignable } from 'tsd'
 import { HTTPMethods } from '../../types/utils'
 import * as http from 'http'
 import { RequestPayload } from '../../types/hooks'
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 
 /*
  * Testing Fastify HTTP Routes and Route Shorthands.

package/types/hooks.d.ts

@@ -4,7 +4,7 @@ import { RouteOptions, RouteGenericInterface } from './route'
 import { RawServerBase, RawServerDefault, RawRequestDefaultExpression, RawReplyDefaultExpression, ContextConfigDefault } from './utils'
 import { FastifyRequest } from './request'
 import { FastifyReply } from './reply'
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 import { FastifyLoggerInstance } from './logger'
 import { RegisterOptions } from './register'
 import { FastifyPluginOptions } from './plugin'

package/types/instance.d.ts

@@ -13,7 +13,7 @@ import { FastifyRegister } from './register'
 import { onRequestHookHandler, preParsingHookHandler, onSendHookHandler, preValidationHookHandler, preHandlerHookHandler, preSerializationHookHandler, onResponseHookHandler, onErrorHookHandler, onRouteHookHandler, onRegisterHookHandler, onCloseHookHandler, onCloseAsyncHookHandler, onReadyHookHandler, onTimeoutHookHandler, preParsingAsyncHookHandler, preValidationAsyncHookHandler, preHandlerAsyncHookHandler, preSerializationAsyncHookHandler, onSendAsyncHookHandler, onResponseAsyncHookHandler, onTimeoutAsyncHookHandler, onErrorAsyncHookHandler, onReadyAsyncHookHandler, onRequestAsyncHookHandler } from './hooks'
 import { FastifyRequest } from './request'
 import { FastifyReply } from './reply'
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 import { AddContentTypeParser, hasContentTypeParser, getDefaultJsonParser, ProtoAction, ConstructorAction, FastifyBodyParser, removeContentTypeParser, removeAllContentTypeParsers } from './content-type-parser'
 
 export interface PrintRoutesOptions {

package/types/logger.d.ts

@@ -18,7 +18,7 @@
  * https://github.com/fastify/fastify/issues/649
  */
 
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 import { RawServerBase, RawServerDefault, RawRequestDefaultExpression, RawReplyDefaultExpression } from './utils'
 import { RouteGenericInterface } from './route'
 import { FastifyRequest } from './request'
@@ -36,12 +36,23 @@ export type LogLevel = 'info' | 'error' | 'debug' | 'fatal' | 'warn' | 'trace'
 
 export type SerializerFn = (value: unknown) => unknown;
 
+export interface redactOptions {
+  paths: string[];
+  censor?: string | ((v: any) => any) | undefined;
+  remove?: boolean | undefined;
+}
 export interface Bindings {
   level?: LogLevel | string;
   serializers?: { [key: string]: SerializerFn };
   [key: string]: unknown;
 }
 
+export interface ChildLoggerOptions {
+  level?: LogLevel | string;
+  redact?: string[] | redactOptions | undefined;
+  serializers?: { [key: string]: SerializerFn } | undefined;
+}
+
 export interface FastifyLoggerInstance {
   info: FastifyLogFn;
   warn: FastifyLogFn;
@@ -49,7 +60,7 @@ export interface FastifyLoggerInstance {
   fatal: FastifyLogFn;
   trace: FastifyLogFn;
   debug: FastifyLogFn;
-  child(bindings: Bindings): FastifyLoggerInstance;
+  child(bindings: Bindings, options?: ChildLoggerOptions): FastifyLoggerInstance;
 }
 
 // This interface is accurate for pino 6.3 and was copied from the following permalink:

package/types/route.d.ts

@@ -5,7 +5,7 @@ import { FastifySchema, FastifySchemaCompiler, FastifySchemaValidationError, Fas
 import { HTTPMethods, RawServerBase, RawServerDefault, RawRequestDefaultExpression, RawReplyDefaultExpression, ContextConfigDefault } from './utils'
 import { FastifyLoggerInstance, LogLevel } from './logger'
 import { preValidationHookHandler, preHandlerHookHandler, preSerializationHookHandler, onRequestHookHandler, preParsingHookHandler, onResponseHookHandler, onSendHookHandler, onErrorHookHandler, onTimeoutHookHandler } from './hooks'
-import { FastifyError } from 'fastify-error'
+import { FastifyError } from '@fastify/error'
 import { FastifyContext } from './context'
 
 export interface RouteGenericInterface extends RequestGenericInterface, ReplyGenericInterface {}