diff options
7 files changed, 35 insertions, 28 deletions
diff --git a/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/chat/handler/ChannelMessageHandler.kt b/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/chat/handler/ChannelMessageHandler.kt index 985f321..4cfd061 100644 --- a/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/chat/handler/ChannelMessageHandler.kt +++ b/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/chat/handler/ChannelMessageHandler.kt @@ -75,7 +75,7 @@ class ChannelMessageHandler( } } - logger.info("Channel Message from ${player.name} in ${context.channel.name}: $message") + logger.debug("Channel Message from {} in {}: {}", player.name, context.channel.name, message) // Log message to file if logging is enabled messageLogger?.let { diff --git a/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerChatManager.kt b/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerChatManager.kt index 2f2bde0..19668be 100644 --- a/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerChatManager.kt +++ b/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerChatManager.kt @@ -69,7 +69,7 @@ class CrossServerChatManager( PluginMessageChannel.ID, PluginMessageCodec.encode(globalChatMessage), ) - logger.info("Sent global chat message to Velocity: messageId=$messageId, player=$playerName") + logger.fine { "Sent global chat message to Velocity: messageId=$messageId, player=$playerName" } } else { logger.warning("Cannot send global chat message: player $playerId not found") } @@ -109,10 +109,10 @@ class CrossServerChatManager( }, ) - logger.info( + logger.fine { "Broadcasted global chat message from ${message.serverName}: " + - "player=${message.playerName}, messageId=${message.messageId}", - ) + "player=${message.playerName}, messageId=${message.messageId}" + } } catch (e: Exception) { logger.log(Level.SEVERE, "Failed to handle incoming global chat message", e) } diff --git a/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerDirectMessageManager.kt b/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerDirectMessageManager.kt index b35f6a5..76cc879 100644 --- a/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerDirectMessageManager.kt +++ b/platform-paper/src/main/kotlin/dev/m1sk9/lunaticChat/paper/velocity/CrossServerDirectMessageManager.kt @@ -69,10 +69,10 @@ class CrossServerDirectMessageManager( ) sender.sendPluginMessage(plugin, PluginMessageChannel.ID, PluginMessageCodec.encode(relay)) - logger.info( + logger.fine { "Sent direct message to Velocity: messageId=$messageId, " + - "target=$targetName@$targetServerName", - ) + "target=$targetName@$targetServerName" + } } catch (e: Exception) { logger.log(Level.SEVERE, "Failed to send cross-server direct message", e) } diff --git a/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelay.kt b/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelay.kt index f47db70..bebc7b9 100644 --- a/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelay.kt +++ b/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelay.kt @@ -43,9 +43,12 @@ class CrossServerChatRelay( relayCount++ } - logger.info( - "Relayed global chat message from ${message.serverName} to $relayCount servers " + - "(messageId=${message.messageId}, player=${message.playerName})", + logger.debug( + "Relayed global chat message from {} to {} servers (messageId={}, player={})", + message.serverName, + relayCount, + message.messageId, + message.playerName, ) } catch (e: Exception) { logger.error("Failed to relay global chat message: ${e.message}", e) diff --git a/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerDirectMessageRelay.kt b/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerDirectMessageRelay.kt index 3746395..f9cc52d 100644 --- a/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerDirectMessageRelay.kt +++ b/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerDirectMessageRelay.kt @@ -62,9 +62,13 @@ class CrossServerDirectMessageRelay( } targetServer.sendPluginMessage(CHANNEL, PluginMessageCodec.encode(message)) - logger.info( - "Relayed direct message from ${message.senderName}@${message.sourceServerName} " + - "to ${message.targetName}@${message.targetServerName} (messageId=${message.messageId})", + logger.debug( + "Relayed direct message from {}@{} to {}@{} (messageId={})", + message.senderName, + message.sourceServerName, + message.targetName, + message.targetServerName, + message.messageId, ) } catch (e: Exception) { logger.error("Failed to relay direct message: ${e.message}", e) diff --git a/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/PluginMessageHandler.kt b/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/PluginMessageHandler.kt index 6b40a7e..aa0cc07 100644 --- a/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/PluginMessageHandler.kt +++ b/platform-velocity/src/main/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/PluginMessageHandler.kt @@ -170,9 +170,11 @@ class PluginMessageHandler( connection: ServerConnection, message: PluginMessage.GlobalChatMessage, ) { - logger.info( - "Received global chat message from ${connection.serverInfo.name}: " + - "messageId=${message.messageId}, player=${message.playerName}", + logger.debug( + "Received global chat message from {}: messageId={}, player={}", + connection.serverInfo.name, + message.messageId, + message.playerName, ) crossServerChatRelay.relayGlobalMessage(message, connection.server) diff --git a/platform-velocity/src/test/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelayTest.kt b/platform-velocity/src/test/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelayTest.kt index 50b0db2..1cd5fbf 100644 --- a/platform-velocity/src/test/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelayTest.kt +++ b/platform-velocity/src/test/kotlin/dev/m1sk9/lunaticChat/velocity/messaging/CrossServerChatRelayTest.kt @@ -4,11 +4,14 @@ import com.velocitypowered.api.proxy.ProxyServer import com.velocitypowered.api.proxy.messages.ChannelIdentifier import com.velocitypowered.api.proxy.server.RegisteredServer import dev.m1sk9.lunaticChat.engine.protocol.PluginMessage +import dev.m1sk9.lunaticChat.engine.protocol.PluginMessageCodec import io.mockk.every import io.mockk.mockk +import io.mockk.slot import io.mockk.verify import org.slf4j.Logger import kotlin.test.Test +import kotlin.test.assertEquals class CrossServerChatRelayTest { private fun createRelay(): Triple<CrossServerChatRelay, ProxyServer, Logger> { @@ -70,7 +73,7 @@ class CrossServerChatRelayTest { @Test fun `relayGlobalMessage with only source server should relay to zero`() { - val (relay, proxyServer, logger) = createRelay() + val (relay, proxyServer, _) = createRelay() val sourceServer = createRegisteredServer("lobby") every { proxyServer.allServers } returns listOf(sourceServer) @@ -78,27 +81,22 @@ class CrossServerChatRelayTest { relay.relayGlobalMessage(createTestMessage(), sourceServer) verify(exactly = 0) { sourceServer.sendPluginMessage(any<ChannelIdentifier>(), any<ByteArray>()) } - verify { logger.info(match { it.contains("0 servers") }) } } @Test - fun `relayGlobalMessage should log with messageId and playerName`() { - val (relay, proxyServer, logger) = createRelay() + fun `relayGlobalMessage should forward the message unchanged`() { + val (relay, proxyServer, _) = createRelay() val sourceServer = createRegisteredServer("lobby") val targetServer = createRegisteredServer("survival") + val relayed = slot<ByteArray>() every { proxyServer.allServers } returns listOf(sourceServer, targetServer) + every { targetServer.sendPluginMessage(any<ChannelIdentifier>(), capture(relayed)) } returns true val message = createTestMessage(messageId = "test-msg-123") relay.relayGlobalMessage(message, sourceServer) - verify { - logger.info( - match { msg -> - msg.contains("test-msg-123") && msg.contains("TestPlayer") - }, - ) - } + assertEquals(message, PluginMessageCodec.decode(relayed.captured)) } @Test |