diff --git a/Client/pom.xml b/Client/pom.xml index ec21e033..f4ba06c3 100644 --- a/Client/pom.xml +++ b/Client/pom.xml @@ -39,7 +39,7 @@ org.java-websocket Java-WebSocket - 1.5.4 + 1.5.5 org.testng 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 8e655479..365fcc33 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; @@ -107,7 +106,6 @@ public void connectProxy(ProxyClientSettings proxySettings) { } 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"); @@ -124,6 +122,7 @@ public X509Certificate[] getAcceptedIssuers() { }}, 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 9c140cc0..c9113547 100644 --- a/Examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java +++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java @@ -27,31 +27,26 @@ public class ProxyExample { public static void main(String[] args) throws Exception { TikTokLive.newClient(SimpleExample.TIKTOK_HOSTNAME) - .configure(clientSettings -> { - clientSettings.setPrintToConsole(true); - clientSettings.getHttpSettings().configureProxy(proxySettings -> { - proxySettings.setOnProxyUpdated(proxyData -> System.err.println("Next proxy: " + proxyData.toString())); - proxySettings.setType(Proxy.Type.SOCKS); - proxySettings.addProxy("localhost", 8080); - }); - }) - .onConnected((liveClient, event) -> - { - liveClient.getLogger().info("Connected " + liveClient.getRoomInfo().getHostName()); - }) - .onDisconnected((liveClient, event) -> - { - liveClient.getLogger().info("Disconnect reason: " + event.getReason()); - }) - .onLiveEnded((liveClient, event) -> - { - liveClient.getLogger().info("Live Ended"); - }) - .onError((liveClient, event) -> - { - event.getException().printStackTrace(); - }) - .buildAndConnect(); + .configure(clientSettings -> { + clientSettings.setPrintToConsole(true); + clientSettings.getHttpSettings().configureProxy(proxySettings -> { + proxySettings.setOnProxyUpdated(proxyData -> System.err.println("Next proxy: " + proxyData.toString())); + proxySettings.setType(Proxy.Type.SOCKS); + proxySettings.addProxy("localhost", 8080); + }); + }) + .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.getRoomInfo().getHostName())) + .onError((liveClient, event) -> + event.getException().printStackTrace()) + .buildAndConnect(); + System.in.read(); } } \ No newline at end of file diff --git a/Examples/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java b/Examples/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java index e1df391a..858ff8f5 100644 --- a/Examples/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java +++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java @@ -23,27 +23,18 @@ package io.github.jwdeveloper.tiktok; import io.github.jwdeveloper.tiktok.data.events.TikTokSubNotifyEvent; -import io.github.jwdeveloper.tiktok.data.events.TikTokSubscribeEvent; import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent; import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; -import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException; -import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage; import io.github.jwdeveloper.tiktok.utils.ConsoleColors; -import io.github.jwdeveloper.tiktok.utils.JsonUtil; import java.io.IOException; -import java.net.URI; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; import java.time.Duration; -import java.util.HashMap; import java.util.logging.Level; public class SimpleExample { - public static String TIKTOK_HOSTNAME = "dash4214"; + public static String TIKTOK_HOSTNAME = "dash4114"; - public static void main(String[] args) throws IOException, InterruptedException { + public static void main(String[] args) throws IOException { showLogo(); @@ -160,4 +151,4 @@ private static void showLogo() { """); } -} +} \ No newline at end of file