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

Reviewed-on: #124

go.mod

@@ -1,18 +1,16 @@
-module go.unistack.org/micro-codec-segmentio/v3
+module go.unistack.org/micro-codec-segmentio/v4
 
-go 1.21
+go 1.19
-
-toolchain go1.23.4
 
 require (
-	github.com/segmentio/encoding v0.4.1
+	github.com/segmentio/encoding v0.3.6
-	go.unistack.org/micro-proto/v3 v3.4.1
+	go.unistack.org/micro-proto/v4 v4.0.0
-	go.unistack.org/micro/v3 v3.10.88
+	go.unistack.org/micro/v4 v4.0.1
-	google.golang.org/protobuf v1.35.2
+	google.golang.org/protobuf v1.28.1
 )
 
 require (
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
 )

go.sum

@@ -1,10 +1,21 @@
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
 github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
-github.com/segmentio/encoding v0.4.1 h1:KLGaLSW0jrmhB58Nn4+98spfvPvmo4Ci1P/WIQ9wn7w=
+github.com/segmentio/encoding v0.3.6 h1:E6lVLyDPseWEulBmCmAKPanDd3jiyGDo5gMcugCRwZQ=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+github.com/segmentio/encoding v0.3.6/go.mod h1:n0JeuIqEQrQoPDGsjo8UNd1iA0U8d8+oHAA4E3G3OxM=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro-proto/v4 v4.0.0 h1:+TAwKSlx48eLsNO2E2cO0JLE8we1KU2AuWe9Q310FuU=
-go.unistack.org/micro/v3 v3.10.88 h1:MxlzP+77Y6Kphb3lzHxROL4XfE/WdCQMQpnPv4D9Z8U=
+go.unistack.org/micro-proto/v4 v4.0.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.unistack.org/micro/v3 v3.10.88/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

json/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,15 @@ func TestFrameFlatten(t *testing.T) {
 		t.Fatalf("bytes not equal %s != %s", buf, `test`)
 	}
 }
