entrySet内置

Author: yumaojun03

http/router/entry.go

@@ -0,0 +1,66 @@
+package httprouter
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/infraboard/mcube/http/router"
+)
+
+// Entry 路由条目
+type entry struct {
+	*router.Entry
+
+	needAuth bool
+	h        http.HandlerFunc
+}
+
+func newEntrySet() *entrySet {
+	return &entrySet{
+		items: map[string]*entry{},
+	}
+}
+
+// EntrySet 路由集合
+type entrySet struct {
+	items map[string]*entry
+}
+
+// AddEntry 添加理由条目
+func (s *entrySet) AddEntry(es ...*entry) error {
+	for _, e := range es {
+		key := s.ID(e.Path, e.Method)
+		if _, ok := s.items[key]; ok {
+			return fmt.Errorf("router entry %s has exist", key)
+		}
+		s.items[key] = e
+	}
+
+	return nil
+}
+
+// ShowEntries 显示理由条目
+func (s *entrySet) ShowEntries() []router.Entry {
+	entries := make([]router.Entry, 0, len(s.items))
+	for _, v := range s.items {
+		entries = append(entries, *v.Entry)
+	}
+
+	return entries
+}
+
+// FindEntry 通过函数地址找到对于的路由条目
+// 由于该接口是高频接口, 为了不影响性能 采用指针输出, 请不要修改Entry
+func (s *entrySet) FindEntry(path, method string) *entry {
+	id := s.ID(path, method)
+	entry, ok := s.items[id]
+	if !ok {
+		return nil
+	}
+
+	return entry
+}
+
+func (s *entrySet) ID(path, mothod string) string {
+	return path + "." + mothod
+}

http/router/entry_test.go

@@ -12,20 +12,12 @@ import (
 	"github.com/julienschmidt/httprouter"
 )
 
