NextCraft/CoreApp
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复CPU占用问题，添加servers.JOIN,LEAVE,LIST包

Browse Source
This commit is contained in:
lc-official
2025-07-11 02:27:16 +08:00
parent e5e02d2430
commit f5290d8585
13 changed files with 303 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
router/minecraft/server.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.36.6
// protoc v5.29.3
// protoc v6.31.1
// source: server.proto
package minecraft
@ -29,6 +29,9 @@ const (
ServerPacketType_NEW ServerPacketType = 2
ServerPacketType_DELETE ServerPacketType = 3
ServerPacketType_CONNECT ServerPacketType = 4
ServerPacketType_JOIN ServerPacketType = 5
ServerPacketType_LEAVE ServerPacketType = 6
ServerPacketType_LIST ServerPacketType = 7
)
// Enum value maps for ServerPacketType.
@ -39,6 +42,9 @@ var (
2: "NEW",
3: "DELETE",
4: "CONNECT",
5: "JOIN",
6: "LEAVE",
7: "LIST",
}
ServerPacketType_value = map[string]int32{
"PING": 0,
@ -46,6 +52,9 @@ var (
"NEW": 2,
"DELETE": 3,
"CONNECT": 4,
"JOIN": 5,
"LEAVE": 6,
"LIST": 7,
}
)
@ -308,6 +317,102 @@ func (x *ServerConnectPacket) GetPlayer() string {
return ""
}
type ServerPlayerPacket struct {
state protoimpl.MessageState `protogen:"open.v1"`
Player string `protobuf:"bytes,1,opt,name=player,proto3" json:"player,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *ServerPlayerPacket) Reset() {
*x = ServerPlayerPacket{}
mi := &file_server_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ServerPlayerPacket) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ServerPlayerPacket) ProtoMessage() {}
func (x *ServerPlayerPacket) ProtoReflect() protoreflect.Message {
mi := &file_server_proto_msgTypes[4]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use ServerPlayerPacket.ProtoReflect.Descriptor instead.
func (*ServerPlayerPacket) Descriptor() ([]byte, []int) {
return file_server_proto_rawDescGZIP(), []int{4}
}
func (x *ServerPlayerPacket) GetPlayer() string {
if x != nil {
return x.Player
}
return ""
}
type ServerListPacket struct {
state protoimpl.MessageState `protogen:"open.v1"`
ServerId string `protobuf:"bytes,1,opt,name=serverId,proto3" json:"serverId,omitempty"`
Players []string `protobuf:"bytes,2,rep,name=players,proto3" json:"players,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *ServerListPacket) Reset() {
*x = ServerListPacket{}
mi := &file_server_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ServerListPacket) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ServerListPacket) ProtoMessage() {}
func (x *ServerListPacket) ProtoReflect() protoreflect.Message {
mi := &file_server_proto_msgTypes[5]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use ServerListPacket.ProtoReflect.Descriptor instead.
func (*ServerListPacket) Descriptor() ([]byte, []int) {
return file_server_proto_rawDescGZIP(), []int{5}
}
func (x *ServerListPacket) GetServerId() string {
if x != nil {
return x.ServerId
}
return ""
}
func (x *ServerListPacket) GetPlayers() []string {
if x != nil {
return x.Players
}
return nil
}
var File_server_proto protoreflect.FileDescriptor
const file_server_proto_rawDesc = "" +
@ -329,14 +434,22 @@ const file_server_proto_rawDesc = "" +
"\bserverId\x18\x01 \x01(\tR\bserverId\"I\n" +
"\x13ServerConnectPacket\x12\x1a\n" +
"\bserverId\x18\x01 \x01(\tR\bserverId\x12\x16\n" +
"\x06player\x18\x02 \x01(\tR\x06player*H\n" +
"\x06player\x18\x02 \x01(\tR\x06player\",\n" +
"\x12ServerPlayerPacket\x12\x16\n" +
"\x06player\x18\x01 \x01(\tR\x06player\"H\n" +
"\x10ServerListPacket\x12\x1a\n" +
"\bserverId\x18\x01 \x01(\tR\bserverId\x12\x18\n" +
"\aplayers\x18\x02 \x03(\tR\aplayers*g\n" +
"\x10ServerPacketType\x12\b\n" +
"\x04PING\x10\x00\x12\b\n" +
"\x04PONG\x10\x01\x12\a\n" +
"\x03NEW\x10\x02\x12\n" +
"\n" +
"\x06DELETE\x10\x03\x12\v\n" +
"\aCONNECT\x10\x04B\x12Z\x10router/minecraftb\x06proto3"
"\aCONNECT\x10\x04\x12\b\n" +
"\x04JOIN\x10\x05\x12\t\n" +
"\x05LEAVE\x10\x06\x12\b\n" +
"\x04LIST\x10\aB\x12Z\x10router/minecraftb\x06proto3"
var (
file_server_proto_rawDescOnce sync.Once
@ -351,13 +464,15 @@ func file_server_proto_rawDescGZIP() []byte {
}
var file_server_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_server_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_server_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_server_proto_goTypes = []any{
(ServerPacketType)(0), // 0: ServerPacketType
(*ServerPacket)(nil), // 1: ServerPacket
(*ServerNewPacket)(nil), // 2: ServerNewPacket
(*ServerDeletePacket)(nil), // 3: ServerDeletePacket
(*ServerConnectPacket)(nil), // 4: ServerConnectPacket
(*ServerPlayerPacket)(nil), // 5: ServerPlayerPacket
(*ServerListPacket)(nil), // 6: ServerListPacket
}
var file_server_proto_depIdxs = []int32{
0, // 0: ServerPacket.typ:type_name -> ServerPacketType
@ -380,7 +495,7 @@ func file_server_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_server_proto_rawDesc), len(file_server_proto_rawDesc)),
NumEnums: 1,
NumMessages: 4,
NumMessages: 6,
NumExtensions: 0,
NumServices: 0,
},

