h3 0.5.2 → 0.5.5

package/dist/index.cjs

@@ -11,114 +11,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 const destr__default = /*#__PURE__*/_interopDefaultLegacy(destr);
 
-const defineHandler = (handler) => handler;
-const defineHandle = defineHandler;
-const defineMiddleware = (middleware) => middleware;
-function promisifyHandler(handler) {
-  return function(req, res) {
-    return callHandler(handler, req, res);
-  };
-}
-const promisifyHandle = promisifyHandler;
-function callHandler(handler, req, res) {
-  return new Promise((resolve, reject) => {
-    const next = (err) => err ? reject(err) : resolve(void 0);
-    try {
-      return resolve(handler(req, res, next));
-    } catch (err) {
-      next(err);
-    }
-  });
-}
-function defineLazyHandler(handler, promisify) {
-  let _promise;
-  const resolve = () => {
-    if (!_promise) {
-      _promise = Promise.resolve(handler()).then((r) => promisify ? promisifyHandler(r.default || r) : r.default || r);
-    }
-    return _promise;
-  };
-  return function(req, res) {
-    return resolve().then((h) => h(req, res));
-  };
-}
-const lazyHandle = defineLazyHandler;
-function useBase(base, handler) {
-  base = ufo.withoutTrailingSlash(base);
-  if (!base) {
-    return handler;
-  }
-  return function(req, res) {
-    req.originalUrl = req.originalUrl || req.url || "/";
-    req.url = ufo.withoutBase(req.url || "/", base);
-    return handler(req, res);
-  };
-}
-
-function defineEventHandler(handler) {
-  handler.__is_handler__ = true;
-  return handler;
-}
-function defineLazyEventHandler(factory) {
-  let _promise;
-  let _resolved;
-  const resolveHandler = () => {
-    if (_resolved) {
-      return Promise.resolve(_resolved);
-    }
-    if (!_promise) {
-      _promise = Promise.resolve(factory()).then((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;
-      });
-    }
-    return _promise;
-  };
-  return defineEventHandler((event) => {
-    if (_resolved) {
-      return _resolved(event);
-    }
-    return resolveHandler().then((handler) => handler(event));
-  });
-}
-function isEventHandler(input) {
-  return "__is_handler__" in input;
-}
-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);
-  });
-}
-function createEvent(req, res) {
-  const event = {
-    __is_event__: true,
-    req,
-    res
-  };
-  event.event = event;
-  req.event = event;
-  req.req = req;
-  req.res = res;
-  res.event = event;
-  res.res = res;
-  res.req.res = res;
-  res.req.req = req;
-  return event;
-}
-function isEvent(input) {
-  return "__is_event__" in input;
-}
-
 function useQuery(event) {
   return ufo.getQuery(event.req.url || "");
 }
@@ -177,6 +69,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;
@@ -297,6 +193,142 @@ function isError(input) {
   return input instanceof H3Error;
 }
 
