Smartcraft-Media-Tech/TikTokLiveJava
1
0
Fork 0
mirror of https://github.com/jwdeveloper/TikTokLiveJava.git synced 2026-02-27 16:59:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved proxy declaration to inside of try, updated websocket version to 1.5.5 from 1.5.4, and cleared up ProxyExample!

Browse Source
This commit is contained in:
kohlerpop1
2024-01-16 22:09:56 -05:00
parent 9da96b4417
commit 2555edd86f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/pom.xml
View File

@@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>org.java-websocket</groupId> <groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId> <artifactId>Java-WebSocket</artifactId>
<version>1.5.4</version> <version>1.5.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>

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

@@ -22,7 +22,6 @@
*/ */
package io.github.jwdeveloper.tiktok.websocket; package io.github.jwdeveloper.tiktok.websocket;
import io.github.jwdeveloper.tiktok.*; import io.github.jwdeveloper.tiktok.*;
import io.github.jwdeveloper.tiktok.data.dto.ProxyData; import io.github.jwdeveloper.tiktok.data.dto.ProxyData;
import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData; import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
@@ -105,7 +104,6 @@ public class TikTokWebSocketClient implements SocketClient {
} }
public boolean tryProxyConnection(ProxyClientSettings proxySettings, ProxyData proxyData) { public boolean tryProxyConnection(ProxyClientSettings proxySettings, ProxyData proxyData) {
webSocketClient.setProxy(new Proxy(proxySettings.getType(), proxyData.toSocketAddress()));
try { try {
if (proxySettings.getType() == Proxy.Type.SOCKS) { if (proxySettings.getType() == Proxy.Type.SOCKS) {
SSLContext sc = SSLContext.getInstance("SSL"); SSLContext sc = SSLContext.getInstance("SSL");
@@ -116,6 +114,7 @@ public class TikTokWebSocketClient implements SocketClient {
}}, null); }}, null);
webSocketClient.setSocketFactory(sc.getSocketFactory()); webSocketClient.setSocketFactory(sc.getSocketFactory());
} }
webSocketClient.setProxy(new Proxy(proxySettings.getType(), proxyData.toSocketAddress()));
webSocketClient.connect(); webSocketClient.connect();
return true; return true;
} catch (Exception e) } catch (Exception e)

4
Examples/src/main/java/io/github/jwdeveloper/tiktok/ProxyExample.java
View File

@@ -38,10 +38,12 @@ public class ProxyExample
}) })
.onConnected((liveClient, event) -> .onConnected((liveClient, event) ->
liveClient.getLogger().info("Connected "+liveClient.getRoomInfo().getHostName())) 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) -> .onDisconnected((liveClient, event) ->
liveClient.getLogger().info("Disconnect reason: "+event.getReason())) liveClient.getLogger().info("Disconnect reason: "+event.getReason()))
.onLiveEnded((liveClient, event) -> .onLiveEnded((liveClient, event) ->
liveClient.getLogger().info("Live Ended")) liveClient.getLogger().info("Live Ended: "+liveClient.getRoomInfo().getHostName()))
.onError((liveClient, event) -> .onError((liveClient, event) ->
event.getException().printStackTrace()) event.getException().printStackTrace())
.buildAndConnect(); .buildAndConnect();