hono 3.1.8 → 3.2.0-rc.2

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

@@ -5,27 +5,34 @@ var handle = (app) => {
   return async (event) => {
     const req = createRequest(event);
     const res = await app.fetch(req);
-    const arrayBuffer = await res.arrayBuffer();
-    const result = {
-      statusCode: res.status,
-      body: String.fromCharCode(...new Uint8Array(arrayBuffer)),
-      headers: {},
-      isBase64Encoded: false
-    };
-    res.headers.forEach((value, key) => {
-      result.headers[key] = value;
-    });
-    return result;
+    return createResult(res);
   };
 };
+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();
+  const result = {
+    body,
+    headers: {},
+    statusCode: res.status,
+    isBase64Encoded
+  };
+  res.headers.forEach((value, key) => {
+    result.headers[key] = value;
+  });
+  return result;
+};
 var createRequest = (event) => {
-  const url = `https://${event.requestContext.domainName}${event.path}`;
+  const queryString = extractQueryString(event);
+  const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
+  const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   for (const [k, v] of Object.entries(event.headers)) {
     if (v)
       headers.set(k, v);
   }
-  const method = event.httpMethod;
+  const method = "httpMethod" in event ? event.httpMethod : event.requestContext.http.method;
   const requestInit = {
     headers,
     method
@@ -35,6 +42,33 @@ var createRequest = (event) => {
   }
   return new Request(url, requestInit);
 };
+var extractQueryString = (event) => {
+  if (isProxyEvent(event)) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  }
+  return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
+};
+var isProxyEvent = (event) => {
+  return Object.prototype.hasOwnProperty.call(event, "path");
+};
+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
+  );
+};
 export {
-  handle
+  handle,
+  isContentTypeBinary
 };

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

@@ -11,8 +11,9 @@ var serveStatic = (options = { root: "" }) => {
       return;
     }
     const url = new URL(c.req.url);
+    const filename = options.path ?? decodeURI(url.pathname);
     let path = getFilePath({
-      filename: options.path ?? decodeURI(url.pathname),
+      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });

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

@@ -10,8 +10,9 @@ var serveStatic = (options = { root: "" }) => {
       return;
     }
     const url = new URL(c.req.url);
+    const filename = options.path ?? decodeURI(url.pathname);
     const path = getFilePath({
-      filename: options.path ?? decodeURI(url.pathname),
+      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });

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

@@ -9,8 +9,9 @@ var serveStatic = (options = { root: "" }) => {
       return;
     }
     const url = new URL(c.req.url);
+    const filename = options.path ?? decodeURI(url.pathname);
     let path = getFilePath({
-      filename: options.path ?? decodeURI(url.pathname),
+      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });

package/dist/adapter/vercel/handler.js

@@ -0,0 +1,7 @@
+// src/adapter/vercel/handler.ts
+var handle = (app) => (req) => {
+  return app.fetch(req);
+};
+export {
+  handle
+};

package/dist/adapter/vercel/index.js

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

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

@@ -24,7 +24,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var handler_exports = {};
 __export(handler_exports, {
-  handle: () => handle
+  handle: () => handle,
+  isContentTypeBinary: () => isContentTypeBinary
 });
 module.exports = __toCommonJS(handler_exports);
 var import_crypto = __toESM(require("crypto"), 1);
@@ -33,27 +34,34 @@ const handle = (app) => {
   return async (event) => {
     const req = createRequest(event);
     const res = await app.fetch(req);
-    const arrayBuffer = await res.arrayBuffer();
-    const result = {
-      statusCode: res.status,
-      body: String.fromCharCode(...new Uint8Array(arrayBuffer)),
-      headers: {},
-      isBase64Encoded: false
-    };
-    res.headers.forEach((value, key) => {
-      result.headers[key] = value;
-    });
-    return result;
+    return createResult(res);
   };
 };
+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();
+  const result = {
+    body,
+    headers: {},
+    statusCode: res.status,
+    isBase64Encoded
+  };
+  res.headers.forEach((value, key) => {
+    result.headers[key] = value;
+  });
+  return result;
+};
 const createRequest = (event) => {
-  const url = `https://${event.requestContext.domainName}${event.path}`;
+  const queryString = extractQueryString(event);
+  const urlPath = `https://${event.requestContext.domainName}${isProxyEvent(event) ? event.path : event.rawPath}`;
+  const url = queryString ? `${urlPath}?${queryString}` : urlPath;
   const headers = new Headers();
   for (const [k, v] of Object.entries(event.headers)) {
     if (v)
       headers.set(k, v);
   }
-  const method = event.httpMethod;
+  const method = "httpMethod" in event ? event.httpMethod : event.requestContext.http.method;
   const requestInit = {
     headers,
     method
@@ -63,7 +71,34 @@ const createRequest = (event) => {
   }
   return new Request(url, requestInit);
 };
+const extractQueryString = (event) => {
+  if (isProxyEvent(event)) {
+    return Object.entries(event.queryStringParameters || {}).filter(([, value]) => value).map(([key, value]) => `${key}=${value}`).join("&");
+  }
+  return isProxyEventV2(event) ? event.rawQueryString : event.rawQueryString;
+};
+const isProxyEvent = (event) => {
+  return Object.prototype.hasOwnProperty.call(event, "path");
+};
+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
+  );
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  handle
+  handle,
+  isContentTypeBinary
 });

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

