Handle pong message correctly (#241)

RakambdaOrg · Jul 31, 2022 · 1d63faf · 1d63faf
1 parent a1d2f5d
commit 1d63faf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...in/java/fr/raksrinana/channelpointsminer/miner/api/chat/ws/TwitchChatWebSocketClient.java b/...in/java/fr/raksrinana/channelpointsminer/miner/api/chat/ws/TwitchChatWebSocketClient.java
@@ -9,6 +9,7 @@
 import org.java_websocket.WebSocket;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.framing.Framedata;
+import org.java_websocket.framing.PongFrame;
 import org.java_websocket.handshake.ServerHandshake;
 import org.jetbrains.annotations.NotNull;
 import java.net.URI;
@@ -57,6 +58,9 @@ public void onOpen(ServerHandshake serverHandshake){
 	public void onMessage(String messageStr){
 		try(var logContext = LogContext.empty().withSocketId(uuid)){
 			log.trace("Received Chat Websocket message: {}", messageStr.strip());
+			if(messageStr.startsWith("PONG :tmi.twitch.tv")){
+				onWebsocketPong(this, new PongFrame());
+			}
 		}
 		catch(Exception e){
 			log.error("Failed to handle Chat WebSocket message {}", messageStr, e);

diff --git a/...ava/fr/raksrinana/channelpointsminer/miner/api/chat/ws/TwitchChatWebSocketClientTest.java b/...ava/fr/raksrinana/channelpointsminer/miner/api/chat/ws/TwitchChatWebSocketClientTest.java
@@ -11,8 +11,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import java.net.URI;
+import java.time.Duration;
 import java.time.Instant;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -95,6 +97,20 @@ void pongUpdatesHeartbeat(WebsocketMockServer server) throws InterruptedExceptio
 		assertThat(tested.getLastHeartbeat()).isAfter(now);
 	}
 
+	@Test
+	void pongUpdatesHeartbeat2(WebsocketMockServer server) throws InterruptedException{
+		tested.connectBlocking();
+		server.awaitMessage(3);
+		server.reset();
+
+		var now = Instant.now();
+		Thread.sleep(100);
+
+		server.send("PONG :tmi.twitch.tv");
+
+		await().atMost(Duration.ofSeconds(30)).until(() -> tested.getLastHeartbeat().isAfter(now));
+	}
+
 	@Test
 	void sendPing(WebsocketMockServer server) throws InterruptedException{
 		tested.connectBlocking();