fastify 3.27.1 → 3.27.4

package/docs/Guides/Ecosystem.md

@@ -59,7 +59,7 @@ section.
 - [`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,
-  internally uses [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken).
+  internally uses [fast-jwt](https://github.com/nearform/fast-jwt).
 - [`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
@@ -130,6 +130,7 @@ section.
 - [`@immobiliarelabs/fastify-metrics`](https://github.com/immobiliare/fastify-metrics)
   Minimalistic and opinionated plugin that collects usage/process metrics and
   dispatches to [statsd](https://github.com/statsd/statsd).
+- [`@immobiliarelabs/fastify-sentry`](https://github.com/immobiliare/fastify-sentry) Sentry errors handler that just works! Install, add your DSN and you're good to go!
 - [`@mgcrea/fastify-graceful-exit`](https://github.com/mgcrea/fastify-graceful-exit)
   A plugin to close the server gracefully
 - [`@mgcrea/fastify-request-logger`](https://github.com/mgcrea/fastify-request-logger)

package/docs/Reference/ContentTypeParser.md

@@ -2,7 +2,10 @@
 
 ## `Content-Type` Parser
 Natively, Fastify only supports `'application/json'` and `'text/plain'` content
-types. The default charset is `utf-8`. If you need to support different content
+types. If the content type is not one of these, a `FST_ERR_CTP_INVALID_MEDIA_TYPE` 
+error will be thrown.
+
+The default charset is `utf-8`. If you need to support different content
 types, you can use the `addContentTypeParser` API. *The default JSON and/or
 plain text parser can be changed or removed.*
 

package/docs/Reference/Server.md

@@ -77,6 +77,9 @@ describes the properties available in that options object.
     - [printRoutes](#printroutes)
     - [printPlugins](#printplugins)
     - [addContentTypeParser](#addcontenttypeparser)
+    - [hasContentTypeParser](#hasContentTypeParser)
+    - [removeContentTypeParser](#removeContentTypeParser)
+    - [removeAllContentTypeParsers](#removeAllContentTypeParsers)
     - [getDefaultJsonParser](#getdefaultjsonparser)
     - [defaultTextParser](#defaulttextparser)
     - [errorHandler](#errorhandler)
@@ -1479,6 +1482,39 @@ content types, e.g. `text/json, application/vnd.oasis.opendocument.text`.
 fastify.addContentTypeParser('text/json', { asString: true }, fastify.getDefaultJsonParser('ignore', 'ignore'))
 ```
 
+#### hasContentTypeParser
+<a id="hasContentTypeParser"></a>
+
+`fastify.hasContentTypeParser(contentType)` is used to check whether there is a content type parser in the current 
+context for the specified content type.
+
+```js
+fastify.hasContentTypeParser('text/json')
+
+fastify.hasContentTypeParser(/^.+\/json$/)
+```
+
+#### removeContentTypeParser
+<a id="removeContentTypeParser"></a>
+
+`fastify.removeContentTypeParser(contentType)` is used to remove content type parsers in the current context. This
+method allows for example to remove the both built-in parsers for `application/json` and `text/plain`.
+
+```js
+fastify.removeContentTypeParser('application/json')
+
+fastify.removeContentTypeParser(['application/json', 'text/plain'])
+```
+
+#### removeAllContentTypeParsers
+<a id="removeAllContentTypeParsers"></a>
+
+The `fastify.removeAllContentTypeParsers()` method allows all content type parsers in the current context to be removed.
+A use case of this method is the implementation of catch-all content type parser. Before adding this parser with
+`fastify.addContentTypeParser()` one could call the `removeAllContentTypeParsers` method.
+
+For more details about the usage of the different content type parser APIs see [here](./ContentTypeParser.md#usage).
+
 #### getDefaultJsonParser
 <a id="getDefaultJsonParser"></a>
 

package/docs/Reference/Validation-and-Serialization.md

@@ -4,7 +4,10 @@
 Fastify uses a schema-based approach, and even if it is not mandatory we
 recommend using [JSON Schema](https://json-schema.org/) to validate your routes
 and serialize your outputs. Internally, Fastify compiles the schema into a
-highly performant function.
+highly performant function. 
+
+Validation will only be attempted if the content type is `application-json`,
+as described in the documentation for the [content type parser](./ContentTypeParser.md).
 
 > ## ⚠  Security Notice
 > Treat the schema definition as application code. Validation and serialization

package/fastify.d.ts

@@ -113,6 +113,7 @@ export type FastifyServerOptions<
   caseSensitive?: boolean,
   requestIdHeader?: string,
   requestIdLogLabel?: string;
+  jsonShorthand?: boolean;
   genReqId?: <RequestGeneric extends RequestGenericInterface = RequestGenericInterface>(req: FastifyRequest<RequestGeneric, RawServer, RawRequestDefaultExpression<RawServer>>) => string,
   trustProxy?: boolean | string | string[] | number | TrustProxyFunction,
   querystringParser?: (str: string) => { [key: string]: unknown },

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '3.27.1'
+const VERSION = '3.27.4'
 
 const Avvio = require('avvio')
 const http = require('http')
@@ -27,7 +27,8 @@ const {
   kPluginNameChain,
   kSchemaErrorFormatter,
   kErrorHandler,
-  kKeepAliveConnections
+  kKeepAliveConnections,
+  kFourOhFourContext
 } = require('./lib/symbols.js')
 
 const { createServer } = require('./lib/server')
@@ -58,7 +59,8 @@ const onBadUrlContext = {
   config: {
   },
   onSend: [],
-  onError: []
+  onError: [],
+  [kFourOhFourContext]: null
 }
 
 function defaultBuildPrettyMeta (route) {
@@ -173,9 +175,9 @@ function fastify (options) {
   // Default router
   const router = buildRouting({
     config: {
-      defaultRoute: defaultRoute,
-      onBadUrl: onBadUrl,
-      constraints: constraints,
+      defaultRoute,
+      onBadUrl,
+      constraints,
       ignoreTrailingSlash: options.ignoreTrailingSlash || defaultInitOptions.ignoreTrailingSlash,
       maxParamLength: options.maxParamLength || defaultInitOptions.maxParamLength,
       caseSensitive: options.caseSensitive,
@@ -266,16 +268,16 @@ function fastify (options) {
     // expose logger instance
     log: logger,
     // hooks
-    addHook: addHook,
+    addHook,
     // schemas
-    addSchema: addSchema,
+    addSchema,
     getSchema: schemaController.getSchema.bind(schemaController),
     getSchemas: schemaController.getSchemas.bind(schemaController),
-    setValidatorCompiler: setValidatorCompiler,
-    setSerializerCompiler: setSerializerCompiler,
-    setSchemaController: setSchemaController,
-    setReplySerializer: setReplySerializer,
-    setSchemaErrorFormatter: setSchemaErrorFormatter,
+    setValidatorCompiler,
+    setSerializerCompiler,
+    setSchemaController,
+    setReplySerializer,
+    setSchemaErrorFormatter,
     // custom parsers
     addContentTypeParser: ContentTypeParser.helpers.addContentTypeParser,
     hasContentTypeParser: ContentTypeParser.helpers.hasContentTypeParser,
@@ -291,8 +293,8 @@ function fastify (options) {
     close: null,
     printPlugins: null,
     // http server
-    listen: listen,
-    server: server,
+    listen,
+    server,
     // extend fastify objects
     decorate: decorator.add,
     hasDecorator: decorator.exist,
@@ -301,12 +303,12 @@ function fastify (options) {
     hasRequestDecorator: decorator.existRequest,
     hasReplyDecorator: decorator.existReply,
     // fake http injection
-    inject: inject,
+    inject,
     // pretty print of the registered routes
     printRoutes,
     // custom error handling
-    setNotFoundHandler: setNotFoundHandler,
-    setErrorHandler: setErrorHandler,
+    setNotFoundHandler,
+    setErrorHandler,
     // Set fastify initial configuration options read-only object
     initialConfig
   }

package/lib/decorate.js

@@ -134,6 +134,6 @@ module.exports = {
   existRequest: checkRequestExistence,
   existReply: checkReplyExistence,
   dependencies: checkDependencies,
-  decorateReply: decorateReply,
-  decorateRequest: decorateRequest
+  decorateReply,
+  decorateRequest
 }

package/lib/errors.js

@@ -106,7 +106,7 @@ const codes = {
    */
   FST_ERR_MISSING_MIDDLEWARE: createError(
     'FST_ERR_MISSING_MIDDLEWARE',
-    'You must register a plugin for handling middlewares, visit fastify.io/docs/latest/Middleware/ for more info.',
+    'You must register a plugin for handling middlewares, visit fastify.io/docs/latest/Reference/Middleware/ for more info.',
     500
   ),
 

package/lib/reply.js

@@ -579,11 +579,11 @@ function handleError (reply, error, cb) {
     const serializerFn = getSchemaSerializer(reply.context, statusCode)
     payload = (serializerFn === false)
       ? serializeError({
-          error: statusCodes[statusCode + ''],
-          code: error.code,
-          message: error.message || '',
-          statusCode: statusCode
-        })
+        error: statusCodes[statusCode + ''],
+        code: error.code,
+        message: error.message || '',
+        statusCode
+      })
       : serializerFn(Object.create(error, {
         error: { value: statusCodes[statusCode + ''] },
         message: { value: error.message || '' },

package/lib/schema-controller.js

@@ -25,7 +25,7 @@ function buildSchemaController (parentSchemaCtrl, opts) {
 
   const option = {
     bucket: (opts && opts.bucket) || buildSchemas,
-    compilersFactory: compilersFactory
+    compilersFactory
   }
 
   return new SchemaController(undefined, option)

package/lib/server.js

@@ -52,7 +52,7 @@ function createServer (options, httpHandler) {
       }
 
       const cb = typeof args[args.length - 1] === 'function' ? args.pop() : undefined
-      const options = { cb: cb }
+      const options = { cb }
 
       const firstArg = args[0]
       const argsLength = args.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "3.27.1",
+  "version": "3.27.4",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -12,7 +12,7 @@
     "license-checker": "license-checker --production --onlyAllow=\"MIT;ISC;BSD-3-Clause;BSD-2-Clause\"",
     "lint": "npm run lint:standard && npm run lint:typescript",
     "lint:fix": "standard --fix",
-    "lint:standard": "standard --verbose | snazzy",
+    "lint:standard": "standard | snazzy",
     "lint:typescript": "eslint -c types/.eslintrc.json types/**/*.d.ts test/types/**/*.test-d.ts",
     "prepublishOnly": "tap --no-check-coverage test/internals/version.test.js",
     "test": "npm run lint && npm run unit && npm run test:typescript",
@@ -124,11 +124,11 @@
     "@fastify/ajv-compiler-8": "npm:@fastify/ajv-compiler@^2.0.0",
     "@fastify/pre-commit": "^2.0.1",
     "@hapi/joi": "^17.1.1",
-    "@sinonjs/fake-timers": "^8.1.0",
+    "@sinonjs/fake-timers": "^9.1.0",
     "@types/node": "^16.0.0",
     "@types/pino": "^6.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.5.0",
-    "@typescript-eslint/parser": "^4.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.0.0",
+    "@typescript-eslint/parser": "^5.0.0",
     "JSONStream": "^1.3.5",
     "ajv": "^6.0.0",
     "ajv-errors": "^1.0.1",
@@ -140,13 +140,12 @@
     "cors": "^2.8.5",
     "coveralls": "^3.1.0",
     "dns-prefetch-control": "^0.3.0",
-    "eslint": "^7.11.0",
-    "eslint-config-standard": "^16.0.1",
+    "eslint": "^8.0.1",
+    "eslint-config-standard": "^17.0.0-1",
     "eslint-import-resolver-node": "^0.3.2",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-n": "^14.0.0",
+    "eslint-plugin-promise": "^6.0.0",
     "fast-json-body": "^1.1.0",
     "fastify-plugin": "^3.0.0",
     "fluent-json-schema": "^3.0.0",
@@ -167,7 +166,7 @@
     "simple-get": "^4.0.0",
     "snazzy": "^9.0.0",
     "split2": "^4.1.0",
-    "standard": "^16.0.1",
+    "standard": "^17.0.0-2",
     "tap": "^15.1.1",
     "tap-mocha-reporter": "^5.0.1",
     "then-sleep": "^1.0.1",
@@ -192,7 +191,7 @@
     "rfdc": "^1.1.4",
     "secure-json-parse": "^2.0.0",
     "semver": "^7.3.2",
-    "tiny-lru": "^7.0.0"
+    "tiny-lru": "^8.0.1"
   },
   "standard": {
     "ignore": [

package/test/404s.test.js

@@ -1772,3 +1772,27 @@ test('setNotFoundHandler should be chaining fastify instance', t => {
 
   t.end()
 })
+
+test('Send 404 when frameworkError calls reply.callNotFound', t => {
+  t.test('Dynamic route', t => {
+    t.plan(4)
+    const fastify = Fastify({
+      logger: true,
+      frameworkErrors: (error, req, reply) => {
+        t.equal(error.message, "'%world' is not a valid url component")
+        return reply.callNotFound()
+      }
+    })
+    fastify.get('/hello/:id', () => t.fail('we should not be here'))
+    fastify.inject({
+      url: '/hello/%world',
+      method: 'GET'
+    }, (err, response) => {
+      t.error(err)
+      t.equal(response.statusCode, 404)
+      t.equal(response.payload, '404 Not Found')
+    })
+  })
+
+  t.end()
+})

package/test/async-await.test.js

@@ -407,7 +407,7 @@ test('error is logged because promise was fulfilled with undefined', t => {
   try {
     fastify = Fastify({
       logger: {
-        stream: stream,
+        stream,
         level: 'error'
       }
     })
@@ -447,7 +447,7 @@ test('error is not logged because promise was fulfilled with undefined but statu
   try {
     fastify = Fastify({
       logger: {
-        stream: stream,
+        stream,
         level: 'error'
       }
     })
@@ -488,7 +488,7 @@ test('error is not logged because promise was fulfilled with undefined but respo
   try {
     fastify = Fastify({
       logger: {
-        stream: stream,
+        stream,
         level: 'error'
       }
     })

package/test/close.test.js

@@ -215,7 +215,7 @@ t.test('Current opened connection should continue to work after closing and retu
     t.error(err)
 
     const port = fastify.server.address().port
-    const client = net.createConnection({ port: port }, () => {
+    const client = net.createConnection({ port }, () => {
       client.write('GET / HTTP/1.1\r\n\r\n')
 
       client.once('data', data => {

package/test/context-config.test.js

@@ -29,7 +29,7 @@ test('config', t => {
     method: 'GET',
     url: '/route',
     schema: schema.schema,
-    handler: handler,
+    handler,
     config: Object.assign({}, schema.config)
   })
 
@@ -37,7 +37,7 @@ test('config', t => {
     method: 'GET',
     url: '/no-config',
     schema: schema.schema,
-    handler: handler
+    handler
   })
 
   fastify.inject({
@@ -81,7 +81,7 @@ test('config with exposeHeadRoutes', t => {
     method: 'GET',
     url: '/route',
     schema: schema.schema,
-    handler: handler,
+    handler,
     config: Object.assign({}, schema.config)
   })
 
@@ -89,7 +89,7 @@ test('config with exposeHeadRoutes', t => {
     method: 'GET',
     url: '/no-config',
     schema: schema.schema,
-    handler: handler
+    handler
   })
 
   fastify.inject({

package/test/inject.test.js

@@ -186,7 +186,7 @@ test('inject post request', t => {
   fastify.inject({
     method: 'POST',
     url: '/',
-    payload: payload
+    payload
   }, (err, res) => {
     t.error(err)
     t.same(payload, JSON.parse(res.payload))

package/test/internals/all.test.js

@@ -19,7 +19,7 @@ test('fastify.all should add all the methods to the same url', t => {
   function injectRequest (method) {
     const options = {
       url: '/',
-      method: method
+      method
     }
 
     if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
@@ -29,7 +29,7 @@ test('fastify.all should add all the methods to the same url', t => {
     fastify.inject(options, (err, res) => {
       t.error(err)
       const payload = JSON.parse(res.payload)
-      t.same(payload, { method: method })
+      t.same(payload, { method })
     })
   }
 })

package/test/internals/contentTypeParser.test.js

@@ -32,8 +32,8 @@ test('rawBody function', t => {
 
   res.log = { error: () => { }, info: () => { } }
   const context = {
-    Reply: Reply,
-    Request: Request,
+    Reply,
+    Request,
     preHandler: [],
     onSend: [],
     _parserOptions: {
@@ -85,8 +85,8 @@ test('Should support Webpack and faux modules', t => {
 
   res.log = { error: () => { }, info: () => { } }
   const context = {
-    Reply: Reply,
-    Request: Request,
+    Reply,
+    Request,
     preHandler: [],
     onSend: [],
     _parserOptions: {

package/test/internals/handleRequest.test.js

@@ -62,8 +62,8 @@ test('handler function - invalid schema', t => {
       }
     },
     handler: () => {},
-    Reply: Reply,
-    Request: Request,
+    Reply,
+    Request,
     preValidation: [],
     preHandler: [],
     onSend: [],
@@ -93,8 +93,8 @@ test('handler function - reply', t => {
       reply.code(204)
       reply.send(undefined)
     },
-    Reply: Reply,
-    Request: Request,
+    Reply,
+    Request,
     preValidation: [],
     preHandler: [],
     onSend: [],
@@ -123,8 +123,8 @@ test('handler function - preValidationCallback with finished response', t => {
       t.fail()
       reply.send(undefined)
     },
-    Reply: Reply,
-    Request: Request,
+    Reply,
+    Request,
     preValidation: null,
     preHandler: [],
     onSend: [],
@@ -150,8 +150,8 @@ test('handler function - preValidationCallback with finished response (< v12.9.0
       t.fail()
       reply.send(undefined)
     },
-    Reply: Reply,
-    Request: Request,
+    Reply,
+    Request,
     preValidation: null,
     preHandler: [],
     onSend: [],

package/test/internals/logger.test.js

@@ -103,7 +103,7 @@ test('The logger should error if both stream and file destination are given', t
     Fastify({
       logger: {
         level: 'info',
-        stream: stream,
+        stream,
         file: '/test'
       }
     })

package/test/internals/reply.test.js

@@ -5,9 +5,8 @@ const test = t.test
 const sget = require('simple-get').concat
 const http = require('http')
 const NotFound = require('http-errors').NotFound
-const EventEmitter = require('events').EventEmitter
 const Reply = require('../../lib/reply')
-const { Writable } = require('stream')
+const { Readable, Writable } = require('stream')
 const {
   kReplyErrorHandlerCalled,
   kReplyHeaders,
@@ -40,30 +39,30 @@ test('Once called, Reply should return an object with methods', t => {
 test('reply.send will logStream error and destroy the stream', { only: true }, t => {
   t.plan(1)
   let destroyCalled
-  const payload = new EventEmitter()
+  const payload = new Readable({
+    read () {},
+    destroy (err, cb) {
+      destroyCalled = true
+      cb(err)
+    }
+  })
 
-  const response = {
+  const response = new Writable()
+  Object.assign(response, {
     setHeader: () => {},
     hasHeader: () => false,
     getHeader: () => undefined,
     writeHead: () => {},
-    end: () => {},
-    headersSent: true,
-    destroy: () => (destroyCalled = true),
-    on: () => {}
-  }
+    headersSent: true
+  })
 
   const log = {
     warn: () => {}
   }
 
-  Object.assign(payload, {
-    pipe: () => {},
-    destroy: () => {}
-  })
   const reply = new Reply(response, { context: { onSend: null } }, log)
   reply.send(payload)
-  payload.emit('error', new Error('stream error'))
+  payload.destroy(new Error('stream error'))
 
   t.equal(destroyCalled, true, 'Error not logged and not streamed')
 })

package/test/logger.test.js

@@ -37,7 +37,7 @@ test('defaults to info level', t => {
   try {
     fastify = Fastify({
       logger: {
-        stream: stream
+        stream
       }
     })
   } catch (e) {
@@ -85,7 +85,7 @@ test('test log stream', t => {
   try {
     fastify = Fastify({
       logger: {
-        stream: stream,
+        stream,
         level: 'info'
       }
     })
@@ -132,7 +132,7 @@ test('test error log stream', t => {
   try {
     fastify = Fastify({
       logger: {
-        stream: stream,
+        stream,
         level: 'info'
       }
     })
@@ -182,7 +182,7 @@ test('can use external logger instance', t => {
 
   const logger = require('pino')(splitStream)
 
-  const localFastify = Fastify({ logger: logger })
+  const localFastify = Fastify({ logger })
 
   localFastify.get('/foo', function (req, reply) {
     t.ok(req.log)
@@ -226,7 +226,7 @@ test('can use external logger instance with custom serializer', t => {
   }, splitStream)
 
   const localFastify = Fastify({
-    logger: logger
+    logger
   })
 
   localFastify.get('/foo', function (req, reply) {
@@ -253,7 +253,7 @@ test('expose the logger', t => {
   try {
     fastify = Fastify({
       logger: {
-        stream: stream,
+        stream,
         level: 'info'
       }
     })
@@ -271,7 +271,7 @@ test('The request id header key can be customized', t => {
 
   const stream = split(JSON.parse)
   const fastify = Fastify({
-    logger: { stream: stream, level: 'info' },
+    logger: { stream, level: 'info' },
     requestIdHeader: 'my-custom-request-id'
   })
   t.teardown(() => fastify.close())
@@ -316,7 +316,7 @@ test('The request id header key can be customized along with a custom id generat
 
   const stream = split(JSON.parse)
   const fastify = Fastify({
-    logger: { stream: stream, level: 'info' },
+    logger: { stream, level: 'info' },
     requestIdHeader: 'my-custom-request-id',
     genReqId (req) {
       return 'foo'
@@ -379,7 +379,7 @@ test('The request id log label can be changed', t => {
 
   const stream = split(JSON.parse)
   const fastify = Fastify({
-    logger: { stream: stream, level: 'info' },
+    logger: { stream, level: 'info' },
     requestIdHeader: 'my-custom-request-id',
     requestIdLogLabel: 'traceId'
   })
@@ -422,7 +422,7 @@ test('The logger should accept custom serializer', t => {
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info',
       serializers: {
         req: function (req) {
@@ -1151,7 +1151,7 @@ test('should serialize request and response', t => {
       const stream = split(JSON.parse)
       const fastify = Fastify({
         logger: {
-          stream: stream,
+          stream,
           level: 'info'
         }
       })
@@ -1173,7 +1173,7 @@ test('Do not wrap IPv4 address', t => {
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info'
     }
   })
@@ -1241,7 +1241,7 @@ test('should log the error if no error handler is defined', t => {
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info'
     }
   })
@@ -1275,7 +1275,7 @@ test('should log as info if error status code >= 400 and < 500 if no error handl
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info'
     }
   })
@@ -1313,7 +1313,7 @@ test('should log as error if error status code >= 500 if no error handler is def
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info'
     }
   })
@@ -1347,7 +1347,7 @@ test('should not log the error if error handler is defined', t => {
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info'
     }
   })
@@ -1381,7 +1381,7 @@ test('should not rely on raw request to log errors', t => {
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info'
     }
   })
@@ -1412,7 +1412,7 @@ test('should redact the authorization header if so specified', t => {
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       redact: ['req.headers.authorization'],
       level: 'info',
       serializers: {

package/test/maxRequestsPerSocket.test.js

@@ -21,7 +21,7 @@ test('maxRequestsPerSocket on node version >= 16.10.0', { skip }, t => {
     t.error(err)
 
     const port = fastify.server.address().port
-    const client = net.createConnection({ port: port }, () => {
+    const client = net.createConnection({ port }, () => {
       client.write('GET / HTTP/1.1\r\n\r\n')
 
       client.once('data', data => {
@@ -61,7 +61,7 @@ test('maxRequestsPerSocket zero should behave same as null', { skip }, t => {
     t.error(err)
 
     const port = fastify.server.address().port
-    const client = net.createConnection({ port: port }, () => {
+    const client = net.createConnection({ port }, () => {
       client.write('GET / HTTP/1.1\r\n\r\n')
 
       client.once('data', data => {

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

@@ -23,7 +23,7 @@ test('skip automatic reply.send() with reply.sent = true and a body', (t) => {
   const stream = split(JSON.parse)
   const app = Fastify({
     logger: {
-      stream: stream
+      stream
     }
   })
 
@@ -52,7 +52,7 @@ test('skip automatic reply.send() with reply.sent = true and no body', (t) => {
   const stream = split(JSON.parse)
   const app = Fastify({
     logger: {
-      stream: stream
+      stream
     }
   })
 
@@ -81,7 +81,7 @@ test('skip automatic reply.send() with reply.sent = true and an error', (t) => {
   const stream = split(JSON.parse)
   const app = Fastify({
     logger: {
-      stream: stream
+      stream
     }
   })
 
@@ -125,7 +125,7 @@ function testHandlerOrBeforeHandlerHook (test, hookOrHandler) {
       const stream = split(JSON.parse)
       const app = Fastify({
         logger: {
-          stream: stream
+          stream
         }
       })
 
@@ -170,7 +170,7 @@ function testHandlerOrBeforeHandlerHook (test, hookOrHandler) {
       const stream = split(JSON.parse)
       const app = Fastify({
         logger: {
-          stream: stream
+          stream
         }
       })
       t.teardown(() => app.close())
@@ -224,7 +224,7 @@ function testHandlerOrBeforeHandlerHook (test, hookOrHandler) {
       const stream = split(JSON.parse)
       const app = Fastify({
         logger: {
-          stream: stream
+          stream
         }
       })
       t.teardown(() => app.close())
@@ -274,7 +274,7 @@ function testHandlerOrBeforeHandlerHook (test, hookOrHandler) {
       const stream = split(JSON.parse)
       const app = Fastify({
         logger: {
-          stream: stream
+          stream
         }
       })
 

package/test/trust-proxy.test.js

@@ -16,7 +16,7 @@ const sgetForwardedRequest = (app, forHeader, path, protoHeader) => {
   }
   sget({
     method: 'GET',
-    headers: headers,
+    headers,
     url: 'http://localhost:' + app.server.address().port + path
   }, () => {})
 }

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

@@ -206,6 +206,7 @@ expectAssignable<FastifyInstance>(fastify({
     expectType<Socket>(socket)
   }
 }))
+expectAssignable<FastifyInstance>(fastify({ jsonShorthand: true }))
 
 // Thenable
 expectAssignable<PromiseLike<FastifyInstance>>(fastify({ return503OnClosing: true }))

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

@@ -7,7 +7,9 @@ import fastify, {
   RawReplyDefaultExpression,
   RawRequestDefaultExpression,
   RawServerBase,
-  RouteOptions
+  RouteOptions,
+  RegisterOptions,
+  FastifyPluginOptions
 } from '../../fastify'
 import { preHandlerAsyncHookHandler, RequestPayload } from '../../types/hooks'
 
@@ -113,8 +115,9 @@ server.addHook('onRoute', function (opts) {
   expectType<RouteOptions & { routePath: string; path: string; prefix: string}>(opts)
 })
 
-server.addHook('onRegister', (instance, done) => {
+server.addHook('onRegister', (instance, opts, done) => {
   expectType<FastifyInstance>(instance)
+  expectType<RegisterOptions & FastifyPluginOptions>(opts)
   expectAssignable<(err?: FastifyError) => void>(done)
   expectAssignable<(err?: NodeJS.ErrnoException) => void>(done)
   expectType<void>(done(new Error()))
@@ -194,8 +197,9 @@ server.addHook('onError', async function (request, reply, error) {
   expectType<FastifyError>(error)
 })
 
-server.addHook('onRegister', async (instance) => {
+server.addHook('onRegister', async (instance, opts) => {
   expectType<FastifyInstance>(instance)
+  expectType<RegisterOptions & FastifyPluginOptions>(opts)
 })
 
 server.addHook('onReady', async function () {

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

@@ -54,7 +54,7 @@ function asyncNodeJSErrorHandler (error: NodeJS.ErrnoException) {}
 server.setErrorHandler(asyncNodeJSErrorHandler)
 
 class CustomError extends Error {
-  private __brand: any;
+  private __brand: any
 }
 interface ReplyPayload {
   Reply: {

package/test/validation-error-handling.test.js

@@ -140,7 +140,7 @@ test('error inside custom error handler should have validationContext if specifi
       return function (data) {
         const error = new Error('this failed')
         error.validationContext = 'customContext'
-        return { error: error }
+        return { error }
       }
     }
   }, function (req, reply) {

package/test/versioned-routes.test.js

@@ -433,7 +433,7 @@ test('test log stream', t => {
   const stream = split(JSON.parse)
   const fastify = Fastify({
     logger: {
-      stream: stream,
+      stream,
       level: 'info'
     }
   })

package/types/.eslintrc.json

@@ -31,12 +31,14 @@
       "files": ["*.test-d.ts"],
       "rules": {
         "no-unused-vars": "off",
-        "node/handle-callback-err": "off",
+        "n/handle-callback-err": "off",
         "@typescript-eslint/no-empty-function": "off",
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
-        "@typescript-eslint/no-misused-promises": ["error"]
+        "@typescript-eslint/no-misused-promises": ["error", {
+          "checksVoidReturn": false
+        }]
       },
       "globals": {
         "NodeJS": "readonly"

package/types/hooks.d.ts

@@ -6,6 +6,8 @@ import { FastifyRequest } from './request'
 import { FastifyReply } from './reply'
 import { FastifyError } from 'fastify-error'
 import { FastifyLoggerInstance } from './logger'
+import { RegisterOptions } from './register'
+import { FastifyPluginOptions } from './plugin'
 
 type HookHandlerDoneFunction = <TError extends Error = FastifyError>(err?: TError) => void
 
@@ -360,10 +362,12 @@ export interface onRegisterHookHandler<
   RawServer extends RawServerBase = RawServerDefault,
   RawRequest extends RawRequestDefaultExpression<RawServer> = RawRequestDefaultExpression<RawServer>,
   RawReply extends RawReplyDefaultExpression<RawServer> = RawReplyDefaultExpression<RawServer>,
-  Logger = FastifyLoggerInstance
+  Logger = FastifyLoggerInstance,
+  Options extends FastifyPluginOptions = FastifyPluginOptions
 > {
   (
     instance: FastifyInstance<RawServer, RawRequest, RawReply, Logger>,
+    opts: RegisterOptions & Options,
     done: HookHandlerDoneFunction
   ): Promise<unknown> | void; // documentation is missing the `done` method
 }

package/types/register.d.ts

@@ -2,7 +2,7 @@ import { FastifyPluginOptions, FastifyPluginCallback, FastifyPluginAsync } from
 import { LogLevel } from './logger'
 import { FastifyInstance } from './instance'
 
-interface RegisterOptions {
+export interface RegisterOptions {
   prefix?: string;
   logLevel?: LogLevel;
   logSerializers?: Record<string, (value: any) => string>;