122
router/minecraft/servers.go
View File

@ -3,6 +3,7 @@ package minecraft
import (
"coreapp/util"
"coreapp/util/ws"
"fmt"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
"google.golang.org/protobuf/proto"
@ -41,14 +42,15 @@ func (typ ServerType) Prefix() string {
}
type Server struct {
Id string `json:"id"`
Name string `json:"name"`
Group string `json:"group"`
Host string `json:"host"`
Port int `json:"port"`
Type ServerType `json:"type"`
Motd string `json:"motd"`
LastHB time.Time
Id string `json:"id"`
Name string `json:"name"`
Group string `json:"group"`
Host string `json:"host"`
Port int `json:"port"`
Type ServerType `json:"type"`
Motd string `json:"motd"`
Players []string `json:"players"`
LastHB time.Time
}
var servers = sync.Map{}
@ -88,11 +90,12 @@ func ServerMiddleware() gin.HandlerFunc {
}
func ServerList(c *gin.Context) {
serverList := make(map[string]*Server)
var serverList []Server
// 遍历 sync.Map
servers.Range(func(key, value interface{}) bool {
serverList[key.(string)] = value.(*Server)
server := value.(*Server)
serverList = append(serverList, *server)
return true // 继续遍历
})
@ -104,12 +107,12 @@ func ServerList(c *gin.Context) {
}
type ServerRegisterData struct {
Name string `json:"name"`
Name string `json:"name,omitempty"`
Host string `json:"host"`
Port int `json:"port"`
Type ServerType `json:"type"`
Group string `json:"group"`
Motd string `json:"motd"`
Group string `json:"group,omitempty"`
Motd string `json:"motd,omitempty"`
}
func ServerRegister(c *gin.Context) {
@ -223,6 +226,23 @@ func ServerMessage(c *gin.Context) {
if c.GetString("serverId") == "PROXY" {
serverProxyConn = wrapped
serverProxyLastHB = time.Now()
servers.Range(func(_, value any) bool {
server := value.(*Server)
newPkt := &ServerNewPacket{
ServerId: server.Id,
Name: server.Name,
Host: server.Host,
Port: int32(server.Port),
Group: server.Group,
Motd: server.Motd,
}
buf, err := serverWrapPacket(ServerPacketType_NEW, newPkt)
if err != nil {
panic(err)
}
wrapped.WriteChan <- ws.Binary(buf)
return true
})
go serverProxyReadLoop(wrapped)
} else {
go serverReadLoop(wrapped, c.GetString("serverId"))
@ -230,6 +250,9 @@ func ServerMessage(c *gin.Context) {
}
func serverReadLoop(conn *ws.Conn, serverId string) {
defer func() {
fmt.Printf("%s closed\n", serverId)
}()
for {
// 使用 Load 读取，避免并发问题
serverVal, ok := servers.Load(serverId)
@ -266,6 +289,43 @@ func serverReadLoop(conn *ws.Conn, serverId string) {
if serverProxyConn != nil {
serverProxyConn.WriteChan <- ws.Binary(msg)
}
case ServerPacketType_JOIN:
var payload ServerPlayerPacket
err := proto.Unmarshal(pkt.GetPayload(), &payload)
if err != nil {
continue
}
server.Players = append(server.Players, payload.Player)
case ServerPacketType_LEAVE:
var payload ServerPlayerPacket
err := proto.Unmarshal(pkt.GetPayload(), &payload)
if err != nil {
continue
}
for i, player := range server.Players {
if player == payload.Player {
server.Players = append(server.Players[:i], server.Players[i+1:]...)
break
}
}
case ServerPacketType_LIST:
var payload ServerListPacket
err := proto.Unmarshal(pkt.GetPayload(), &payload)
if err != nil {
panic(err)
}
reply := &ServerListPacket{
ServerId: payload.ServerId,
}
if s, ok := servers.Load(payload.ServerId); ok {
reply.Players = s.(*Server).Players
buf, err := proto.Marshal(reply)
if err != nil {
panic(err)
}
conn.WriteChan <- ws.Binary(buf)
return
}
}
default:
if conn.IsClosed() {
@ -280,28 +340,26 @@ func serverProxyReadLoop(conn *ws.Conn) {
serverProxyConn = nil
}()
for {
select {
case msg := <-conn.ReadChan:
if msg == nil {
return
msg := <-conn.ReadChan
if msg == nil {
return
}
pkt := &ServerPacket{}
err := proto.Unmarshal(msg, pkt)
if err != nil {
continue
}
switch pkt.GetTyp() {
case ServerPacketType_PING:
serverProxyLastHB = time.Now()
resp := &ServerPacket{
Typ: ServerPacketType_PONG,
}
pkt := &ServerPacket{}
err := proto.Unmarshal(msg, pkt)
buf, err := proto.Marshal(resp)
if err != nil {
panic(err)
}
switch pkt.GetTyp() {
case ServerPacketType_PING:
serverProxyLastHB = time.Now()
resp := &ServerPacket{
Typ: ServerPacketType_PONG,
}
buf, err := proto.Marshal(resp)
if err != nil {
panic(err)
}
conn.WriteChan <- ws.Binary(buf)
}
conn.WriteChan <- ws.Binary(buf)
}
}
}
@ -312,7 +370,7 @@ var serverUpgrader = websocket.Upgrader{
}
func generateServerId(prefix string) string {
return string(prefix) + util.RandStringNumber(rand.Intn(2)+1) + strings.ToUpper(util.RandStringAlphabet(rand.Intn(2)+1))
return prefix + util.RandStringNumber(rand.Intn(2)+1) + strings.ToUpper(util.RandStringAlphabet(rand.Intn(2)+1))
}
var serverHBTicker = time.NewTicker(time.Second * 5)

9
router/router.go
View File

@ -2,12 +2,19 @@ package router
import (
"coreapp/router/minecraft"
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
)
func Route(server *gin.Engine) {
server.Use(cors.New(cors.Config{
AllowAllOrigins: true,
AllowCredentials: true,
AllowMethods: []string{"*"},
ExposeHeaders: []string{"*"},
AllowHeaders: []string{"*"},
}))
rootGroup := server.Group("/")
minecraftGroup := rootGroup.Group("/minecraft")
{
servers := minecraftGroup.Group("/servers")