h3 0.7.21 → 0.8.1

package/dist/index.mjs

@@ -1,7 +1,19 @@
-import { getQuery as getQuery$1, withoutTrailingSlash, withoutBase } from 'ufo';
+import { withoutTrailingSlash, withoutBase, getQuery as getQuery$1 } from 'ufo';
+import { createRouter as createRouter$1 } from 'radix3';
 import destr from 'destr';
 import { parse, serialize } from 'cookie-es';
-import { createRouter as createRouter$1 } from 'radix3';
+
+function useBase(base, handler) {
+  base = withoutTrailingSlash(base);
+  if (!base) {
+    return handler;
+  }
+  return eventHandler((event) => {
+    event.req.originalUrl = event.req.originalUrl || event.req.url || "/";
+    event.req.url = withoutBase(event.req.url || "/", base);
+    return handler(event);
+  });
+}
 
 class H3Error extends Error {
   constructor() {
@@ -9,7 +21,7 @@ class H3Error extends Error {
     this.statusCode = 500;
     this.fatal = false;
     this.unhandled = false;
-    this.statusMessage = "Internal Server Error";
+    this.statusMessage = void 0;
   }
 }
 H3Error.__h3_error__ = true;
@@ -67,8 +79,13 @@ function sendError(event, error, debug) {
   if (event.res.writableEnded) {
     return;
   }
-  event.res.statusCode = h3Error.statusCode;
-  event.res.statusMessage = h3Error.statusMessage;
+  const _code = parseInt(h3Error.statusCode);
+  if (_code) {
+    event.res.statusCode = _code;
+  }
+  if (h3Error.statusMessage) {
+    event.res.statusMessage = h3Error.statusMessage;
+  }
   event.res.setHeader("Content-Type", MIMES.json);
   event.res.end(JSON.stringify(responseBody, null, 2));
 }
@@ -265,6 +282,22 @@ function sendStream(event, data) {
     data.on("error", (error) => reject(createError(error)));
   });
 }
