perf(group): GroupOf.ServeHTTP 中减少不必要的 types.Context 分配

Author: caixw

examples/ctx/ctx.go

@@ -6,6 +6,8 @@ package ctx
 import (
 	"net/http"
 
+	"github.com/issue9/mux/v7"
+	"github.com/issue9/mux/v7/group"
 	"github.com/issue9/mux/v7/types"
 )
 
@@ -16,11 +18,15 @@ type (
 		P types.Route
 	}
 
+	Router = mux.RouterOf[Handler]
+
+	Routers = group.GroupOf[Handler]
+
 	Handler interface {
 		Handle(*CTX)
 	}
 
-	HandlerFunc func(ctx *CTX)
+	HandlerFunc func(*CTX)
 )
 
 func (f HandlerFunc) Handle(c *CTX) { f(c) }
@@ -45,3 +51,12 @@ func methodNotAllowedBuilder(p types.Node) Handler {
 func notFound(ctx *CTX) {
 	ctx.W.WriteHeader(http.StatusNotFound)
 }
+
+func NewRouters(o ...mux.Option) *Routers {
+	return group.NewGroupOf[Handler](call, HandlerFunc(notFound), methodNotAllowedBuilder, optionsHandlerBuilder, o...)
+}
+
+// NewRouter 声明适用于官方 http.Handler 接口的路由
+func NewRouter(name string, o ...mux.Option) *Router {
+	return mux.NewRouterOf[Handler](name, call, HandlerFunc(notFound), methodNotAllowedBuilder, optionsHandlerBuilder, o...)
+}

group/group.go

@@ -53,15 +53,17 @@ func NewGroupOf[T any](call mux.CallOf[T], notFound T, methodNotAllowedBuilder,
 }
 
 func (g *GroupOf[T]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	for _, router := range g.routers {
-		ps := types.NewContext()
-		defer ps.Destroy()
+	ctx := types.NewContext()
+	defer ctx.Destroy()
 
-		if ok := router.m.Match(r, ps); ok {
-			router.r.ServeContext(w, r, ps)
+	for _, router := range g.routers {
+		if ok := router.m.Match(r, ctx); ok {
+			router.r.ServeContext(w, r, ctx)
 			return
 		}
+		ctx.Reset()
 	}
+
 	g.call(w, r, nil, g.notFound)
 }
 

group/match.go

@@ -15,11 +15,11 @@ import (
 type Matcher interface {
 	// Match 验证请求是否符合当前对象的要求
 	//
-	// ok 表示是否匹配成功；
-	Match(*http.Request, *types.Context) (ok bool)
+	// 返回值表示是否匹配成功；
+	Match(*http.Request, *types.Context) bool
 }
 
-type MatcherFunc func(*http.Request, *types.Context) (ok bool)
+type MatcherFunc func(*http.Request, *types.Context) bool
 
 func (f MatcherFunc) Match(r *http.Request, p *types.Context) bool { return f(r, p) }
 
@@ -29,7 +29,7 @@ func anyRouter(*http.Request, *types.Context) bool { return true }
 //
 // 前一个对象返回的实例将作为下一个对象的输入参数。
 func AndMatcher(m ...Matcher) Matcher {
-	return MatcherFunc(func(r *http.Request, ctx *types.Context) (ok bool) {
+	return MatcherFunc(func(r *http.Request, ctx *types.Context) bool {
 		for _, mm := range m {
 			if !mm.Match(r, ctx) {
 				return false

router.go

@@ -179,9 +179,9 @@ func (r *RouterOf[T]) URL(strict bool, pattern string, params map[string]string)
 }
 
 func (r *RouterOf[T]) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	p := types.NewContext()
-	defer p.Destroy()
-	r.ServeContext(w, req, p)
+	ctx := types.NewContext()
+	defer ctx.Destroy()
+	r.ServeContext(w, req, ctx)
 }
 
 func (r *RouterOf[T]) ServeContext(w http.ResponseWriter, req *http.Request, ctx *types.Context) {
@@ -194,11 +194,11 @@ func (r *RouterOf[T]) ServeContext(w http.ResponseWriter, req *http.Request, ctx
 	}
 
 	ctx.Path = req.URL.Path
-	node, h, exists := r.tree.Handler(ctx, req.Method)
+	node, h, ok := r.tree.Handler(ctx, req.Method)
 	ctx.SetNode(node)
 	ctx.SetRouterName(r.Name())
 
-	if exists {
+	if ok { // !ok 即为 405 或是 404 状态
 		r.cors.Handle(node, w.Header(), req)
 		if req.Method == http.MethodHead {
 			w = &headResponse{ResponseWriter: w}