+const defineHandler = (handler) => handler;
+const defineHandle = defineHandler;
+const defineMiddleware = (middleware) => middleware;
+function promisifyHandler(handler) {
+  return function(req, res) {
+    return callHandler(handler, req, res);
+  };
+}
+const promisifyHandle = promisifyHandler;
+function callHandler(handler, req, res) {
+  const isMiddleware = handler.length > 2;
+  return new Promise((resolve, reject) => {
+    const next = (err) => {
+      if (isMiddleware) {
+        res.off("close", next);
+        res.off("error", next);
+      }
+      return err ? reject(createError(err)) : resolve(void 0);
+    };
+    try {
+      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);
+    }
+  });
+}
+function defineLazyHandler(handler, promisify) {
+  let _promise;
+  const resolve = () => {
+    if (!_promise) {
+      _promise = Promise.resolve(handler()).then((r) => promisify ? promisifyHandler(r.default || r) : r.default || r);
+    }
+    return _promise;
+  };
+  return function(req, res) {
+    return resolve().then((h) => h(req, res));
+  };
+}
+const lazyHandle = defineLazyHandler;
+function useBase(base, handler) {
+  base = ufo.withoutTrailingSlash(base);
+  if (!base) {
+    return handler;
+  }
+  return function(req, res) {
+    req.originalUrl = req.originalUrl || req.url || "/";
+    req.url = ufo.withoutBase(req.url || "/", base);
+    return handler(req, res);
+  };
+}
+
+function eventHandler(handler) {
+  handler.__is_handler__ = true;
+  return handler;
+}
+const defineEventHandler = eventHandler;
+function lazyEventHandler(factory) {
+  let _promise;
+  let _resolved;
+  const resolveHandler = () => {
+    if (_resolved) {
+      return Promise.resolve(_resolved);
+    }
+    if (!_promise) {
+      _promise = Promise.resolve(factory()).then((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;
+      });
+    }
+    return _promise;
+  };
+  return eventHandler((event) => {
+    if (_resolved) {
+      return _resolved(event);
+    }
+    return resolveHandler().then((handler) => handler(event));
+  });
+}
+const defineLazyEventHandler = lazyEventHandler;
+function dynamicEventHandler(initial) {
+  let current = initial;
+  const wrapper = eventHandler((event) => {
+    if (current) {
+      return current(event);
+    }
+  });
+  wrapper.set = (handler) => {
+    current = handler;
+  };
+  return wrapper;
+}
+function isEventHandler(input) {
+  return "__is_handler__" in input;
+}
+function toEventHandler(handler) {
+  if (isEventHandler(handler)) {
+    return handler;
+  }
+  if (typeof handler !== "function") {
+    throw new TypeError("Invalid handler. It should be a function:", handler);
+  }
+  return eventHandler((event) => {
+    return callHandler(handler, event.req, event.res);
+  });
+}
+function createEvent(req, res) {
+  const event = {
+    __is_event__: true,
+    req,
+    res
+  };
+  event.event = event;
+  req.event = event;
+  req.req = req;
+  req.res = res;
+  res.event = event;
+  res.res = res;
+  res.req = res.req || {};
+  res.req.res = res;
+  res.req.req = req;
+  return event;
+}
+function isEvent(input) {
+  return "__is_event__" in input;
+}
+
 function createApp(options = {}) {
   const stack = [];
   const handler = createAppEventHandler(stack, options);
@@ -338,7 +370,7 @@ function use(app, arg1, arg2, arg3) {
 }
 function createAppEventHandler(stack, options) {
   const spacing = options.debug ? 2 : void 0;
-  return defineEventHandler(async (event) => {
+  return eventHandler(async (event) => {
     event.req.originalUrl = event.req.originalUrl || event.req.url || "/";
     const reqUrl = event.req.url || "/";
     for (const layer of stack) {
@@ -383,7 +415,7 @@ function normalizeLayer(input) {
     handler = handler.handler;
   }
   if (input.lazy) {
-    handler = defineLazyEventHandler(handler);
+    handler = lazyEventHandler(handler);
   } else if (!isEventHandler(handler)) {
     handler = toEventHandler(handler);
   }
@@ -412,7 +444,7 @@ function createRouter() {
   for (const method of RouterMethods) {
     router[method] = (path, handle) => router.add(path, handle, method);
   }
-  router.handler = defineEventHandler((event) => {
+  router.handler = eventHandler((event) => {
     let path = event.req.url || "/";
     const queryUrlIndex = path.lastIndexOf("?");
     if (queryUrlIndex > -1) {
@@ -460,11 +492,14 @@ exports.defineLazyEventHandler = defineLazyEventHandler;
 exports.defineLazyHandler = defineLazyHandler;
 exports.defineMiddleware = defineMiddleware;
 exports.deleteCookie = deleteCookie;
+exports.dynamicEventHandler = dynamicEventHandler;
+exports.eventHandler = eventHandler;
 exports.isError = isError;
 exports.isEvent = isEvent;
 exports.isEventHandler = isEventHandler;
 exports.isMethod = isMethod;
 exports.isStream = isStream;
+exports.lazyEventHandler = lazyEventHandler;
 exports.lazyHandle = lazyHandle;
 exports.promisifyHandle = promisifyHandle;
 exports.promisifyHandler = promisifyHandler;

package/dist/index.d.ts

@@ -20,9 +20,17 @@ interface EventHandler {
     '__is_handler__'?: true;
     (event: CompatibilityEvent): H3Response | Promise<H3Response>;
 }
-declare function defineEventHandler(handler: EventHandler): EventHandler;
+declare function eventHandler(handler: EventHandler): EventHandler;
+/** @deprecated Use eventHandler() */
+declare const defineEventHandler: typeof eventHandler;
 declare type LazyEventHandler = () => EventHandler | Promise<EventHandler>;
-declare function defineLazyEventHandler(factory: LazyEventHandler): EventHandler;
+declare function lazyEventHandler(factory: LazyEventHandler): EventHandler;
+/** @deprecated use lazyEventHandler() */
+declare const defineLazyEventHandler: typeof lazyEventHandler;
+interface DynamicEventHandler extends EventHandler {
+    set: (handler: EventHandler) => void;
+}
+declare function dynamicEventHandler(initial?: EventHandler): DynamicEventHandler;
 declare function isEventHandler(input: any): input is EventHandler;
 declare type CompatibilityEventHandler = EventHandler | Handler | Middleware;
 declare function toEventHandler(handler: CompatibilityEventHandler): EventHandler;
@@ -225,4 +233,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, isError, 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, DynamicEventHandler, 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, dynamicEventHandler, eventHandler, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, lazyHandle, promisifyHandle, promisifyHandler, send, sendError, sendRedirect, sendStream, setCookie, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };

package/dist/index.mjs

@@ -1,116 +1,8 @@
-import { withoutTrailingSlash, withoutBase, getQuery } from 'ufo';
+import { getQuery, withoutTrailingSlash, withoutBase } from 'ufo';
 import { createRouter as createRouter$1 } from 'radix3';
 import destr from 'destr';
 import { parse, serialize } from 'cookie-es';
 
-const defineHandler = (handler) => handler;
-const defineHandle = defineHandler;
-const defineMiddleware = (middleware) => middleware;
-function promisifyHandler(handler) {
-  return function(req, res) {
-    return callHandler(handler, req, res);
-  };
-}
-const promisifyHandle = promisifyHandler;
-function callHandler(handler, req, res) {
-  return new Promise((resolve, reject) => {
-    const next = (err) => err ? reject(err) : resolve(void 0);
-    try {
-      return resolve(handler(req, res, next));
-    } catch (err) {
-      next(err);
-    }
-  });
-}
-function defineLazyHandler(handler, promisify) {
-  let _promise;
-  const resolve = () => {
-    if (!_promise) {
-      _promise = Promise.resolve(handler()).then((r) => promisify ? promisifyHandler(r.default || r) : r.default || r);
-    }
-    return _promise;
-  };
-  return function(req, res) {
-    return resolve().then((h) => h(req, res));
-  };
-}
-const lazyHandle = defineLazyHandler;
-function useBase(base, handler) {
-  base = withoutTrailingSlash(base);
-  if (!base) {
-    return handler;
-  }
-  return function(req, res) {
-    req.originalUrl = req.originalUrl || req.url || "/";
-    req.url = withoutBase(req.url || "/", base);
-    return handler(req, res);
-  };
-}
-
-function defineEventHandler(handler) {
-  handler.__is_handler__ = true;
-  return handler;
-}
-function defineLazyEventHandler(factory) {
-  let _promise;
-  let _resolved;
-  const resolveHandler = () => {
-    if (_resolved) {
-      return Promise.resolve(_resolved);
-    }
-    if (!_promise) {
-      _promise = Promise.resolve(factory()).then((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;
-      });
-    }
-    return _promise;
-  };
-  return defineEventHandler((event) => {
-    if (_resolved) {
-      return _resolved(event);
-    }
-    return resolveHandler().then((handler) => handler(event));
-  });
-}
-function isEventHandler(input) {
-  return "__is_handler__" in input;
-}
-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);
-  });
-}
-function createEvent(req, res) {
-  const event = {
-    __is_event__: true,
-    req,
-    res
-  };
-  event.event = event;
-  req.event = event;
-  req.req = req;
-  req.res = res;
-  res.event = event;
-  res.res = res;
-  res.req.res = res;
-  res.req.req = req;
-  return event;
-}
-function isEvent(input) {
-  return "__is_event__" in input;
-}
-
 function useQuery(event) {
   return getQuery(event.req.url || "");
 }
@@ -169,6 +61,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;
@@ -289,6 +185,142 @@ function isError(input) {
   return input instanceof H3Error;
 }
 
+const defineHandler = (handler) => handler;
+const defineHandle = defineHandler;
+const defineMiddleware = (middleware) => middleware;
+function promisifyHandler(handler) {
+  return function(req, res) {
+    return callHandler(handler, req, res);
+  };
+}
+const promisifyHandle = promisifyHandler;
+function callHandler(handler, req, res) {
+  const isMiddleware = handler.length > 2;
+  return new Promise((resolve, reject) => {
+    const next = (err) => {
+      if (isMiddleware) {
+        res.off("close", next);
+        res.off("error", next);
+      }
+      return err ? reject(createError(err)) : resolve(void 0);
+    };
+    try {
+      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);
+    }
+  });
+}
+function defineLazyHandler(handler, promisify) {
+  let _promise;
+  const resolve = () => {
+    if (!_promise) {
+      _promise = Promise.resolve(handler()).then((r) => promisify ? promisifyHandler(r.default || r) : r.default || r);
+    }
+    return _promise;
+  };
+  return function(req, res) {
+    return resolve().then((h) => h(req, res));
+  };
+}
+const lazyHandle = defineLazyHandler;
+function useBase(base, handler) {
+  base = withoutTrailingSlash(base);
+  if (!base) {
+    return handler;
+  }
+  return function(req, res) {
+    req.originalUrl = req.originalUrl || req.url || "/";
+    req.url = withoutBase(req.url || "/", base);
+    return handler(req, res);
+  };
+}
+
+function eventHandler(handler) {
+  handler.__is_handler__ = true;
+  return handler;
+}
+const defineEventHandler = eventHandler;
+function lazyEventHandler(factory) {
+  let _promise;
+  let _resolved;
+  const resolveHandler = () => {
+    if (_resolved) {
+      return Promise.resolve(_resolved);
+    }
+    if (!_promise) {
+      _promise = Promise.resolve(factory()).then((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;
+      });
+    }
+    return _promise;
+  };
+  return eventHandler((event) => {
+    if (_resolved) {
+      return _resolved(event);
+    }
+    return resolveHandler().then((handler) => handler(event));
+  });
+}
+const defineLazyEventHandler = lazyEventHandler;
+function dynamicEventHandler(initial) {
+  let current = initial;
+  const wrapper = eventHandler((event) => {
+    if (current) {
+      return current(event);
+    }
+  });
+  wrapper.set = (handler) => {
+    current = handler;
+  };
+  return wrapper;
+}
+function isEventHandler(input) {
+  return "__is_handler__" in input;
+}
+function toEventHandler(handler) {
+  if (isEventHandler(handler)) {
+    return handler;
+  }
+  if (typeof handler !== "function") {
+    throw new TypeError("Invalid handler. It should be a function:", handler);
+  }
+  return eventHandler((event) => {
+    return callHandler(handler, event.req, event.res);
+  });
+}
+function createEvent(req, res) {
+  const event = {
+    __is_event__: true,
+    req,
+    res
+  };
+  event.event = event;
+  req.event = event;
+  req.req = req;
+  req.res = res;
+  res.event = event;
+  res.res = res;
+  res.req = res.req || {};
+  res.req.res = res;
+  res.req.req = req;
+  return event;
+}
+function isEvent(input) {
+  return "__is_event__" in input;
+}
+
 function createApp(options = {}) {
   const stack = [];
   const handler = createAppEventHandler(stack, options);
@@ -330,7 +362,7 @@ function use(app, arg1, arg2, arg3) {
 }
 function createAppEventHandler(stack, options) {
   const spacing = options.debug ? 2 : void 0;
-  return defineEventHandler(async (event) => {
+  return eventHandler(async (event) => {
     event.req.originalUrl = event.req.originalUrl || event.req.url || "/";
     const reqUrl = event.req.url || "/";
     for (const layer of stack) {
@@ -375,7 +407,7 @@ function normalizeLayer(input) {
     handler = handler.handler;
   }
   if (input.lazy) {
-    handler = defineLazyEventHandler(handler);
+    handler = lazyEventHandler(handler);
   } else if (!isEventHandler(handler)) {
     handler = toEventHandler(handler);
   }
@@ -404,7 +436,7 @@ function createRouter() {
   for (const method of RouterMethods) {
     router[method] = (path, handle) => router.add(path, handle, method);
   }
-  router.handler = defineEventHandler((event) => {
+  router.handler = eventHandler((event) => {
     let path = event.req.url || "/";
     const queryUrlIndex = path.lastIndexOf("?");
     if (queryUrlIndex > -1) {
@@ -434,4 +466,4 @@ function createRouter() {
   return router;
 }
 
-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 };
+export { H3Error, MIMES, appendHeader, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, dynamicEventHandler, eventHandler, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, 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.2",
+  "version": "0.5.5",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",