metadata.FromContext => metadata.FromOutgoingContext

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

go.sum

@@ -5,10 +5,10 @@ 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.2.26/go.mod h1:iJwCWq2PECMxigfqe6TPC5GLWvj6P94Kk+PTVZGL3w8=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+github.com/unistack-org/micro/v3 v3.3.9/go.mod h1:M3RGgKZX1OlTn0QB+3R1tlSoGwmEg6rb/Isr0lLYmjQ=
+golang.org/x/net v0.0.0-20210326220855-61e056675ecf/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 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-20210324051608-47abb6519492/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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

http.go

@@ -34,6 +34,7 @@ type httpClient struct {
 	opts    client.Options
 	dialer  *net.Dialer
 	httpcli *http.Client
+	init    bool
 }
 
 func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg interface{}, opts client.CallOptions) (*http.Request, error) {
@@ -97,13 +98,18 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
 
-	// marshal request is struct not empty
-	if nmsg != nil {
 	var b []byte
+
+	if ct == "x-www-form-urlencoded" {
+		fmt.Printf("XXXXX %#+v\n", nmsg)
+	} else if nmsg != nil {
 		b, err = cf.Marshal(nmsg)
 		if err != nil {
 			return nil, errors.BadRequest("go.micro.client", err.Error())
 		}
+	}
+
+	if len(b) > 0 {
 		hreq.Body = ioutil.NopCloser(bytes.NewBuffer(b))
 		hreq.ContentLength = int64(len(b))
 	}
@@ -113,7 +119,7 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 
 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.FromContext(ctx); ok {
+	if md, ok := metadata.FromOutgoingContext(ctx); ok {
 		for k, v := range md {
 			header.Set(k, v)
 		}
@@ -126,8 +132,16 @@ 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
-	cf, err := h.newCodec(ct)
+	switch ct {
+	case "x-www-form-urlencoded":
+		cf, err = h.newCodec(DefaultContentType)
+	default:
+		cf, err = h.newCodec(ct)
+	}
+
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}
@@ -163,7 +177,7 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 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.FromContext(ctx); ok {
+	if md, ok := metadata.FromOutgoingContext(ctx); ok {
 		header = make(http.Header, len(md)+2)
 		for k, v := range md {
 			header.Set(k, v)
@@ -189,7 +203,7 @@ func (h *httpClient) stream(ctx context.Context, addr string, req client.Request
 	if err == nil && u.Scheme != "" && u.Host != "" {
 		dialAddr = u.Host
 	}
-	cc, err := h.dialer.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))
 	}
@@ -217,9 +231,32 @@ func (h *httpClient) newCodec(ct string) (codec.Codec, error) {
 }
 
 func (h *httpClient) Init(opts ...client.Option) error {
+	if len(opts) == 0 && h.init {
+		return nil
+	}
 	for _, o := range opts {
 		o(&h.opts)
 	}
+
+	if err := h.opts.Broker.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Tracer.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Router.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Logger.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Meter.Init(); err != nil {
+		return err
+	}
+	if err := h.opts.Transport.Init(); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -231,8 +268,8 @@ func (h *httpClient) NewMessage(topic string, msg interface{}, opts ...client.Me
 	return newHTTPMessage(topic, msg, h.opts.ContentType, opts...)
 }
 
-func (h *httpClient) NewRequest(service, method string, req interface{}, reqOpts ...client.RequestOption) client.Request {
-	return newHTTPRequest(service, method, req, h.opts.ContentType, reqOpts...)
+func (h *httpClient) NewRequest(service, method string, req interface{}, opts ...client.RequestOption) client.Request {
+	return newHTTPRequest(service, method, req, h.opts.ContentType, opts...)
 }
 
 func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
@@ -501,7 +538,7 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 func (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
 	options := client.NewPublishOptions(opts...)
 
-	md, ok := metadata.FromContext(ctx)
+	md, ok := metadata.FromOutgoingContext(ctx)
 	if !ok {
 		md = metadata.New(2)
 	}
@@ -563,17 +600,31 @@ func NewClient(opts ...client.Option) client.Client {
 		opts: options,
 	}
 
+	dialer, ok := options.Context.Value(httpDialerKey{}).(*net.Dialer)
+	if !ok {
+		dialer = &net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+		}
+	}
+
 	if httpcli, ok := options.Context.Value(httpClientKey{}).(*http.Client); ok {
 		rc.httpcli = httpcli
 	} else {
-		rc.httpcli = http.DefaultClient
+		// TODO customTransport := http.DefaultTransport.(*http.Transport).Clone()
+		tr := &http.Transport{
+			Proxy:                 http.ProxyFromEnvironment,
+			DialContext:           dialer.DialContext,
+			ForceAttemptHTTP2:     true,
+			MaxConnsPerHost:       100,
+			MaxIdleConns:          20,
+			IdleConnTimeout:       60 * time.Second,
+			TLSHandshakeTimeout:   10 * time.Second,
+			ExpectContinueTimeout: 1 * time.Second,
+			TLSClientConfig:       options.TLSConfig,
 		}
-	if dialer, ok := options.Context.Value(httpDialerKey{}).(*net.Dialer); ok {
-		rc.dialer = dialer
-	} else {
-		rc.dialer = &net.Dialer{}
+		rc.httpcli = &http.Client{Transport: tr}
 	}
-
 	c := client.Client(rc)
 
 	// wrap in reverse

options.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"crypto/tls"
 	"net"
 	"net/http"
 
@@ -33,28 +32,21 @@ type tlsAuth struct{}
 type maxRecvMsgSizeKey struct{}
 type maxSendMsgSizeKey struct{}
 
-// maximum streams on a connectioin
+// PoolMaxStreams maximum streams on a connectioin
 func PoolMaxStreams(n int) client.Option {
 	return client.SetOption(poolMaxStreams{}, n)
 }
 
-// maximum idle conns of a pool
+// PoolMaxIdle maximum idle conns of a pool
 func PoolMaxIdle(d int) client.Option {
 	return client.SetOption(poolMaxIdle{}, d)
 }
 
-// AuthTLS should be used to setup a secure authentication using TLS
-func AuthTLS(t *tls.Config) client.Option {
-	return client.SetOption(tlsAuth{}, t)
-}
-
-//
 // MaxRecvMsgSize set the maximum size of message that client can receive.
 func MaxRecvMsgSize(s int) client.Option {
 	return client.SetOption(maxRecvMsgSizeKey{}, s)
 }
 
-//
 // MaxSendMsgSize set the maximum size of message that client can send.
 func MaxSendMsgSize(s int) client.Option {
 	return client.SetOption(maxSendMsgSizeKey{}, s)