update for latest micro

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

.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,6 +3,6 @@ module github.com/unistack-org/micro-server-tcp/v3
 go 1.16
 
 require (
-	github.com/unistack-org/micro/v3 v3.3.0
-	golang.org/x/net v0.0.0-20210323141857-08027d57d8cf
+	github.com/unistack-org/micro/v3 v3.3.17
+	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
 )

go.sum

@@ -6,15 +6,14 @@ 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.0 h1:pEj/8QVFzMlNMEL//q/Te8qgG+XI6LTYIQrb6hMymgk=
-github.com/unistack-org/micro/v3 v3.3.0/go.mod h1:iJwCWq2PECMxigfqe6TPC5GLWvj6P94Kk+PTVZGL3w8=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210323141857-08027d57d8cf h1:sewfyKLWuY3ko6EI4hbFziQ8bHkfammpzCDfLT92I1c=
-golang.org/x/net v0.0.0-20210323141857-08027d57d8cf/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+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-20210315160823-c6e025ad8005/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.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

@@ -13,8 +13,8 @@ type Handler interface {
 
 type tcpHandler struct {
 	opts       server.HandlerOptions
-	eps        []*register.Endpoint
 	hd         interface{}
+	eps        []*register.Endpoint
 	maxMsgSize int
 }
 

message.go

@@ -3,15 +3,18 @@ package tcp
 import (
 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/metadata"
+	"github.com/unistack-org/micro/v3/server"
 )
 
+var _ server.Message = &tcpMessage{}
+
 type tcpMessage 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 *tcpMessage) Topic() string {

options.go

@@ -7,16 +7,16 @@ import (
 	"github.com/unistack-org/micro/v3/server"
 )
 
-var (
-	// DefaultMaxMsgSize define maximum message size that server can send
-	// or receive.  Default value is 8K
-	DefaultMaxMsgSize = 1024 * 8
-)
+// DefaultMaxMsgSize define maximum message size that server can send
+// or receive.  Default value is 8K
+var DefaultMaxMsgSize = 1024 * 8
 
-type maxMsgSizeKey struct{}
-type tlsAuth struct{}
-type maxConnKey struct{}
-type netListener struct{}
+type (
+	maxMsgSizeKey struct{}
+	tlsAuth       struct{}
+	maxConnKey    struct{}
+	netListener   struct{}
+)
 
 //
 // MaxMsgSize set the maximum message in bytes the server can receive and

request.go

@@ -2,16 +2,20 @@ package tcp
 
 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 = &tcpRequest{}
+
 type tcpRequest struct {
-	service     string
+	codec       codec.Codec
+	body        interface{}
+	header      map[string]string
 	method      string
 	endpoint    string
 	contentType string
-	header      map[string]string
-	body        interface{}
-	codec       codec.Codec
+	service     string
 }
 
 func (r *tcpRequest) Service() string {
@@ -30,7 +34,7 @@ func (r *tcpRequest) ContentType() string {
 	return r.contentType
 }
 
-func (r *tcpRequest) Header() map[string]string {
+func (r *tcpRequest) Header() metadata.Metadata {
 	return r.header
 }
 

subscriber.go

@@ -23,9 +23,9 @@ const (
 var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
 
 type handler struct {
-	method  reflect.Value
 	reqType reflect.Type
 	ctxType reflect.Type
+	method  reflect.Value
 }
 
 type tcpSubscriber struct {
@@ -133,7 +133,8 @@ func validateSubscriber(sub server.Subscriber) error {
 	typ := reflect.TypeOf(sub.Subscriber())
 	var argType reflect.Type
 
-	if typ.Kind() == reflect.Func {
+	switch typ.Kind() {
+	case reflect.Func:
 		name := "Func"
 		switch typ.NumIn() {
 		case 2:
@@ -151,7 +152,7 @@ func validateSubscriber(sub server.Subscriber) error {
 		if returnType := typ.Out(0); returnType != typeOfError {
 			return fmt.Errorf("subscriber %v returns %v not error", name, returnType.String())
 		}
-	} else {
+	default:
 		hdlr := reflect.ValueOf(sub.Subscriber())
 		name := reflect.Indirect(hdlr).Type().Name()
 
@@ -192,12 +193,14 @@ func (s *tcpServer) createSubHandler(sb *tcpSubscriber, opts server.Options) bro
 			return err
 		}
 
-		hdr := make(map[string]string)
+		hdr := make(map[string]string, len(msg.Header)-1)
 		for k, v := range msg.Header {
+			if k == "Content-Type" {
+				continue
+			}
 			hdr[k] = v
 		}
-		delete(hdr, "Content-Type")
-		ctx := metadata.NewContext(context.Background(), hdr)
+		ctx := metadata.NewIncomingContext(context.Background(), hdr)
 
 		results := make(chan error, len(sb.handlers))
 

tcp.go

@@ -18,17 +18,14 @@ import (
 )
 
 type tcpServer struct {
+	hd          server.Handler
+	rsvc        *register.Service
+	exit        chan chan error
+	subscribers map[*tcpSubscriber][]broker.Subscriber
+	opts        server.Options
 	sync.RWMutex
-	opts         server.Options
-	hd           server.Handler
-	exit         chan chan error
-	registerOnce sync.Once
-	subscribers  map[*tcpSubscriber][]broker.Subscriber
-	// used for first registration
 	registered bool
 	init       bool
-	// register service instance
-	rsvc *register.Service
 }
 
 func (h *tcpServer) newCodec(ct string) (codec.Codec, error) {
@@ -89,15 +86,12 @@ func (h *tcpServer) Handle(handler server.Handler) error {
 func (h *tcpServer) 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,
+		})
 	}
 
 	th := &tcpHandler{
@@ -159,17 +153,17 @@ func (h *tcpServer) Register() error {
 	if err != nil {
 		return err
 	}
+
 	service.Nodes[0].Metadata["protocol"] = "tcp"
-	service.Nodes[0].Metadata["transport"] = "tcp"
+	service.Nodes[0].Metadata["transport"] = service.Nodes[0].Metadata["protocol"]
 	service.Endpoints = eps
 
 	h.Lock()
-	var subscriberList []*tcpSubscriber
+
+	subscriberList := make([]*tcpSubscriber, 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
@@ -185,7 +179,7 @@ func (h *tcpServer) 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)
 		}
 	}
 
@@ -248,7 +242,7 @@ func (h *tcpServer) 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 {
@@ -316,10 +310,13 @@ func (h *tcpServer) Start() error {
 
 	if l := h.getListener(); l != nil {
 		ts = l
-	} else {
+	}
+
+	// nolint: nestif
+	if ts == nil {
 		// check the tls config for secure connect
-		if tc := config.TLSConfig; tc != nil {
-			ts, err = tls.Listen("tcp", config.Address, tc)
+		if config.TLSConfig != nil {
+			ts, err = tls.Listen("tcp", config.Address, config.TLSConfig)
 			// otherwise just plain tcp listener
 		} else {
 			ts, err = net.Listen("tcp", config.Address)
@@ -379,25 +376,26 @@ func (h *tcpServer) Start() error {
 				registered := h.registered
 				h.RUnlock()
 				rerr := h.opts.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)
 					}
 				}
 				// wait for exit
@@ -409,9 +407,13 @@ func (h *tcpServer) Start() error {
 		ch <- ts.Close()
 
 		// deregister
-		h.Deregister()
+		if cerr := h.Deregister(); cerr != nil {
+			config.Logger.Errorf(config.Context, "Register deregister error: %v", cerr)
+		}
 
-		config.Broker.Disconnect(config.Context)
+		if cerr := config.Broker.Disconnect(config.Context); cerr != nil {
+			config.Logger.Errorf(config.Context, "Broker disconnect error: %v", cerr)
+		}
 	}()
 
 	return nil
@@ -423,24 +425,25 @@ func (h *tcpServer) Stop() error {
 	return <-ch
 }
 
-func (s *tcpServer) String() string {
+func (h *tcpServer) String() string {
 	return "tcp"
 }
 
-func (s *tcpServer) Name() string {
-	return s.opts.Name
+func (h *tcpServer) Name() string {
+	return h.opts.Name
 }
 
-func (s *tcpServer) serve(ln net.Listener, h Handler) {
+func (h *tcpServer) serve(ln net.Listener, hd Handler) {
 	var tempDelay time.Duration // how long to sleep on accept failure
-	s.RLock()
-	config := s.opts
-	s.RUnlock()
+	h.RLock()
+	config := h.opts
+	h.RUnlock()
 	for {
 		c, err := ln.Accept()
+		// nolint: nestif
 		if err != nil {
 			select {
-			case <-s.exit:
+			case <-h.exit:
 				return
 			default:
 			}
@@ -460,16 +463,16 @@ func (s *tcpServer) serve(ln net.Listener, h Handler) {
 				continue
 			}
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Error(config.Context, "tcp: Accept error: %v", err)
+				config.Logger.Errorf(config.Context, "tcp: Accept error: %v", err)
 			}
 			return
 		}
 
 		if err != nil {
-			config.Logger.Error(config.Context, "tcp: accept err: %v", err)
+			config.Logger.Errorf(config.Context, "tcp: accept err: %v", err)
 			return
 		}
-		go h.Serve(c)
+		go hd.Serve(c)
 	}
 }