internal rewrite to be more performant

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

go.mod

@@ -3,6 +3,6 @@ module go.unistack.org/micro-server-http/v3
 go 1.16
 
 require (
-	go.unistack.org/micro/v3 v3.8.7
+	go.unistack.org/micro/v3 v3.8.18
-	golang.org/x/net v0.0.0-20211020060615-d418f374d309
+	golang.org/x/net v0.0.0-20220121175114-2ed6ce1e1725
 )

go.sum

@@ -1,23 +1,27 @@
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
+go.unistack.org/micro-proto/v3 v3.1.1 h1:78qRmltwGek5kSQ9tNmDZ9TCRvZM7YDIOgzriKvabjA=
-go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
+go.unistack.org/micro-proto/v3 v3.1.1/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
-go.unistack.org/micro/v3 v3.8.7 h1:k1zOpJ3uS8MxdhK8annRsa5J/LW7MpqPjwYuekW61wE=
+go.unistack.org/micro/v3 v3.8.18 h1:+7UiB46D9EoCgGN+JfhoWCvn36yvtplh6fmA1+ZiqEE=
-go.unistack.org/micro/v3 v3.8.7/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
+go.unistack.org/micro/v3 v3.8.18/go.mod h1:ueDiiOe3fRW9kL0Fbh4OWw/R/SQhMd6vUcAV/WHYRWw=
 golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211020060615-d418f374d309 h1:A0lJIi+hcTR6aajJH4YqKWwohY4aW9RO7oRMcdv+HKI=
+golang.org/x/net v0.0.0-20220121175114-2ed6ce1e1725 h1:YtkHkox9J+kfAdNdlvEXp2SkLMQSkSjWFP4sjgxEPa8=
-golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220121175114-2ed6ce1e1725/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=

handler.go

