Merge pull request #125 from jwdeveloper/develop-1.10.3

Change websocket connection logic!

Author: kohlerpop1

API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java

@@ -28,4 +28,5 @@
 public interface LiveSocketClient {
     void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient);
     void stop();
-}
+    boolean isConnected();
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java

@@ -154,12 +154,11 @@ public void tryConnect() {
     }
 
     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,17 +173,16 @@ public void publishEvent(TikTokEvent event) {
     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));
         var message = builder.build();
         messageHandler.handleSingleMessage(this, message);
     }
 
-
     public void connectAsync(Consumer<LiveClient> onConnection) {
         connectAsync().thenAccept(onConnection);
     }

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java

@@ -26,9 +26,7 @@
 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 TikTokWebSocketClient(
         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 @@ private void connectDefault() {
         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 X509Certificate[] getAcceptedIssuers() {
             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 boolean tryProxyConnection(ProxyClientSettings proxySettings, ProxyData p
     }
 
     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();
     }
 }

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java

@@ -45,9 +45,12 @@ public void start(LiveConnectionData.Response webcastResponse, LiveClient tikTok
 
     @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;
     }
 }