fix: improve error handling in ErrorHandler for API responses

Author: 3m1n3nc3

express/src/core/utils/request-handlers.ts

@@ -72,10 +72,10 @@ export const ErrorHandler = (
     writeFileSync(path.join(logsDir, 'error.log'), logContent + newLogEntry, 'utf-8')
   }
 
-  res.statusMessage = error.message
-
   // If the request is an API call, return a JSON response. Otherwise, you might want to render an error page.
   const headers = req instanceof ServerResponse ? req.getHeaders() : req.headers
+  const acceptsHeader = Array.isArray(headers.accept) ? headers.accept.join(',') : headers.accept ?? ''
+  const expectsJson = acceptsHeader.includes('application/json') || req.originalUrl.startsWith('/api/')
 
   if (!(err instanceof ValidationException) || Number(error.code) === 404) {
     delete error.errors
@@ -84,7 +84,7 @@ export const ErrorHandler = (
 
   if (process.env.NODE_ENV === 'development') console.error(error)
 
-  if (headers.accept?.includes('application/json')) {
+  if (expectsJson) {
     return res.status(error.code).json(error)
   } else {
     return res.status(error.code).setHeader('Content-Type', 'text/html').send(buildHtmlErrorResponse({

h3/src/core/utils/request-handlers.ts

@@ -27,8 +27,7 @@ export const ErrorHandler = (err: HTTPError, event: H3Event) => {
     message: typeof err === 'string' ? `${message}: ${err}` : err.message || message,
   }
 
-  event.res.status = error.code
-  event.res.statusText = error.message
+  event.res.status = error.code < 100 || error.code >= 600 ? 500 : error.code
 
   if (typeof err !== 'string' && err.stack) {
     const [stack, ...rest] = err.stack.split('\n')
@@ -75,10 +74,10 @@ export const ErrorHandler = (err: HTTPError, event: H3Event) => {
   if (process.env.NODE_ENV === 'development') console.error(error)
 
   // If the request is an API call, return a JSON response. Otherwise, you might want to render an error page.
-  if (
-    event.req.headers.get('accept')?.includes('application/json') ||
-    event.req._url?.pathname?.startsWith('/api')
-  ) {
+  const acceptsHeader = event.req.headers.get('accept') ?? ''
+  const expectsJson = acceptsHeader.includes('application/json') || event.req._url?.pathname?.startsWith('/api')
+
+  if (expectsJson) {
     return {
       ...error,
       error: true,