h3 1.6.6 → 1.7.0

package/README.md

@@ -111,7 +111,7 @@ app.use('/1', eventHandler(() => '<h1>Hello world!</h1>'))
    .use('/2', eventHandler(() => '<h1>Goodbye!</h1>'))
 
 // We can proxy requests and rewrite cookie's domain and path
-app.use('/api', eventHandler((event) => proxyRequest('https://example.com', {
+app.use('/api', eventHandler((event) => proxyRequest(event, 'https://example.com', {
   // f.e. keep one domain unchanged, rewrite one domain and remove other domains
   cookieDomainRewrite: {
     "example.com": "example.com",

package/dist/index.cjs

@@ -182,7 +182,7 @@ function createError(input) {
   return err;
 }
 function sendError(event, error, debug) {
-  if (event.node.res.writableEnded) {
+  if (event.handled) {
     return;
   }
   const h3Error = isError(error) ? error : createError(error);
@@ -195,7 +195,7 @@ function sendError(event, error, debug) {
   if (debug) {
     responseBody.stack = (h3Error.stack || "").split("\n").map((l) => l.trim());
   }
-  if (event.node.res.writableEnded) {
+  if (event.handled) {
     return;
   }
   const _code = Number.parseInt(h3Error.statusCode);
@@ -291,9 +291,15 @@ function readRawBody(event, encoding = "utf8") {
   assertMethod(event, PayloadMethods$1);
   const _rawBody = event.node.req[RawBodySymbol] || event.node.req.body;
   if (_rawBody) {
-    const promise2 = Promise.resolve(_rawBody).then(
-      (_resolved) => Buffer.isBuffer(_resolved) ? _resolved : Buffer.from(_resolved)
-    );
+    const promise2 = Promise.resolve(_rawBody).then((_resolved) => {
+      if (Buffer.isBuffer(_resolved)) {
+        return _resolved;
+      }
+      if (_resolved.constructor === Object) {
+        return Buffer.from(JSON.stringify(_resolved));
+      }
+      return Buffer.from(_resolved);
+    });
     return encoding ? promise2.then((buff) => buff.toString(encoding)) : promise2;
   }
   if (!Number.parseInt(event.node.req.headers["content-length"] || "")) {
@@ -378,7 +384,9 @@ function handleCacheHeaders(event, opts) {
   event.node.res.setHeader("cache-control", cacheControls.join(", "));
   if (cacheMatched) {
     event.node.res.statusCode = 304;
-    event.node.res.end();
+    if (!event.handled) {
+      event.node.res.end();
+    }
     return true;
   }
   return false;
@@ -527,6 +535,7 @@ async function sendProxy(event, target, opts = {}) {
     event.node.res.statusCode
   );
   event.node.res.statusMessage = sanitizeStatusMessage(response.statusText);
+  const cookies = [];
   for (const [key, value] of response.headers.entries()) {
     if (key === "content-encoding") {
       continue;
@@ -535,7 +544,15 @@ async function sendProxy(event, target, opts = {}) {
       continue;
     }
     if (key === "set-cookie") {
-      const cookies = splitCookiesString(value).map((cookie) => {
+      cookies.push(...splitCookiesString(value));
+      continue;
+    }
+    event.node.res.setHeader(key, value);
+  }
+  if (cookies.length > 0) {
+    event.node.res.setHeader(
+      "set-cookie",
+      cookies.map((cookie) => {
         if (opts.cookieDomainRewrite) {
           cookie = rewriteCookieProperty(
             cookie,
@@ -551,15 +568,18 @@ async function sendProxy(event, target, opts = {}) {
           );
         }
         return cookie;
-      });
-      event.node.res.setHeader("set-cookie", cookies);
-      continue;
-    }
-    event.node.res.setHeader(key, value);
+      })
+    );
+  }
+  if (opts.onResponse) {
+    await opts.onResponse(event, response);
   }
   if (response._data !== void 0) {
     return response._data;
   }
+  if (event.handled) {
+    return;
+  }
   if (opts.sendStream === false) {
     const data = new Uint8Array(await response.arrayBuffer());
     return event.node.res.end(data);
@@ -618,14 +638,16 @@ function rewriteCookieProperty(header, map, property) {
   );
 }
 
-const defer = typeof setImmediate !== "undefined" ? setImmediate : (fn) => fn();
+const defer = typeof setImmediate === "undefined" ? (fn) => fn() : setImmediate;
 function send(event, data, type) {
   if (type) {
     defaultContentType(event, type);
   }
   return new Promise((resolve) => {
     defer(() => {
-      event.node.res.end(data);
+      if (!event.handled) {
+        event.node.res.end(data);
+      }
       resolve();
     });
   });
@@ -635,7 +657,9 @@ function sendNoContent(event, code = 204) {
   if (event.node.res.statusCode === 204) {
     event.node.res.removeHeader("content-length");
   }
-  event.node.res.end();
+  if (!event.handled) {
+    event.node.res.end();
+  }
 }
 function setResponseStatus(event, code, text) {
   if (code) {
@@ -818,7 +842,7 @@ async function getSession(event, config) {
     Object.assign(session, unsealed);
   }
   if (!session.id) {
-    session.id = (config.crypto || crypto__default).randomUUID();
+    session.id = config.generateId?.() ?? (config.crypto || crypto__default).randomUUID();
     session.createdAt = Date.now();
     await updateSession(event, config);
   }
@@ -1089,12 +1113,16 @@ class H3Response {
 class H3Event {
   constructor(req, res) {
     this["__is_event__"] = true;
+    this._handled = false;
     this.context = {};
     this.node = { req, res };
   }
   get path() {
     return getRequestPath(this);
   }
+  get handled() {
+    return this._handled || this.node.res.writableEnded || this.node.res.headersSent;
+  }
   /** @deprecated Please use `event.node.req` instead. **/
   get req() {
     return this.node.req;
@@ -1106,35 +1134,37 @@ class H3Event {
   // Implementation of FetchEvent
   respondWith(r) {
     Promise.resolve(r).then((_response) => {
-      if (this.res.writableEnded) {
+      if (this.handled) {
         return;
       }
       const response = _response instanceof H3Response ? _response : new H3Response(_response);
       for (const [key, value] of response.headers.entries()) {
-        this.res.setHeader(key, value);
+        this.node.res.setHeader(key, value);
       }
       if (response.status) {
-        this.res.statusCode = sanitizeStatusCode(
+        this.node.res.statusCode = sanitizeStatusCode(
           response.status,
-          this.res.statusCode
+          this.node.res.statusCode
         );
       }
       if (response.statusText) {
-        this.res.statusMessage = sanitizeStatusMessage(response.statusText);
+        this.node.res.statusMessage = sanitizeStatusMessage(
+          response.statusText
+        );
       }
       if (response.redirected) {
-        this.res.setHeader("location", response.url);
+        this.node.res.setHeader("location", response.url);
       }
       if (!response._body) {
-        return this.res.end();
+        return this.node.res.end();
       }
       if (typeof response._body === "string" || "buffer" in response._body || "byteLength" in response._body) {
-        return this.res.end(response._body);
+        return this.node.res.end(response._body);
       }
       if (!response.headers.has("content-type")) {
         response.headers.set("content-type", MIMES.json);
       }
-      this.res.end(JSON.stringify(response._body));
+      this.node.res.end(JSON.stringify(response._body));
     });
   }
 }
@@ -1260,7 +1290,7 @@ function createAppEventHandler(stack, options) {
         continue;
       }
       const val = await layer.handler(event);
-      if (event.node.res.writableEnded) {
+      if (event.handled) {
         return;
       }
       const type = typeof val;
@@ -1285,10 +1315,10 @@ function createAppEventHandler(stack, options) {
         }
       }
     }
-    if (!event.node.res.writableEnded) {
+    if (!event.handled) {
       throw createError({
         statusCode: 404,
-        statusMessage: `Cannot find any route matching ${event.node.req.url || "/"}.`
+        statusMessage: `Cannot find any path matching ${event.node.req.url || "/"}.`
       });
     }
   });
@@ -1436,15 +1466,25 @@ function createRouter(opts = {}) {
     const method = (event.node.req.method || "get").toLowerCase();
     const handler = matched.handlers[method] || matched.handlers.all;
     if (!handler) {
-      throw createError({
-        statusCode: 405,
-        name: "Method Not Allowed",
-        statusMessage: `Method ${method} is not allowed on this route.`
-      });
+      if (opts.preemptive || opts.preemtive) {
+        throw createError({
+          statusCode: 405,
+          name: "Method Not Allowed",
+          statusMessage: `Method ${method} is not allowed on this route.`
+        });
+      } else {
+        return;
+      }
     }
     const params = matched.params || {};
     event.context.params = params;
-    return handler(event);
+    return Promise.resolve(handler(event)).then((res) => {
+      if (res === void 0 && (opts.preemptive || opts.preemtive)) {
+        setResponseStatus(event, 204);
+        return "";
+      }
+      return res;
+    });
   });
   return router;
 }

package/dist/index.d.ts

@@ -24,6 +24,8 @@ interface SessionConfig {
     sessionHeader?: false | string;
     seal?: SealOptions;
     crypto?: Crypto;
+    /** Default is Crypto.randomUUID */
+    generateId?: () => string;
 }
 declare function useSession<T extends SessionDataT = SessionDataT>(event: H3Event, config: SessionConfig): Promise<{
     readonly id: string | undefined;
@@ -105,10 +107,12 @@ interface NodeEventContext {
 }
 declare class H3Event implements Pick<FetchEvent, "respondWith"> {
     "__is_event__": boolean;
+    _handled: boolean;
     node: NodeEventContext;
     context: H3EventContext;
     constructor(req: IncomingMessage, res: ServerResponse);
     get path(): string;
+    get handled(): boolean;
     /** @deprecated Please use `event.node.req` instead. **/
     get req(): IncomingMessage;
     /** @deprecated Please use `event.node.res` instead. **/
@@ -313,6 +317,7 @@ interface ProxyOptions {
     sendStream?: boolean;
     cookieDomainRewrite?: string | Record<string, string>;
     cookiePathRewrite?: string | Record<string, string>;
+    onResponse?: (event: H3Event, response: Response) => void;
 }
 declare function proxyRequest(event: H3Event, target: string, opts?: ProxyOptions): Promise<any>;
 declare function sendProxy(event: H3Event, target: string, opts?: ProxyOptions): Promise<any>;
@@ -324,8 +329,8 @@ declare function fetchWithEvent(event: H3Event, req: RequestInfo | URL, init?: R
 }): Promise<Response>;
 
 declare function getQuery(event: H3Event): ufo.QueryObject;
-declare function getRouterParams(event: H3Event): H3Event["context"];
-declare function getRouterParam(event: H3Event, name: string): H3Event["context"][string];
+declare function getRouterParams(event: H3Event): NonNullable<H3Event["context"]["params"]>;
+declare function getRouterParam(event: H3Event, name: string): string | undefined;
 declare function getMethod(event: H3Event, defaultMethod?: HTTPMethod): HTTPMethod;
 declare function isMethod(event: H3Event, expected: HTTPMethod | HTTPMethod[], allowHead?: boolean): boolean;
 declare function assertMethod(event: H3Event, expected: HTTPMethod | HTTPMethod[], allowHead?: boolean): void;

package/dist/index.mjs

@@ -175,7 +175,7 @@ function createError(input) {
   return err;
 }
 function sendError(event, error, debug) {
-  if (event.node.res.writableEnded) {
+  if (event.handled) {
     return;
   }
   const h3Error = isError(error) ? error : createError(error);
@@ -188,7 +188,7 @@ function sendError(event, error, debug) {
   if (debug) {
     responseBody.stack = (h3Error.stack || "").split("\n").map((l) => l.trim());
   }
-  if (event.node.res.writableEnded) {
+  if (event.handled) {
     return;
   }
   const _code = Number.parseInt(h3Error.statusCode);
@@ -284,9 +284,15 @@ function readRawBody(event, encoding = "utf8") {
   assertMethod(event, PayloadMethods$1);
   const _rawBody = event.node.req[RawBodySymbol] || event.node.req.body;
   if (_rawBody) {
-    const promise2 = Promise.resolve(_rawBody).then(
-      (_resolved) => Buffer.isBuffer(_resolved) ? _resolved : Buffer.from(_resolved)
-    );
+    const promise2 = Promise.resolve(_rawBody).then((_resolved) => {
+      if (Buffer.isBuffer(_resolved)) {
+        return _resolved;
+      }
+      if (_resolved.constructor === Object) {
+        return Buffer.from(JSON.stringify(_resolved));
+      }
+      return Buffer.from(_resolved);
+    });
     return encoding ? promise2.then((buff) => buff.toString(encoding)) : promise2;
   }
   if (!Number.parseInt(event.node.req.headers["content-length"] || "")) {
@@ -371,7 +377,9 @@ function handleCacheHeaders(event, opts) {
   event.node.res.setHeader("cache-control", cacheControls.join(", "));
   if (cacheMatched) {
     event.node.res.statusCode = 304;
-    event.node.res.end();
+    if (!event.handled) {
+      event.node.res.end();
+    }
     return true;
   }
   return false;
@@ -520,6 +528,7 @@ async function sendProxy(event, target, opts = {}) {
     event.node.res.statusCode
   );
   event.node.res.statusMessage = sanitizeStatusMessage(response.statusText);
+  const cookies = [];
   for (const [key, value] of response.headers.entries()) {
     if (key === "content-encoding") {
       continue;
@@ -528,7 +537,15 @@ async function sendProxy(event, target, opts = {}) {
       continue;
     }
     if (key === "set-cookie") {
-      const cookies = splitCookiesString(value).map((cookie) => {
+      cookies.push(...splitCookiesString(value));
+      continue;
+    }
+    event.node.res.setHeader(key, value);
+  }
+  if (cookies.length > 0) {
+    event.node.res.setHeader(
+      "set-cookie",
+      cookies.map((cookie) => {
         if (opts.cookieDomainRewrite) {
           cookie = rewriteCookieProperty(
             cookie,
@@ -544,15 +561,18 @@ async function sendProxy(event, target, opts = {}) {
           );
         }
         return cookie;
-      });
-      event.node.res.setHeader("set-cookie", cookies);
-      continue;
-    }
-    event.node.res.setHeader(key, value);
+      })
+    );
+  }
+  if (opts.onResponse) {
+    await opts.onResponse(event, response);
   }
   if (response._data !== void 0) {
     return response._data;
   }
+  if (event.handled) {
+    return;
+  }
   if (opts.sendStream === false) {
     const data = new Uint8Array(await response.arrayBuffer());
     return event.node.res.end(data);
@@ -611,14 +631,16 @@ function rewriteCookieProperty(header, map, property) {
   );
 }
 
-const defer = typeof setImmediate !== "undefined" ? setImmediate : (fn) => fn();
+const defer = typeof setImmediate === "undefined" ? (fn) => fn() : setImmediate;
 function send(event, data, type) {
   if (type) {
     defaultContentType(event, type);
   }
   return new Promise((resolve) => {
     defer(() => {
-      event.node.res.end(data);
+      if (!event.handled) {
+        event.node.res.end(data);
+      }
       resolve();
     });
   });
@@ -628,7 +650,9 @@ function sendNoContent(event, code = 204) {
   if (event.node.res.statusCode === 204) {
     event.node.res.removeHeader("content-length");
   }
-  event.node.res.end();
+  if (!event.handled) {
+    event.node.res.end();
+  }
 }
 function setResponseStatus(event, code, text) {
   if (code) {
@@ -811,7 +835,7 @@ async function getSession(event, config) {
     Object.assign(session, unsealed);
   }
   if (!session.id) {
-    session.id = (config.crypto || crypto).randomUUID();
+    session.id = config.generateId?.() ?? (config.crypto || crypto).randomUUID();
     session.createdAt = Date.now();
     await updateSession(event, config);
   }
@@ -1082,12 +1106,16 @@ class H3Response {
 class H3Event {
   constructor(req, res) {
     this["__is_event__"] = true;
+    this._handled = false;
     this.context = {};
     this.node = { req, res };
   }
   get path() {
     return getRequestPath(this);
   }
+  get handled() {
+    return this._handled || this.node.res.writableEnded || this.node.res.headersSent;
+  }
   /** @deprecated Please use `event.node.req` instead. **/
   get req() {
     return this.node.req;
@@ -1099,35 +1127,37 @@ class H3Event {
   // Implementation of FetchEvent
   respondWith(r) {
     Promise.resolve(r).then((_response) => {
-      if (this.res.writableEnded) {
+      if (this.handled) {
         return;
       }
       const response = _response instanceof H3Response ? _response : new H3Response(_response);
       for (const [key, value] of response.headers.entries()) {
-        this.res.setHeader(key, value);
+        this.node.res.setHeader(key, value);
       }
       if (response.status) {
-        this.res.statusCode = sanitizeStatusCode(
+        this.node.res.statusCode = sanitizeStatusCode(
           response.status,
-          this.res.statusCode
+          this.node.res.statusCode
         );
       }
       if (response.statusText) {
-        this.res.statusMessage = sanitizeStatusMessage(response.statusText);
+        this.node.res.statusMessage = sanitizeStatusMessage(
+          response.statusText
+        );
       }
       if (response.redirected) {
-        this.res.setHeader("location", response.url);
+        this.node.res.setHeader("location", response.url);
       }
       if (!response._body) {
-        return this.res.end();
+        return this.node.res.end();
       }
       if (typeof response._body === "string" || "buffer" in response._body || "byteLength" in response._body) {
-        return this.res.end(response._body);
+        return this.node.res.end(response._body);
       }
       if (!response.headers.has("content-type")) {
         response.headers.set("content-type", MIMES.json);
       }
-      this.res.end(JSON.stringify(response._body));
+      this.node.res.end(JSON.stringify(response._body));
     });
   }
 }
@@ -1253,7 +1283,7 @@ function createAppEventHandler(stack, options) {
         continue;
       }
       const val = await layer.handler(event);
-      if (event.node.res.writableEnded) {
+      if (event.handled) {
         return;
       }
       const type = typeof val;
@@ -1278,10 +1308,10 @@ function createAppEventHandler(stack, options) {
         }
       }
     }
-    if (!event.node.res.writableEnded) {
+    if (!event.handled) {
       throw createError({
         statusCode: 404,
-        statusMessage: `Cannot find any route matching ${event.node.req.url || "/"}.`
+        statusMessage: `Cannot find any path matching ${event.node.req.url || "/"}.`
       });
     }
   });
@@ -1429,15 +1459,25 @@ function createRouter(opts = {}) {
     const method = (event.node.req.method || "get").toLowerCase();
     const handler = matched.handlers[method] || matched.handlers.all;
     if (!handler) {
-      throw createError({
-        statusCode: 405,
-        name: "Method Not Allowed",
-        statusMessage: `Method ${method} is not allowed on this route.`
-      });
+      if (opts.preemptive || opts.preemtive) {
+        throw createError({
+          statusCode: 405,
+          name: "Method Not Allowed",
+          statusMessage: `Method ${method} is not allowed on this route.`
+        });
+      } else {
+        return;
+      }
     }
     const params = matched.params || {};
     event.context.params = params;
-    return handler(event);
+    return Promise.resolve(handler(event)).then((res) => {
+      if (res === void 0 && (opts.preemptive || opts.preemtive)) {
+        setResponseStatus(event, 204);
+        return "";
+      }
+      return res;
+    });
   });
   return router;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "1.6.6",
+  "version": "1.7.0",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",
@@ -32,33 +32,33 @@
   "dependencies": {
     "cookie-es": "^1.0.0",
     "defu": "^6.1.2",
-    "destr": "^1.2.2",
+    "destr": "^2.0.0",
     "iron-webcrypto": "^0.7.0",
     "radix3": "^1.0.1",
     "ufo": "^1.1.2",
-    "uncrypto": "^0.1.2"
+    "uncrypto": "^0.1.3"
   },
   "devDependencies": {
     "0x": "^5.5.0",
     "@types/express": "^4.17.17",
-    "@types/node": "^20.1.4",
+    "@types/node": "^20.3.1",
     "@types/supertest": "^2.0.12",
-    "@vitest/coverage-c8": "^0.31.0",
+    "@vitest/coverage-v8": "^0.32.2",
     "autocannon": "^7.11.0",
     "changelogen": "^0.5.3",
     "connect": "^3.7.0",
-    "eslint": "^8.40.0",
-    "eslint-config-unjs": "^0.1.0",
+    "eslint": "^8.43.0",
+    "eslint-config-unjs": "^0.2.1",
     "express": "^4.18.2",
-    "get-port": "^6.1.2",
+    "get-port": "^7.0.0",
     "jiti": "^1.18.2",
     "listhen": "^1.0.4",
-    "node-fetch-native": "^1.1.1",
+    "node-fetch-native": "^1.2.0",
     "prettier": "^2.8.8",
     "supertest": "^6.3.3",
-    "typescript": "^5.0.4",
+    "typescript": "^5.1.3",
     "unbuild": "^1.2.1",
-    "vitest": "^0.31.0"
+    "vitest": "^0.32.2"
   },
-  "packageManager": "pnpm@8.5.1"
+  "packageManager": "pnpm@8.6.3"
 }