prepare v4

2025-02-25 16:42:21 +03:00
parent 9526345cd6
commit 7969cfd8c9
10 changed files with 118 additions and 1198 deletions
--- a/codec.go
+++ b/codec.go
@@ -1,9 +1,7 @@
 package grpc

 import (
-	"io"
-
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
@@ -65,63 +63,3 @@ func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option)
 	}
 	return w.Codec.Unmarshal(d, v)
 }
-
-/*
-type grpcCodec struct {
-	grpc.ServerStream
-	// headers
-	id       string
-	target   string
-	method   string
-	endpoint string
-
-	c encoding.Codec
-}
-
-*/
-
-func (w *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
-	/*
-		if m == nil {
-			m = codec.NewMessage(codec.Request)
-		}
-
-		if md, ok := metadata.FromIncomingContext(g.ServerStream.Context()); ok {
-			if m.Header == nil {
-				m.Header = meta.New(len(md))
-			}
-			for k, v := range md {
-				m.Header[k] = strings.Join(v, ",")
-			}
-		}
-
-		m.Id = g.id
-		m.Target = g.target
-		m.Method = g.method
-		m.Endpoint = g.endpoint
-	*/
-	return nil
-}
-
-func (w *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error {
-	// caller has requested a frame
-	if m, ok := v.(*codec.Frame); ok {
-		_, err := conn.Read(m.Data)
-		return err
-	}
-	return codec.ErrInvalidMessage
-}
-
-func (w *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
-	// if we don't have a body
-	if v != nil {
-		b, err := w.Marshal(v)
-		if err != nil {
-			return err
-		}
-		m.Body = b
-	}
-	// write the body using the framing codec
-	_, err := conn.Write(m.Body)
-	return err
-}
--- a/error.go
+++ b/error.go
@@ -1,7 +1,7 @@
 package grpc

 import (
-	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v4/errors"
 	"google.golang.org/grpc/status"
 )

--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,22 @@
 module go.unistack.org/micro-client-grpc/v3

-go 1.16
+go 1.22.0

 require (
-	go.unistack.org/micro/v3 v3.10.22
-	google.golang.org/grpc v1.52.3
+	go.unistack.org/micro/v4 v4.1.2
+	google.golang.org/grpc v1.70.0
+)
+
+require (
+	github.com/ash3in/uuidv8 v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/matoous/go-nanoid v1.5.1 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
--- a/grpc.go
+++ b/grpc.go
@@ -6,18 +6,16 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net"
-	"os"
 	"reflect"
 	"strings"
 	"sync"
 	"time"

-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/errors"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/selector"
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/errors"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/selector"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
@@ -68,15 +66,15 @@ func (g *grpcClient) secure(addr string) grpc.DialOption {
 }

 func (g *grpcClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
-	var header map[string]string
+	var header map[string][]string

 	if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		header = make(map[string]string, len(md))
+		header = make(map[string][]string, len(md))
 		for k, v := range md {
 			header[strings.ToLower(k)] = v
 		}
 	} else {
-		header = make(map[string]string, 2)
+		header = make(map[string][]string, 2)
 	}
 	if opts.RequestMetadata != nil {
 		for k, v := range opts.RequestMetadata {
@@ -84,16 +82,16 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 		}
 	}
 	// set timeout in nanoseconds
-	header["Grpc-Timeout"] = fmt.Sprintf("%dn", opts.RequestTimeout)
-	header["timeout"] = fmt.Sprintf("%dn", opts.RequestTimeout)
-	header["content-type"] = req.ContentType()
+	header["Grpc-Timeout"] = append(header["Grpc-Timeout"], fmt.Sprintf("%dn", opts.RequestTimeout))
+	header["timeout"] = append(header["timeout"], fmt.Sprintf("%dn", opts.RequestTimeout))
+	header["content-type"] = append(header["content-type"], req.ContentType())

-	md := gmetadata.New(header)
+	md := gmetadata.MD(metadata.Copy(header))
 	ctx = gmetadata.NewOutgoingContext(ctx, md)

 	cf, err := g.newCodec(req.ContentType())
 	if err != nil {
-		return errors.InternalServerError("go.micro.client", err.Error())
+		return errors.InternalServerError("go.micro.client", "%+v", err)
 	}

 	maxRecvMsgSize := g.maxRecvMsgSizeValue()
@@ -134,7 +132,7 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,

 	cc, err := g.pool.Get(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
-		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
+		return errors.InternalServerError("go.micro.client", "Error sending request: %v", err)
 	}
 	defer func() {
 		// defer execution of release
@@ -180,31 +178,31 @@ func (g *grpcClient) call(ctx context.Context, addr string, req client.Request,
 }

 func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
-	var header map[string]string
+	var header map[string][]string

 	if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		header = make(map[string]string, len(md))
+		header = make(map[string][]string, len(md))
 		for k, v := range md {
 			header[k] = v
 		}
 	} else {
-		header = make(map[string]string)
+		header = make(map[string][]string)
 	}

 	// set timeout in nanoseconds
 	if opts.StreamTimeout > time.Duration(0) {
-		header["Grpc-Timeout"] = fmt.Sprintf("%dn", opts.StreamTimeout)
-		header["timeout"] = fmt.Sprintf("%dn", opts.StreamTimeout)
+		header["Grpc-Timeout"] = append(header["Grpc-Timeout"], fmt.Sprintf("%dn", opts.RequestTimeout))
+		header["timeout"] = append(header["timeout"], fmt.Sprintf("%dn", opts.RequestTimeout))
 	}
 	// set the content type for the request
-	header["content-type"] = req.ContentType()
+	header["content-type"] = append(header["content-type"], req.ContentType())

-	md := gmetadata.New(header)
+	md := gmetadata.MD(metadata.Copy(header))
 	ctx = gmetadata.NewOutgoingContext(ctx, md)

 	cf, err := g.newCodec(req.ContentType())
 	if err != nil {
-		return errors.InternalServerError("go.micro.client", err.Error())
+		return errors.InternalServerError("go.micro.client", "%+v", err)
 	}

 	var dialCtx context.Context
@@ -245,7 +243,7 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request

 	cc, err := g.pool.Get(dialCtx, addr, grpcDialOptions...)
 	if err != nil {
-		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error sending request: %v", err))
+		return errors.InternalServerError("go.micro.client", "Error sending request: %v", err)
 	}

 	desc := &grpc.StreamDesc{
@@ -278,7 +276,7 @@ func (g *grpcClient) stream(ctx context.Context, addr string, req client.Request
 		// release the connection
 		g.pool.Put(cc, err)
 		// now return the error
-		return errors.InternalServerError("go.micro.client", fmt.Sprintf("Error creating stream: %v", err))
+		return errors.InternalServerError("go.micro.client", "Error creating stream: %v", err)
 	}

 	// set request codec
@@ -418,9 +416,6 @@ func (g *grpcClient) Init(opts ...client.Option) error {
 	if err := g.opts.Meter.Init(); err != nil {
 		return err
 	}
-	if err := g.opts.Transport.Init(); err != nil {
-		return err
-	}

 	g.init = true

@@ -431,10 +426,6 @@ func (g *grpcClient) Options() client.Options {
 	return g.opts
 }

-func (g *grpcClient) NewMessage(topic string, msg interface{}, opts ...client.MessageOption) client.Message {
-	return newGRPCEvent(topic, msg, g.opts.ContentType, opts...)
-}
-
 func (g *grpcClient) NewRequest(service, method string, req interface{}, reqOpts ...client.RequestOption) client.Request {
 	return newGRPCRequest(service, method, req, g.opts.ContentType, reqOpts...)
 }
@@ -476,11 +467,6 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
 	// make copy of call method
 	gcall := g.call

-	// wrap the call in reverse
-	for i := len(callOpts.CallWrappers); i > 0; i-- {
-		gcall = callOpts.CallWrappers[i-1](gcall)
-	}
-
 	// use the router passed as a call option, or fallback to the rpc clients router
 	if callOpts.Router == nil {
 		callOpts.Router = g.opts.Router
@@ -502,7 +488,7 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
 		// call backoff first. Someone may want an initial start delay
 		t, err := callOpts.Backoff(ctx, req, i)
 		if err != nil {
-			return errors.InternalServerError("go.micro.client", err.Error())
+			return errors.InternalServerError("go.micro.client", "%+v", err)
 		}

 		// only sleep if greater than 0
@@ -517,7 +503,7 @@ func (g *grpcClient) Call(ctx context.Context, req client.Request, rsp interface
 			// TODO apply any filtering here
 			routes, err = g.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
+				return errors.InternalServerError("go.micro.client", "%+v", err)
 			}

 			// balance the list of nodes
@@ -598,11 +584,6 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 	// make a copy of stream
 	gstream := g.stream

-	// wrap the call in reverse
-	for i := len(callOpts.CallWrappers); i > 0; i-- {
-		gstream = callOpts.CallWrappers[i-1](gstream)
-	}
-
 	// use the router passed as a call option, or fallback to the rpc clients router
 	if callOpts.Router == nil {
 		callOpts.Router = g.opts.Router
@@ -624,7 +605,7 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 		// call backoff first. Someone may want an initial start delay
 		t, err := callOpts.Backoff(ctx, req, i)
 		if err != nil {
-			return nil, errors.InternalServerError("go.micro.client", err.Error())
+			return nil, errors.InternalServerError("go.micro.client", "%+v", err)
 		}

 		// only sleep if greater than 0
@@ -639,7 +620,7 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 			// TODO apply any filtering here
 			routes, err = g.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
-				return nil, errors.InternalServerError("go.micro.client", err.Error())
+				return nil, errors.InternalServerError("go.micro.client", "%+v", err)
 			}

 			// balance the list of nodes
@@ -712,6 +693,7 @@ func (g *grpcClient) Stream(ctx context.Context, req client.Request, opts ...cli
 	return nil, grr
 }

+/*
 func (g *grpcClient) BatchPublish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
 	return g.publish(ctx, ps, opts...)
 }
@@ -777,6 +759,8 @@ func (g *grpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	)
 }

+*/
+
 func (g *grpcClient) String() string {
 	return "grpc"
 }
--- a/message.go
+++ b/message.go
@@ -1,44 +0,0 @@
-package grpc
-
-import (
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/metadata"
-)
-
-type grpcEvent struct {
-	payload     interface{}
-	topic       string
-	contentType string
-	opts        client.MessageOptions
-}
-
-func newGRPCEvent(topic string, payload interface{}, contentType string, opts ...client.MessageOption) client.Message {
-	options := client.NewMessageOptions(opts...)
-
-	if len(options.ContentType) > 0 {
-		contentType = options.ContentType
-	}
-
-	return &grpcEvent{
-		payload:     payload,
-		topic:       topic,
-		contentType: contentType,
-		opts:        options,
-	}
-}
-
-func (g *grpcEvent) ContentType() string {
-	return g.contentType
-}
-
-func (g *grpcEvent) Topic() string {
-	return g.topic
-}
-
-func (g *grpcEvent) Payload() interface{} {
-	return g.payload
-}
-
-func (g *grpcEvent) Metadata() metadata.Metadata {
-	return g.opts.Metadata
-}
--- a/options.go
+++ b/options.go
@@ -4,7 +4,7 @@ package grpc
 import (
 	"context"

-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/client"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
--- a/request.go
+++ b/request.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"

-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/codec"
 )

 type grpcRequest struct {
--- a/response.go
+++ b/response.go
@@ -1,10 +1,8 @@
 package grpc

 import (
-	"strings"
-
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/metadata"
 	"google.golang.org/grpc"
 )

@@ -25,18 +23,19 @@ func (r *response) Header() metadata.Metadata {
 	if err != nil {
 		return nil
 	}
-	md := metadata.New(len(meta))
-	for k, v := range meta {
-		md.Set(k, strings.Join(v, ","))
-	}
-	return md
+
+	return metadata.Metadata(meta.Copy())
 }

 // Read the undecoded response
 func (r *response) Read() ([]byte, error) {
 	f := &codec.Frame{}
-	if err := r.codec.ReadBody(&wrapStream{r.stream}, f); err != nil {
+	wrap := &wrapStream{r.stream}
+
+	_, err := wrap.Read(f.Data)
+	if err != nil {
 		return nil, err
 	}
+
 	return f.Data, nil
 }
--- a/stream.go
+++ b/stream.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"sync"

-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/client"
 	"google.golang.org/grpc"
 )