h3 1.15.1 → 1.15.2

package/dist/index.cjs

@@ -62,7 +62,7 @@ class H3Error extends Error {
     if (this.statusMessage) {
       obj.statusMessage = sanitizeStatusMessage(this.statusMessage);
     }
-    if (this.data !== undefined) {
+    if (this.data !== void 0) {
       obj.data = this.data;
     }
     return obj;
@@ -114,10 +114,10 @@ function createError(input) {
       );
     }
   }
-  if (input.fatal !== undefined) {
+  if (input.fatal !== void 0) {
     err.fatal = input.fatal;
   }
-  if (input.unhandled !== undefined) {
+  if (input.unhandled !== void 0) {
     err.unhandled = input.unhandled;
   }
   return err;
@@ -142,7 +142,7 @@ function sendError(event, error, debug) {
   const _code = Number.parseInt(h3Error.statusCode);
   setResponseStatus(event, _code, h3Error.statusMessage);
   event.node.res.setHeader("content-type", MIMES.json);
-  event.node.res.end(JSON.stringify(responseBody, undefined, 2));
+  event.node.res.end(JSON.stringify(responseBody, void 0, 2));
 }
 function isError(input) {
   return input?.constructor?.__h3_error__ === true;
@@ -410,12 +410,15 @@ function readRawBody(event, encoding = "utf8") {
       if (_resolved instanceof URLSearchParams) {
         return Buffer.from(_resolved.toString());
       }
+      if (_resolved instanceof FormData) {
+        return new Response(_resolved).bytes().then((uint8arr) => Buffer.from(uint8arr));
+      }
       return Buffer.from(_resolved);
     });
     return encoding ? promise2.then((buff) => buff.toString(encoding)) : promise2;
   }
   if (!Number.parseInt(event.node.req.headers["content-length"] || "") && !String(event.node.req.headers["transfer-encoding"] ?? "").split(",").map((e) => e.trim()).filter(Boolean).includes("chunked")) {
-    return Promise.resolve(undefined);
+    return Promise.resolve(void 0);
   }
   const promise = event.node.req[RawBodySymbol] = new Promise(
     (resolve, reject) => {
@@ -510,7 +513,7 @@ function getRequestWebStream(event) {
 }
 function _parseJSON(body = "", strict) {
   if (!body) {
-    return undefined;
+    return void 0;
   }
   try {
     return destr__default(body, { strict });
@@ -541,14 +544,14 @@ function _parseURLEncodedBody(body) {
 function handleCacheHeaders(event, opts) {
   const cacheControls = ["public", ...opts.cacheControls || []];
   let cacheMatched = false;
-  if (opts.maxAge !== undefined) {
+  if (opts.maxAge !== void 0) {
     cacheControls.push(`max-age=${+opts.maxAge}`, `s-maxage=${+opts.maxAge}`);
   }
   if (opts.modifiedTime) {
     const modifiedTime = new Date(opts.modifiedTime);
     const ifModifiedSince = event.node.req.headers["if-modified-since"];
     event.node.res.setHeader("last-modified", modifiedTime.toUTCString());
-    if (ifModifiedSince && new Date(ifModifiedSince) >= opts.modifiedTime) {
+    if (ifModifiedSince && new Date(ifModifiedSince) >= modifiedTime) {
       cacheMatched = true;
     }
   }
@@ -593,14 +596,7 @@ function sanitizeStatusCode(statusCode, defaultStatusCode = 200) {
 }
 
 function getDistinctCookieKey(name, opts) {
-  return [
-    name,
-    opts.domain || "",
-    opts.path || "/",
-    Boolean(opts.secure),
-    Boolean(opts.httpOnly),
-    Boolean(opts.sameSite)
-  ].join(";");
+  return [name, opts.domain || "", opts.path || "/"].join(";");
 }
 
 function parseCookies(event) {
@@ -708,7 +704,7 @@ function serializeIterableValue(value) {
     }
     case "function":
     case "undefined": {
-      return undefined;
+      return void 0;
     }
     case "object": {
       if (value instanceof Uint8Array) {
@@ -981,9 +977,9 @@ function sendIterable(event, iterable, options) {
     new ReadableStream({
       async pull(controller) {
         const { value, done } = await iterator.next();
-        if (value !== undefined) {
+        if (value !== void 0) {
           const chunk = serializer(value);
-          if (chunk !== undefined) {
+          if (chunk !== void 0) {
             controller.enqueue(chunk);
           }
         }
@@ -1161,7 +1157,7 @@ async function proxyRequest(event, target, opts = {}) {
       body = getRequestWebStream(event);
       duplex = "half";
     } else {
-      body = await readRawBody(event, false).catch(() => undefined);
+      body = await readRawBody(event, false).catch(() => void 0);
     }
   }
   const method = opts.fetchOptions?.method || event.method;
@@ -1241,7 +1237,7 @@ async function sendProxy(event, target, opts = {}) {
   if (opts.onResponse) {
     await opts.onResponse(event, response);
   }
-  if (response._data !== undefined) {
+  if (response._data !== void 0) {
     return response._data;
   }
   if (event.handled) {
@@ -1315,8 +1311,9 @@ function mergeHeaders(defaults, ...inputs) {
   }
   const merged = new Headers(defaults);
   for (const input of _inputs) {
-    for (const [key, value] of Object.entries(input)) {
-      if (value !== undefined) {
+    const entries = Array.isArray(input) ? input : typeof input.entries === "function" ? input.entries() : Object.entries(input);
+    for (const [key, value] of entries) {
+      if (value !== void 0) {
         merged.set(key, value);
       }
     }
@@ -1433,7 +1430,7 @@ async function updateSession(event, config, update) {
     const sealed = await sealSession(event, config);
     setCookie(event, sessionName, sealed, {
       ...DEFAULT_COOKIE,
-      expires: config.maxAge ? new Date(session.createdAt + config.maxAge * 1e3) : undefined,
+      expires: config.maxAge ? new Date(session.createdAt + config.maxAge * 1e3) : void 0,
       ...config.cookie
     });
   }
@@ -1519,7 +1516,7 @@ function setEventStreamHeaders(event) {
   setResponseHeaders(event, headers);
 }
 function isHttp2Request(event) {
-  return getHeader(event, ":path") !== undefined && getHeader(event, ":method") !== undefined;
+  return getHeader(event, ":path") !== void 0 && getHeader(event, ":method") !== void 0;
 }
 
 class EventStream {
@@ -1609,7 +1606,7 @@ class EventStream {
     }
     if (this._unsentData?.length) {
       await this._writer.write(this._encoder.encode(this._unsentData));
-      this._unsentData = undefined;
+      this._unsentData = void 0;
     }
   }
   /**
@@ -1719,7 +1716,7 @@ async function serveStatic(event, options) {
   if (meta.encoding && !getResponseHeader(event, "content-encoding")) {
     setResponseHeader(event, "content-encoding", meta.encoding);
   }
-  if (meta.size !== undefined && meta.size > 0 && !getResponseHeader(event, "content-length")) {
+  if (meta.size !== void 0 && meta.size > 0 && !getResponseHeader(event, "content-length")) {
     setResponseHeader(event, "content-length", meta.size);
   }
   if (event.method === "HEAD") {
@@ -1861,7 +1858,7 @@ function defineEventHandler(handler) {
   return _handler;
 }
 function _normalizeArray(input) {
-  return input ? Array.isArray(input) ? input : [input] : undefined;
+  return input ? Array.isArray(input) ? input : [input] : void 0;
 }
 async function _callHandler(event, handler, hooks) {
   if (hooks.onRequest) {
@@ -1991,7 +1988,7 @@ function use(app, arg1, arg2, arg3) {
   return app;
 }
 function createAppEventHandler(stack, options) {
-  const spacing = options.debug ? 2 : undefined;
+  const spacing = options.debug ? 2 : void 0;
   return eventHandler(async (event) => {
     event.node.req.originalUrl = event.node.req.originalUrl || event.node.req.url || "/";
     const _reqPath = event._path || event.node.req.url || "/";
@@ -2014,8 +2011,8 @@ function createAppEventHandler(stack, options) {
       event._path = _layerPath;
       event.node.req.url = _layerPath;
       const val = await layer.handler(event);
-      const _body = val === undefined ? undefined : await val;
-      if (_body !== undefined) {
+      const _body = val === void 0 ? void 0 : await val;
+      if (_body !== void 0) {
         const _response = { body: _body };
         if (options.onBeforeResponse) {
           event._onBeforeResponseCalled = true;
@@ -2031,7 +2028,7 @@ function createAppEventHandler(stack, options) {
       if (event.handled) {
         if (options.onAfterResponse) {
           event._onAfterResponseCalled = true;
-          await options.onAfterResponse(event, undefined);
+          await options.onAfterResponse(event, void 0);
         }
         return;
       }
@@ -2044,7 +2041,7 @@ function createAppEventHandler(stack, options) {
     }
     if (options.onAfterResponse) {
       event._onAfterResponseCalled = true;
-      await options.onAfterResponse(event, undefined);
+      await options.onAfterResponse(event, void 0);
     }
   });
 }
@@ -2059,7 +2056,7 @@ function createResolver(stack) {
         continue;
       }
       _layerPath = path.slice(layer.route.length) || "/";
-      if (layer.match && !layer.match(_layerPath, undefined)) {
+      if (layer.match && !layer.match(_layerPath, void 0)) {
         continue;
       }
       let res = { route: layer.route, handler: layer.handler };
@@ -2086,7 +2083,7 @@ function normalizeLayer(input) {
   if (input.lazy) {
     handler = lazyEventHandler(handler);
   } else if (!isEventHandler(handler)) {
-    handler = toEventHandler(handler, undefined, input.route);
+    handler = toEventHandler(handler, void 0, input.route);
   }
   return {
     route: ufo.withoutTrailingSlash(input.route),
@@ -2125,7 +2122,7 @@ function handleHandlerResponse(event, val, jsonSpace) {
     return send(event, val, MIMES.html);
   }
   if (valType === "object" || valType === "boolean" || valType === "number") {
-    return send(event, JSON.stringify(val, undefined, jsonSpace), MIMES.json);
+    return send(event, JSON.stringify(val, void 0, jsonSpace), MIMES.json);
   }
   if (valType === "bigint") {
     return send(event, val.toString(), MIMES.json);
@@ -2183,7 +2180,7 @@ function createRouter(opts = {}) {
         addRoute(path, handler, m);
       }
     } else {
-      route.handlers[method] = toEventHandler(handler, undefined, path);
+      route.handlers[method] = toEventHandler(handler, void 0, path);
     }
     return router;
   };
@@ -2253,7 +2250,7 @@ function createRouter(opts = {}) {
     const params = match.matched.params || {};
     event.context.params = params;
     return Promise.resolve(match.handler(event)).then((res) => {
-      if (res === undefined && isPreemptive) {
+      if (res === void 0 && isPreemptive) {
         return null;
       }
       return res;
@@ -2345,7 +2342,7 @@ function callNodeListener(handler, req, res) {
         res.off("close", next);
         res.off("error", next);
       }
-      return err ? reject(createError(err)) : resolve(undefined);
+      return err ? reject(createError(err)) : resolve(void 0);
     };
     try {
       const returned = handler(req, res, next);
@@ -2445,7 +2442,7 @@ function _normalizeUnenvHeaders(input) {
       for (const _value of value) {
         headers.push([key, _value]);
       }
-    } else if (value !== undefined) {
+    } else if (value !== void 0) {
       headers.push([key, String(value)]);
     }
   }

package/dist/index.d.cts

@@ -331,7 +331,7 @@ declare class H3Error<DataT = unknown> extends Error {
     constructor(message: string, opts?: {
         cause?: unknown;
     });
-    toJSON(): Pick<H3Error<DataT>, "data" | "statusCode" | "statusMessage" | "message">;
+    toJSON(): Pick<H3Error<DataT>, "message" | "statusCode" | "statusMessage" | "data">;
 }
 /**
  * Creates a new `Error` that can be used to handle both internal and runtime errors.
@@ -1392,4 +1392,5 @@ declare function toPlainHandler(app: App): PlainHandler;
 /** @experimental */
 declare function fromPlainHandler(handler: PlainHandler): EventHandler<EventHandlerRequest, Promise<unknown>>;
 
-export { type AddRouteShortcuts, type App, type AppOptions, type AppUse, type CacheConditions, type CreateRouterOptions, type Duplex, type DynamicEventHandler, type Encoding, type EventHandler, type EventHandlerObject, type EventHandlerRequest, type EventHandlerResolver, type EventHandlerResponse, type EventStream, type EventStreamMessage, type EventStreamOptions, type H3CorsOptions, H3Error, H3Event, type H3EventContext, H3Headers, H3Response, type HTTPHeaderName, type HTTPMethod, type InferEventInput, type InputLayer, type InputStack, type Layer, type LazyEventHandler, MIMES, type Matcher, type MimeType, type MultiPartData, type NodeEventContext, type NodeListener, type NodeMiddleware, type NodePromisifiedHandler, type PlainHandler, type PlainRequest, type PlainResponse, type ProxyOptions, type RequestFingerprintOptions, type RequestHeaders, type RouteNode, type Router, type RouterMethod, type RouterUse, type ServeStaticOptions, type Session, type SessionConfig, type SessionData, type Stack, type StaticAssetMeta, type StatusCode, type TypedHeaders, type ValidateFunction, type ValidateResult, type WebEventContext, type WebHandler, type WebSocketOptions, type _RequestMiddleware, type _ResponseMiddleware, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearResponseHeaders, clearSession, createApp, createAppEventHandler, createError, createEvent, createEventStream, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, defineWebSocketHandler, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, fromPlainHandler, fromWebHandler, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestPath, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedQuery, getValidatedRouterParams, handleCacheHeaders, handleCors, isCorsOriginAllowed, isError, isEvent, isEventHandler, isMethod, isPreflightRequest, isStream, isWebResponse, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readFormData, readMultipartFormData, readRawBody, readValidatedBody, removeResponseHeader, sanitizeStatusCode, sanitizeStatusMessage, sealSession, send, sendError, sendIterable, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, serveStatic, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, unsealSession, updateSession, use, useBase, useSession, writeEarlyHints };
+export { H3Error, H3Event, H3Headers, H3Response, MIMES, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearResponseHeaders, clearSession, createApp, createAppEventHandler, createError, createEvent, createEventStream, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, defineWebSocketHandler, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, fromPlainHandler, fromWebHandler, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestPath, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedQuery, getValidatedRouterParams, handleCacheHeaders, handleCors, isCorsOriginAllowed, isError, isEvent, isEventHandler, isMethod, isPreflightRequest, isStream, isWebResponse, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readFormData, readMultipartFormData, readRawBody, readValidatedBody, removeResponseHeader, sanitizeStatusCode, sanitizeStatusMessage, sealSession, send, sendError, sendIterable, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, serveStatic, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, unsealSession, updateSession, use, useBase, useSession, writeEarlyHints };
+export type { AddRouteShortcuts, App, AppOptions, AppUse, CacheConditions, CreateRouterOptions, Duplex, DynamicEventHandler, Encoding, EventHandler, EventHandlerObject, EventHandlerRequest, EventHandlerResolver, EventHandlerResponse, EventStream, EventStreamMessage, EventStreamOptions, H3CorsOptions, H3EventContext, HTTPHeaderName, HTTPMethod, InferEventInput, InputLayer, InputStack, Layer, LazyEventHandler, Matcher, MimeType, MultiPartData, NodeEventContext, NodeListener, NodeMiddleware, NodePromisifiedHandler, PlainHandler, PlainRequest, PlainResponse, ProxyOptions, RequestFingerprintOptions, RequestHeaders, RouteNode, Router, RouterMethod, RouterUse, ServeStaticOptions, Session, SessionConfig, SessionData, Stack, StaticAssetMeta, StatusCode, TypedHeaders, ValidateFunction, ValidateResult, WebEventContext, WebHandler, WebSocketOptions, _RequestMiddleware, _ResponseMiddleware };

package/dist/index.d.mts

@@ -331,7 +331,7 @@ declare class H3Error<DataT = unknown> extends Error {
     constructor(message: string, opts?: {
         cause?: unknown;
     });
-    toJSON(): Pick<H3Error<DataT>, "data" | "statusCode" | "statusMessage" | "message">;
+    toJSON(): Pick<H3Error<DataT>, "message" | "statusCode" | "statusMessage" | "data">;
 }
 /**
  * Creates a new `Error` that can be used to handle both internal and runtime errors.
@@ -1392,4 +1392,5 @@ declare function toPlainHandler(app: App): PlainHandler;
 /** @experimental */
 declare function fromPlainHandler(handler: PlainHandler): EventHandler<EventHandlerRequest, Promise<unknown>>;
 
-export { type AddRouteShortcuts, type App, type AppOptions, type AppUse, type CacheConditions, type CreateRouterOptions, type Duplex, type DynamicEventHandler, type Encoding, type EventHandler, type EventHandlerObject, type EventHandlerRequest, type EventHandlerResolver, type EventHandlerResponse, type EventStream, type EventStreamMessage, type EventStreamOptions, type H3CorsOptions, H3Error, H3Event, type H3EventContext, H3Headers, H3Response, type HTTPHeaderName, type HTTPMethod, type InferEventInput, type InputLayer, type InputStack, type Layer, type LazyEventHandler, MIMES, type Matcher, type MimeType, type MultiPartData, type NodeEventContext, type NodeListener, type NodeMiddleware, type NodePromisifiedHandler, type PlainHandler, type PlainRequest, type PlainResponse, type ProxyOptions, type RequestFingerprintOptions, type RequestHeaders, type RouteNode, type Router, type RouterMethod, type RouterUse, type ServeStaticOptions, type Session, type SessionConfig, type SessionData, type Stack, type StaticAssetMeta, type StatusCode, type TypedHeaders, type ValidateFunction, type ValidateResult, type WebEventContext, type WebHandler, type WebSocketOptions, type _RequestMiddleware, type _ResponseMiddleware, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearResponseHeaders, clearSession, createApp, createAppEventHandler, createError, createEvent, createEventStream, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, defineWebSocketHandler, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, fromPlainHandler, fromWebHandler, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestPath, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedQuery, getValidatedRouterParams, handleCacheHeaders, handleCors, isCorsOriginAllowed, isError, isEvent, isEventHandler, isMethod, isPreflightRequest, isStream, isWebResponse, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readFormData, readMultipartFormData, readRawBody, readValidatedBody, removeResponseHeader, sanitizeStatusCode, sanitizeStatusMessage, sealSession, send, sendError, sendIterable, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, serveStatic, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, unsealSession, updateSession, use, useBase, useSession, writeEarlyHints };
+export { H3Error, H3Event, H3Headers, H3Response, MIMES, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearResponseHeaders, clearSession, createApp, createAppEventHandler, createError, createEvent, createEventStream, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, defineWebSocketHandler, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, fromPlainHandler, fromWebHandler, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestPath, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedQuery, getValidatedRouterParams, handleCacheHeaders, handleCors, isCorsOriginAllowed, isError, isEvent, isEventHandler, isMethod, isPreflightRequest, isStream, isWebResponse, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readFormData, readMultipartFormData, readRawBody, readValidatedBody, removeResponseHeader, sanitizeStatusCode, sanitizeStatusMessage, sealSession, send, sendError, sendIterable, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, serveStatic, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, unsealSession, updateSession, use, useBase, useSession, writeEarlyHints };
+export type { AddRouteShortcuts, App, AppOptions, AppUse, CacheConditions, CreateRouterOptions, Duplex, DynamicEventHandler, Encoding, EventHandler, EventHandlerObject, EventHandlerRequest, EventHandlerResolver, EventHandlerResponse, EventStream, EventStreamMessage, EventStreamOptions, H3CorsOptions, H3EventContext, HTTPHeaderName, HTTPMethod, InferEventInput, InputLayer, InputStack, Layer, LazyEventHandler, Matcher, MimeType, MultiPartData, NodeEventContext, NodeListener, NodeMiddleware, NodePromisifiedHandler, PlainHandler, PlainRequest, PlainResponse, ProxyOptions, RequestFingerprintOptions, RequestHeaders, RouteNode, Router, RouterMethod, RouterUse, ServeStaticOptions, Session, SessionConfig, SessionData, Stack, StaticAssetMeta, StatusCode, TypedHeaders, ValidateFunction, ValidateResult, WebEventContext, WebHandler, WebSocketOptions, _RequestMiddleware, _ResponseMiddleware };

package/dist/index.d.ts

@@ -331,7 +331,7 @@ declare class H3Error<DataT = unknown> extends Error {
     constructor(message: string, opts?: {
         cause?: unknown;
     });
-    toJSON(): Pick<H3Error<DataT>, "data" | "statusCode" | "statusMessage" | "message">;
+    toJSON(): Pick<H3Error<DataT>, "message" | "statusCode" | "statusMessage" | "data">;
 }
 /**
  * Creates a new `Error` that can be used to handle both internal and runtime errors.
@@ -1392,4 +1392,5 @@ declare function toPlainHandler(app: App): PlainHandler;
 /** @experimental */
 declare function fromPlainHandler(handler: PlainHandler): EventHandler<EventHandlerRequest, Promise<unknown>>;
 
-export { type AddRouteShortcuts, type App, type AppOptions, type AppUse, type CacheConditions, type CreateRouterOptions, type Duplex, type DynamicEventHandler, type Encoding, type EventHandler, type EventHandlerObject, type EventHandlerRequest, type EventHandlerResolver, type EventHandlerResponse, type EventStream, type EventStreamMessage, type EventStreamOptions, type H3CorsOptions, H3Error, H3Event, type H3EventContext, H3Headers, H3Response, type HTTPHeaderName, type HTTPMethod, type InferEventInput, type InputLayer, type InputStack, type Layer, type LazyEventHandler, MIMES, type Matcher, type MimeType, type MultiPartData, type NodeEventContext, type NodeListener, type NodeMiddleware, type NodePromisifiedHandler, type PlainHandler, type PlainRequest, type PlainResponse, type ProxyOptions, type RequestFingerprintOptions, type RequestHeaders, type RouteNode, type Router, type RouterMethod, type RouterUse, type ServeStaticOptions, type Session, type SessionConfig, type SessionData, type Stack, type StaticAssetMeta, type StatusCode, type TypedHeaders, type ValidateFunction, type ValidateResult, type WebEventContext, type WebHandler, type WebSocketOptions, type _RequestMiddleware, type _ResponseMiddleware, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearResponseHeaders, clearSession, createApp, createAppEventHandler, createError, createEvent, createEventStream, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, defineWebSocketHandler, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, fromPlainHandler, fromWebHandler, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestPath, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedQuery, getValidatedRouterParams, handleCacheHeaders, handleCors, isCorsOriginAllowed, isError, isEvent, isEventHandler, isMethod, isPreflightRequest, isStream, isWebResponse, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readFormData, readMultipartFormData, readRawBody, readValidatedBody, removeResponseHeader, sanitizeStatusCode, sanitizeStatusMessage, sealSession, send, sendError, sendIterable, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, serveStatic, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, unsealSession, updateSession, use, useBase, useSession, writeEarlyHints };
+export { H3Error, H3Event, H3Headers, H3Response, MIMES, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertMethod, callNodeListener, clearResponseHeaders, clearSession, createApp, createAppEventHandler, createError, createEvent, createEventStream, createRouter, defaultContentType, defineEventHandler, defineLazyEventHandler, defineNodeListener, defineNodeMiddleware, defineRequestMiddleware, defineResponseMiddleware, defineWebSocket, defineWebSocketHandler, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, fromNodeMiddleware, fromPlainHandler, fromWebHandler, getCookie, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestPath, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedQuery, getValidatedRouterParams, handleCacheHeaders, handleCors, isCorsOriginAllowed, isError, isEvent, isEventHandler, isMethod, isPreflightRequest, isStream, isWebResponse, lazyEventHandler, parseCookies, promisifyNodeListener, proxyRequest, readBody, readFormData, readMultipartFormData, readRawBody, readValidatedBody, removeResponseHeader, sanitizeStatusCode, sanitizeStatusMessage, sealSession, send, sendError, sendIterable, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, serveStatic, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, splitCookiesString, toEventHandler, toNodeListener, toPlainHandler, toWebHandler, toWebRequest, unsealSession, updateSession, use, useBase, useSession, writeEarlyHints };
+export type { AddRouteShortcuts, App, AppOptions, AppUse, CacheConditions, CreateRouterOptions, Duplex, DynamicEventHandler, Encoding, EventHandler, EventHandlerObject, EventHandlerRequest, EventHandlerResolver, EventHandlerResponse, EventStream, EventStreamMessage, EventStreamOptions, H3CorsOptions, H3EventContext, HTTPHeaderName, HTTPMethod, InferEventInput, InputLayer, InputStack, Layer, LazyEventHandler, Matcher, MimeType, MultiPartData, NodeEventContext, NodeListener, NodeMiddleware, NodePromisifiedHandler, PlainHandler, PlainRequest, PlainResponse, ProxyOptions, RequestFingerprintOptions, RequestHeaders, RouteNode, Router, RouterMethod, RouterUse, ServeStaticOptions, Session, SessionConfig, SessionData, Stack, StaticAssetMeta, StatusCode, TypedHeaders, ValidateFunction, ValidateResult, WebEventContext, WebHandler, WebSocketOptions, _RequestMiddleware, _ResponseMiddleware };

package/dist/index.mjs

@@ -55,7 +55,7 @@ class H3Error extends Error {
     if (this.statusMessage) {
       obj.statusMessage = sanitizeStatusMessage(this.statusMessage);
     }
-    if (this.data !== undefined) {
+    if (this.data !== void 0) {
       obj.data = this.data;
     }
     return obj;
@@ -107,10 +107,10 @@ function createError(input) {
       );
     }
   }
-  if (input.fatal !== undefined) {
+  if (input.fatal !== void 0) {
     err.fatal = input.fatal;
   }
-  if (input.unhandled !== undefined) {
+  if (input.unhandled !== void 0) {
     err.unhandled = input.unhandled;
   }
   return err;
@@ -135,7 +135,7 @@ function sendError(event, error, debug) {
   const _code = Number.parseInt(h3Error.statusCode);
   setResponseStatus(event, _code, h3Error.statusMessage);
   event.node.res.setHeader("content-type", MIMES.json);
-  event.node.res.end(JSON.stringify(responseBody, undefined, 2));
+  event.node.res.end(JSON.stringify(responseBody, void 0, 2));
 }
 function isError(input) {
   return input?.constructor?.__h3_error__ === true;
@@ -403,12 +403,15 @@ function readRawBody(event, encoding = "utf8") {
       if (_resolved instanceof URLSearchParams) {
         return Buffer.from(_resolved.toString());
       }
+      if (_resolved instanceof FormData) {
+        return new Response(_resolved).bytes().then((uint8arr) => Buffer.from(uint8arr));
+      }
       return Buffer.from(_resolved);
     });
     return encoding ? promise2.then((buff) => buff.toString(encoding)) : promise2;
   }
   if (!Number.parseInt(event.node.req.headers["content-length"] || "") && !String(event.node.req.headers["transfer-encoding"] ?? "").split(",").map((e) => e.trim()).filter(Boolean).includes("chunked")) {
-    return Promise.resolve(undefined);
+    return Promise.resolve(void 0);
   }
   const promise = event.node.req[RawBodySymbol] = new Promise(
     (resolve, reject) => {
@@ -503,7 +506,7 @@ function getRequestWebStream(event) {
 }
 function _parseJSON(body = "", strict) {
   if (!body) {
-    return undefined;
+    return void 0;
   }
   try {
     return destr(body, { strict });
@@ -534,14 +537,14 @@ function _parseURLEncodedBody(body) {
 function handleCacheHeaders(event, opts) {
   const cacheControls = ["public", ...opts.cacheControls || []];
   let cacheMatched = false;
-  if (opts.maxAge !== undefined) {
+  if (opts.maxAge !== void 0) {
     cacheControls.push(`max-age=${+opts.maxAge}`, `s-maxage=${+opts.maxAge}`);
   }
   if (opts.modifiedTime) {
     const modifiedTime = new Date(opts.modifiedTime);
     const ifModifiedSince = event.node.req.headers["if-modified-since"];
     event.node.res.setHeader("last-modified", modifiedTime.toUTCString());
-    if (ifModifiedSince && new Date(ifModifiedSince) >= opts.modifiedTime) {
+    if (ifModifiedSince && new Date(ifModifiedSince) >= modifiedTime) {
       cacheMatched = true;
     }
   }
@@ -586,14 +589,7 @@ function sanitizeStatusCode(statusCode, defaultStatusCode = 200) {
 }
 
 function getDistinctCookieKey(name, opts) {
-  return [
-    name,
-    opts.domain || "",
-    opts.path || "/",
-    Boolean(opts.secure),
-    Boolean(opts.httpOnly),
-    Boolean(opts.sameSite)
-  ].join(";");
+  return [name, opts.domain || "", opts.path || "/"].join(";");
 }
 
 function parseCookies(event) {
@@ -701,7 +697,7 @@ function serializeIterableValue(value) {
     }
     case "function":
     case "undefined": {
-      return undefined;
+      return void 0;
     }
     case "object": {
       if (value instanceof Uint8Array) {
@@ -974,9 +970,9 @@ function sendIterable(event, iterable, options) {
     new ReadableStream({
       async pull(controller) {
         const { value, done } = await iterator.next();
-        if (value !== undefined) {
+        if (value !== void 0) {
           const chunk = serializer(value);
-          if (chunk !== undefined) {
+          if (chunk !== void 0) {
             controller.enqueue(chunk);
           }
         }
@@ -1154,7 +1150,7 @@ async function proxyRequest(event, target, opts = {}) {
       body = getRequestWebStream(event);
       duplex = "half";
     } else {
-      body = await readRawBody(event, false).catch(() => undefined);
+      body = await readRawBody(event, false).catch(() => void 0);
     }
   }
   const method = opts.fetchOptions?.method || event.method;
@@ -1234,7 +1230,7 @@ async function sendProxy(event, target, opts = {}) {
   if (opts.onResponse) {
     await opts.onResponse(event, response);
   }
-  if (response._data !== undefined) {
+  if (response._data !== void 0) {
     return response._data;
   }
   if (event.handled) {
@@ -1308,8 +1304,9 @@ function mergeHeaders(defaults, ...inputs) {
   }
   const merged = new Headers(defaults);
   for (const input of _inputs) {
-    for (const [key, value] of Object.entries(input)) {
-      if (value !== undefined) {
+    const entries = Array.isArray(input) ? input : typeof input.entries === "function" ? input.entries() : Object.entries(input);
+    for (const [key, value] of entries) {
+      if (value !== void 0) {
         merged.set(key, value);
       }
     }
@@ -1426,7 +1423,7 @@ async function updateSession(event, config, update) {
     const sealed = await sealSession(event, config);
     setCookie(event, sessionName, sealed, {
       ...DEFAULT_COOKIE,
-      expires: config.maxAge ? new Date(session.createdAt + config.maxAge * 1e3) : undefined,
+      expires: config.maxAge ? new Date(session.createdAt + config.maxAge * 1e3) : void 0,
       ...config.cookie
     });
   }
@@ -1512,7 +1509,7 @@ function setEventStreamHeaders(event) {
   setResponseHeaders(event, headers);
 }
 function isHttp2Request(event) {
-  return getHeader(event, ":path") !== undefined && getHeader(event, ":method") !== undefined;
+  return getHeader(event, ":path") !== void 0 && getHeader(event, ":method") !== void 0;
 }
 
 class EventStream {
@@ -1602,7 +1599,7 @@ class EventStream {
     }
     if (this._unsentData?.length) {
       await this._writer.write(this._encoder.encode(this._unsentData));
-      this._unsentData = undefined;
+      this._unsentData = void 0;
     }
   }
   /**
@@ -1712,7 +1709,7 @@ async function serveStatic(event, options) {
   if (meta.encoding && !getResponseHeader(event, "content-encoding")) {
     setResponseHeader(event, "content-encoding", meta.encoding);
   }
-  if (meta.size !== undefined && meta.size > 0 && !getResponseHeader(event, "content-length")) {
+  if (meta.size !== void 0 && meta.size > 0 && !getResponseHeader(event, "content-length")) {
     setResponseHeader(event, "content-length", meta.size);
   }
   if (event.method === "HEAD") {
@@ -1854,7 +1851,7 @@ function defineEventHandler(handler) {
   return _handler;
 }
 function _normalizeArray(input) {
-  return input ? Array.isArray(input) ? input : [input] : undefined;
+  return input ? Array.isArray(input) ? input : [input] : void 0;
 }
 async function _callHandler(event, handler, hooks) {
   if (hooks.onRequest) {
@@ -1984,7 +1981,7 @@ function use(app, arg1, arg2, arg3) {
   return app;
 }
 function createAppEventHandler(stack, options) {
-  const spacing = options.debug ? 2 : undefined;
+  const spacing = options.debug ? 2 : void 0;
   return eventHandler(async (event) => {
     event.node.req.originalUrl = event.node.req.originalUrl || event.node.req.url || "/";
     const _reqPath = event._path || event.node.req.url || "/";
@@ -2007,8 +2004,8 @@ function createAppEventHandler(stack, options) {
       event._path = _layerPath;
       event.node.req.url = _layerPath;
       const val = await layer.handler(event);
-      const _body = val === undefined ? undefined : await val;
-      if (_body !== undefined) {
+      const _body = val === void 0 ? void 0 : await val;
+      if (_body !== void 0) {
         const _response = { body: _body };
         if (options.onBeforeResponse) {
           event._onBeforeResponseCalled = true;
@@ -2024,7 +2021,7 @@ function createAppEventHandler(stack, options) {
       if (event.handled) {
         if (options.onAfterResponse) {
           event._onAfterResponseCalled = true;
-          await options.onAfterResponse(event, undefined);
+          await options.onAfterResponse(event, void 0);
         }
         return;
       }
@@ -2037,7 +2034,7 @@ function createAppEventHandler(stack, options) {
     }
     if (options.onAfterResponse) {
       event._onAfterResponseCalled = true;
-      await options.onAfterResponse(event, undefined);
+      await options.onAfterResponse(event, void 0);
     }
   });
 }
@@ -2052,7 +2049,7 @@ function createResolver(stack) {
         continue;
       }
       _layerPath = path.slice(layer.route.length) || "/";
-      if (layer.match && !layer.match(_layerPath, undefined)) {
+      if (layer.match && !layer.match(_layerPath, void 0)) {
         continue;
       }
       let res = { route: layer.route, handler: layer.handler };
@@ -2079,7 +2076,7 @@ function normalizeLayer(input) {
   if (input.lazy) {
     handler = lazyEventHandler(handler);
   } else if (!isEventHandler(handler)) {
-    handler = toEventHandler(handler, undefined, input.route);
+    handler = toEventHandler(handler, void 0, input.route);
   }
   return {
     route: withoutTrailingSlash(input.route),
@@ -2118,7 +2115,7 @@ function handleHandlerResponse(event, val, jsonSpace) {
     return send(event, val, MIMES.html);
   }
   if (valType === "object" || valType === "boolean" || valType === "number") {
-    return send(event, JSON.stringify(val, undefined, jsonSpace), MIMES.json);
+    return send(event, JSON.stringify(val, void 0, jsonSpace), MIMES.json);
   }
   if (valType === "bigint") {
     return send(event, val.toString(), MIMES.json);
@@ -2176,7 +2173,7 @@ function createRouter(opts = {}) {
         addRoute(path, handler, m);
       }
     } else {
-      route.handlers[method] = toEventHandler(handler, undefined, path);
+      route.handlers[method] = toEventHandler(handler, void 0, path);
     }
     return router;
   };
@@ -2246,7 +2243,7 @@ function createRouter(opts = {}) {
     const params = match.matched.params || {};
     event.context.params = params;
     return Promise.resolve(match.handler(event)).then((res) => {
-      if (res === undefined && isPreemptive) {
+      if (res === void 0 && isPreemptive) {
         return null;
       }
       return res;
@@ -2338,7 +2335,7 @@ function callNodeListener(handler, req, res) {
         res.off("close", next);
         res.off("error", next);
       }
-      return err ? reject(createError(err)) : resolve(undefined);
+      return err ? reject(createError(err)) : resolve(void 0);
     };
     try {
       const returned = handler(req, res, next);
@@ -2438,7 +2435,7 @@ function _normalizeUnenvHeaders(input) {
       for (const _value of value) {
         headers.push([key, _value]);
       }
-    } else if (value !== undefined) {
+    } else if (value !== void 0) {
       headers.push([key, String(value)]);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "1.15.1",
+  "version": "1.15.2",
   "description": "Minimal H(TTP) framework built for high performance and portability.",
   "repository": "unjs/h3",
   "license": "MIT",
@@ -34,42 +34,42 @@
   },
   "dependencies": {
     "cookie-es": "^1.2.2",
-    "crossws": "^0.3.3",
+    "crossws": "^0.3.4",
     "defu": "^6.1.4",
-    "destr": "^2.0.3",
+    "destr": "^2.0.5",
     "iron-webcrypto": "^1.2.1",
     "node-mock-http": "^1.0.0",
     "radix3": "^1.1.2",
-    "ufo": "^1.5.4",
+    "ufo": "^1.6.1",
     "uncrypto": "^0.1.3"
   },
   "devDependencies": {
     "0x": "^5.8.0",
-    "@types/express": "^5.0.0",
-    "@types/node": "^22.13.1",
-    "@types/supertest": "^6.0.2",
-    "@vitest/coverage-v8": "^3.0.5",
+    "@types/express": "^5.0.1",
+    "@types/node": "^22.15.2",
+    "@types/supertest": "^6.0.3",
+    "@vitest/coverage-v8": "^3.1.2",
     "autocannon": "^8.0.0",
-    "automd": "^0.3.12",
-    "changelogen": "^0.5.7",
+    "automd": "^0.4.0",
+    "changelogen": "^0.6.1",
     "connect": "^3.7.0",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "eslint-config-unjs": "^0.4.2",
-    "express": "^4.21.2",
+    "express": "^5.1.0",
     "get-port": "^7.1.0",
-    "h3": "^1.14.0",
+    "h3": "^1.15.1",
     "jiti": "^2.4.2",
     "listhen": "^1.9.0",
     "node-fetch-native": "^1.6.6",
-    "prettier": "^3.4.2",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "supertest": "^7.0.0",
-    "typescript": "^5.7.3",
-    "unbuild": "^3.3.1",
-    "undici": "^7.3.0",
-    "vitest": "^3.0.5",
-    "zod": "^3.24.1"
+    "prettier": "^3.5.3",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
+    "supertest": "^7.1.0",
+    "typescript": "^5.8.3",
+    "unbuild": "^3.5.0",
+    "undici": "^7.8.0",
+    "vitest": "^3.1.2",
+    "zod": "^3.24.3"
   },
   "packageManager": "pnpm@10.2.0"
 }