unistack-org/micro-codec-proto
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 15 Wiki Activity

simplify

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2021-05-26 00:47:41 +03:00
parent fc33542ff7
commit f64f6567a6
1 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
proto.go
View File

@ -57,50 +57,25 @@ func (c *protoCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.Messag
} }
func (c *protoCodec) ReadBody(conn io.Reader, v interface{}) error { func (c *protoCodec) ReadBody(conn io.Reader, v interface{}) error {
switch m := v.(type) { if v == nil {
case nil:
return nil return nil
case *codec.Frame: }
buf, err := io.ReadAll(conn) buf, err := io.ReadAll(conn)
if err != nil { if err != nil {
return err return err
} else if len(buf) == 0 { } else if len(buf) == 0 {
return nil return nil
} }
m.Data = buf return c.Unmarshal(buf, v)
return nil
case proto.Message:
buf, err := io.ReadAll(conn)
if err != nil {
return err
} else if len(buf) == 0 {
return nil
}
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok {
m = nm
}
}
return proto.Unmarshal(buf, m)
}
return codec.ErrInvalidMessage
} }
func (c *protoCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error { func (c *protoCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
switch m := v.(type) { if v == nil {
case nil:
return nil return nil
case *codec.Frame:
_, err := conn.Write(m.Data)
return err
case proto.Message:
if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
if nm, ok := nv.(proto.Message); ok {
m = nm
}
} }
buf, err := proto.Marshal(m) buf, err := c.Marshal(v)
if err != nil { if err != nil {
return err return err
} else if len(buf) == 0 { } else if len(buf) == 0 {
@ -109,8 +84,6 @@ func (c *protoCodec) Write(conn io.Writer, m *codec.Message, v interface{}) erro
_, err = conn.Write(buf) _, err = conn.Write(buf)
return err return err
} }
return codec.ErrInvalidMessage
}
func (c *protoCodec) String() string { func (c *protoCodec) String() string {
return "proto" return "proto"