发布v2.5.3版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

server/internal/library/network/tcp/server.go

@@ -3,12 +3,12 @@ package tcp
 import (
 	"context"
 	"fmt"
-	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gtcp"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/glog"
+	"hotgo/internal/consts"
 	"reflect"
 	"sync"
 	"time"
@@ -31,6 +31,7 @@ type Server struct {
 	Logger       *glog.Logger
 	addr         string
 	name         string
+	rpc          *Rpc
 	ln           *gtcp.Server
 	wgLn         sync.WaitGroup
 	mutex        sync.Mutex
@@ -72,6 +73,7 @@ func NewServer(config *ServerConfig) (server *Server, err error) {
 		return
 	}
 	server.Logger = logger
+	server.rpc = NewRpc(server.Ctx)
 
 	server.startCron()
 
@@ -100,13 +102,19 @@ func (server *Server) accept(conn *gtcp.Conn) {
 
 		switch msg.Router {
 		case "ServerLogin": // 服务登录
-			server.onServerLogin(msg.Data, conn)
+			// 初始化上下文
+			ctx, cancel := initCtx(gctx.New(), &Context{
+				Conn: conn,
+			})
+			doHandleRouterMsg(server.onServerLogin, ctx, cancel, msg.Data)
 		case "ServerHeartbeat": // 心跳
 			if client == nil {
 				server.Logger.Infof(server.Ctx, "conn not connected, ignore the heartbeat, msg:%+v", msg)
 				continue
 			}
-			server.onServerHeartbeat(msg, client)
+			// 初始化上下文
+			ctx, cancel := initCtx(gctx.New(), &Context{})
+			doHandleRouterMsg(server.onServerHeartbeat, ctx, cancel, msg.Data, client)
 		default: // 通用路由消息处理
 			if client == nil {
 				server.Logger.Warningf(server.Ctx, "conn is not logged in but sends a routing message. actively conn disconnect, msg:%+v", msg)
@@ -121,14 +129,25 @@ func (server *Server) accept(conn *gtcp.Conn) {
 
 // handleRouterMsg 处理路由消息
 func (server *Server) handleRouterMsg(msg *Message, client *ClientConn) {
-
 	// 验证签名
-	err := VerifySign(msg.Data, client.Auth.AppId, client.Auth.SecretKey)
+	in, err := VerifySign(msg.Data, client.Auth.AppId, client.Auth.SecretKey)
 	if err != nil {
 		server.Logger.Warningf(server.Ctx, "handleRouterMsg VerifySign err:%+v message: %+v", err, msg)
 		return
 	}
 
+	// 初始化上下文
+	ctx, cancel := initCtx(gctx.New(), &Context{
+		Conn:    client.Conn,
+		Auth:    client.Auth,
+		TraceID: in.TraceID,
+	})
+
+	// 响应rpc消息
+	if server.rpc.HandleMsg(ctx, cancel, msg.Data) {
+		return
+	}
+
 	handle := func(routers map[string]RouterHandler, group string) {
 		if routers == nil {
 			server.Logger.Debugf(server.Ctx, "handleRouterMsg route is not initialized %v message: %+v", group, msg)
@@ -139,15 +158,16 @@ func (server *Server) handleRouterMsg(msg *Message, client *ClientConn) {
 			server.Logger.Debugf(server.Ctx, "handleRouterMsg invalid %v message: %+v", group, msg)
 			return
 		}
-		f(msg.Data, client)
+
+		doHandleRouterMsg(f, ctx, cancel, msg.Data)
 	}
 
 	switch client.Auth.Group {
-	case ClientGroupCron:
+	case consts.TCPClientGroupCron:
 		handle(server.cronRouters, client.Auth.Group)
-	case ClientGroupQueue:
+	case consts.TCPClientGroupQueue:
 		handle(server.queueRouters, client.Auth.Group)
-	case ClientGroupAuth:
+	case consts.TCPClientGroupAuth:
 		handle(server.authRouters, client.Auth.Group)
 	default:
 		server.Logger.Warningf(server.Ctx, "group is not registered: %+v", client.Auth.Group)
@@ -173,6 +193,16 @@ func (server *Server) getAppIdClients(appid string) (list []*ClientConn) {
 	return
 }
 
+// GetGroupClients 获取指定分组的所有连接
+func (server *Server) GetGroupClients(group string) (list []*ClientConn) {
+	for _, v := range server.clients {
+		if v.Auth.Group == group {
+			list = append(list, v)
+		}
+	}
+	return
+}
+
 // RegisterAuthRouter 注册授权路由
 func (server *Server) RegisterAuthRouter(routers map[string]RouterHandler) {
 	server.mutex.Lock()
@@ -272,7 +302,39 @@ func (server *Server) Write(conn *gtcp.Conn, data interface{}) (err error) {
 
 	msg := &Message{Router: msgType.Elem().Name(), Data: data}
 
-	server.Logger.Debugf(server.Ctx, "server Write Router:%v, data:%+v", msg.Router, gjson.New(data).String())
-
 	return SendPkg(conn, msg)
 }
+
+// Send 发送消息
+func (server *Server) Send(ctx context.Context, client *ClientConn, data interface{}) (err error) {
+	MsgPkg(data, client.Auth, gctx.CtxId(ctx))
+	return server.Write(client.Conn, data)
+}
+
+// Reply 回复消息
+func (server *Server) Reply(ctx context.Context, data interface{}) (err error) {
+	user := GetCtx(ctx)
+	if user == nil {
+		err = gerror.New("获取回复用户信息失败")
+		return
+	}
+	MsgPkg(data, user.Auth, user.TraceID)
+	return server.Write(user.Conn, data)
+}
+
+// RpcRequest 向指定客户端发送消息并等待响应结果
+func (server *Server) RpcRequest(ctx context.Context, client *ClientConn, data interface{}) (res interface{}, err error) {
+	var (
+		traceID = MsgPkg(data, client.Auth, gctx.CtxId(ctx))
+		key     = server.rpc.GetCallId(client.Conn, traceID)
+	)
+
+	if traceID == "" {
+		err = gerror.New("traceID is required")
+		return
+	}
+
+	return server.rpc.Request(key, func() {
+		server.Write(client.Conn, data)
+	})
+}