fastify 6.0.0-alpha.4 → 6.0.0-alpha.6

package/fastify.d.ts

@@ -96,6 +96,7 @@ declare namespace fastify {
   type TrustProxyFunction = (address: string, hop: number) => boolean
 
   export type FastifyRouterOptions<RawServer extends RawServerBase> = Omit<FindMyWayConfigForServer<RawServer>, 'defaultRoute' | 'onBadUrl' | 'onMaxParamLength' | 'querystringParser' | 'constraints'> & {
+    compile?: boolean,
     constraints?: {
       [name: string]: ConstraintStrategy<FindMyWayVersion<RawServer>, unknown>,
     },

package/fastify.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const VERSION = '6.0.0-alpha.4'
+const VERSION = '6.0.0-alpha.6'
 
 const Avvio = require('avvio')
 const http = require('node:http')
@@ -83,6 +83,23 @@ const { buildErrorHandler } = require('./lib/error-handler.js')
 
 const initChannel = diagnostics.channel('fastify.initialization')
 
+function asyncDisposableHook (disposable) {
+  return function (instance, done) {
+    disposable[Symbol.asyncDispose]().then(() => done(), done)
+  }
+}
+
+function disposableHook (disposable) {
+  return function (instance, done) {
+    try {
+      disposable[Symbol.dispose]()
+      done()
+    } catch (err) {
+      done(err)
+    }
+  }
+}
+
 /**
  * @param {import('./fastify.js').FastifyServerOptions} serverOptions
  */
@@ -381,6 +398,13 @@ function fastify (serverOptions) {
 
   // cache the closing value, since we are checking it in an hot path
   avvio.once('preReady', () => {
+    // All the routes are registered at this point. Routes added or removed
+    // afterwards make find-my-way compile the changed trees again lazily.
+    if (options.routerOptions.compile === true) {
+      router.compileRoutes()
+      fourOhFour.router.compile()
+    }
+
     fastify.onClose((instance, done) => {
       fastify[kState].closing = true
       router.closeRoutes()
@@ -598,6 +622,16 @@ function fastify (serverOptions) {
       }
     }
 
+    if (name === 'onClose' && typeof fn !== 'function') {
+      if (typeof fn[Symbol.asyncDispose] === 'function') {
+        fn = asyncDisposableHook(fn)
+      } else if (typeof fn[Symbol.dispose] === 'function') {
+        fn = disposableHook(fn)
+      } else {
+        throw new errorCodes.FST_ERR_HOOK_INVALID_HANDLER(name, Object.prototype.toString.call(fn))
+      }
+    }
+
     if (name === 'onClose') {
       this.onClose(fn.bind(this))
     } else if (name === 'onReady' || name === 'onListen' || name === 'onRoute' || name === 'preClose') {

package/lib/config-validator.js

@@ -3,7 +3,7 @@
 "use strict";
 module.exports = validate10;
 module.exports.default = validate10;
-const schema11 = {"type":"object","additionalProperties":false,"properties":{"connectionTimeout":{"type":"integer","default":0},"keepAliveTimeout":{"type":"integer","default":72000},"forceCloseConnections":{"oneOf":[{"type":"string","pattern":"idle"},{"type":"boolean"}]},"maxRequestsPerSocket":{"type":"integer","default":0,"nullable":true},"requestTimeout":{"type":"integer","default":0},"handlerTimeout":{"type":"integer","default":0},"bodyLimit":{"type":"integer","default":1048576},"http2":{"type":"boolean"},"https":{"if":{"not":{"oneOf":[{"type":"boolean"},{"type":"null"},{"type":"object","additionalProperties":false,"required":["allowHTTP1"],"properties":{"allowHTTP1":{"type":"boolean"}}}]}},"then":{"setDefaultValue":true}},"ignoreTrailingSlash":{"type":"boolean"},"ignoreDuplicateSlashes":{"type":"boolean"},"onProtoPoisoning":{"type":"string","default":"error"},"onConstructorPoisoning":{"type":"string","default":"error"},"pluginTimeout":{"type":"integer","default":10000},"requestIdHeader":{"anyOf":[{"type":"boolean"},{"type":"string"}],"default":false},"http2SessionTimeout":{"type":"integer","default":72000},"exposeHeadRoutes":{"type":"boolean","default":true},"routerOptions":{"type":"object","additionalProperties":false,"properties":{"allowUnsafeRegex":{"type":"boolean","default":false},"caseSensitive":{"type":"boolean","default":true},"constraints":{"type":"object","additionalProperties":{"type":"object","required":["name","storage","validate","deriveConstraint"],"additionalProperties":true,"properties":{"name":{"type":"string"},"storage":{},"validate":{},"deriveConstraint":{}}}},"ignoreTrailingSlash":{"type":"boolean","default":false},"ignoreDuplicateSlashes":{"type":"boolean","default":false},"maxParamLength":{"type":"integer","default":100},"useSemicolonDelimiter":{"type":"boolean","default":false}}}}};
+const schema11 = {"type":"object","additionalProperties":false,"properties":{"connectionTimeout":{"type":"integer","default":0},"keepAliveTimeout":{"type":"integer","default":72000},"forceCloseConnections":{"oneOf":[{"type":"string","pattern":"idle"},{"type":"boolean"}]},"maxRequestsPerSocket":{"type":"integer","default":0,"nullable":true},"requestTimeout":{"type":"integer","default":0},"handlerTimeout":{"type":"integer","default":0},"bodyLimit":{"type":"integer","default":1048576},"http2":{"type":"boolean"},"https":{"if":{"not":{"oneOf":[{"type":"boolean"},{"type":"null"},{"type":"object","additionalProperties":false,"required":["allowHTTP1"],"properties":{"allowHTTP1":{"type":"boolean"}}}]}},"then":{"setDefaultValue":true}},"ignoreTrailingSlash":{"type":"boolean"},"ignoreDuplicateSlashes":{"type":"boolean"},"onProtoPoisoning":{"type":"string","default":"error"},"onConstructorPoisoning":{"type":"string","default":"error"},"pluginTimeout":{"type":"integer","default":10000},"requestIdHeader":{"anyOf":[{"type":"boolean"},{"type":"string"}],"default":false},"http2SessionTimeout":{"type":"integer","default":72000},"exposeHeadRoutes":{"type":"boolean","default":true},"routerOptions":{"type":"object","additionalProperties":false,"properties":{"allowUnsafeRegex":{"type":"boolean","default":false},"caseSensitive":{"type":"boolean","default":true},"compile":{"type":"boolean","default":false},"constraints":{"type":"object","additionalProperties":{"type":"object","required":["name","storage","validate","deriveConstraint"],"additionalProperties":true,"properties":{"name":{"type":"string"},"storage":{},"validate":{},"deriveConstraint":{}}}},"ignoreTrailingSlash":{"type":"boolean","default":false},"ignoreDuplicateSlashes":{"type":"boolean","default":false},"maxParamLength":{"type":"integer","default":100},"useSemicolonDelimiter":{"type":"boolean","default":false}}}}};
 const func2 = Object.prototype.hasOwnProperty;
 const pattern0 = new RegExp("idle", "u");
 
@@ -876,6 +876,9 @@ data18.allowUnsafeRegex = false;
 if(data18.caseSensitive === undefined){
 data18.caseSensitive = true;
 }
+if(data18.compile === undefined){
+data18.compile = false;
+}
 if(data18.ignoreTrailingSlash === undefined){
 data18.ignoreTrailingSlash = false;
 }
@@ -890,7 +893,7 @@ data18.useSemicolonDelimiter = false;
 }
 const _errs61 = errors;
 for(const key2 in data18){
-if(!(((((((key2 === "allowUnsafeRegex") || (key2 === "caseSensitive")) || (key2 === "constraints")) || (key2 === "ignoreTrailingSlash")) || (key2 === "ignoreDuplicateSlashes")) || (key2 === "maxParamLength")) || (key2 === "useSemicolonDelimiter"))){
+if(!((((((((key2 === "allowUnsafeRegex") || (key2 === "caseSensitive")) || (key2 === "compile")) || (key2 === "constraints")) || (key2 === "ignoreTrailingSlash")) || (key2 === "ignoreDuplicateSlashes")) || (key2 === "maxParamLength")) || (key2 === "useSemicolonDelimiter"))){
 delete data18[key2];
 }
 }
@@ -945,43 +948,68 @@ data18["caseSensitive"] = coerced22;
 }
 var valid7 = _errs64 === errors;
 if(valid7){
-if(data18.constraints !== undefined){
-let data21 = data18.constraints;
+let data21 = data18.compile;
 const _errs66 = errors;
-if(errors === _errs66){
-if(data21 && typeof data21 == "object" && !Array.isArray(data21)){
-for(const key3 in data21){
-let data22 = data21[key3];
-const _errs69 = errors;
-if(errors === _errs69){
+if(typeof data21 !== "boolean"){
+let coerced23 = undefined;
+if(!(coerced23 !== undefined)){
+if(data21 === "false" || data21 === 0 || data21 === null){
+coerced23 = false;
+}
+else if(data21 === "true" || data21 === 1){
+coerced23 = true;
+}
+else {
+validate10.errors = [{instancePath:instancePath+"/routerOptions/compile",schemaPath:"#/properties/routerOptions/properties/compile/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"}];
+return false;
+}
+}
+if(coerced23 !== undefined){
+data21 = coerced23;
+if(data18 !== undefined){
+data18["compile"] = coerced23;
+}
+}
+}
+var valid7 = _errs66 === errors;
+if(valid7){
+if(data18.constraints !== undefined){
+let data22 = data18.constraints;
+const _errs68 = errors;
+if(errors === _errs68){
 if(data22 && typeof data22 == "object" && !Array.isArray(data22)){
+for(const key3 in data22){
+let data23 = data22[key3];
+const _errs71 = errors;
+if(errors === _errs71){
+if(data23 && typeof data23 == "object" && !Array.isArray(data23)){
 let missing1;
-if(((((data22.name === undefined) && (missing1 = "name")) || ((data22.storage === undefined) && (missing1 = "storage"))) || ((data22.validate === undefined) && (missing1 = "validate"))) || ((data22.deriveConstraint === undefined) && (missing1 = "deriveConstraint"))){
+if(((((data23.name === undefined) && (missing1 = "name")) || ((data23.storage === undefined) && (missing1 = "storage"))) || ((data23.validate === undefined) && (missing1 = "validate"))) || ((data23.deriveConstraint === undefined) && (missing1 = "deriveConstraint"))){
 validate10.errors = [{instancePath:instancePath+"/routerOptions/constraints/" + key3.replace(/~/g, "~0").replace(/\//g, "~1"),schemaPath:"#/properties/routerOptions/properties/constraints/additionalProperties/required",keyword:"required",params:{missingProperty: missing1},message:"must have required property '"+missing1+"'"}];
 return false;
 }
 else {
-if(data22.name !== undefined){
-let data23 = data22.name;
-if(typeof data23 !== "string"){
-let dataType23 = typeof data23;
-let coerced23 = undefined;
-if(!(coerced23 !== undefined)){
-if(dataType23 == "number" || dataType23 == "boolean"){
-coerced23 = "" + data23;
+if(data23.name !== undefined){
+let data24 = data23.name;
+if(typeof data24 !== "string"){
+let dataType24 = typeof data24;
+let coerced24 = undefined;
+if(!(coerced24 !== undefined)){
+if(dataType24 == "number" || dataType24 == "boolean"){
+coerced24 = "" + data24;
 }
-else if(data23 === null){
-coerced23 = "";
+else if(data24 === null){
+coerced24 = "";
 }
 else {
 validate10.errors = [{instancePath:instancePath+"/routerOptions/constraints/" + key3.replace(/~/g, "~0").replace(/\//g, "~1")+"/name",schemaPath:"#/properties/routerOptions/properties/constraints/additionalProperties/properties/name/type",keyword:"type",params:{type: "string"},message:"must be string"}];
 return false;
 }
 }
-if(coerced23 !== undefined){
-data23 = coerced23;
-if(data22 !== undefined){
-data22["name"] = coerced23;
+if(coerced24 !== undefined){
+data24 = coerced24;
+if(data23 !== undefined){
+data23["name"] = coerced24;
 }
 }
 }
@@ -993,7 +1021,7 @@ validate10.errors = [{instancePath:instancePath+"/routerOptions/constraints/" +
 return false;
 }
 }
-var valid8 = _errs69 === errors;
+var valid8 = _errs71 === errors;
 if(!valid8){
 break;
 }
@@ -1004,38 +1032,13 @@ validate10.errors = [{instancePath:instancePath+"/routerOptions/constraints",sch
 return false;
 }
 }
-var valid7 = _errs66 === errors;
+var valid7 = _errs68 === errors;
 }
 else {
 var valid7 = true;
 }
 if(valid7){
-let data24 = data18.ignoreTrailingSlash;
-const _errs74 = errors;
-if(typeof data24 !== "boolean"){
-let coerced24 = undefined;
-if(!(coerced24 !== undefined)){
-if(data24 === "false" || data24 === 0 || data24 === null){
-coerced24 = false;
-}
-else if(data24 === "true" || data24 === 1){
-coerced24 = true;
-}
-else {
-validate10.errors = [{instancePath:instancePath+"/routerOptions/ignoreTrailingSlash",schemaPath:"#/properties/routerOptions/properties/ignoreTrailingSlash/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"}];
-return false;
-}
-}
-if(coerced24 !== undefined){
-data24 = coerced24;
-if(data18 !== undefined){
-data18["ignoreTrailingSlash"] = coerced24;
-}
-}
-}
-var valid7 = _errs74 === errors;
-if(valid7){
-let data25 = data18.ignoreDuplicateSlashes;
+let data25 = data18.ignoreTrailingSlash;
 const _errs76 = errors;
 if(typeof data25 !== "boolean"){
 let coerced25 = undefined;
@@ -1047,67 +1050,93 @@ else if(data25 === "true" || data25 === 1){
 coerced25 = true;
 }
 else {
-validate10.errors = [{instancePath:instancePath+"/routerOptions/ignoreDuplicateSlashes",schemaPath:"#/properties/routerOptions/properties/ignoreDuplicateSlashes/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"}];
+validate10.errors = [{instancePath:instancePath+"/routerOptions/ignoreTrailingSlash",schemaPath:"#/properties/routerOptions/properties/ignoreTrailingSlash/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"}];
 return false;
 }
 }
 if(coerced25 !== undefined){
 data25 = coerced25;
 if(data18 !== undefined){
-data18["ignoreDuplicateSlashes"] = coerced25;
+data18["ignoreTrailingSlash"] = coerced25;
 }
 }
 }
 var valid7 = _errs76 === errors;
 if(valid7){
-let data26 = data18.maxParamLength;
+let data26 = data18.ignoreDuplicateSlashes;
 const _errs78 = errors;
-if(!(((typeof data26 == "number") && (!(data26 % 1) && !isNaN(data26))) && (isFinite(data26)))){
-let dataType26 = typeof data26;
+if(typeof data26 !== "boolean"){
 let coerced26 = undefined;
 if(!(coerced26 !== undefined)){
-if(dataType26 === "boolean" || data26 === null
-              || (dataType26 === "string" && data26 && data26 == +data26 && !(data26 % 1))){
-coerced26 = +data26;
+if(data26 === "false" || data26 === 0 || data26 === null){
+coerced26 = false;
+}
+else if(data26 === "true" || data26 === 1){
+coerced26 = true;
 }
 else {
-validate10.errors = [{instancePath:instancePath+"/routerOptions/maxParamLength",schemaPath:"#/properties/routerOptions/properties/maxParamLength/type",keyword:"type",params:{type: "integer"},message:"must be integer"}];
+validate10.errors = [{instancePath:instancePath+"/routerOptions/ignoreDuplicateSlashes",schemaPath:"#/properties/routerOptions/properties/ignoreDuplicateSlashes/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"}];
 return false;
 }
 }
 if(coerced26 !== undefined){
 data26 = coerced26;
 if(data18 !== undefined){
-data18["maxParamLength"] = coerced26;
+data18["ignoreDuplicateSlashes"] = coerced26;
 }
 }
 }
 var valid7 = _errs78 === errors;
 if(valid7){
-let data27 = data18.useSemicolonDelimiter;
+let data27 = data18.maxParamLength;
 const _errs80 = errors;
-if(typeof data27 !== "boolean"){
+if(!(((typeof data27 == "number") && (!(data27 % 1) && !isNaN(data27))) && (isFinite(data27)))){
+let dataType27 = typeof data27;
 let coerced27 = undefined;
 if(!(coerced27 !== undefined)){
-if(data27 === "false" || data27 === 0 || data27 === null){
-coerced27 = false;
-}
-else if(data27 === "true" || data27 === 1){
-coerced27 = true;
+if(dataType27 === "boolean" || data27 === null
+              || (dataType27 === "string" && data27 && data27 == +data27 && !(data27 % 1))){
+coerced27 = +data27;
 }
 else {
-validate10.errors = [{instancePath:instancePath+"/routerOptions/useSemicolonDelimiter",schemaPath:"#/properties/routerOptions/properties/useSemicolonDelimiter/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"}];
+validate10.errors = [{instancePath:instancePath+"/routerOptions/maxParamLength",schemaPath:"#/properties/routerOptions/properties/maxParamLength/type",keyword:"type",params:{type: "integer"},message:"must be integer"}];
 return false;
 }
 }
 if(coerced27 !== undefined){
 data27 = coerced27;
 if(data18 !== undefined){
-data18["useSemicolonDelimiter"] = coerced27;
+data18["maxParamLength"] = coerced27;
 }
 }
 }
 var valid7 = _errs80 === errors;
+if(valid7){
+let data28 = data18.useSemicolonDelimiter;
+const _errs82 = errors;
+if(typeof data28 !== "boolean"){
+let coerced28 = undefined;
+if(!(coerced28 !== undefined)){
+if(data28 === "false" || data28 === 0 || data28 === null){
+coerced28 = false;
+}
+else if(data28 === "true" || data28 === 1){
+coerced28 = true;
+}
+else {
+validate10.errors = [{instancePath:instancePath+"/routerOptions/useSemicolonDelimiter",schemaPath:"#/properties/routerOptions/properties/useSemicolonDelimiter/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"}];
+return false;
+}
+}
+if(coerced28 !== undefined){
+data28 = coerced28;
+if(data18 !== undefined){
+data18["useSemicolonDelimiter"] = coerced28;
+}
+}
+}
+var valid7 = _errs82 === errors;
+}
 }
 }
 }
@@ -1155,5 +1184,5 @@ return errors === 0;
 }
 
 
-module.exports.defaultInitOptions = {"connectionTimeout":0,"keepAliveTimeout":72000,"maxRequestsPerSocket":0,"requestTimeout":0,"handlerTimeout":0,"bodyLimit":1048576,"onProtoPoisoning":"error","onConstructorPoisoning":"error","pluginTimeout":10000,"requestIdHeader":false,"http2SessionTimeout":72000,"exposeHeadRoutes":true,"allowErrorHandlerOverride":false,"routerOptions":{"allowUnsafeRegex":false,"caseSensitive":true,"ignoreTrailingSlash":false,"ignoreDuplicateSlashes":false,"maxParamLength":100,"useSemicolonDelimiter":false}}
+module.exports.defaultInitOptions = {"connectionTimeout":0,"keepAliveTimeout":72000,"maxRequestsPerSocket":0,"requestTimeout":0,"handlerTimeout":0,"bodyLimit":1048576,"onProtoPoisoning":"error","onConstructorPoisoning":"error","pluginTimeout":10000,"requestIdHeader":false,"http2SessionTimeout":72000,"exposeHeadRoutes":true,"allowErrorHandlerOverride":false,"routerOptions":{"allowUnsafeRegex":false,"caseSensitive":true,"compile":false,"ignoreTrailingSlash":false,"ignoreDuplicateSlashes":false,"maxParamLength":100,"useSemicolonDelimiter":false}}
 /* c8 ignore stop */

package/lib/content-type-parser.js

@@ -222,7 +222,13 @@ ContentTypeParser.prototype.run = function (contentType, handler, request, reply
     return
   }
 
-  const result = parser.fn(request, request[kRequestPayloadStream], done)
+  let result
+  try {
+    result = parser.fn(request, request[kRequestPayloadStream], done)
+  } catch (error) {
+    done(error, undefined)
+    return
+  }
   if (result && typeof result.then === 'function') {
     result.then(body => { done(null, body) }, done)
   }
@@ -253,12 +259,12 @@ function rawBody (request, reply, options, parser, done) {
   }
 
   let receivedLength = 0
-  let body = asString ? '' : []
+  const chunks = []
   const payload = request[kRequestPayloadStream] || request.raw
 
-  if (asString) {
-    payload.setEncoding('utf8')
-  }
+  // Always read raw Buffers and decode once at the end: setEncoding() would
+  // allocate a StringDecoder per request and force a Buffer.byteLength()
+  // rescan of every decoded chunk just to enforce the byte limit.
 
   payload.on('data', onData)
   payload.on('end', onEnd)
@@ -266,7 +272,11 @@ function rawBody (request, reply, options, parser, done) {
   payload.resume()
 
   function onData (chunk) {
-    receivedLength += asString ? Buffer.byteLength(chunk) : chunk.length
+    // A custom preParsing stream may still emit strings
+    if (typeof chunk === 'string') {
+      chunk = Buffer.from(chunk)
+    }
+    receivedLength += chunk.length
     const { receivedEncodedLength = 0 } = payload
     // The resulting body length must not exceed bodyLimit (see "zip bomb").
     // The case when encoded length is larger than received length is rather theoretical,
@@ -279,11 +289,7 @@ function rawBody (request, reply, options, parser, done) {
       return
     }
 
-    if (asString) {
-      body += chunk
-    } else {
-      body.push(chunk)
-    }
+    chunks.push(chunk)
   }
 
   function onEnd (err) {
@@ -304,11 +310,26 @@ function rawBody (request, reply, options, parser, done) {
       return
     }
 
-    if (!asString) {
-      body = Buffer.concat(body)
+    let body
+    if (asString) {
+      // Decoding the whole body at once also keeps multi-byte characters
+      // split across chunks intact
+      body = chunks.length === 1
+        ? chunks[0].toString('utf8')
+        : Buffer.concat(chunks, receivedLength).toString('utf8')
+    } else {
+      // Always copy so the parser never receives a view over the shared
+      // socket read buffer
+      body = Buffer.concat(chunks, receivedLength)
     }
 
-    const result = parser.fn(request, body, done)
+    let result
+    try {
+      result = parser.fn(request, body, done)
+    } catch (error) {
+      done(error, undefined)
+      return
+    }
     if (result && typeof result.then === 'function') {
       result.then(body => { done(null, body) }, done)
     }

package/lib/content-type.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { LruMap: Lru } = require('toad-cache')
+const { FifoMap: Fifo } = require('toad-cache')
 
 /**
  * keyValuePairsReg matches a single `parameter-name "=" parameter-value`
@@ -61,9 +61,9 @@ const subtypeNameReg = /^[\w!#$%&'*+.^`|~-]+\s*$/
 
 /**
  * Content-Type internal shared cache
- * @type {Lru<ContentType>}
+ * @type {Fifo<ContentType>}
  */
-const cache = new Lru(100)
+const cache = new Fifo(100)
 
 /**
  * ContentType parses and represents the value of the content-type header.
@@ -82,7 +82,7 @@ class ContentType {
   /**
    * The shared cache of ContentType instances. The cache is used to avoid
    * creating multiple instances of ContentType for the same header value.
-   * @type {Lru<ContentType>}
+   * @type {Fifo<ContentType>}
    */
   static get cache () { return cache }
 

package/lib/context.js

@@ -16,6 +16,7 @@ const {
   kReplyCacheSerializeFns,
   kHandlerTimeout
 } = require('./symbols.js')
+const { FST_ERR_VALIDATION } = require('./errors.js')
 
 // Object that holds the context of every request
 // Every route holds an instance of this object.
@@ -89,7 +90,7 @@ function defaultSchemaErrorFormatter (errors, dataVar) {
     const e = errors[i]
     text += dataVar + (e.instancePath || '') + ' ' + e.message + separator
   }
-  return new Error(text.slice(0, -separator.length))
+  return new FST_ERR_VALIDATION(text.slice(0, -separator.length))
 }
 
 module.exports = Context

package/lib/decorate.js

@@ -38,11 +38,12 @@ function getInstanceDecorator (name) {
     throw new FST_ERR_DEC_UNDECLARED(name, 'instance')
   }
 
-  if (typeof this[name] === 'function') {
-    return this[name].bind(this)
+  const decorator = this[name]
+  if (typeof decorator === 'function') {
+    return decorator.bind(this)
   }
 
-  return this[name]
+  return decorator
 }
 
 function decorateConstructor (konstructor, name, fn, dependencies) {

package/lib/error-handler.js

@@ -33,10 +33,27 @@ function handleError (reply, error, cb) {
   const context = reply[kRouteContext]
   if (reply[kReplyNextErrorHandler] === false) {
     fallbackErrorHandler(error, reply, function (reply, payload) {
+      if (reply.raw.headersSent === true || reply.raw.destroyed === true) {
+        // The response has already started transmitting (e.g. an active
+        // stream that timed out after its headers were sent). We cannot
+        // write a new error response, so abort the in-flight response
+        // instead of raising an uncaught ERR_HTTP_HEADERS_SENT.
+        reply.raw.destroy(error)
+        return
+      }
       try {
         reply.raw.writeHead(reply.raw.statusCode, reply[kReplyHeaders])
       } catch (error) {
         reply.server[kLogController].writeHeadError(error, reply.request, reply)
+        // If the response has started transmitting, retrying writeHead
+        // would raise an uncaught ERR_HTTP_HEADERS_SENT and terminate the
+        // process, so abort the in-flight response instead.
+        if (error.code === 'ERR_HTTP_HEADERS_SENT' || reply.raw.headersSent === true || reply.raw.destroyed === true) {
+          reply.raw.destroy(error)
+          return
+        }
+        // For other writeHead failures (e.g. an invalid header value in
+        // the error payload) retry without the offending headers.
         reply.raw.writeHead(reply.raw.statusCode)
       }
       reply.raw.end(payload)
@@ -134,16 +151,16 @@ function buildErrorHandler (parent = rootErrorHandler, func) {
 function setErrorHeaders (error, reply) {
   const res = reply.raw
   let statusCode = res.statusCode
-  statusCode = (statusCode >= 400) ? statusCode : 500
+  statusCode = (statusCode >= 400 && statusCode <= 599) ? statusCode : 500
   // treat undefined and null as same
   if (error != null) {
     if (error.headers !== undefined) {
       reply.headers(error.headers)
     }
-    if (error.status >= 400) {
-      statusCode = error.status
-    } else if (error.statusCode >= 400) {
+    if (error.statusCode >= 400 && error.statusCode <= 599) {
       statusCode = error.statusCode
+    } else if (error.status >= 400 && error.status <= 599) {
+      statusCode = error.status
     }
   }
   res.statusCode = statusCode

package/lib/error-status.js

@@ -6,8 +6,10 @@ const {
 
 function setErrorStatusCode (reply, err) {
   if (!reply[kReplyHasStatusCode] || reply.statusCode === 200) {
-    const statusCode = err && (err.statusCode || err.status)
-    reply.code(statusCode >= 400 ? statusCode : 500)
+    let statusCode = 500
+    if (err?.statusCode >= 400 && err.statusCode <= 599) statusCode = err.statusCode
+    else if (err?.status >= 400 && err.status <= 599) statusCode = err.status
+    reply.code(statusCode)
   }
 }