From a2e34202d31e4dd6f2d581553de99fa0560d59d7 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 15 Mar 2022 20:43:51 +0100 Subject: [PATCH] debug --- serverCommunication/minecraft.go | 2 ++ serverCommunication/web.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index 7e2f572..a7d3b3a 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -148,6 +148,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) { logger.Minecraft.Debugln("webCmdID", webCmdID) + // TODO: Get minecraft server dest from func a := &structs.A{WebCmdID: webCmdID, CmdIDFromMinecraftServer: cmdID, DestFromMinecraftServer: 10} webClient.VoiceCmdIDsByBackend = append(webClient.VoiceCmdIDsByBackend, a) @@ -160,6 +161,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) { logger.Minecraft.Debugln("webCmdID", webCmdID) + // TODO: Get minecraft server dest from func a := &structs.A{WebCmdID: webCmdID, CmdIDFromMinecraftServer: cmdID, DestFromMinecraftServer: 10} webClient.MobileCmdIDsByBackend = append(webClient.MobileCmdIDsByBackend, a) diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 678e4d9..63d1b27 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -31,10 +31,13 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt if status == kraProtocol.StatusReply { if isVoice { + logger.WebVoice.Debugln("Reply from Web Voice") for _, data := range webClient.VoiceCmdIDsByBackend { if data.WebCmdID == cmdID { // forward to target dest mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(data.DestFromMinecraftServer)) + logger.WebVoice.Debugln("Forwarding reply from web voice to mc client", mcClient.Name, "cmdID", cmdID) + raw = kraProtocol.EncodeJavaMessage(kraProtocol.StatusReply, data.CmdIDFromMinecraftServer, 0, webClient.Uuid, 0, "") err = mcClient.SendBinaryMessage(raw) @@ -57,10 +60,13 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt webClient.RemoveVoiceCmdID(cmdID) } } else { + logger.WebMobile.Debugln("Reply from Web Mobile") for _, data := range webClient.MobileCmdIDsByBackend { if data.WebCmdID == cmdID { // forward to target dest mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(data.DestFromMinecraftServer)) + logger.WebMobile.Debugln("Forwarding reply from web mobile to mc client", mcClient.Name, "cmdID", cmdID) + raw = kraProtocol.EncodeJavaMessage(kraProtocol.StatusReply, data.CmdIDFromMinecraftServer, 0, webClient.Uuid, 0, "") err = mcClient.SendBinaryMessage(raw)