matched path

Author: johzchen

lib/resty/radixtree.lua

@@ -578,9 +578,6 @@ local function match_route_opts(route, opts, ...)
         local uris = route.uris
         for i = 1, #uris, 2 do
             if match_uri(uris[i], uris[i + 1], opts.uri) then
-                if opts.matched ~= nil then
-                    opts.matched._uri = uris[i + 1]
-                end
                 matched = true
                 break
             end
@@ -629,10 +626,14 @@ end
 
 
 local function _match_from_routes(routes, path, opts, ...)
+    local opts_matched_exists = (opts.matched ~= nil)
     for _, route in ipairs(routes) do
         if route.path_op == "=" then
             if route.path == path then
                 if match_route_opts(route, opts, ...) then
+                    if opts_matched_exists then
+                        opts.matched._path = path
+                    end
                     return route
                 end
             end
@@ -643,6 +644,9 @@ local function _match_from_routes(routes, path, opts, ...)
             -- log_info("matched route: ", require("cjson").encode(route))
             -- log_info("matched path: ", path)
             if compare_gin(path, route.path_org, opts) then
+                    if opts_matched_exists then
+                        opts.matched._path = route.path_org
+                    end
                 return route
             end
         end
@@ -660,9 +664,13 @@ local function match_route(self, path, opts, ...)
     end
 
     local routes = self.hash_path[path]
+    local opts_matched_exists = (opts.matched ~= nil)
     if routes then
         for _, route in ipairs(routes) do
             if match_route_opts(route, opts, ...) then
+                if opts_matched_exists then
+                    opts.matched._path = path
+                end
                 return route
             end
         end

t/parameter.t

@@ -36,9 +36,9 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"name":"json"}
+matched: {"_path":"\/name\/*name","name":"json"}
 match meta: metadata /name
-matched: {"name":""}
+matched: {"_path":"\/name\/*name","name":""}
 
 
 
@@ -71,9 +71,9 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {":ext":"json\/foo\/bar"}
+matched: {"_path":"\/name\/*",":ext":"json\/foo\/bar"}
 match meta: metadata /name
-matched: {":ext":""}
+matched: {"_path":"\/name\/*",":ext":""}
 
 
 
@@ -107,7 +107,7 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"id":"1","name":"json"}
+matched: {"name":"json","_path":"\/name\/:name\/id\/:id","id":"1"}
 match meta: nil
 matched: {}
 
@@ -138,7 +138,7 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"other":"foo\/bar\/gloo","name":"json","id":"1"}
+matched: {"other":"foo\/bar\/gloo","name":"json","_path":"\/name\/:name\/id\/:id\/*other","id":"1"}
 
 
 
@@ -180,7 +180,6 @@ matched: {}
             local rx = radix.new({
                 {
                     paths = {"/aa/*", "/bb/cc/*", "/dd/ee/index.html"},
-                    uris = {"/aa/*", "/bb/cc/*", "/dd/ee/index.html"},
                     methods = {"GET", "POST", "PUT"},
                     hosts = {"foo.com", "*.bar.com"},
                     metadata = "metadata /asf",
@@ -200,4 +199,4 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /asf
-matched: {"_uri":"\/bb\/cc\/",":ext":"xx","_method":"GET","_host":"foo.com"}
+matched: {"_path":"\/bb\/cc\/*",":ext":"xx","_method":"GET","_host":"foo.com"}