fix path template parsing

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

@@ -2,4 +2,4 @@ module github.com/unistack-org/micro-client-http/v3
 
 go 1.16
 
-require github.com/unistack-org/micro/v3 v3.3.14
+require github.com/unistack-org/micro/v3 v3.5.4

go.sum

@@ -1,15 +1,15 @@
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 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.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 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.5.4 h1:6nIljqND355f+Fhc2mtCxYb5IRwer6nsMoAXpN8kka0=
-github.com/unistack-org/micro/v3 v3.3.14/go.mod h1:ETGcQQUcjxGaD44LUMX+0fgo8Loh7ExldfIPLvfUmDo=
+github.com/unistack-org/micro/v3 v3.5.4/go.mod h1:1ZkwpEqpiHiVhM2hiF9DamtpsF04oFybFhEQ4zEMcro=
-golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 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=

http.go

@@ -20,61 +20,53 @@ import (
 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/errors"
 	"github.com/unistack-org/micro/v3/metadata"
-	"github.com/unistack-org/micro/v3/router"
 )
 
-var (
+var DefaultContentType = "application/json"
-	DefaultContentType = "application/json"
-)
 
+/*
 func filterLabel(r []router.Route) []router.Route {
 	//				selector.FilterLabel("protocol", "http")
 	return r
 }
+*/
 
 type httpClient struct {
-	opts    client.Options
-	dialer  *net.Dialer
 	httpcli *http.Client
-	init    bool
+	opts    client.Options
 	sync.RWMutex
+	init bool
 }
 
