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

changed the way sent and received messages are stored

master
Alex 2022-03-18 23:10:04 +01:00
parent 1ca05ff9b1
commit 9d539ba009
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
serverCommunication/minecraft.go
View File

@ -2,7 +2,6 @@ package serverCommunication
import ( import (
"errors" "errors"
"time"
"github.com/gofiber/websocket/v2" "github.com/gofiber/websocket/v2"
"krakatoa.net/backend/modules/cache" "krakatoa.net/backend/modules/cache"
@ -139,34 +138,20 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) {
webCmdID = structs.GenerateWebCmdID(webClient.CurrentVoiceSendMessageCmdIDIndexByBackend) webCmdID = structs.GenerateWebCmdID(webClient.CurrentVoiceSendMessageCmdIDIndexByBackend)
webClient.CurrentVoiceSendMessageCmdIDIndexByBackend = webCmdID 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 } else { // dest mobile
webCmdID = structs.GenerateWebCmdID(webClient.CurrentMobileSendMessageCmdIDIndexByBackend) webCmdID = structs.GenerateWebCmdID(webClient.CurrentMobileSendMessageCmdIDIndexByBackend)
webClient.CurrentMobileSendMessageCmdIDIndexByBackend = webCmdID 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) raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusGet, webCmdID, cmdNumber, args)
if dest == kraProtocol.DestVoice { 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 { } 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 { } else {
raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, 0, cmdNumber, args) raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, 0, cmdNumber, args)

10
serverCommunication/web.go
View File

@ -269,16 +269,6 @@ func generateMobileWebCode() (string, error) {
return string(ret), nil 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 { func getWebClientByConn(conn *websocket.Conn) *structs.WebClient {
for _, client := range cache.WebClients { for _, client := range cache.WebClients {
if client.VoiceConn == conn || client.MobileConn == conn { if client.VoiceConn == conn || client.MobileConn == conn {