在玩家断开连接时,使用 sync.Once 确保只保存一次玩家数据, 防止因并发或多次触发导致的数据异常。 feat(fight): 增加战斗资格判断与邀请取消功能 - 新增 Player.CanFight() 方法用于统一判断是否可以参与战斗 - 在多个战斗相关接口中加入 CanFight 检查 - 添加“取消战斗邀请”指令及处理逻辑(cmd: 2402) - 修复部分错误码不准确的问题,提升提示一致性 refactor(login): 优化登录流程并增强健壮性 - 提前校验 session 合法性 - 增强获取玩家信息后的空指针检查 - 调整挖矿数据重置方式为 defer 执行 - 优化日志输出内容,便于调试追踪 docs(model): 更新部门、菜单等模型字段命名规范 将 orderNum 字段改为 ordernum,保持数据库列名风格一致, 同时更新了 base_sys_role 中 userId 为 userid。 perf(rate-limit): 提高登录接口的限流 Burst 容量 调整限流器配置,将请求 burst 容量从 2 提升至 5, 以应对短时间高频访问场景,改善用户体验。 chore(build): 忽略新增编译产物和临时文件 在 .gitignore 中添加 logic/logic2、login/login 等新生成文件路径, 避免误提交二进制文件到版本控制。
227 lines
5.3 KiB
Go
227 lines
5.3 KiB
Go
package socket
|
||
|
||
import (
|
||
"context"
|
||
"log"
|
||
"os"
|
||
"sync/atomic"
|
||
"time"
|
||
|
||
"blazing/common/socket/codec"
|
||
"blazing/cool"
|
||
"blazing/logic/service/player"
|
||
|
||
"github.com/panjf2000/gnet/v2"
|
||
)
|
||
|
||
func (s *Server) Boot() error {
|
||
// go s.bootws()
|
||
err := gnet.Run(s, s.network+"://"+s.addr,
|
||
gnet.WithMulticore(true),
|
||
gnet.WithTicker(true),
|
||
|
||
// gnet.WithReusePort(true),
|
||
// gnet.WithReuseAddr(true),
|
||
gnet.WithSocketRecvBuffer(s.bufferSize))
|
||
if err != nil {
|
||
return err
|
||
}
|
||
|
||
// err := gnet.Run(s, s.network+"://"+s.addr, gnet.WithMulticore(s.multicore))
|
||
cool.Loger.Debug(context.Background(), "server exits with error: %v", err)
|
||
// logging.Infof("server exits with error: %v", err)
|
||
return nil
|
||
}
|
||
|
||
func (s *Server) Stop() error {
|
||
_ = s.eng.Stop(context.Background())
|
||
s.workerPool.Release()
|
||
|
||
return nil
|
||
}
|
||
|
||
func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) {
|
||
defer func() {
|
||
if err := recover(); err != nil { // 恢复 panic,err 为 panic 错误值
|
||
// 1. 打印错误信息
|
||
|
||
cool.Loger.Error(context.TODO(), "panic 错误:", err)
|
||
|
||
}
|
||
}()
|
||
|
||
atomic.AddInt64(&s.connected, -1)
|
||
//logging.Infof("conn[%v] disconnected", c.RemoteAddr().String())
|
||
v, _ := c.Context().(*player.ClientData)
|
||
s.workerPool.Submit(func() { //TODO 这里可能存在顺序执行问题,待修复
|
||
|
||
if v.Player != nil {
|
||
v.SaveL.Do(func() { //使用保存锁,确保在踢人和掉线的时候只保存一次
|
||
//cool.Loger.Info(context.TODO(), "准备保存", v.Player.Info.UserID)
|
||
v.Player.Save() //保存玩家数据
|
||
//cool.Loger.Info(context.TODO(), "保存完成", v.Player.Info.UserID)
|
||
if v.CloseChan != nil {
|
||
close(v.CloseChan)
|
||
}
|
||
})
|
||
|
||
}
|
||
|
||
})
|
||
|
||
//}
|
||
//关闭连接
|
||
return
|
||
}
|
||
func (s *Server) OnTick() (delay time.Duration, action gnet.Action) {
|
||
cool.Loger.Infof(context.Background(), "[connected-count=%v]", atomic.LoadInt64(&s.connected))
|
||
if s.quit && atomic.LoadInt64(&s.connected) == 0 {
|
||
//执行正常退出逻辑
|
||
os.Exit(0)
|
||
}
|
||
return 30 * time.Second, gnet.None
|
||
}
|
||
func (s *Server) OnBoot(eng gnet.Engine) gnet.Action {
|
||
s.eng = eng
|
||
|
||
// cool.Loger.Infof(context.Background(), " server is listening on %s\n", s.addr)
|
||
|
||
return gnet.None
|
||
}
|
||
|
||
func (s *Server) OnOpen(conn gnet.Conn) (out []byte, action gnet.Action) {
|
||
if conn.Context() == nil {
|
||
conn.SetContext(player.NewClientData(conn)) //注入data
|
||
}
|
||
|
||
atomic.AddInt64(&s.connected, 1)
|
||
|
||
return nil, gnet.None
|
||
}
|
||
|
||
func (s *Server) OnTraffic(c gnet.Conn) (action gnet.Action) {
|
||
defer func() {
|
||
if err := recover(); err != nil { // 恢复 panic,err 为 panic 错误值
|
||
// 1. 打印错误信息
|
||
|
||
cool.Loger.Error(context.TODO(), "panic 错误:", err)
|
||
|
||
}
|
||
}()
|
||
if s.network != "tcp" {
|
||
return gnet.Close
|
||
}
|
||
|
||
ws := c.Context().(*player.ClientData).Wsmsg
|
||
if ws.Tcp { //升级失败时候防止缓冲区溢出
|
||
return s.handleTcp(c)
|
||
|
||
}
|
||
|
||
tt, len1 := ws.ReadBufferBytes(c)
|
||
if tt == gnet.Close {
|
||
|
||
return gnet.Close
|
||
}
|
||
|
||
ok, action := ws.Upgrade(c)
|
||
if action != gnet.None { //连接断开
|
||
return action
|
||
}
|
||
if !ok { //升级失败,说明是tcp连接
|
||
ws.Tcp = true
|
||
|
||
return s.handleTcp(c)
|
||
|
||
}
|
||
// fmt.Println(ws.Buf.Bytes())
|
||
c.Discard(len1)
|
||
if ws.Buf.Len() <= 0 {
|
||
return gnet.None
|
||
}
|
||
messages, err := ws.Decode(c)
|
||
if err != nil {
|
||
return gnet.Close
|
||
}
|
||
if messages == nil {
|
||
return
|
||
}
|
||
|
||
for _, msg := range messages {
|
||
t := c.Context().(*player.ClientData)
|
||
//client := conn.RemoteAddr().String()
|
||
s.workerPool.Submit(func() { //TODO 这里可能存在顺序执行问题,待修复
|
||
t.OnEvent(msg.Payload)
|
||
|
||
})
|
||
|
||
}
|
||
|
||
return gnet.None
|
||
}
|
||
|
||
func (s *Server) handleTcp(conn gnet.Conn) (action gnet.Action) {
|
||
if s.discorse && !conn.Context().(*player.ClientData).IsCrossDomain {
|
||
handle(conn)
|
||
}
|
||
conn.Context().(*player.ClientData).IsCrossDomain = true
|
||
for i := 0; i < s.batchRead; i++ {
|
||
|
||
data, err := s.codec.Decode(conn)
|
||
|
||
if err == codec.ErrIncompletePacket {
|
||
break
|
||
}
|
||
if err != nil {
|
||
|
||
return gnet.Close
|
||
|
||
}
|
||
|
||
//cool.Loger.Debug(context.Background(), "原始数据", hex.EncodeToString(data))
|
||
t := conn.Context().(*player.ClientData)
|
||
|
||
err = s.workerPool.Submit(func() { //TODO 这里可能存在顺序执行问题,待修复
|
||
t.OnEvent(data)
|
||
|
||
})
|
||
|
||
}
|
||
|
||
if conn.InboundBuffered() > 0 {
|
||
if err := conn.Wake(nil); err != nil { // wake up the connection manually to avoid missing the leftover data
|
||
cool.Loger.Errorf(context.Background(), "failed to wake up the connection, %v", err)
|
||
return gnet.Close
|
||
}
|
||
}
|
||
return action
|
||
|
||
}
|
||
|
||
// CROSS_DOMAIN 定义跨域策略文件内容
|
||
const CROSS_DOMAIN = "<?xml version=\"1.0\"?><!DOCTYPE cross-domain-policy><cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\x00"
|
||
|
||
// TEXT 定义跨域请求的文本格式
|
||
const TEXT = "<policy-file-request/>\x00"
|
||
|
||
func handle(c gnet.Conn) {
|
||
|
||
// 读取数据并检查是否为跨域请求
|
||
data, err := c.Peek(len(TEXT))
|
||
if err != nil {
|
||
log.Printf("Error reading cross-domain request: %v", err)
|
||
return
|
||
}
|
||
|
||
if string(data) == TEXT { //判断是否是跨域请求
|
||
log.Printf("Received cross-domain request from %s", c.RemoteAddr())
|
||
// 处理跨域请求
|
||
c.Write([]byte(CROSS_DOMAIN))
|
||
c.Discard(len(TEXT))
|
||
|
||
return
|
||
}
|
||
|
||
//return
|
||
}
|