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 20:43:23 +01:00
parent dbc4d922aa
commit 6e3946c620
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/structs/MinecraftClient.go
View File

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

1
modules/structs/QueueMessage.go
View File

@ -6,5 +6,6 @@ type SendQueueMessage struct {
MessageRaw []byte MessageRaw []byte
CmdID int CmdID int
TrySendCount int TrySendCount int
OriginDest int // This value tells from which destination this message was sent. (example: voice, mobile, backend)
Time time.Time Time time.Time
} }

4
serverCommunication/minecraft.go
View File

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

10
serverCommunication/web.go
View File

@ -123,7 +123,15 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt
// no ack // no ack
if dest == kraProtocol.DestProxy || dest == kraProtocol.DestPlayersCurrentServer { // forwarding message to java / minecraft if dest == kraProtocol.DestProxy || dest == kraProtocol.DestPlayersCurrentServer { // forwarding message to java / minecraft
err = SendMessageToMinecraftServer(status, dest, uuid, cmdNumber, args) var originDest int
if isVoice {
originDest = kraProtocol.DestVoice
} else {
originDest = kraProtocol.DestMobile
}
err = SendMessageToMinecraftServer(originDest, 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)