h3 0.5.0 → 0.5.3

package/dist/index.cjs

@@ -21,10 +21,23 @@ function promisifyHandler(handler) {
 }
 const promisifyHandle = promisifyHandler;
 function callHandler(handler, req, res) {
+  const isMiddleware = handler.length > 2;
   return new Promise((resolve, reject) => {
-    const next = (err) => err ? reject(err) : resolve(void 0);
+    const next = (err) => {
+      if (isMiddleware) {
+        res.off("close", next);
+        res.off("error", next);
+      }
+      return err ? reject(err) : resolve(void 0);
+    };
     try {
-      return resolve(handler(req, res, next));
+      const returned = handler(req, res, next);
+      if (isMiddleware && returned === void 0) {
+        res.once("close", next);
+        res.once("error", next);
+      } else {
+        resolve(returned);
+      }
     } catch (err) {
       next(err);
     }
@@ -68,7 +81,11 @@ function defineLazyEventHandler(factory) {
     }
     if (!_promise) {
       _promise = Promise.resolve(factory()).then((r) => {
-        _resolved = r.default || r;
+        const handler = r.default || r;
+        if (typeof handler !== "function") {
+          throw new TypeError("Invalid lazy handler result. It should be a function:", handler);
+        }
+        _resolved = toEventHandler(r.default || r);
         return _resolved;
       });
     }
@@ -88,6 +105,9 @@ function toEventHandler(handler) {
   if (isEventHandler(handler)) {
     return handler;
   }
+  if (typeof handler !== "function") {
+    throw new TypeError("Invalid handler. It should be a function:", handler);
+  }
   return defineEventHandler((event) => {
     return callHandler(handler, event.req, event.res);
   });
@@ -104,6 +124,7 @@ function createEvent(req, res) {
   req.res = res;
   res.event = event;
   res.res = res;
+  res.req = res.req || {};
   res.req.res = res;
   res.req.req = req;
   return event;
@@ -170,6 +191,10 @@ async function useBody(event) {
     return event.req[ParsedBodySymbol];
   }
   const body = await useRawBody(event);
+  if (event.req.headers["content-type"] === "application/x-www-form-urlencoded") {
+    const parsedForm = Object.fromEntries(new URLSearchParams(body));
+    return parsedForm;
+  }
   const json = destr__default(body);
   event.req[ParsedBodySymbol] = json;
   return json;
@@ -265,30 +290,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 = [];
@@ -300,11 +325,16 @@ 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;
+  app.nodeHandler = nodeHandler;
   app.stack = stack;
   app.handler = handler;
   app.use = (arg1, arg2, arg3) => use(app, arg1, arg2, arg3);
@@ -366,14 +396,13 @@ function createAppEventHandler(stack, options) {
   });
 }
 function normalizeLayer(input) {
-  let handler = input.handler;
+  let handler = input.handler || input.handle;
   if (handler.handler) {
     handler = handler.handler;
   }
-  if (!isEventHandler(handler)) {
-    if (input.lazy) {
-      handler = defineLazyHandler(handler);
-    }
+  if (input.lazy) {
+    handler = defineLazyEventHandler(handler);
+  } else if (!isEventHandler(handler)) {
     handler = toEventHandler(handler);
   }
   return {
@@ -449,6 +478,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

@@ -21,7 +21,8 @@ interface EventHandler {
     (event: CompatibilityEvent): H3Response | Promise<H3Response>;
 }
 declare function defineEventHandler(handler: EventHandler): EventHandler;
-declare function defineLazyEventHandler(factory: () => EventHandler | Promise<EventHandler>): EventHandler;
+declare type LazyEventHandler = () => EventHandler | Promise<EventHandler>;
+declare function defineLazyEventHandler(factory: LazyEventHandler): EventHandler;
 declare function isEventHandler(input: any): input is EventHandler;
 declare type CompatibilityEventHandler = EventHandler | Handler | Middleware;
 declare function toEventHandler(handler: CompatibilityEventHandler): EventHandler;
@@ -58,11 +59,11 @@ declare type Stack = Layer[];
 interface InputLayer {
     route?: string;
     match?: Matcher;
-    handler: Handler | LazyHandler;
+    handler: Handler | LazyHandler | EventHandler | LazyEventHandler;
     lazy?: boolean;
-    /**
-     * @deprecated
-     */
+    /** @deprecated */
+    handle?: Handler;
+    /** @deprecated */
     promisify?: boolean;
 }
 declare type InputStack = InputLayer[];
@@ -72,10 +73,11 @@ interface AppUse {
     (handler: CompatibilityEventHandler | CompatibilityEventHandler[], options?: Partial<InputLayer>): App;
     (options: InputLayer): App;
 }
-declare type NodeHandler = (req: http.IncomingMessage, res: http.ServerResponse) => void | Promise<void>;
+declare type NodeHandler = (req: http.IncomingMessage, res: http.ServerResponse) => Promise<void>;
 interface App extends NodeHandler {
     stack: Stack;
     handler: EventHandler;
+    nodeHandler: NodeHandler;
     use: AppUse;
 }
 interface AppOptions {
@@ -119,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 */
@@ -128,10 +131,10 @@ declare function promisifyHandler(handler: Handler | Middleware): PromisifiedHan
 /** @deprecated Use defineHandler */
 declare const promisifyHandle: typeof promisifyHandler;
 declare function callHandler(handler: Middleware, req: IncomingMessage, res: ServerResponse): Promise<unknown>;
-declare function defineLazyHandler(handler: LazyHandler, promisify?: boolean): PromisifiedHandler;
+declare function defineLazyHandler(handler: LazyHandler, promisify?: boolean): Handler;
 /** @deprecated Use defineLazyHandler */
 declare const lazyHandle: typeof defineLazyHandler;
-declare function useBase(base: string, handler: PromisifiedHandler): PromisifiedHandler;
+declare function useBase(base: string, handler: Handler): Handler;
 
 /**
  * Reads body of the request and returns encoded raw string (default) or `Buffer` if encoding if falsy.
@@ -222,4 +225,4 @@ interface Router extends AddRouteShortcuts {
 }
 declare function createRouter(): Router;
 
-export { AddRouteShortcuts, App, AppOptions, AppUse, CompatibilityEvent, CompatibilityEventHandler, EventHandler, H3Error, H3Event, H3Response, InputLayer, InputStack, JSONValue, Layer, MIMES, Matcher, NodeHandler, Router, RouterMethod, RouterUse, 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

@@ -13,10 +13,23 @@ function promisifyHandler(handler) {
 }
 const promisifyHandle = promisifyHandler;
 function callHandler(handler, req, res) {
+  const isMiddleware = handler.length > 2;
   return new Promise((resolve, reject) => {
-    const next = (err) => err ? reject(err) : resolve(void 0);
+    const next = (err) => {
+      if (isMiddleware) {
+        res.off("close", next);
+        res.off("error", next);
+      }
+      return err ? reject(err) : resolve(void 0);
+    };
     try {
-      return resolve(handler(req, res, next));
+      const returned = handler(req, res, next);
+      if (isMiddleware && returned === void 0) {
+        res.once("close", next);
+        res.once("error", next);
+      } else {
+        resolve(returned);
+      }
     } catch (err) {
       next(err);
     }
@@ -60,7 +73,11 @@ function defineLazyEventHandler(factory) {
     }
     if (!_promise) {
       _promise = Promise.resolve(factory()).then((r) => {
-        _resolved = r.default || r;
+        const handler = r.default || r;
+        if (typeof handler !== "function") {
+          throw new TypeError("Invalid lazy handler result. It should be a function:", handler);
+        }
+        _resolved = toEventHandler(r.default || r);
         return _resolved;
       });
     }
@@ -80,6 +97,9 @@ function toEventHandler(handler) {
   if (isEventHandler(handler)) {
     return handler;
   }
+  if (typeof handler !== "function") {
+    throw new TypeError("Invalid handler. It should be a function:", handler);
+  }
   return defineEventHandler((event) => {
     return callHandler(handler, event.req, event.res);
   });
@@ -96,6 +116,7 @@ function createEvent(req, res) {
   req.res = res;
   res.event = event;
   res.res = res;
+  res.req = res.req || {};
   res.req.res = res;
   res.req.req = req;
   return event;
@@ -162,6 +183,10 @@ async function useBody(event) {
     return event.req[ParsedBodySymbol];
   }
   const body = await useRawBody(event);
+  if (event.req.headers["content-type"] === "application/x-www-form-urlencoded") {
+    const parsedForm = Object.fromEntries(new URLSearchParams(body));
+    return parsedForm;
+  }
   const json = destr(body);
   event.req[ParsedBodySymbol] = json;
   return json;
@@ -257,30 +282,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 = [];
@@ -292,11 +317,16 @@ 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;
+  app.nodeHandler = nodeHandler;
   app.stack = stack;
   app.handler = handler;
   app.use = (arg1, arg2, arg3) => use(app, arg1, arg2, arg3);
@@ -358,14 +388,13 @@ function createAppEventHandler(stack, options) {
   });
 }
 function normalizeLayer(input) {
-  let handler = input.handler;
+  let handler = input.handler || input.handle;
   if (handler.handler) {
     handler = handler.handler;
   }
-  if (!isEventHandler(handler)) {
-    if (input.lazy) {
-      handler = defineLazyHandler(handler);
-    }
+  if (input.lazy) {
+    handler = defineLazyEventHandler(handler);
+  } else if (!isEventHandler(handler)) {
     handler = toEventHandler(handler);
   }
   return {
@@ -423,4 +452,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.0",
+  "version": "0.5.3",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",