Aktueller Stand

backend/node_modules/fastify/lib/error-handler.js

@@ -1,12 +1,12 @@
 'use strict'
 
 const statusCodes = require('node:http').STATUS_CODES
-const wrapThenable = require('./wrapThenable')
+const wrapThenable = require('./wrap-thenable.js')
+const { setErrorStatusCode } = require('./error-status.js')
 const {
   kReplyHeaders,
   kReplyNextErrorHandler,
   kReplyIsRunningOnErrorHook,
-  kReplyHasStatusCode,
   kRouteContext,
   kDisableRequestLogging
 } = require('./symbols.js')
@@ -39,7 +39,7 @@ function handleError (reply, error, cb) {
         if (!reply.log[kDisableRequestLogging]) {
           reply.log.warn(
             { req: reply.request, res: reply, err: error },
-            error && error.message
+            error?.message
           )
         }
         reply.raw.writeHead(reply.raw.statusCode)
@@ -81,22 +81,19 @@ function handleError (reply, error, cb) {
 
 function defaultErrorHandler (error, request, reply) {
   setErrorHeaders(error, reply)
-  if (!reply[kReplyHasStatusCode] || reply.statusCode === 200) {
-    const statusCode = error.statusCode || error.status
-    reply.code(statusCode >= 400 ? statusCode : 500)
-  }
+  setErrorStatusCode(reply, error)
   if (reply.statusCode < 500) {
     if (!reply.log[kDisableRequestLogging]) {
       reply.log.info(
         { res: reply, err: error },
-        error && error.message
+        error?.message
       )
     }
   } else {
     if (!reply.log[kDisableRequestLogging]) {
       reply.log.error(
         { req: request, res: reply, err: error },
-        error && error.message
+        error?.message
       )
     }
   }
@@ -110,18 +107,20 @@ function fallbackErrorHandler (error, reply, cb) {
   let payload
   try {
     const serializerFn = getSchemaSerializer(reply[kRouteContext], statusCode, reply[kReplyHeaders]['content-type'])
-    payload = (serializerFn === false)
-      ? serializeError({
+    if (serializerFn === false) {
+      payload = serializeError({
         error: statusCodes[statusCode + ''],
         code: error.code,
         message: error.message,
         statusCode
       })
-      : serializerFn(Object.create(error, {
+    } else {
+      payload = serializerFn(Object.create(error, {
         error: { value: statusCodes[statusCode + ''] },
         message: { value: error.message },
         statusCode: { value: statusCode }
       }))
+    }
   } catch (err) {
     if (!reply.log[kDisableRequestLogging]) {
       // error is always FST_ERR_SCH_SERIALIZATION_BUILD because this is called from route/compileSchemasForSerialization