-// Entry 路由条目
-type entry struct {
-	router.Entry
-
-	needAuth bool
-	h        http.HandlerFunc
-}
-
 type httpRouter struct {
 	r *httprouter.Router
 	l logger.Logger
 
 	middlewareChain []router.Middleware
-	entrySet        *router.EntrySet
+	entrySet        *entrySet
 	auther          router.Auther
 	mergedHandler   http.Handler
 	labels          []*router.Label
@@ -36,7 +28,7 @@ type httpRouter struct {
 func New() router.Router {
 	r := &httpRouter{
 		notFound: http.HandlerFunc(http.NotFound),
-		entrySet: router.NewEntrySet(),
+		entrySet: newEntrySet(),
 		r: &httprouter.Router{
 			RedirectTrailingSlash:  true,
 			RedirectFixedPath:      true,
@@ -58,7 +50,7 @@ func (r *httpRouter) Use(m router.Middleware) {
 
 func (r *httpRouter) AddProtected(method, path string, h http.HandlerFunc) {
 	e := &entry{
-		Entry: router.Entry{
+		Entry: &router.Entry{
 			Method:    method,
 			Path:      path,
 			Protected: true,
@@ -71,7 +63,7 @@ func (r *httpRouter) AddProtected(method, path string, h http.HandlerFunc) {
 
 func (r *httpRouter) AddPublict(method, path string, h http.HandlerFunc) {
 	e := &entry{
-		Entry: router.Entry{
+		Entry: &router.Entry{
 			Method:    method,
 			Path:      path,
 			Protected: false,
@@ -105,8 +97,8 @@ func (r *httpRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	r.r.ServeHTTP(response.NewResponse(w), req)
 }
 
-func (r *httpRouter) GetEndpoints() *router.EntrySet {
-	return r.entrySet
+func (r *httpRouter) GetEndpoints() []router.Entry {
+	return r.entrySet.ShowEntries()
 }
 
 func (r *httpRouter) EnableAPIRoot() {
@@ -145,38 +137,38 @@ func (r *httpRouter) add(e *entry) {
 }
 
 func (r *httpRouter) addHandler(protected bool, method, path string, h http.Handler) {
-	r.r.Handle(method, path,
-		func(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
-			entry := r.findEntry(method, path)
-			if entry == nil {
-				r.notFound.ServeHTTP(w, req)
+	wrapper := func(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
+		entry := r.findEntry(method, path)
+		if entry == nil {
+			r.notFound.ServeHTTP(w, req)
+			return
+		}
+		// 使用auther进行认证
+		if protected && r.auther != nil {
+			authInfo, err := r.auther.Auth(req.Header, *entry.Entry)
+			if err != nil {
+				response.Failed(w, err)
 				return
 			}
-			// 使用auther进行认证
-			if protected && r.auther != nil {
-				authInfo, err := r.auther.Auth(req.Header, *entry)
-				if err != nil {
-					response.Failed(w, err)
-					return
-				}
-
-				rc := context.GetContext(req)
-				rc.AuthInfo = authInfo
-				req = context.WithContext(req, rc)
-			}
 
-			// 未包含和auth为nil
-			if !protected || r.auther == nil {
-				rc := &context.ReqContext{
-					PS: ps,
-				}
+			rc := context.GetContext(req)
+			rc.AuthInfo = authInfo
+			req = context.WithContext(req, rc)
+		}
 
-				req = context.WithContext(req, rc)
+		// 未包含和auth为nil
+		if !protected || r.auther == nil {
+			rc := &context.ReqContext{
+				PS: ps,
 			}
 
-			h.ServeHTTP(w, req)
-		},
-	)
+			req = context.WithContext(req, rc)
+		}
+
+		h.ServeHTTP(w, req)
+	}
+
+	r.r.Handle(method, path, wrapper)
 }
 
 func (r *httpRouter) addEntry(e *entry) {
@@ -186,12 +178,12 @@ func (r *httpRouter) addEntry(e *entry) {
 		e.Labels[kv.Key()] = kv.Value()
 	}
 
-	if err := r.entrySet.AddEntry(&e.Entry); err != nil {
+	if err := r.entrySet.AddEntry(e); err != nil {
 		panic(err)
 	}
 }
 
-func (r *httpRouter) findEntry(method, path string) *router.Entry {
+func (r *httpRouter) findEntry(method, path string) *entry {
 	hander, paras, _ := r.r.Lookup(method, path)
 	if hander == nil {
 		return nil

http/router/httprouter/entriy.go

@@ -118,7 +118,7 @@ func TestSetLabel(t *testing.T) {
 	r.SetLabel(router.NewLable("k1", "v1"))
 	r.AddProtected("GET", "/:id", WithContextHandler)
 
-	entries := r.GetEndpoints().ShowEntries()
+	entries := r.GetEndpoints()
 
 	should.Equal(entries[0].Labels["k1"], "v1")
 }

http/router/httprouter/httprouter.go

@@ -41,7 +41,7 @@ func (r *subRouter) With(m ...router.Middleware) router.SubRouter {
 
 func (r *subRouter) AddProtected(method, path string, h http.HandlerFunc) {
 	e := &entry{
-		Entry: router.Entry{
+		Entry: &router.Entry{
 			Resource: r.resourceName,
 			Method:   method,
 			Path:     path,
@@ -56,7 +56,7 @@ func (r *subRouter) AddProtected(method, path string, h http.HandlerFunc) {
 
 func (r *subRouter) AddPublict(method, path string, h http.HandlerFunc) {
 	e := &entry{
-		Entry: router.Entry{
+		Entry: &router.Entry{
 			Resource: r.resourceName,
 			Method:   method,
 			Path:     path,

http/router/httprouter/httprouter_test.go

@@ -46,7 +46,7 @@ func (a *subRouterTestSuit) testSetLabel() func(t *testing.T) {
 		a.sub.SetLabel(router.NewLable("k1", "v1"))
 		a.sub.AddPublict("GET", "/index", IndexHandler)
 
-		entries := a.root.GetEndpoints().ShowEntries()
+		entries := a.root.GetEndpoints()
 
 		a.should.Equal(entries[0].Labels["k1"], "v1")
 	}
@@ -75,7 +75,7 @@ func (a *subRouterTestSuit) testResourceRouterOK() func(t *testing.T) {
 		req, _ := http.NewRequest("GET", "/v1/resources/", nil)
 		a.root.ServeHTTP(w, req)
 
-		t.Log(a.root.GetEndpoints().ShowEntries())
+		t.Log(a.root.GetEndpoints())
 		a.should.Equal(w.Code, 200)
 	}
 }

http/router/httprouter/subrouter.go

@@ -6,6 +6,15 @@ import (
 	"github.com/infraboard/mcube/logger"
 )
 
+// Entry 路由条目
+type Entry struct {
+	Path      string            `json:"path,omitempty"`
+	Method    string            `json:"method,omitempty"`
+	Resource  string            `json:"resource,omitempty"`
+	Protected bool              `json:"protected"`
+	Labels    map[string]string `json:"labels,omitempty"`
+}
+
 // Router 路由
 type Router interface {
 	// 添加中间件
@@ -21,7 +30,7 @@ type Router interface {
 	ServeHTTP(http.ResponseWriter, *http.Request)
 
 	// 获取当前的路由条目信息
-	GetEndpoints() *EntrySet
+	GetEndpoints() []Entry
 
 	// EnableAPIRoot 将服务路由表通过路径/暴露出去
 	EnableAPIRoot()