+function writeEarlyHints(event, links, callback) {
+  if (!event.res.socket && !("writeEarlyHints" in event.res)) {
+    if (callback) {
+      callback();
+    }
+    return;
+  }
+  if ("writeEarlyHints" in event.res) {
+    return event.res.writeEarlyHints(links, callback);
+  }
+  const _links = Array.isArray(links) ? links : [links];
+  event.res.socket.write(`HTTP/1.1 103 Early Hints\r
+Link: ${_links.join("\r\n")}\r
+\r
+`, "utf-8", callback);
+}
 
 function parseCookies(event) {
   return parse(event.req.headers.cookie || "");
@@ -364,16 +397,6 @@ class H3Event {
     this.context = {};
     this.req = req;
     this.res = res;
-    this.event = this;
-    req.event = this;
-    req.context = this.context;
-    req.req = req;
-    req.res = res;
-    res.event = this;
-    res.res = res;
-    res.req = res.req || {};
-    res.req.res = res;
-    res.req.req = req;
   }
   respondWith(r) {
     Promise.resolve(r).then((_response) => {
@@ -413,63 +436,6 @@ function createEvent(req, res) {
   return new H3Event(req, res);
 }
 
-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 defineEventHandler(handler) {
   handler.__is_handler__ = true;
   return handler;
@@ -478,16 +444,17 @@ const eventHandler = defineEventHandler;
 function isEventHandler(input) {
   return "__is_handler__" in input;
 }
-function toEventHandler(handler) {
-  if (isEventHandler(handler)) {
-    return handler;
+function toEventHandler(input, _, _route) {
+  if (!isEventHandler(input)) {
+    console.warn(
+      "[h3] Implicit event handler conversion is deprecated. Use `eventHandler()` or `fromNodeMiddleware()` to define event handlers.",
+      _route && _route !== "/" ? `
+     Route: ${_route}` : "",
+      `
+     Handler: ${input}`
+    );
   }
-  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);
-  });
+  return input;
 }
 function dynamicEventHandler(initial) {
   let current = initial;
@@ -532,30 +499,12 @@ const lazyEventHandler = defineLazyEventHandler;
 function createApp(options = {}) {
   const stack = [];
   const handler = createAppEventHandler(stack, options);
-  const nodeHandler = async function(req, res) {
-    const event = createEvent(req, res);
-    try {
-      await handler(event);
-    } catch (_error) {
-      const error = createError(_error);
-      if (!isError(_error)) {
-        error.unhandled = true;
-      }
-      if (options.onError) {
-        await options.onError(error, event);
-      } else {
-        if (error.unhandled || error.fatal) {
-          console.error("[h3]", error.fatal ? "[fatal]" : "[unhandled]", error);
-        }
-        await sendError(event, error, !!options.debug);
-      }
-    }
+  const app = {
+    use: (arg1, arg2, arg3) => use(app, arg1, arg2, arg3),
+    handler,
+    stack,
+    options
   };
-  const app = nodeHandler;
-  app.nodeHandler = nodeHandler;
-  app.stack = stack;
-  app.handler = handler;
-  app.use = (arg1, arg2, arg3) => use(app, arg1, arg2, arg3);
   return app;
 }
 function use(app, arg1, arg2, arg3) {
@@ -612,19 +561,22 @@ function createAppEventHandler(stack, options) {
       }
     }
     if (!event.res.writableEnded) {
-      throw createError({ statusCode: 404, statusMessage: "Not Found" });
+      throw createError({
+        statusCode: 404,
+        statusMessage: `Cannot find any route matching ${event.req.url || "/"}.`
+      });
     }
   });
 }
 function normalizeLayer(input) {
-  let handler = input.handler || input.handle;
+  let handler = input.handler;
   if (handler.handler) {
     handler = handler.handler;
   }
   if (input.lazy) {
     handler = lazyEventHandler(handler);
   } else if (!isEventHandler(handler)) {
-    handler = toEventHandler(handler);
+    handler = toEventHandler(handler, null, input.route);
   }
   return {
     route: withoutTrailingSlash(input.route),
@@ -633,8 +585,72 @@ function normalizeLayer(input) {
   };
 }
 
+const defineNodeListener = (handler) => handler;
+const defineNodeMiddleware = (middleware) => middleware;
+function fromNodeMiddleware(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 callNodeListener(handler, event.req, event.res);
+  });
+}
+function toNodeListener(app) {
+  const toNodeHandle = async function(req, res) {
+    const event = createEvent(req, res);
+    try {
+      await app.handler(event);
+    } catch (_error) {
+      const error = createError(_error);
+      if (!isError(_error)) {
+        error.unhandled = true;
+      }
+      if (app.options.onError) {
+        await app.options.onError(error, event);
+      } else {
+        if (error.unhandled || error.fatal) {
+          console.error("[h3]", error.fatal ? "[fatal]" : "[unhandled]", error);
+        }
+        await sendError(event, error, !!app.options.debug);
+      }
+    }
+  };
+  return toNodeHandle;
+}
+function promisifyNodeListener(handler) {
+  return function(req, res) {
+    return callNodeListener(handler, req, res);
+  };
+}
+function callNodeListener(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);
+    }
+  });
+}
+
 const RouterMethods = ["connect", "delete", "get", "head", "options", "post", "put", "trace", "patch"];
