fix repeated detection

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

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.13
+require github.com/unistack-org/micro/v3 v3.3.14

go.sum

@@ -5,13 +5,13 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 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.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=
+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/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=

http.go

@@ -21,7 +21,6 @@ import (
 	"github.com/unistack-org/micro/v3/errors"
 	"github.com/unistack-org/micro/v3/metadata"
 	"github.com/unistack-org/micro/v3/router"
-	rutil "github.com/unistack-org/micro/v3/util/reflect"
 )
 
 var (
@@ -102,21 +101,9 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
 
-	var b []byte
-
-	if nmsg != nil {
-		if ct == "application/x-www-form-urlencoded" {
-			data, err := rutil.StructURLValues(nmsg, "", tags)
-			if err != nil {
-				return nil, errors.BadRequest("go.micro.client", err.Error())
-			}
-			b = []byte(data.Encode())
-		} else {
-			b, err = cf.Marshal(nmsg)
-			if err != nil {
-				return nil, errors.BadRequest("go.micro.client", err.Error())
-			}
-		}
+	b, err := cf.Marshal(nmsg)
+	if err != nil {
+		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
 
 	if len(b) > 0 {
@@ -145,20 +132,10 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 	// set the content type for the request
 	header.Set("Content-Type", ct)
 
-	var cf codec.Codec
-	var err error
-	// get codec
-	switch ct {
-	case "application/x-www-form-urlencoded":
-		cf, err = h.newCodec(DefaultContentType)
-	default:
-		cf, err = h.newCodec(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)
 	if err != nil {
 		return err
@@ -184,7 +161,13 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 
 	defer hrsp.Body.Close()
 
-	return parseRsp(ctx, hrsp, cf, rsp, opts)
+	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) {

stream.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"context"
 	"fmt"
+	"io"
 	"net"
 	"net/http"
 	"sync"
@@ -89,7 +90,7 @@ func (h *httpStream) Recv(msg interface{}) error {
 	}
 	defer hrsp.Body.Close()
 
-	return parseRsp(h.context, hrsp, h.cf, msg, h.opts)
+	return h.parseRsp(h.context, hrsp, h.cf, msg, h.opts)
 }
 
 func (h *httpStream) Error() error {
@@ -107,3 +108,39 @@ func (h *httpStream) Close() error {
 		return h.conn.Close()
 	}
 }
+
+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
+	if hrsp.StatusCode == http.StatusNoContent {
+		return nil
+	}
+
+	if hrsp.StatusCode < 400 {
+		if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
+			return errors.InternalServerError("go.micro.client", err.Error())
+		}
+		return nil
+	}
+
+	errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
+	if ok && errmap != nil {
+		if err, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
+			err, ok = errmap["default"].(error)
+		}
+	}
+	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.go

@@ -3,14 +3,14 @@ package http
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"net/url"
 	"reflect"
 	"strings"
 	"sync"
 
 	"github.com/unistack-org/micro/v3/client"
-	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/errors"
 	rutil "github.com/unistack-org/micro/v3/util/reflect"
 	util "github.com/unistack-org/micro/v3/util/router"
@@ -32,6 +32,7 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		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))
 	for _, v := range tpl.Fields {
 		fieldsmap[v] = ""
@@ -53,7 +54,7 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		tnmsg = tnmsg.Elem()
 	}
 
-	values := make(map[string]string)
+	values := url.Values{}
 	// copy cycle
 	for i := 0; i < tmsg.NumField(); i++ {
 		val := tmsg.Field(i)
@@ -73,9 +74,13 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			// special
 			switch tn {
 			case "protobuf": // special
-				t = &tag{key: tn, name: tp[3][5:], opts: append(tp[:3], tp[4:]...)}
+				for _, p := range tp {
+					if idx := strings.Index(p, "name="); idx > 0 {
+						t = &tag{key: tn, name: p[idx:]}
+					}
+				}
 			default:
-				t = &tag{key: tn, name: tp[0], opts: tp[1:]}
+				t = &tag{key: tn, name: tp[0]}
 			}
 			if t.name != "" {
 				break
@@ -92,17 +97,31 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		}
 
 		if _, ok := fieldsmap[t.name]; ok {
-			fieldsmap[t.name] = fmt.Sprintf("%v", val.Interface())
+			if val.Type().Kind() == 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 {
+				fieldsmap[t.name] = fmt.Sprintf("%v", val.Interface())
+			}
 		} else if (body == "*" || body == t.name) && method != http.MethodGet {
 			tnmsg.Field(i).Set(val)
 		} else {
-			values[t.name] = fmt.Sprintf("%v", val.Interface())
+			if val.Type().Kind() == reflect.Slice {
+				for idx := 0; idx < val.Len(); idx++ {
+					values.Add(t.name, fmt.Sprintf("%v", val.Index(idx).Interface()))
+				}
+			} else {
+				values.Add(t.name, fmt.Sprintf("%v", val.Interface()))
+			}
 		}
 	}
 
 	// check not filled stuff
 	for k, v := range fieldsmap {
-		if v == "" {
+		_, ok := fieldsmapskip[k]
+		if !ok && v == "" {
 			return "", nil, fmt.Errorf("path param %s not filled", k)
 		}
 	}
@@ -111,23 +130,17 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 	for _, fld := range tpl.Pool {
 		_, _ = b.WriteRune('/')
 		if v, ok := fieldsmap[fld]; ok {
-			_, _ = b.WriteString(v)
+			if v != "" {
+				_, _ = b.WriteString(v)
+			}
 		} else {
 			_, _ = b.WriteString(fld)
 		}
 	}
 
-	idx := 0
-	for k, v := range values {
-		if idx == 0 {
-			_, _ = b.WriteRune('?')
-		} else {
-			_, _ = b.WriteRune('&')
-		}
-		_, _ = b.WriteString(k)
-		_, _ = b.WriteRune('=')
-		_, _ = b.WriteString(v)
-		idx++
+	if len(values) > 0 {
+		_, _ = b.WriteRune('?')
+		_, _ = b.WriteString(values.Encode())
 	}
 
 	if rutil.IsZero(nmsg) {
@@ -159,48 +172,46 @@ func newTemplate(path string) (util.Template, error) {
 	return tpl, nil
 }
 
-func parseRsp(ctx context.Context, hrsp *http.Response, cf codec.Codec, rsp interface{}, opts client.CallOptions) error {
+func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp interface{}, opts client.CallOptions) error {
 	// fast path return
 	if hrsp.StatusCode == http.StatusNoContent {
 		return nil
 	}
 
-	b, err := ioutil.ReadAll(hrsp.Body)
+	ct := DefaultContentType
+
+	if htype := hrsp.Header.Get("Content-Type"); htype != "" {
+		ct = htype
+	}
+
+	cf, err := h.newCodec(ct)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}
 
 	if hrsp.StatusCode < 400 {
-		// unmarshal only if body not nil
-		if len(b) > 0 {
-			// unmarshal
-			if err := cf.Unmarshal(b, rsp); err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
-			}
+		if err := cf.ReadBody(hrsp.Body, rsp); err != nil {
+			return errors.InternalServerError("go.micro.client", err.Error())
 		}
 		return nil
 	}
 
 	errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
-	if !ok || errmap == nil {
-		// user not provide map of errors
-		// id: req.Service() ??
-		return errors.New("go.micro.client", string(b), int32(hrsp.StatusCode))
-	}
-
-	if err, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
-		err, ok = errmap["default"].(error)
-	}
-	if !ok {
-		return errors.New("go.micro.client", string(b), int32(hrsp.StatusCode))
-	}
-
-	if len(b) > 0 {
-		if cerr := cf.Unmarshal(b, err); cerr != nil {
-			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)
 		}
-	} else {
-		err = errors.New("go.micro.client", string(b), int32(hrsp.StatusCode))
+	}
+	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
@@ -209,5 +220,4 @@ func parseRsp(ctx context.Context, hrsp *http.Response, cf codec.Codec, rsp inte
 type tag struct {
 	key  string
 	name string
-	opts []string
 }