hono 3.2.4 → 3.2.6

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

@@ -1,5 +1,6 @@
 // src/adapter/aws-lambda/handler.ts
 import crypto from "crypto";
+import { encodeBase64 } from "../../utils/encode.js";
 globalThis.crypto = crypto;
 var handle = (app) => {
   return async (event) => {
@@ -11,7 +12,13 @@ var handle = (app) => {
 var createResult = async (res) => {
   const contentType = res.headers.get("content-type");
   const isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
-  const body = isBase64Encoded ? await fromReadableToString(res) : await res.text();
+  let body;
+  if (isBase64Encoded) {
+    const buffer = await res.arrayBuffer();
+    body = encodeBase64(buffer);
+  } else {
+    body = await res.text();
+  }
   const result = {
     body,
     headers: {},
@@ -54,15 +61,6 @@ var isProxyEvent = (event) => {
 var isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");
 };
-var fromReadableToString = async (res) => {
-  const stream = res.body || new ReadableStream();
-  const decoder = new TextDecoder();
-  let string = "";
-  for await (const chunk of stream) {
-    string += decoder.decode(chunk);
-  }
-  return btoa(string);
-};
 var isContentTypeBinary = (contentType) => {
   return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(
     contentType

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

@@ -29,6 +29,7 @@ __export(handler_exports, {
 });
 module.exports = __toCommonJS(handler_exports);
 var import_crypto = __toESM(require("crypto"), 1);
+var import_encode = require("../../utils/encode");
 globalThis.crypto = import_crypto.default;
 const handle = (app) => {
   return async (event) => {
@@ -40,7 +41,13 @@ const handle = (app) => {
 const createResult = async (res) => {
   const contentType = res.headers.get("content-type");
   const isBase64Encoded = contentType && isContentTypeBinary(contentType) ? true : false;
-  const body = isBase64Encoded ? await fromReadableToString(res) : await res.text();
+  let body;
+  if (isBase64Encoded) {
+    const buffer = await res.arrayBuffer();
+    body = (0, import_encode.encodeBase64)(buffer);
+  } else {
+    body = await res.text();
+  }
   const result = {
     body,
     headers: {},
@@ -83,15 +90,6 @@ const isProxyEvent = (event) => {
 const isProxyEventV2 = (event) => {
   return Object.prototype.hasOwnProperty.call(event, "rawPath");
 };
-const fromReadableToString = async (res) => {
-  const stream = res.body || new ReadableStream();
-  const decoder = new TextDecoder();
-  let string = "";
-  for await (const chunk of stream) {
-    string += decoder.decode(chunk);
-  }
-  return btoa(string);
-};
 const isContentTypeBinary = (contentType) => {
   return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(
     contentType

package/dist/cjs/http-exception.js

@@ -32,8 +32,7 @@ class HTTPException extends Error {
       return this.res;
     }
     return new Response(this.message, {
-      status: this.status,
-      statusText: this.message
+      status: this.status
     });
   }
 }

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

@@ -104,19 +104,23 @@ class JSXNode {
     buffer[0] += `<${tag}`;
     const propsKeys = Object.keys(props || {});
     for (let i = 0, len = propsKeys.length; i < len; i++) {
-      const v = props[propsKeys[i]];
-      if (typeof v === "string") {
-        buffer[0] += ` ${propsKeys[i]}="`;
+      const key = propsKeys[i];
+      const v = props[key];
+      if (key === "style" && typeof v === "object") {
+        const styles = Object.keys(v).map((k) => `${k}:${v[k]}`).join(";").replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
+        buffer[0] += ` style="${styles}"`;
+      } else if (typeof v === "string") {
+        buffer[0] += ` ${key}="`;
         (0, import_html.escapeToBuffer)(v, buffer);
         buffer[0] += '"';
       } else if (typeof v === "number") {
-        buffer[0] += ` ${propsKeys[i]}="${v}"`;
+        buffer[0] += ` ${key}="${v}"`;
       } else if (v === null || v === void 0) {
-      } else if (typeof v === "boolean" && booleanAttributes.includes(propsKeys[i])) {
+      } else if (typeof v === "boolean" && booleanAttributes.includes(key)) {
         if (v) {
-          buffer[0] += ` ${propsKeys[i]}=""`;
+          buffer[0] += ` ${key}=""`;
         }
-      } else if (propsKeys[i] === "dangerouslySetInnerHTML") {
+      } else if (key === "dangerouslySetInnerHTML") {
         if (children.length > 0) {
           throw "Can only set one of `children` or `props.dangerouslySetInnerHTML`.";
         }
@@ -124,7 +128,7 @@ class JSXNode {
         escapedString.isEscaped = true;
         children = [escapedString];
       } else {
-        buffer[0] += ` ${propsKeys[i]}="`;
+        buffer[0] += ` ${key}="`;
         (0, import_html.escapeToBuffer)(v.toString(), buffer);
         buffer[0] += '"';
       }

package/dist/cjs/utils/body.js

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(body_exports);
 async function parseBody(r) {
   let body = {};
   const contentType = r.headers.get("Content-Type");
-  if (contentType && (contentType.startsWith("multipart/form-data") || contentType === "application/x-www-form-urlencoded")) {
+  if (contentType && (contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded"))) {
     const form = {};
     (await r.formData()).forEach((value, key) => {
       form[key] = value;

package/dist/cjs/utils/cookie.js

@@ -35,7 +35,7 @@ const parse = (cookie) => {
 const serialize = (name, value, opt = {}) => {
   value = encodeURIComponent(value);
   let cookie = `${name}=${value}`;
-  if (opt.maxAge) {
+  if (opt.maxAge && opt.maxAge >= 0) {
     cookie += `; Max-Age=${Math.floor(opt.maxAge)}`;
   }
   if (opt.domain) {

package/dist/cjs/utils/encode.js

@@ -29,7 +29,11 @@ const decodeBase64Url = (str) => {
 };
 const encodeBase64Url = (buf) => encodeBase64(buf).replace(/\/|\+/g, (m) => ({ "/": "_", "+": "-" })[m] ?? m);
 const encodeBase64 = (buf) => {
-  const binary = String.fromCharCode(...new Uint8Array(buf));
+  let binary = "";
+  const bytes = new Uint8Array(buf);
+  for (let i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
   return btoa(binary);
 };
 const decodeBase64 = (str) => {

package/dist/http-exception.js

@@ -10,8 +10,7 @@ var HTTPException = class extends Error {
       return this.res;
     }
     return new Response(this.message, {
-      status: this.status,
-      statusText: this.message
+      status: this.status
     });
   }
 };

package/dist/middleware/jsx/index.js

@@ -79,19 +79,23 @@ var JSXNode = class {
     buffer[0] += `<${tag}`;
     const propsKeys = Object.keys(props || {});
     for (let i = 0, len = propsKeys.length; i < len; i++) {
-      const v = props[propsKeys[i]];
-      if (typeof v === "string") {
-        buffer[0] += ` ${propsKeys[i]}="`;
+      const key = propsKeys[i];
+      const v = props[key];
+      if (key === "style" && typeof v === "object") {
+        const styles = Object.keys(v).map((k) => `${k}:${v[k]}`).join(";").replace(/[A-Z]/g, (match) => `-${match.toLowerCase()}`);
+        buffer[0] += ` style="${styles}"`;
+      } else if (typeof v === "string") {
+        buffer[0] += ` ${key}="`;
         escapeToBuffer(v, buffer);
         buffer[0] += '"';
       } else if (typeof v === "number") {
-        buffer[0] += ` ${propsKeys[i]}="${v}"`;
+        buffer[0] += ` ${key}="${v}"`;
       } else if (v === null || v === void 0) {
-      } else if (typeof v === "boolean" && booleanAttributes.includes(propsKeys[i])) {
+      } else if (typeof v === "boolean" && booleanAttributes.includes(key)) {
         if (v) {
-          buffer[0] += ` ${propsKeys[i]}=""`;
+          buffer[0] += ` ${key}=""`;
         }
-      } else if (propsKeys[i] === "dangerouslySetInnerHTML") {
+      } else if (key === "dangerouslySetInnerHTML") {
         if (children.length > 0) {
           throw "Can only set one of `children` or `props.dangerouslySetInnerHTML`.";
         }
@@ -99,7 +103,7 @@ var JSXNode = class {
         escapedString.isEscaped = true;
         children = [escapedString];
       } else {
-        buffer[0] += ` ${propsKeys[i]}="`;
+        buffer[0] += ` ${key}="`;
         escapeToBuffer(v.toString(), buffer);
         buffer[0] += '"';
       }

package/dist/types/context.d.ts

@@ -3,7 +3,7 @@ import type { TypedResponse } from './types';
 import type { Env, NotFoundHandler, Input } from './types';
 import type { CookieOptions } from './utils/cookie';
 import type { StatusCode } from './utils/http-status';
-import type { JSONValue } from './utils/types';
+import type { JSONValue, InterfaceToType } from './utils/types';
 declare type Runtime = 'node' | 'deno' | 'bun' | 'workerd' | 'fastly' | 'edge-light' | 'lagon' | 'other';
 declare type HeaderRecord = Record<string, string | string[]>;
 declare type Data = string | ArrayBuffer | ReadableStream;
@@ -36,8 +36,10 @@ interface JSONRespond {
     <T = JSONValue>(object: T, init?: ResponseInit): Response;
 }
 interface JSONTRespond {
-    <T>(object: T extends JSONValue ? T : JSONValue, status?: StatusCode, headers?: HeaderRecord): TypedResponse<T extends JSONValue ? (JSONValue extends T ? never : T) : never>;
-    <T>(object: T extends JSONValue ? T : JSONValue, init?: ResponseInit): TypedResponse<T extends JSONValue ? (JSONValue extends T ? never : T) : never>;
+    <T>(object: T extends JSONValue ? T : JSONValue, status?: StatusCode, headers?: HeaderRecord): TypedResponse<InterfaceToType<T> extends JSONValue ? JSONValue extends InterfaceToType<T> ? never : T : never>;
+    <T>(object: InterfaceToType<T> extends JSONValue ? T : JSONValue, status?: StatusCode, headers?: HeaderRecord): TypedResponse<InterfaceToType<T> extends JSONValue ? JSONValue extends InterfaceToType<T> ? never : T : never>;
+    <T>(object: T extends JSONValue ? T : JSONValue, init?: ResponseInit): TypedResponse<InterfaceToType<T> extends JSONValue ? JSONValue extends InterfaceToType<T> ? never : T : never>;
+    <T>(object: InterfaceToType<T> extends JSONValue ? T : JSONValue, init?: ResponseInit): TypedResponse<InterfaceToType<T> extends JSONValue ? JSONValue extends InterfaceToType<T> ? never : T : never>;
 }
 interface HTMLRespond {
     (html: string, status?: StatusCode, headers?: HeaderRecord): Response;

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

@@ -9,3 +9,6 @@ export declare type JSONObject = {
     [key: string]: JSONPrimitive | JSONArray | JSONObject;
 };
 export declare type JSONValue = JSONObject | JSONArray | JSONPrimitive;
+export declare type InterfaceToType<T> = T extends Function ? T : {
+    [K in keyof T]: InterfaceToType<T[K]>;
+};

package/dist/utils/body.js

@@ -2,7 +2,7 @@
 async function parseBody(r) {
   let body = {};
   const contentType = r.headers.get("Content-Type");
-  if (contentType && (contentType.startsWith("multipart/form-data") || contentType === "application/x-www-form-urlencoded")) {
+  if (contentType && (contentType.startsWith("multipart/form-data") || contentType.startsWith("application/x-www-form-urlencoded"))) {
     const form = {};
     (await r.formData()).forEach((value, key) => {
       form[key] = value;

package/dist/utils/cookie.js

@@ -12,7 +12,7 @@ var parse = (cookie) => {
 var serialize = (name, value, opt = {}) => {
   value = encodeURIComponent(value);
   let cookie = `${name}=${value}`;
-  if (opt.maxAge) {
+  if (opt.maxAge && opt.maxAge >= 0) {
     cookie += `; Max-Age=${Math.floor(opt.maxAge)}`;
   }
   if (opt.domain) {

package/dist/utils/encode.js

@@ -4,7 +4,11 @@ var decodeBase64Url = (str) => {
 };
 var encodeBase64Url = (buf) => encodeBase64(buf).replace(/\/|\+/g, (m) => ({ "/": "_", "+": "-" })[m] ?? m);
 var encodeBase64 = (buf) => {
-  const binary = String.fromCharCode(...new Uint8Array(buf));
+  let binary = "";
+  const bytes = new Uint8Array(buf);
+  for (let i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
   return btoa(binary);
 };
 var decodeBase64 = (str) => {

package/package.json

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