hono 3.3.2 → 3.3.4

package/dist/adapter/bun/serve-static.js

@@ -17,6 +17,8 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     if (existsSync(path)) {
       const content = file(path);

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

@@ -11,6 +11,17 @@ var handle = (subApp, path) => (eventContext) => {
     }
   );
 };
+var serveStatic = () => {
+  return async (c) => {
+    const env = c.env;
+    const res = await env.ASSETS.fetch(c.req.raw);
+    if (res.status === 404) {
+      return c.notFound();
+    }
+    return res;
+  };
+};
 export {
-  handle
+  handle,
+  serveStatic
 };

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

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

package/dist/adapter/cloudflare-workers/serve-static.js

@@ -16,6 +16,8 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     const content = await getContentFromKVAsset(path, {
       manifest: options.manifest,
       namespace: options.namespace ? options.namespace : c.env ? c.env.__STATIC_CONTENT : void 0

package/dist/adapter/deno/serve-static.js

@@ -16,6 +16,8 @@ var serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     let file;
     try {

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

@@ -2,14 +2,24 @@
 import crypto from "crypto";
 import { encodeBase64 } from "../../utils/encode.js";
 globalThis.crypto ?? (globalThis.crypto = crypto);
+var convertHeaders = (headers) => {
+  const cfHeaders = {};
+  headers.forEach((value, key) => {
+    cfHeaders[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
+  });
+  return cfHeaders;
+};
 var handle = (app) => {
   return async (event, context, callback) => {
-    const req = createRequest(event);
-    const res = await app.fetch(req, {
+    const res = await app.fetch(createRequest(event), {
       event,
       context,
-      callback,
-      request: event.Records[0].cf.request
+      callback: (err, result) => {
+        callback?.(err, result);
+      },
+      config: event.Records[0].cf.config,
+      request: event.Records[0].cf.request,
+      response: event.Records[0].cf.response
     });
     return createResult(res);
   };
@@ -17,35 +27,27 @@ var handle = (app) => {
 var createResult = async (res) => {
   const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
   const body = isBase64Encoded ? encodeBase64(await res.arrayBuffer()) : await res.text();
-  const headers = {};
-  res.headers.forEach((value, key) => {
-    headers[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
-  });
   return {
     status: res.status.toString(),
-    headers,
+    headers: convertHeaders(res.headers),
     body
   };
 };
 var createRequest = (event) => {
-  const queryString = extractQueryString(event);
+  const queryString = event.Records[0].cf.request.querystring;
   const urlPath = `https://${event.Records[0].cf.config.distributionDomainName}${event.Records[0].cf.request.uri}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
-  for (const [k, v] of Object.entries(event.Records[0].cf.request.headers)) {
+  Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
     v.forEach((header) => headers.set(k, header.value));
-  }
-  const method = event.Records[0].cf.request.method;
-  const requestInit = {
-    headers,
-    method
-  };
+  });
   const requestBody = event.Records[0].cf.request.body;
-  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
-  return new Request(url, requestInit);
-};
-var extractQueryString = (event) => {
-  return event.Records[0].cf.request.querystring;
+  const body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
+  return new Request(url, {
+    headers,
+    method: event.Records[0].cf.request.method,
+    body
+  });
 };
 var isContentTypeBinary = (contentType) => {
   return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(

package/dist/cjs/adapter/bun/serve-static.js

@@ -39,6 +39,8 @@ const serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     if ((0, import_fs.existsSync)(path)) {
       const content = file(path);

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

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var handler_exports = {};
 __export(handler_exports, {
-  handle: () => handle
+  handle: () => handle,
+  serveStatic: () => serveStatic
 });
 module.exports = __toCommonJS(handler_exports);
 var import_hono = require("../../hono");
@@ -33,7 +34,18 @@ const handle = (subApp, path) => (eventContext) => {
     }
   );
 };
+const serveStatic = () => {
+  return async (c) => {
+    const env = c.env;
+    const res = await env.ASSETS.fetch(c.req.raw);
+    if (res.status === 404) {
+      return c.notFound();
+    }
+    return res;
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  handle
+  handle,
+  serveStatic
 });

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

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

package/dist/cjs/adapter/cloudflare-workers/serve-static.js

@@ -38,6 +38,8 @@ const serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     const content = await (0, import_cloudflare.getContentFromKVAsset)(path, {
       manifest: options.manifest,
       namespace: options.namespace ? options.namespace : c.env ? c.env.__STATIC_CONTENT : void 0

package/dist/cjs/adapter/deno/serve-static.js

@@ -38,6 +38,8 @@ const serveStatic = (options = { root: "" }) => {
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });
+    if (!path)
+      return await next();
     path = `./${path}`;
     let file;
     try {

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

@@ -31,14 +31,24 @@ module.exports = __toCommonJS(handler_exports);
 var import_crypto = __toESM(require("crypto"), 1);
 var import_encode = require("../../utils/encode");
 globalThis.crypto ?? (globalThis.crypto = import_crypto.default);
+const convertHeaders = (headers) => {
+  const cfHeaders = {};
+  headers.forEach((value, key) => {
+    cfHeaders[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
+  });
+  return cfHeaders;
+};
 const handle = (app) => {
   return async (event, context, callback) => {
-    const req = createRequest(event);
-    const res = await app.fetch(req, {
+    const res = await app.fetch(createRequest(event), {
       event,
       context,
-      callback,
-      request: event.Records[0].cf.request
+      callback: (err, result) => {
+        callback?.(err, result);
+      },
+      config: event.Records[0].cf.config,
+      request: event.Records[0].cf.request,
+      response: event.Records[0].cf.response
     });
     return createResult(res);
   };
@@ -46,35 +56,27 @@ const handle = (app) => {
 const createResult = async (res) => {
   const isBase64Encoded = isContentTypeBinary(res.headers.get("content-type") || "");
   const body = isBase64Encoded ? (0, import_encode.encodeBase64)(await res.arrayBuffer()) : await res.text();
-  const headers = {};
-  res.headers.forEach((value, key) => {
-    headers[key.toLowerCase()] = [{ key: key.toLowerCase(), value }];
-  });
   return {
     status: res.status.toString(),
-    headers,
+    headers: convertHeaders(res.headers),
     body
   };
 };
 const createRequest = (event) => {
-  const queryString = extractQueryString(event);
+  const queryString = event.Records[0].cf.request.querystring;
   const urlPath = `https://${event.Records[0].cf.config.distributionDomainName}${event.Records[0].cf.request.uri}`;
   const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
-  for (const [k, v] of Object.entries(event.Records[0].cf.request.headers)) {
+  Object.entries(event.Records[0].cf.request.headers).forEach(([k, v]) => {
     v.forEach((header) => headers.set(k, header.value));
-  }
-  const method = event.Records[0].cf.request.method;
-  const requestInit = {
-    headers,
-    method
-  };
+  });
   const requestBody = event.Records[0].cf.request.body;
-  requestInit.body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
-  return new Request(url, requestInit);
-};
-const extractQueryString = (event) => {
-  return event.Records[0].cf.request.querystring;
+  const body = requestBody?.encoding === "base64" && requestBody?.data ? Buffer.from(requestBody.data, "base64") : requestBody?.data;
+  return new Request(url, {
+    headers,
+    method: event.Records[0].cf.request.method,
+    body
+  });
 };
 const isContentTypeBinary = (contentType) => {
   return !/^(text\/(plain|html|css|javascript|csv).*|application\/(.*json|.*xml).*|image\/svg\+xml)$/.test(

package/dist/cjs/hono-base.js

@@ -117,7 +117,7 @@ class Hono extends defineDynamicClass() {
     const strict = init.strict ?? true;
     delete init.strict;
     Object.assign(this, init);
-    this.getPath || (this.getPath = strict ? import_url.getPath : import_url.getPathNoStrict);
+    this.getPath = strict ? init.getPath ?? import_url.getPath : import_url.getPathNoStrict;
   }
   clone() {
     const clone = new Hono({

package/dist/cjs/utils/filepath.js

@@ -23,6 +23,8 @@ __export(filepath_exports, {
 module.exports = __toCommonJS(filepath_exports);
 const getFilePath = (options) => {
   let filename = options.filename;
+  if (/(?:^|\/)\.\.(?:$|\/)/.test(filename))
+    return;
   let root = options.root || "";
   const defaultDocument = options.defaultDocument || "index.html";
   if (filename.endsWith("/")) {

package/dist/cjs/utils/html.js

@@ -21,7 +21,7 @@ __export(html_exports, {
   escapeToBuffer: () => escapeToBuffer
 });
 module.exports = __toCommonJS(html_exports);
-const escapeRe = /[&<>"]/;
+const escapeRe = /[&<>'"]/;
 const escapeToBuffer = (str, buffer) => {
   const match = str.search(escapeRe);
   if (match === -1) {
@@ -36,6 +36,9 @@ const escapeToBuffer = (str, buffer) => {
       case 34:
         escape = "&quot;";
         break;
+      case 39:
+        escape = "&#39;";
+        break;
       case 38:
         escape = "&amp;";
         break;

package/dist/hono-base.js

@@ -95,7 +95,7 @@ var Hono = class extends defineDynamicClass() {
     const strict = init.strict ?? true;
     delete init.strict;
     Object.assign(this, init);
-    this.getPath || (this.getPath = strict ? getPath : getPathNoStrict);
+    this.getPath = strict ? init.getPath ?? getPath : getPathNoStrict;
   }
   clone() {
     const clone = new Hono({

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

@@ -1,4 +1,5 @@
 import type { Hono } from '../../hono';
+import type { Env } from '../../types';
 interface APIGatewayProxyEventV2 {
     httpMethod: string;
     headers: Record<string, string | undefined>;
@@ -43,6 +44,6 @@ interface APIGatewayProxyResult {
 /**
  * Accepts events from API Gateway/ELB(`APIGatewayProxyEvent`) and directly through Function Url(`APIGatewayProxyEventV2`)
  */
-export declare const handle: (app: Hono) => (event: APIGatewayProxyEvent | APIGatewayProxyEventV2 | LambdaFunctionUrlEvent) => Promise<APIGatewayProxyResult>;
+export declare const handle: <E extends Env = Env, S = {}, BasePath extends string = "/">(app: Hono<E, S, BasePath>) => (event: APIGatewayProxyEvent | APIGatewayProxyEventV2 | LambdaFunctionUrlEvent) => Promise<APIGatewayProxyResult>;
 export declare const isContentTypeBinary: (contentType: string) => boolean;
 export {};

package/dist/types/adapter/bun/serve-static.d.ts

@@ -5,4 +5,4 @@ export declare type ServeStaticOptions = {
     path?: string;
     rewriteRequestPath?: (path: string) => string;
 };
-export declare const serveStatic: (options?: ServeStaticOptions) => (c: Context, next: Next) => Promise<Response | undefined>;
+export declare const serveStatic: (options?: ServeStaticOptions) => (c: Context, next: Next) => Promise<void | Response>;

package/dist/types/adapter/cloudflare-pages/handler.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from '../../hono';
-import type { Env } from '../../types';
+import type { Env, MiddlewareHandler } from '../../types';
 declare type Params<P extends string = any> = Record<P, string | string[]>;
 export declare type EventContext<Env = {}, P extends string = any, Data = {}> = {
     request: Request;
@@ -24,4 +24,11 @@ interface HandleInterface {
     <E extends Env, S extends {}, BasePath extends string>(app: Hono<E, S, BasePath>, path: string): (eventContext: EventContext) => Response | Promise<Response>;
 }
 export declare const handle: HandleInterface;
+/**
+ *
+ * @description `serveStatic()` is for advanced mode:
+ * https://developers.cloudflare.com/pages/platform/functions/advanced-mode/#set-up-a-function
+ *
+ */
+export declare const serveStatic: () => MiddlewareHandler;
 export {};

package/dist/types/adapter/cloudflare-pages/index.d.ts

@@ -1,2 +1,2 @@
-export { handle } from './handler';
+export { handle, serveStatic } from './handler';
 export type { EventContext } from './handler';

package/dist/types/adapter/deno/serve-static.d.ts

@@ -5,4 +5,4 @@ export declare type ServeStaticOptions = {
     path?: string;
     rewriteRequestPath?: (path: string) => string;
 };
-export declare const serveStatic: (options?: ServeStaticOptions) => (c: Context, next: Next) => Promise<Response | undefined>;
+export declare const serveStatic: (options?: ServeStaticOptions) => (c: Context, next: Next) => Promise<void | Response>;

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

@@ -32,7 +32,12 @@ export interface CloudFrontRequest {
         custom: CloudFrontCustomOrigin;
     };
 }
-interface CloudFrontConfig {
+export interface CloudFrontResponse {
+    headers: CloudFrontHeaders;
+    status: string;
+    statusDescription?: string;
+}
+export interface CloudFrontConfig {
     distributionDomainName: string;
     distributionId: string;
     eventType: string;
@@ -42,6 +47,7 @@ interface CloudFrontEvent {
     cf: {
         config: CloudFrontConfig;
         request: CloudFrontRequest;
+        response?: CloudFrontResponse;
     };
 }
 export interface CloudFrontEdgeEvent {
@@ -63,10 +69,6 @@ interface CloudFrontResult {
     body?: string;
     bodyEncoding?: 'text' | 'base64';
 }
-/**
- * Accepts events from 'Lambda@Edge' event
- * https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html
- */
 export declare const handle: (app: Hono<any>) => (event: CloudFrontEdgeEvent, context?: CloudFrontContext, callback?: Callback) => Promise<CloudFrontResult>;
 export declare const isContentTypeBinary: (contentType: string) => boolean;
 export {};

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

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

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

@@ -3,5 +3,5 @@ declare type FilePathOptions = {
     root?: string;
     defaultDocument?: string;
 };
-export declare const getFilePath: (options: FilePathOptions) => string;
+export declare const getFilePath: (options: FilePathOptions) => string | undefined;
 export {};

package/dist/utils/filepath.js

@@ -1,6 +1,8 @@
 // src/utils/filepath.ts
 var getFilePath = (options) => {
   let filename = options.filename;
+  if (/(?:^|\/)\.\.(?:$|\/)/.test(filename))
+    return;
   let root = options.root || "";
   const defaultDocument = options.defaultDocument || "index.html";
   if (filename.endsWith("/")) {

package/dist/utils/html.js

@@ -1,5 +1,5 @@
 // src/utils/html.ts
-var escapeRe = /[&<>"]/;
+var escapeRe = /[&<>'"]/;
 var escapeToBuffer = (str, buffer) => {
   const match = str.search(escapeRe);
   if (match === -1) {
@@ -14,6 +14,9 @@ var escapeToBuffer = (str, buffer) => {
       case 34:
         escape = "&quot;";
         break;
+      case 39:
+        escape = "&#39;";
+        break;
       case 38:
         escape = "&amp;";
         break;

package/package.json

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