Merge pull request 'Update workflows' (#106) from atolstikhin/micro-codec-jsonpb:master into master

Reviewed-on: #106

codec_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
 )
 
 func TestFrame(t *testing.T) {
@@ -28,7 +28,7 @@ func TestFrameFlatten(t *testing.T) {
 		Name: &codec.Frame{Data: []byte("test")},
 	}
 
-	buf, err := NewCodec(codec.Flatten(true)).Marshal(s)
+	buf, err := NewCodec().Marshal(s)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,3 +36,16 @@ func TestFrameFlatten(t *testing.T) {
 		t.Fatalf("bytes not equal %s != %s", buf, `test`)
 	}
 }
+
+func TestReadBody(t *testing.T) {
+	t.Skip("skip without proto message")
+	s := &struct {
+		Name string
+	}{}
+	c := NewCodec()
+	b := bytes.NewReader(nil)
+	err := c.ReadBody(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

go.mod

@@ -1,13 +1,14 @@
-module go.unistack.org/micro-codec-jsonpb/v3
+module go.unistack.org/micro-codec-jsonpb/v4
 
-go 1.21
-
-toolchain go1.23.4
+go 1.19
 
 require (
-	go.unistack.org/micro-proto/v3 v3.4.1
-	go.unistack.org/micro/v3 v3.10.35
-	google.golang.org/protobuf v1.35.2
+	go.unistack.org/micro-proto/v4 v4.0.1
+	go.unistack.org/micro/v4 v4.0.14
+	google.golang.org/protobuf v1.32.0
 )
 
-require github.com/google/go-cmp v0.6.0 // indirect
+require (
+	github.com/google/go-cmp v0.5.9 // indirect
+	golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
+)

go.sum

@@ -1,5 +1,10 @@
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro/v3 v3.10.35 h1:TPo0cTgrk+PAGh7u/7tge2faSiYA0mC1n4oflOYl3v8=
-go.unistack.org/micro/v3 v3.10.35/go.mod h1:eUgtvbtiiz6te93m0ZdmoecbitWwjdBmmr84srmEIKA=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+go.unistack.org/micro-proto/v4 v4.0.1 h1:2RKHgtCOOcAFgKsnngGK5bqM/6MWXOjVCdw03dbuoF8=
+go.unistack.org/micro-proto/v4 v4.0.1/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
+go.unistack.org/micro/v4 v4.0.14 h1:zN+aVfTceei3TPzuA7f2wAXLYHoSHWpx2XgW8yqaTIA=
+go.unistack.org/micro/v4 v4.0.14/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
+golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE=
+golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

jsonpb.go

@@ -1,10 +1,12 @@
-// Package jsonpb provides a json protobuf codec
-package jsonpb
+// Package jsonpb provides a json codec
+package jsonpb // import "go.unistack.org/micro-codec-jsonpb/v4"
 
 import (
-	pb "go.unistack.org/micro-proto/v3/codec"
-	"go.unistack.org/micro/v3/codec"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"io"
+
+	pb "go.unistack.org/micro-proto/v4/codec"
+	"go.unistack.org/micro/v4/codec"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 	jsonpb "google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 )
@@ -27,13 +29,8 @@ type jsonpbCodec struct {
 	opts codec.Options
 }
 
-type jsonpbCodecV2 struct {
-	opts codec.Options
-}
-
-var (
-	_ codec.Codec   = (*jsonpbCodec)(nil)
-	_ codec.CodecV2 = (*jsonpbCodecV2)(nil)
+const (
+	flattenTag = "flatten"
 )
 
 func (c *jsonpbCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
@@ -46,32 +43,29 @@ func (c *jsonpbCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, erro
 		o(&options)
 	}
 
-	if options.Flatten {
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
 		return m.Data, nil
 	case *pb.Frame:
 		return m.Data, nil
-	case proto.Message:
+	}
+
+	if _, ok := v.(proto.Message); !ok {
+		return nil, codec.ErrInvalidMessage
+	}
+
 	marshalOptions := DefaultMarshalOptions
 	if options.Context != nil {
 		if f, ok := options.Context.Value(marshalOptionsKey{}).(jsonpb.MarshalOptions); ok {
 			marshalOptions = f
 		}
 	}
-		return marshalOptions.Marshal(m)
-	case codec.RawMessage:
-		return []byte(m), nil
-	case *codec.RawMessage:
-		return []byte(*m), nil
-	default:
-		return nil, codec.ErrInvalidMessage
-	}
+
+	return marshalOptions.Marshal(v.(proto.Message))
 }
 
 func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
@@ -84,11 +78,9 @@ func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) e
 		o(&options)
 	}
 
-	if options.Flatten {
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
@@ -97,23 +89,52 @@ func (c *jsonpbCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) e
 	case *pb.Frame:
 		m.Data = d
 		return nil
-	case proto.Message:
+	}
+
+	if _, ok := v.(proto.Message); !ok {
+		return codec.ErrInvalidMessage
+	}
+
 	unmarshalOptions := DefaultUnmarshalOptions
 	if options.Context != nil {
 		if f, ok := options.Context.Value(unmarshalOptionsKey{}).(jsonpb.UnmarshalOptions); ok {
 			unmarshalOptions = f
 		}
 	}
-		return unmarshalOptions.Unmarshal(d, m)
-	case *codec.RawMessage:
-		*m = append((*m)[0:0], d...)
+
+	return unmarshalOptions.Unmarshal(d, v.(proto.Message))
+}
+
+func (c *jsonpbCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
 	return nil
-	case codec.RawMessage:
-		copy(m, d)
+}
+
+func (c *jsonpbCodec) ReadBody(conn io.Reader, v interface{}) error {
+	if v == nil {
 		return nil
-	default:
+	}
+	buf, err := io.ReadAll(conn)
+	if err != nil {
+		return err
+	} else if len(buf) == 0 {
+		return nil
+	}
+	return c.Unmarshal(buf, v)
+}
+
+func (c *jsonpbCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
+	if v == nil {
+		return nil
+	}
+
+	buf, err := c.Marshal(v)
+	if err != nil {
+		return err
+	} else if len(buf) == 0 {
 		return codec.ErrInvalidMessage
 	}
+	_, err = conn.Write(buf)
+	return err
 }
 
 func (c *jsonpbCodec) String() string {
@@ -123,91 +144,3 @@ func (c *jsonpbCodec) String() string {
 func NewCodec(opts ...codec.Option) codec.Codec {
 	return &jsonpbCodec{opts: codec.NewOptions(opts...)}
 }
-
-func (c *jsonpbCodecV2) Marshal(d []byte, v interface{}, opts ...codec.Option) ([]byte, error) {
-	if v == nil {
-		return nil, nil
-	}
-
-	options := c.opts
-	for _, o := range opts {
-		o(&options)
-	}
-
-	if options.Flatten {
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
-			v = nv
-		}
-	}
-
-	switch m := v.(type) {
-	case *codec.Frame:
-		return m.Data, nil
-	case *pb.Frame:
-		return m.Data, nil
-	case proto.Message:
-		marshalOptions := DefaultMarshalOptions
-		if options.Context != nil {
-			if f, ok := options.Context.Value(marshalOptionsKey{}).(jsonpb.MarshalOptions); ok {
-				marshalOptions = f
-			}
-		}
-		return marshalOptions.MarshalAppend(d[:0], m)
-	case codec.RawMessage:
-		return []byte(m), nil
-	case *codec.RawMessage:
-		return []byte(*m), nil
-	default:
-		return nil, codec.ErrInvalidMessage
-	}
-}
-
-func (c *jsonpbCodecV2) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
-	if v == nil || len(d) == 0 {
-		return nil
-	}
-
-	options := c.opts
-	for _, o := range opts {
-		o(&options)
-	}
-
-	if options.Flatten {
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
-			v = nv
-		}
-	}
-
-	switch m := v.(type) {
-	case *codec.Frame:
-		m.Data = d
-		return nil
-	case *pb.Frame:
-		m.Data = d
-		return nil
-	case proto.Message:
-		unmarshalOptions := DefaultUnmarshalOptions
-		if options.Context != nil {
-			if f, ok := options.Context.Value(unmarshalOptionsKey{}).(jsonpb.UnmarshalOptions); ok {
-				unmarshalOptions = f
-			}
-		}
-		return unmarshalOptions.Unmarshal(d, m)
-	case *codec.RawMessage:
-		*m = append((*m)[0:0], d...)
-		return nil
-	case codec.RawMessage:
-		copy(m, d)
-		return nil
-	default:
-		return codec.ErrInvalidMessage
-	}
-}
-
-func (c *jsonpbCodecV2) String() string {
-	return "jsonpb"
-}
-
-func NewCodecV2(opts ...codec.Option) codec.CodecV2 {
-	return &jsonpbCodecV2{opts: codec.NewOptions(opts...)}
-}

options.go

@@ -1,7 +1,7 @@
 package jsonpb
 
 import (
-	codec "go.unistack.org/micro/v3/codec"
+	codec "go.unistack.org/micro/v4/codec"
 	jsonpb "google.golang.org/protobuf/encoding/protojson"
 )