Merge pull request #49 from kohlerpop1/fixes-updates

Fixed SimpleExample name and imports!
This commit is contained in:
Jacek W
2024-01-19 19:04:03 +01:00
committed by GitHub
4 changed files with 25 additions and 40 deletions

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>

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;
@@ -107,7 +106,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");
@@ -124,6 +122,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) {

View File

@@ -27,31 +27,26 @@ import java.net.Proxy;
public class ProxyExample { public class ProxyExample {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
TikTokLive.newClient(SimpleExample.TIKTOK_HOSTNAME) TikTokLive.newClient(SimpleExample.TIKTOK_HOSTNAME)
.configure(clientSettings -> { .configure(clientSettings -> {
clientSettings.setPrintToConsole(true); clientSettings.setPrintToConsole(true);
clientSettings.getHttpSettings().configureProxy(proxySettings -> { clientSettings.getHttpSettings().configureProxy(proxySettings -> {
proxySettings.setOnProxyUpdated(proxyData -> System.err.println("Next proxy: " + proxyData.toString())); proxySettings.setOnProxyUpdated(proxyData -> System.err.println("Next proxy: " + proxyData.toString()));
proxySettings.setType(Proxy.Type.SOCKS); proxySettings.setType(Proxy.Type.SOCKS);
proxySettings.addProxy("localhost", 8080); proxySettings.addProxy("localhost", 8080);
}); });
}) })
.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) ->
}) liveClient.getLogger().info("Live Ended: "+liveClient.getRoomInfo().getHostName()))
.onLiveEnded((liveClient, event) -> .onError((liveClient, event) ->
{ event.getException().printStackTrace())
liveClient.getLogger().info("Live Ended"); .buildAndConnect();
})
.onError((liveClient, event) ->
{
event.getException().printStackTrace();
})
.buildAndConnect();
System.in.read(); System.in.read();
} }
} }

View File

@@ -23,27 +23,18 @@
package io.github.jwdeveloper.tiktok; package io.github.jwdeveloper.tiktok;
import io.github.jwdeveloper.tiktok.data.events.TikTokSubNotifyEvent; 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.envelop.TikTokChestEvent;
import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent; 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.ConsoleColors;
import io.github.jwdeveloper.tiktok.utils.JsonUtil;
import java.io.IOException; 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.time.Duration;
import java.util.HashMap;
import java.util.logging.Level; import java.util.logging.Level;
public class SimpleExample { 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(); showLogo();
@@ -160,4 +151,4 @@ public class SimpleExample {
"""); """);
} }
} }