-func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg interface{}, opts client.CallOptions) (*http.Request, error) {
+func newRequest(ctx context.Context, addr string, req client.Request, ct string, cf codec.Codec, msg interface{}, opts client.CallOptions) (*http.Request, error) {
-	hreq := &http.Request{Method: http.MethodPost}
-	body := "*" // as like google api http annotation
-
 	var tags []string
-	var scheme string
+	scheme := "http"
-	u, err := url.Parse(addr)
+	method := http.MethodPost
-	if err != nil {
+	body := "*" // as like google api http annotation
-		hreq.URL = &url.URL{
+	host := addr
-			Scheme: "http",
+	path := req.Endpoint()
-			Host:   addr,
-			Path:   req.Endpoint(),
-		}
-		hreq.Host = addr
-		scheme = "http"
-	} else {
-		ep := req.Endpoint()
-		if opts.Context != nil {
-			if m, ok := opts.Context.Value(methodKey{}).(string); ok {
-				hreq.Method = m
-			}
-			if p, ok := opts.Context.Value(pathKey{}).(string); ok {
-				ep = p
-			}
-			if b, ok := opts.Context.Value(bodyKey{}).(string); ok {
-				body = b
-			}
-			if t, ok := opts.Context.Value(structTagsKey{}).([]string); ok && len(t) > 0 {
-				tags = t
-			}
 
+	u, err := url.Parse(addr)
+	if err == nil {
+		scheme = u.Scheme
+		path = u.Path
+		host = u.Host
+	} else {
+		u = &url.URL{Scheme: scheme, Path: path, Host: host}
+	}
+
+	if opts.Context != nil {
+		if m, ok := opts.Context.Value(methodKey{}).(string); ok {
+			method = m
 		}
-		hreq.URL, err = u.Parse(ep)
+		if p, ok := opts.Context.Value(pathKey{}).(string); ok {
-		if err != nil {
+			path += p
-			return nil, errors.BadRequest("go.micro.client", err.Error())
+		}
+		if b, ok := opts.Context.Value(bodyKey{}).(string); ok {
+			body = b
+		}
+		if t, ok := opts.Context.Value(structTagsKey{}).([]string); ok && len(t) > 0 {
+			tags = t
 		}
 	}
 
@@ -87,16 +79,21 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 		}
 	}
 
-	path, nmsg, err := newPathRequest(hreq.URL.Path, hreq.Method, body, msg, tags)
+	if path == "" {
+		path = req.Endpoint()
+	}
+
+	u, err = u.Parse(path)
 	if err != nil {
 		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
 
-	if scheme != "" {
+	path, nmsg, err := newPathRequest(u.Path, method, body, msg, tags)
-		hreq.URL, err = url.Parse(scheme + "://" + addr + path)
+	if err != nil {
-	} else {
+		return nil, errors.BadRequest("go.micro.client", err.Error())
-		hreq.URL, err = url.Parse(addr + path)
 	}
+
+	u, err = url.Parse(fmt.Sprintf("%s://%s%s", scheme, host, path))
 	if err != nil {
 		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
@@ -106,103 +103,100 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
 
+	var hreq *http.Request
 	if len(b) > 0 {
-		hreq.Body = ioutil.NopCloser(bytes.NewBuffer(b))
+		hreq, err = http.NewRequestWithContext(ctx, method, u.String(), ioutil.NopCloser(bytes.NewBuffer(b)))
 		hreq.ContentLength = int64(len(b))
+	} else {
+		hreq, err = http.NewRequestWithContext(ctx, method, u.String(), nil)
 	}
 
+	if err != nil {
+		return nil, errors.BadRequest("go.micro.client", err.Error())
+	}
+
+	header := make(http.Header)
+
+	if opts.Context != nil {
+		if md, ok := opts.Context.Value(metadataKey{}).(metadata.Metadata); ok {
+			for k, v := range md {
+				header.Set(k, v)
+			}
+		}
+	}
+
+	if opts.AuthToken != "" {
+		hreq.Header.Set(metadata.HeaderAuthorization, opts.AuthToken)
+	}
+
+	if md, ok := metadata.FromOutgoingContext(ctx); ok {
+		for k, v := range md {
+			hreq.Header.Set(k, v)
+		}
+	}
+
+	// set timeout in nanoseconds
+	if opts.StreamTimeout > time.Duration(0) {
+		hreq.Header.Set(metadata.HeaderTimeout, fmt.Sprintf("%d", opts.StreamTimeout))
+	}
+	if opts.RequestTimeout > time.Duration(0) {
+		hreq.Header.Set(metadata.HeaderTimeout, fmt.Sprintf("%d", opts.RequestTimeout))
+	}
+
+	// set the content type for the request
+	hreq.Header.Set(metadata.HeaderContentType, ct)
+
 	return hreq, nil
 }
 
 func (h *httpClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
-	header := make(http.Header, 2)
-	if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		for k, v := range md {
-			header.Set(k, v)
-		}
-	}
-
 	ct := req.ContentType()
 	if len(opts.ContentType) > 0 {
 		ct = opts.ContentType
 	}
 
-	// set timeout in nanoseconds
-	header.Set("Timeout", fmt.Sprintf("%d", opts.RequestTimeout))
-	// set the content type for the request
-	header.Set("Content-Type", ct)
-
 	cf, err := h.newCodec(ct)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}
-	hreq, err := newRequest(addr, req, ct, cf, req.Body(), opts)
+	hreq, err := newRequest(ctx, addr, req, ct, cf, req.Body(), opts)
 	if err != nil {
 		return err
 	}
 
-	hreq.Header = header
-
 	// make the request
-	hrsp, err := h.httpcli.Do(hreq.WithContext(ctx))
+	hrsp, err := h.httpcli.Do(hreq)
 	if err != nil {
 		switch err := err.(type) {
-		case net.Error:
-			if err.Timeout() {
-				return errors.Timeout("go.micro.client", err.Error())
-			}
 		case *url.Error:
 			if err, ok := err.Err.(net.Error); ok && err.Timeout() {
 				return errors.Timeout("go.micro.client", err.Error())
 			}
+		case net.Error:
+			if err.Timeout() {
+				return errors.Timeout("go.micro.client", err.Error())
+			}
 		}
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}
 
 	defer hrsp.Body.Close()
 
-	if ct == "application/x-www-form-urlencoded" {
-		cf, err = h.newCodec(DefaultContentType)
-		if err != nil {
-			return errors.InternalServerError("go.micro.client", err.Error())
-		}
-	}
 	return h.parseRsp(ctx, hrsp, rsp, opts)
 }
 
 func (h *httpClient) stream(ctx context.Context, addr string, req client.Request, opts client.CallOptions) (client.Stream, error) {
-	var header http.Header
-
-	if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		header = make(http.Header, len(md)+2)
-		for k, v := range md {
-			header.Set(k, v)
-		}
-	} else {
-		header = make(http.Header, 2)
-	}
-
 	ct := req.ContentType()
 	if len(opts.ContentType) > 0 {
 		ct = opts.ContentType
 	}
 
-	// set timeout in nanoseconds
-	header.Set("Timeout", fmt.Sprintf("%d", opts.RequestTimeout))
-	// set the content type for the request
-	header.Set("Content-Type", ct)
-
 	// get codec
 	cf, err := h.newCodec(ct)
 	if err != nil {
 		return nil, errors.InternalServerError("go.micro.client", err.Error())
 	}
 
-	dialAddr := addr
-	u, err := url.Parse(dialAddr)
-	if err == nil && u.Scheme != "" && u.Host != "" {
-		dialAddr = u.Host
-	}
 	cc, err := (h.httpcli.Transport).(*http.Transport).DialContext(ctx, "tcp", addr)
 	if err != nil {
 		return nil, errors.InternalServerError("go.micro.client", fmt.Sprintf("Error dialing: %v", err))
@@ -216,7 +210,6 @@ func (h *httpClient) stream(ctx context.Context, addr string, req client.Request
 		conn:    cc,
 		ct:      ct,
 		cf:      cf,
-		header:  header,
 		reader:  bufio.NewReader(cc),
 		request: req,
 	}, nil
@@ -296,7 +289,7 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := client.WithRequestTimeout(d.Sub(time.Now()))
+		opt := client.WithRequestTimeout(time.Until(d))
 		opt(&callOpts)
 	}
 
@@ -409,22 +402,22 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
 	// make a copy of call opts
 	callOpts := h.opts.CallOptions
-	for _, opt := range opts {
+	for _, o := range opts {
-		opt(&callOpts)
+		o(&callOpts)
 	}
 
 	// check if we already have a deadline
 	d, ok := ctx.Deadline()
-	if !ok {
+	if !ok && callOpts.StreamTimeout > time.Duration(0) {
 		var cancel context.CancelFunc
 		// no deadline so we create a new one
-		ctx, cancel = context.WithTimeout(ctx, callOpts.RequestTimeout)
+		ctx, cancel = context.WithTimeout(ctx, callOpts.StreamTimeout)
 		defer cancel()
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := client.WithRequestTimeout(d.Sub(time.Now()))
+		o := client.WithStreamTimeout(time.Until(d))
-		opt(&callOpts)
+		o(&callOpts)
 	}
 
 	// should we noop right here?
@@ -436,10 +429,7 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 	/*
 		// make copy of call method
-		hstream, err := h.stream()
+		hstream := h.stream
-		if err != nil {
-			return nil, err
-		}
 		// wrap the call in reverse
 		for i := len(callOpts.CallWrappers); i > 0; i-- {
 			hstream = callOpts.CallWrappers[i-1](hstream)
@@ -476,9 +466,9 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 	call := func(i int) (client.Stream, error) {
 		// call backoff first. Someone may want an initial start delay
-		t, err := callOpts.Backoff(ctx, req, i)
+		t, cerr := callOpts.Backoff(ctx, req, i)
-		if err != nil {
+		if cerr != nil {
-			return nil, errors.InternalServerError("go.micro.client", err.Error())
+			return nil, errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
 		// only sleep if greater than 0
@@ -488,19 +478,19 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 		node := next()
 
-		stream, err := h.stream(ctx, node, req, callOpts)
+		stream, cerr := h.stream(ctx, node, req, callOpts)
 
 		// record the result of the call to inform future routing decisions
-		if verr := h.opts.Selector.Record(node, err); verr != nil {
+		if verr := h.opts.Selector.Record(node, cerr); verr != nil {
 			return nil, verr
 		}
 
 		// try and transform the error to a go-micro error
-		if verr, ok := err.(*errors.Error); ok {
+		if verr, ok := cerr.(*errors.Error); ok {
 			return nil, verr
 		}
 
-		return stream, err
+		return stream, cerr
 	}
 
 	type response struct {
@@ -513,8 +503,8 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 	for i := 0; i <= callOpts.Retries; i++ {
 		go func() {
-			s, err := call(i)
+			s, cerr := call(i)
-			ch <- response{s, err}
+			ch <- response{s, cerr}
 		}()
 
 		select {
@@ -542,50 +532,64 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 	return nil, grr
 }
 
+func (h *httpClient) BatchPublish(ctx context.Context, p []client.Message, opts ...client.PublishOption) error {
+	return h.publish(ctx, p, opts...)
+}
+
 func (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
+	return h.publish(ctx, []client.Message{p}, opts...)
+}
+
+func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
 	options := client.NewPublishOptions(opts...)
 
-	md, ok := metadata.FromOutgoingContext(ctx)
+	// get proxy
-	if !ok {
+	exchange := ""
-		md = metadata.New(2)
+	if v, ok := os.LookupEnv("MICRO_PROXY"); ok {
-	}
+		exchange = v
-	md["Content-Type"] = p.ContentType()
-	md["Micro-Topic"] = p.Topic()
-
-	cf, err := h.newCodec(p.ContentType())
-	if err != nil {
-		return errors.InternalServerError("go.micro.client", err.Error())
 	}
 
-	var body []byte
+	msgs := make([]*broker.Message, 0, len(ps))
 
-	// passed in raw data
+	for _, p := range ps {
-	if d, ok := p.Payload().(*codec.Frame); ok {
+		md, ok := metadata.FromOutgoingContext(ctx)
-		body = d.Data
+		if !ok {
-	} else {
+			md = metadata.New(2)
-		b := bytes.NewBuffer(nil)
+		}
-		if err := cf.Write(b, &codec.Message{Type: codec.Event}, p.Payload()); err != nil {
+		md[metadata.HeaderContentType] = p.ContentType()
+		md[metadata.HeaderTopic] = p.Topic()
+
+		cf, err := h.newCodec(p.ContentType())
+		if err != nil {
 			return errors.InternalServerError("go.micro.client", err.Error())
 		}
-		body = b.Bytes()
+
+		var body []byte
+
+		// passed in raw data
+		if d, ok := p.Payload().(*codec.Frame); ok {
+			body = d.Data
+		} else {
+			b := bytes.NewBuffer(nil)
+			if err := cf.Write(b, &codec.Message{Type: codec.Event}, p.Payload()); err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
+			body = b.Bytes()
+		}
+
+		topic := p.Topic()
+		if len(exchange) > 0 {
+			topic = exchange
+		}
+
+		md.Set(metadata.HeaderTopic, topic)
+		msgs = append(msgs, &broker.Message{Header: md, Body: body})
 	}
 
-	topic := p.Topic()
+	return h.opts.Broker.BatchPublish(ctx, msgs,
-
+		broker.PublishContext(ctx),
-	// get proxy
+		broker.PublishBodyOnly(options.BodyOnly),
-	if prx := os.Getenv("MICRO_PROXY"); len(prx) > 0 {
+	)
-		options.Exchange = prx
-	}
-
-	// get the exchange
-	if len(options.Exchange) > 0 {
-		topic = options.Exchange
-	}
-
-	return h.opts.Broker.Publish(ctx, topic, &broker.Message{
-		Header: md,
-		Body:   body,
-	}, broker.PublishContext(ctx))
 }
 
 func (h *httpClient) String() string {

message.go

@@ -5,9 +5,9 @@ import (
 )
 
 type httpMessage struct {
+	payload     interface{}
 	topic       string
 	contentType string
-	payload     interface{}
 }
 
 func newHTTPMessage(topic string, payload interface{}, contentType string, opts ...client.MessageOption) client.Message {

options.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/unistack-org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/metadata"
 )
 
 var (
@@ -26,27 +27,28 @@ var (
 )
 
 type poolMaxStreams struct{}
-type poolMaxIdle struct{}
-type codecsKey struct{}
-type tlsAuth struct{}
-type maxRecvMsgSizeKey struct{}
-type maxSendMsgSizeKey struct{}
 
 // PoolMaxStreams maximum streams on a connectioin
 func PoolMaxStreams(n int) client.Option {
 	return client.SetOption(poolMaxStreams{}, n)
 }
 
+type poolMaxIdle struct{}
+
 // PoolMaxIdle maximum idle conns of a pool
 func PoolMaxIdle(d int) client.Option {
 	return client.SetOption(poolMaxIdle{}, d)
 }
 
+type maxRecvMsgSizeKey struct{}
+
 // MaxRecvMsgSize set the maximum size of message that client can receive.
 func MaxRecvMsgSize(s int) client.Option {
 	return client.SetOption(maxRecvMsgSizeKey{}, s)
 }
 
+type maxSendMsgSizeKey struct{}
+
 // MaxSendMsgSize set the maximum size of message that client can send.
 func MaxSendMsgSize(s int) client.Option {
 	return client.SetOption(maxSendMsgSizeKey{}, s)
@@ -54,12 +56,14 @@ func MaxSendMsgSize(s int) client.Option {
 
 type httpClientKey struct{}
 
+// nolint: golint
 func HTTPClient(c *http.Client) client.Option {
 	return client.SetOption(httpClientKey{}, c)
 }
 
 type httpDialerKey struct{}
 
+// nolint: golint
 func HTTPDialer(d *net.Dialer) client.Option {
 	return client.SetOption(httpDialerKey{}, d)
 }
@@ -93,3 +97,9 @@ type structTagsKey struct{}
 func StructTags(tags []string) client.CallOption {
 	return client.SetCallOption(structTagsKey{}, tags)
 }
+
+type metadataKey struct{}
+
+func Metadata(md metadata.Metadata) client.CallOption {
+	return client.SetCallOption(metadataKey{}, md)
+}

stream.go

@@ -16,24 +16,20 @@ import (
 
 // Implements the streamer interface
 type httpStream struct {
-	sync.RWMutex
-	address string
-	opts    client.CallOptions
-	ct      string
-	cf      codec.Codec
-	context context.Context
-	header  http.Header
-	seq     uint64
-	closed  chan bool
 	err     error
 	conn    net.Conn
-	reader  *bufio.Reader
+	cf      codec.Codec
+	context context.Context
 	request client.Request
+	closed  chan bool
+	reader  *bufio.Reader
+	address string
+	ct      string
+	opts    client.CallOptions
+	sync.RWMutex
 }
 
-var (
+var errShutdown = fmt.Errorf("connection is shut down")
-	errShutdown = fmt.Errorf("connection is shut down")
-)
 
 func (h *httpStream) isClosed() bool {
 	select {
@@ -65,13 +61,11 @@ func (h *httpStream) Send(msg interface{}) error {
 		return errShutdown
 	}
 
-	hreq, err := newRequest(h.address, h.request, h.ct, h.cf, msg, h.opts)
+	hreq, err := newRequest(h.context, h.address, h.request, h.ct, h.cf, msg, h.opts)
 	if err != nil {
 		return err
 	}
 
-	hreq.Header = h.header
-
 	return hreq.Write(h.conn)
 }
 
@@ -112,34 +106,39 @@ func (h *httpStream) Close() error {
 func (h *httpStream) parseRsp(ctx context.Context, hrsp *http.Response, cf codec.Codec, rsp interface{}, opts client.CallOptions) error {
 	var err error
 
-	// fast path return
+	select {
-	if hrsp.StatusCode == http.StatusNoContent {
+	case <-ctx.Done():
-		return nil
+		err = ctx.Err()
-	}
+	default:
-
+		// fast path return
-	if hrsp.StatusCode < 400 {
+		if hrsp.StatusCode == http.StatusNoContent {
-		if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
+			return nil
-			return errors.InternalServerError("go.micro.client", err.Error())
 		}
-		return nil
-	}
 
-	errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
+		if hrsp.StatusCode < 400 {
-	if ok && errmap != nil {
+			if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
-		if err, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
+				return errors.InternalServerError("go.micro.client", err.Error())
-			err, ok = errmap["default"].(error)
+			}
+			return nil
 		}
-	}
-	if err == nil {
-		buf, err := io.ReadAll(hrsp.Body)
-		if err != nil {
-			errors.InternalServerError("go.micro.client", err.Error())
-		}
-		return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
-	}
 
-	if cerr := cf.ReadBody(hrsp.Body, err); cerr != nil {
+		errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
-		err = errors.InternalServerError("go.micro.client", cerr.Error())
+		if ok && errmap != nil {
+			if err, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
+				err, ok = errmap["default"].(error)
+			}
+		}
+		if !ok || err == nil {
+			buf, cerr := io.ReadAll(hrsp.Body)
+			if cerr != nil {
+				return errors.InternalServerError("go.micro.client", cerr.Error())
+			}
+			return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
+		}
+
+		if cerr := cf.ReadBody(hrsp.Body, err); cerr != nil {
+			err = errors.InternalServerError("go.micro.client", cerr.Error())
+		}
 	}
 
 	return err

util.go

@@ -12,15 +12,32 @@ import (
 
 	"github.com/unistack-org/micro/v3/client"
 	"github.com/unistack-org/micro/v3/errors"
+	"github.com/unistack-org/micro/v3/logger"
 	rutil "github.com/unistack-org/micro/v3/util/reflect"
-	util "github.com/unistack-org/micro/v3/util/router"
 )
 
 var (
-	templateCache = make(map[string]util.Template)
+	templateCache = make(map[string][]string)
 	mu            sync.RWMutex
 )
 
+// Error struct holds error
+type Error struct {
+	err interface{}
+}
+
+// Error func for error interface
+func (err *Error) Error() string {
+	return fmt.Sprintf("%v", err.err)
+}
+
+func GetError(err error) interface{} {
+	if rerr, ok := err.(*Error); ok {
+		return rerr.err
+	}
+	return err
+}
+
 func newPathRequest(path string, method string, body string, msg interface{}, tags []string) (string, interface{}, error) {
 	// parse via https://github.com/googleapis/googleapis/blob/master/google/api/http.proto definition
 	tpl, err := newTemplate(path)
@@ -28,14 +45,17 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		return "", nil, err
 	}
 
-	if len(tpl.Fields) > 0 && msg == nil {
+	if len(tpl) > 0 && msg == nil {
 		return "", nil, fmt.Errorf("nil message but path params requested: %v", path)
 	}
 
 	fieldsmapskip := make(map[string]struct{})
-	fieldsmap := make(map[string]string, len(tpl.Fields))
+	fieldsmap := make(map[string]string, len(tpl))
-	for _, v := range tpl.Fields {
+	for _, v := range tpl {
-		fieldsmap[v] = ""
+		if v[0] != '{' || v[len(v)-1] != '}' {
+			continue
+		}
+		fieldsmap[v[1:len(v)-1]] = ""
 	}
 
 	nmsg, err := rutil.Zero(msg)
@@ -96,17 +116,21 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			continue
 		}
 
+		// nolint: gocritic, nestif
 		if _, ok := fieldsmap[t.name]; ok {
-			if val.Type().Kind() == reflect.Slice {
+			switch val.Type().Kind() {
+			case reflect.Slice:
 				for idx := 0; idx < val.Len(); idx++ {
 					values.Add(t.name, fmt.Sprintf("%v", val.Index(idx).Interface()))
 				}
 				fieldsmapskip[t.name] = struct{}{}
-			} else {
+			default:
 				fieldsmap[t.name] = fmt.Sprintf("%v", val.Interface())
 			}
 		} else if (body == "*" || body == t.name) && method != http.MethodGet {
-			tnmsg.Field(i).Set(val)
+			if tnmsg.Field(i).CanSet() {
+				tnmsg.Field(i).Set(val)
+			}
 		} else {
 			if val.Type().Kind() == reflect.Slice {
 				for idx := 0; idx < val.Len(); idx++ {
@@ -127,11 +151,15 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 	}
 
 	var b strings.Builder
-	for _, fld := range tpl.Pool {
+	for _, fld := range tpl {
 		_, _ = b.WriteRune('/')
-		if v, ok := fieldsmap[fld]; ok {
+		if fld[0] == '{' && fld[len(fld)-1] == '}' {
-			if v != "" {
+			if v, ok := fieldsmap[fld[1:len(fld)-1]]; ok {
-				_, _ = b.WriteString(v)
+				if v != "" {
+					_, _ = b.WriteString(v)
+				}
+			} else {
+				_, _ = b.WriteString(fld)
 			}
 		} else {
 			_, _ = b.WriteString(fld)
@@ -150,7 +178,10 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 	return b.String(), nmsg, nil
 }
 
-func newTemplate(path string) (util.Template, error) {
+func newTemplate(path string) ([]string, error) {
+	if len(path) == 0 || path[0] != '/' {
+		return nil, fmt.Errorf("path must starts with /")
+	}
 	mu.RLock()
 	tpl, ok := templateCache[path]
 	if ok {
@@ -159,12 +190,7 @@ func newTemplate(path string) (util.Template, error) {
 	}
 	mu.RUnlock()
 
-	rule, err := util.Parse(path)
+	tpl = strings.Split(path[1:], "/")
-	if err != nil {
-		return tpl, err
-	}
-
-	tpl = rule.Compile()
 	mu.Lock()
 	templateCache[path] = tpl
 	mu.Unlock()
@@ -173,45 +199,71 @@ func newTemplate(path string) (util.Template, error) {
 }
 
 func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp interface{}, opts client.CallOptions) error {
-	// fast path return
+	var err error
-	if hrsp.StatusCode == http.StatusNoContent {
-		return nil
-	}
 
-	ct := DefaultContentType
+	select {
-
+	case <-ctx.Done():
-	if htype := hrsp.Header.Get("Content-Type"); htype != "" {
+		err = ctx.Err()
-		ct = htype
+	default:
-	}
+		// fast path return
-
+		if hrsp.StatusCode == http.StatusNoContent {
-	cf, err := h.newCodec(ct)
+			return nil
-	if err != nil {
-		return errors.InternalServerError("go.micro.client", err.Error())
-	}
-
-	if hrsp.StatusCode < 400 {
-		if err := cf.ReadBody(hrsp.Body, rsp); err != nil {
-			return errors.InternalServerError("go.micro.client", err.Error())
 		}
-		return nil
+		ct := DefaultContentType
-	}
 
-	errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
+		if htype := hrsp.Header.Get("Content-Type"); htype != "" {
-	if ok && errmap != nil {
+			ct = htype
-		if err, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
+		}
-			err, ok = errmap["default"].(error)
+
+		cf, cerr := h.newCodec(ct)
+		if hrsp.StatusCode >= 400 && cerr != nil {
+			var buf []byte
+			if hrsp.Body != nil {
+				buf, err = io.ReadAll(hrsp.Body)
+				if err != nil && h.opts.Logger.V(logger.ErrorLevel) {
+					h.opts.Logger.Errorf(ctx, "failed to read body: %v", err)
+				}
+			}
+			// response like text/plain or something else, return original error
+			return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
+		} else if cerr != nil {
+			return errors.InternalServerError("go.micro.client", cerr.Error())
+		}
+
+		// succeseful response
+		if hrsp.StatusCode < 400 {
+			if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
+			return nil
+		}
+
+		// response with error
+		var rerr interface{}
+		errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
+		if ok && errmap != nil {
+			rerr, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)]
+			if !ok {
+				rerr, ok = errmap["default"]
+			}
+		}
+
+		if !ok || rerr == nil {
+			buf, rerr := io.ReadAll(hrsp.Body)
+			if rerr != nil {
+				return errors.InternalServerError("go.micro.client", rerr.Error())
+			}
+			return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
+		}
+
+		if cerr := cf.ReadBody(hrsp.Body, rerr); cerr != nil {
+			return errors.InternalServerError("go.micro.client", cerr.Error())
+		}
+
+		if err, ok = rerr.(error); !ok {
+			err = &Error{rerr}
 		}
-	}
-	if err == nil {
-		buf, err := io.ReadAll(hrsp.Body)
-		if err != nil {
-			errors.InternalServerError("go.micro.client", err.Error())
-		}
-		return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
-	}
 
-	if cerr := cf.ReadBody(hrsp.Body, err); cerr != nil {
-		err = errors.InternalServerError("go.micro.client", cerr.Error())
 	}
 
 	return err

util_test.go

@@ -5,21 +5,39 @@ import (
 	"testing"
 )
 
-func TestTemplate(t *testing.T) {
+func TestParsing(t *testing.T) {
-	tpl, err := newTemplate("/v1/{ClientID}/list")
+	type Message struct {
-	if err != nil {
+		IIN string `protobuf:"bytes,1,opt,name=iin,proto3" json:"iin"`
-		t.Fatal(err)
+	}
+
+	omsg := &Message{IIN: "5555"}
+
+	for _, m := range []string{"POST"} {
+		body := ""
+		path, nmsg, err := newPathRequest("/users/iin/{iin}/push-notifications", m, body, omsg, []string{"protobuf", "json"})
+		if err != nil {
+			t.Fatal(err)
+		}
+		u, err := url.Parse(path)
+		if err != nil {
+			t.Fatal(err)
+		}
+		_ = nmsg
+		if u.Path != "/users/iin/5555/push-notifications" {
+			t.Fatalf("newPathRequest invalid path %s", u.Path)
+		}
+		if nmsg != nil {
+			t.Fatalf("new message must be nil: %v\n", nmsg)
+		}
 	}
-	_ = tpl
-	//	fmt.Printf("%#+v\n", tpl.Pool)
 }
 
 func TestNewPathRequest(t *testing.T) {
 	type Message struct {
 		Name string `json:"name"`
 		Val1 string `protobuf:"bytes,1,opt,name=val1,proto3" json:"val1"`
-		Val2 int64
 		Val3 []string
+		Val2 int64
 	}
 
 	omsg := &Message{Name: "test_name", Val1: "test_val1", Val2: 100, Val3: []string{"slice"}}
@@ -45,8 +63,8 @@ func TestNewPathVarRequest(t *testing.T) {
 	type Message struct {
 		Name string `json:"name"`
 		Val1 string `protobuf:"bytes,1,opt,name=val1,proto3" json:"val1"`
-		Val2 int64
 		Val3 []string
+		Val2 int64
 	}
 
 	omsg := &Message{Name: "test_name", Val1: "test_val1", Val2: 100, Val3: []string{"slice"}}