feat: optimize server code (#1931)

* fix: GroupApplicationAcceptedNotification

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* utils.Wrap -> errs.Wrap

* utils.Wrap -> errs.Wrap

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

internal/msggateway/client.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/OpenIMSDK/tools/errs"
 	"runtime/debug"
 	"sync"
 	"sync/atomic"
@@ -173,7 +174,7 @@ func (c *Client) handleMessage(message []byte) error {
 		var err error
 		message, err = c.longConnServer.DecompressWithPool(message)
 		if err != nil {
-			return utils.Wrap(err, "")
+			return errs.Wrap(err)
 		}
 	}
 
@@ -182,15 +183,15 @@ func (c *Client) handleMessage(message []byte) error {
 
 	err := c.longConnServer.Decode(message, binaryReq)
 	if err != nil {
-		return utils.Wrap(err, "")
+		return errs.Wrap(err)
 	}
 
 	if err := c.longConnServer.Validate(binaryReq); err != nil {
-		return utils.Wrap(err, "")
+		return errs.Wrap(err)
 	}
 
 	if binaryReq.SendID != c.UserID {
-		return utils.Wrap(errors.New("exception conn userID not same to req userID"), binaryReq.String())
+		return errs.Wrap(errors.New("exception conn userID not same to req userID"), binaryReq.String())
 	}
 
 	ctx := mcontext.WithMustInfoCtx(
@@ -313,7 +314,7 @@ func (c *Client) writeBinaryMsg(resp Resp) error {
 
 	encodedBuf, err := c.longConnServer.Encode(resp)
 	if err != nil {
-		return utils.Wrap(err, "")
+		return errs.Wrap(err)
 	}
 
 	c.w.Lock()
@@ -323,7 +324,7 @@ func (c *Client) writeBinaryMsg(resp Resp) error {
 	if c.IsCompress {
 		resultBuf, compressErr := c.longConnServer.CompressWithPool(encodedBuf)
 		if compressErr != nil {
-			return utils.Wrap(compressErr, "")
+			return errs.Wrap(compressErr)
 		}
 		return c.conn.WriteMessage(MessageBinary, resultBuf)
 	}
@@ -341,7 +342,7 @@ func (c *Client) writePongMsg() error {
 
 	err := c.conn.SetWriteDeadline(writeWait)
 	if err != nil {
-		return utils.Wrap(err, "")
+		return errs.Wrap(err)
 	}
 
 	return c.conn.WriteMessage(PongMessage, nil)

internal/msggateway/compressor.go

@@ -18,10 +18,9 @@ import (
 	"bytes"
 	"compress/gzip"
 	"errors"
+	"github.com/OpenIMSDK/tools/errs"
 	"io"
 	"sync"
-
-	"github.com/OpenIMSDK/tools/utils"
 )
 
 var (
@@ -47,10 +46,10 @@ func (g *GzipCompressor) Compress(rawData []byte) ([]byte, error) {
 	gzipBuffer := bytes.Buffer{}
 	gz := gzip.NewWriter(&gzipBuffer)
 	if _, err := gz.Write(rawData); err != nil {
-		return nil, utils.Wrap(err, "")
+		return nil, errs.Wrap(err)
 	}
 	if err := gz.Close(); err != nil {
-		return nil, utils.Wrap(err, "")
+		return nil, errs.Wrap(err)
 	}
 	return gzipBuffer.Bytes(), nil
 }
@@ -63,10 +62,10 @@ func (g *GzipCompressor) CompressWithPool(rawData []byte) ([]byte, error) {
 	gz.Reset(&gzipBuffer)
 
 	if _, err := gz.Write(rawData); err != nil {
-		return nil, utils.Wrap(err, "")
+		return nil, errs.Wrap(err)
 	}
 	if err := gz.Close(); err != nil {
-		return nil, utils.Wrap(err, "")
+		return nil, errs.Wrap(err)
 	}
 	return gzipBuffer.Bytes(), nil
 }
@@ -75,11 +74,11 @@ func (g *GzipCompressor) DeCompress(compressedData []byte) ([]byte, error) {
 	buff := bytes.NewBuffer(compressedData)
 	reader, err := gzip.NewReader(buff)
 	if err != nil {
-		return nil, utils.Wrap(err, "NewReader failed")
+		return nil, errs.Wrap(err, "NewReader failed")
 	}
 	compressedData, err = io.ReadAll(reader)
 	if err != nil {
-		return nil, utils.Wrap(err, "ReadAll failed")
+		return nil, errs.Wrap(err, "ReadAll failed")
 	}
 	_ = reader.Close()
 	return compressedData, nil
@@ -88,18 +87,18 @@ func (g *GzipCompressor) DeCompress(compressedData []byte) ([]byte, error) {
 func (g *GzipCompressor) DecompressWithPool(compressedData []byte) ([]byte, error) {
 	reader := gzipReaderPool.Get().(*gzip.Reader)
 	if reader == nil {
-		return nil, errors.New("NewReader failed")
+		return nil, errs.Wrap(errors.New("NewReader failed"))
 	}
 	defer gzipReaderPool.Put(reader)
 
 	err := reader.Reset(bytes.NewReader(compressedData))
 	if err != nil {
-		return nil, utils.Wrap(err, "NewReader failed")
+		return nil, errs.Wrap(err, "NewReader failed")
 	}
 
 	compressedData, err = io.ReadAll(reader)
 	if err != nil {
-		return nil, utils.Wrap(err, "ReadAll failed")
+		return nil, errs.Wrap(err, "ReadAll failed")
 	}
 	_ = reader.Close()
 	return compressedData, nil

internal/msggateway/encoder.go

@@ -17,8 +17,7 @@ package msggateway
 import (
 	"bytes"
 	"encoding/gob"
-
-	"github.com/OpenIMSDK/tools/utils"
+	"github.com/OpenIMSDK/tools/errs"
 )
 
 type Encoder interface {
@@ -47,7 +46,7 @@ func (g *GobEncoder) Decode(encodeData []byte, decodeData any) error {
 	dec := gob.NewDecoder(buff)
 	err := dec.Decode(decodeData)
 	if err != nil {
-		return utils.Wrap(err, "")
+		return errs.Wrap(err)
 	}
 	return nil
 }