simplify

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

proto.go

@@ -24,7 +24,7 @@ func (c *protoCodec) Marshal(v interface{}) ([]byte, error) {
 	case proto.Message:
 		if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
 			if nm, ok := nv.(proto.Message); ok {
-				return proto.Marshal(nm)
+				m = nm
 			}
 		}
 		return proto.Marshal(m)
@@ -44,7 +44,7 @@ func (c *protoCodec) Unmarshal(d []byte, v interface{}) error {
 	case proto.Message:
 		if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
 			if nm, ok := nv.(proto.Message); ok {
-				return proto.Unmarshal(d, nm)
+				m = nm
 			}
 		}
 		return proto.Unmarshal(d, m)
@@ -57,54 +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 {
-	switch m := v.(type) {
+	if v == nil {
-	case nil:
 		return nil
-	case *codec.Frame:
+	}
+
 	buf, err := io.ReadAll(conn)
 	if err != nil {
 		return err
 	} else if len(buf) == 0 {
 		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 {
-				return proto.Unmarshal(buf, nm)
-			}
-		}
-		return proto.Unmarshal(buf, m)
-	}
-	return codec.ErrInvalidMessage
 }
 
 func (c *protoCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
-	switch m := v.(type) {
+	if v == nil {
-	case nil:
 		return nil
-	case *codec.Frame:
-		_, err := conn.Write(m.Data)
-		return err
-	case proto.Message:
-		var buf []byte
-		var err error
-
-		if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil {
-			if nm, ok := nv.(proto.Message); ok {
-				buf, err = proto.Marshal(nm)
-			}
-		} else {
-			buf, err = proto.Marshal(m)
 	}
 
+	buf, err := c.Marshal(v)
 	if err != nil {
 		return err
 	} else if len(buf) == 0 {
@@ -113,8 +84,6 @@ func (c *protoCodec) Write(conn io.Writer, m *codec.Message, v interface{}) erro
 	_, err = conn.Write(buf)
 	return err
 }
-	return codec.ErrInvalidMessage
-}
 
 func (c *protoCodec) String() string {
 	return "proto"