From 9d539ba009d773ecf234d2d5a195d675a731ae6e Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 18 Mar 2022 23:10:04 +0100 Subject: [PATCH] changed the way sent and received messages are stored --- serverCommunication/minecraft.go | 23 ++++------------------- serverCommunication/web.go | 10 ---------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index b046331..1ed046f 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -2,7 +2,6 @@ package serverCommunication import ( "errors" - "time" "github.com/gofiber/websocket/v2" "krakatoa.net/backend/modules/cache" @@ -139,34 +138,20 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) { webCmdID = structs.GenerateWebCmdID(webClient.CurrentVoiceSendMessageCmdIDIndexByBackend) webClient.CurrentVoiceSendMessageCmdIDIndexByBackend = webCmdID - - logger.Minecraft.Debugln("webCmdID", webCmdID) - - //a := &structs.A{WebCmdID: webCmdID, CmdIDFromMinecraftServer: cmdID, DestFromMinecraftServer: mcClient.Dest} - - //webClient.VoiceCmdIDsByBackend = append(webClient.VoiceCmdIDsByBackend, a) - - //logger.Minecraft.Debugln("VoiceCMDIDsByBackend", webClient.VoiceCmdIDsByBackend) } else { // dest mobile webCmdID = structs.GenerateWebCmdID(webClient.CurrentMobileSendMessageCmdIDIndexByBackend) webClient.CurrentMobileSendMessageCmdIDIndexByBackend = webCmdID - - logger.Minecraft.Debugln("webCmdID", webCmdID) - - //a := &structs.A{WebCmdID: webCmdID, CmdIDFromMinecraftServer: cmdID, DestFromMinecraftServer: mcClient.Dest} - - //webClient.MobileCmdIDsByBackend = append(webClient.MobileCmdIDsByBackend, a) - - //logger.Minecraft.Debugln("MobileCMDIDsByBackend", webClient.MobileCmdIDsByBackend) } raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusGet, webCmdID, cmdNumber, args) if dest == kraProtocol.DestVoice { - webClient.SendVoiceQueueMessages = append(webClient.SendVoiceQueueMessages, &structs.SendQueueMessage{MessageRaw: raw, CmdID: webCmdID, TrySendCount: 0, OriginDest: mcClient.Dest, OriginCmdID: cmdID, Time: time.Now()}) + //webClient.SendVoiceQueueMessages = append(webClient.SendVoiceQueueMessages, &structs.SendQueueMessage{MessageRaw: raw, CmdID: webCmdID, TrySendCount: 0, OriginDest: mcClient.Dest, OriginCmdID: cmdID, Time: time.Now()}) + webClient.AddMessageToVoiceSendQueue(mcClient.Dest, cmdID, raw, webCmdID) } else { - webClient.SendMobileQueueMessages = append(webClient.SendMobileQueueMessages, &structs.SendQueueMessage{MessageRaw: raw, CmdID: webCmdID, TrySendCount: 0, OriginDest: mcClient.Dest, OriginCmdID: cmdID, Time: time.Now()}) + //webClient.SendMobileQueueMessages = append(webClient.SendMobileQueueMessages, &structs.SendQueueMessage{MessageRaw: raw, CmdID: webCmdID, TrySendCount: 0, OriginDest: mcClient.Dest, OriginCmdID: cmdID, Time: time.Now()}) + webClient.AddMessageToMobileSendQueue(mcClient.Dest, cmdID, raw, webCmdID) } } else { raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, 0, cmdNumber, args) diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 664568d..9270fd1 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -269,16 +269,6 @@ func generateMobileWebCode() (string, error) { return string(ret), nil } -/* -func IsMessageInAckQueue(conn *websocket.Conn, cmdID int) bool { - for _, client := range cache.VoiceCmdIDs { - if client.CmdID == cmdID && client.Conn == conn { - return true - } - } - return false -} */ - func getWebClientByConn(conn *websocket.Conn) *structs.WebClient { for _, client := range cache.WebClients { if client.VoiceConn == conn || client.MobileConn == conn {