update for latest micro

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

.github/stale.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-export PATH=$PATH:$(pwd)/bin
-export GO111MODULE=on
-export GOBIN=$(pwd)/bin
-
-#go get github.com/rvflash/goup@v0.4.1
-
-#goup -v ./...
-#go get github.com/psampaz/go-mod-outdated@v0.6.0
-go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
-
-#go list -u -m -json all | go-mod-outdated -update

.github/workflows/build.yml

@@ -34,10 +34,9 @@ jobs:
         uses: actions/checkout@v2
       - name: lint
         uses: golangci/golangci-lint-action@v2
-        continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
+          version: v1.39
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
           # Optional: golangci-lint command line arguments.

.github/workflows/pr.yml

@@ -34,10 +34,9 @@ jobs:
         uses: actions/checkout@v2
       - name: lint
         uses: golangci/golangci-lint-action@v2
-        continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
+          version: v1.39
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
           # Optional: golangci-lint command line arguments.

.golangci.yml

@@ -0,0 +1,44 @@
+run:
+  concurrency: 4
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true
+
+linters-settings:
+  govet:
+    check-shadowing: true
+    enable:
+      - fieldalignment
+
+linters:
+  enable:
+    - govet
+    - deadcode
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - bodyclose
+    - gci
+    - goconst
+    - gocritic
+    - gosimple
+    - gofmt
+    - gofumpt
+    - goimports
+    - golint
+    - gosec
+    - makezero
+    - misspell
+    - nakedret
+    - nestif
+    - nilerr
+    - noctx
+    - prealloc
+    - unconvert
+    - unparam
+  disable-all: false

go.mod

@@ -3,8 +3,6 @@ module github.com/unistack-org/micro-server-http/v3
 go 1.16
 
 require (
-	github.com/unistack-org/micro/v3 v3.3.14
-	golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d
+	github.com/unistack-org/micro/v3 v3.3.17
+	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
 )
-
-//replace github.com/unistack-org/micro/v3 => ../../micro

go.sum

@@ -6,12 +6,12 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
 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.3.14 h1:CAkDMjHZT8/D6GGF5h3gK84m6tlWZC17IGPb2GkAn/4=
-github.com/unistack-org/micro/v3 v3.3.14/go.mod h1:ETGcQQUcjxGaD44LUMX+0fgo8Loh7ExldfIPLvfUmDo=
-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=
+github.com/unistack-org/micro/v3 v3.3.17 h1:WcyS7InP0DlS/JpRQGLh5sG6VstkdHJbgpMp+gmHmwg=
+github.com/unistack-org/micro/v3 v3.3.17/go.mod h1:022EOEZZ789hZY3yB5ZSMXU6jLiadBgcNB/cpediV3c=
+golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 h1:0PC75Fz/kyMGhL0e1QnypqK2kQMqKt9csD1GnMJR+Zk=
+golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 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/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 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=

handler.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/errors"
 	"github.com/unistack-org/micro/v3/logger"
 	"github.com/unistack-org/micro/v3/metadata"
@@ -22,42 +21,30 @@ import (
 var (
 	DefaultErrorHandler = func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int) {
 		w.WriteHeader(status)
-		w.Write([]byte(err.Error()))
+		if _, cerr := w.Write([]byte(err.Error())); cerr != nil {
+			logger.DefaultLogger.Errorf(ctx, "write failed: %v", cerr)
+		}
 	}
 	DefaultContentType = "application/json"
 )
 
 type patHandler struct {
-	pat   rutil.Pattern
 	mtype *methodType
-	name  string
 	rcvr  reflect.Value
+	name  string
+	pat   rutil.Pattern
 }
 
 type httpHandler struct {
-	name     string
 	opts     server.HandlerOptions
-	sopts    server.Options
-	eps      []*register.Endpoint
 	hd       interface{}
 	handlers map[string][]patHandler
+	name     string
+	eps      []*register.Endpoint
+	sopts    server.Options
 	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
-	}
-	return nil, codec.ErrUnknownContentType
-}
-
 func (h *httpHandler) Name() string {
 	return h.name
 }
