refactor(socket): 重构 socket 模块
- 移除 common/data/socket 目录下的大部分文件 - 新增 service 目录,将 Player 和 Conn 结构体移至该目录 - 更新 LogicClient 中的方法签名,使用 service 包的类型 - 重构 Controller 中的方法,适应新的 service 包结构
This commit is contained in:
@@ -2,13 +2,58 @@ package socket
|
||||
|
||||
import (
|
||||
"blazing/common/socket/codec"
|
||||
"blazing/common/socket/handler"
|
||||
"blazing/common/socket/errorcode"
|
||||
"blazing/logic/service"
|
||||
|
||||
"github.com/gogf/gf/v2/util/gconv"
|
||||
"github.com/panjf2000/gnet/pkg/pool/goroutine"
|
||||
"github.com/panjf2000/gnet/v2"
|
||||
)
|
||||
|
||||
func GetPlayer(c *service.Conn, userid uint32) *service.Player { //TODO 这里待优化,可能存在内存泄漏问题
|
||||
c.Mu.Lock()
|
||||
defer c.Mu.Unlock()
|
||||
//检查player初始化,是否为conn初始后取map,防止二次连接后存在两个player
|
||||
|
||||
clientdata := c.MainConn.Context().(*service.ClientData)
|
||||
if clientdata.Player != nil {
|
||||
return clientdata.Player
|
||||
}
|
||||
|
||||
clientdata.Player = service.NewPlayer(
|
||||
|
||||
service.WithConn(c), //注入conn
|
||||
)
|
||||
|
||||
// gff := socket.NewClientData()
|
||||
|
||||
// gff.Player = clientdata.Player
|
||||
// c.MainConn.SetContext(gff)
|
||||
service.Mainplayer.Store(userid, clientdata.Player)
|
||||
|
||||
return clientdata.Player
|
||||
// return nil
|
||||
}
|
||||
func KickPlayer(userid uint32) { //踢出玩家
|
||||
//TODO 返回错误码
|
||||
//var player *entity.Player
|
||||
if player1, ok := service.Mainplayer.Load((userid)); ok {
|
||||
//取成功,否则创建
|
||||
head := service.NewTomeeHeader(1001, userid)
|
||||
head.Result = uint32(errorcode.ErrorCodes.ErrAccountLoggedInElsewhere)
|
||||
|
||||
player1.SendPack(head.Pack(nil))
|
||||
player1.MainConn.MainConn.Close()
|
||||
// clientdata.Player = player
|
||||
}
|
||||
|
||||
//return player
|
||||
// return nil
|
||||
}
|
||||
|
||||
type Handler interface {
|
||||
Handle(gnet.Conn, []byte)
|
||||
}
|
||||
type Server struct {
|
||||
gnet.BuiltinEventEngine
|
||||
eng gnet.Engine
|
||||
@@ -19,7 +64,7 @@ type Server struct {
|
||||
bufferSize int
|
||||
workerPool *goroutine.Pool
|
||||
codec codec.SocketCodec
|
||||
handler handler.Handler
|
||||
handler Handler
|
||||
discorse bool
|
||||
}
|
||||
|
||||
@@ -52,7 +97,7 @@ func WithCORS() Option {
|
||||
u.discorse = false
|
||||
}
|
||||
}
|
||||
func WithSocketHandler(handler handler.Handler) Option {
|
||||
func WithSocketHandler(handler Handler) Option {
|
||||
return func(u *Server) {
|
||||
u.handler = handler
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user