hono 3.1.4 → 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/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

@@ -142,8 +142,7 @@ const _getQueryParam = (url, key, multiple) => {
       if (trailingKeyCode === 61) {
         const valueIndex = keyIndex2 + key.length + 2;
         const endIndex = url.indexOf("&", valueIndex);
-        const value = url.slice(valueIndex, endIndex === -1 ? void 0 : endIndex);
-        return _decodeURI(value);
+        return _decodeURI(url.slice(valueIndex, endIndex === -1 ? void 0 : endIndex));
       } else if (trailingKeyCode == 38 || isNaN(trailingKeyCode)) {
         return "";
       }
@@ -158,18 +157,27 @@ const _getQueryParam = (url, key, multiple) => {
   encoded ?? (encoded = /[%+]/.test(url));
   let keyIndex = url.indexOf("?", 8);
   while (keyIndex !== -1) {
-    const valueIndex = url.indexOf("=", keyIndex);
-    let name = url.slice(keyIndex + 1, valueIndex === -1 ? void 0 : valueIndex);
+    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) {
-      keyIndex = -1;
       value = "";
     } else {
-      keyIndex = url.indexOf("&", valueIndex);
-      value = url.slice(valueIndex + 1, keyIndex === -1 ? void 0 : keyIndex);
+      value = url.slice(valueIndex + 1, nextKeyIndex === -1 ? void 0 : nextKeyIndex);
       if (encoded) {
         value = _decodeURI(value);
       }

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/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/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

@@ -113,8 +113,7 @@ var _getQueryParam = (url, key, multiple) => {
       if (trailingKeyCode === 61) {
         const valueIndex = keyIndex2 + key.length + 2;
         const endIndex = url.indexOf("&", valueIndex);
-        const value = url.slice(valueIndex, endIndex === -1 ? void 0 : endIndex);
-        return _decodeURI(value);
+        return _decodeURI(url.slice(valueIndex, endIndex === -1 ? void 0 : endIndex));
       } else if (trailingKeyCode == 38 || isNaN(trailingKeyCode)) {
         return "";
       }
@@ -129,18 +128,27 @@ var _getQueryParam = (url, key, multiple) => {
   encoded ?? (encoded = /[%+]/.test(url));
   let keyIndex = url.indexOf("?", 8);
   while (keyIndex !== -1) {
-    const valueIndex = url.indexOf("=", keyIndex);
-    let name = url.slice(keyIndex + 1, valueIndex === -1 ? void 0 : valueIndex);
+    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) {
-      keyIndex = -1;
       value = "";
     } else {
-      keyIndex = url.indexOf("&", valueIndex);
-      value = url.slice(valueIndex + 1, keyIndex === -1 ? void 0 : keyIndex);
+      value = url.slice(valueIndex + 1, nextKeyIndex === -1 ? void 0 : nextKeyIndex);
       if (encoded) {
         value = _decodeURI(value);
       }

package/package.json

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