Skip to content

Commit 9c7b24f

Browse files
committed
Add settings for allowing proxies to be used for working through Websockets.
1 parent 7476a11 commit 9c7b24f

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/ProxyClientSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
@Setter
3434
public class ProxyClientSettings implements Iterator<ProxyData>, Iterable<ProxyData>
3535
{
36-
private boolean enabled, autoDiscard = true, fallback = true;
36+
private boolean enabled, autoDiscard = true, fallback = true, allowWebsocket = true;
3737
private Rotation rotation = Rotation.CONSECUTIVE;
3838
private final List<ProxyData> proxyList = new ArrayList<>();
3939
private int index;

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ public void start(LiveConnectionData.Response connectionData, LiveClient liveCli
7474
tikTokEventHandler,
7575
liveClient);
7676

77-
// ProxyClientSettings proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
78-
// if (proxyClientSettings.isEnabled())
79-
// connectProxy(proxyClientSettings);
80-
// else
81-
connectDefault();
77+
ProxyClientSettings proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
78+
if (proxyClientSettings.isEnabled() && proxyClientSettings.isAllowWebsocket())
79+
connectProxy(proxyClientSettings);
80+
else
81+
connectDefault();
8282
}
8383

8484
private void connectDefault() {
@@ -115,15 +115,14 @@ public X509Certificate[] getAcceptedIssuers() {
115115
}
116116
while (proxySettings.hasNext()) {
117117
ProxyData proxyData = proxySettings.next();
118-
if (!tryProxyConnection(proxySettings, proxyData)) {
119-
if (proxySettings.isAutoDiscard())
120-
proxySettings.remove();
121-
continue;
122-
}
123-
heartbeatTask.run(webSocketClient, clientSettings.getPingInterval());
124-
isConnected = true;
125-
break;
126-
}
118+
if (tryProxyConnection(proxySettings, proxyData)) {
119+
heartbeatTask.run(webSocketClient, clientSettings.getPingInterval());
120+
isConnected = true;
121+
break;
122+
}
123+
if (proxySettings.isAutoDiscard())
124+
proxySettings.remove();
125+
}
127126
if (!isConnected)
128127
throw new TikTokLiveException("Failed to connect to the websocket");
129128
}

0 commit comments

Comments
 (0)