From 4a92cf9703f481d0592d87f970833490865c3a94 Mon Sep 17 00:00:00 2001 From: Yuzu Date: Thu, 2 Jan 2025 22:14:51 +0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20use=20plugin=20logger=20for?= =?UTF-8?q?=20websocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kirameki/minikuraVelocity/MinikuraWebSocketClient.kt | 9 +++++---- .../kirameki/minikuraVelocity/utils/WebSocketUtils.kt | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/MinikuraWebSocketClient.kt b/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/MinikuraWebSocketClient.kt index 9cb3683..94fa9f6 100644 --- a/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/MinikuraWebSocketClient.kt +++ b/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/MinikuraWebSocketClient.kt @@ -3,16 +3,17 @@ package cafe.kirameki.minikuraVelocity import com.velocitypowered.api.proxy.ProxyServer import org.java_websocket.client.WebSocketClient import org.java_websocket.handshake.ServerHandshake +import org.slf4j.Logger import java.net.URI import java.time.Duration -class MinikuraWebSocketClient(private val plugin: Main, private val server: ProxyServer, serverUri: URI?) : WebSocketClient(serverUri) { +class MinikuraWebSocketClient(private val plugin: Main, private val logger: Logger, private val server: ProxyServer, serverUri: URI?) : WebSocketClient(serverUri) { override fun onOpen(handshakedata: ServerHandshake) { - println("Connected to server") + logger.info("Connected to websocket") } override fun onMessage(message: String) { - println("Received: $message") + logger.debug("Received: $message") } override fun onError(ex: Exception) { @@ -20,7 +21,7 @@ class MinikuraWebSocketClient(private val plugin: Main, private val server: Prox } override fun onClose(code: Int, reason: String, remote: Boolean) { - println("Disconnected from websocket, reconnecting...") + logger.info("Connection closed, attempting to reconnect...") server.scheduler.buildTask(plugin, Runnable { reconnect() }).delay(Duration.ofMillis(5000)).schedule() } } \ No newline at end of file diff --git a/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/utils/WebSocketUtils.kt b/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/utils/WebSocketUtils.kt index a2e95c6..1cd2054 100644 --- a/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/utils/WebSocketUtils.kt +++ b/plugins/MinikuraVelocity/src/main/kotlin/cafe/kirameki/minikuraVelocity/utils/WebSocketUtils.kt @@ -3,10 +3,11 @@ package cafe.kirameki.minikuraVelocity.utils import cafe.kirameki.minikuraVelocity.Main import cafe.kirameki.minikuraVelocity.MinikuraWebSocketClient import com.velocitypowered.api.proxy.ProxyServer +import org.slf4j.Logger import java.net.URI -fun createWebSocketClient(plugin: Main, server: ProxyServer, websocketUrl: String): MinikuraWebSocketClient { +fun createWebSocketClient(plugin: Main, logger: Logger, server: ProxyServer, websocketUrl: String): MinikuraWebSocketClient { val uri = URI(websocketUrl) - val client = MinikuraWebSocketClient(plugin, server, uri) + val client = MinikuraWebSocketClient(plugin, logger, server, uri) return client }