fastify 4.5.0 → 4.5.3

package/docs/Guides/Ecosystem.md

@@ -102,11 +102,15 @@ section.
 - [`@fastify/schedule`](https://github.com/fastify/fastify-schedule) Plugin for
   scheduling periodic jobs, based on
   [toad-scheduler](https://github.com/kibertoad/toad-scheduler).
+- [`@fastify/secure-session`](https://github.com/fastify/fastify-secure-session)
+  Create a secure stateless cookie session for Fastify.
 - [`@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/soap-client`](https://github.com/fastify/fastify-soap-client) a SOAP
+  client plugin for Fastify.
 - [`@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
@@ -485,8 +489,6 @@ section.
 - [`fastify-schema-to-typescript`](https://github.com/thomasthiebaud/fastify-schema-to-typescript)
   Generate typescript types based on your JSON/YAML validation schemas so they
   are always in sync.
-- [`fastify-secure-session`](https://github.com/mcollina/fastify-secure-session)
-  Create a secure stateless cookie session for Fastify.
 - [`fastify-sentry`](https://github.com/alex-ppg/fastify-sentry) Fastify plugin
   to add the Sentry SDK error handler to requests.
 - [`fastify-sequelize`](https://github.com/lyquocnam/fastify-sequelize) Fastify
@@ -497,8 +499,6 @@ section.
   `fastify-caching`.
 - [`fastify-slonik`](https://github.com/Unbuttun/fastify-slonik) Fastify Slonik
   plugin, with this you can use slonik in every part of your server.
-- [`fastify-soap-client`](https://github.com/fastify/fastify-soap-client) a SOAP
-  client plugin for Fastify.
 - [`fastify-socket.io`](https://github.com/alemagio/fastify-socket.io) a
   Socket.io plugin for Fastify.
 - [`fastify-split-validator`](https://github.com/MetCoder95/fastify-split-validator)

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '4.5.0'
+const VERSION = '4.5.3'
 
 const Avvio = require('avvio')
 const http = require('http')

package/lib/context.js

@@ -44,6 +44,7 @@ function Context ({
   this.onTimeout = null
   this.preHandler = null
   this.onResponse = null
+  this.preSerialization = null
   this.config = config
   this.errorHandler = errorHandler || server[kErrorHandler]
   this._middie = null

package/lib/decorate.js

@@ -19,7 +19,7 @@ const {
 const warning = require('./warnings')
 
 function decorate (instance, name, fn, dependencies) {
-  if (instance.hasOwnProperty(name)) {
+  if (Object.prototype.hasOwnProperty.call(instance, name)) {
     throw new FST_ERR_DEC_ALREADY_PRESENT(name)
   }
 
@@ -37,7 +37,7 @@ function decorate (instance, name, fn, dependencies) {
 
 function decorateConstructor (konstructor, name, fn, dependencies) {
   const instance = konstructor.prototype
-  if (instance.hasOwnProperty(name) || hasKey(konstructor, name)) {
+  if (Object.prototype.hasOwnProperty.call(instance, name) || hasKey(konstructor, name)) {
     throw new FST_ERR_DEC_ALREADY_PRESENT(name)
   }
 

package/lib/fourOhFour.js

@@ -10,7 +10,8 @@ const {
   kCanSetNotFoundHandler,
   kFourOhFourLevelInstance,
   kFourOhFourContext,
-  kHooks
+  kHooks,
+  kErrorHandler
 } = require('./symbols.js')
 const { lifecycleHooks } = require('./hooks')
 const { buildErrorHandler } = require('./error-handler.js')
@@ -148,6 +149,7 @@ function fourOhFour (options) {
           .map(h => h.bind(this))
         context[hook] = toSet.length ? toSet : null
       }
+      context.errorHandler = opts.errorHandler ? buildErrorHandler(this[kErrorHandler], opts.errorHandler) : this[kErrorHandler]
     })
 
     if (this[kFourOhFourContext] !== null && prefix === '/') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "4.5.0",
+  "version": "4.5.3",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -177,7 +177,7 @@
     "abstract-logging": "^2.0.1",
     "avvio": "^8.1.3",
     "find-my-way": "^7.0.0",
-    "light-my-request": "^5.0.0",
+    "light-my-request": "^5.5.1",
     "pino": "^8.0.0",
     "process-warning": "^2.0.0",
     "proxy-addr": "^2.0.7",

package/test/404s.test.js

@@ -1944,3 +1944,68 @@ test('Send 404 when frameworkError calls reply.callNotFound', t => {
 
   t.end()
 })
+
+test('hooks are applied to not found handlers /1', async ({ equal }) => {
+  const fastify = Fastify()
+
+  // adding await here is fundamental for this test
+  await fastify.register(async function (fastify) {
+  })
+
+  fastify.setErrorHandler(function (_, request, reply) {
+    return reply.code(401).send({ error: 'Unauthorized' })
+  })
+
+  fastify.addHook('preValidation', async function (request, reply) {
+    throw new Error('kaboom')
+  })
+
+  const { statusCode } = await fastify.inject('/')
+  equal(statusCode, 401)
+})
+
+test('hooks are applied to not found handlers /2', async ({ equal }) => {
+  const fastify = Fastify()
+
+  async function plugin (fastify) {
+    fastify.setErrorHandler(function (_, request, reply) {
+      return reply.code(401).send({ error: 'Unauthorized' })
+    })
+  }
+
+  plugin[Symbol.for('skip-override')] = true
+
+  fastify.register(plugin)
+
+  fastify.addHook('preValidation', async function (request, reply) {
+    throw new Error('kaboom')
+  })
+
+  const { statusCode } = await fastify.inject('/')
+  equal(statusCode, 401)
+})
+
+test('hooks are applied to not found handlers /3', async ({ equal, fail }) => {
+  const fastify = Fastify()
+
+  async function plugin (fastify) {
+    fastify.setNotFoundHandler({ errorHandler }, async () => {
+      fail('this should never be called')
+    })
+
+    function errorHandler (_, request, reply) {
+      return reply.code(401).send({ error: 'Unauthorized' })
+    }
+  }
+
+  plugin[Symbol.for('skip-override')] = true
+
+  fastify.register(plugin)
+
+  fastify.addHook('preValidation', async function (request, reply) {
+    throw new Error('kaboom')
+  })
+
+  const { statusCode } = await fastify.inject('/')
+  equal(statusCode, 401)
+})

package/test/async-await.test.js

@@ -423,6 +423,28 @@ test('promise was fulfilled with undefined', t => {
   })
 })
 
+test('promise was fulfilled with undefined using inject', async (t) => {
+  const stream = split(JSON.parse)
+  const fastify = Fastify({
+    logger: {
+      stream,
+      level: 'error'
+    }
+  })
+
+  fastify.get('/', async (req, reply) => {
+  })
+
+  stream.once('data', line => {
+    t.fail('should not log an error')
+  })
+
+  const res = await fastify.inject('/')
+
+  t.equal(res.body, '')
+  t.equal(res.statusCode, 200)
+})
+
 test('error is not logged because promise was fulfilled with undefined but response was sent before promise resolution', t => {
   t.plan(4)
 

package/test/decorator.test.js

@@ -642,7 +642,7 @@ test('should register empty values', t => {
 
   fastify.register((instance, opts, done) => {
     instance.decorate('test', null)
-    t.ok(instance.hasOwnProperty('test'))
+    t.ok(Object.prototype.hasOwnProperty.call(instance, 'test'))
     done()
   })
 

package/test/hooks-async.test.js

@@ -710,3 +710,46 @@ test('preSerializationEnd should handle errors if the serialize method throws',
 
   t.end()
 })
+
+t.test('nested hooks to do not crash on 404', t => {
+  t.plan(2)
+  const fastify = Fastify()
+
+  fastify.get('/hello', (req, reply) => {
+    reply.send({ hello: 'world' })
+  })
+
+  fastify.register(async function (fastify) {
+    fastify.get('/something', (req, reply) => {
+      reply.callNotFound()
+    })
+
+    fastify.setNotFoundHandler(async (request, reply) => {
+      reply.statusCode = 404
+      return { status: 'nested-not-found' }
+    })
+
+    fastify.setErrorHandler(async (error, request, reply) => {
+      reply.statusCode = 500
+      return { status: 'nested-error', error }
+    })
+  }, { prefix: '/nested' })
+
+  fastify.setNotFoundHandler(async (request, reply) => {
+    reply.statusCode = 404
+    return { status: 'not-found' }
+  })
+
+  fastify.setErrorHandler(async (error, request, reply) => {
+    reply.statusCode = 500
+    return { status: 'error', error }
+  })
+
+  fastify.inject({
+    method: 'GET',
+    url: '/nested/something'
+  }, (err, res) => {
+    t.error(err)
+    t.equal(res.statusCode, 404)
+  })
+})

package/test/internals/decorator.test.js

@@ -138,7 +138,7 @@ test('decorate should recognize getter/setter objects', t => {
       this._a = val
     }
   })
-  t.equal(one.hasOwnProperty('foo'), true)
+  t.equal(Object.prototype.hasOwnProperty.call(one, 'foo'), true)
   t.equal(one.foo, undefined)
   one.foo = 'a'
   t.equal(one.foo, 'a')
@@ -154,6 +154,6 @@ test('decorate should recognize getter/setter objects', t => {
   decorator.add.call(two, 'foo', {
     getter: () => 'a getter'
   })
-  t.equal(two.hasOwnProperty('foo'), true)
+  t.equal(Object.prototype.hasOwnProperty.call(two, 'foo'), true)
   t.equal(two.foo, 'a getter')
 })

package/types/instance.d.ts

@@ -174,7 +174,7 @@ export interface FastifyInstance<
   route<
     RouteGeneric extends RouteGenericInterface = RouteGenericInterface,
     ContextConfig = ContextConfigDefault,
-    SchemaCompiler = FastifySchema,
+    SchemaCompiler extends FastifySchema = FastifySchema,
   >(opts: RouteOptions<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, SchemaCompiler, TypeProvider>): FastifyInstance<RawServer, RawRequest, RawReply, Logger, TypeProvider>;
 
   get: RouteShorthandMethod<RawServer, RawRequest, RawReply, TypeProvider>;

package/types/route.d.ts

@@ -24,7 +24,7 @@ export interface RouteShorthandOptions<
   RawReply extends RawReplyDefaultExpression<RawServer> = RawReplyDefaultExpression<RawServer>,
   RouteGeneric extends RouteGenericInterface = RouteGenericInterface,
   ContextConfig = ContextConfigDefault,
-  SchemaCompiler = FastifySchema,
+  SchemaCompiler extends FastifySchema = FastifySchema,
   TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault,
   Logger extends FastifyLoggerInstance = FastifyLoggerInstance
 > {
@@ -84,7 +84,7 @@ export interface RouteShorthandOptionsWithHandler<
   RawReply extends RawReplyDefaultExpression<RawServer> = RawReplyDefaultExpression<RawServer>,
   RouteGeneric extends RouteGenericInterface = RouteGenericInterface,
   ContextConfig = ContextConfigDefault,
-  SchemaCompiler = FastifySchema,
+  SchemaCompiler extends FastifySchema = FastifySchema,
   TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault,
   Logger extends FastifyLoggerInstance = FastifyLoggerInstance
 > extends RouteShorthandOptions<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, SchemaCompiler, TypeProvider, Logger> {
@@ -100,16 +100,16 @@ export interface RouteShorthandMethod<
   RawReply extends RawReplyDefaultExpression<RawServer> = RawReplyDefaultExpression<RawServer>,
   TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault,
 > {
-  <RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler = FastifySchema, Logger extends FastifyLoggerInstance = FastifyLoggerInstance>(
+  <RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, Logger extends FastifyLoggerInstance = FastifyLoggerInstance>(
     path: string,
     opts: RouteShorthandOptions<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, SchemaCompiler, TypeProvider, Logger>,
     handler: RouteHandlerMethod<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, SchemaCompiler, TypeProvider, Logger>
   ): FastifyInstance<RawServer, RawRequest, RawReply, Logger, TypeProvider>;
-  <RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler = FastifySchema, Logger extends FastifyLoggerInstance = FastifyLoggerInstance>(
+  <RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, Logger extends FastifyLoggerInstance = FastifyLoggerInstance>(
     path: string,
     handler: RouteHandlerMethod<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, SchemaCompiler, TypeProvider, Logger>
   ): FastifyInstance<RawServer, RawRequest, RawReply, Logger, TypeProvider>;
-  <RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler = FastifySchema, Logger extends FastifyLoggerInstance = FastifyLoggerInstance>(
+  <RouteGeneric extends RouteGenericInterface = RouteGenericInterface, ContextConfig = ContextConfigDefault, SchemaCompiler extends FastifySchema = FastifySchema, Logger extends FastifyLoggerInstance = FastifyLoggerInstance>(
     path: string,
     opts: RouteShorthandOptionsWithHandler<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, SchemaCompiler, TypeProvider, Logger>
   ): FastifyInstance<RawServer, RawRequest, RawReply, Logger, TypeProvider>;
@@ -124,7 +124,7 @@ export interface RouteOptions<
   RawReply extends RawReplyDefaultExpression<RawServer> = RawReplyDefaultExpression<RawServer>,
   RouteGeneric extends RouteGenericInterface = RouteGenericInterface,
   ContextConfig = ContextConfigDefault,
-  SchemaCompiler = FastifySchema,
+  SchemaCompiler extends FastifySchema = FastifySchema,
   TypeProvider extends FastifyTypeProvider = FastifyTypeProviderDefault,
   Logger extends FastifyLoggerInstance = FastifyLoggerInstance
 > extends RouteShorthandOptions<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, SchemaCompiler, TypeProvider, Logger> {