use DefaultContentType on application/x-www-form-urlencoded

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

.github/renovate.json

@@ -2,6 +2,7 @@
   "extends": [
     "config:base"
   ],
+  "postUpdateOptions": ["gomodTidy"],
   "packageRules": [
     {
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],

go.mod

@@ -1,10 +1,10 @@
 module github.com/unistack-org/micro-server-http/v3
 
-go 1.13
+go 1.16
 
 require (
-	github.com/unistack-org/micro/v3 v3.2.15
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
+	github.com/unistack-org/micro/v3 v3.3.13
+	golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d
 )
 
 //replace github.com/unistack-org/micro/v3 => ../../micro

go.sum

@@ -2,17 +2,20 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+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-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro/v3 v3.2.15 h1:9Wg6FAFVPUijAm5ZFF+y4oYEd8zd/Pp48QwmMrSs074=
-github.com/unistack-org/micro/v3 v3.2.15/go.mod h1:y+fV+BPNK2IqGoLquRU396jTYifG0HCw3zxFfI4E0dc=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+github.com/unistack-org/micro/v3 v3.3.13 h1:y4bDDkbwnjgOckrhFkC6D/o42tr75X33UbrB+Ko0M68=
+github.com/unistack-org/micro/v3 v3.3.13/go.mod h1:98hNcMXp/WyWJwLwCuwrhN1Jm7aCWaRNsMfRjK8Fq+Y=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d h1:BgJvlyh+UqCUaPlscHJ+PN8GcpfrFdr7NHjd1JL0+Gs=
+golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

handler.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"reflect"
 	"strings"
+	"sync"
 
 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/errors"
@@ -34,16 +35,23 @@ type patHandler struct {
 }
 
 type httpHandler struct {
-	name         string
-	opts         server.HandlerOptions
-	sopts        server.Options
-	eps          []*register.Endpoint
-	hd           interface{}
-	handlers     map[string][]patHandler
-	errorHandler func(context.Context, server.Handler, http.ResponseWriter, *http.Request, error, int)
+	name     string
+	opts     server.HandlerOptions
+	sopts    server.Options
+	eps      []*register.Endpoint
+	hd       interface{}
+	handlers map[string][]patHandler
+	sync.RWMutex
 }
 
 func (h *httpHandler) newCodec(ct string) (codec.Codec, error) {
+	h.RLock()
+	defer h.RUnlock()
+
+	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
+		ct = ct[:idx]
+	}
+
 	if cf, ok := h.sopts.Codecs[ct]; ok {
 		return cf, nil
 	}
@@ -66,14 +74,13 @@ func (h *httpHandler) Options() server.HandlerOptions {
 	return h.opts
 }
 
-func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	ctx := metadata.NewContext(r.Context(), nil)
+func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
-	defer r.Body.Close()
-
-	path := r.URL.Path
-	if !strings.HasPrefix(path, "/") {
-		h.errorHandler(ctx, h, w, r, fmt.Errorf("path must contains /"), http.StatusBadRequest)
+	for exp, ph := range h.pathHandlers {
+		if exp.MatchString(r.URL.String()) {
+			ph(w, r)
+			return
+		}
 	}
 
 	ct := DefaultContentType
@@ -81,9 +88,27 @@ func (h *httpHandler) 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 := metadata.NewContext(r.Context(), nil)
+
+	defer r.Body.Close()
+
+	path := r.URL.Path
+	if !strings.HasPrefix(path, "/") {
+		h.errorHandler(ctx, nil, w, r, fmt.Errorf("path must contains /"), http.StatusBadRequest)
+		return
+	}
+
 	cf, err := h.newCodec(ct)
 	if err != nil {
-		h.errorHandler(ctx, h, w, r, err, http.StatusBadRequest)
+		h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
+		return
 	}
 
 	components := strings.Split(path[1:], "/")
@@ -91,7 +116,7 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var verb string
 	idx := strings.LastIndex(components[l-1], ":")
 	if idx == 0 {
-		h.errorHandler(ctx, h, w, r, fmt.Errorf("not found"), http.StatusNotFound)
+		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not found"), http.StatusNotFound)
 		return
 	}
 	if idx > 0 {
@@ -100,21 +125,28 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	matches := make(map[string]interface{})
+
 	var match bool
 	var hldr patHandler
-	for _, hldr = range h.handlers[r.Method] {
-		mp, err := hldr.pat.Match(components, verb)
-		if err == nil {
-			match = true
-			for k, v := range mp {
-				matches[k] = v
+	var handler *httpHandler
+	for _, hpat := range h.handlers {
+		handlertmp := hpat.(*httpHandler)
+		for _, hldrtmp := range handlertmp.handlers[r.Method] {
+			mp, err := hldrtmp.pat.Match(components, verb)
+			if err == nil {
+				match = true
+				for k, v := range mp {
+					matches[k] = v
+				}
+				hldr = hldrtmp
+				handler = handlertmp
+				break
 			}
-			break
 		}
 	}
 
 	if !match {
-		h.errorHandler(ctx, h, w, r, fmt.Errorf("not matching route found"), http.StatusNotFound)
+		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not matching route found"), http.StatusNotFound)
 		return
 	}
 
@@ -131,7 +163,8 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if len(r.URL.RawQuery) > 0 {
 		umd, err := rflutil.URLMap(r.URL.RawQuery)
 		if err != nil {
-			h.errorHandler(ctx, h, w, r, err, http.StatusBadRequest)
+			h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+			return
 		}
 		for k, v := range umd {
 			matches[k] = v
@@ -161,24 +194,25 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var returnValues []reflect.Value
 
 	if err = cf.ReadBody(r.Body, argv.Interface()); err != nil && err != io.EOF {
-		h.errorHandler(ctx, h, w, r, err, http.StatusInternalServerError)
+		h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
+		return
 	}
 
 	matches = rflutil.FlattenMap(matches)
-	if err = rflutil.MergeMap(argv.Interface(), matches); err != nil {
-		h.errorHandler(ctx, h, w, r, err, http.StatusBadRequest)
+	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, h, w, r, err, http.StatusBadRequest)
+		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
 		return
 	}
 
 	hr := &rpcRequest{
 		codec:       cf,
-		service:     h.sopts.Name,
+		service:     handler.sopts.Name,
 		contentType: ct,
 		method:      fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name),
 		body:        b,
@@ -206,8 +240,17 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// wrap the handler func
-	for i := len(h.sopts.HdlrWrappers); i > 0; i-- {
-		fn = h.sopts.HdlrWrappers[i-1](fn)
+	for i := len(handler.sopts.HdlrWrappers); i > 0; i-- {
+		fn = handler.sopts.HdlrWrappers[i-1](fn)
+	}
+
+	if ct == "application/x-www-form-urlencoded" {
+		cf, err = h.newCodec(DefaultContentType)
+		if err != nil {
+			h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
+			return
+		}
+		ct = DefaultContentType
 	}
 
 	if appErr := fn(ctx, hr, replyv.Interface()); appErr != nil {
@@ -223,8 +266,8 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	} else {
 		b, err = cf.Marshal(replyv.Interface())
 	}
-	if err != nil && h.sopts.Logger.V(logger.ErrorLevel) {
-		h.sopts.Logger.Errorf(h.sopts.Context, "handler err: %v", err)
+	if err != nil && handler.sopts.Logger.V(logger.ErrorLevel) {
+		handler.sopts.Logger.Errorf(handler.sopts.Context, "handler err: %v", err)
 		return
 	}
 
@@ -238,7 +281,8 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if scode != 0 {
 		w.WriteHeader(scode)
 	} else {
-		h.sopts.Logger.Warn(h.sopts.Context, "response code not set in handler via SetRspCode(ctx, http.StatusXXX)")
+		//handler.sopts.Logger.Warn(handler.sopts.Context, "response code not set in handler via SetRspCode(ctx, http.StatusXXX)")
+		w.WriteHeader(200)
 	}
 	w.Write(b)
 }

http.go

@@ -4,11 +4,11 @@ package http
 import (
 	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"net"
 	"net/http"
 	"reflect"
+	"regexp"
 	"sort"
 	"strings"
 	"sync"
@@ -26,16 +26,28 @@ import (
 type httpServer struct {
 	sync.RWMutex
 	opts        server.Options
+	handlers    map[string]server.Handler
 	hd          server.Handler
 	exit        chan chan error
 	subscribers map[*httpSubscriber][]broker.Subscriber
 	// used for first registration
 	registered bool
 	// register service instance
-	rsvc *register.Service
+	rsvc                *register.Service
+	init                bool
+	errorHandler        func(context.Context, server.Handler, http.ResponseWriter, *http.Request, error, int)
+	pathHandlers        map[*regexp.Regexp]http.HandlerFunc
+	contentTypeHandlers map[string]http.HandlerFunc
 }
 
 func (h *httpServer) newCodec(ct string) (codec.Codec, error) {
+	h.RLock()
+	defer h.RUnlock()
+
+	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
+		ct = ct[:idx]
+	}
+
 	if cf, ok := h.opts.Codecs[ct]; ok {
 		return cf, nil
 	}
@@ -50,17 +62,84 @@ func (h *httpServer) Options() server.Options {
 }
 
 func (h *httpServer) Init(opts ...server.Option) error {
+	if len(opts) == 0 && h.init {
+		return nil
+	}
+
 	h.Lock()
+	defer h.Unlock()
+
 	for _, o := range opts {
 		o(&h.opts)
 	}
-	h.Unlock()
+	if fn, ok := h.opts.Context.Value(errorHandlerKey{}).(func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int)); ok && fn != nil {
+		h.errorHandler = fn
+	}
+	if h.handlers == nil {
+		h.handlers = make(map[string]server.Handler)
+	}
+	if h.pathHandlers == nil {
+		h.pathHandlers = make(map[*regexp.Regexp]http.HandlerFunc)
+	}
+	if h.contentTypeHandlers == nil {
+		h.contentTypeHandlers = make(map[string]http.HandlerFunc)
+	}
+	if phs, ok := h.opts.Context.Value(pathHandlerKey{}).(*pathHandlerVal); ok && phs.h != nil {
+		for pp, ph := range phs.h {
+			exp, err := regexp.Compile(pp)
+			if err != nil {
+				return err
+			}
+			h.pathHandlers[exp] = ph
+		}
+	}
+	if phs, ok := h.opts.Context.Value(contentTypeHandlerKey{}).(*contentTypeHandlerVal); ok && phs.h != nil {
+		for pp, ph := range phs.h {
+			h.contentTypeHandlers[pp] = ph
+		}
+	}
+
+	if err := h.opts.Register.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Broker.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Tracer.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Auth.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Logger.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Meter.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Transport.Init(); err != nil {
+		return err
+	}
+
+	h.init = true
+
 	return nil
 }
 
 func (h *httpServer) Handle(handler server.Handler) error {
 	h.Lock()
-	h.hd = handler
+	if hdlr, ok := handler.(*httpHandler); ok {
+		if _, ok := hdlr.hd.(http.Handler); ok {
+			h.hd = handler
+		} else {
+			if h.handlers == nil {
+				h.handlers = make(map[string]server.Handler)
+			}
+			h.handlers[handler.Name()] = handler
+		}
+	} else {
+		h.hd = handler
+	}
 	h.Unlock()
 	return nil
 }
@@ -86,10 +165,6 @@ func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOptio
 		sopts: h.opts,
 	}
 
-	hdlr.errorHandler = DefaultErrorHandler
-	if fn, ok := options.Context.Value(errorHandlerKey{}).(func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int)); ok && fn != nil {
-		hdlr.errorHandler = fn
-	}
 	tp := reflect.TypeOf(handler)
 
 	/*
@@ -184,8 +259,11 @@ func (h *httpServer) Subscribe(sb server.Subscriber) error {
 }
 
 func (h *httpServer) Register() error {
+	var eps []*register.Endpoint
 	h.RLock()
-	eps := h.hd.Endpoints()
+	for _, hdlr := range h.handlers {
+		eps = append(eps, hdlr.Endpoints()...)
+	}
 	rsvc := h.rsvc
 	config := h.opts
 	h.RUnlock()
@@ -322,7 +400,6 @@ func (h *httpServer) Deregister() error {
 func (h *httpServer) Start() error {
 	h.RLock()
 	config := h.opts
-	hd := h.hd
 	h.RUnlock()
 
 	// micro: config.Transport.Listen(config.Address)
@@ -357,13 +434,32 @@ func (h *httpServer) Start() error {
 	h.opts.Address = ts.Addr().String()
 	h.Unlock()
 
-	handler, ok := hd.Handler().(http.Handler)
-	if !ok {
-		handler, ok = hd.(http.Handler)
+	var handler http.Handler
+	var srvFunc func(net.Listener) error
+
+	if h.opts.Context != nil {
+		if hs, ok := h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil {
+			if hs.Handler == nil && h.hd != nil {
+				if hdlr, ok := h.hd.Handler().(http.Handler); ok {
+					hs.Handler = hdlr
+					handler = hs.Handler
+				}
+			} else {
+				handler = hs.Handler
+			}
+		}
 	}
 
-	if !ok {
-		return errors.New("Server required http.Handler")
+	if handler == nil && h.hd == nil {
+		handler = h
+	} else if handler == nil && h.hd != nil {
+		if hdlr, ok := h.hd.Handler().(http.Handler); ok {
+			handler = hdlr
+		}
+	}
+
+	if handler == nil {
+		return fmt.Errorf("cant process with nil handler")
 	}
 
 	if err := config.Broker.Connect(h.opts.Context); err != nil {
@@ -381,7 +477,6 @@ func (h *httpServer) Start() error {
 	}
 
 	fn := handler
-	var srvFunc func(net.Listener) error
 
 	if h.opts.Context != nil {
 		if mwf, ok := h.opts.Context.Value(middlewareKey{}).([]func(http.Handler) http.Handler); ok && len(mwf) > 0 {
@@ -486,8 +581,10 @@ func (h *httpServer) Name() string {
 func NewServer(opts ...server.Option) server.Server {
 	options := server.NewOptions(opts...)
 	return &httpServer{
-		opts:        options,
-		exit:        make(chan chan error),
-		subscribers: make(map[*httpSubscriber][]broker.Subscriber),
+		opts:         options,
+		exit:         make(chan chan error),
+		subscribers:  make(map[*httpSubscriber][]broker.Subscriber),
+		errorHandler: DefaultErrorHandler,
+		pathHandlers: make(map[*regexp.Regexp]http.HandlerFunc),
 	}
 }

options.go

@@ -64,3 +64,43 @@ type errorHandlerKey struct{}
 func ErrorHandler(fn func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int)) server.Option {
 	return server.SetOption(errorHandlerKey{}, fn)
 }
+
+type pathHandlerKey struct{}
+type pathHandlerVal struct {
+	h map[string]http.HandlerFunc
+}
+
+// PathHandler specifies http handler for path regexp
+func PathHandler(path string, h 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.h[path] = h
+		o.Context = context.WithValue(o.Context, pathHandlerKey{}, v)
+	}
+}
+
+type contentTypeHandlerKey struct{}
+type 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)}
+		}
+		v.h[ct] = h
+		o.Context = context.WithValue(o.Context, contentTypeHandlerKey{}, v)
+	}
+}