h3 0.4.2 → 0.5.2

package/README.md

@@ -29,8 +29,8 @@
 # Using npm
 npm install h3
 
-# Using pnpm
-pnpm add h3
+# Using yarn
+yarn add h3
 
 # Using pnpm
 pnpm add h3

package/dist/index.cjs

@@ -11,34 +11,30 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 const destr__default = /*#__PURE__*/_interopDefaultLegacy(destr);
 
-const defineHandle = (handler) => handler;
+const defineHandler = (handler) => handler;
+const defineHandle = defineHandler;
 const defineMiddleware = (middleware) => middleware;
-function promisifyHandle(handle) {
+function promisifyHandler(handler) {
   return function(req, res) {
-    return callHandle(handle, req, res);
+    return callHandler(handler, req, res);
   };
 }
-function callHandle(handle, 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 {
-      const returned = handle(req, res, next);
-      if (returned !== void 0) {
-        resolve(returned);
-      } else {
-        res.once("close", next);
-        res.once("error", next);
-      }
+      return resolve(handler(req, res, next));
     } catch (err) {
       next(err);
     }
   });
 }
-function lazyHandle(handle, promisify) {
+function defineLazyHandler(handler, promisify) {
   let _promise;
   const resolve = () => {
     if (!_promise) {
-      _promise = Promise.resolve(handle()).then((r) => promisify ? promisifyHandle(r.default || r) : r.default || r);
+      _promise = Promise.resolve(handler()).then((r) => promisify ? promisifyHandler(r.default || r) : r.default || r);
     }
     return _promise;
   };
@@ -46,26 +42,91 @@ function lazyHandle(handle, promisify) {
     return resolve().then((h) => h(req, res));
   };
 }
-function useBase(base, handle) {
+const lazyHandle = defineLazyHandler;
+function useBase(base, handler) {
   base = ufo.withoutTrailingSlash(base);
   if (!base) {
-    return handle;
+    return handler;
   }
   return function(req, res) {
     req.originalUrl = req.originalUrl || req.url || "/";
     req.url = ufo.withoutBase(req.url || "/", base);
-    return handle(req, res);
+    return handler(req, res);
   };
 }
 
-function useQuery(req) {
-  return ufo.getQuery(req.url || "");
+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 useMethod(req, defaultMethod = "GET") {
-  return (req.method || defaultMethod).toUpperCase();
+function isEventHandler(input) {
+  return "__is_handler__" in input;
 }
-function isMethod(req, expected, allowHead) {
-  const method = useMethod(req);
+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 || "");
+}
+function useMethod(event, defaultMethod = "GET") {
+  return (event.req.method || defaultMethod).toUpperCase();
+}
+function isMethod(event, expected, allowHead) {
+  const method = useMethod(event);
   if (allowHead && method === "HEAD") {
     return true;
   }
@@ -78,8 +139,8 @@ function isMethod(req, expected, allowHead) {
   }
   return false;
 }
-function assertMethod(req, expected, allowHead) {
-  if (!isMethod(req, expected, allowHead)) {
+function assertMethod(event, expected, allowHead) {
+  if (!isMethod(event, expected, allowHead)) {
     throw createError({
       statusCode: 405,
       statusMessage: "HTTP method is not allowed."
@@ -90,18 +151,18 @@ function assertMethod(req, expected, allowHead) {
 const RawBodySymbol = Symbol("h3RawBody");
 const ParsedBodySymbol = Symbol("h3RawBody");
 const PayloadMethods = ["PATCH", "POST", "PUT", "DELETE"];
-function useRawBody(req, encoding = "utf-8") {
-  assertMethod(req, PayloadMethods);
-  if (RawBodySymbol in req) {
-    const promise2 = Promise.resolve(req[RawBodySymbol]);
+function useRawBody(event, encoding = "utf-8") {
+  assertMethod(event, PayloadMethods);
+  if (RawBodySymbol in event.req) {
+    const promise2 = Promise.resolve(event.req[RawBodySymbol]);
     return encoding ? promise2.then((buff) => buff.toString(encoding)) : promise2;
   }
-  if ("body" in req) {
-    return Promise.resolve(req.body);
+  if ("body" in event.req) {
+    return Promise.resolve(event.req.body);
   }
-  const promise = req[RawBodySymbol] = new Promise((resolve, reject) => {
+  const promise = event.req[RawBodySymbol] = new Promise((resolve, reject) => {
     const bodyData = [];
-    req.on("error", (err) => {
+    event.req.on("error", (err) => {
       reject(err);
     }).on("data", (chunk) => {
       bodyData.push(chunk);
@@ -111,13 +172,13 @@ function useRawBody(req, encoding = "utf-8") {
   });
   return encoding ? promise.then((buff) => buff.toString(encoding)) : promise;
 }
-async function useBody(req) {
-  if (ParsedBodySymbol in req) {
-    return req[ParsedBodySymbol];
+async function useBody(event) {
+  if (ParsedBodySymbol in event.req) {
+    return event.req[ParsedBodySymbol];
   }
-  const body = await useRawBody(req);
+  const body = await useRawBody(event);
   const json = destr__default(body);
-  req[ParsedBodySymbol] = json;
+  event.req[ParsedBodySymbol] = json;
   return json;
 }
 
@@ -127,61 +188,61 @@ const MIMES = {
 };
 
 const defer = typeof setImmediate !== "undefined" ? setImmediate : (fn) => fn();
-function send(res, data, type) {
+function send(event, data, type) {
   if (type) {
-    defaultContentType(res, type);
+    defaultContentType(event, type);
   }
   return new Promise((resolve) => {
     defer(() => {
-      res.end(data);
+      event.res.end(data);
       resolve(void 0);
     });
   });
 }
-function defaultContentType(res, type) {
-  if (type && !res.getHeader("Content-Type")) {
-    res.setHeader("Content-Type", type);
+function defaultContentType(event, type) {
+  if (type && !event.res.getHeader("Content-Type")) {
+    event.res.setHeader("Content-Type", type);
   }
 }
-function sendRedirect(res, location, code = 302) {
-  res.statusCode = code;
-  res.setHeader("Location", location);
-  return send(res, "Redirecting to " + location, MIMES.html);
+function sendRedirect(event, location, code = 302) {
+  event.res.statusCode = code;
+  event.res.setHeader("Location", location);
+  return send(event, "Redirecting to " + location, MIMES.html);
 }
-function appendHeader(res, name, value) {
-  let current = res.getHeader(name);
+function appendHeader(event, name, value) {
+  let current = event.res.getHeader(name);
   if (!current) {
-    res.setHeader(name, value);
+    event.res.setHeader(name, value);
     return;
   }
   if (!Array.isArray(current)) {
     current = [current.toString()];
   }
-  res.setHeader(name, current.concat(value));
+  event.res.setHeader(name, current.concat(value));
 }
 function isStream(data) {
-  return typeof data === "object" && typeof data.pipe === "function" && typeof data.on === "function";
+  return data && typeof data === "object" && typeof data.pipe === "function" && typeof data.on === "function";
 }
-function sendStream(res, data) {
+function sendStream(event, data) {
   return new Promise((resolve, reject) => {
-    data.pipe(res);
+    data.pipe(event.res);
     data.on("end", () => resolve(void 0));
     data.on("error", (error) => reject(createError(error)));
   });
 }
 
-function useCookies(req) {
-  return cookieEs.parse(req.headers.cookie || "");
+function useCookies(event) {
+  return cookieEs.parse(event.req.headers.cookie || "");
 }
-function useCookie(req, name) {
-  return useCookies(req)[name];
+function useCookie(event, name) {
+  return useCookies(event)[name];
 }
-function setCookie(res, name, value, serializeOptions) {
+function setCookie(event, name, value, serializeOptions) {
   const cookieStr = cookieEs.serialize(name, value, serializeOptions);
-  appendHeader(res, "Set-Cookie", cookieStr);
+  appendHeader(event, "Set-Cookie", cookieStr);
 }
-function deleteCookie(res, name, serializeOptions) {
-  setCookie(res, name, "", {
+function deleteCookie(event, name, serializeOptions) {
+  setCookie(event, name, "", {
     ...serializeOptions,
     maxAge: 0
   });
@@ -210,45 +271,54 @@ function createError(input) {
   }
   return err;
 }
-function sendError(res, error, debug) {
-  let h3Error;
-  if (error instanceof H3Error) {
-    h3Error = error;
-  } else {
-    console.error(error);
-    h3Error = createError(error);
-  }
-  if (res.writableEnded) {
+function sendError(event, error, debug) {
+  if (event.res.writableEnded) {
     return;
   }
-  res.statusCode = h3Error.statusCode;
-  res.statusMessage = h3Error.statusMessage;
+  const h3Error = isError(error) ? error : createError(error);
   const responseBody = {
-    statusCode: res.statusCode,
-    statusMessage: res.statusMessage,
+    statusCode: h3Error.statusCode,
+    statusMessage: h3Error.statusMessage,
     stack: [],
     data: h3Error.data
   };
   if (debug) {
     responseBody.stack = (h3Error.stack || "").split("\n").map((l) => l.trim());
   }
-  res.setHeader("Content-Type", MIMES.json);
-  res.end(JSON.stringify(responseBody, null, 2));
+  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 = [];
-  const _handle = createHandle(stack, options);
-  const app = function(req, res) {
-    return _handle(req, res).catch((error) => {
+  const handler = createAppEventHandler(stack, options);
+  const nodeHandler = async function(req, res) {
+    const event = createEvent(req, res);
+    try {
+      await handler(event);
+    } catch (err) {
       if (options.onError) {
-        return options.onError(error, req, res);
+        await options.onError(err, event);
+      } else {
+        if (!isError(err)) {
+          console.error("[h3]", err);
+        }
+        await sendError(event, err, !!options.debug);
       }
-      return sendError(res, error, !!options.debug);
-    });
+    }
   };
+  const app = nodeHandler;
+  app.nodeHandler = nodeHandler;
   app.stack = stack;
-  app._handle = _handle;
+  app.handler = handler;
   app.use = (arg1, arg2, arg3) => use(app, arg1, arg2, arg3);
   return app;
 }
@@ -258,63 +328,69 @@ function use(app, arg1, arg2, arg3) {
   } else if (Array.isArray(arg2)) {
     arg2.forEach((i) => use(app, arg1, i, arg3));
   } else if (typeof arg1 === "string") {
-    app.stack.push(normalizeLayer({ ...arg3, route: arg1, handle: arg2 }));
+    app.stack.push(normalizeLayer({ ...arg3, route: arg1, handler: arg2 }));
   } else if (typeof arg1 === "function") {
-    app.stack.push(normalizeLayer({ ...arg2, route: "/", handle: arg1 }));
+    app.stack.push(normalizeLayer({ ...arg2, route: "/", handler: arg1 }));
   } else {
     app.stack.push(normalizeLayer({ ...arg1 }));
   }
   return app;
 }
-function createHandle(stack, options) {
+function createAppEventHandler(stack, options) {
   const spacing = options.debug ? 2 : void 0;
-  return async function handle(req, res) {
-    req.originalUrl = req.originalUrl || req.url || "/";
-    const reqUrl = req.url || "/";
+  return defineEventHandler(async (event) => {
+    event.req.originalUrl = event.req.originalUrl || event.req.url || "/";
+    const reqUrl = event.req.url || "/";
     for (const layer of stack) {
       if (layer.route.length > 1) {
         if (!reqUrl.startsWith(layer.route)) {
           continue;
         }
-        req.url = reqUrl.slice(layer.route.length) || "/";
+        event.req.url = reqUrl.slice(layer.route.length) || "/";
       } else {
-        req.url = reqUrl;
+        event.req.url = reqUrl;
       }
-      if (layer.match && !layer.match(req.url, req)) {
+      if (layer.match && !layer.match(event.req.url, event)) {
         continue;
       }
-      const val = await layer.handle(req, res);
-      if (res.writableEnded) {
+      const val = await layer.handler(event);
+      if (event.res.writableEnded) {
         return;
       }
       const type = typeof val;
       if (type === "string") {
-        return send(res, val, MIMES.html);
+        return send(event, val, MIMES.html);
       } else if (isStream(val)) {
-        return sendStream(res, val);
+        return sendStream(event, val);
       } else if (type === "object" || type === "boolean" || type === "number") {
         if (val && val.buffer) {
-          return send(res, val);
+          return send(event, val);
         } else if (val instanceof Error) {
           throw createError(val);
         } else {
-          return send(res, JSON.stringify(val, null, spacing), MIMES.json);
+          return send(event, JSON.stringify(val, null, spacing), MIMES.json);
         }
       }
     }
-    if (!res.writableEnded) {
+    if (!event.res.writableEnded) {
       throw createError({ statusCode: 404, statusMessage: "Not Found" });
     }
-  };
+  });
 }
-function normalizeLayer(layer) {
-  if (layer.promisify === void 0) {
-    layer.promisify = layer.handle.length > 2;
+function normalizeLayer(input) {
+  let handler = input.handler || input.handle;
+  if (handler.handler) {
+    handler = handler.handler;
+  }
+  if (input.lazy) {
+    handler = defineLazyEventHandler(handler);
+  } else if (!isEventHandler(handler)) {
+    handler = toEventHandler(handler);
   }
   return {
-    route: ufo.withoutTrailingSlash(layer.route),
-    match: layer.match,
-    handle: layer.lazy ? lazyHandle(layer.handle, layer.promisify) : layer.promisify ? promisifyHandle(layer.handle) : layer.handle
+    route: ufo.withoutTrailingSlash(input.route),
+    match: input.match,
+    handler
   };
 }
 
@@ -323,28 +399,34 @@ function createRouter() {
   const _router = radix3.createRouter({});
   const routes = {};
   const router = {};
-  router.add = (path, handle, method = "all") => {
+  const addRoute = (path, handler, method) => {
     let route = routes[path];
     if (!route) {
       routes[path] = route = { handlers: {} };
       _router.insert(path, route);
     }
-    route.handlers[method] = handle;
+    route.handlers[method] = toEventHandler(handler);
     return router;
   };
+  router.use = router.add = (path, handler, method) => addRoute(path, handler, method || "all");
   for (const method of RouterMethods) {
     router[method] = (path, handle) => router.add(path, handle, method);
   }
-  router.handle = (req, res) => {
-    const matched = _router.lookup(req.url || "/");
+  router.handler = defineEventHandler((event) => {
+    let path = event.req.url || "/";
+    const queryUrlIndex = path.lastIndexOf("?");
+    if (queryUrlIndex > -1) {
+      path = path.substring(0, queryUrlIndex);
+    }
+    const matched = _router.lookup(path);
     if (!matched) {
       throw createError({
         statusCode: 404,
         name: "Not Found",
-        statusMessage: `Cannot find any route matching ${req.url || "/"}.`
+        statusMessage: `Cannot find any route matching ${event.req.url || "/"}.`
       });
     }
-    const method = (req.method || "get").toLowerCase();
+    const method = (event.req.method || "get").toLowerCase();
     const handler = matched.handlers[method] || matched.handlers.all;
     if (!handler) {
       throw createError({
@@ -353,9 +435,10 @@ function createRouter() {
         statusMessage: `Method ${method} is not allowed on this route.`
       });
     }
-    req.params = matched.params || {};
-    return handler(req, res);
-  };
+    event.event.params = matched.params || {};
+    event.req.params = event.event.params;
+    return handler(event);
+  });
   return router;
 }
 
@@ -363,24 +446,34 @@ exports.H3Error = H3Error;
 exports.MIMES = MIMES;
 exports.appendHeader = appendHeader;
 exports.assertMethod = assertMethod;
-exports.callHandle = callHandle;
+exports.callHandler = callHandler;
 exports.createApp = createApp;
+exports.createAppEventHandler = createAppEventHandler;
 exports.createError = createError;
-exports.createHandle = createHandle;
+exports.createEvent = createEvent;
 exports.createRouter = createRouter;
 exports.defaultContentType = defaultContentType;
+exports.defineEventHandler = defineEventHandler;
 exports.defineHandle = defineHandle;
+exports.defineHandler = defineHandler;
+exports.defineLazyEventHandler = defineLazyEventHandler;
+exports.defineLazyHandler = defineLazyHandler;
 exports.defineMiddleware = defineMiddleware;
 exports.deleteCookie = deleteCookie;
+exports.isError = isError;
+exports.isEvent = isEvent;
+exports.isEventHandler = isEventHandler;
 exports.isMethod = isMethod;
 exports.isStream = isStream;
 exports.lazyHandle = lazyHandle;
 exports.promisifyHandle = promisifyHandle;
+exports.promisifyHandler = promisifyHandler;
 exports.send = send;
 exports.sendError = sendError;
 exports.sendRedirect = sendRedirect;
 exports.sendStream = sendStream;
 exports.setCookie = setCookie;
+exports.toEventHandler = toEventHandler;
 exports.use = use;
 exports.useBase = useBase;
 exports.useBody = useBody;