From 2555edd86f42e9106beb88c7d4d7343840ffe8ba Mon Sep 17 00:00:00 2001
From: kohlerpop1 <kohlerpop1@gmail.com>
Date: Tue, 16 Jan 2024 22:09:56 -0500
Subject: [PATCH] Moved proxy declaration to inside of try, updated websocket
 version to 1.5.5 from 1.5.4, and cleared up ProxyExample!

---
 Client/pom.xml                                                | 2 +-
 .../jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java   | 3 +--
 .../main/java/io/github/jwdeveloper/tiktok/ProxyExample.java  | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Client/pom.xml b/Client/pom.xml
index ec21e03..f4ba06c 100644
--- a/Client/pom.xml
+++ b/Client/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.4</version>
+            <version>1.5.5</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
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 5b32b76..60742a5 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
@@ -22,7 +22,6 @@
  */
 package io.github.jwdeveloper.tiktok.websocket;
 
-
 import io.github.jwdeveloper.tiktok.*;
 import io.github.jwdeveloper.tiktok.data.dto.ProxyData;
 import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
@@ -105,7 +104,6 @@ public class TikTokWebSocketClient implements SocketClient {
     }
 
     public boolean tryProxyConnection(ProxyClientSettings proxySettings, ProxyData proxyData) {
-        webSocketClient.setProxy(new Proxy(proxySettings.getType(), proxyData.toSocketAddress()));
         try {
             if (proxySettings.getType() == Proxy.Type.SOCKS) {
                 SSLContext sc = SSLContext.getInstance("SSL");
@@ -116,6 +114,7 @@ public class TikTokWebSocketClient implements SocketClient {
                 }}, null);
                 webSocketClient.setSocketFactory(sc.getSocketFactory());
             }
+            webSocketClient.setProxy(new Proxy(proxySettings.getType(), proxyData.toSocketAddress()));
             webSocketClient.connect();
             return true;
         } catch (Exception e)
diff --git a/Examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java b/Examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java
index 3746bf4..a70ce60 100644
--- a/Examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java
+++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java
@@ -38,10 +38,12 @@ public class ProxyExample
             })
             .onConnected((liveClient, event) ->
                 liveClient.getLogger().info("Connected "+liveClient.getRoomInfo().getHostName()))
+            .onComment((liveClient, event) -> liveClient.getLogger().info(event.getUser().getName()+": "+event.getText()))
+            .onLike((liveClient, event) -> liveClient.getLogger().info(event.getUser().getName()+" sent "+event.getLikes()+"x likes!"))
             .onDisconnected((liveClient, event) ->
                 liveClient.getLogger().info("Disconnect reason: "+event.getReason()))
             .onLiveEnded((liveClient, event) ->
-                liveClient.getLogger().info("Live Ended"))
+                liveClient.getLogger().info("Live Ended: "+liveClient.getRoomInfo().getHostName()))
             .onError((liveClient, event) ->
                 event.getException().printStackTrace())
             .buildAndConnect();