@@ -33,8 +33,9 @@ const serveStatic = (options = { root: "" }) => {
       return;
     }
     const url = new URL(c.req.url);
+    const filename = options.path ?? decodeURI(url.pathname);
     let path = (0, import_filepath.getFilePath)({
-      filename: options.path ?? decodeURI(url.pathname),
+      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });

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

@@ -32,8 +32,9 @@ const serveStatic = (options = { root: "" }) => {
       return;
     }
     const url = new URL(c.req.url);
+    const filename = options.path ?? decodeURI(url.pathname);
     const path = (0, import_filepath.getFilePath)({
-      filename: options.path ?? decodeURI(url.pathname),
+      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });

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

@@ -31,8 +31,9 @@ const serveStatic = (options = { root: "" }) => {
       return;
     }
     const url = new URL(c.req.url);
+    const filename = options.path ?? decodeURI(url.pathname);
     let path = (0, import_filepath.getFilePath)({
-      filename: options.path ?? decodeURI(url.pathname),
+      filename: options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename,
       root: options.root,
       defaultDocument: DEFAULT_DOCUMENT
     });

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

@@ -0,0 +1,30 @@
+"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) => (req) => {
+  return app.fetch(req);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handle
+});

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

package/dist/cjs/client/utils.js

@@ -24,7 +24,6 @@ __export(utils_exports, {
   replaceUrlParam: () => replaceUrlParam
 });
 module.exports = __toCommonJS(utils_exports);