@@ -75,7 +62,6 @@ func (h *httpHandler) Options() server.HandlerOptions {
 }
 
 func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-
 	for exp, ph := range h.pathHandlers {
 		if exp.MatchString(r.URL.String()) {
 			ph(w, r)
@@ -95,7 +81,7 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	ctx := metadata.NewContext(r.Context(), nil)
+	ctx := metadata.NewIncomingContext(r.Context(), nil)
 
 	defer r.Body.Close()
 
@@ -132,8 +118,8 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	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 {
+			mp, merr := hldrtmp.pat.Match(components, verb)
+			if merr == nil {
 				match = true
 				for k, v := range mp {
 					matches[k] = v
@@ -161,9 +147,9 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// get fields from url values
 	if len(r.URL.RawQuery) > 0 {
-		umd, err := rflutil.URLMap(r.URL.RawQuery)
-		if err != nil {
-			h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+		umd, cerr := rflutil.URLMap(r.URL.RawQuery)
+		if cerr != nil {
+			h.errorHandler(ctx, handler, w, r, cerr, http.StatusBadRequest)
 			return
 		}
 		for k, v := range umd {
@@ -190,7 +176,7 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	replyv = reflect.New(hldr.mtype.ReplyType.Elem())
 
 	function := hldr.mtype.method.Func
-	//function := hldr.rcvr
+	// function := hldr.rcvr
 	var returnValues []reflect.Value
 
 	if err = cf.ReadBody(r.Body, argv.Interface()); err != nil && err != io.EOF {
@@ -281,8 +267,10 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if scode != 0 {
 		w.WriteHeader(scode)
 	} else {
-		//handler.sopts.Logger.Warn(handler.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)
+	if _, cerr := w.Write(b); cerr != nil {
+		logger.DefaultLogger.Errorf(ctx, "write failed: %v", cerr)
+	}
 }

http.go

@@ -24,20 +24,18 @@ 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
+	hd                  server.Handler
 	rsvc                *register.Service
-	init                bool
+	handlers            map[string]server.Handler
+	exit                chan chan error
+	subscribers         map[*httpSubscriber][]broker.Subscriber
 	errorHandler        func(context.Context, server.Handler, http.ResponseWriter, *http.Request, error, int)
 	pathHandlers        map[*regexp.Regexp]http.HandlerFunc
 	contentTypeHandlers map[string]http.HandlerFunc
+	opts                server.Options
+	sync.RWMutex
+	registered bool
+	init       bool
 }
 
 func (h *httpServer) newCodec(ct string) (codec.Codec, error) {
@@ -128,34 +126,35 @@ func (h *httpServer) Init(opts ...server.Option) error {
 
 func (h *httpServer) Handle(handler server.Handler) error {
 	h.Lock()
-	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 {
+	defer h.Unlock()
+	hdlr, ok := handler.(*httpHandler)
+	if !ok {
 		h.hd = handler
+		return nil
 	}
-	h.Unlock()
+
+	if _, ok := hdlr.hd.(http.Handler); ok {
+		h.hd = handler
+		return nil
+	}
+
+	if h.handlers == nil {
+		h.handlers = make(map[string]server.Handler)
+	}
+	h.handlers[handler.Name()] = handler
+
 	return nil
 }
 
 func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)
 
-	var eps []*register.Endpoint
-
-	if !options.Internal {
-		for name, metadata := range options.Metadata {
-			eps = append(eps, &register.Endpoint{
-				Name:     name,
-				Metadata: metadata,
-			})
-		}
+	eps := make([]*register.Endpoint, 0, len(options.Metadata))
+	for name, metadata := range options.Metadata {
+		eps = append(eps, &register.Endpoint{
+			Name:     name,
+			Metadata: metadata,
+		})
 	}
 
 	hdlr := &httpHandler{
@@ -284,12 +283,10 @@ func (h *httpServer) Register() error {
 	service.Endpoints = eps
 
 	h.Lock()
-	var subscriberList []*httpSubscriber
+	subscriberList := make([]*httpSubscriber, 0, len(h.subscribers))
 	for e := range h.subscribers {
 		// Only advertise non internal subscribers
-		if !e.Options().Internal {
-			subscriberList = append(subscriberList, e)
-		}
+		subscriberList = append(subscriberList, e)
 	}
 	sort.Slice(subscriberList, func(i, j int) bool {
 		return subscriberList[i].topic > subscriberList[j].topic
@@ -306,7 +303,7 @@ func (h *httpServer) Register() error {
 
 	if !registered {
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(config.Context, "Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].Id)
+			config.Logger.Infof(config.Context, "Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID)
 		}
 	}
 
@@ -361,7 +358,7 @@ func (h *httpServer) Deregister() error {
 	}
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].Id)
+		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].ID)
 	}
 
 	if err := server.DefaultDeregisterFunc(service, config); err != nil {
@@ -437,6 +434,7 @@ func (h *httpServer) Start() error {
 	var handler http.Handler
 	var srvFunc func(net.Listener) error
 
+	// nolint: nestif
 	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 {
@@ -468,7 +466,7 @@ func (h *httpServer) Start() error {
 
 	if err := config.RegisterCheck(h.opts.Context); err != nil {
 		if config.Logger.V(logger.ErrorLevel) {
-			config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.Id, err)
+			config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, err)
 		}
 	} else {
 		if err = h.Register(); err != nil {
@@ -492,9 +490,17 @@ func (h *httpServer) Start() error {
 	}
 
 	if srvFunc != nil {
-		go srvFunc(ts)
+		go func() {
+			if cerr := srvFunc(ts); cerr != nil {
+				h.opts.Logger.Error(h.opts.Context, cerr)
+			}
+		}()
 	} else {
-		go http.Serve(ts, fn)
+		go func() {
+			if cerr := http.Serve(ts, fn); cerr != nil {
+				h.opts.Logger.Error(h.opts.Context, cerr)
+			}
+		}()
 	}
 
 	go func() {
@@ -518,25 +524,26 @@ func (h *httpServer) Start() error {
 				registered := h.registered
 				h.RUnlock()
 				rerr := config.RegisterCheck(h.opts.Context)
+				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.Id, rerr)
+						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
 					}
 					// deregister self in case of error
 					if err := h.Deregister(); err != nil {
 						if config.Logger.V(logger.ErrorLevel) {
-							config.Logger.Errorf(config.Context, "Server %s-%s deregister error: %s", config.Name, config.Id, err)
+							config.Logger.Errorf(config.Context, "Server %s-%s deregister error: %s", config.Name, config.ID, err)
 						}
 					}
 				} else if rerr != nil && !registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.Id, rerr)
+						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, rerr)
 					}
 					continue
 				}
 				if err := h.Register(); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.Id, err)
+						config.Logger.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.ID, err)
 					}
 				}
 

message.go

@@ -6,12 +6,12 @@ import (
 )
 
 type httpMessage struct {
-	topic       string
 	payload     interface{}
-	contentType string
-	header      metadata.Metadata
-	body        []byte
 	codec       codec.Codec
+	header      metadata.Metadata
+	topic       string
+	contentType string
+	body        []byte
 }
 
 func (r *httpMessage) Topic() string {

options.go

@@ -8,11 +8,6 @@ import (
 	"github.com/unistack-org/micro/v3/server"
 )
 
-type rspCodeKey struct{}
-type rspCodeVal struct {
-	code int
-}
-
 // SetError pass error to caller
 func SetError(err interface{}) error {
 	return &Error{err: err}
@@ -28,6 +23,13 @@ func (err *Error) Error() string {
 	return fmt.Sprintf("%v", err.err)
 }
 
+type (
+	rspCodeKey struct{}
+	rspCodeVal struct {
+		code int
+	}
+)
+
 // SetRspCode saves response code in context, must be used by handler to specify http code
 func SetRspCode(ctx context.Context, code int) {
 	if rsp, ok := ctx.Value(rspCodeKey{}).(*rspCodeVal); ok {
@@ -65,10 +67,12 @@ func ErrorHandler(fn func(ctx context.Context, s server.Handler, w http.Response
 	return server.SetOption(errorHandlerKey{}, fn)
 }
 
-type pathHandlerKey struct{}
-type pathHandlerVal struct {
-	h map[string]http.HandlerFunc
-}
+type (
+	pathHandlerKey struct{}
+	pathHandlerVal struct {
+		h map[string]http.HandlerFunc
+	}
+)
 
 // PathHandler specifies http handler for path regexp
 func PathHandler(path string, h http.HandlerFunc) server.Option {
@@ -85,10 +89,12 @@ func PathHandler(path string, h http.HandlerFunc) server.Option {
 	}
 }
 
-type contentTypeHandlerKey struct{}
-type contentTypeHandlerVal struct {
-	h map[string]http.HandlerFunc
-}
+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 {

request.go

@@ -5,29 +5,34 @@ import (
 
 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/metadata"
+	"github.com/unistack-org/micro/v3/server"
+)
+
+var (
+	_ server.Request = &rpcRequest{}
+	_ server.Message = &rpcMessage{}
 )
 
 type rpcRequest struct {
 	rw          io.ReadWriter
-	service     string
-	method      string
-	endpoint    string
-	target      string
-	contentType string
+	payload     interface{}
 	codec       codec.Codec
 	header      metadata.Metadata
+	method      string
+	endpoint    string
+	contentType string
+	service     string
 	body        []byte
 	stream      bool
-	payload     interface{}
 }
 
 type rpcMessage struct {
+	payload     interface{}
+	codec       codec.Codec
+	header      metadata.Metadata
 	topic       string
 	contentType string
-	payload     interface{}
-	header      metadata.Metadata
 	body        []byte
-	codec       codec.Codec
 }
 
 func (r *rpcRequest) ContentType() string {
@@ -43,7 +48,7 @@ func (r *rpcRequest) Method() string {
 }
 
 func (r *rpcRequest) Endpoint() string {
-	return r.method
+	return r.endpoint
 }
 
 func (r *rpcRequest) Codec() codec.Codec {

server.go

@@ -11,10 +11,10 @@ import (
 )
 
 type methodType struct {
-	method      reflect.Method
 	ArgType     reflect.Type
 	ReplyType   reflect.Type
 	ContextType reflect.Type
+	method      reflect.Method
 	stream      bool
 }
 
@@ -62,15 +62,14 @@ func prepareEndpoint(method reflect.Method) (*methodType, error) {
 		return nil, fmt.Errorf("method %v of %v has wrong number of ins: %v", mname, mtype, mtype.NumIn())
 	}
 
-	if stream {
+	switch stream {
+	case true:
 		// check stream type
 		streamType := reflect.TypeOf((*server.Stream)(nil)).Elem()
 		if !argType.Implements(streamType) {
 			return nil, fmt.Errorf("%v argument does not implement Streamer interface: %v", mname, argType)
 		}
-	} else {
-		// if not stream check the replyType
-
+	default:
 		// First arg need not be a pointer.
 		if !isExportedOrBuiltinType(argType) {
 			return nil, fmt.Errorf("%v argument type not exported: %v", mname, argType)

subscriber.go

@@ -14,16 +14,12 @@ import (
 	"github.com/unistack-org/micro/v3/server"
 )
 
-const (
-	subSig = "func(context.Context, interface{}) error"
-)
-
 var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
 
 type handler struct {
-	method  reflect.Value
 	reqType reflect.Type
 	ctxType reflect.Type
+	method  reflect.Value
 }
 
 type httpSubscriber struct {
@@ -116,7 +112,7 @@ func (s *httpServer) createSubHandler(sb *httpSubscriber, opts server.Options) b
 
 		hdr := metadata.Copy(msg.Header)
 		delete(hdr, "Content-Type")
-		ctx := metadata.NewContext(context.Background(), hdr)
+		ctx := metadata.NewIncomingContext(context.Background(), hdr)
 
 		results := make(chan error, len(sb.handlers))