fix: Use url pathname, instead of full url with query

tosuapp · Feb 19, 2024 · ca9c50b · ca9c50b
1 parent 585ee10
commit ca9c50b
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/packages/server/http/index.ts b/packages/server/http/index.ts
@@ -116,19 +116,28 @@ export class HttpServer {
             (value, key) => (req.query[key] = value)
         );
 
-        const routes = this.routes[method] || [];
+        const routes = (this.routes[method] || []).sort(
+            (a, b) => b.path.toString().length - a.path.toString().length
+        );
         for (let i = 0; i < routes.length; i++) {
             const route = routes[i];
             let routeExists = false;
 
-            if (route.path instanceof RegExp && route.path.test(url)) {
+            if (
+                route.path instanceof RegExp &&
+                route.path.test(parsedURL.pathname)
+            ) {
                 routeExists = true;
 
                 // turn groups to route params
-                const array = Object.keys(route.path.exec(url)?.groups || {});
+                const array = Object.keys(
+                    route.path.exec(parsedURL.pathname)?.groups || {}
+                );
                 for (let g = 0; g < array.length; g++) {
                     const key = array[g];
-                    const value = route.path.exec(url)?.groups?.[key];
+                    const value = route.path.exec(parsedURL.pathname)?.groups?.[
+                        key
+                    ];
 
                     if (key == null || value == null) continue;
                     req.params[key] = value;