hono 4.2.4 → 4.2.6

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

@@ -16,8 +16,9 @@ var streamToNodeStream = async (reader, writer) => {
 var streamHandle = (app) => {
   return awslambda.streamifyResponse(
     async (event, responseStream, context) => {
+      const processor = getProcessor(event);
       try {
-        const req = createRequest(event);
+        const req = processor.createRequest(event);
         const requestContext = getRequestContext(event);
         const res = await app.fetch(req, {
           event,
@@ -45,81 +46,123 @@ var streamHandle = (app) => {
 };
 var handle = (app) => {
   return async (event, lambdaContext) => {
-    const req = createRequest(event);
+    const processor = getProcessor(event);
+    const req = processor.createRequest(event);
     const requestContext = getRequestContext(event);
     const res = await app.fetch(req, {
       event,
       requestContext,
       lambdaContext
     });
-    return createResult(event, res);
+    return processor.createResult(event, res);
   };
 };
-var createResult = async (event, res) => {
-  const contentType = res.headers.get("content-type");
-  let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
-  if (!isBase64Encoded) {
-    const contentEncoding = res.headers.get("content-encoding");
-    isBase64Encoded = isContentEncodingBinary(contentEncoding);
+var EventProcessor = class {
+  createRequest(event) {
+    const queryString = this.getQueryString(event);
+    const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers?.["host"] ?? event.multiValueHeaders?.["host"]?.[0];
+    const path = this.getPath(event);
+    const urlPath = `https://${domainName}${path}`;
+    const url = queryString ? `${urlPath}?${queryString}` : urlPath;
+    const headers = new Headers();
+    this.getCookies(event, headers);
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v) {
+          headers.set(k, v);
+        }
+      }
+    }
+    if (event.multiValueHeaders) {
+      for (const [k, values] of Object.entries(event.multiValueHeaders)) {
+        if (values) {
+          values.forEach((v) => headers.append(k, v));
+        }
+      }
+    }
+    const method = this.getMethod(event);
+    const requestInit = {
+      headers,
+      method
+    };
+    if (event.body) {
+      requestInit.body = event.isBase64Encoded ? Buffer.from(event.body, "base64") : event.body;
+    }
+    return new Request(url, requestInit);
   }
-  const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
-  const result = {
-    body,
-    headers: {},
-    statusCode: res.status,
-    isBase64Encoded
-  };
-  setCookies(event, res, result);
-  res.headers.forEach((value, key) => {
-    result.headers[key] = value;
-  });
-  return result;
-};
-var createRequest = (event) => {
-  const queryString = extractQueryString(event);
-  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers["host"];
-  const path = isProxyEventV2(event) ? event.rawPath : event.path;
-  const urlPath = `https://${domainName}${path}`;
-  const url = queryString ? `${urlPath}?${queryString}` : urlPath;
-  const headers = new Headers();
-  getCookies(event, headers);
-  for (const [k, v] of Object.entries(event.headers)) {
-    if (v) {
-      headers.set(k, v);
+  async createResult(event, res) {
+    const contentType = res.headers.get("content-type");
+    let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+    if (!isBase64Encoded) {
+      const contentEncoding = res.headers.get("content-encoding");
+      isBase64Encoded = isContentEncodingBinary(contentEncoding);
     }
+    const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
+    const result = {
+      body,
+      headers: {},
+      statusCode: res.status,
+      isBase64Encoded
+    };
+    this.setCookies(event, res, result);
+    res.headers.forEach((value, key) => {
+      result.headers[key] = value;
+    });
+    return result;
   }
-  const method = isProxyEventV2(event) ? event.requestContext.http.method : event.httpMethod;
-  const requestInit = {
-    headers,
-    method
+  setCookies = (event, res, result) => {
+    if (res.headers.has("set-cookie")) {
+      const cookies = res.headers.get("set-cookie")?.split(", ");
+      if (Array.isArray(cookies)) {
+        this.setCookiesToResult(result, cookies);
+        res.headers.delete("set-cookie");
+      }
+    }
   };
-  if (event.body) {
-    requestInit.body = event.isBase64Encoded ? Buffer.from(event.body, "base64") : event.body;
-  }
-  return new Request(url, requestInit);
 };
-var extractQueryString = (event) => {
-  return isProxyEventV2(event) ? event.rawQueryString : Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
-};
-var getCookies = (event, headers) => {
-  if (isProxyEventV2(event) && Array.isArray(event.cookies)) {
-    headers.set("Cookie", event.cookies.join("; "));
+var v2Processor = new class EventV2Processor extends EventProcessor {
+  getPath(event) {
+    return event.rawPath;
   }
-};
-var setCookies = (event, res, result) => {
-  if (res.headers.has("set-cookie")) {
-    const cookies = res.headers.get("set-cookie")?.split(", ");
-    if (Array.isArray(cookies)) {
-      if (isProxyEventV2(event)) {
-        result.cookies = cookies;
-      } else {
-        result.multiValueHeaders = {
-          "set-cookie": cookies
-        };
-      }
-      res.headers.delete("set-cookie");
+  getMethod(event) {
+    return event.requestContext.http.method;
+  }
+  getQueryString(event) {
+    return event.rawQueryString;
+  }
+  getCookies(event, headers) {
+    if (Array.isArray(event.cookies)) {
+      headers.set("Cookie", event.cookies.join("; "));
     }
   }
+  setCookiesToResult(result, cookies) {
+    result.cookies = cookies;
+  }
+}();
+var v1Processor = new class EventV1Processor extends EventProcessor {
+  getPath(event) {
+    return event.path;
+  }
+  getMethod(event) {
+    return event.httpMethod;
+  }
+  getQueryString(event) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  }
+  getCookies(event, headers) {
+  }
+  setCookiesToResult(result, cookies) {
+    result.multiValueHeaders = {
+      "set-cookie": cookies
+    };
+  }
+}();
+var getProcessor = (event) => {
+  if (isProxyEventV2(event)) {
+    return v2Processor;
+  } else {
+    return v1Processor;
+  }
 };
 var isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");

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

@@ -47,8 +47,9 @@ const streamToNodeStream = async (reader, writer) => {
 const streamHandle = (app) => {
   return awslambda.streamifyResponse(
     async (event, responseStream, context) => {
+      const processor = getProcessor(event);
       try {
-        const req = createRequest(event);
+        const req = processor.createRequest(event);
         const requestContext = getRequestContext(event);
         const res = await app.fetch(req, {
           event,
@@ -76,81 +77,123 @@ const streamHandle = (app) => {
 };
 const handle = (app) => {
   return async (event, lambdaContext) => {
-    const req = createRequest(event);
+    const processor = getProcessor(event);
+    const req = processor.createRequest(event);
     const requestContext = getRequestContext(event);
     const res = await app.fetch(req, {
       event,
       requestContext,
       lambdaContext
     });
-    return createResult(event, res);
+    return processor.createResult(event, res);
   };
 };
-const createResult = async (event, res) => {
-  const contentType = res.headers.get("content-type");
-  let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
-  if (!isBase64Encoded) {
-    const contentEncoding = res.headers.get("content-encoding");
-    isBase64Encoded = isContentEncodingBinary(contentEncoding);
-  }
-  const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
-  const result = {
-    body,
-    headers: {},
-    statusCode: res.status,
-    isBase64Encoded
-  };
-  setCookies(event, res, result);
-  res.headers.forEach((value, key) => {
-    result.headers[key] = value;
-  });
-  return result;
-};
-const createRequest = (event) => {
-  const queryString = extractQueryString(event);
-  const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers["host"];
-  const path = isProxyEventV2(event) ? event.rawPath : event.path;
-  const urlPath = `https://${domainName}${path}`;
-  const url = queryString ? `${urlPath}?${queryString}` : urlPath;
-  const headers = new Headers();
-  getCookies(event, headers);
-  for (const [k, v] of Object.entries(event.headers)) {
-    if (v) {
-      headers.set(k, v);
+class EventProcessor {
+  createRequest(event) {
+    const queryString = this.getQueryString(event);
+    const domainName = event.requestContext && "domainName" in event.requestContext ? event.requestContext.domainName : event.headers?.["host"] ?? event.multiValueHeaders?.["host"]?.[0];
+    const path = this.getPath(event);
+    const urlPath = `https://${domainName}${path}`;
+    const url = queryString ? `${urlPath}?${queryString}` : urlPath;
+    const headers = new Headers();
+    this.getCookies(event, headers);
+    if (event.headers) {
+      for (const [k, v] of Object.entries(event.headers)) {
+        if (v) {
+          headers.set(k, v);
+        }
+      }
+    }
+    if (event.multiValueHeaders) {
+      for (const [k, values] of Object.entries(event.multiValueHeaders)) {
+        if (values) {
+          values.forEach((v) => headers.append(k, v));
+        }
+      }
     }
+    const method = this.getMethod(event);
+    const requestInit = {
+      headers,
+      method
+    };
+    if (event.body) {
+      requestInit.body = event.isBase64Encoded ? Buffer.from(event.body, "base64") : event.body;
+    }
+    return new Request(url, requestInit);
+  }
+  async createResult(event, res) {
+    const contentType = res.headers.get("content-type");
+    let isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
+    if (!isBase64Encoded) {
+      const contentEncoding = res.headers.get("content-encoding");
+      isBase64Encoded = isContentEncodingBinary(contentEncoding);
+    }
+    const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
+    const result = {
+      body,
+      headers: {},
+      statusCode: res.status,
+      isBase64Encoded
+    };
+    this.setCookies(event, res, result);
+    res.headers.forEach((value, key) => {
+      result.headers[key] = value;
+    });
+    return result;
   }
-  const method = isProxyEventV2(event) ? event.requestContext.http.method : event.httpMethod;
-  const requestInit = {
-    headers,
-    method
+  setCookies = (event, res, result) => {
+    if (res.headers.has("set-cookie")) {
+      const cookies = res.headers.get("set-cookie")?.split(", ");
+      if (Array.isArray(cookies)) {
+        this.setCookiesToResult(result, cookies);
+        res.headers.delete("set-cookie");
+      }
+    }
   };
-  if (event.body) {
-    requestInit.body = event.isBase64Encoded ? Buffer.from(event.body, "base64") : event.body;
+}
+const v2Processor = new class EventV2Processor extends EventProcessor {
+  getPath(event) {
+    return event.rawPath;
   }
-  return new Request(url, requestInit);
-};
-const extractQueryString = (event) => {
-  return isProxyEventV2(event) ? event.rawQueryString : Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
-};
-const getCookies = (event, headers) => {
-  if (isProxyEventV2(event) && Array.isArray(event.cookies)) {
-    headers.set("Cookie", event.cookies.join("; "));
+  getMethod(event) {
+    return event.requestContext.http.method;
   }
-};
-const setCookies = (event, res, result) => {
-  if (res.headers.has("set-cookie")) {
-    const cookies = res.headers.get("set-cookie")?.split(", ");
-    if (Array.isArray(cookies)) {
-      if (isProxyEventV2(event)) {
-        result.cookies = cookies;
-      } else {
-        result.multiValueHeaders = {
-          "set-cookie": cookies
-        };
-      }
-      res.headers.delete("set-cookie");
+  getQueryString(event) {
+    return event.rawQueryString;
+  }
+  getCookies(event, headers) {
+    if (Array.isArray(event.cookies)) {
+      headers.set("Cookie", event.cookies.join("; "));
     }
   }
+  setCookiesToResult(result, cookies) {
+    result.cookies = cookies;
+  }
+}();
+const v1Processor = new class EventV1Processor extends EventProcessor {
+  getPath(event) {
+    return event.path;
+  }
+  getMethod(event) {
+    return event.httpMethod;
+  }
+  getQueryString(event) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  }
+  getCookies(event, headers) {
+  }
+  setCookiesToResult(result, cookies) {
+    result.multiValueHeaders = {
+      "set-cookie": cookies
+    };
+  }
+}();
+const getProcessor = (event) => {
+  if (isProxyEventV2(event)) {
+    return v2Processor;
+  } else {
+    return v1Processor;
+  }
 };
 const isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");

package/dist/cjs/client/client.js

@@ -115,8 +115,20 @@ class ClientRequestImpl {
     });
   };
 }
-const hc = (baseUrl, options) => createProxy((opts) => {
+const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   const parts = [...opts.path];
+  if (parts[parts.length - 1] === "toString") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback.toString();
+  }
+  if (parts[parts.length - 1] === "valueOf") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback;
+  }
   let method = "";
   if (/^\$/.test(parts[parts.length - 1])) {
     const last = parts.pop();

package/dist/cjs/client/utils.js

@@ -47,6 +47,9 @@ const replaceUrlProtocol = (urlString, protocol) => {
   }
 };
 const removeIndexString = (urlSting) => {
+  if (/^https?:\/\/[^\/]+?\/index$/.test(urlSting)) {
+    return urlSting.replace(/\/index$/, "/");
+  }
   return urlSting.replace(/\/index$/, "");
 };
 function isObject(item) {

package/dist/cjs/helper/ssg/utils.js

@@ -26,8 +26,8 @@ module.exports = __toCommonJS(utils_exports);
 var import_router = require("../../router");
 var import_handler = require("../../utils/handler");
 const dirname = (path) => {
-  const splitedPath = path.split(/[\/\\]/);
-  return splitedPath.slice(0, -1).join("/");
+  const splittedPath = path.split(/[\/\\]/);
+  return splittedPath.slice(0, -1).join("/");
 };
 const normalizePath = (path) => {
   return path.replace(/(\\)/g, "/").replace(/\/$/g, "");

package/dist/cjs/helper/streaming/sse.js

@@ -53,6 +53,8 @@ const run = async (stream, cb, onError) => {
     } else {
       console.error(e);
     }
+  } finally {
+    stream.close();
   }
 };
 const streamSSE = (c, cb, onError) => {

package/dist/cjs/jsx/dom/render.js

@@ -40,7 +40,7 @@ const buildDataStack = [];
 let nameSpaceContext = void 0;
 const isNodeString = (node) => Array.isArray(node);
 const getEventSpec = (key) => {
-  const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/);
+  const match = key.match(/^on([A-Z][a-zA-Z]+?(?:PointerCapture)?)(Capture)?$/);
   if (match) {
     const [, eventName, capture] = match;
     return [(eventAliasMap[eventName] || eventName).toLowerCase(), !!capture];

package/dist/client/client.js

@@ -99,8 +99,20 @@ var ClientRequestImpl = class {
     });
   };
 };
-var hc = (baseUrl, options) => createProxy((opts) => {
+var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   const parts = [...opts.path];
+  if (parts[parts.length - 1] === "toString") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback.toString();
+  }
+  if (parts[parts.length - 1] === "valueOf") {
+    if (parts[parts.length - 2] === "name") {
+      return parts[parts.length - 3] || "";
+    }
+    return proxyCallback;
+  }
   let method = "";
   if (/^\$/.test(parts[parts.length - 1])) {
     const last = parts.pop();

package/dist/client/utils.js

@@ -21,6 +21,9 @@ var replaceUrlProtocol = (urlString, protocol) => {
   }
 };
 var removeIndexString = (urlSting) => {
+  if (/^https?:\/\/[^\/]+?\/index$/.test(urlSting)) {
+    return urlSting.replace(/\/index$/, "/");
+  }
   return urlSting.replace(/\/index$/, "");
 };
 function isObject(item) {

package/dist/helper/ssg/utils.js

@@ -2,8 +2,8 @@
 import { METHOD_NAME_ALL } from "../../router.js";
 import { findTargetHandler, isMiddleware } from "../../utils/handler.js";
 var dirname = (path) => {
-  const splitedPath = path.split(/[\/\\]/);
-  return splitedPath.slice(0, -1).join("/");
+  const splittedPath = path.split(/[\/\\]/);
+  return splittedPath.slice(0, -1).join("/");
 };
 var normalizePath = (path) => {
   return path.replace(/(\\)/g, "/").replace(/\/$/g, "");

package/dist/helper/streaming/sse.js

@@ -30,6 +30,8 @@ var run = async (stream, cb, onError) => {
     } else {
       console.error(e);
     }
+  } finally {
+    stream.close();
   }
 };
 var streamSSE = (c, cb, onError) => {

package/dist/jsx/dom/render.js

@@ -15,7 +15,7 @@ var buildDataStack = [];
 var nameSpaceContext = void 0;
 var isNodeString = (node) => Array.isArray(node);
 var getEventSpec = (key) => {
-  const match = key.match(/^on([A-Z][a-zA-Z]+?)((?<!Pointer)Capture)?$/);
+  const match = key.match(/^on([A-Z][a-zA-Z]+?(?:PointerCapture)?)(Capture)?$/);
   if (match) {
     const [, eventName, capture] = match;
     return [(eventAliasMap[eventName] || eventName).toLowerCase(), !!capture];

package/dist/types/adapter/aws-lambda/handler.d.ts

@@ -7,6 +7,7 @@ export interface APIGatewayProxyEventV2 {
     version: string;
     routeKey: string;
     headers: Record<string, string | undefined>;
+    multiValueHeaders?: undefined;
     cookies?: string[];
     rawPath: string;
     rawQueryString: string;
@@ -44,7 +45,8 @@ export interface APIGatewayProxyEvent {
 }
 export interface ALBProxyEvent {
     httpMethod: string;
-    headers: Record<string, string | undefined>;
+    headers?: Record<string, string | undefined>;
+    multiValueHeaders?: Record<string, string[] | undefined>;
     path: string;
     body: string | null;
     isBase64Encoded: boolean;

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

@@ -23,15 +23,15 @@ export type ClientRequest<S extends Schema> = {
     } ? {
         param: P;
     } : {} : {}) => URL;
-} & {
-    $ws: S['$get'] extends {
-        input: {
-            json: UpgradedWebSocketResponseInputJSONType;
-        };
-    } ? S['$get'] extends {
-        input: infer I;
-    } ? (args?: Omit<I, 'json'>) => WebSocket : never : never;
-};
+} & (S['$get'] extends {
+    input: {
+        json: UpgradedWebSocketResponseInputJSONType;
+    };
+} ? S['$get'] extends {
+    input: infer I;
+} ? {
+    $ws: (args?: Omit<I, 'json'>) => WebSocket;
+} : {} : {});
 type BlankRecordToNever<T> = T extends any ? T extends null ? null : keyof T extends never ? never : T : never;
 export interface ClientResponse<T> {
     readonly body: ReadableStream | null;

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

@@ -9,7 +9,7 @@ export interface WSEvents {
     onClose?: (evt: CloseEvent, ws: WSContext) => void;
     onError?: (evt: Event, ws: WSContext) => void;
 }
-export type UpgradedWebSocketResponseInputJSONType = '__websocket' | undefined;
+export type UpgradedWebSocketResponseInputJSONType = '__websocket';
 /**
  * Upgrade WebSocket Type
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.2.4",
+  "version": "4.2.6",
   "description": "Ultrafast web framework for the Edges",
   "main": "dist/cjs/index.js",
   "type": "module",