fastify 3.27.4 → 4.0.0-alpha.3

package/lib/fourOhFour.js

@@ -9,21 +9,17 @@ const {
   kRoutePrefix,
   kCanSetNotFoundHandler,
   kFourOhFourLevelInstance,
-  kReply,
-  kRequest,
-  kContentTypeParser,
-  kBodyLimit,
-  kLogLevel,
   kFourOhFourContext,
-  kHooks,
-  kErrorHandler
+  kHooks
 } = require('./symbols.js')
 const { lifecycleHooks } = require('./hooks')
+const { buildErrorHandler } = require('./error-handler.js')
 const fourOhFourContext = {
   config: {
   },
   onSend: [],
-  onError: []
+  onError: [],
+  errorHandler: buildErrorHandler()
 }
 
 /**
@@ -34,10 +30,10 @@ const fourOhFourContext = {
  * kFourOhFourContext: the context in the reply object where the handler will be executed
  */
 function fourOhFour (options) {
-  const { logger, genReqId } = options
+  const { logger, genReqId, disableRequestLogging } = options
 
   // 404 router, used for handling encapsulated 404 handlers
-  const router = FindMyWay({ defaultRoute: fourOhFourFallBack })
+  const router = FindMyWay({ onBadUrl, defaultRoute: fourOhFourFallBack })
 
   return { router, setNotFoundHandler, setContext, arrange404 }
 
@@ -58,6 +54,26 @@ function fourOhFour (options) {
     })
   }
 