-var import_url = require("../utils/url");
 const mergePath = (base, path) => {
   base = base.replace(/\/+$/, "");
   base = base + "/";
@@ -39,7 +38,6 @@ const replaceUrlParam = (urlString, params) => {
   return urlString;
 };
 const removeIndexString = (urlSting) => {
-  const path = (0, import_url.getPathFromURL)(urlSting);
   return urlSting.replace(/\/index$/, "/");
 };
 function isObject(item) {

package/dist/cjs/context.js

@@ -29,25 +29,36 @@ class Context {
     this.finalized = false;
     this.error = void 0;
     this._status = 200;
-    this._pretty = false;
-    this._prettySpace = 2;
-    this._headers = void 0;
-    this._preparedHeaders = void 0;
+    this._pre = false;
+    this._preS = 2;
+    this._h = void 0;
+    this._pH = void 0;
     this._path = "/";
     this.notFoundHandler = () => new Response();
     this.header = (name, value, options) => {
+      if (value === void 0) {
+        if (this._h) {
+          this._h.delete(name);
+        } else if (this._pH) {
+          delete this._pH[name.toLocaleLowerCase()];
+        }
+        if (this.finalized) {
+          this.res.headers.delete(name);
+        }
+        return;
+      }
       if (options?.append) {
-        if (!this._headers) {
-          this._headers = new Headers(this._preparedHeaders);
-          this._preparedHeaders = {};
+        if (!this._h) {
+          this._h = new Headers(this._pH);
+          this._pH = {};
         }
-        this._headers.append(name, value);
+        this._h.append(name, value);
       } else {
-        if (this._headers) {
-          this._headers.set(name, value);
+        if (this._h) {
+          this._h.set(name, value);
         } else {
-          this._preparedHeaders ?? (this._preparedHeaders = {});
-          this._preparedHeaders[name.toLowerCase()] = value;
+          this._pH ?? (this._pH = {});
+          this._pH[name.toLowerCase()] = value;
         }
       }
       if (this.finalized) {
@@ -66,75 +77,75 @@ class Context {
       this._map[key] = value;
     };
     this.get = (key) => {
-      return this._map?.[key];
+      return this._map ? this._map[key] : void 0;
     };
     this.pretty = (prettyJSON, space = 2) => {
-      this._pretty = prettyJSON;
-      this._prettySpace = space;
+      this._pre = prettyJSON;
+      this._preS = space;
     };
     this.newResponse = (data, arg, headers) => {
-      if (!headers && !this._headers && !this._res && !arg && this._status === 200) {
+      if (!headers && !this._h && !this._res && !arg && this._status === 200) {
         return new Response(data, {
-          headers: this._preparedHeaders
+          headers: this._pH
         });
       }
       if (arg && typeof arg !== "number") {
         const res = new Response(data, arg);
-        const contentType = this._preparedHeaders?.["content-type"];
+        const contentType = this._pH?.["content-type"];
         if (contentType) {
           res.headers.set("content-type", contentType);
         }
         return res;
       }
       const status = arg ?? this._status;
-      this._preparedHeaders ?? (this._preparedHeaders = {});
-      this._headers ?? (this._headers = new Headers());
-      for (const [k, v] of Object.entries(this._preparedHeaders)) {
-        this._headers.set(k, v);
+      this._pH ?? (this._pH = {});
+      this._h ?? (this._h = new Headers());
+      for (const [k, v] of Object.entries(this._pH)) {
+        this._h.set(k, v);
       }
       if (this._res) {
         this._res.headers.forEach((v, k) => {
-          this._headers?.set(k, v);
+          this._h?.set(k, v);
         });
-        for (const [k, v] of Object.entries(this._preparedHeaders)) {
-          this._headers.set(k, v);
+        for (const [k, v] of Object.entries(this._pH)) {
+          this._h.set(k, v);
         }
       }
       headers ?? (headers = {});
       for (const [k, v] of Object.entries(headers)) {
         if (typeof v === "string") {
-          this._headers.set(k, v);
+          this._h.set(k, v);
         } else {
-          this._headers.delete(k);
+          this._h.delete(k);
           for (const v2 of v) {
-            this._headers.append(k, v2);
+            this._h.append(k, v2);
           }
         }
       }
       return new Response(data, {
         status,
-        headers: this._headers
+        headers: this._h
       });
     };
     this.body = (data, arg, headers) => {
       return typeof arg === "number" ? this.newResponse(data, arg, headers) : this.newResponse(data, arg);
     };
     this.text = (text, arg, headers) => {
-      if (!this._preparedHeaders) {
-        if (!headers && !this._res && !this._headers && !arg) {
+      if (!this._pH) {
+        if (!headers && !this._res && !this._h && !arg) {
           return new Response(text);
         }
-        this._preparedHeaders = {};
+        this._pH = {};
       }
-      if (this._preparedHeaders["content-type"]) {
-        this._preparedHeaders["content-type"] = "text/plain; charset=UTF-8";
+      if (this._pH["content-type"]) {
+        this._pH["content-type"] = "text/plain; charset=UTF-8";
       }
       return typeof arg === "number" ? this.newResponse(text, arg, headers) : this.newResponse(text, arg);
     };
     this.json = (object, arg, headers) => {
-      const body = this._pretty ? JSON.stringify(object, null, this._prettySpace) : JSON.stringify(object);
-      this._preparedHeaders ?? (this._preparedHeaders = {});
-      this._preparedHeaders["content-type"] = "application/json; charset=UTF-8";
+      const body = this._pre ? JSON.stringify(object, null, this._preS) : JSON.stringify(object);
+      this._pH ?? (this._pH = {});
+      this._pH["content-type"] = "application/json; charset=UTF-8";
       return typeof arg === "number" ? this.newResponse(body, arg, headers) : this.newResponse(body, arg);
     };
     this.jsonT = (object, arg, headers) => {
@@ -145,13 +156,13 @@ class Context {
       };
     };
     this.html = (html, arg, headers) => {
-      this._preparedHeaders ?? (this._preparedHeaders = {});
-      this._preparedHeaders["content-type"] = "text/html; charset=UTF-8";
+      this._pH ?? (this._pH = {});
+      this._pH["content-type"] = "text/html; charset=UTF-8";
       return typeof arg === "number" ? this.newResponse(html, arg, headers) : this.newResponse(html, arg);
     };
     this.redirect = (location, status = 302) => {
-      this._headers ?? (this._headers = new Headers());
-      this._headers.set("Location", location);
+      this._h ?? (this._h = new Headers());
+      this._h.set("Location", location);
       return this.newResponse(null, status);
     };
     this.cookie = (name, value, opt) => {
@@ -163,9 +174,9 @@ class Context {
     };
     this.rawRequest = req;
     if (options) {
-      this._executionCtx = options.executionCtx;
+      this._exCtx = options.executionCtx;
       this._path = options.path ?? "/";
-      this._paramData = options.paramData;
+      this._pData = options.paramData;
       this.env = options.env;
       if (options.notFoundHandler) {
         this.notFoundHandler = options.notFoundHandler;
@@ -176,22 +187,22 @@ class Context {
     if (this._req) {
       return this._req;
     } else {
-      this._req = new import_request.HonoRequest(this.rawRequest, this._path, this._paramData);
+      this._req = new import_request.HonoRequest(this.rawRequest, this._path, this._pData);
       this.rawRequest = void 0;
-      this._paramData = void 0;
+      this._pData = void 0;
       return this._req;
     }
   }
   get event() {
-    if (this._executionCtx instanceof FetchEvent) {
-      return this._executionCtx;
+    if (this._exCtx instanceof FetchEvent) {
+      return this._exCtx;
     } else {
       throw Error("This context has no FetchEvent");
     }
   }
   get executionCtx() {
-    if (this._executionCtx) {
-      return this._executionCtx;
+    if (this._exCtx) {
+      return this._exCtx;
     } else {
       throw Error("This context has no ExecutionContext");
     }