@@ -31,14 +31,13 @@ var (
 type patHandler struct {
 	mtype *methodType
 	rcvr  reflect.Value
-	pat   *rhttp.Trie
 	name  string
 }
 
 type httpHandler struct {
 	opts     server.HandlerOptions
 	hd       interface{}
-	handlers map[string][]patHandler
+	handlers *rhttp.Trie
 	name     string
 	eps      []*register.Endpoint
 	sopts    server.Options
@@ -62,6 +61,7 @@ func (h *httpHandler) Options() server.HandlerOptions {
 }
 
 func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	// check for http.HandlerFunc handlers
 	if ph, _, ok := h.pathHandlers.Search(r.Method, r.URL.Path); ok {
 		ph.(http.HandlerFunc)(w, r)
 		return
@@ -72,17 +72,10 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		ct = htype
 	}
 
-	if idx := strings.Index(ct, ":"); idx > 0 {
-		if ph, ok := h.contentTypeHandlers[ct[:idx]]; ok {
-			ph(w, r)
-			return
-		}
-	}
-
 	ctx := context.WithValue(r.Context(), rspCodeKey{}, &rspCodeVal{})
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
-		md = metadata.New(len(r.Header))
+		md = metadata.New(len(r.Header) + 8)
 	}
 	for k, v := range r.Header {
 		md.Set(k, strings.Join(v, ", "))
@@ -114,24 +107,22 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	matches := make(map[string]interface{})
 
 	var match bool
-	var hldr patHandler
+	var hldr *patHandler
 	var handler *httpHandler
 
-	for _, hpat := range h.handlers {
+	for _, shdlr := range h.handlers {
-		handlertmp := hpat.(*httpHandler)
+		hdlr := shdlr.(*httpHandler)
-		for _, hldrtmp := range handlertmp.handlers[r.Method] {
+		fh, mp, ok := hdlr.handlers.Search(r.Method, path)
-			_, mp, ok := hldrtmp.pat.Search(r.Method, path)
 		if ok {
 			match = true
 			for k, v := range mp {
 				matches[k] = v
 			}
-				hldr = hldrtmp
+			hldr = fh.(*patHandler)
-				handler = handlertmp
+			handler = hdlr
 			break
 		}
 	}
-	}
 
 	if !match {
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not matching route found"), http.StatusNotFound)
@@ -171,29 +162,29 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	function := hldr.mtype.method.Func
 	var returnValues []reflect.Value
 
-	if err = cf.ReadBody(r.Body, argv.Interface()); err != nil && err != io.EOF {
+	buf, err := io.ReadAll(r.Body)
+	if err != nil && err != io.EOF {
 		h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
 		return
 	}
 
+	if err = cf.Unmarshal(buf, argv.Interface()); err != nil {
+		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+		return
+	}
+
 	matches = rflutil.FlattenMap(matches)
 	if err = rflutil.Merge(argv.Interface(), matches, rflutil.SliceAppend(true), rflutil.Tags([]string{"protobuf", "json"})); err != nil {
 		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
 		return
 	}
 
-	b, err := cf.Marshal(argv.Interface())
-	if err != nil {
-		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
-		return
-	}
-
 	hr := &rpcRequest{
 		codec:       cf,
 		service:     handler.sopts.Name,
 		contentType: ct,
 		method:      fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name),
-		body:        b,
+		body:        buf,
 		payload:     argv.Interface(),
 		header:      md,
 	}
@@ -255,14 +246,14 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		switch verr := appErr.(type) {
 		case *errors.Error:
 			scode = int(verr.Code)
-			b, err = cf.Marshal(verr)
+			buf, err = cf.Marshal(verr)
 		case *Error:
-			b, err = cf.Marshal(verr.err)
+			buf, err = cf.Marshal(verr.err)
 		default:
-			b, err = cf.Marshal(appErr)
+			buf, err = cf.Marshal(appErr)
 		}
 	} else {
-		b, err = cf.Marshal(replyv.Interface())
+		buf, err = cf.Marshal(replyv.Interface())
 	}
 
 	if err != nil && handler.sopts.Logger.V(logger.ErrorLevel) {
@@ -275,7 +266,7 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	w.WriteHeader(scode)
 
-	if _, cerr := w.Write(b); cerr != nil {
+	if _, cerr := w.Write(buf); cerr != nil {
-		logger.DefaultLogger.Errorf(ctx, "write failed: %v", cerr)
+		handler.sopts.Logger.Errorf(ctx, "write failed: %v", cerr)
 	}
 }

http.go

@@ -22,18 +22,6 @@ import (
 	"golang.org/x/net/netutil"
 )
 
-var httpAllMethods = []string{
-	http.MethodConnect,
-	http.MethodDelete,
-	http.MethodGet,
-	http.MethodHead,
-	http.MethodOptions,
-	http.MethodPatch,
-	http.MethodPost,
-	http.MethodPut,
-	http.MethodTrace,
-}
-
 type httpServer struct {
 	hd           server.Handler
 	rsvc         *register.Service
@@ -42,7 +30,6 @@ type httpServer struct {
 	subscribers  map[*httpSubscriber][]broker.Subscriber
 	errorHandler func(context.Context, server.Handler, http.ResponseWriter, *http.Request, error, int)
 	pathHandlers *rhttp.Trie
-	contentTypeHandlers map[string]http.HandlerFunc
 	opts         server.Options
 	registerRPC  bool
 	sync.RWMutex
@@ -89,22 +76,19 @@ func (h *httpServer) Init(opts ...server.Option) error {
 	if h.pathHandlers == nil {
 		h.pathHandlers = rhttp.NewTrie()
 	}
-	if h.contentTypeHandlers == nil {
-		h.contentTypeHandlers = make(map[string]http.HandlerFunc)
-	}
 
 	if v, ok := h.opts.Context.Value(registerRPCHandlerKey{}).(bool); ok {
 		h.registerRPC = v
 	}
 
 	if phs, ok := h.opts.Context.Value(pathHandlerKey{}).(*pathHandlerVal); ok && phs.h != nil {
-		for pp, ph := range phs.h {
+		for pm, ps := range phs.h {
-			h.pathHandlers.Insert(httpAllMethods, pp, ph)
+			for pp, ph := range ps {
+				if err := h.pathHandlers.Insert([]string{pm}, pp, ph); err != nil {
+					h.Unlock()
+					return err
 				}
 			}
-	if phs, ok := h.opts.Context.Value(contentTypeHandlerKey{}).(*contentTypeHandlerVal); ok && phs.h != nil {
-		for pp, ph := range phs.h {
-			h.contentTypeHandlers[pp] = ph
 		}
 	}
 	h.Unlock()
@@ -148,6 +132,7 @@ func (h *httpServer) Init(opts ...server.Option) error {
 }
 
 func (h *httpServer) Handle(handler server.Handler) error {
+	// passed unknown handler
 	hdlr, ok := handler.(*httpHandler)
 	if !ok {
 		h.Lock()
@@ -156,6 +141,7 @@ func (h *httpServer) Handle(handler server.Handler) error {
 		return nil
 	}
 
+	// passed http.Handler like some muxer
 	if _, ok := hdlr.hd.(http.Handler); ok {
 		h.Lock()
 		h.hd = handler
@@ -163,6 +149,7 @@ func (h *httpServer) Handle(handler server.Handler) error {
 		return nil
 	}
 
+	// passed micro compat handler
 	h.Lock()
 	if h.handlers == nil {
 		h.handlers = make(map[string]server.Handler)
@@ -189,16 +176,12 @@ func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOptio
 		hd:       handler,
 		opts:     options,
 		sopts:    h.opts,
+		handlers: rhttp.NewTrie(),
 	}
 
 	tp := reflect.TypeOf(handler)
-	type nilHandler struct{}
 
-	hdlr.handlers = make(map[string][]patHandler)
 	for hn, md := range options.Metadata {
-		pat := rhttp.NewTrie()
-		pat.Insert([]string{md["Method"]}, md["Path"], &nilHandler{})
-
 		var method reflect.Method
 		mname := hn[strings.Index(hn, ".")+1:]
 		for m := 0; m < tp.NumMethod(); m++ {
@@ -220,25 +203,25 @@ func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOptio
 			h.opts.Logger.Errorf(h.opts.Context, "%v", err)
 			continue
 		} else if mtype == nil {
+			h.opts.Logger.Errorf(h.opts.Context, "nil mtype for %s", mname)
 			continue
 		}
 
 		rcvr := reflect.ValueOf(handler)
 		name := reflect.Indirect(rcvr).Type().Name()
 
-		pth := patHandler{pat: pat, mtype: mtype, name: name, rcvr: rcvr}
+		pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr}
 		hdlr.name = name
-		hdlr.handlers[md["Method"]] = append(hdlr.handlers[md["Method"]], pth)
 
-		if !h.registerRPC {
+		if err := hdlr.handlers.Insert([]string{md["Method"]}, md["Path"], pth); err != nil {
-			continue
+			h.opts.Logger.Errorf(h.opts.Context, "cant add handler for %s %s", md["Method"], md["Path"])
 		}
 
-		rpat := rhttp.NewTrie()
+		if h.registerRPC {
-		rpat.Insert([]string{http.MethodPost}, "/"+hn, &nilHandler{})
+			if err := hdlr.handlers.Insert([]string{http.MethodPost}, "/"+hn, pth); err != nil {
-
+				h.opts.Logger.Errorf(h.opts.Context, "cant add handler for %s %s", md["Method"], md["Path"])
-		pth = patHandler{pat: rpat, mtype: mtype, name: name, rcvr: rcvr}
+			}
-		hdlr.handlers[http.MethodPost] = append(hdlr.handlers[http.MethodPost], pth)
+		}
 	}
 
 	return hdlr

options.go

@@ -78,44 +78,27 @@ func ErrorHandler(fn func(ctx context.Context, s server.Handler, w http.Response
 type (
 	pathHandlerKey struct{}
 	pathHandlerVal struct {
-		h map[string]http.HandlerFunc
+		h map[string]map[string]http.HandlerFunc
 	}
 )
 
 // PathHandler specifies http handler for path regexp
-func PathHandler(path string, h http.HandlerFunc) server.Option {
+func PathHandler(method, path string, handler http.HandlerFunc) server.Option {
 	return func(o *server.Options) {
 		if o.Context == nil {
 			o.Context = context.Background()
 		}
 		v, ok := o.Context.Value(pathHandlerKey{}).(*pathHandlerVal)
 		if !ok {
-			v = &pathHandlerVal{h: make(map[string]http.HandlerFunc)}
+			v = &pathHandlerVal{h: make(map[string]map[string]http.HandlerFunc)}
 		}
-		v.h[path] = h
+		m, ok := v.h[method]
-		o.Context = context.WithValue(o.Context, pathHandlerKey{}, v)
-	}
-}
-
-type (
-	contentTypeHandlerKey struct{}
-	contentTypeHandlerVal struct {
-		h map[string]http.HandlerFunc
-	}
-)
-
-// ContentTypeHandler specifies http handler for Content-Type
-func ContentTypeHandler(ct string, h http.HandlerFunc) server.Option {
-	return func(o *server.Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		v, ok := o.Context.Value(contentTypeHandlerKey{}).(*contentTypeHandlerVal)
 		if !ok {
-			v = &contentTypeHandlerVal{h: make(map[string]http.HandlerFunc)}
+			m = make(map[string]http.HandlerFunc)
+			v.h[method] = m
 		}
-		v.h[ct] = h
+		m[path] = handler
-		o.Context = context.WithValue(o.Context, contentTypeHandlerKey{}, v)
+		o.Context = context.WithValue(o.Context, pathHandlerKey{}, v)
 	}
 }