From b9eb0eba9311da12e944d0188f549c8091e66251 Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Sun, 4 May 2025 21:59:22 -0400 Subject: [PATCH] Removal of debug print statements! --- .../tiktok/websocket/LiveSocketClient.java | 3 ++- .../jwdeveloper/tiktok/TikTokLiveClient.java | 14 +++++------ .../websocket/TikTokWebSocketClient.java | 25 ++++++++----------- .../TikTokWebSocketOfflineClient.java | 11 +++++--- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java b/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java index 473095a..136d95d 100644 --- a/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java +++ b/API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java @@ -28,4 +28,5 @@ import io.github.jwdeveloper.tiktok.live.LiveClient; public interface LiveSocketClient { void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient); void stop(); -} + boolean isConnected(); +} \ No newline at end of file diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java index 85a0f4e..01f50ce 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java @@ -154,12 +154,11 @@ public class TikTokLiveClient implements LiveClient } public void disconnect() { - if (roomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) { - return; - } - setState(ConnectionState.DISCONNECTED); - webSocketClient.stop(); - } + if (webSocketClient.isConnected()) + webSocketClient.stop(); + if (!roomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) + setState(ConnectionState.DISCONNECTED); + } private void setState(ConnectionState connectionState) { logger.info("TikTokLive client state: " + connectionState.name()); @@ -174,9 +173,9 @@ public class TikTokLiveClient implements LiveClient public void publishMessage(String webcastMessageName, String payloadBase64) { this.publishMessage(webcastMessageName, Base64.getDecoder().decode(payloadBase64)); } + @Override public void publishMessage(String webcastMessageName, byte[] payload) { - var builder = ProtoMessageFetchResult.BaseProtoMessage.newBuilder(); builder.setMethod(webcastMessageName); builder.setPayload(ByteString.copyFrom(payload)); @@ -184,7 +183,6 @@ public class TikTokLiveClient implements LiveClient messageHandler.handleSingleMessage(this, message); } - public void connectAsync(Consumer onConnection) { connectAsync().thenAccept(onConnection); } diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java index 9b91480..19dd7b4 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java @@ -26,9 +26,7 @@ import io.github.jwdeveloper.tiktok.data.dto.ProxyData; import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData; import io.github.jwdeveloper.tiktok.data.settings.*; import io.github.jwdeveloper.tiktok.exceptions.*; -import io.github.jwdeveloper.tiktok.live.LiveClient; -import io.github.jwdeveloper.tiktok.live.LiveEventsHandler; -import io.github.jwdeveloper.tiktok.live.LiveMessagesHandler; +import io.github.jwdeveloper.tiktok.live.*; import org.java_websocket.client.WebSocketClient; import javax.net.ssl.*; @@ -42,7 +40,6 @@ public class TikTokWebSocketClient implements LiveSocketClient { private final LiveEventsHandler tikTokEventHandler; private final WebSocketHeartbeatTask heartbeatTask; private WebSocketClient webSocketClient; - private boolean isConnected; public TikTokWebSocketClient( LiveClientSettings clientSettings, @@ -54,14 +51,12 @@ public class TikTokWebSocketClient implements LiveSocketClient { this.messageHandler = messageHandler; this.tikTokEventHandler = tikTokEventHandler; this.heartbeatTask = heartbeatTask; - isConnected = false; } @Override public void start(LiveConnectionData.Response connectionData, LiveClient liveClient) { - if (isConnected) { - stop(); - } + if (isConnected()) + stop(); messageHandler.handle(liveClient, connectionData.getWebcastResponse()); @@ -85,9 +80,7 @@ public class TikTokWebSocketClient implements LiveSocketClient { try { webSocketClient.connect(); heartbeatTask.run(webSocketClient, clientSettings.getPingInterval()); - isConnected = true; } catch (Exception e) { - isConnected = false; throw new TikTokLiveException("Failed to connect to the websocket", e); } } @@ -117,13 +110,12 @@ public class TikTokWebSocketClient implements LiveSocketClient { ProxyData proxyData = proxySettings.next(); if (tryProxyConnection(proxySettings, proxyData)) { heartbeatTask.run(webSocketClient, clientSettings.getPingInterval()); - isConnected = true; break; } if (proxySettings.isAutoDiscard()) proxySettings.remove(); } - if (!isConnected) + if (!isConnected()) throw new TikTokLiveException("Failed to connect to the websocket"); } @@ -138,11 +130,14 @@ public class TikTokWebSocketClient implements LiveSocketClient { } public void stop() { - if (isConnected && webSocketClient != null && webSocketClient.isOpen()) { - webSocketClient.closeConnection(0, ""); + if (isConnected()) { + webSocketClient.close(); heartbeatTask.stop(); } webSocketClient = null; - isConnected = false; + } + + public boolean isConnected() { + return webSocketClient != null && webSocketClient.isOpen(); } } \ No newline at end of file diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java index f345d7d..2ff067e 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java @@ -45,9 +45,12 @@ public class TikTokWebSocketOfflineClient implements LiveSocketClient { @Override public void stop() { - if (liveClient == null) { - return; - } - handler.publish(liveClient, new TikTokDisconnectedEvent("Stopping")); + if (liveClient != null) + handler.publish(liveClient, new TikTokDisconnectedEvent("Stopping")); + } + + @Override + public boolean isConnected() { + return false; } } \ No newline at end of file