hono 3.1.3 → 3.1.5

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

@@ -23,6 +23,7 @@ __export(jwt_exports, {
 module.exports = __toCommonJS(jwt_exports);
 var import_http_exception = require("../../http-exception");
 var import_jwt = require("../../utils/jwt");
+var import_context = require("../../context");
 const jwt = (options) => {
   if (!options) {
     throw new Error('JWT auth middleware requires options for "secret');
@@ -58,14 +59,14 @@ const jwt = (options) => {
       });
       throw new import_http_exception.HTTPException(401, { res });
     }
-    let authorized = false;
+    let payload;
     let msg = "";
     try {
-      authorized = await import_jwt.Jwt.verify(token, options.secret, options.alg);
+      payload = await import_jwt.Jwt.verify(token, options.secret, options.alg);
     } catch (e) {
       msg = `${e}`;
     }
-    if (!authorized) {
+    if (!payload) {
       const res = new Response("Unauthorized", {
         status: 401,
         statusText: msg,
@@ -75,6 +76,7 @@ const jwt = (options) => {
       });
       throw new import_http_exception.HTTPException(401, { res });
     }
+    ctx.set("jwtPayload", payload);
     await next();
   };
 };

package/dist/cjs/request.js

@@ -49,18 +49,10 @@ class HonoRequest {
     return null;
   }
   query(key) {
-    const queryString = (0, import_url.getQueryStringFromURL)(this.url);
-    const result = (0, import_url.getQueryParam)(queryString, key);
-    if (result === null)
-      return void 0;
-    return result;
+    return (0, import_url.getQueryParam)(this.url, key);
   }
   queries(key) {
-    const queryString = (0, import_url.getQueryStringFromURL)(this.url);
-    const result = (0, import_url.getQueryParams)(queryString, key);
-    if (result === null)
-      return void 0;
-    return result;
+    return (0, import_url.getQueryParams)(this.url, key);
   }
   header(name) {
     const headerData = {};

package/dist/cjs/utils/jwt/jwt.js

@@ -120,7 +120,7 @@ const verify = async (token, secret, alg = import_types.AlgorithmTypes.HS256) =>
   if (encodedSignature !== tokenParts[2]) {
     throw new import_types2.JwtTokenSignatureMismatched(token);
   }
-  return true;
+  return payload;
 };
 const decode = (token) => {
   try {

package/dist/cjs/utils/url.js

@@ -23,7 +23,6 @@ __export(url_exports, {
   getPattern: () => getPattern,
   getQueryParam: () => getQueryParam,
   getQueryParams: () => getQueryParams,
-  getQueryStringFromURL: () => getQueryStringFromURL,
   mergePath: () => mergePath,
   splitPath: () => splitPath,
   splitRoutingPath: () => splitRoutingPath
@@ -92,11 +91,6 @@ const getPathFromURL = (url, strict = true) => {
   }
   return result;
 };
-const getQueryStringFromURL = (url) => {
-  const queryIndex = url.indexOf("?", 8);
-  const result = queryIndex !== -1 ? url.slice(queryIndex + 1) : "";
-  return result;
-};
 const mergePath = (...paths) => {
   let p = "";
   let endsWithSlash = false;
@@ -127,48 +121,79 @@ const checkOptionalParameter = (path) => {
   const optional = base + match[2];
   return [base === "" ? "/" : base.replace(/\/$/, ""), optional];
 };
-const getQueryParam = (queryString, key) => {
-  const results = {};
-  while (true) {
-    const andIndex = queryString.indexOf("&");
-    let strings = "";
-    if (andIndex === -1) {
-      strings = queryString;
-    } else {
-      strings = queryString.substring(0, andIndex);
+const _decodeURI = (value) => {
+  if (!/[%+]/.test(value)) {
+    return value;
+  }
+  if (value.includes("+")) {
+    value = value.replace(/\+/g, " ");
+  }
+  return value.includes("%") ? decodeURIComponent(value) : value;
+};
+const _getQueryParam = (url, key, multiple) => {
+  let encoded;
+  if (!multiple && key && !/[%+]/.test(key)) {
+    let keyIndex2 = url.indexOf(`?${key}`, 8);
+    if (keyIndex2 === -1) {
+      keyIndex2 = url.indexOf(`&${key}`, 8);
     }
-    const eqIndex = strings.indexOf("=");
-    if (eqIndex !== -1) {
-      const v = strings.substring(eqIndex + 1);
-      const k = strings.substring(0, eqIndex);
-      if (key === k) {
-        return /\%/.test(v) ? decodeURIComponent(v) : v;
-      } else {
-        results[k] || (results[k] = v);
+    while (keyIndex2 !== -1) {
+      const trailingKeyCode = url.charCodeAt(keyIndex2 + key.length + 1);
+      if (trailingKeyCode === 61) {
+        const valueIndex = keyIndex2 + key.length + 2;
+        const endIndex = url.indexOf("&", valueIndex);
+        return _decodeURI(url.slice(valueIndex, endIndex === -1 ? void 0 : endIndex));
+      } else if (trailingKeyCode == 38 || isNaN(trailingKeyCode)) {
+        return "";
       }
-    } else if (strings === key) {
-      return "";
+      keyIndex2 = url.indexOf(`&${key}`, keyIndex2);
+    }
+    encoded = /[%+]/.test(url);
+    if (!encoded) {
+      return void 0;
     }
-    if (andIndex === -1)
-      break;
-    queryString = queryString.substring(andIndex + 1, queryString.length);
   }
-  if (key)
-    return null;
-  return results;
-};
-const getQueryParams = (queryString, key) => {
   const results = {};
-  for (const strings of queryString.split("&")) {
-    let [k, v] = strings.split("=");
-    if (v === void 0)
-      v = "";
-    results[k] || (results[k] = []);
-    results[k].push(v.indexOf("%") !== -1 ? decodeURIComponent(v) : v);
+  encoded ?? (encoded = /[%+]/.test(url));
+  let keyIndex = url.indexOf("?", 8);
+  while (keyIndex !== -1) {
+    const nextKeyIndex = url.indexOf("&", keyIndex + 1);
+    let valueIndex = url.indexOf("=", keyIndex);
+    if (valueIndex > nextKeyIndex && nextKeyIndex !== -1) {
+      valueIndex = -1;
+    }
+    let name = url.slice(
+      keyIndex + 1,
+      valueIndex === -1 ? nextKeyIndex === -1 ? void 0 : nextKeyIndex : valueIndex
+    );
+    if (encoded) {
+      name = _decodeURI(name);
+    }
+    keyIndex = nextKeyIndex;
+    if (name === "") {
+      continue;
+    }
+    let value;
+    if (valueIndex === -1) {
+      value = "";
+    } else {
+      value = url.slice(valueIndex + 1, nextKeyIndex === -1 ? void 0 : nextKeyIndex);
+      if (encoded) {
+        value = _decodeURI(value);
+      }
+    }
+    if (multiple) {
+      ;
+      (results[name] ?? (results[name] = [])).push(value);
+    } else {
+      results[name] ?? (results[name] = value);
+    }
   }
-  if (key)
-    return results[key] ? results[key] : null;
-  return results;
+  return key ? results[key] : results;
+};
+const getQueryParam = _getQueryParam;
+const getQueryParams = (url, key) => {
+  return _getQueryParam(url, key, true);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -177,7 +202,6 @@ const getQueryParams = (queryString, key) => {
   getPattern,
   getQueryParam,
   getQueryParams,
-  getQueryStringFromURL,
   mergePath,
   splitPath,
   splitRoutingPath

package/dist/middleware/jwt/index.js

@@ -1,6 +1,7 @@
 // src/middleware/jwt/index.ts
 import { HTTPException } from "../../http-exception.js";
 import { Jwt } from "../../utils/jwt/index.js";
+import "../../context.js";
 var jwt = (options) => {
   if (!options) {
     throw new Error('JWT auth middleware requires options for "secret');
@@ -36,14 +37,14 @@ var jwt = (options) => {
       });
       throw new HTTPException(401, { res });
     }
-    let authorized = false;
+    let payload;
     let msg = "";
     try {
-      authorized = await Jwt.verify(token, options.secret, options.alg);
+      payload = await Jwt.verify(token, options.secret, options.alg);
     } catch (e) {
       msg = `${e}`;
     }
-    if (!authorized) {
+    if (!payload) {
       const res = new Response("Unauthorized", {
         status: 401,
         statusText: msg,
@@ -53,6 +54,7 @@ var jwt = (options) => {
       });
       throw new HTTPException(401, { res });
     }
+    ctx.set("jwtPayload", payload);
     await next();
   };
 };

package/dist/request.js

@@ -1,7 +1,7 @@
 // src/request.ts
 import { parseBody } from "./utils/body.js";
 import { parse } from "./utils/cookie.js";
-import { getQueryStringFromURL, getQueryParam, getQueryParams } from "./utils/url.js";
+import { getQueryParam, getQueryParams } from "./utils/url.js";
 var HonoRequest = class {
   constructor(request, path = "/", paramData) {
     this.raw = request;
@@ -27,18 +27,10 @@ var HonoRequest = class {
     return null;
   }
   query(key) {
-    const queryString = getQueryStringFromURL(this.url);
-    const result = getQueryParam(queryString, key);
-    if (result === null)
-      return void 0;
-    return result;
+    return getQueryParam(this.url, key);
   }
   queries(key) {
-    const queryString = getQueryStringFromURL(this.url);
-    const result = getQueryParams(queryString, key);
-    if (result === null)
-      return void 0;
-    return result;
+    return getQueryParams(this.url, key);
   }
   header(name) {
     const headerData = {};

package/dist/types/adapter.d.ts

@@ -1,2 +1,2 @@
 import type { Context } from './context';
-export declare const env: <T = Record<string, string>>(c: Context) => T;
+export declare const env: <T extends Record<string, string>, C extends Context<any, any, {}> = Context<{}, any, {}>>(c: C) => T & C["env"];

package/dist/types/context.d.ts

@@ -70,8 +70,8 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
         append?: boolean;
     }) => void;
     status: (status: StatusCode) => void;
-    set: <Key extends keyof E["Variables"]>(key: Key, value: GetVariable<Key, E>) => void;
-    get: <Key extends keyof E["Variables"]>(key: Key) => GetVariable<Key, E>;
+    set: <Key extends keyof E["Variables"] | "jwtPayload">(key: Key, value: GetVariable<Key, E>) => void;
+    get: <Key extends keyof E["Variables"] | "jwtPayload">(key: Key) => GetVariable<Key, E>;
     pretty: (prettyJSON: boolean, space?: number) => void;
     newResponse: NewResponse;
     body: BodyRespond;

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from './hono';
-export type { Env, ErrorHandler, Handler, MiddlewareHandler, Next, NotFoundHandler, ValidationTargets, } from './types';
+export type { Env, ErrorHandler, Handler, MiddlewareHandler, Next, NotFoundHandler, ValidationTargets, Input, } from './types';
 export type { Context, ContextVariableMap } from './context';
 export type { HonoRequest } from './request';
 declare module './hono' {

package/dist/types/middleware/jwt/index.d.ts

@@ -1,4 +1,10 @@
 import type { MiddlewareHandler } from '../../types';
+import '../../context';
+declare module '../../context' {
+    interface ContextVariableMap {
+        jwtPayload: any;
+    }
+}
 export declare const jwt: (options: {
     secret: string;
     cookie?: string;

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

@@ -1,6 +1,6 @@
 import { AlgorithmTypes } from './types';
 export declare const sign: (payload: unknown, secret: string, alg?: AlgorithmTypes) => Promise<string>;
-export declare const verify: (token: string, secret: string, alg?: AlgorithmTypes) => Promise<boolean>;
+export declare const verify: (token: string, secret: string, alg?: AlgorithmTypes) => Promise<any>;
 export declare const decode: (token: string) => {
     header: any;
     payload: any;

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

@@ -3,8 +3,7 @@ export declare const splitPath: (path: string) => string[];
 export declare const splitRoutingPath: (path: string) => string[];
 export declare const getPattern: (label: string) => Pattern | null;
 export declare const getPathFromURL: (url: string, strict?: boolean) => string;
-export declare const getQueryStringFromURL: (url: string) => string;
 export declare const mergePath: (...paths: string[]) => string;
 export declare const checkOptionalParameter: (path: string) => string[] | null;
-export declare const getQueryParam: (queryString: string, key?: string) => string | null | Record<string, string>;
-export declare const getQueryParams: (queryString: string, key?: string) => string[] | null | Record<string, string[]>;
+export declare const getQueryParam: (url: string, key?: string) => string | undefined | Record<string, string>;
+export declare const getQueryParams: (url: string, key?: string) => string[] | undefined | Record<string, string[]>;

package/dist/utils/jwt/jwt.js

@@ -84,7 +84,7 @@ var verify = async (token, secret, alg = AlgorithmTypes.HS256) => {
   if (encodedSignature !== tokenParts[2]) {
     throw new JwtTokenSignatureMismatched(token);
   }
-  return true;
+  return payload;
 };
 var decode = (token) => {
   try {

package/dist/utils/url.js

@@ -62,11 +62,6 @@ var getPathFromURL = (url, strict = true) => {
   }
   return result;
 };
-var getQueryStringFromURL = (url) => {
-  const queryIndex = url.indexOf("?", 8);
-  const result = queryIndex !== -1 ? url.slice(queryIndex + 1) : "";
-  return result;
-};
 var mergePath = (...paths) => {
   let p = "";
   let endsWithSlash = false;
@@ -97,48 +92,79 @@ var checkOptionalParameter = (path) => {
   const optional = base + match[2];
   return [base === "" ? "/" : base.replace(/\/$/, ""), optional];
 };
-var getQueryParam = (queryString, key) => {
-  const results = {};
-  while (true) {
-    const andIndex = queryString.indexOf("&");
-    let strings = "";
-    if (andIndex === -1) {
-      strings = queryString;
-    } else {
-      strings = queryString.substring(0, andIndex);
+var _decodeURI = (value) => {
+  if (!/[%+]/.test(value)) {
+    return value;
+  }
+  if (value.includes("+")) {
+    value = value.replace(/\+/g, " ");
+  }
+  return value.includes("%") ? decodeURIComponent(value) : value;
+};
+var _getQueryParam = (url, key, multiple) => {
+  let encoded;
+  if (!multiple && key && !/[%+]/.test(key)) {
+    let keyIndex2 = url.indexOf(`?${key}`, 8);
+    if (keyIndex2 === -1) {
+      keyIndex2 = url.indexOf(`&${key}`, 8);
     }
-    const eqIndex = strings.indexOf("=");
-    if (eqIndex !== -1) {
-      const v = strings.substring(eqIndex + 1);
-      const k = strings.substring(0, eqIndex);
-      if (key === k) {
-        return /\%/.test(v) ? decodeURIComponent(v) : v;
-      } else {
-        results[k] || (results[k] = v);
+    while (keyIndex2 !== -1) {
+      const trailingKeyCode = url.charCodeAt(keyIndex2 + key.length + 1);
+      if (trailingKeyCode === 61) {
+        const valueIndex = keyIndex2 + key.length + 2;
+        const endIndex = url.indexOf("&", valueIndex);
+        return _decodeURI(url.slice(valueIndex, endIndex === -1 ? void 0 : endIndex));
+      } else if (trailingKeyCode == 38 || isNaN(trailingKeyCode)) {
+        return "";
       }
-    } else if (strings === key) {
-      return "";
+      keyIndex2 = url.indexOf(`&${key}`, keyIndex2);
+    }
+    encoded = /[%+]/.test(url);
+    if (!encoded) {
+      return void 0;
     }
-    if (andIndex === -1)
-      break;
-    queryString = queryString.substring(andIndex + 1, queryString.length);
   }
-  if (key)
-    return null;
-  return results;
-};
-var getQueryParams = (queryString, key) => {
   const results = {};
-  for (const strings of queryString.split("&")) {
-    let [k, v] = strings.split("=");
-    if (v === void 0)
-      v = "";
-    results[k] || (results[k] = []);
-    results[k].push(v.indexOf("%") !== -1 ? decodeURIComponent(v) : v);
+  encoded ?? (encoded = /[%+]/.test(url));
+  let keyIndex = url.indexOf("?", 8);
+  while (keyIndex !== -1) {
+    const nextKeyIndex = url.indexOf("&", keyIndex + 1);
+    let valueIndex = url.indexOf("=", keyIndex);
+    if (valueIndex > nextKeyIndex && nextKeyIndex !== -1) {
+      valueIndex = -1;
+    }
+    let name = url.slice(
+      keyIndex + 1,
+      valueIndex === -1 ? nextKeyIndex === -1 ? void 0 : nextKeyIndex : valueIndex
+    );
+    if (encoded) {
+      name = _decodeURI(name);
+    }
+    keyIndex = nextKeyIndex;
+    if (name === "") {
+      continue;
+    }
+    let value;
+    if (valueIndex === -1) {
+      value = "";
+    } else {
+      value = url.slice(valueIndex + 1, nextKeyIndex === -1 ? void 0 : nextKeyIndex);
+      if (encoded) {
+        value = _decodeURI(value);
+      }
+    }
+    if (multiple) {
+      ;
+      (results[name] ?? (results[name] = [])).push(value);
+    } else {
+      results[name] ?? (results[name] = value);
+    }
   }
-  if (key)
-    return results[key] ? results[key] : null;
-  return results;
+  return key ? results[key] : results;
+};
+var getQueryParam = _getQueryParam;
+var getQueryParams = (url, key) => {
+  return _getQueryParam(url, key, true);
 };
 export {
   checkOptionalParameter,
@@ -146,7 +172,6 @@ export {
   getPattern,
   getQueryParam,
   getQueryParams,
-  getQueryStringFromURL,
   mergePath,
   splitPath,
   splitRoutingPath

package/package.json

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