fix: improve internal error handling

Author: pi0

src/app.ts

@@ -57,11 +57,6 @@ export function createApp (options: AppOptions = {}): App {
       if (options.onError) {
         return options.onError(error, req, res)
       }
-      // @ts-ignore
-      if (typeof error.internal === 'undefined') {
-        // @ts-ignore
-        error.internal = true
-      }
       return sendError(res, error, !!options.debug)
     })
   }
@@ -113,14 +108,7 @@ export function createHandle (stack: Stack): PHandle {
       if (layer.match && !layer.match(req.url as string, req)) {
         continue
       }
-      let val
-      try {
-        val = await layer.handle(req, res)
-      } catch (err) {
-        if (!res.writableEnded) {
-          return sendError(res, err, true)
-        }
-      }
+      const val = await layer.handle(req, res)
       if (res.writableEnded) {
         break
       }
@@ -138,7 +126,7 @@ export function createHandle (stack: Stack): PHandle {
       }
     }
     if (!res.writableEnded) {
-      return sendError(res, createError({ statusCode: 404, statusMessage: 'Not Found' }), false)
+      throw createError({ statusCode: 404, statusMessage: 'Not Found' })
     }
   }
 }

src/error.ts

@@ -13,9 +13,8 @@ import { MIMES } from './utils'
  */
 export class H3Error extends Error {
   statusCode: number = 500
-  statusMessage: string = 'Internal Error'
+  statusMessage: string = 'H3Error'
   data?: any
-  internal: boolean = false
 }
 
 /**
@@ -30,20 +29,19 @@ export function createError (input: Partial<H3Error>): H3Error {
   }
 
   const err = new H3Error(input.message)
-  Error.captureStackTrace(err, createError)
 
   if (input.statusCode) {
     err.statusCode = input.statusCode
   }
+
   if (input.statusMessage) {
     err.statusMessage = input.statusMessage
   }
+
   if (input.data) {
     err.data = input.data
   }
-  if (input.internal) {
-    err.internal = input.internal
-  }
+
   return err
 }
 
@@ -58,11 +56,16 @@ export function createError (input: Partial<H3Error>): H3Error {
  *  In the debug mode the stack trace of errors will be return in response.
  */
 export function sendError (res: ServerResponse, error: Error | H3Error, debug?: boolean) {
-  const h3Error = createError(error)
+  let h3Error: H3Error
+  if (error instanceof H3Error) {
+    h3Error = error
+  } else {
+    console.error(error) // eslint-disable-line no-console
+    h3Error = createError(error)
+  }
 
-  // @ts-ignore
-  if (h3Error.internal) {
-    console.error(h3Error) // eslint-disable-line no-console
+  if (res.writableEnded) {
+    return
   }
 
   res.statusCode = h3Error.statusCode

test/error.test.ts

@@ -32,12 +32,7 @@ describe('error', () => {
 
   it('can send internal error', async () => {
     app.use('/', () => {
-      throw createError({
-        statusCode: 500,
-        statusMessage: 'Internal Error',
-        data: 'oops',
-        internal: true
-      })
+      throw new Error('Booo')
     })
     const result = await request.get('/api/test')
 
@@ -47,7 +42,7 @@ describe('error', () => {
 
     expect(JSON.parse(result.text)).toMatchObject({
       statusCode: 500,
-      statusMessage: 'Internal Error'
+      statusMessage: 'H3Error'
     })
   })