hono 3.4.3 → 3.5.0

package/dist/cjs/client/client.js

@@ -48,6 +48,9 @@ class ClientRequestImpl {
       if (args) {
         if (args.query) {
           for (const [k, v] of Object.entries(args.query)) {
+            if (v === void 0) {
+              return;
+            }
             this.queryParams || (this.queryParams = new URLSearchParams());
             if (Array.isArray(v)) {
               for (const v2 of v) {

package/dist/cjs/context.js

@@ -21,7 +21,6 @@ __export(context_exports, {
   Context: () => Context
 });
 module.exports = __toCommonJS(context_exports);
-var import_request = require("./request");
 var import_types = require("./types");
 var import_cookie = require("./utils/cookie");
 class Context {
@@ -32,7 +31,6 @@ class Context {
     this._status = 200;
     this._h = void 0;
     this._pH = void 0;
-    this._path = "/";
     this._init = true;
     this.notFoundHandler = () => new Response();
     this.header = (name, value, options) => {
@@ -169,27 +167,15 @@ class Context {
     this.notFound = () => {
       return this.notFoundHandler(this);
     };
-    this.rawRequest = req;
+    this.req = req;
     if (options) {
       this._exCtx = options.executionCtx;
-      this._path = options.path ?? "/";
-      this._params = options.params;
       this.env = options.env;
       if (options.notFoundHandler) {
         this.notFoundHandler = options.notFoundHandler;
       }
     }
   }
-  get req() {
-    if (this._req) {
-      return this._req;
-    } else {
-      this._req = new import_request.HonoRequest(this.rawRequest, this._path, this._params);
-      this.rawRequest = void 0;
-      this._params = void 0;
-      return this._req;
-    }
-  }
   get event() {
     if (this._exCtx instanceof import_types.FetchEventLike) {
       return this._exCtx;

package/dist/cjs/{adapter.js → helper/adapter/index.js}

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var adapter_exports = {};
 __export(adapter_exports, {
-  env: () => env
+  env: () => env,
+  getRuntimeKey: () => getRuntimeKey
 });
 module.exports = __toCommonJS(adapter_exports);
 const env = (c) => {
@@ -37,7 +38,33 @@ const env = (c) => {
   }
   return {};
 };
+const getRuntimeKey = () => {
+  const global = globalThis;
+  if (global?.Deno !== void 0) {
+    return "deno";
+  }
+  if (global?.Bun !== void 0) {
+    return "bun";
+  }
+  if (typeof global?.WebSocketPair === "function") {
+    return "workerd";
+  }
+  if (typeof global?.EdgeRuntime === "string") {
+    return "edge-light";
+  }
+  if (global?.fastly !== void 0) {
+    return "fastly";
+  }
+  if (global?.__lagon__ !== void 0) {
+    return "lagon";
+  }
+  if (global?.process?.release?.name === "node") {
+    return "node";
+  }
+  return "other";
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  env
+  env,
+  getRuntimeKey
 });

package/dist/cjs/helper.js

@@ -0,0 +1,20 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var helper_exports = {};
+module.exports = __toCommonJS(helper_exports);
+__reExport(helper_exports, require("./helper/cookie"), module.exports);
+__reExport(helper_exports, require("./helper/html"), module.exports);
+__reExport(helper_exports, require("./helper/adapter"), module.exports);

package/dist/cjs/hono-base.js

@@ -24,6 +24,7 @@ module.exports = __toCommonJS(hono_base_exports);
 var import_compose = require("./compose");
 var import_context = require("./context");
 var import_http_exception = require("./http-exception");
+var import_request = require("./request");
 var import_router = require("./router");
 var import_url = require("./utils/url");
 function defineDynamicClass() {
@@ -208,17 +209,15 @@ class Hono extends defineDynamicClass() {
     throw err;
   }
   dispatch(request, executionCtx, env, method) {
-    const path = this.getPath(request);
+    const path = this.getPath(request, { env });
     if (method === "HEAD") {
       return (async () => new Response(null, await this.dispatch(request, executionCtx, env, "GET")))();
     }
     const { handlers, params } = this.matchRoute(method, path);
-    const c = new import_context.Context(request, {
+    const c = new import_context.Context(new import_request.HonoRequest(request, path, params), {
       env,
       executionCtx,
-      notFoundHandler: this.notFoundHandler,
-      path,
-      params
+      notFoundHandler: this.notFoundHandler
     });
     if (handlers.length === 1) {
       let res;

package/dist/cjs/{middleware/jsx → jsx}/index.js

@@ -24,7 +24,7 @@ __export(jsx_exports, {
   memo: () => memo
 });
 module.exports = __toCommonJS(jsx_exports);
-var import_html = require("../../utils/html");
+var import_html = require("../utils/html");
 const emptyTags = [
   "area",
   "base",

package/dist/cjs/middleware/compress/index.js

@@ -21,16 +21,15 @@ __export(compress_exports, {
   compress: () => compress
 });
 module.exports = __toCommonJS(compress_exports);
+const ENCODING_TYPES = ["gzip", "deflate"];
 const compress = (options) => {
   return async (ctx, next) => {
     await next();
     const accepted = ctx.req.headers.get("Accept-Encoding");
-    const pattern = options?.encoding ?? /gzip|deflate/;
-    const match = accepted?.match(pattern);
-    if (!accepted || !match || !ctx.res.body) {
+    const encoding = options?.encoding ?? ENCODING_TYPES.find((encoding2) => accepted?.includes(encoding2));
+    if (!encoding || !ctx.res.body) {
       return;
     }
-    const encoding = match[0];
     const stream = new CompressionStream(encoding);
     ctx.res = new Response(ctx.res.body.pipeThrough(stream), ctx.res);
     ctx.res.headers.set("Content-Encoding", encoding);

package/dist/cjs/middleware/secure-headers/index.js

@@ -0,0 +1,72 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var secure_headers_exports = {};
+__export(secure_headers_exports, {
+  secureHeaders: () => secureHeaders
+});
+module.exports = __toCommonJS(secure_headers_exports);
+const HEADERS_MAP = {
+  crossOriginEmbedderPolicy: ["Cross-Origin-Embedder-Policy", "require-corp"],
+  crossOriginResourcePolicy: ["Cross-Origin-Resource-Policy", "same-origin"],
+  crossOriginOpenerPolicy: ["Cross-Origin-Opener-Policy", "same-origin"],
+  originAgentCluster: ["Origin-Agent-Cluster", "?1"],
+  referrerPolicy: ["Referrer-Policy", "no-referrer"],
+  strictTransportSecurity: ["Strict-Transport-Security", "max-age=15552000; includeSubDomains"],
+  xContentTypeOptions: ["X-Content-Type-Options", "nosniff"],
+  xDnsPrefetchControl: ["X-DNS-Prefetch-Control", "off"],
+  xDownloadOptions: ["X-Download-Options", "noopen"],
+  xFrameOptions: ["X-Frame-Options", "SAMEORIGIN"],
+  xPermittedCrossDomainPolicies: ["X-Permitted-Cross-Domain-Policies", "none"],
+  xXssProtection: ["X-XSS-Protection", "0"]
+};
+const DEFAULT_OPTIONS = {
+  crossOriginEmbedderPolicy: false,
+  crossOriginResourcePolicy: true,
+  crossOriginOpenerPolicy: true,
+  originAgentCluster: true,
+  referrerPolicy: true,
+  strictTransportSecurity: true,
+  xContentTypeOptions: true,
+  xDnsPrefetchControl: true,
+  xDownloadOptions: true,
+  xFrameOptions: true,
+  xPermittedCrossDomainPolicies: true,
+  xXssProtection: true
+};
+const secureHeaders = (customOptions) => {
+  const options = { ...DEFAULT_OPTIONS, ...customOptions };
+  const headersToSet = Object.entries(HEADERS_MAP).filter(([key]) => options[key]).map(([, value]) => value);
+  return async (ctx, next) => {
+    await next();
+    headersToSet.forEach(([header, value]) => {
+      ctx.res.headers.set(header, value);
+    });
+    if (options.contentSecurityPolicy) {
+      const cspDirectives = Object.entries(options.contentSecurityPolicy).map(([directive, sources]) => {
+        return `${directive} ${sources.join(" ")}`;
+      }).join("; ");
+      ctx.res.headers.set("Content-Security-Policy", cspDirectives);
+    }
+    ctx.res.headers.delete("X-Powered-By");
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  secureHeaders
+});

package/dist/cjs/request.js

@@ -26,6 +26,14 @@ var import_cookie = require("./utils/cookie");
 var import_url = require("./utils/url");
 class HonoRequest {
   constructor(request, path = "/", paramData) {
+    this.bodyCache = {};
+    this.cachedBody = (key) => {
+      const { bodyCache, raw } = this;
+      const cachedBody = bodyCache[key];
+      if (cachedBody)
+        return cachedBody;
+      return bodyCache[key] = raw[key]();
+    };
     this.raw = request;
     this.path = path;
     this.paramData = paramData;
@@ -76,30 +84,28 @@ class HonoRequest {
     }
   }
   async parseBody() {
-    return await (0, import_body.parseBody)(this.raw);
+    return await (0, import_body.parseBody)(this);
   }
   json() {
-    return this.raw.json();
+    return this.cachedBody("json");
   }
   text() {
-    return this.raw.text();
+    return this.cachedBody("text");
   }
   arrayBuffer() {
-    return this.raw.arrayBuffer();
+    return this.cachedBody("arrayBuffer");
   }
   blob() {
-    return this.raw.blob();
+    return this.cachedBody("blob");
   }
   formData() {
-    return this.raw.formData();
+    return this.cachedBody("formData");
   }
   addValidatedData(target, data) {
     this.vData[target] = data;
   }
   valid(target) {
-    if (target) {
-      return this.vData[target];
-    }
+    return this.vData[target];
   }
   get url() {
     return this.raw.url;

package/dist/cjs/utils/cookie.js

@@ -44,12 +44,15 @@ const _parseCookiePairs = (cookie, name) => {
 };
 const parse = (cookie, name) => {
   const parsedCookie = {};
-  const unsingedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
-    if (pair[1].split(".").length === 2)
+  const unsignedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
+    const valueSplit = pair[1].split(".");
+    const signature = valueSplit[1] ? (0, import_url.decodeURIComponent_)(valueSplit[1]) : void 0;
+    if (valueSplit.length === 2 && signature && signature.length === 44 && signature.endsWith("=")) {
       return false;
+    }
     return true;
   });
-  for (let [key, value] of unsingedCookies) {
+  for (let [key, value] of unsignedCookies) {
     value = (0, import_url.decodeURIComponent_)(value);
     parsedCookie[key] = value;
   }
@@ -58,8 +61,12 @@ const parse = (cookie, name) => {
 const parseSigned = async (cookie, secret, name) => {
   const parsedCookie = {};
   const signedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
-    if (pair[1].split(".").length !== 2)
+    const valueSplit = pair[1].split(".");
+    const signature = valueSplit[1] ? (0, import_url.decodeURIComponent_)(valueSplit[1]) : void 0;
+    if (valueSplit.length !== 2 || !signature || signature.length !== 44 || !signature.endsWith("=")) {
+      console.log("VALUE SPLIT", valueSplit);
       return false;
+    }
     return true;
   });
   for (let [key, value] of signedCookies) {

package/dist/cjs/validator/validator.js

@@ -21,14 +21,14 @@ __export(validator_exports, {
   validator: () => validator
 });
 module.exports = __toCommonJS(validator_exports);
-var import_body = require("../utils/body");
+var import_cookie = require("../helper/cookie");
 const validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     switch (target) {
       case "json":
         try {
-          value = await c.req.raw.clone().json();
+          value = await c.req.json();
         } catch {
           console.error("Error: Malformed JSON in request body");
           return c.json(
@@ -41,7 +41,7 @@ const validator = (target, validationFunc) => {
         }
         break;
       case "form":
-        value = await (0, import_body.parseBody)(c.req.raw.clone());
+        value = await c.req.parseBody();
         break;
       case "query":
         value = Object.fromEntries(
@@ -52,10 +52,17 @@ const validator = (target, validationFunc) => {
         break;
       case "queries":
         value = c.req.queries();
+        console.log("Warnings: Validate type `queries` is deprecated. Use `query` instead.");
         break;
       case "param":
         value = c.req.param();
         break;
+      case "header":
+        value = c.req.header();
+        break;
+      case "cookie":
+        value = (0, import_cookie.getCookie)(c);
+        break;
     }
     const res = await validationFunc(value, c);
     if (res instanceof Response) {

package/dist/client/client.js

@@ -1,5 +1,5 @@
 // src/client/client.ts
-import { replaceUrlParam, mergePath, removeIndexString, deepMerge } from "./utils.js";
+import { deepMerge, mergePath, removeIndexString, replaceUrlParam } from "./utils.js";
 var createProxy = (callback, path) => {
   const proxy = new Proxy(() => {
   }, {
@@ -26,6 +26,9 @@ var ClientRequestImpl = class {
       if (args) {
         if (args.query) {
           for (const [k, v] of Object.entries(args.query)) {
+            if (v === void 0) {
+              return;
+            }
             this.queryParams || (this.queryParams = new URLSearchParams());
             if (Array.isArray(v)) {
               for (const v2 of v) {

package/dist/context.js

@@ -1,5 +1,4 @@
 // src/context.ts
-import { HonoRequest } from "./request.js";
 import { FetchEventLike } from "./types.js";
 import { serialize } from "./utils/cookie.js";
 var Context = class {
@@ -10,7 +9,6 @@ var Context = class {
     this._status = 200;
     this._h = void 0;
     this._pH = void 0;
-    this._path = "/";
     this._init = true;
     this.notFoundHandler = () => new Response();
     this.header = (name, value, options) => {
@@ -147,27 +145,15 @@ var Context = class {
     this.notFound = () => {
       return this.notFoundHandler(this);
     };
-    this.rawRequest = req;
+    this.req = req;
     if (options) {
       this._exCtx = options.executionCtx;
-      this._path = options.path ?? "/";
-      this._params = options.params;
       this.env = options.env;
       if (options.notFoundHandler) {
         this.notFoundHandler = options.notFoundHandler;
       }
     }
   }
-  get req() {
-    if (this._req) {
-      return this._req;
-    } else {
-      this._req = new HonoRequest(this.rawRequest, this._path, this._params);
-      this.rawRequest = void 0;
-      this._params = void 0;
-      return this._req;
-    }
-  }
   get event() {
     if (this._exCtx instanceof FetchEventLike) {
       return this._exCtx;

package/dist/helper/adapter/index.js

@@ -0,0 +1,46 @@
+// src/helper/adapter/index.ts
+var env = (c) => {
+  const global = globalThis;
+  if (c.runtime === "bun" || c.runtime === "node" || c.runtime === "edge-light" || c.runtime === "lagon") {
+    return global?.process?.env;
+  }
+  if (c.runtime === "deno") {
+    return Deno.env.toObject();
+  }
+  if (c.runtime === "workerd") {
+    return c.env;
+  }
+  if (c.runtime === "fastly") {
+    return {};
+  }
+  return {};
+};
+var getRuntimeKey = () => {
+  const global = globalThis;
+  if (global?.Deno !== void 0) {
+    return "deno";
+  }
+  if (global?.Bun !== void 0) {
+    return "bun";
+  }
+  if (typeof global?.WebSocketPair === "function") {
+    return "workerd";
+  }
+  if (typeof global?.EdgeRuntime === "string") {
+    return "edge-light";
+  }
+  if (global?.fastly !== void 0) {
+    return "fastly";
+  }
+  if (global?.__lagon__ !== void 0) {
+    return "lagon";
+  }
+  if (global?.process?.release?.name === "node") {
+    return "node";
+  }
+  return "other";
+};
+export {
+  env,
+  getRuntimeKey
+};

package/dist/{middleware → helper}/cookie/index.js

@@ -1,4 +1,4 @@
-// src/middleware/cookie/index.ts
+// src/helper/cookie/index.ts
 import { parse, parseSigned, serialize, serializeSigned } from "../../utils/cookie.js";
 var getCookie = (c, key) => {
   const cookie = c.req.raw.headers.get("Cookie");

package/dist/{middleware → helper}/html/index.js

@@ -1,4 +1,4 @@
-// src/middleware/html/index.ts
+// src/helper/html/index.ts
 import { escapeToBuffer } from "../../utils/html.js";
 var raw = (value) => {
   const escapedString = new String(value);

package/dist/helper.js

@@ -0,0 +1,4 @@
+// src/helper.ts
+export * from "./helper/cookie/index.js";
+export * from "./helper/html/index.js";
+export * from "./helper/adapter/index.js";

package/dist/hono-base.js

@@ -2,6 +2,7 @@
 import { compose } from "./compose.js";
 import { Context } from "./context.js";
 import { HTTPException } from "./http-exception.js";
+import { HonoRequest } from "./request.js";
 import { METHOD_NAME_ALL, METHOD_NAME_ALL_LOWERCASE, METHODS } from "./router.js";
 import { getPath, getPathNoStrict, getQueryStrings, mergePath } from "./utils/url.js";
 function defineDynamicClass() {
@@ -186,17 +187,15 @@ var Hono = class extends defineDynamicClass() {
     throw err;
   }
   dispatch(request, executionCtx, env, method) {
-    const path = this.getPath(request);
+    const path = this.getPath(request, { env });
     if (method === "HEAD") {
       return (async () => new Response(null, await this.dispatch(request, executionCtx, env, "GET")))();
     }
     const { handlers, params } = this.matchRoute(method, path);
-    const c = new Context(request, {
+    const c = new Context(new HonoRequest(request, path, params), {
       env,
       executionCtx,
-      notFoundHandler: this.notFoundHandler,
-      path,
-      params
+      notFoundHandler: this.notFoundHandler
     });
     if (handlers.length === 1) {
       let res;

package/dist/{middleware/jsx → jsx}/index.js

@@ -1,5 +1,5 @@
-// src/middleware/jsx/index.ts
-import { escapeToBuffer } from "../../utils/html.js";
+// src/jsx/index.ts
+import { escapeToBuffer } from "../utils/html.js";
 var emptyTags = [
   "area",
   "base",

package/dist/{middleware/jsx → jsx}/jsx-dev-runtime.js

@@ -1,4 +1,4 @@
-// src/middleware/jsx/jsx-dev-runtime.ts
+// src/jsx/jsx-dev-runtime.ts
 import { jsx } from "./index.js";
 import { Fragment } from "./index.js";
 function jsxDEV(tag, props) {

package/dist/{middleware/jsx → jsx}/jsx-runtime.js

@@ -1,4 +1,4 @@
-// src/middleware/jsx/jsx-runtime.ts
+// src/jsx/jsx-runtime.ts
 import { jsxDEV, Fragment } from "./jsx-dev-runtime.js";
 import { jsxDEV as jsxDEV2 } from "./jsx-dev-runtime.js";
 export {

package/dist/middleware/compress/index.js

@@ -1,14 +1,13 @@
 // src/middleware/compress/index.ts
+var ENCODING_TYPES = ["gzip", "deflate"];
 var compress = (options) => {
   return async (ctx, next) => {
     await next();
     const accepted = ctx.req.headers.get("Accept-Encoding");
-    const pattern = options?.encoding ?? /gzip|deflate/;
-    const match = accepted?.match(pattern);
-    if (!accepted || !match || !ctx.res.body) {
+    const encoding = options?.encoding ?? ENCODING_TYPES.find((encoding2) => accepted?.includes(encoding2));
+    if (!encoding || !ctx.res.body) {
       return;
     }
-    const encoding = match[0];
     const stream = new CompressionStream(encoding);
     ctx.res = new Response(ctx.res.body.pipeThrough(stream), ctx.res);
     ctx.res.headers.set("Content-Encoding", encoding);

package/dist/middleware/secure-headers/index.js

@@ -0,0 +1,49 @@
+// src/middleware/secure-headers/index.ts
+var HEADERS_MAP = {
+  crossOriginEmbedderPolicy: ["Cross-Origin-Embedder-Policy", "require-corp"],
+  crossOriginResourcePolicy: ["Cross-Origin-Resource-Policy", "same-origin"],
+  crossOriginOpenerPolicy: ["Cross-Origin-Opener-Policy", "same-origin"],
+  originAgentCluster: ["Origin-Agent-Cluster", "?1"],
+  referrerPolicy: ["Referrer-Policy", "no-referrer"],
+  strictTransportSecurity: ["Strict-Transport-Security", "max-age=15552000; includeSubDomains"],
+  xContentTypeOptions: ["X-Content-Type-Options", "nosniff"],
+  xDnsPrefetchControl: ["X-DNS-Prefetch-Control", "off"],
+  xDownloadOptions: ["X-Download-Options", "noopen"],
+  xFrameOptions: ["X-Frame-Options", "SAMEORIGIN"],
+  xPermittedCrossDomainPolicies: ["X-Permitted-Cross-Domain-Policies", "none"],
+  xXssProtection: ["X-XSS-Protection", "0"]
+};
+var DEFAULT_OPTIONS = {
+  crossOriginEmbedderPolicy: false,
+  crossOriginResourcePolicy: true,
+  crossOriginOpenerPolicy: true,
+  originAgentCluster: true,
+  referrerPolicy: true,
+  strictTransportSecurity: true,
+  xContentTypeOptions: true,
+  xDnsPrefetchControl: true,
+  xDownloadOptions: true,
+  xFrameOptions: true,
+  xPermittedCrossDomainPolicies: true,
+  xXssProtection: true
+};
+var secureHeaders = (customOptions) => {
+  const options = { ...DEFAULT_OPTIONS, ...customOptions };
+  const headersToSet = Object.entries(HEADERS_MAP).filter(([key]) => options[key]).map(([, value]) => value);
+  return async (ctx, next) => {
+    await next();
+    headersToSet.forEach(([header, value]) => {
+      ctx.res.headers.set(header, value);
+    });
+    if (options.contentSecurityPolicy) {
+      const cspDirectives = Object.entries(options.contentSecurityPolicy).map(([directive, sources]) => {
+        return `${directive} ${sources.join(" ")}`;
+      }).join("; ");
+      ctx.res.headers.set("Content-Security-Policy", cspDirectives);
+    }
+    ctx.res.headers.delete("X-Powered-By");
+  };
+};
+export {
+  secureHeaders
+};

package/dist/request.js

@@ -4,6 +4,14 @@ import { parse } from "./utils/cookie.js";
 import { getQueryParam, getQueryParams, decodeURIComponent_ } from "./utils/url.js";
 var HonoRequest = class {
   constructor(request, path = "/", paramData) {
+    this.bodyCache = {};
+    this.cachedBody = (key) => {
+      const { bodyCache, raw } = this;
+      const cachedBody = bodyCache[key];
+      if (cachedBody)
+        return cachedBody;
+      return bodyCache[key] = raw[key]();
+    };
     this.raw = request;
     this.path = path;
     this.paramData = paramData;
@@ -54,30 +62,28 @@ var HonoRequest = class {
     }
   }
   async parseBody() {
-    return await parseBody(this.raw);
+    return await parseBody(this);
   }
   json() {
-    return this.raw.json();
+    return this.cachedBody("json");
   }
   text() {
-    return this.raw.text();
+    return this.cachedBody("text");
   }
   arrayBuffer() {
-    return this.raw.arrayBuffer();
+    return this.cachedBody("arrayBuffer");
   }
   blob() {
-    return this.raw.blob();
+    return this.cachedBody("blob");
   }
   formData() {
-    return this.raw.formData();
+    return this.cachedBody("formData");
   }
   addValidatedData(target, data) {
     this.vData[target] = data;
   }
   valid(target) {
-    if (target) {
-      return this.vData[target];
-    }
+    return this.vData[target];
   }
   get url() {
     return this.raw.url;

package/dist/types/adapter/lambda-edge/index.d.ts

@@ -1,2 +1,2 @@
 export { handle } from './handler';
-export type { Callback, CloudFrontConfig, CloudFrontRequest, CloudFrontResponse, CloudFrontEdgeEvent } from './handler';
+export type { Callback, CloudFrontConfig, CloudFrontRequest, CloudFrontResponse, CloudFrontEdgeEvent, } from './handler';

package/dist/types/client/types.d.ts

@@ -17,7 +17,7 @@ declare type ClientRequest<S extends Data> = {
     [M in keyof S]: S[M] extends {
         input: infer R;
         output: infer O;
-    } ? RemoveBlankRecord<R> extends never ? (args?: {}, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : (args: R, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : never;
+    } ? RemoveBlankRecord<R> extends never ? (args?: {}, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : (args: Omit<R, 'header' | 'cookie'>, options?: ClientRequestOptions) => Promise<ClientResponse<O>> : never;
 };
 export interface ClientResponse<T> {
     ok: boolean;

package/dist/types/context.d.ts

@@ -1,4 +1,4 @@
-import { HonoRequest } from './request';
+import type { HonoRequest } from './request';
 import { FetchEventLike } from './types';
 import type { Env, NotFoundHandler, Input, TypedResponse } from './types';
 import type { CookieOptions } from './utils/cookie';
@@ -47,27 +47,21 @@ declare type ContextOptions<E extends Env> = {
     env: E['Bindings'];
     executionCtx?: FetchEventLike | ExecutionContext | undefined;
     notFoundHandler?: NotFoundHandler<E>;
-    path?: string;
-    params?: Record<string, string>;
 };
 export declare class Context<E extends Env = any, P extends string = any, I extends Input = {}> {
+    req: HonoRequest<P, I['out']>;
     env: E['Bindings'];
     finalized: boolean;
     error: Error | undefined;
-    private _req?;
     private _status;
     private _exCtx;
     private _map;
     private _h;
     private _pH;
     private _res;
-    private _path;
-    private _params?;
     private _init;
-    private rawRequest?;
     private notFoundHandler;
-    constructor(req: Request, options?: ContextOptions<E>);
-    get req(): HonoRequest<P, I['out']>;
+    constructor(req: HonoRequest<P, I['out']>, options?: ContextOptions<E>);
     get event(): FetchEventLike;
     get executionCtx(): ExecutionContext;
     get res(): Response;
@@ -99,6 +93,18 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      */
     cookie: (name: string, value: string, opt?: CookieOptions) => void;
     notFound: () => Response | Promise<Response>;
+    /** @deprecated
+     * Use `getRuntimeKey()` exported from `hono/adapter` instead of `c.runtime()`. The `c.runtime()` will be removed in v4.
+     *
+     * @example
+     *
+     * import { getRuntimeKey } from 'hono/adapter'
+     * // ...
+     * app.get('/', (c) => {
+     *   const key = getRuntimeKey()
+     *   //...
+     * })
+     */
     get runtime(): Runtime;
 }
 export {};

package/dist/types/helper/adapter/index.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from '../../context';
+export declare const env: <T extends Record<string, string>, C extends Context<any, any, {}> = Context<{}, any, {}>>(c: C) => T & C["env"];
+export declare const getRuntimeKey: () => "other" | "node" | "deno" | "bun" | "workerd" | "fastly" | "edge-light" | "lagon";

package/dist/types/helper.d.ts

@@ -0,0 +1,3 @@
+export * from './helper/cookie';
+export * from './helper/html';
+export * from './helper/adapter';

package/dist/types/hono-base.d.ts

@@ -23,7 +23,9 @@ declare const Hono_base: new <E_1 extends Env = Env, S_1 = {}, BasePath_1 extend
 };
 declare class Hono<E extends Env = Env, S = {}, BasePath extends string = '/'> extends Hono_base<E, S, BasePath> {
     router: Router<H>;
-    readonly getPath: (request: Request) => string;
+    readonly getPath: (request: Request, options?: {
+        env?: E['Bindings'];
+    }) => string;
     private _basePath;
     private path;
     routes: RouterRoute[];

package/dist/types/{middleware/jsx → jsx}/index.d.ts

@@ -1,4 +1,4 @@
-import type { StringBuffer, HtmlEscaped, HtmlEscapedString } from '../../utils/html';
+import type { StringBuffer, HtmlEscaped, HtmlEscapedString } from '../utils/html';
 declare type Props = Record<string, any>;
 declare global {
     namespace JSX {

package/dist/types/middleware/compress/index.d.ts

@@ -1,7 +1,7 @@
 import type { MiddlewareHandler } from '../../types';
-declare type EncodingType = 'gzip' | 'deflate';
+declare const ENCODING_TYPES: readonly ["gzip", "deflate"];
 interface CompressionOptions {
-    encoding?: EncodingType;
+    encoding?: typeof ENCODING_TYPES[number];
 }
 export declare const compress: (options?: CompressionOptions) => MiddlewareHandler;
 export {};

package/dist/types/middleware/secure-headers/index.d.ts

@@ -0,0 +1,30 @@
+import type { MiddlewareHandler } from '../../types';
+interface ContentSecurityPolicyOptions {
+    defaultSrc?: string[];
+    baseUri?: string[];
+    fontSrc?: string[];
+    frameAncestors?: string[];
+    imgSrc?: string[];
+    objectSrc?: string[];
+    scriptSrc?: string[];
+    scriptSrcAttr?: string[];
+    styleSrc?: string[];
+    upgradeInsecureRequests?: string[];
+}
+interface SecureHeadersOptions {
+    contentSecurityPolicy?: ContentSecurityPolicyOptions;
+    crossOriginEmbedderPolicy?: boolean;
+    crossOriginResourcePolicy?: boolean;
+    crossOriginOpenerPolicy?: boolean;
+    originAgentCluster: boolean;
+    referrerPolicy?: boolean;
+    strictTransportSecurity?: boolean;
+    xContentTypeOptions?: boolean;
+    xDnsPrefetchControl?: boolean;
+    xDownloadOptions?: boolean;
+    xFrameOptions?: boolean;
+    xPermittedCrossDomainPolicies?: boolean;
+    xXssProtection?: boolean;
+}
+export declare const secureHeaders: (customOptions?: Partial<SecureHeadersOptions>) => MiddlewareHandler;
+export {};

package/dist/types/request.d.ts

@@ -7,6 +7,7 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
     private paramData;
     private vData;
     path: string;
+    private bodyCache;
     constructor(request: Request, path?: string, paramData?: Record<string, string> | undefined);
     param<P2 extends string = P>(key: RemoveQuestion<ParamKeys<P2>>): UndefinedIfHavingQuestion<ParamKeys<P2>>;
     param<P2 extends string = P>(): UnionToIntersection<ParamKeyToRecord<ParamKeys<P2>>>;
@@ -37,14 +38,14 @@ export declare class HonoRequest<P extends string = '/', I extends Input['out']
      */
     cookie(): Cookie;
     parseBody<T extends BodyData = BodyData>(): Promise<T>;
+    private cachedBody;
     json<T = any>(): Promise<T>;
     text(): Promise<string>;
     arrayBuffer(): Promise<ArrayBuffer>;
     blob(): Promise<Blob>;
     formData(): Promise<FormData>;
     addValidatedData(target: keyof ValidationTargets, data: {}): void;
-    valid<T extends keyof ValidationTargets = I extends Record<infer R, unknown> ? R extends keyof ValidationTargets ? R : never : never>(target: T): InputToDataByTarget<I, T>;
-    valid(): never;
+    valid<T extends keyof I & keyof ValidationTargets>(target: T): InputToDataByTarget<I, T>;
     get url(): string;
     get method(): string;
     get headers(): Headers;

package/dist/types/types.d.ts

@@ -22,9 +22,9 @@ export declare type ErrorHandler<E extends Env = any> = (err: Error, c: Context<
 export interface HandlerInterface<E extends Env = Env, M extends string = any, S = {}, BasePath extends string = '/'> {
     <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, I extends Input = {}, O = {}>(...handlers: [H<E, P, I, O>, H<E, P, I, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I['in'], O>>, BasePath>;
     <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2>(...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I3['in'], O>>, BasePath>;
-    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I2 & I3>(...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I4['in'], O>>, BasePath>;
-    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I2 & I3, I5 extends Input = I3 & I4>(...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>, H<E, P, I5, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I5['in'], O>>, BasePath>;
-    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, I extends Input = {}, O = {}>(...handlers: Handler<E, P, I, O>[]): Hono<E, RemoveBlankRecord<Schema<M, P, I['in'], O>>, BasePath>;
+    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I & I2 & I3>(...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I4['in'], O>>, BasePath>;
+    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I2 & I3, I5 extends Input = I & I2 & I3 & I4>(...handlers: [H<E, P, I, O>, H<E, P, I2, O>, H<E, P, I3, O>, H<E, P, I4, O>, H<E, P, I5, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I5['in'], O>>, BasePath>;
+    <P extends string = ExtractKey<S> extends never ? BasePath : ExtractKey<S>, I extends Input = {}, O = {}>(...handlers: Handler<E, P, I, O>[]): Hono<E, RemoveBlankRecord<S | Schema<M, P, I['in'], O>>, BasePath>;
     <P extends string, O = {}, I extends Input = {}>(path: P, handler: H<E, MergePath<BasePath, P>, I, O>): Hono<E, RemoveBlankRecord<S | Schema<M, MergePath<BasePath, P>, I['in'], O>>, BasePath>;
     <P extends string, O = {}, I extends Input = {}>(path: P, ...handlers: [H<E, MergePath<BasePath, P>, I, O>, H<E, MergePath<BasePath, P>, I, O>]): Hono<E, RemoveBlankRecord<S | Schema<M, MergePath<BasePath, P>, I['in'], O>>, BasePath>;
     <P extends string, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2>(path: P, ...handlers: [
@@ -32,13 +32,13 @@ export interface HandlerInterface<E extends Env = Env, M extends string = any, S
         H<E, MergePath<BasePath, P>, I2, O>,
         H<E, MergePath<BasePath, P>, I3, O>
     ]): Hono<E, RemoveBlankRecord<S | Schema<M, MergePath<BasePath, P>, I3['in'], O>>, BasePath>;
-    <P extends string, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I2 & I3>(path: P, ...handlers: [
+    <P extends string, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I & I2 & I3>(path: P, ...handlers: [
         H<E, MergePath<BasePath, P>, I, O>,
         H<E, MergePath<BasePath, P>, I2, O>,
         H<E, MergePath<BasePath, P>, I3, O>,
         H<E, MergePath<BasePath, P>, I4, O>
     ]): Hono<E, RemoveBlankRecord<S | Schema<M, MergePath<BasePath, P>, I4['in'], O>>, BasePath>;
-    <P extends string, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I2 & I3, I5 extends Input = I3 & I4>(path: P, ...handlers: [
+    <P extends string, O = {}, I extends Input = {}, I2 extends Input = I, I3 extends Input = I & I2, I4 extends Input = I2 & I3, I5 extends Input = I & I2 & I3 & I4>(path: P, ...handlers: [
         H<E, MergePath<BasePath, P>, I, O>,
         H<E, MergePath<BasePath, P>, I2, O>,
         H<E, MergePath<BasePath, P>, I3, O>,
@@ -102,6 +102,8 @@ export declare type ValidationTargets = {
     query: Record<string, string | string[]>;
     queries: Record<string, string[]>;
     param: Record<string, string>;
+    header: Record<string, string>;
+    cookie: Record<string, string>;
 };
 declare type ParamKeyName<NameWithPattern> = NameWithPattern extends `${infer Name}{${infer _Pattern}` ? Name : NameWithPattern;
 declare type ParamKey<Component> = Component extends `:${infer NameWithPattern}` ? ParamKeyName<NameWithPattern> : never;
@@ -114,7 +116,7 @@ export declare type InputToDataByTarget<T extends Input['out'], Target extends k
 } ? R : never;
 export declare type RemoveQuestion<T> = T extends `${infer R}?` ? R : T;
 export declare type UndefinedIfHavingQuestion<T> = T extends `${infer _}?` ? string | undefined : string;
-export declare type ExtractSchema<T> = T extends Hono<infer _, infer S, any> ? S : never;
+export declare type ExtractSchema<T> = UnionToIntersection<T extends Hono<infer _, infer S, any> ? S : never>;
 export declare abstract class FetchEventLike {
     abstract readonly request: Request;
     abstract respondWith(promise: Response | Promise<Response>): void;

package/dist/types/utils/body.d.ts

@@ -1,2 +1,3 @@
+import type { HonoRequest } from '../request';
 export declare type BodyData = Record<string, string | File>;
-export declare const parseBody: <T extends BodyData = BodyData>(r: Request | Response) => Promise<T>;
+export declare const parseBody: <T extends BodyData = BodyData>(r: HonoRequest | Request) => Promise<T>;

package/dist/utils/cookie.js

@@ -19,12 +19,15 @@ var _parseCookiePairs = (cookie, name) => {
 };
 var parse = (cookie, name) => {
   const parsedCookie = {};
-  const unsingedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
-    if (pair[1].split(".").length === 2)
+  const unsignedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
+    const valueSplit = pair[1].split(".");
+    const signature = valueSplit[1] ? decodeURIComponent_(valueSplit[1]) : void 0;
+    if (valueSplit.length === 2 && signature && signature.length === 44 && signature.endsWith("=")) {
       return false;
+    }
     return true;
   });
-  for (let [key, value] of unsingedCookies) {
+  for (let [key, value] of unsignedCookies) {
     value = decodeURIComponent_(value);
     parsedCookie[key] = value;
   }
@@ -33,8 +36,12 @@ var parse = (cookie, name) => {
 var parseSigned = async (cookie, secret, name) => {
   const parsedCookie = {};
   const signedCookies = _parseCookiePairs(cookie, name).filter((pair) => {
-    if (pair[1].split(".").length !== 2)
+    const valueSplit = pair[1].split(".");
+    const signature = valueSplit[1] ? decodeURIComponent_(valueSplit[1]) : void 0;
+    if (valueSplit.length !== 2 || !signature || signature.length !== 44 || !signature.endsWith("=")) {
+      console.log("VALUE SPLIT", valueSplit);
       return false;
+    }
     return true;
   });
   for (let [key, value] of signedCookies) {

package/dist/validator/validator.js

@@ -1,12 +1,12 @@
 // src/validator/validator.ts
-import { parseBody } from "../utils/body.js";
+import { getCookie } from "../helper/cookie/index.js";
 var validator = (target, validationFunc) => {
   return async (c, next) => {
     let value = {};
     switch (target) {
       case "json":
         try {
-          value = await c.req.raw.clone().json();
+          value = await c.req.json();
         } catch {
           console.error("Error: Malformed JSON in request body");
           return c.json(
@@ -19,7 +19,7 @@ var validator = (target, validationFunc) => {
         }
         break;
       case "form":
-        value = await parseBody(c.req.raw.clone());
+        value = await c.req.parseBody();
         break;
       case "query":
         value = Object.fromEntries(
@@ -30,10 +30,17 @@ var validator = (target, validationFunc) => {
         break;
       case "queries":
         value = c.req.queries();
+        console.log("Warnings: Validate type `queries` is deprecated. Use `query` instead.");
         break;
       case "param":
         value = c.req.param();
         break;
+      case "header":
+        value = c.req.header();
+        break;
+      case "cookie":
+        value = getCookie(c);
+        break;
     }
     const res = await validationFunc(value, c);
     if (res instanceof Response) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -12,7 +12,7 @@
   "scripts": {
     "test": "jest",
     "test:deno": "env NAME=Deno deno test --allow-read --allow-env runtime_tests/deno",
-    "test:bun": "env NAME=Bun bun test --jsx-import-source ../../src/middleware/jsx runtime_tests/bun/index.test.tsx",
+    "test:bun": "env NAME=Bun bun test --jsx-import-source ../../src/jsx runtime_tests/bun/index.test.tsx",
     "test:fastly": "jest --config ./runtime_tests/fastly/jest.config.js",
     "test:lagon": "start-server-and-test \"lagon dev runtime_tests/lagon/index.ts -e runtime_tests/lagon/.env.lagon\" http://127.0.0.1:1234 \"yarn jest runtime_tests/lagon/index.test.ts --roots runtime_tests/lagon --testMatch '**/*.test.ts'\"",
     "test:node": "env NAME=Node jest --config ./runtime_tests/node/jest.config.js",
@@ -22,6 +22,8 @@
     "test:all": "yarn test && yarn test:deno && yarn test:bun && yarn test:fastly && yarn test:lagon && yarn test:node && yarn test:wrangler && yarn test:lambda && yarn test:lambda-edge",
     "lint": "eslint --ext js,ts src runtime_tests .eslintrc.cjs",
     "lint:fix": "eslint --ext js,ts src runtime_tests .eslintrc.cjs --fix",
+    "format": "prettier --check 'src/**/*.{js,ts}' 'runtime_tests/**/*.{js,ts}'",
+    "format:fix": "prettier --write 'src/**/*.{js,ts}' 'runtime_tests/**/*.{js,ts}'",
     "denoify": "rimraf deno_dist && denoify && rimraf 'deno_dist/**/*.test.ts'",
     "copy:package.cjs.json": "cp ./package.cjs.json ./dist/cjs/package.json && cp ./package.cjs.json ./dist/types/package.json ",
     "build": "rimraf dist && tsx ./build.ts && yarn copy:package.cjs.json",
@@ -36,6 +38,11 @@
       "import": "./dist/index.js",
       "require": "./dist/cjs/index.js"
     },
+    "./context": {
+      "types": "./dist/types/context.d.ts",
+      "import": "./dist/context.js",
+      "require": "./dist/cjs/context.js"
+    },
     "./tiny": {
       "types": "./dist/types/preset/tiny.d.ts",
       "import": "./dist/preset/tiny.js",
@@ -67,9 +74,9 @@
       "require": "./dist/cjs/middleware/cache/index.js"
     },
     "./cookie": {
-      "types": "./dist/types/middleware/cookie/index.d.ts",
-      "import": "./dist/middleware/cookie/index.js",
-      "require": "./dist/cjs/middleware/cookie/index.js"
+      "types": "./dist/types/helper/cookie/index.d.ts",
+      "import": "./dist/helper/cookie/index.js",
+      "require": "./dist/cjs/helper/cookie/index.js"
     },
     "./compress": {
       "types": "./dist/types/middleware/compress/index.d.ts",
@@ -87,24 +94,24 @@
       "require": "./dist/cjs/middleware/etag/index.js"
     },
     "./html": {
-      "types": "./dist/types/middleware/html/index.d.ts",
-      "import": "./dist/middleware/html/index.js",
-      "require": "./dist/cjs/middleware/html/index.js"
+      "types": "./dist/types/helper/html/index.d.ts",
+      "import": "./dist/helper/html/index.js",
+      "require": "./dist/cjs/helper/html/index.js"
     },
     "./jsx": {
-      "types": "./dist/types/middleware/jsx/index.d.ts",
-      "import": "./dist/middleware/jsx/index.js",
-      "require": "./dist/cjs/middleware/jsx/index.js"
+      "types": "./dist/types/jsx/index.d.ts",
+      "import": "./dist/jsx/index.js",
+      "require": "./dist/cjs/jsx/index.js"
     },
     "./jsx/jsx-dev-runtime": {
-      "types": "./dist/types/middleware/jsx/jsx-dev-runtime.d.ts",
-      "import": "./dist/middleware/jsx/jsx-dev-runtime.js",
-      "require": "./dist/cjs/middleware/jsx/jsx-dev-runtime.js"
+      "types": "./dist/types/jsx/jsx-dev-runtime.d.ts",
+      "import": "./dist/jsx/jsx-dev-runtime.js",
+      "require": "./dist/cjs/jsx/jsx-dev-runtime.js"
     },
     "./jsx/jsx-runtime": {
-      "types": "./dist/types/middleware/jsx/jsx-runtime.d.ts",
-      "import": "./dist/middleware/jsx/jsx-runtime.js",
-      "require": "./dist/cjs/middleware/jsx/jsx-runtime.js"
+      "types": "./dist/types/jsx/jsx-runtime.d.ts",
+      "import": "./dist/jsx/jsx-runtime.js",
+      "require": "./dist/cjs/jsx/jsx-runtime.js"
     },
     "./jwt": {
       "types": "./dist/types/middleware/jwt/index.d.ts",
@@ -131,6 +138,11 @@
       "import": "./dist/middleware/pretty-json/index.js",
       "require": "./dist/cjs/middleware/pretty-json/index.js"
     },
+    "./secure-headers": {
+      "types": "./dist/types/middleware/secure-headers/index.d.ts",
+      "import": "./dist/middleware/secure-headers/index.js",
+      "require": "./dist/cjs/middleware/secure-headers/index.js"
+    },
     "./validator": {
       "types": "./dist/types/validator/index.d.ts",
       "import": "./dist/validator/index.js",
@@ -177,9 +189,9 @@
       "require": "./dist/cjs/client/index.js"
     },
     "./adapter": {
-      "types": "./dist/types/adapter.d.ts",
-      "import": "./dist/adapter.js",
-      "require": "./dist/cjs/adapter.js"
+      "types": "./dist/types/helper/adapter/index.d.ts",
+      "import": "./dist/helper/adapter/index.js",
+      "require": "./dist/cjs/helper/adapter/index.js"
     },
     "./cloudflare-workers": {
       "types": "./dist/types/adapter/cloudflare-workers/index.d.ts",
@@ -224,6 +236,9 @@
   },
   "typesVersions": {
     "*": {
+      "context": [
+        "./dist/types/context"
+      ],
       "tiny": [
         "./dist/types/preset/tiny"
       ],
@@ -243,7 +258,7 @@
         "./dist/types/middleware/cache"
       ],
       "cookie": [
-        "./dist/types/middleware/cookie"
+        "./dist/types/helper/cookie"
       ],
       "compress": [
         "./dist/types/middleware/compress"
@@ -255,16 +270,16 @@
         "./dist/types/middleware/etag"
       ],
       "html": [
-        "./dist/types/middleware/html"
+        "./dist/types/helper/html"
       ],
       "jsx": [
-        "./dist/types/middleware/jsx"
+        "./dist/types/jsx"
       ],
       "jsx/jsx-runtime": [
-        "./dist/types/middleware/jsx/jsx-runtime.d.ts"
+        "./dist/types/jsx/jsx-runtime.d.ts"
       ],
       "jsx/jsx-dev-runtime": [
-        "./dist/types/middleware/jsx/jsx-dev-runtime.d.ts"
+        "./dist/types/jsx/jsx-dev-runtime.d.ts"
       ],
       "jwt": [
         "./dist/types/middleware/jwt"
@@ -281,6 +296,9 @@
       "pretty-json": [
         "./dist/types/middleware/pretty-json"
       ],
+      "secure-headers": [
+        "./dist/types/middleware/secure-headers"
+      ],
       "validator": [
         "./dist/types/validator/index.d.ts"
       ],
@@ -309,7 +327,7 @@
         "./dist/types/client/index.d.ts"
       ],
       "adapter": [
-        "./dist/types/adapter.d.ts"
+        "./dist/types/helper/adapter/index.d.ts"
       ],
       "cloudflare-workers": [
         "./dist/types/adapter/cloudflare-workers"

package/dist/adapter.js

@@ -1,20 +0,0 @@
-// src/adapter.ts
-var env = (c) => {
-  const global = globalThis;
-  if (c.runtime === "bun" || c.runtime === "node" || c.runtime === "edge-light" || c.runtime === "lagon") {
-    return global?.process?.env;
-  }
-  if (c.runtime === "deno") {
-    return Deno.env.toObject();
-  }
-  if (c.runtime === "workerd") {
-    return c.env;
-  }
-  if (c.runtime === "fastly") {
-    return {};
-  }
-  return {};
-};
-export {
-  env
-};

package/dist/types/adapter.d.ts

@@ -1,2 +0,0 @@
-import type { Context } from './context';
-export declare const env: <T extends Record<string, string>, C extends Context<any, any, {}> = Context<{}, any, {}>>(c: C) => T & C["env"];