@suveren/gateway 0.40.0 → 0.41.0

package/node_modules/encodeurl/README.md

@@ -1,5 +1,10 @@
 # Encode URL
 
+[![NPM Version][npm-image]][npm-url]
+[![NPM Downloads][downloads-image]][downloads-url]
+[![Build Status][ci-image]][ci-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+
 Encode a URL to a percent-encoded form, excluding already-encoded sequences.
 
 ## Installation
@@ -107,3 +112,12 @@ $ npm run lint
 ## License
 
 [MIT](LICENSE)
+
+[npm-image]: https://img.shields.io/npm/v/encodeurl
+[npm-url]: https://npmjs.org/package/encodeurl
+[downloads-image]: https://img.shields.io/npm/dm/encodeurl
+[downloads-url]: https://npmcharts.com/compare/encodeurl?minimal=true
+[ci-image]: https://img.shields.io/github/actions/workflow/status/pillarjs/encodeurl/ci.yml?branch=master
+[ci-url]: https://github.com/pillarjs/encodeurl/actions/workflows/ci.yml
+[coveralls-image]: https://img.shields.io/coverallsCoverage/github/pillarjs/encodeurl?branch=master
+[coveralls-url]: https://coveralls.io/r/pillarjs/encodeurl?branch=master

package/node_modules/encodeurl/index.js

@@ -22,18 +22,11 @@ module.exports = encodeUrl
 var ENCODE_CHARS_REGEXP = /(?:[^\x21\x23-\x3B\x3D\x3F-\x5F\x61-\x7A\x7C\x7E]|%(?:[^0-9A-Fa-f]|[0-9A-Fa-f][^0-9A-Fa-f]|$))+/g
 
 /**
- * RegExp to match unmatched surrogate pair.
+ * RegExp to match surrogate pairs and unpaired surrogates.
  * @private
  */
 
-var UNMATCHED_SURROGATE_PAIR_REGEXP = /(^|[^\uD800-\uDBFF])[\uDC00-\uDFFF]|[\uD800-\uDBFF]([^\uDC00-\uDFFF]|$)/g
-
-/**
- * String to replace unmatched surrogate pair with.
- * @private
- */
-
-var UNMATCHED_SURROGATE_PAIR_REPLACE = '$1\uFFFD$2'
+var SURROGATE_REGEXP = /([\uD800-\uDBFF][\uDC00-\uDFFF])|[\uD800-\uDFFF]/g
 
 /**
  * Encode a URL to a percent-encoded form, excluding already-encoded sequences.
@@ -55,6 +48,8 @@ var UNMATCHED_SURROGATE_PAIR_REPLACE = '$1\uFFFD$2'
 
 function encodeUrl (url) {
   return String(url)
-    .replace(UNMATCHED_SURROGATE_PAIR_REGEXP, UNMATCHED_SURROGATE_PAIR_REPLACE)
+    .replace(SURROGATE_REGEXP, function (_, pair) {
+      return pair || '\uFFFD'
+    })
     .replace(ENCODE_CHARS_REGEXP, encodeURI)
 }

package/node_modules/encodeurl/package.json

@@ -1,7 +1,7 @@
 {
   "name": "encodeurl",
   "description": "Encode a URL to a percent-encoded form, excluding already-encoded sequences",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "contributors": [
     "Douglas Christopher Wilson <doug@somethingdoug.com>"
   ],
@@ -12,6 +12,10 @@
     "url"
   ],
   "repository": "pillarjs/encodeurl",
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/express"
+  },
   "devDependencies": {
     "eslint": "5.11.1",
     "eslint-config-standard": "12.0.0",
@@ -19,8 +23,8 @@
     "eslint-plugin-node": "7.0.1",
     "eslint-plugin-promise": "4.0.1",
     "eslint-plugin-standard": "4.0.0",
-    "istanbul": "0.4.5",
-    "mocha": "2.5.3"
+    "mocha": "~11.7.0",
+    "nyc": "~17.1.0"
   },
   "files": [
     "LICENSE",
@@ -33,8 +37,8 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha --reporter spec --bail --check-leaks test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
-    "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/"
+    "test": "mocha --check-leaks --reporter spec",
+    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
+    "test-cov": "nyc --reporter=html --reporter=text npm test"
   }
 }

package/node_modules/express-rate-limit/dist/index.cjs

@@ -182,7 +182,7 @@ var MemoryStore = class {
    */
   resetClient(client, now = Date.now()) {
     client.totalHits = 0;
-    client.resetTime.setTime(now + this.windowMs);
+    client.resetTime = new Date(now + this.windowMs);
     return client;
   }
   /**
@@ -931,7 +931,11 @@ var rateLimit = (passedOptions) => {
       try {
         const incrementResult = await config.store.increment(key);
         totalHits = incrementResult.totalHits;
-        resetTime = incrementResult.resetTime;
+        if (incrementResult.resetTime && (config.skipFailedRequests || config.skipSuccessfulRequests)) {
+          resetTime = new Date(incrementResult.resetTime.getTime());
+        } else {
+          resetTime = incrementResult.resetTime;
+        }
       } catch (error) {
         if (config.passOnStoreError) {
           config.logger.error(
@@ -1057,7 +1061,7 @@ var rateLimit = (passedOptions) => {
           const retryAfter = await retrieveRetryAfter;
           setRetryAfterHeader(response, info, config.windowMs, retryAfter);
         }
-        config.handler(request, response, next, options);
+        await config.handler(request, response, next, options);
         return;
       }
       next();

package/node_modules/express-rate-limit/dist/index.mjs

@@ -139,7 +139,7 @@ var MemoryStore = class {
    */
   resetClient(client, now = Date.now()) {
     client.totalHits = 0;
-    client.resetTime.setTime(now + this.windowMs);
+    client.resetTime = new Date(now + this.windowMs);
     return client;
   }
   /**
@@ -888,7 +888,11 @@ var rateLimit = (passedOptions) => {
       try {
         const incrementResult = await config.store.increment(key);
         totalHits = incrementResult.totalHits;
-        resetTime = incrementResult.resetTime;
+        if (incrementResult.resetTime && (config.skipFailedRequests || config.skipSuccessfulRequests)) {
+          resetTime = new Date(incrementResult.resetTime.getTime());
+        } else {
+          resetTime = incrementResult.resetTime;
+        }
       } catch (error) {
         if (config.passOnStoreError) {
           config.logger.error(
@@ -1014,7 +1018,7 @@ var rateLimit = (passedOptions) => {
           const retryAfter = await retrieveRetryAfter;
           setRetryAfterHeader(response, info, config.windowMs, retryAfter);
         }
-        config.handler(request, response, next, options);
+        await config.handler(request, response, next, options);
         return;
       }
       next();

package/node_modules/express-rate-limit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "express-rate-limit",
-	"version": "8.7.1",
+	"version": "8.7.3",
 	"description": "Basic IP rate-limiting middleware for Express. Use to limit repeated requests to public APIs and/or endpoints such as password reset.",
 	"author": {
 		"name": "Nathan Friedly",
@@ -86,25 +86,25 @@
 		"@biomejs/biome": "2.4.6",
 		"@express-rate-limit/prettier": "1.1.1",
 		"@express-rate-limit/tsconfig": "1.0.5",
-		"@jest/globals": "30.5.1",
+		"@jest/globals": "30.5.2",
 		"@types/debug": "4.1.13",
 		"@types/express": "5.0.6",
 		"@types/jest": "30.0.0",
-		"@types/node": "26.4.1",
+		"@types/node": "26.6.4",
 		"@types/supertest": "7.2.1",
 		"del-cli": "7.0.0",
 		"dts-bundle-generator": "8.1.2",
 		"esbuild": "0.28.2",
 		"express": "5.2.1",
 		"husky": "9.1.7",
-		"jest": "30.5.1",
-		"lint-staged": "17.4.1",
-		"mintlify": "4.2.874",
+		"jest": "30.5.2",
+		"lint-staged": "17.6.0",
+		"mintlify": "4.2.988",
 		"npm-run-all": "4.1.5",
-		"prettier": "3.9.6",
-		"ratelimit-header-parser": "0.1.0",
-		"supertest": "7.2.2",
-		"ts-jest": "29.4.12",
+		"prettier": "3.9.9",
+		"ratelimit-header-parser": "0.2.1",
+		"supertest": "7.3.1",
+		"ts-jest": "29.4.14",
 		"ts-node": "10.9.2",
 		"typescript": "5.9.3"
 	},

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

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_middleware_serve_static_index = require("../../middleware/serve-static/index.js");
-let node_fs_promises = require("node:fs/promises");
 let node_path = require("node:path");
+let node_fs_promises = require("node:fs/promises");
 //#region src/adapter/bun/serve-static.ts
 /**
 * @deprecated `hono/bun` will be removed in v5. Install `@hono/bun` and import from there instead.

package/node_modules/hono/dist/cjs/adapter/bun/websocket.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_adapter_bun_server = require("./server.js");
 const require_helper_websocket_index = require("../../helper/websocket/index.js");
+const require_adapter_bun_server = require("./server.js");
 //#region src/adapter/bun/websocket.ts
 /**
 * @internal

package/node_modules/hono/dist/cjs/context.js

@@ -198,7 +198,7 @@ var Context = class {
 	* ```
 	*/
 	header = (name, value, options) => {
-		if (this.finalized) this.#res = createResponseInstance(this.#res.body, this.#res);
+		if (this.finalized && !this.#res.bodyUsed) this.#res = createResponseInstance(this.#res.body, this.#res);
 		const headers = this.#res ? this.#res.headers : this.#preparedHeaders ??= new Headers();
 		if (value === void 0) headers.delete(name);
 		else if (options?.append) headers.append(name, value);

package/node_modules/hono/dist/cjs/helper/css/common.js

@@ -80,10 +80,8 @@ const buildStyleString = (strings, values) => {
 		for (let j = 0, len = vArray.length; j < len; j++) {
 			let value = vArray[j];
 			if (typeof value === "boolean" || value === null || value === void 0) continue;
-			if (typeof value === "string") {
-				if (/([\\"'\/])/.test(value)) styleString += value.replace(/([\\"']|(?<=<)\/)/g, "\\$1");
-				else styleString += value;
-			} else if (typeof value === "number") styleString += value;
+			if (typeof value === "string") styleString += value.replace(/[\\"']/g, "\\$&");
+			else if (typeof value === "number") styleString += value;
 			else if (value[CSS_ESCAPED]) styleString += value[CSS_ESCAPED];
 			else if (value[CLASS_NAME].startsWith("@keyframes ")) {
 				selectors.push(value);
@@ -108,7 +106,7 @@ const buildStyleString = (strings, values) => {
 	}
 	return [
 		label,
-		minify(styleString),
+		minify(styleString).replace(/<\//g, "<\\/"),
 		selectors,
 		externalClassNames
 	];

package/node_modules/hono/dist/cjs/hono-base.js

@@ -4,6 +4,7 @@ const require_utils_url = require("./utils/url.js");
 const require_context = require("./context.js");
 const require_router = require("./router.js");
 const require_utils_constants = require("./utils/constants.js");
+const require_utils_mount = require("./utils/mount.js");
 //#region src/hono-base.ts
 /**
 * @module
@@ -228,17 +229,10 @@ var Hono = class Hono {
 			} catch {}
 			return [c.env, executionContext];
 		};
-		replaceRequest ||= (() => {
-			const mergedPath = require_utils_url.mergePath(this._basePath, path);
-			const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
-			return (request) => {
-				const url = new URL(request.url);
-				url.pathname = this.getPath(request).slice(pathPrefixLength) || "/";
-				return new Request(url, request);
-			};
-		})();
+		const mergedPath = require_utils_url.mergePath(this._basePath, path);
+		const defaultReplaceRequest = (c) => require_utils_mount.createMountedRequest(c, mergedPath.replace(/\/$/, ""), require_utils_url.mergePath(mergedPath, "*"));
 		const handler = async (c, next) => {
-			const res = await applicationHandler(replaceRequest(c.req.raw), ...getOptions(c));
+			const res = await applicationHandler(replaceRequest ? replaceRequest(c.req.raw) : defaultReplaceRequest(c), ...getOptions(c));
 			if (res) return res;
 			await next();
 		};

package/node_modules/hono/dist/cjs/hono.js

@@ -1,7 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_hono_base = require("./hono-base.js");
 const require_router_reg_exp_router_router = require("./router/reg-exp-router/router.js");
-require("./router/reg-exp-router/index.js");
 const require_router_smart_router_router = require("./router/smart-router/router.js");
 const require_router_trie_router_router = require("./router/trie-router/router.js");
 require("./router/trie-router/index.js");

package/node_modules/hono/dist/cjs/middleware/basic-auth/index.js

@@ -81,7 +81,7 @@ const basicAuth = (options, ...users) => {
 			}
 		}
 		const status = 401;
-		const headers = { "WWW-Authenticate": "Basic realm=\"" + options.realm?.replace(/"/g, "\\\"") + "\"" };
+		const headers = { "WWW-Authenticate": "Basic realm=\"" + options.realm?.replace(/[\\"]/g, "\\$&") + "\"" };
 		const responseMessage = typeof options.invalidUserMessage === "function" ? await options.invalidUserMessage(ctx) : options.invalidUserMessage;
 		const res = typeof responseMessage === "string" ? new Response(responseMessage, {
 			status,

package/node_modules/hono/dist/cjs/middleware/bearer-auth/index.js

@@ -45,7 +45,7 @@ const bearerAuth = (options) => {
 	if (!("token" in options || "verifyToken" in options)) throw new Error("bearer auth middleware requires options for \"token\" or \"verifyToken\"");
 	if (!options.realm) options.realm = "";
 	if (options.prefix === void 0) options.prefix = PREFIX;
-	const realm = options.realm?.replace(/"/g, "\\\"");
+	const realm = options.realm?.replace(/[\\"]/g, "\\$&");
 	const prefix = options.prefix;
 	const tokenRegexp = new RegExp(`^${TOKEN_STRINGS}$`);
 	const wwwAuthenticatePrefix = prefix === "" ? "" : `${prefix} `;

package/node_modules/hono/dist/cjs/middleware/csrf/index.js

@@ -9,7 +9,7 @@ const secFetchSiteValues = [
 ];
 const isSecFetchSite = (value) => secFetchSiteValues.includes(value);
 const isSafeMethodRe = /^(GET|HEAD|OPTIONS)$/;
-const isRequestedByFormElementRe = /^\b(application\/x-www-form-urlencoded|multipart\/form-data|text\/plain)\b/i;
+const isCsrfContentTypeRe = /^\b(application\/x-www-form-urlencoded|multipart\/form-data|text\/(?:plain|ping))\b/i;
 /**
 * CSRF Protection Middleware for Hono.
 *
@@ -95,7 +95,7 @@ const csrf = (options) => {
 		return await secFetchSiteHandler(secFetchSite, c);
 	};
 	return async function csrf(c, next) {
-		if (!isSafeMethodRe.test(c.req.method) && isRequestedByFormElementRe.test(c.req.header("content-type") || "text/plain") && !await isAllowedSecFetchSite(c.req.header("sec-fetch-site"), c) && !await isAllowedOrigin(c.req.header("origin"), c)) {
+		if (!isSafeMethodRe.test(c.req.method) && isCsrfContentTypeRe.test(c.req.header("content-type") || "text/plain") && !await isAllowedSecFetchSite(c.req.header("sec-fetch-site"), c) && !await isAllowedOrigin(c.req.header("origin"), c)) {
 			const res = new Response("Forbidden", { status: 403 });
 			throw new require_http_exception.HTTPException(403, { res });
 		}

package/node_modules/hono/dist/cjs/middleware/jwk/jwk.js

@@ -110,8 +110,8 @@ const jwk = (options, init) => {
 	};
 };
 function unauthorizedResponse(opts) {
-	const realm = (opts.realm ?? opts.ctx.req.url).replace(/"/g, "\\\"");
-	const errDescription = opts.errDescription.replace(/"/g, "\\\"");
+	const realm = (opts.realm ?? opts.ctx.req.url).replace(/[\\"]/g, "\\$&");
+	const errDescription = opts.errDescription.replace(/[\\"]/g, "\\$&");
 	return new Response("Unauthorized", {
 		status: 401,
 		statusText: opts.statusText,

package/node_modules/hono/dist/cjs/middleware/jwt/jwt.js

@@ -104,8 +104,8 @@ const jwt = (options) => {
 	};
 };
 function unauthorizedResponse(opts) {
-	const realm = (opts.realm ?? opts.ctx.req.url).replace(/"/g, "\\\"");
-	const errDescription = opts.errDescription.replace(/"/g, "\\\"");
+	const realm = (opts.realm ?? opts.ctx.req.url).replace(/[\\"]/g, "\\$&");
+	const errDescription = opts.errDescription.replace(/[\\"]/g, "\\$&");
 	return new Response("Unauthorized", {
 		status: 401,
 		statusText: opts.statusText,

package/node_modules/hono/dist/cjs/middleware/mount/index.js

@@ -1,11 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_utils_mount = require("../../utils/mount.js");
 const require_helper_route_index = require("../../helper/route/index.js");
 //#region src/middleware/mount/index.ts
 const defaultReplaceRequest = (c) => {
-	const pathPrefix = require_helper_route_index.routePath(c).replace(/\/\*$/, "");
-	const url = new URL(c.req.raw.url);
-	url.pathname = c.req.path.slice(pathPrefix.length) || "/";
-	return new Request(url, c.req.raw);
+	const path = require_helper_route_index.routePath(c);
+	return require_utils_mount.createMountedRequest(c, path.replace(/\/?\*$/, ""), path);
 };
 const defaultGetOptions = (c) => {
 	let executionContext = void 0;
@@ -22,6 +21,7 @@ const defaultGetOptions = (c) => {
 * @param {Function} applicationHandler - other Request Handler
 * @param {MountOptions} [options] - options of `mount()`
 * @returns {MiddlewareHandler} handler to register with `app.all()`
+* @throws {Error} If the route ends with a wildcard inside a segment (e.g. `/assets*`), or automatic request rewriting encounters duplicate path parameter names.
 *
 * @example
 * ```ts

package/node_modules/hono/dist/cjs/router/reg-exp-router/node.js

@@ -2,8 +2,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_router_utils = require("../utils.js");
 //#region src/router/reg-exp-router/node.ts
 const LABEL_REG_EXP_STR = "[^/]+";
-const ONLY_WILDCARD_REG_EXP_STR = ".*";
-const TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
+const ONLY_WILDCARD_REG_EXP_STR = "[^]*";
+const TAIL_WILDCARD_REG_EXP_STR = "(?:|/[^]*)";
 const PATH_ERROR = Symbol();
 const regExpMetaChars = /* @__PURE__ */ new Set(".\\+*[^]$()");
 /**
@@ -16,8 +16,8 @@ const regExpMetaChars = /* @__PURE__ */ new Set(".\\+*[^]$()");
 function compareKey(a, b) {
 	if (a.length === 1) return b.length === 1 ? a < b ? -1 : 1 : -1;
 	if (b.length === 1) return 1;
-	if (a === ".*" || a === "(?:|/.*)") return b === "(?:|/.*)" ? -1 : 1;
-	else if (b === ".*" || b === "(?:|/.*)") return -1;
+	if (a === "[^]*" || a === "(?:|/[^]*)") return b === "[^]*" ? -1 : 1;
+	else if (b === "[^]*" || b === "(?:|/[^]*)") return -1;
 	if (a === "[^/]+") return 1;
 	else if (b === "[^/]+") return -1;
 	return a.length === b.length ? a < b ? -1 : 1 : b.length - a.length;
@@ -26,14 +26,14 @@ var Node = class Node {
 	#index;
 	#varIndex;
 	#children = require_router_utils.createNullObject();
-	insert(tokens, index, paramMap, context, isStatic) {
+	insert(tokens, index, paramMap, context, keys) {
 		let node = this;
 		for (let i = 0, len = tokens.length; i < len; i++) {
 			const token = tokens[i];
 			const pattern = token.length === 1 ? token === "*" ? i === len - 1 ? [
 				"",
 				"",
-				".*"
+				ONLY_WILDCARD_REG_EXP_STR
 			] : [
 				"",
 				"",
@@ -48,15 +48,16 @@ var Node = class Node {
 				const name = pattern[1];
 				let regexpStr = pattern[2] || "[^/]+";
 				if (name && pattern[2]) {
-					if (regexpStr === ".*") throw PATH_ERROR;
+					if (new RegExp(regexpStr).test("")) throw PATH_ERROR;
 					regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
 					if (/\((?!\?:)/.test(regexpStr)) throw PATH_ERROR;
 					if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) throw PATH_ERROR;
 				}
+				keys.push(regexpStr);
 				nextNode = node.#children[regexpStr];
 				if (!nextNode) {
-					if (regexpStr !== ".*" && regexpStr !== "(?:|/.*)") {
-						for (const k in node.#children) if ((regexpStr.length > 1 || k.length > 1) && k !== ".*" && k !== "(?:|/.*)") throw PATH_ERROR;
+					if (regexpStr !== "[^]*" && regexpStr !== "(?:|/[^]*)") {
+						for (const k in node.#children) if ((regexpStr.length > 1 || k.length > 1) && k !== "[^]*" && k !== "(?:|/[^]*)") throw PATH_ERROR;
 					}
 					nextNode = node.#children[regexpStr] = new Node();
 				}
@@ -65,16 +66,17 @@ var Node = class Node {
 					paramMap.push([name, nextNode.#varIndex]);
 				}
 			} else {
+				keys.push(token);
 				nextNode = node.#children[token];
 				if (!nextNode) {
-					for (const k in node.#children) if (k.length > 1 && k !== ".*" && k !== "(?:|/.*)") throw PATH_ERROR;
+					for (const k in node.#children) if (k.length > 1 && k !== "[^]*" && k !== "(?:|/[^]*)") throw PATH_ERROR;
 					nextNode = node.#children[token] = new Node();
 				}
 			}
 			node = nextNode;
 		}
 		if (node.#index !== void 0) throw PATH_ERROR;
-		node.#index = isStatic ? -1 : index;
+		node.#index = index;
 	}
 	buildRegExpStr() {
 		const strList = Object.keys(this.#children).sort(compareKey).map((k) => {

package/node_modules/hono/dist/cjs/router/reg-exp-router/prepared-router.js

@@ -28,7 +28,7 @@ var PreparedRegExpRouter = class {
 		if (!this.#matchers[method]) {
 			const all = this.#matchers["ALL"];
 			const staticMap = {};
-			for (const key in all[2]) staticMap[key] = [all[2][key][0].slice(), require_router_reg_exp_router_matcher.emptyParam];
+			for (const key in all[2]) staticMap[key] = [all[2][key][0].slice(), all[2][key][1]];
 			this.#matchers[method] = [
 				all[0],
 				all[1].map((list) => Array.isArray(list) ? list.slice() : 0),
@@ -72,7 +72,7 @@ const buildInitParams = ({ paths }) => {
 						...map
 					};
 					else relocateMap[path] = [[[], map]];
-					if (relocateMap[path][0][0].findIndex((j) => j === i) === -1) relocateMap[path][0][0].push(i);
+					if (!relocateMap[path][0][0].includes(i)) relocateMap[path][0][0].push(i);
 				}
 			});
 		});
@@ -80,7 +80,7 @@ const buildInitParams = ({ paths }) => {
 			if (p === path) {
 				relocateMap[path] ||= [[[]]];
 				const value = path2 === path ? "" : path2;
-				if (relocateMap[path][0][0].findIndex((v) => v === value) === -1) relocateMap[path][0][0].push(value);
+				if (!relocateMap[path][0][0].includes(value)) relocateMap[path][0][0].push(value);
 			}
 		});
 	}
@@ -89,7 +89,7 @@ const buildInitParams = ({ paths }) => {
 	return [matchers, relocateMap];
 };
 const serializeInitParams = ([matchers, relocateMap]) => {
-	return `[${JSON.stringify(matchers, (_, value) => value instanceof RegExp ? `##${value.toString()}##` : value).replace(/"##(.+?)##"/g, (_, str) => str.replace(/\\\\/g, "\\"))},${JSON.stringify(relocateMap)}]`;
+	return `[${JSON.stringify(matchers, (_, value) => value instanceof RegExp || value === void 0 ? `##${value}##` : value).replace(/"##(.+?)##"/g, (_, str) => str.replace(/\\\\/g, "\\"))},${JSON.stringify(relocateMap)}]`;
 };
 //#endregion
 exports.PreparedRegExpRouter = PreparedRegExpRouter;

package/node_modules/hono/dist/cjs/router/reg-exp-router/router.js

@@ -6,21 +6,21 @@ const require_router_reg_exp_router_matcher = require("./matcher.js");
 const require_router_reg_exp_router_node = require("./node.js");
 const require_router_reg_exp_router_trie = require("./trie.js");
 //#region src/router/reg-exp-router/router.ts
-let wildcardRegExpCache = require_router_utils.createNullObject();
-function buildWildcardRegExp(path) {
-	return wildcardRegExpCache[path] ??= new RegExp(`^${path.replace(/\/:[^/{}]+(?:\{\[\^\/]\+})?(?=[/{]|$)|\/?\*$|([.\\+*[^\]$()?{}|])/g, (match, metaChar) => metaChar ? `\\${metaChar}` : match === "/*" ? require_router_reg_exp_router_node.TAIL_WILDCARD_REG_EXP_STR : match === "*" ? ".*" : `/:${require_router_reg_exp_router_node.LABEL_REG_EXP_STR}`)}$`);
+function endsWithWildcard(keys) {
+	const tail = keys[keys.length - 1];
+	return tail === "[^]*" || tail === "(?:|/[^]*)";
 }
-function findMiddleware(middleware, path) {
-	for (const k of Object.keys(middleware).sort((a, b) => b.length - a.length)) if (buildWildcardRegExp(k).test(path)) return [...middleware[k]];
+function covers(wildcard, target) {
+	const last = wildcard.length - 1;
+	for (let i = 0; i < last; i++) if (wildcard[i] !== target[i]) return false;
+	return wildcard[last] === "[^]*" || target.length === last || target[last] === "/";
 }
 var RegExpRouter = class {
 	name = "RegExpRouter";
-	#middleware;
-	#routes;
+	#handlers;
 	#tries;
 	constructor() {
-		this.#middleware = { ["ALL"]: require_router_utils.createNullObject() };
-		this.#routes = { ["ALL"]: require_router_utils.createNullObject() };
+		this.#handlers = { ["ALL"]: [] };
 		this.#tries = { ["ALL"]: new require_router_reg_exp_router_trie.Trie() };
 	}
 	#insertPath(method, path) {
@@ -31,65 +31,53 @@ var RegExpRouter = class {
 		}
 	}
 	add(method, path, handler) {
-		const middleware = this.#middleware;
-		const routes = this.#routes;
-		if (!middleware) throw new Error(require_router.MESSAGE_MATCHER_IS_ALREADY_BUILT);
-		if (!middleware[method]) {
-			this.#tries[method] = new require_router_reg_exp_router_trie.Trie();
-			for (const handlerMap of [middleware, routes]) {
-				handlerMap[method] = require_router_utils.createNullObject();
-				for (const p in handlerMap["ALL"]) {
-					handlerMap[method][p] = [...handlerMap["ALL"][p]];
-					this.#insertPath(method, p);
-				}
-			}
+		const handlers = this.#handlers;
+		if (!handlers) throw new Error(require_router.MESSAGE_MATCHER_IS_ALREADY_BUILT);
+		const tries = this.#tries;
+		if (!handlers[method]) {
+			tries[method] = new require_router_reg_exp_router_trie.Trie();
+			handlers[method] = [...handlers["ALL"]];
+			for (const p in tries["ALL"].paths) this.#insertPath(method, p);
 		}
 		if (path === "/*") path = "*";
-		const methods = method === "ALL" ? Object.keys(middleware) : [method];
-		if (/\*$/.test(path)) {
-			const re = buildWildcardRegExp(path);
-			for (const m of methods) if (!middleware[m][path]) {
-				this.#insertPath(m, path);
-				middleware[m][path] = findMiddleware(middleware[m], path) || findMiddleware(middleware["ALL"], path) || [];
-			}
-			for (const handlerMap of [middleware, routes]) for (const m of methods) for (const p in handlerMap[m]) re.test(p) && handlerMap[m][p].push([handler, path]);
-			return;
-		}
+		const methods = method === "ALL" ? Object.keys(handlers) : [method];
 		const paths = require_utils_url.checkOptionalParameter(path) || [path];
 		for (const path of paths) for (const m of methods) {
-			if (!routes[m][path]) {
-				this.#insertPath(m, path);
-				routes[m][path] = findMiddleware(middleware[m], path) || findMiddleware(middleware["ALL"], path) || [];
-			}
-			routes[m][path].push([handler, path]);
+			if (!tries[m].paths[path]) this.#insertPath(m, path);
+			handlers[m].push([handler, path]);
 		}
 	}
 	match = require_router_reg_exp_router_matcher.match;
 	buildAllMatchers() {
 		const matchers = require_router_utils.createNullObject();
-		for (const method of Object.keys(this.#routes)) matchers[method] = this.#buildMatcher(method);
-		this.#middleware = this.#routes = this.#tries = void 0;
-		wildcardRegExpCache = require_router_utils.createNullObject();
+		for (const method of Object.keys(this.#handlers)) matchers[method] = this.#buildMatcher(method);
+		this.#handlers = this.#tries = void 0;
 		return matchers;
 	}
 	#buildMatcher(method) {
-		const middleware = this.#middleware[method];
-		const routes = this.#routes[method];
+		const handlers = this.#handlers[method];
 		const trie = this.#tries[method];
 		const staticMap = require_router_utils.createNullObject();
 		const handlerData = [];
 		const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
-		for (const r of [middleware, routes]) for (const path in r) {
-			const handlers = r[path];
-			const pathData = trie.paths[path];
-			if (!pathData) {
-				staticMap[path] = [handlers.map(([h]) => [h, require_router_utils.createNullObject()]), require_router_reg_exp_router_matcher.emptyParam];
-				continue;
-			}
-			handlerData[pathData[0]] = handlers.map(([h, handlerPath]) => [h, trie.paths[handlerPath][1].reduceRight((map, [key], i) => {
-				map[key] = paramReplacementMap[pathData[1][i][1]];
+		const own = require_router_utils.createNullObject();
+		const entries = handlers.map(([h, p], i) => {
+			(own[p] ??= []).push(i);
+			return [h, trie.paths[p][1].reduceRight((map, [key, varIndex]) => {
+				map[key] = paramReplacementMap[varIndex];
 				return map;
-			}, require_router_utils.createNullObject())]);
+			}, require_router_utils.createNullObject())];
+		});
+		const wildcards = Object.keys(own).filter((p) => endsWithWildcard(trie.paths[p][2]));
+		for (const path in trie.paths) {
+			const [index, , keys] = trie.paths[path];
+			const indexes = [...own[path]];
+			for (const p of wildcards) if (p !== path && covers(trie.paths[p][2], keys)) indexes.push(...own[p]);
+			const data = indexes.sort((a, b) => a - b).map((i) => entries[i]);
+			if (index === -1) {
+				const last = Math.max(-1, ...data.flatMap(([, map]) => Object.values(map)));
+				staticMap[path] = [data, last === -1 ? require_router_reg_exp_router_matcher.emptyParam : path.match(regexp).slice(0, last + 1)];
+			} else handlerData[index] = data;
 		}
 		return [
 			regexp,