From 6bfa0b77456b883312a65431dc6a58361ff1653e Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Sun, 14 Jan 2024 20:46:58 -0500 Subject: [PATCH 1/5] Fixed stack overflow error! --- .../src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java | 1 - .../java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java index d2243195..2d67e890 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java @@ -50,7 +50,6 @@ public static boolean isLiveOnline(String hostName) return requests().fetchLiveUserData(hostName).isLiveOnline(); } - /** * * @param hostName profile name of Tiktok user could be found in profile link 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 81709a07..34282237 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java @@ -159,8 +159,8 @@ public void disconnect() { if (liveRoomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) { return; } - webSocketClient.stop(); setState(ConnectionState.DISCONNECTED); + webSocketClient.stop(); } private void setState(ConnectionState connectionState) { From 9da96b4417c2e7dbe43501a14421afe3bc7c675b Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Mon, 15 Jan 2024 12:32:31 -0500 Subject: [PATCH 2/5] Missed one print statement! --- .../java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java index 88b523c5..d17c4129 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java @@ -99,7 +99,6 @@ public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {} try { Proxy proxy = new Proxy(Proxy.Type.SOCKS, proxySettings.next().toSocketAddress()); - System.err.println("Connecting to "+ url); HttpsURLConnection socksConnection = (HttpsURLConnection) url.openConnection(proxy); socksConnection.setSSLSocketFactory(sc.getSocketFactory()); socksConnection.setConnectTimeout(httpClientSettings.getTimeout().toMillisPart()); From 2555edd86f42e9106beb88c7d4d7343840ffe8ba Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Tue, 16 Jan 2024 22:09:56 -0500 Subject: [PATCH 3/5] 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 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 5b32b765..60742a57 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 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"); @@ -116,6 +114,7 @@ public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {} }}, 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 3746bf43..a70ce60d 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 static void main(String[] args) throws Exception { }) .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(); From 7b4590d0a1348216294882f4a464b5e209da5236 Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Thu, 18 Jan 2024 10:51:03 -0500 Subject: [PATCH 4/5] Fixed SimpleExample! --- .../main/java/io/github/jwdeveloper/tiktok/SimpleExample.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..e36586ec 100644 --- a/Examples/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java +++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java @@ -41,7 +41,7 @@ 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 { @@ -160,4 +160,4 @@ private static void showLogo() { """); } -} +} \ No newline at end of file From 8a7b9e801bd323d4733230c6848b4a312f862bac Mon Sep 17 00:00:00 2001 From: kohlerpop1 Date: Thu, 18 Jan 2024 10:58:33 -0500 Subject: [PATCH 5/5] Removed not used SimpleExample imports! --- .../io/github/jwdeveloper/tiktok/SimpleExample.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) 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 e36586ec..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 = "dash4114"; - public static void main(String[] args) throws IOException, InterruptedException { + public static void main(String[] args) throws IOException { showLogo();