go.mod

@@ -1,15 +1,5 @@
 module go.unistack.org/micro-client-http/v3
 
-go 1.22
+go 1.18
 
-toolchain go1.23.1
+require go.unistack.org/micro/v3 v3.10.16
-
-require go.unistack.org/micro/v3 v3.10.97
-
-require (
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
-)

go.sum

@@ -1,39 +1,8 @@
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro/v3 v3.10.69 h1:V4g9LqUhzGab73U2aevnjtffCdJqGTuMfWY7fy4qGwI=
+go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q=
-go.unistack.org/micro/v3 v3.10.69/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
-go.unistack.org/micro/v3 v3.10.88 h1:MxlzP+77Y6Kphb3lzHxROL4XfE/WdCQMQpnPv4D9Z8U=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-go.unistack.org/micro/v3 v3.10.88/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
-google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
-google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
-google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
-google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
-google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
-google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

http.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -22,10 +21,7 @@ import (
 	"go.unistack.org/micro/v3/errors"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/selector"
-	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v3/tracer"
 	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
@@ -39,10 +35,6 @@ func filterLabel(r []router.Route) []router.Route {
 */
 
 type httpClient struct {
-	funcPublish      client.FuncPublish
-	funcBatchPublish client.FuncBatchPublish
-	funcCall         client.FuncCall
-	funcStream       client.FuncStream
 	httpcli *http.Client
 	opts    client.Options
 	sync.RWMutex
@@ -155,11 +147,6 @@ func newRequest(ctx context.Context, log logger.Logger, addr string, req client.
 	if opts.AuthToken != "" {
 		header.Set(metadata.HeaderAuthorization, opts.AuthToken)
 	}
-	if opts.RequestMetadata != nil {
-		for k, v := range opts.RequestMetadata {
-			header.Set(k, v)
-		}
-	}
 
 	if md, ok := metadata.FromOutgoingContext(ctx); ok {
 		for k, v := range md {
@@ -225,29 +212,29 @@ func newRequest(ctx context.Context, log logger.Logger, addr string, req client.
 	}
 
 	if log.V(logger.DebugLevel) {
-		log.Debug(ctx, fmt.Sprintf("request %s to %s with headers %v body %s", method, u.String(), hreq.Header, b))
+		log.Debugf(ctx, "request %s to %s with headers %v body %s", method, u.String(), hreq.Header, b)
 	}
 
 	return hreq, nil
 }
 
-func (c *httpClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
+func (h *httpClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
 	ct := req.ContentType()
 	if len(opts.ContentType) > 0 {
 		ct = opts.ContentType
 	}
 
-	cf, err := c.newCodec(ct)
+	cf, err := h.newCodec(ct)
 	if err != nil {
 		return errors.BadRequest("go.micro.client", err.Error())
 	}
-	hreq, err := newRequest(ctx, c.opts.Logger, addr, req, ct, cf, req.Body(), opts)
+	hreq, err := newRequest(ctx, h.opts.Logger, addr, req, ct, cf, req.Body(), opts)
 	if err != nil {
 		return err
 	}
 
 	// make the request
-	hrsp, err := c.httpcli.Do(hreq)
+	hrsp, err := h.httpcli.Do(hreq)
 	if err != nil {
 		switch err := err.(type) {
 		case *url.Error:
@@ -264,29 +251,29 @@ func (c *httpClient) call(ctx context.Context, addr string, req client.Request,
 
 	defer hrsp.Body.Close()
 
-	return c.parseRsp(ctx, hrsp, rsp, opts)
+	return h.parseRsp(ctx, hrsp, rsp, opts)
 }
 
-func (c *httpClient) stream(ctx context.Context, addr string, req client.Request, opts client.CallOptions) (client.Stream, error) {
+func (h *httpClient) stream(ctx context.Context, addr string, req client.Request, opts client.CallOptions) (client.Stream, error) {
 	ct := req.ContentType()
 	if len(opts.ContentType) > 0 {
 		ct = opts.ContentType
 	}
 
 	// get codec
-	cf, err := c.newCodec(ct)
+	cf, err := h.newCodec(ct)
 	if err != nil {
 		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
 
-	cc, err := (c.httpcli.Transport).(*http.Transport).DialContext(ctx, "tcp", addr)
+	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))
 	}
 
 	return &httpStream{
 		address: addr,
-		logger:  c.opts.Logger,
+		logger:  h.opts.Logger,
 		context: ctx,
 		closed:  make(chan bool),
 		opts:    opts,
@@ -298,88 +285,66 @@ func (c *httpClient) stream(ctx context.Context, addr string, req client.Request
 	}, nil
 }
 
-func (c *httpClient) newCodec(ct string) (codec.Codec, error) {
+func (h *httpClient) newCodec(ct string) (codec.Codec, error) {
-	c.RLock()
+	h.RLock()
+	defer h.RUnlock()
 
 	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
 		ct = ct[:idx]
 	}
 
-	if cf, ok := c.opts.Codecs[ct]; ok {
+	if c, ok := h.opts.Codecs[ct]; ok {
-		c.RUnlock()
+		return c, nil
-		return cf, nil
 	}
 
-	c.RUnlock()
 	return nil, codec.ErrUnknownContentType
 }
 
-func (c *httpClient) Init(opts ...client.Option) error {
+func (h *httpClient) Init(opts ...client.Option) error {
+	if len(opts) == 0 && h.init {
+		return nil
+	}
 	for _, o := range opts {
-		o(&c.opts)
+		o(&h.opts)
 	}
 
-	c.funcCall = c.fnCall
+	if err := h.opts.Broker.Init(); err != nil {
-	c.funcStream = c.fnStream
+		return err
-	c.funcPublish = c.fnPublish
+	}
-	c.funcBatchPublish = c.fnBatchPublish
+	if err := h.opts.Tracer.Init(); err != nil {
-
+		return err
-	c.opts.Hooks.EachNext(func(hook options.Hook) {
+	}
-		switch h := hook.(type) {
+	if err := h.opts.Router.Init(); err != nil {
-		case client.HookCall:
+		return err
-			c.funcCall = h(c.funcCall)
+	}
-		case client.HookStream:
+	if err := h.opts.Logger.Init(); err != nil {
-			c.funcStream = h(c.funcStream)
+		return err
-		case client.HookPublish:
+	}
-			c.funcPublish = h(c.funcPublish)
+	if err := h.opts.Meter.Init(); err != nil {
-		case client.HookBatchPublish:
+		return err
-			c.funcBatchPublish = h(c.funcBatchPublish)
+	}
+	if err := h.opts.Transport.Init(); err != nil {
+		return err
 	}
-	})
 
 	return nil
 }
 
-func (c *httpClient) Options() client.Options {
+func (h *httpClient) Options() client.Options {
-	return c.opts
+	return h.opts
 }
 
-func (c *httpClient) NewMessage(topic string, msg interface{}, opts ...client.MessageOption) client.Message {
+func (h *httpClient) NewMessage(topic string, msg interface{}, opts ...client.MessageOption) client.Message {
-	return newHTTPMessage(topic, msg, c.opts.ContentType, opts...)
+	return newHTTPMessage(topic, msg, h.opts.ContentType, opts...)
 }
 
-func (c *httpClient) NewRequest(service, method string, req interface{}, opts ...client.RequestOption) client.Request {
+func (h *httpClient) NewRequest(service, method string, req interface{}, opts ...client.RequestOption) client.Request {
-	return newHTTPRequest(service, method, req, c.opts.ContentType, opts...)
+	return newHTTPRequest(service, method, req, h.opts.ContentType, opts...)
 }
 
-func (c *httpClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
-	ts := time.Now()
-	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
-	var sp tracer.Span
-	ctx, sp = c.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		tracer.WithSpanLabels("endpoint", req.Endpoint()),
-	)
-	err := c.funcCall(ctx, req, rsp, opts...)
-	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
-	te := time.Since(ts)
-	c.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-	c.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-
-	if me := errors.FromError(err); me == nil {
-		sp.Finish()
-		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
-	} else {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
-	}
-
-	return err
-}
-
-func (c *httpClient) fnCall(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
 	// make a copy of call opts
-	callOpts := c.opts.CallOptions
+	callOpts := h.opts.CallOptions
 	for _, opt := range opts {
 		opt(&callOpts)
 	}
@@ -406,21 +371,26 @@ func (c *httpClient) fnCall(ctx context.Context, req client.Request, rsp interfa
 	}
 
 	// make copy of call method
-	hcall := c.call
+	hcall := h.call
+
+	// wrap the call in reverse
+	for i := len(callOpts.CallWrappers); i > 0; i-- {
+		hcall = callOpts.CallWrappers[i-1](hcall)
+	}
 
 	// use the router passed as a call option, or fallback to the rpc clients router
 	if callOpts.Router == nil {
-		callOpts.Router = c.opts.Router
+		callOpts.Router = h.opts.Router
 	}
 
 	if callOpts.Selector == nil {
-		callOpts.Selector = c.opts.Selector
+		callOpts.Selector = h.opts.Selector
 	}
 
 	// inject proxy address
 	// TODO: don't even bother using Lookup/Select in this case
-	if len(c.opts.Proxy) > 0 {
+	if len(h.opts.Proxy) > 0 {
-		callOpts.Address = []string{c.opts.Proxy}
+		callOpts.Address = []string{h.opts.Proxy}
 	}
 
 	var next selector.Next
@@ -442,7 +412,7 @@ func (c *httpClient) fnCall(ctx context.Context, req client.Request, rsp interfa
 			var routes []string
 			// lookup the route to send the reques to
 			// TODO apply any filtering here
-			routes, err = c.opts.Lookup(ctx, req, callOpts)
+			routes, err = h.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
@@ -459,7 +429,7 @@ func (c *httpClient) fnCall(ctx context.Context, req client.Request, rsp interfa
 		// make the call
 		err = hcall(ctx, node, req, rsp, callOpts)
 		// record the result of the call to inform future routing decisions
-		if verr := c.opts.Selector.Record(node, err); verr != nil {
+		if verr := h.opts.Selector.Record(node, err); verr != nil {
 			return verr
 		}
 
@@ -504,36 +474,11 @@ func (c *httpClient) fnCall(ctx context.Context, req client.Request, rsp interfa
 	return gerr
 }
 
-func (c *httpClient) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
-	ts := time.Now()
-	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
-	var sp tracer.Span
-	ctx, sp = c.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		tracer.WithSpanLabels("endpoint", req.Endpoint()),
-	)
-	stream, err := c.funcStream(ctx, req, opts...)
-	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
-	te := time.Since(ts)
-	c.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-	c.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-
-	if me := errors.FromError(err); me == nil {
-		sp.Finish()
-		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
-	} else {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
-	}
-
-	return stream, err
-}
-
-func (c *httpClient) fnStream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
 	var err error
 
 	// make a copy of call opts
-	callOpts := c.opts.CallOptions
+	callOpts := h.opts.CallOptions
 	for _, o := range opts {
 		o(&callOpts)
 	}
@@ -570,17 +515,17 @@ func (c *httpClient) fnStream(ctx context.Context, req client.Request, opts ...c
 
 	// use the router passed as a call option, or fallback to the rpc clients router
 	if callOpts.Router == nil {
-		callOpts.Router = c.opts.Router
+		callOpts.Router = h.opts.Router
 	}
 
 	if callOpts.Selector == nil {
-		callOpts.Selector = c.opts.Selector
+		callOpts.Selector = h.opts.Selector
 	}
 
 	// inject proxy address
 	// TODO: don't even bother using Lookup/Select in this case
-	if len(c.opts.Proxy) > 0 {
+	if len(h.opts.Proxy) > 0 {
-		callOpts.Address = []string{c.opts.Proxy}
+		callOpts.Address = []string{h.opts.Proxy}
 	}
 
 	var next selector.Next
@@ -601,7 +546,7 @@ func (c *httpClient) fnStream(ctx context.Context, req client.Request, opts ...c
 			var routes []string
 			// lookup the route to send the reques to
 			// TODO apply any filtering here
-			routes, err = c.opts.Lookup(ctx, req, callOpts)
+			routes, err = h.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
 				return nil, errors.InternalServerError("go.micro.client", err.Error())
 			}
@@ -615,10 +560,10 @@ func (c *httpClient) fnStream(ctx context.Context, req client.Request, opts ...c
 
 		node := next()
 
-		stream, cerr := c.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 := c.opts.Selector.Record(node, cerr); verr != nil {
+		if verr := h.opts.Selector.Record(node, cerr); verr != nil {
 			return nil, verr
 		}
 
@@ -669,23 +614,15 @@ func (c *httpClient) fnStream(ctx context.Context, req client.Request, opts ...c
 	return nil, grr
 }
 
-func (c *httpClient) BatchPublish(ctx context.Context, p []client.Message, opts ...client.PublishOption) error {
+func (h *httpClient) BatchPublish(ctx context.Context, p []client.Message, opts ...client.PublishOption) error {
-	return c.funcBatchPublish(ctx, p, opts...)
+	return h.publish(ctx, p, opts...)
 }
 
-func (c *httpClient) fnBatchPublish(ctx context.Context, p []client.Message, opts ...client.PublishOption) error {
+func (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
-	return c.publish(ctx, p, opts...)
+	return h.publish(ctx, []client.Message{p}, opts...)
 }
 
-func (c *httpClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
+func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
-	return c.funcPublish(ctx, p, opts...)
-}
-
-func (c *httpClient) fnPublish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
-	return c.publish(ctx, []client.Message{p}, opts...)
-}
-
-func (c *httpClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
 	var body []byte
 
 	options := client.NewPublishOptions(opts...)
@@ -695,10 +632,6 @@ func (c *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	if v, ok := os.LookupEnv("MICRO_PROXY"); ok {
 		exchange = v
 	}
-	// get the exchange
-	if len(options.Exchange) > 0 {
-		exchange = options.Exchange
-	}
 
 	omd, ok := metadata.FromOutgoingContext(ctx)
 	if !ok {
@@ -710,23 +643,13 @@ func (c *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	for _, p := range ps {
 		md := metadata.Copy(omd)
 		md[metadata.HeaderContentType] = p.ContentType()
-		topic := p.Topic()
-		if len(exchange) > 0 {
-			topic = exchange
-		}
-		md.Set(metadata.HeaderTopic, topic)
-		iter := p.Metadata().Iterator()
-		var k, v string
-		for iter.Next(&k, &v) {
-			md.Set(k, v)
-		}
 
 		// passed in raw data
 		if d, ok := p.Payload().(*codec.Frame); ok {
 			body = d.Data
 		} else {
 			// use codec for payload
-			cf, err := c.newCodec(p.ContentType())
+			cf, err := h.newCodec(p.ContentType())
 			if err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
@@ -738,31 +661,40 @@ func (c *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 			body = b
 		}
 
+		topic := p.Topic()
+		if len(exchange) > 0 {
+			topic = exchange
+		}
+
+		for k, v := range p.Metadata() {
+			md.Set(k, v)
+		}
+		md.Set(metadata.HeaderTopic, topic)
 		msgs = append(msgs, &broker.Message{Header: md, Body: body})
 	}
 
-	return c.opts.Broker.BatchPublish(ctx, msgs,
+	return h.opts.Broker.BatchPublish(ctx, msgs,
 		broker.PublishContext(ctx),
 		broker.PublishBodyOnly(options.BodyOnly),
 	)
 }
 
-func (c *httpClient) String() string {
+func (h *httpClient) String() string {
 	return "http"
 }
 
-func (c *httpClient) Name() string {
+func (h *httpClient) Name() string {
-	return c.opts.Name
+	return h.opts.Name
 }
 
-func NewClient(opts ...client.Option) *httpClient {
+func NewClient(opts ...client.Option) client.Client {
 	options := client.NewOptions(opts...)
 
 	if len(options.ContentType) == 0 {
 		options.ContentType = DefaultContentType
 	}
 
-	c := &httpClient{
+	rc := &httpClient{
 		opts: options,
 	}
 
@@ -785,7 +717,7 @@ func NewClient(opts ...client.Option) *httpClient {
 	}
 
 	if httpcli, ok := options.Context.Value(httpClientKey{}).(*http.Client); ok {
-		c.httpcli = httpcli
+		rc.httpcli = httpcli
 	} else {
 		// TODO customTransport := http.DefaultTransport.(*http.Transport).Clone()
 		tr := &http.Transport{
@@ -801,13 +733,14 @@ func NewClient(opts ...client.Option) *httpClient {
 			ExpectContinueTimeout: 1 * time.Second,
 			TLSClientConfig:       options.TLSConfig,
 		}
-		c.httpcli = &http.Client{Transport: tr}
+		rc.httpcli = &http.Client{Transport: tr}
 	}
+	c := client.Client(rc)
 
-	c.funcCall = c.fnCall
+	// wrap in reverse
-	c.funcStream = c.fnStream
+	for i := len(options.Wrappers); i > 0; i-- {
-	c.funcPublish = c.fnPublish
+		c = options.Wrappers[i-1](c)
-	c.funcBatchPublish = c.fnBatchPublish
+	}
 
 	return c
 }

http_test.go

@@ -1,60 +1,21 @@
 package http
 
 import (
-	"encoding/json"
-	"fmt"
 	"net/url"
 	"strings"
 	"testing"
 )
 
-func TestNestedPathPost(t *testing.T) {
+type Request struct {
-	req := &request{Name: "first", Field1: "fieldval"}
+	Name     string `json:"name"`
-	p, m, err := newPathRequest("/api/v1/xxxx", "POST", "*", req, []string{"json", "protobuf"}, nil)
+	Field1   string `json:"field1"`
-	if err != nil {
+	ClientID string
-		t.Fatal(err)
+	Field2   string
-	}
+	Field3   int64
-	u, err := url.Parse(p)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s := u.String(); s != "/api/v1/xxxx" {
-		t.Fatalf("nested path error %s", s)
-	}
-	_ = m
-}
-
-type request struct {
-	NestedTest *request `json:"nested_test,omitempty"`
-	Name       string   `json:"name,omitempty"`
-	Field1     string   `json:"field1,omitempty"`
-	ClientID   string   `json:",omitempty"`
-	Field2     string   `json:",omitempty"`
-	Field3     int64    `json:",omitempty"`
-}
-
-func TestNestedPath(t *testing.T) {
-	req := &request{Name: "first", NestedTest: &request{Name: "second"}, Field1: "fieldval"}
-	p, m, err := newPathRequest("/api/v1/{name}/{nested_test.name}", "PUT", "*", req, []string{"json", "protobuf"}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	u, err := url.Parse(p)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s := u.String(); s != "/api/v1/first/second" {
-		t.Fatalf("nested path error %s", s)
-	}
-	b, err := json.Marshal(m)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("m %#+v %s\n", m, b)
 }
 
 func TestPathWithHeader(t *testing.T) {
-	req := &request{Name: "vtolstov", Field1: "field1", ClientID: "1234567890"}
+	req := &Request{Name: "vtolstov", Field1: "field1", ClientID: "1234567890"}
 	p, m, err := newPathRequest(
 		"/api/v1/test?Name={name}&Field1={field1}",
 		"POST",
@@ -79,7 +40,7 @@ func TestPathWithHeader(t *testing.T) {
 }
 
 func TestPathValues(t *testing.T) {
-	req := &request{Name: "vtolstov", Field1: "field1"}
+	req := &Request{Name: "vtolstov", Field1: "field1"}
 	p, m, err := newPathRequest("/api/v1/test?Name={name}&Field1={field1}", "POST", "*", req, nil, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -95,7 +56,7 @@ func TestPathValues(t *testing.T) {
 }
 
 func TestValidPath(t *testing.T) {
-	req := &request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
+	req := &Request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
 	p, m, err := newPathRequest("/api/v1/{name}/list", "GET", "", req, nil, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -112,9 +73,9 @@ func TestValidPath(t *testing.T) {
 }
 
 func TestInvalidPath(t *testing.T) {
-	req := &request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
+	req := &Request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
-	s, _, err := newPathRequest("/api/v1/{xname}/list", "GET", "", req, nil, nil)
+	_, _, err := newPathRequest("/api/v1/{xname}/list", "GET", "", req, nil, nil)
 	if err == nil {
-		t.Fatalf("path param must not be filled: %s", s)
+		t.Fatal("path param must not be filled")
 	}
 }

stream.go

@@ -2,9 +2,11 @@ package http
 
 import (
 	"bufio"
+	"bytes"
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"sync"
@@ -119,55 +121,59 @@ func (h *httpStream) Close() error {
 
 func (h *httpStream) parseRsp(ctx context.Context, log logger.Logger, hrsp *http.Response, cf codec.Codec, rsp interface{}, opts client.CallOptions) error {
 	var err error
-	var buf []byte
-
-	// fast path return
-	if hrsp.StatusCode == http.StatusNoContent {
-		return nil
-	}
 
 	select {
 	case <-ctx.Done():
 		err = ctx.Err()
 	default:
-		if hrsp.Body != nil {
+		// fast path return
-			buf, err = io.ReadAll(hrsp.Body)
+		if hrsp.StatusCode == http.StatusNoContent {
-			if err != nil {
+			return nil
-				if log.V(logger.ErrorLevel) {
-					log.Error(ctx, "failed to read body", err)
-				}
-				return errors.InternalServerError("go.micro.client", string(buf))
-			}
-		}
-
-		if log.V(logger.DebugLevel) {
-			log.Debug(ctx, fmt.Sprintf("response %s with %v", buf, hrsp.Header))
 		}
 
 		if hrsp.StatusCode < 400 {
-			if err = cf.Unmarshal(buf, rsp); err != nil {
+			if log.V(logger.DebugLevel) {
+				buf, rerr := io.ReadAll(hrsp.Body)
+				log.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+				if err != nil {
+					return errors.InternalServerError("go.micro.client", rerr.Error())
+				}
+				hrsp.Body = ioutil.NopCloser(bytes.NewBuffer(buf))
+			}
+			if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
 			return nil
 		}
 
-		var rerr interface{}
 		errmap, ok := opts.Context.Value(errorMapKey{}).(map[string]interface{})
 		if ok && errmap != nil {
-			if rerr, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
+			if err, ok = errmap[fmt.Sprintf("%d", hrsp.StatusCode)].(error); !ok {
-				rerr, ok = errmap["default"].(error)
+				err, ok = errmap["default"].(error)
 			}
 		}
-		if !ok || rerr == nil {
+		if !ok || err == nil {
+			buf, cerr := io.ReadAll(hrsp.Body)
+			if log.V(logger.DebugLevel) {
+				log.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+			}
+			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.Unmarshal(buf, rerr); cerr != nil {
+		if log.V(logger.DebugLevel) {
-			return errors.InternalServerError("go.micro.client", cerr.Error())
+			buf, rerr := io.ReadAll(hrsp.Body)
+			log.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+			if err != nil {
+				return errors.InternalServerError("go.micro.client", rerr.Error())
+			}
+			hrsp.Body = ioutil.NopCloser(bytes.NewBuffer(buf))
 		}
 
-		if err, ok = rerr.(error); !ok {
+		if cerr := cf.ReadBody(hrsp.Body, err); cerr != nil {
-			err = &Error{rerr}
+			err = errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 	}
 

util.go

@@ -1,9 +1,11 @@
 package http
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -13,7 +15,6 @@ import (
 	"go.unistack.org/micro/v3/client"
 	"go.unistack.org/micro/v3/errors"
 	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/metadata"
 	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
@@ -87,8 +88,6 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 
 	values := url.Values{}
 	// copy cycle
-
-	cleanPath := make(map[string]bool)
 	for i := 0; i < tmsg.NumField(); i++ {
 		val := tmsg.Field(i)
 		if val.IsZero() {
@@ -123,7 +122,6 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			default:
 				t = &tag{key: tn, name: tp[0]}
 			}
-
 			if t.name != "" {
 				break
 			}
@@ -157,64 +155,19 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			default:
 				fieldsmap[t.name] = getParam(val)
 			}
-		} else {
+		} else if (body == "*" || body == t.name) && method != http.MethodGet {
-			for k, v := range fieldsmap {
-				isSet := false
-				if v != "" {
-					continue
-				}
-				var clean []string
-				fld := msg
-
-				parts := strings.Split(k, ".")
-
-				for idx := 0; idx < len(parts); idx++ {
-					var nfld interface{}
-					var name string
-					if tags == nil {
-						tags = []string{"json"}
-					}
-				tagsloop:
-					for ti := 0; ti < len(tags); ti++ {
-						name, nfld, err = rutil.StructFieldNameByTag(fld, tags[ti], parts[idx])
-						if err == nil {
-							clean = append(clean, name)
-							break tagsloop
-						}
-					}
-					if err == nil {
-						fld = nfld
-						if len(parts)-1 == idx {
-							isSet = true
-							fieldsmap[k] = fmt.Sprintf("%v", fld)
-
-						}
-					}
-				}
-				if isSet {
-					cleanPath[strings.Join(clean, ".")] = true
-				}
-			}
-			for k := range cleanPath {
-				if err = rutil.ZeroFieldByPath(nmsg, k); err != nil {
-					return "", nil, err
-				}
-			}
-			if (body == "*" || body == t.name) && method != http.MethodGet {
 			if tnmsg.Field(i).CanSet() {
 				tnmsg.Field(i).Set(val)
 			}
-			} else if method == http.MethodGet {
+		} else {
 			if val.Type().Kind() == reflect.Slice {
 				for idx := 0; idx < val.Len(); idx++ {
 					values.Add(t.name, getParam(val.Index(idx)))
 				}
-				} else if !rutil.IsEmpty(val) {
+			} else {
 				values.Add(t.name, getParam(val))
 			}
 		}
-
-		}
 	}
 
 	// check not filled stuff
@@ -265,23 +218,13 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		_, _ = b.WriteString(values.Encode())
 	}
 
-	// rutil.ZeroEmpty(tnmsg.Interface())
+	if rutil.IsZero(nmsg) {
-
-	if rutil.IsZero(nmsg) && !isEmptyStruct(nmsg) {
 		return b.String(), nil, nil
 	}
 
 	return b.String(), nmsg, nil
 }
 
-func isEmptyStruct(v interface{}) bool {
-	val := reflect.ValueOf(v)
-	if val.Kind() == reflect.Ptr {
-		val = val.Elem()
-	}
-	return val.Kind() == reflect.Struct && val.NumField() == 0
-}
-
 func newTemplate(path string) ([]string, error) {
 	if len(path) == 0 || path[0] != '/' {
 		return nil, fmt.Errorf("path must starts with /")
@@ -304,55 +247,45 @@ func newTemplate(path string) ([]string, error) {
 
 func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp interface{}, opts client.CallOptions) error {
 	var err error
-	var buf []byte
-
-	// fast path return
-	if hrsp.StatusCode == http.StatusNoContent {
-		return nil
-	}
-
-	if opts.ResponseMetadata != nil {
-		*opts.ResponseMetadata = metadata.New(len(hrsp.Header))
-		for k, v := range hrsp.Header {
-			opts.ResponseMetadata.Set(k, strings.Join(v, ","))
-		}
-	}
 
 	select {
 	case <-ctx.Done():
 		err = ctx.Err()
 	default:
+		// fast path return
+		if hrsp.StatusCode == http.StatusNoContent {
+			return nil
+		}
 		ct := DefaultContentType
 
 		if htype := hrsp.Header.Get("Content-Type"); htype != "" {
 			ct = htype
 		}
 
+		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 {
+				if err != nil && h.opts.Logger.V(logger.ErrorLevel) {
-				if h.opts.Logger.V(logger.ErrorLevel) {
+					h.opts.Logger.Errorf(ctx, "failed to read body: %v", err)
-					h.opts.Logger.Error(ctx, "failed to read body", err)
-				}
-				return errors.InternalServerError("go.micro.client", string(buf))
 				}
 			}
-
-		cf, cerr := h.newCodec(ct)
-		if cerr != nil {
 			if h.opts.Logger.V(logger.DebugLevel) {
-				h.opts.Logger.Debug(ctx, fmt.Sprintf("response with %v unknown content-type %s %s", hrsp.Header, ct, buf))
+				h.opts.Logger.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+			}
+			// 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 {
+			if h.opts.Logger.V(logger.DebugLevel) {
+				h.opts.Logger.Debugf(ctx, "response with %v unknown content-type", hrsp.Header, ct)
 			}
 			return errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
-		if h.opts.Logger.V(logger.DebugLevel) {
-			h.opts.Logger.Debug(ctx, fmt.Sprintf("response %s with %v", buf, hrsp.Header))
-		}
-
 		// succeseful response
 		if hrsp.StatusCode < 400 {
-			if err = cf.Unmarshal(buf, rsp); err != nil {
+			if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
 			return nil
@@ -369,10 +302,26 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 		}
 
 		if !ok || rerr == nil {
+			buf, rerr := io.ReadAll(hrsp.Body)
+			if h.opts.Logger.V(logger.DebugLevel) {
+				h.opts.Logger.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+			}
+			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.Unmarshal(buf, rerr); cerr != nil {
+		if h.opts.Logger.V(logger.DebugLevel) {
+			buf, rerr := io.ReadAll(hrsp.Body)
+			h.opts.Logger.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+			if err != nil {
+				return errors.InternalServerError("go.micro.client", rerr.Error())
+			}
+			hrsp.Body = ioutil.NopCloser(bytes.NewBuffer(buf))
+		}
+
+		if cerr := cf.ReadBody(hrsp.Body, rerr); cerr != nil {
 			return errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 

util_test.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"net/http"
 	"net/url"
 	"testing"
 )
@@ -53,49 +52,11 @@ func TestNewPathRequest(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		switch m {
-		case http.MethodPost, http.MethodPut, http.MethodPatch, http.MethodDelete:
-			break
-		case http.MethodGet:
 		vals := u.Query()
 		if v, ok := vals["name"]; !ok || v[0] != "test_name" {
-				t.Fatalf("%s invalid path: %v nmsg: %v", m, path, nmsg)
-			}
-		}
-
-	}
-}
-
-func TestNewPathRequestWithEmptyBody(t *testing.T) {
-	val := struct{}{}
-	cases := []string{
-		"",
-		"*",
-		"{}",
-		"nil",
-		`{"type": "invalid"}`,
-	}
-
-	for _, body := range cases {
-		for _, m := range []string{"POST", "PUT", "PATCH", "GET", "DELETE"} {
-			path, nmsg, err := newPathRequest("/v1/test", m, body, val, []string{"protobuf", "json"}, nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if nmsg == nil {
-				t.Fatalf("invalid path: nil nmsg")
-			}
-
-			u, err := url.Parse(path)
-			if err != nil {
-				t.Fatal(err)
-			}
-			vals := u.Query()
-			if len(vals) != 0 {
 			t.Fatalf("invalid path: %v nmsg: %v", path, nmsg)
 		}
 	}
-	}
 }
 
 func TestNewPathVarRequest(t *testing.T) {
@@ -126,7 +87,7 @@ func TestNewPathVarRequest(t *testing.T) {
 				t.Fatalf("invalid nmsg: %#+v\n", nmsg)
 			}
 			if nmsg.(*Message).Name != "test_name" {
-				t.Fatalf("invalid path: %v nmsg: %#+v", path, nmsg)
+				t.Fatalf("invalid nmsg: %v nmsg: %v", path, nmsg)
 			}
 		} else {
 			vals := u.Query()