h3 0.5.1 → 0.5.2

package/dist/index.cjs

@@ -272,30 +272,30 @@ function createError(input) {
   return err;
 }
 function sendError(event, error, debug) {
-  let h3Error;
-  if (error instanceof H3Error) {
-    h3Error = error;
-  } else {
-    console.error(error);
-    h3Error = createError(error);
-  }
   if (event.res.writableEnded) {
     return;
   }
-  event.res.statusCode = h3Error.statusCode;
-  event.res.statusMessage = h3Error.statusMessage;
+  const h3Error = isError(error) ? error : createError(error);
   const responseBody = {
-    statusCode: event.res.statusCode,
-    statusMessage: event.res.statusMessage,
+    statusCode: h3Error.statusCode,
+    statusMessage: h3Error.statusMessage,
     stack: [],
     data: h3Error.data
   };
   if (debug) {
     responseBody.stack = (h3Error.stack || "").split("\n").map((l) => l.trim());
   }
+  if (event.res.writableEnded) {
+    return;
+  }
+  event.res.statusCode = h3Error.statusCode;
+  event.res.statusMessage = h3Error.statusMessage;
   event.res.setHeader("Content-Type", MIMES.json);
   event.res.end(JSON.stringify(responseBody, null, 2));
 }
+function isError(input) {
+  return input instanceof H3Error;
+}
 
 function createApp(options = {}) {
   const stack = [];
@@ -307,8 +307,12 @@ function createApp(options = {}) {
     } catch (err) {
       if (options.onError) {
         await options.onError(err, event);
+      } else {
+        if (!isError(err)) {
+          console.error("[h3]", err);
+        }
+        await sendError(event, err, !!options.debug);
       }
-      await sendError(event, err, !!options.debug);
     }
   };
   const app = nodeHandler;
@@ -456,6 +460,7 @@ exports.defineLazyEventHandler = defineLazyEventHandler;
 exports.defineLazyHandler = defineLazyHandler;
 exports.defineMiddleware = defineMiddleware;
 exports.deleteCookie = deleteCookie;
+exports.isError = isError;
 exports.isEvent = isEvent;
 exports.isEventHandler = isEventHandler;
 exports.isMethod = isMethod;

package/dist/index.d.ts

@@ -121,6 +121,7 @@ declare function createError(input: Partial<H3Error>): H3Error;
  *  In the debug mode the stack trace of errors will be return in response.
  */
 declare function sendError(event: CompatibilityEvent, error: Error | H3Error, debug?: boolean): void;
+declare function isError(input: any): input is H3Error;
 
 declare const defineHandler: <T>(handler: Handler<T, {}>) => Handler<T, {}>;
 /** @deprecated Use defineHandler */
@@ -224,4 +225,4 @@ interface Router extends AddRouteShortcuts {
 }
 declare function createRouter(): Router;
 
-export { AddRouteShortcuts, App, AppOptions, AppUse, CompatibilityEvent, CompatibilityEventHandler, Encoding, EventHandler, H3Error, H3Event, H3Response, HTTPMethod, Handler, IncomingMessage, InputLayer, InputStack, JSONValue, Layer, LazyEventHandler, LazyHandler, MIMES, Matcher, Middleware, NodeHandler, PromisifiedHandler, Router, RouterMethod, RouterUse, ServerResponse, Stack, _JSONValue, appendHeader, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, isEvent, isEventHandler, isMethod, isStream, lazyHandle, promisifyHandle, promisifyHandler, send, sendError, sendRedirect, sendStream, setCookie, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };
+export { AddRouteShortcuts, App, AppOptions, AppUse, CompatibilityEvent, CompatibilityEventHandler, Encoding, EventHandler, H3Error, H3Event, H3Response, HTTPMethod, Handler, IncomingMessage, InputLayer, InputStack, JSONValue, Layer, LazyEventHandler, LazyHandler, MIMES, Matcher, Middleware, NodeHandler, PromisifiedHandler, Router, RouterMethod, RouterUse, ServerResponse, Stack, _JSONValue, appendHeader, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, isError, isEvent, isEventHandler, isMethod, isStream, lazyHandle, promisifyHandle, promisifyHandler, send, sendError, sendRedirect, sendStream, setCookie, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };

package/dist/index.mjs

@@ -264,30 +264,30 @@ function createError(input) {
   return err;
 }
 function sendError(event, error, debug) {
-  let h3Error;
-  if (error instanceof H3Error) {
-    h3Error = error;
-  } else {
-    console.error(error);
-    h3Error = createError(error);
-  }
   if (event.res.writableEnded) {
     return;
   }
-  event.res.statusCode = h3Error.statusCode;
-  event.res.statusMessage = h3Error.statusMessage;
+  const h3Error = isError(error) ? error : createError(error);
   const responseBody = {
-    statusCode: event.res.statusCode,
-    statusMessage: event.res.statusMessage,
+    statusCode: h3Error.statusCode,
+    statusMessage: h3Error.statusMessage,
     stack: [],
     data: h3Error.data
   };
   if (debug) {
     responseBody.stack = (h3Error.stack || "").split("\n").map((l) => l.trim());
   }
+  if (event.res.writableEnded) {
+    return;
+  }
+  event.res.statusCode = h3Error.statusCode;
+  event.res.statusMessage = h3Error.statusMessage;
   event.res.setHeader("Content-Type", MIMES.json);
   event.res.end(JSON.stringify(responseBody, null, 2));
 }
+function isError(input) {
+  return input instanceof H3Error;
+}
 
 function createApp(options = {}) {
   const stack = [];
@@ -299,8 +299,12 @@ function createApp(options = {}) {
     } catch (err) {
       if (options.onError) {
         await options.onError(err, event);
+      } else {
+        if (!isError(err)) {
+          console.error("[h3]", err);
+        }
+        await sendError(event, err, !!options.debug);
       }
-      await sendError(event, err, !!options.debug);
     }
   };
   const app = nodeHandler;
@@ -430,4 +434,4 @@ function createRouter() {
   return router;
 }
 
-export { H3Error, MIMES, appendHeader, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, isEvent, isEventHandler, isMethod, isStream, lazyHandle, promisifyHandle, promisifyHandler, send, sendError, sendRedirect, sendStream, setCookie, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };
+export { H3Error, MIMES, appendHeader, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, isError, isEvent, isEventHandler, isMethod, isStream, lazyHandle, promisifyHandle, promisifyHandler, send, sendError, sendRedirect, sendStream, setCookie, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",