Krakatoa-Earth
/
Backend
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

origin dest added to reply the sender after successful reply of the target dest

master
Alex 2022-02-12 21:19:13 +01:00
parent 78e4b1293b
commit 9a786175c6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/structs/MinecraftClient.go
View File

@ -52,8 +52,8 @@ func (mcClient *MinecraftClient) GenerateMinecraftCmdID() int {
return mcClient.CurrentCmdIDIndexByBackend return mcClient.CurrentCmdIDIndexByBackend
} }
func (mcClient *MinecraftClient) AddMessageToSendQueue(raw []byte, cmdID int, originDest int) { func (mcClient *MinecraftClient) AddMessageToSendQueue(originDest int, originCmdID int, raw []byte, cmdID int) {
mcClient.SendQueueMessages = append(mcClient.SendQueueMessages, &SendQueueMessage{MessageRaw: raw, CmdID: cmdID, TrySendCount: 0, OriginDest: originDest, Time: time.Now()}) mcClient.SendQueueMessages = append(mcClient.SendQueueMessages, &SendQueueMessage{MessageRaw: raw, CmdID: cmdID, TrySendCount: 0, OriginDest: originDest, OriginCmdID: originCmdID, Time: time.Now()})
} }
func (mcClient *MinecraftClient) IsCmdIDInSendMessagesQueue(cmdID int) bool { func (mcClient *MinecraftClient) IsCmdIDInSendMessagesQueue(cmdID int) bool {

2
routers/api/v1/minecraft/minecraft.go
View File

@ -12,7 +12,7 @@ func RestartServer(c *fiber.Ctx) error {
if c.Params("accessKey") == serverConfig.Cfg.Servers.MinecraftServer.AccessKey { if c.Params("accessKey") == serverConfig.Cfg.Servers.MinecraftServer.AccessKey {
logger.Minecraft.Infoln("RestartServer msg", c.Params("serverName"), c.Hostname(), c.IP()) logger.Minecraft.Infoln("RestartServer msg", c.Params("serverName"), c.Hostname(), c.IP())
serverCommunication.SendMessageToMinecraftServer(0, kraProtocol.StatusSend, kraProtocol.DestProxy, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", 33329, c.Params("serverName")) serverCommunication.SendMessageToMinecraftServer(0, 0, kraProtocol.StatusSend, kraProtocol.DestProxy, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", 33329, c.Params("serverName"))
return c.SendStatus(fiber.StatusOK) return c.SendStatus(fiber.StatusOK)
} }

4
serverCommunication/minecraft.go
View File

@ -238,7 +238,7 @@ func SendMessageToServer(dest int, playerUuid string, args string) {
} }
} }
func SendMessageToMinecraftServer(originDest, status int, dest int, playerUuid string, cmdNumber int, args string) error { func SendMessageToMinecraftServer(originDest int, originCmdID int, status int, dest int, playerUuid string, cmdNumber int, args string) error {
cmdID := kraProtocol.DefaultCmdID cmdID := kraProtocol.DefaultCmdID
serverName := getMinecraftServerNameByDest(dest) serverName := getMinecraftServerNameByDest(dest)
@ -263,7 +263,7 @@ func SendMessageToMinecraftServer(originDest, status int, dest int, playerUuid s
} }
if status == kraProtocol.StatusGet { if status == kraProtocol.StatusGet {
mcClient.AddMessageToSendQueue(raw, cmdID, originDest) mcClient.AddMessageToSendQueue(originDest, originCmdID, raw, cmdID)
} }
return nil return nil

2
serverCommunication/web.go
View File

@ -130,7 +130,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt
originDest = kraProtocol.DestMobile originDest = kraProtocol.DestMobile
} }
err = SendMessageToMinecraftServer(originDest, status, dest, uuid, cmdNumber, args) err = SendMessageToMinecraftServer(originDest, cmdID, status, dest, uuid, cmdNumber, args)
if err != nil { if err != nil {
raw := kraProtocol.EncodeWebMessage(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, args) raw := kraProtocol.EncodeWebMessage(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, args)