Skip to content

Fix clientParams and send cookies when present and not null to specific requests for 18+ livestreams. #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2025
Merged

Fix clientParams and send cookies when present and not null to specific requests for 18+ livestreams. #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ public static Map<String, Object> DefaultClientParams() {
clientParams.put("screen_height", 1152);
clientParams.put("screen_width", 2048);
clientParams.put("tz_name", "Europe/Berlin");
clientParams.put("referer", "https, //www.tiktok.com/");
clientParams.put("root_referer", "https, //www.tiktok.com/");
clientParams.put("referer", "https://www.tiktok.com/");
clientParams.put("root_referer", "https://www.tiktok.com/");
clientParams.put("msToken", "");
clientParams.put("version_code", 180800);
clientParams.put("webcast_sdk_version", "1.3.0");
Expand Down
2 changes: 2 additions & 0 deletions Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public LiveUserData.Response getLiveUserData(LiveUserData.Request request) {
var result = httpFactory.client(url)
.withParam("uniqueId", request.getUserName())
.withParam("sourceType", "54") //MAGIC NUMBER, WHAT 54 means?
.withCookie("sessionid", clientSettings.getSessionId())
.build()
.toJsonResponse();

Expand Down Expand Up @@ -139,6 +140,7 @@ public LiveData.Response getLiveData(LiveData.Request request) {
var url = TIKTOK_URL_WEBCAST + "room/info";
var result = httpFactory.client(url)
.withParam("room_id", request.getRoomId())
.withCookie("sessionid", clientSettings.getSessionId())
.build()
.toJsonResponse();

Expand Down
4 changes: 4 additions & 0 deletions Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ protected HttpRequest prepareGetRequest() {
var requestBuilder = HttpRequest.newBuilder().GET();
requestBuilder.uri(toUri());
requestBuilder.timeout(httpClientSettings.getTimeout());
if (!httpClientSettings.getCookies().isEmpty()) {
String cookieString = httpClientSettings.getCookies().entrySet().stream().map(e -> e.getKey()+"="+e.getValue()).collect(Collectors.joining("; "));
httpClientSettings.getHeaders().put("Cookie", cookieString);
}
httpClientSettings.getHeaders().forEach(requestBuilder::setHeader);

httpClientSettings.getOnRequestCreating().accept(requestBuilder);
Expand Down
3 changes: 2 additions & 1 deletion Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ public HttpClientBuilder withHttpClientSettings(Consumer<HttpClientSettings> con
}

public HttpClientBuilder withCookie(String name, String value) {
httpClientSettings.getCookies().put(name, value);
if (name != null && value != null)
httpClientSettings.getCookies().put(name, value);
return this;
}

Expand Down