hono 4.5.0-rc.1 → 4.5.0

package/README.md

@@ -25,8 +25,7 @@
 [![codecov](https://codecov.io/github/honojs/hono/graph/badge.svg)](https://codecov.io/github/honojs/hono)
 [![Discord badge](https://img.shields.io/discord/1011308539819597844?label=Discord&logo=Discord)](https://discord.gg/KMh2eNSdxV)
 
-Hono - _**\[炎\] means flame🔥 in Japanese**_ - is a small, simple, and ultrafast web framework for the Edges.
-It works on any JavaScript runtime: Cloudflare Workers, Fastly Compute, Deno, Bun, Vercel, AWS Lambda, Lambda@Edge, and Node.js.
+Hono - _**means flame🔥 in Japanese**_ - is a small, simple, and ultrafast web framework built on Web Standards. It works on any JavaScript runtime: Cloudflare Workers, Fastly Compute, Deno, Bun, Vercel, AWS Lambda, Lambda@Edge, and Node.js.
 
 Fast, but not only fast.
 
@@ -41,7 +40,7 @@ export default app
 
 ## Quick Start
 
-```
+```bash
 npm create hono@latest
 ```
 

package/dist/adapter/aws-lambda/handler.js

@@ -25,9 +25,19 @@ var streamHandle = (app) => {
           requestContext,
           context
         });
+        const headers = {};
+        const cookies = [];
+        res.headers.forEach((value, name) => {
+          if (name === "set-cookie") {
+            cookies.push(value);
+          } else {
+            headers[name] = value;
+          }
+        });
         const httpResponseMetadata = {
           statusCode: res.status,
-          headers: Object.fromEntries(res.headers.entries())
+          headers,
+          cookies
         };
         responseStream = awslambda.HttpResponseStream.from(responseStream, httpResponseMetadata);
         if (res.body) {
@@ -101,7 +111,7 @@ var EventProcessor = class {
   }
   setCookies(event, res, result) {
     if (res.headers.has("set-cookie")) {
-      const cookies = res.headers.get("set-cookie")?.split(", ");
+      const cookies = res.headers.getSetCookie ? res.headers.getSetCookie() : Array.from(res.headers.entries()).filter(([k]) => k === "set-cookie").map(([, v]) => v);
       if (Array.isArray(cookies)) {
         this.setCookiesToResult(event, result, cookies);
         res.headers.delete("set-cookie");

package/dist/adapter/bun/conninfo.js

@@ -12,7 +12,7 @@ var getConnInfo = (c) => {
   return {
     remote: {
       address: info.address,
-      addressType: info.family === "IPv6" || info.family === "IPv4" ? info.family : "unknown",
+      addressType: info.family === "IPv6" || info.family === "IPv4" ? info.family : void 0,
       port: info.port
     }
   };

package/dist/adapter/cloudflare-pages/handler.js

@@ -1,4 +1,6 @@
 // src/adapter/cloudflare-pages/handler.ts
+import { Context } from "../../context.js";
+import { HTTPException } from "../../http-exception.js";
 var handle = (app) => (eventContext) => {
   return app.fetch(
     eventContext.request,
@@ -9,6 +11,44 @@ var handle = (app) => (eventContext) => {
     }
   );
 };
+function handleMiddleware(middleware) {
+  return async (executionCtx) => {
+    const context = new Context(executionCtx.request, {
+      env: executionCtx.env,
+      executionCtx
+    });
+    let response = void 0;
+    try {
+      response = await middleware(context, async () => {
+        try {
+          context.res = await executionCtx.next();
+        } catch (error) {
+          if (error instanceof Error) {
+            context.error = error;
+          } else {
+            throw error;
+          }
+        }
+      });
+    } catch (error) {
+      if (error instanceof Error) {
+        context.error = error;
+      } else {
+        throw error;
+      }
+    }
+    if (response) {
+      return response;
+    }
+    if (context.error instanceof HTTPException) {
+      return context.error.getResponse();
+    }
+    if (context.error) {
+      throw context.error;
+    }
+    return context.res;
+  };
+}
 var serveStatic = () => {
   return async (c) => {
     const env = c.env;
@@ -21,5 +61,6 @@ var serveStatic = () => {
 };
 export {
   handle,
+  handleMiddleware,
   serveStatic
 };

package/dist/adapter/cloudflare-pages/index.js

@@ -1,6 +1,7 @@
 // src/adapter/cloudflare-pages/index.ts
-import { handle, serveStatic } from "./handler.js";
+import { handle, handleMiddleware, serveStatic } from "./handler.js";
 export {
   handle,
+  handleMiddleware,
   serveStatic
 };

package/dist/adapter/cloudflare-workers/conninfo.js

@@ -1,8 +1,7 @@
 // src/adapter/cloudflare-workers/conninfo.ts
 var getConnInfo = (c) => ({
   remote: {
-    address: c.req.header("cf-connecting-ip"),
-    addressType: "unknown"
+    address: c.req.header("cf-connecting-ip")
   }
 });
 export {

package/dist/adapter/deno/conninfo.js

@@ -5,8 +5,7 @@ var getConnInfo = (c) => {
     remote: {
       address: remoteAddr.hostname,
       port: remoteAddr.port,
-      transport: remoteAddr.transport,
-      addressType: "unknown"
+      transport: remoteAddr.transport
     }
   };
 };

package/dist/adapter/deno/websocket.js

@@ -1,10 +1,10 @@
 // src/adapter/deno/websocket.ts
-var upgradeWebSocket = (createEvents) => async (c, next) => {
+var upgradeWebSocket = (createEvents, options) => async (c, next) => {
   if (c.req.header("upgrade") !== "websocket") {
     return await next();
   }
   const events = await createEvents(c);
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options || {});
   const wsContext = {
     binaryType: "arraybuffer",
     close: (code, reason) => socket.close(code, reason),

package/dist/adapter/lambda-edge/conninfo.js

@@ -0,0 +1,9 @@
+// src/adapter/lambda-edge/conninfo.ts
+var getConnInfo = (c) => ({
+  remote: {
+    address: c.env.event.Records[0].cf.request.clientIp
+  }
+});
+export {
+  getConnInfo
+};

package/dist/adapter/lambda-edge/index.js

@@ -1,5 +1,7 @@
 // src/adapter/lambda-edge/index.ts
 import { handle } from "./handler.js";
+import { getConnInfo } from "./conninfo.js";
 export {
+  getConnInfo,
   handle
 };

package/dist/adapter/service-worker/handler.js

@@ -0,0 +1,19 @@
+// src/adapter/service-worker/handler.ts
+var handle = (app, opts = {
+  fetch
+}) => {
+  return (evt) => {
+    evt.respondWith(
+      (async () => {
+        const res = await app.fetch(evt.request);
+        if (opts.fetch && res.status === 404) {
+          return await opts.fetch(evt.request);
+        }
+        return res;
+      })()
+    );
+  };
+};
+export {
+  handle
+};

package/dist/adapter/service-worker/index.js

@@ -0,0 +1,5 @@
+// src/adapter/service-worker/index.ts
+import { handle } from "./handler.js";
+export {
+  handle
+};

package/dist/adapter/vercel/conninfo.js

@@ -0,0 +1,9 @@
+// src/adapter/vercel/conninfo.ts
+var getConnInfo = (c) => ({
+  remote: {
+    address: c.req.header("x-real-ip")
+  }
+});
+export {
+  getConnInfo
+};

package/dist/adapter/vercel/index.js

@@ -1,5 +1,7 @@
 // src/adapter/vercel/index.ts
 import { handle } from "./handler.js";
+import { getConnInfo } from "./conninfo.js";
 export {
+  getConnInfo,
   handle
 };

package/dist/cjs/adapter/aws-lambda/handler.js

@@ -57,9 +57,19 @@ const streamHandle = (app) => {
           requestContext,
           context
         });
+        const headers = {};
+        const cookies = [];
+        res.headers.forEach((value, name) => {
+          if (name === "set-cookie") {
+            cookies.push(value);
+          } else {
+            headers[name] = value;
+          }
+        });
         const httpResponseMetadata = {
           statusCode: res.status,
-          headers: Object.fromEntries(res.headers.entries())
+          headers,
+          cookies
         };
         responseStream = awslambda.HttpResponseStream.from(responseStream, httpResponseMetadata);
         if (res.body) {
@@ -133,7 +143,7 @@ class EventProcessor {
   }
   setCookies(event, res, result) {
     if (res.headers.has("set-cookie")) {
-      const cookies = res.headers.get("set-cookie")?.split(", ");
+      const cookies = res.headers.getSetCookie ? res.headers.getSetCookie() : Array.from(res.headers.entries()).filter(([k]) => k === "set-cookie").map(([, v]) => v);
       if (Array.isArray(cookies)) {
         this.setCookiesToResult(event, result, cookies);
         res.headers.delete("set-cookie");

package/dist/cjs/adapter/bun/conninfo.js

@@ -34,7 +34,7 @@ const getConnInfo = (c) => {
   return {
     remote: {
       address: info.address,
-      addressType: info.family === "IPv6" || info.family === "IPv4" ? info.family : "unknown",
+      addressType: info.family === "IPv6" || info.family === "IPv4" ? info.family : void 0,
       port: info.port
     }
   };

package/dist/cjs/adapter/cloudflare-pages/handler.js

@@ -19,9 +19,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var handler_exports = {};
 __export(handler_exports, {
   handle: () => handle,
+  handleMiddleware: () => handleMiddleware,
   serveStatic: () => serveStatic
 });
 module.exports = __toCommonJS(handler_exports);
+var import_context = require("../../context");
+var import_http_exception = require("../../http-exception");
 const handle = (app) => (eventContext) => {
   return app.fetch(
     eventContext.request,
@@ -32,6 +35,44 @@ const handle = (app) => (eventContext) => {
     }
   );
 };
+function handleMiddleware(middleware) {
+  return async (executionCtx) => {
+    const context = new import_context.Context(executionCtx.request, {
+      env: executionCtx.env,
+      executionCtx
+    });
+    let response = void 0;
+    try {
+      response = await middleware(context, async () => {
+        try {
+          context.res = await executionCtx.next();
+        } catch (error) {
+          if (error instanceof Error) {
+            context.error = error;
+          } else {
+            throw error;
+          }
+        }
+      });
+    } catch (error) {
+      if (error instanceof Error) {
+        context.error = error;
+      } else {
+        throw error;
+      }
+    }
+    if (response) {
+      return response;
+    }
+    if (context.error instanceof import_http_exception.HTTPException) {
+      return context.error.getResponse();
+    }
+    if (context.error) {
+      throw context.error;
+    }
+    return context.res;
+  };
+}
 const serveStatic = () => {
   return async (c) => {
     const env = c.env;
@@ -45,5 +86,6 @@ const serveStatic = () => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   handle,
+  handleMiddleware,
   serveStatic
 });

package/dist/cjs/adapter/cloudflare-pages/index.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cloudflare_pages_exports = {};
 __export(cloudflare_pages_exports, {
   handle: () => import_handler.handle,
+  handleMiddleware: () => import_handler.handleMiddleware,
   serveStatic: () => import_handler.serveStatic
 });
 module.exports = __toCommonJS(cloudflare_pages_exports);
@@ -26,5 +27,6 @@ var import_handler = require("./handler");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   handle,
+  handleMiddleware,
   serveStatic
 });

package/dist/cjs/adapter/cloudflare-workers/conninfo.js

@@ -23,8 +23,7 @@ __export(conninfo_exports, {
 module.exports = __toCommonJS(conninfo_exports);
 const getConnInfo = (c) => ({
   remote: {
-    address: c.req.header("cf-connecting-ip"),
-    addressType: "unknown"
+    address: c.req.header("cf-connecting-ip")
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/adapter/deno/conninfo.js

@@ -27,8 +27,7 @@ const getConnInfo = (c) => {
     remote: {
       address: remoteAddr.hostname,
       port: remoteAddr.port,
-      transport: remoteAddr.transport,
-      addressType: "unknown"
+      transport: remoteAddr.transport
     }
   };
 };

package/dist/cjs/adapter/deno/websocket.js

@@ -21,12 +21,12 @@ __export(websocket_exports, {
   upgradeWebSocket: () => upgradeWebSocket
 });
 module.exports = __toCommonJS(websocket_exports);
-const upgradeWebSocket = (createEvents) => async (c, next) => {
+const upgradeWebSocket = (createEvents, options) => async (c, next) => {
   if (c.req.header("upgrade") !== "websocket") {
     return await next();
   }
   const events = await createEvents(c);
-  const { response, socket } = Deno.upgradeWebSocket(c.req.raw);
+  const { response, socket } = Deno.upgradeWebSocket(c.req.raw, options || {});
   const wsContext = {
     binaryType: "arraybuffer",
     close: (code, reason) => socket.close(code, reason),

package/dist/cjs/adapter/lambda-edge/conninfo.js

@@ -0,0 +1,32 @@
+"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 conninfo_exports = {};
+__export(conninfo_exports, {
+  getConnInfo: () => getConnInfo
+});
+module.exports = __toCommonJS(conninfo_exports);
+const getConnInfo = (c) => ({
+  remote: {
+    address: c.env.event.Records[0].cf.request.clientIp
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConnInfo
+});

package/dist/cjs/adapter/lambda-edge/index.js

@@ -18,11 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var lambda_edge_exports = {};
 __export(lambda_edge_exports, {
+  getConnInfo: () => import_conninfo.getConnInfo,
   handle: () => import_handler.handle
 });
 module.exports = __toCommonJS(lambda_edge_exports);
 var import_handler = require("./handler");
+var import_conninfo = require("./conninfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getConnInfo,
   handle
 });

package/dist/cjs/adapter/service-worker/handler.js

@@ -0,0 +1,42 @@
+"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 handler_exports = {};
+__export(handler_exports, {
+  handle: () => handle
+});
+module.exports = __toCommonJS(handler_exports);
+const handle = (app, opts = {
+  fetch
+}) => {
+  return (evt) => {
+    evt.respondWith(
+      (async () => {
+        const res = await app.fetch(evt.request);
+        if (opts.fetch && res.status === 404) {
+          return await opts.fetch(evt.request);
+        }
+        return res;
+      })()
+    );
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handle
+});

package/dist/cjs/adapter/service-worker/index.js

@@ -0,0 +1,28 @@
+"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 service_worker_exports = {};
+__export(service_worker_exports, {
+  handle: () => import_handler.handle
+});
+module.exports = __toCommonJS(service_worker_exports);
+var import_handler = require("./handler");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handle
+});

package/dist/cjs/adapter/service-worker/types.js

@@ -0,0 +1,16 @@
+"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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/cjs/adapter/vercel/conninfo.js

@@ -0,0 +1,32 @@
+"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 conninfo_exports = {};
+__export(conninfo_exports, {
+  getConnInfo: () => getConnInfo
+});
+module.exports = __toCommonJS(conninfo_exports);
+const getConnInfo = (c) => ({
+  remote: {
+    address: c.req.header("x-real-ip")
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getConnInfo
+});

package/dist/cjs/adapter/vercel/index.js

@@ -18,11 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var vercel_exports = {};
 __export(vercel_exports, {
+  getConnInfo: () => import_conninfo.getConnInfo,
   handle: () => import_handler.handle
 });
 module.exports = __toCommonJS(vercel_exports);
 var import_handler = require("./handler");
+var import_conninfo = require("./conninfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getConnInfo,
   handle
 });

package/dist/cjs/client/client.js

@@ -152,11 +152,15 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
     return new URL(url);
   }
   if (method === "ws") {
-    const targetUrl = (0, import_utils.replaceUrlProtocol)(
+    const webSocketUrl = (0, import_utils.replaceUrlProtocol)(
       opts.args[0] && opts.args[0].param ? (0, import_utils.replaceUrlParam)(url, opts.args[0].param) : url,
       "ws"
     );
-    return new WebSocket(targetUrl);
+    const targetUrl = new URL(webSocketUrl);
+    for (const key in opts.args[0]?.query) {
+      targetUrl.searchParams.set(key, opts.args[0].query[key]);
+    }
+    return new WebSocket(targetUrl.toString());
   }
   const req = new ClientRequestImpl(url, method);
   if (method) {