+  function onBadUrl (path, req, res) {
+    const { url, method } = req
+    const message = `Route ${method}:${url} not found`
+    const body = `{"error":"Not Found","message":"${message}","statusCode":404}`
+
+    // simulate normal route logging
+    if (!disableRequestLogging) {
+      const id = genReqId(req)
+      const childLogger = logger.child({ reqId: id })
+      childLogger.info({ req }, 'incoming request')
+      childLogger.info({ req }, message)
+    }
+
+    res.writeHead(404, {
+      'Content-Type': 'application/json',
+      'Content-Length': body.length
+    })
+    res.end(body)
+  }
+
   function setContext (instance, context) {
     const _404Context = Object.assign({}, instance[kFourOhFourContext])
     _404Context.onSend = context.onSend
@@ -118,17 +134,12 @@ function fourOhFour (options) {
   }
 
   function _setNotFoundHandler (prefix, opts, handler, avvio, routeHandler) {
-    const context = new Context(
-      opts.schema,
+    const context = new Context({
+      schema: opts.schema,
       handler,
-      this[kReply],
-      this[kRequest],
-      this[kContentTypeParser],
-      opts.config || {},
-      this[kErrorHandler],
-      this[kBodyLimit],
-      this[kLogLevel]
-    )
+      config: opts.config || {},
+      server: this
+    })
 
     avvio.once('preReady', () => {
       const context = this[kFourOhFourContext]

package/lib/handleRequest.js

@@ -3,12 +3,14 @@
 const { validate: validateSchema } = require('./validation')
 const { hookRunner, hookIterator } = require('./hooks')
 const wrapThenable = require('./wrapThenable')
-
-const { kReplyIsError } = require('./symbols')
+const {
+  kReplyIsError
+} = require('./symbols')
 
 function handleRequest (err, request, reply) {
   if (reply.sent === true) return
   if (err != null) {
+    reply[kReplyIsError] = true
     reply.send(err)
     return
   }
@@ -55,7 +57,7 @@ function handleRequest (err, request, reply) {
   }
 
   // Return 404 instead of 405 see https://github.com/fastify/fastify/pull/862 for discussion
-  reply.code(404).send(new Error('Not Found'))
+  handler(request, reply)
 }
 
 function handler (request, reply) {
@@ -77,11 +79,10 @@ function handler (request, reply) {
 }
 
 function preValidationCallback (err, request, reply) {
-  if (reply.sent === true ||
-    reply.raw.writableEnded === true ||
-    reply.raw.writable === false) return
+  if (reply.sent === true) return
 
   if (err != null) {
+    reply[kReplyIsError] = true
     reply.send(err)
     return
   }
@@ -111,11 +112,10 @@ function preValidationCallback (err, request, reply) {
 }
 
 function preHandlerCallback (err, request, reply) {
-  if (reply.sent ||
-    reply.raw.writableEnded === true ||
-    reply.raw.writable === false) return
+  if (reply.sent) return
 
   if (err != null) {
+    reply[kReplyIsError] = true
     reply.send(err)
     return
   }
@@ -125,10 +125,7 @@ function preHandlerCallback (err, request, reply) {
   try {
     result = reply.context.handler(request, reply)
   } catch (err) {
-    if (!(err instanceof Error)) {
-      reply[kReplyIsError] = true
-    }
-
+    reply[kReplyIsError] = true
     reply.send(err)
     return
   }

package/lib/hooks.js

@@ -21,11 +21,13 @@ const supportedHooks = lifecycleHooks.concat(applicationHooks)
 const {
   FST_ERR_HOOK_INVALID_TYPE,
   FST_ERR_HOOK_INVALID_HANDLER,
-  FST_ERR_SEND_UNDEFINED_ERR
+  FST_ERR_SEND_UNDEFINED_ERR,
+  FST_ERR_HOOK_TIMEOUT,
+  AVVIO_ERRORS_MAP,
+  appendStackTrace
 } = require('./errors')
 
 const {
-  kReplyIsError,
   kChildren,
   kHooks
 } = require('./symbols')
@@ -84,6 +86,14 @@ function hookRunnerApplication (hookName, boot, server, cb) {
 
   function exit (err) {
     if (err) {
+      if (err.code === 'AVV_ERR_READY_TIMEOUT') {
+        err = appendStackTrace(err, new FST_ERR_HOOK_TIMEOUT(hookName))
+      } else {
+        err = AVVIO_ERRORS_MAP[err.code] != null
+          ? appendStackTrace(err, new AVVIO_ERRORS_MAP[err.code](err.message))
+          : err
+      }
+
       cb(err)
       return
     }
@@ -178,9 +188,8 @@ function hookRunner (functions, runner, request, reply, cb) {
   function handleReject (err) {
     if (!err) {
       err = new FST_ERR_SEND_UNDEFINED_ERR()
-    } else if (!(err instanceof Error)) {
-      reply[kReplyIsError] = true
     }
+
     cb(err, request, reply)
   }
 
@@ -201,11 +210,7 @@ function onSendHookRunner (functions, request, reply, payload, cb) {
     }
 
     if (i === functions.length) {
-      try {
-        cb(null, request, reply, payload)
-      } catch (err) {
-        handleReject(err)
-      }
+      cb(null, request, reply, payload)
       return
     }
 

package/lib/pluginOverride.js

@@ -39,10 +39,7 @@ module.exports = function override (old, fn, opts) {
   instance[kChildren] = []
 
   instance[kReply] = Reply.buildReply(instance[kReply])
-  instance[kReply].prototype.server = instance
-
   instance[kRequest] = Request.buildRequest(instance[kRequest])
-  instance[kRequest].prototype.server = instance
 
   instance[kContentTypeParser] = ContentTypeParser.helpers.buildContentTypeParser(instance[kContentTypeParser])
   instance[kHooks] = buildHooks(instance[kHooks])

package/lib/pluginUtils.js

@@ -102,9 +102,10 @@ function checkVersion (fn) {
   if (!meta) return
 
   const requiredVersion = meta.fastify
-  if (!requiredVersion) return
 
-  if (!semver.satisfies(this.version, requiredVersion)) throw new FST_ERR_PLUGIN_VERSION_MISMATCH(meta.name, requiredVersion, this.version)
+  if (requiredVersion && !semver.satisfies(this.version, requiredVersion)) {
+    throw new FST_ERR_PLUGIN_VERSION_MISMATCH(meta.name, requiredVersion, this.version)
+  }
 }
 
 function registerPluginName (fn) {