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

moved dest into kraProtocol

master
Alex 2021-12-27 22:43:55 +01:00
parent 6e11457c3d
commit 34f012e999
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
serverCommunication/web.go
View File

@ -69,7 +69,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
} }
} }
if dest == DestProxy || dest == DestPlayersCurrentServer { // forwarding message to java / minecraft if dest == kraProtocol.DestProxy || dest == kraProtocol.DestPlayersCurrentServer { // forwarding message to java / minecraft
connForDest := getConnForDest(dest, uuid) connForDest := getConnForDest(dest, uuid)
raw = kraProtocol.SendMessageToJava(status, cmdID, dest, uuid, cmdNumber, args) raw = kraProtocol.SendMessageToJava(status, cmdID, dest, uuid, cmdNumber, args)
@ -81,7 +81,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
} }
} else { // web } else { // web
if isVoice { // message from voice if isVoice { // message from voice
if dest == DestMobile { // forwarding message to mobile if dest == kraProtocol.DestMobile { // forwarding message to mobile
connForDest := getConnForDest(dest, uuid) // get conn for mobile connForDest := getConnForDest(dest, uuid) // get conn for mobile
if connForDest != nil { // mobile is connected if connForDest != nil { // mobile is connected
@ -101,7 +101,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
logger.WebVoice.Warnln("write:", err) logger.WebVoice.Warnln("write:", err)
} }
} }
} else if dest == DestBackend { } else if dest == kraProtocol.DestBackend {
resArgs := voiceCommandHandler(cmdNumber, uuid) resArgs := voiceCommandHandler(cmdNumber, uuid)
if status == kraProtocol.StatusGet { if status == kraProtocol.StatusGet {
@ -116,7 +116,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
} }
} }
} else { // message from mobile } else { // message from mobile
if dest == DestVoice { // forwarding message to voice if dest == kraProtocol.DestVoice { // forwarding message to voice
connForDest := getConnForDest(dest, uuid) // get conn for voice connForDest := getConnForDest(dest, uuid) // get conn for voice
if connForDest != nil { // voice connected if connForDest != nil { // voice connected
@ -136,7 +136,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
logger.WebMobile.Warnln("write:", err) logger.WebMobile.Warnln("write:", err)
} }
} }
} else if dest == DestBackend { } else if dest == kraProtocol.DestBackend {
resArgs := mobileCommandHandler(cmdNumber) resArgs := mobileCommandHandler(cmdNumber)
if status == kraProtocol.StatusGet { if status == kraProtocol.StatusGet {

4
servers/web/socketHub.go
View File

@ -69,13 +69,13 @@ func RunHub() {
client.MobileCmdIDs = []int{} client.MobileCmdIDs = []int{}
logger.Web.Println("delete mobileConn", client) logger.Web.Println("delete mobileConn", client)
serverCommunication.SendMessageToServer(serverCommunication.DestProxy, uuid, "1") serverCommunication.SendMessageToServer(kraProtocol.DestProxy, uuid, "1")
} else if client.VoiceConn == connection { } else if client.VoiceConn == connection {
client.VoiceConn = nil client.VoiceConn = nil
client.VoiceCmdIDs = []int{} client.VoiceCmdIDs = []int{}
logger.Web.Println("delete voiceConn", client) logger.Web.Println("delete voiceConn", client)
serverCommunication.SendMessageToServer(serverCommunication.DestProxy, uuid, "2") serverCommunication.SendMessageToServer(kraProtocol.DestProxy, uuid, "2")
} }
logger.Web.Println("client after updating", client) logger.Web.Println("client after updating", client)