add *codec.Frame and *proto.Frame support

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2021-03-07 19:28:12 +03:00
parent 6add903e5d
commit d68112ac25
3 changed files with 23 additions and 405 deletions

View File

@@ -8,6 +8,7 @@ import (
// nolint: staticcheck
oldproto "github.com/golang/protobuf/proto"
"github.com/segmentio/encoding/proto"
mproto "github.com/unistack-org/micro-proto/proto"
"github.com/unistack-org/micro/v3/codec"
newproto "google.golang.org/protobuf/proto"
)
@@ -20,6 +21,8 @@ func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
return nil, nil
case *codec.Frame:
return m.Data, nil
case *mproto.Frame:
return m.Data, nil
case newproto.Message, oldproto.Message, proto.Message:
return proto.Marshal(m)
}
@@ -27,6 +30,7 @@ func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
}
func (c *protoCodec) Unmarshal(d []byte, v interface{}) error {
var err error
if d == nil {
return nil
}
@@ -35,10 +39,14 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}) error {
return nil
case *codec.Frame:
m.Data = d
case *mproto.Frame:
m.Data = d
case newproto.Message, oldproto.Message, proto.Message:
return proto.Unmarshal(d, m)
err = proto.Unmarshal(d, m)
default:
err = codec.ErrInvalidMessage
}
return codec.ErrInvalidMessage
return err
}
func (c *protoCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
@@ -49,6 +57,13 @@ func (c *protoCodec) ReadBody(conn io.Reader, b interface{}) error {
switch m := b.(type) {
case nil:
return nil
case *mproto.Frame:
buf, err := ioutil.ReadAll(conn)
if err != nil {
return err
}
m.Data = buf
return nil
case *codec.Frame:
buf, err := ioutil.ReadAll(conn)
if err != nil {
@@ -70,6 +85,9 @@ func (c *protoCodec) Write(conn io.Writer, m *codec.Message, b interface{}) erro
switch m := b.(type) {
case nil:
return nil
case *mproto.Frame:
_, err := conn.Write(m.Data)
return err
case *codec.Frame:
_, err := conn.Write(m.Data)
return err