ReadAll for tcp_server

Author: limingxinleo

server/json_rpc_handler.go

@@ -4,8 +4,6 @@ import (
 	"github.com/hyperf/roc"
 	"github.com/hyperf/roc/exception"
 	"github.com/hyperf/roc/formatter"
-	"github.com/hyperf/roc/log"
-	"go.uber.org/zap"
 	"net"
 )
 
@@ -22,7 +20,6 @@ func NewTcpServerHandler(callback JsonRPCHandler) Handler {
 		var response any
 
 		if err != nil {
-			log.Logger().Error("RPC_UnSerialize", zap.String("body", body))
 			response = &formatter.JsonRPCErrorResponse[any]{
 				Id: route.Id,
 				Error: &formatter.JsonRPCError{

server/tcp_server.go

@@ -52,11 +52,31 @@ func (s *TcpServer) Start() {
 	}
 }
 
+func (s *TcpServer) readAll(conn net.Conn, length int) ([]byte, error) {
+	ret := make([]byte, length)
+	recvLength := 0
+	var l int
+	var err error
+	for {
+		bt := make([]byte, length-recvLength)
+		l, err = conn.Read(bt)
+		if err != nil {
+			return nil, err
+		}
+
+		recvLength += l
+		ret = append(ret, bt...)
+		if recvLength >= length {
+			return ret, nil
+		}
+	}
+
+}
+
 func (s *TcpServer) handle(conn net.Conn) {
 	defer conn.Close()
 	for {
-		buf := make([]byte, 4)
-		_, err := conn.Read(buf)
+		buf, err := s.readAll(conn, 4)
 		if err != nil {
 			if err != io.EOF {
 				log.Logger().Error("Error reading", zap.Error(err))
@@ -65,8 +85,7 @@ func (s *TcpServer) handle(conn net.Conn) {
 		}
 
 		len32 := binary.BigEndian.Uint32(buf)
-		buf = make([]byte, len32)
-		_, err = conn.Read(buf)
+		buf, err = s.readAll(conn, int(len32))
 		if err != nil {
 			if err != io.EOF {
 				log.Logger().Error("Error reading", zap.Error(err))