huxiaohei/Game
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 优化网络库

Browse Source
This commit is contained in:
DESKTOP-V763RJ7\Administrator
2026-01-03 13:19:43 +08:00
parent a565692217
commit 470f642515
19 changed files with 180 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Server/gateway/app/websocket.go
View File

@@ -6,6 +6,7 @@ import (
"fmt"
"gateway/config"
"gateway/internal/net/ws_gateway"
"github.com/panjf2000/gnet/v2"
"sync"
"time"
)
@@ -31,14 +32,16 @@ func (m *ModuleWebsocketServer) start() error {
go func() {
defer m.wg.Done()
_ = m.server.Run(
log.GetLogger().Named("GNET"),
fmt.Sprintf("tcp4://0.0.0.0:%v", config.Get().Serve.Socket.Web.Port),
true,
0,
gnet.TCPNoDelay,
64*1024,
64*1024,
true,
false,
false,
true,
8,
log.GetLogger().Named("GNET"),
)
}()
return nil

2
Server/gateway/go.mod
View File

@@ -53,7 +53,7 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
github.com/panjf2000/ants/v2 v2.11.3 // indirect
github.com/panjf2000/gnet/v2 v2.9.1 // indirect
github.com/panjf2000/gnet/v2 v2.9.7 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect

2
Server/gateway/go.sum
View File

@@ -116,6 +116,8 @@ github.com/panjf2000/ants/v2 v2.11.3 h1:AfI0ngBoXJmYOpDh9m516vjqoUu2sLrIVgppI9TZ
github.com/panjf2000/ants/v2 v2.11.3/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek=
github.com/panjf2000/gnet/v2 v2.9.1 h1:bKewICy/0xnQ9PMzNaswpe/Ah14w1TrRk91LHTcbIlA=
github.com/panjf2000/gnet/v2 v2.9.1/go.mod h1:WQTxDWYuQ/hz3eccH0FN32IVuvZ19HewEWx0l62fx7E=
github.com/panjf2000/gnet/v2 v2.9.7 h1:6zW7Jl3oAfXwSuh1PxHLndoL2MQRWx0AJR6aaQjxUgA=
github.com/panjf2000/gnet/v2 v2.9.7/go.mod h1:WQTxDWYuQ/hz3eccH0FN32IVuvZ19HewEWx0l62fx7E=
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

1
Server/gateway/internal/handler/ws_handler/client.go
View File

@@ -90,6 +90,7 @@ func (c *Client) CloseClient() {
}
}
// onClose 客户端关闭自动触发
func (c *Client) onClose() {
if c.conn != nil {
_ = c.conn.Close()

46
Server/gateway/internal/net/ws_gateway/server.go
View File

@@ -3,8 +3,9 @@ package ws_gateway
import (
"common/log"
"common/net/socket"
"common/utils"
"fmt"
ws_handler2 "gateway/internal/handler/ws_handler"
"gateway/internal/handler/ws_handler"
"go.uber.org/zap"
"strconv"
"time"
@@ -19,40 +20,49 @@ func (g *GatewayWsServer) OnOpen(conn socket.ISocketConn) ([]byte, socket.Action
return nil, socket.None
}
func (g *GatewayWsServer) OnHandShake(conn socket.ISocketConn) {
func (g *GatewayWsServer) OnHandShake(conn socket.ISocketConn, bytes []byte, callback func(conn socket.ISocketConn, bytes []byte)) socket.Action {
token, ok := conn.GetParam("token").(string)
if !ok || token == "" {
if !ok {
g.logger.Warnf("token is not string")
_ = conn.Close()
return
return socket.Close
}
t, err := strconv.Atoi(token)
if err != nil {
_ = conn.Close()
//claims, err := utils.ParseToken(token, config.Get().Auth.Secret)
//if err != nil {
// g.logger.Warnf("token is invalid")
// return socket.Close
//}
t, _ := strconv.Atoi(token)
claims := utils.Claims{
USN: int64(t),
}
if oldClient := ws_handler2.UserMgr.GetByUSN(int64(t)); oldClient != nil {
oldClient.CloseClient()
}
client := ws_handler2.NewClient(int64(t), conn)
ws_handler2.UserMgr.Add(int64(t), client)
conn.SetParam("client", client)
go func(shResp []byte) {
if oldClient := ws_handler.UserMgr.GetByUSN(claims.USN); oldClient != nil {
oldClient.CloseClient()
}
client := ws_handler.NewClient(claims.USN, conn)
ws_handler.UserMgr.Add(claims.USN, client)
conn.SetParam("client", client)
callback(conn, shResp)
}(bytes)
return socket.None
}
func (g *GatewayWsServer) OnMessage(conn socket.ISocketConn, bytes []byte) socket.Action {
client, ok := conn.GetParam("client").(*ws_handler2.Client)
client, ok := conn.GetParam("client").(*ws_handler.Client)
if !ok || client.USN == 0 {
return socket.Close
}
client.OnEvent(&ws_handler2.ClientEvent{Msg: bytes})
client.OnEvent(&ws_handler.ClientEvent{Msg: bytes})
return socket.None
}
func (g *GatewayWsServer) OnPong(conn socket.ISocketConn) {
client, ok := conn.GetParam("client").(*ws_handler2.Client)
client, ok := conn.GetParam("client").(*ws_handler.Client)
if !ok || client.USN == 0 {
return
}
client.OnEvent(&ws_handler2.PongEvent{})
client.OnEvent(&ws_handler.PongEvent{})
}
func (g *GatewayWsServer) OnClose(_ socket.ISocketConn, _ error) socket.Action {