+
+func TestReadBody(t *testing.T) {
+	s := &struct {
+		Name string
+	}{}
+	c := NewCodec()
+	b := bytes.NewReader(nil)
+	err := c.ReadBody(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

json/json.go

@@ -1,11 +1,13 @@
 // Package json provides a json codec
-package json // import "go.unistack.org/micro-codec-segmentio/v3/json"
+package json // import "go.unistack.org/micro-codec-segmentio/v4/json"
 
 import (
+	"io"
+
 	"github.com/segmentio/encoding/json"
-	pb "go.unistack.org/micro-proto/v3/codec"
+	pb "go.unistack.org/micro-proto/v4/codec"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var (
@@ -19,9 +21,10 @@ var (
 	}
 )
 
-var (
+var _ codec.Codec = &jsonCodec{}
-	_ codec.Codec   = (*jsonCodec)(nil)
+
-	_ codec.CodecV2 = (*jsonCodecV2)(nil)
+const (
+	flattenTag = "flatten"
 )
 
 type JsonMarshalOptions struct {
@@ -46,12 +49,6 @@ type jsonCodec struct {
 	decodeFlags json.ParseFlags
 }
 
-type jsonCodecV2 struct {
-	opts        codec.Options
-	encodeFlags json.AppendFlags
-	decodeFlags json.ParseFlags
-}
-
 func getMarshalFlags(o JsonMarshalOptions) json.AppendFlags {
 	var encodeFlags json.AppendFlags
 
@@ -114,21 +111,15 @@ func (c *jsonCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error)
 		o(&options)
 	}
 
-	if options.Flatten {
+	if nv, err := rutil.StructFieldByTag(v, options.TagName, flattenTag); err == nil {
-		if nv, err := rutil.StructFieldByTag(v, options.TagName, "flatten"); err == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
 		return m.Data, nil
 	case *pb.Frame:
 		return m.Data, nil
-	case codec.RawMessage:
-		return []byte(m), nil
-	case *codec.RawMessage:
-		return []byte(*m), nil
 	}
 
 	marshalOptions := DefaultMarshalOptions
@@ -154,11 +145,9 @@ func (c *jsonCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) err
 		o(&options)
 	}
 
-	if options.Flatten {
+	if nv, err := rutil.StructFieldByTag(v, options.TagName, flattenTag); err == nil {
-		if nv, err := rutil.StructFieldByTag(v, options.TagName, "flatten"); err == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
@@ -167,12 +156,6 @@ func (c *jsonCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) err
 	case *pb.Frame:
 		m.Data = b
 		return nil
-	case *codec.RawMessage:
-		*m = append((*m)[0:0], b...)
-		return nil
-	case codec.RawMessage:
-		copy(m, b)
-		return nil
 	}
 
 	unmarshalOptions := DefaultUnmarshalOptions
@@ -186,89 +169,44 @@ func (c *jsonCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) err
 	return err
 }
 
+func (c *jsonCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
+	return nil
+}
+
+func (c *jsonCodec) ReadBody(conn io.Reader, v interface{}) error {
+	if v == nil {
+		return nil
+	}
+
+	buf, err := io.ReadAll(conn)
+	if err != nil {
+		return err
+	} else if len(buf) == 0 {
+		return nil
+	}
+	return c.Unmarshal(buf, v)
+}
+
+func (c *jsonCodec) 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 *jsonCodec) String() string {
 	return "json"
 }
 
-func (c *jsonCodecV2) Marshal(b []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, err := rutil.StructFieldByTag(v, options.TagName, "flatten"); err == nil {
-			v = nv
-		}
-	}
-
-	switch m := v.(type) {
-	case *codec.Frame:
-		return m.Data, nil
-	case *pb.Frame:
-		return m.Data, nil
-	}
-
-	marshalOptions := DefaultMarshalOptions
-	if options.Context != nil {
-		if f, ok := options.Context.Value(marshalOptionsKey{}).(JsonMarshalOptions); ok {
-			marshalOptions = f
-		}
-	}
-
-	var err error
-	b, err = json.Append(b[:0], v, getMarshalFlags(marshalOptions))
-	return b, err
-}
-
-func (c *jsonCodecV2) Unmarshal(b []byte, v interface{}, opts ...codec.Option) error {
-	if len(b) == 0 || v == nil {
-		return nil
-	}
-
-	options := c.opts
-	for _, o := range opts {
-		o(&options)
-	}
-
-	if options.Flatten {
-		if nv, err := rutil.StructFieldByTag(v, options.TagName, "flatten"); err == nil {
-			v = nv
-		}
-	}
-
-	switch m := v.(type) {
-	case *codec.Frame:
-		m.Data = b
-		return nil
-	case *pb.Frame:
-		m.Data = b
-		return nil
-	}
-
-	unmarshalOptions := DefaultUnmarshalOptions
-	if options.Context != nil {
-		if f, ok := options.Context.Value(unmarshalOptionsKey{}).(JsonUnmarshalOptions); ok {
-			unmarshalOptions = f
-		}
-	}
-
-	_, err := json.Parse(b, v, getUnmarshalFlags(unmarshalOptions))
-	return err
-}
-
-func (c *jsonCodecV2) String() string {
-	return "json"
-}
-
 func NewCodec(opts ...codec.Option) *jsonCodec {
 	return &jsonCodec{opts: codec.NewOptions(opts...)}
 }
-
-func NewCodecV2(opts ...codec.Option) *jsonCodecV2 {
-	return &jsonCodecV2{opts: codec.NewOptions(opts...)}
-}

json/options.go

@@ -1,7 +1,7 @@
 package json
 
 import (
-	codec "go.unistack.org/micro/v3/codec"
+	codec "go.unistack.org/micro/v4/codec"
 )
 
 type unmarshalOptionsKey struct{}

proto/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("no proto generated")
+	s := &struct {
+		Name string
+	}{}
+	c := NewCodec()
+	b := bytes.NewReader(nil)
+	err := c.ReadBody(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

proto/proto.go

@@ -1,11 +1,13 @@
 // Package proto provides a proto codec
-package proto // import "go.unistack.org/micro-codec-segmentio/v3/proto"
+package proto // import "go.unistack.org/micro-codec-segmentio/v4/proto"
 
 import (
+	"io"
+
 	"github.com/segmentio/encoding/proto"
-	pb "go.unistack.org/micro-proto/v3/codec"
+	pb "go.unistack.org/micro-proto/v4/codec"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 	newproto "google.golang.org/protobuf/proto"
 )
 
@@ -15,6 +17,10 @@ type protoCodec struct {
 
 var _ codec.Codec = &protoCodec{}
 
+const (
+	flattenTag = "flatten"
+)
+
 func (c *protoCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
 	if v == nil {
 		return nil, nil
@@ -25,11 +31,9 @@ func (c *protoCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error
 		o(&options)
 	}
 
-	if options.Flatten {
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
@@ -43,13 +47,9 @@ func (c *protoCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error
 		return proto.Marshal(m)
 	case newproto.Message:
 		return proto.Marshal(m)
-	case codec.RawMessage:
-		return []byte(m), nil
-	case *codec.RawMessage:
-		return []byte(*m), nil
-	default:
-		return nil, codec.ErrInvalidMessage
 	}
+
+	return nil, codec.ErrInvalidMessage
 }
 
 func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
@@ -62,11 +62,9 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) er
 		o(&options)
 	}
 
-	if options.Flatten {
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
@@ -75,12 +73,6 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) er
 	case *pb.Frame:
 		m.Data = d
 		return nil
-	case *codec.RawMessage:
-		*m = append((*m)[0:0], d...)
-		return nil
-	case codec.RawMessage:
-		copy(m, d)
-		return nil
 	}
 
 	switch m := v.(type) {
@@ -88,9 +80,43 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) er
 		return proto.Unmarshal(d, m)
 	case newproto.Message:
 		return proto.Unmarshal(d, m)
-	default:
+
+	}
+
 	return codec.ErrInvalidMessage
 }
+
+func (c *protoCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
+	return nil
+}
+
+func (c *protoCodec) ReadBody(conn io.Reader, v interface{}) error {
+	if v == nil {
+		return nil
+	}
+	buf, err := io.ReadAll(conn)
+	if err != nil {
+		return err
+	} else if len(buf) == 0 {
+		return nil
+	}
+	return c.Unmarshal(buf, v)
+}
+
+func (c *protoCodec) 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 *protoCodec) String() string {