refactor(socket): 重构 socket 模块
- 移除 common/data/socket 目录下的大部分文件 - 新增 service 目录，将 Player 和 Conn 结构体移至该目录 - 更新 LogicClient 中的方法签名，使用 service 包的类型 - 重构 Controller 中的方法，适应新的 service 包结构
This commit is contained in:
@@ -7,7 +7,8 @@ import (
|
||||
"time"
|
||||
|
||||
"blazing/common/data/share"
|
||||
"blazing/common/data/socket"
|
||||
|
||||
"blazing/logic/service"
|
||||
"blazing/logic/service/maps"
|
||||
|
||||
"github.com/gogf/gf/v2/os/glog"
|
||||
@@ -42,7 +43,7 @@ func (s *Server) Stop() error {
|
||||
func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) {
|
||||
atomic.AddInt64(&s.connected, -1)
|
||||
//logging.Infof("conn[%v] disconnected", c.RemoteAddr().String())
|
||||
v, ok := c.Context().(*socket.ClientData)
|
||||
v, ok := c.Context().(*service.ClientData)
|
||||
if !ok {
|
||||
return
|
||||
|
||||
@@ -54,7 +55,7 @@ func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) {
|
||||
maps.LeaveMap(v.Player)
|
||||
|
||||
v.Player.IsLogin = false
|
||||
socket.Mainplayer.Delete(v.Player.Info.UserID)
|
||||
service.Mainplayer.Delete(v.Player.Info.UserID)
|
||||
share.ShareManager.DeleteUserOnline(v.Player.Info.UserID) //设置用户登录服务器
|
||||
v.Player.Save() //保存玩家数据
|
||||
}
|
||||
@@ -77,7 +78,7 @@ func (s *Server) OnBoot(eng gnet.Engine) gnet.Action {
|
||||
|
||||
func (s *Server) OnOpen(conn gnet.Conn) (out []byte, action gnet.Action) {
|
||||
if conn.Context() == nil {
|
||||
conn.SetContext(socket.NewClientData()) //注入data
|
||||
conn.SetContext(service.NewClientData()) //注入data
|
||||
}
|
||||
|
||||
atomic.AddInt64(&s.connected, 1)
|
||||
@@ -90,7 +91,7 @@ func (s *Server) OnTraffic(c gnet.Conn) (action gnet.Action) {
|
||||
return gnet.Close
|
||||
}
|
||||
|
||||
ws := c.Context().(*socket.ClientData).Wsmsg
|
||||
ws := c.Context().(*service.ClientData).Wsmsg
|
||||
tt, len1 := ws.ReadBufferBytes(c)
|
||||
if tt == gnet.Close {
|
||||
|
||||
@@ -169,7 +170,7 @@ const CROSS_DOMAIN = "<?xml version=\"1.0\"?><!DOCTYPE cross-domain-policy><cros
|
||||
const TEXT = "<policy-file-request/>\x00"
|
||||
|
||||
func handle(c gnet.Conn) {
|
||||
clientdata := c.Context().(*socket.ClientData)
|
||||
clientdata := c.Context().(*service.ClientData)
|
||||
if clientdata.IsCrossDomain {
|
||||
return
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
package handler
|
||||
|
||||
import "github.com/panjf2000/gnet/v2"
|
||||
|
||||
// Handler The handler receive every syslog entry at Handle method
|
||||
type Handler interface {
|
||||
Handle(gnet.Conn, []byte)
|
||||
}
|
||||
@@ -1,148 +0,0 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"blazing/common/data/socket"
|
||||
"blazing/common/utils/bytearray"
|
||||
|
||||
"bytes"
|
||||
"fmt"
|
||||
"reflect"
|
||||
|
||||
"github.com/lunixbochs/struc"
|
||||
"github.com/panjf2000/gnet/v2"
|
||||
)
|
||||
|
||||
// TomeeHeader 结构体字段定义
|
||||
type TomeeHeader struct {
|
||||
Len uint32 `json:"len"`
|
||||
Version string `json:"version" struc:"[1]byte"`
|
||||
CMD uint32 `json:"cmdId" struc:"uint32"`
|
||||
UserID uint32 `json:"userId"`
|
||||
//Error uint32 `json:"error" struc:"[0]pad"`
|
||||
|
||||
Result uint32 `json:"result"`
|
||||
Data []byte `json:"data" struc:"skip"` //组包忽略此字段// struc:"[0]pad"
|
||||
//Return []byte `struc:"[0]pad"` //返回记录
|
||||
}
|
||||
|
||||
func NewTomeeHeader(cmd uint32, userid uint32) *TomeeHeader {
|
||||
|
||||
return &TomeeHeader{
|
||||
CMD: cmd,
|
||||
// Len: 0,
|
||||
Version: "7",
|
||||
Result: 0,
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
type TomeeHandler struct {
|
||||
Callback func(conn *socket.Conn, data TomeeHeader)
|
||||
}
|
||||
|
||||
func NewTomeeHandler() *TomeeHandler {
|
||||
return &TomeeHandler{}
|
||||
}
|
||||
|
||||
// Handle entry receiver
|
||||
func (h *TomeeHandler) Handle(c gnet.Conn, data []byte) { //处理接收到的数据 ,
|
||||
//fmt.Println("接收数据", data)
|
||||
|
||||
header := TomeeHeader{}
|
||||
|
||||
tempdata := bytearray.CreateByteArray(data)
|
||||
header.Len, _ = tempdata.ReadUInt32()
|
||||
header.Version, _ = tempdata.ReadString(1)
|
||||
header.CMD, _ = tempdata.ReadUInt32()
|
||||
//header.CMD = cmd.EnumCommandID(_CMD)
|
||||
header.UserID, _ = tempdata.ReadUInt32()
|
||||
|
||||
header.Result, _ = tempdata.ReadUInt32()
|
||||
header.Data = tempdata.BytesAvailable()
|
||||
//fmt.Println("接收封包", header)
|
||||
h.Callback(socket.NewConn(c), header)
|
||||
//return header
|
||||
}
|
||||
|
||||
// Pack 将给定的数据打包成一个字节切片。
|
||||
// 该方法处理的数据类型包括指针、切片和结构体。
|
||||
// 对于指针类型，会解引用以获取实际值。
|
||||
// 切片类型直接转换为字节切片。
|
||||
// 结构体类型使用struc库进行序列化。
|
||||
// 最后，将数据长度、版本号、命令码、用户ID和结果代码一并打包进返回的字节切片中。
|
||||
func (h *TomeeHeader) Pack(data any) []byte { //组包
|
||||
//h.Result = 0//默认置0
|
||||
|
||||
//t := reflect.TypeOf(data)
|
||||
tv := reflect.ValueOf(data)
|
||||
var datar []byte
|
||||
|
||||
// 处理指针类型
|
||||
if tv.Kind() == reflect.Ptr {
|
||||
//tv = t.Elem() // 获取指针指向的类型
|
||||
tv = tv.Elem() // 获取指针指向的值
|
||||
}
|
||||
//.Println(t.Kind())
|
||||
//t1 := tv.Interface()
|
||||
//fmt.Println(t1)
|
||||
switch tv.Kind() {
|
||||
|
||||
case reflect.Slice:
|
||||
datar = data.([]byte)
|
||||
//p.Conn.Write(p.pack(cmd, data.([]byte))) //写入数据
|
||||
|
||||
case reflect.Struct:
|
||||
var data1 bytes.Buffer
|
||||
err := struc.Pack(&data1, data)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
|
||||
datar = data1.Bytes()
|
||||
|
||||
default:
|
||||
datar = []byte{}
|
||||
// fmt.Println(err, datar)
|
||||
// p.Conn.Write(p.pack(cmd, data))
|
||||
|
||||
}
|
||||
h.Len = uint32(len(datar) + 17)
|
||||
|
||||
by := bytearray.CreateByteArray()
|
||||
by.WriteUInt32(h.Len)
|
||||
by.WriteString(h.Version)
|
||||
by.WriteUInt32(uint32(h.CMD))
|
||||
by.WriteUInt32(h.UserID)
|
||||
by.WriteUInt32(h.Result)
|
||||
by.Write(datar)
|
||||
|
||||
return by.Bytes()
|
||||
|
||||
}
|
||||
|
||||
// var _ Blazingservice = (*TomeeHeader)(nil)
|
||||
|
||||
// type Blazingservice interface {
|
||||
// Ret() []byte
|
||||
// }
|
||||
|
||||
// MergeBytes 将多个字节数组合并为一个
|
||||
func MergeBytes(arrays ...[]byte) []byte {
|
||||
// 计算所有数组的总长度
|
||||
totalLen := 0
|
||||
for _, arr := range arrays {
|
||||
totalLen += len(arr)
|
||||
}
|
||||
|
||||
// 创建结果切片
|
||||
result := make([]byte, totalLen)
|
||||
|
||||
// 逐个复制数组内容
|
||||
currentIndex := 0
|
||||
for _, arr := range arrays {
|
||||
copy(result[currentIndex:], arr)
|
||||
currentIndex += len(arr)
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
Reference in New Issue
Block a user