-function createRouter() {
+function createRouter(opts = {}) {
   const _router = createRouter$1({});
   const routes = {};
   const router = {};
@@ -647,7 +663,7 @@ function createRouter() {
     if (Array.isArray(method)) {
       method.forEach((m) => addRoute(path, handler, m));
     } else {
-      route.handlers[method] = toEventHandler(handler);
+      route.handlers[method] = toEventHandler(handler, null, path);
     }
     return router;
   };
@@ -656,18 +672,18 @@ function createRouter() {
     router[method] = (path, handle) => router.add(path, handle, method);
   }
   router.handler = eventHandler((event) => {
-    let path = event.req.url || "/";
-    const queryUrlIndex = path.lastIndexOf("?");
-    if (queryUrlIndex > -1) {
-      path = path.substring(0, queryUrlIndex);
-    }
+    const path = new URL(event.req.url || "/", "http://localhost").pathname;
     const matched = _router.lookup(path);
     if (!matched) {
-      throw createError({
-        statusCode: 404,
-        name: "Not Found",
-        statusMessage: `Cannot find any route matching ${event.req.url || "/"}.`
-      });
+      if (opts.preemtive) {
+        throw createError({
+          statusCode: 404,
+          name: "Not Found",
+          statusMessage: `Cannot find any route matching ${event.req.url || "/"}.`
+        });
+      } else {
+        return;
+      }
     }
     const method = (event.req.method || "get").toLowerCase();
     const handler = matched.handlers[method] || matched.handlers.all;
@@ -679,11 +695,10 @@ function createRouter() {
       });
     }
     const params = matched.params || {};
-    event.event.context.params = params;
-    event.req.context.params = params;
+    event.context.params = params;
     return handler(event);
   });
   return router;
 }
 
-export { H3Error, H3Event, H3Headers, H3Response, MIMES, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, dynamicEventHandler, eventHandler, getCookie, getHeader, getHeaders, getMethod, getQuery, getRequestHeader, getRequestHeaders, getResponseHeader, getResponseHeaders, getRouterParam, getRouterParams, handleCacheHeaders, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, lazyHandle, parseCookies, promisifyHandle, promisifyHandler, readBody, readRawBody, send, sendError, sendRedirect, sendStream, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };
+export { H3Error, H3Event, H3Headers, H3Response, MIMES, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, deleteCookie, dynamicEventHandler, eventHandler, fromNodeMiddleware, getCookie, getHeader, getHeaders, getMethod, getQuery, getRequestHeader, getRequestHeaders, getResponseHeader, getResponseHeaders, getRouterParam, getRouterParams, handleCacheHeaders, isError, isEvent, isEventHandler, isMethod, isStream, lazyEventHandler, parseCookies, promisifyNodeListener, readBody, readRawBody, send, sendError, sendRedirect, sendStream, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, toEventHandler, toNodeListener, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody, writeEarlyHints };

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "h3",
-  "version": "0.7.21",
+  "version": "0.8.1",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",
   "sideEffects": false,
   "exports": {
+    "./package.json": "./package.json",
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
@@ -21,30 +22,30 @@
   "dependencies": {
     "cookie-es": "^0.5.0",
     "destr": "^1.1.1",
-    "radix3": "^0.1.2",
+    "radix3": "^0.2.1",
     "ufo": "^0.8.5"
   },
   "devDependencies": {
     "0x": "^5.4.1",
     "@nuxtjs/eslint-config-typescript": "^11.0.0",
-    "@types/express": "^4.17.13",
-    "@types/node": "^18.7.14",
+    "@types/express": "^4.17.14",
+    "@types/node": "^18.11.0",
     "@types/supertest": "^2.0.12",
-    "@vitest/coverage-c8": "^0.22.1",
-    "autocannon": "^7.9.0",
-    "changelogen": "^0.3.0",
+    "@vitest/coverage-c8": "^0.24.3",
+    "autocannon": "^7.10.0",
+    "changelogen": "^0.3.2",
     "connect": "^3.7.0",
-    "eslint": "^8.23.0",
-    "express": "^4.18.1",
+    "eslint": "^8.25.0",
+    "express": "^4.18.2",
     "get-port": "^6.1.2",
-    "jiti": "^1.14.0",
-    "listhen": "^0.2.15",
-    "supertest": "^6.2.4",
-    "typescript": "^4.8.2",
-    "unbuild": "^0.8.10",
-    "vitest": "^0.22.1"
+    "jiti": "^1.16.0",
+    "listhen": "^0.3.4",
+    "supertest": "^6.3.0",
+    "typescript": "^4.8.4",
+    "unbuild": "^0.9.2",
+    "vitest": "^0.24.3"
   },
-  "packageManager": "pnpm@7.9.5",
+  "packageManager": "pnpm@7.13.4",
   "scripts": {
     "build": "unbuild",
     "dev": "vitest",