Merge remote-tracking branch 'origin/main'

Author: hubertshelley

silent/src/handler/handler_trait.rs

@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 
+use crate::core::res_body::ResBody;
 use crate::{Request, Response, Result, SilentError};
 use async_trait::async_trait;
 use http::{Method, StatusCode};
@@ -17,17 +18,29 @@ pub trait Handler: Send + Sync + 'static {
 #[async_trait]
 impl Handler for HashMap<Method, Arc<dyn Handler>> {
     async fn call(&self, req: Request) -> Result<Response> {
-        match self.clone().get(req.method()) {
-            None => Err(SilentError::business_error(
-                StatusCode::METHOD_NOT_ALLOWED,
-                "method not allowed".to_string(),
-            )),
-            Some(handler) => {
-                let mut pre_res = Response::empty();
-                pre_res.configs = req.configs();
-                pre_res.copy_from_response(handler.call(req).await?);
-                Ok(pre_res)
-            }
+        let method = req.method().clone();
+        // 直接命中匹配的方法
+        if let Some(handler) = self.clone().get(&method) {
+            let mut pre_res = Response::empty();
+            pre_res.configs = req.configs();
+            pre_res.copy_from_response(handler.call(req).await?);
+            return Ok(pre_res);
         }
+
+        // 特殊处理：HEAD 无显式处理器时回退到 GET，并清空响应体
+        if method == http::Method::HEAD
+            && let Some(get_handler) = self.clone().get(&http::Method::GET)
+        {
+            let mut pre_res = Response::empty();
+            pre_res.configs = req.configs();
+            pre_res.copy_from_response(get_handler.call(req).await?);
+            pre_res.set_body(ResBody::None);
+            return Ok(pre_res);
+        }
+
+        Err(SilentError::business_error(
+            StatusCode::METHOD_NOT_ALLOWED,
+            "method not allowed".to_string(),
+        ))
     }
 }

silent/src/route/route_tree.rs

@@ -112,7 +112,8 @@ impl RouteTree {
                     (true, last_path)
                 }
                 SpecialPath::FullPath(key) => {
-                    // ** 通配符：总是匹配，参数记录完整剩余路径
+                    // ** 通配符：记录完整剩余路径，且允许继续尝试子结点匹配。
+                    // 若后续子结点无法匹配，dfs_match 中会在有处理器时回退到当前结点。
                     let p = path.strip_prefix('/').unwrap_or(path);
                     req.set_path_params(key, PathParam::Path(p.to_string()));
                     (true, last_path)
@@ -137,17 +138,19 @@ impl RouteTree {
         stack.push(self);
 
         if last_path.is_empty() {
-            // URL 已完全匹配：仅尝试 path 为空字符串的子结点
+            // URL 已完全匹配：仍尝试所有子结点，让特殊路径（如 <path:**>）有机会匹配空余路径
             for child in &self.children {
-                if !child.path.is_empty() {
-                    continue;
-                }
                 if child.dfs_match(req, last_path, stack) {
                     return true;
                 }
             }
-            // 无子结点匹配，则当前为终点
-            return true;
+            // 无子结点匹配：仅当当前结点存在处理器时才认为匹配成功
+            if self.has_handler {
+                return true;
+            } else {
+                stack.pop();
+                return false;
+            }
         }
 
         // 继续匹配子路由

xtask/Cargo.toml

@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 clap = { version = "4", features = ["derive"] }
-which = "6"
+which = "8"
 serde_json = "1"
 chrono = { version = "0.4" }