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

Push for proxy test pt 2!

Browse Source
This commit is contained in:
kohlerpop1
2024-01-11 11:35:34 -05:00
committed by Jacek W
parent bc3386d21e
commit 2c12b71e99
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java
View File

@@ -182,7 +182,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
var optionalResponse = httpFactory var optionalResponse = httpFactory
.clientEmpty(signedUrl) .clientEmpty(signedUrl)
.build() .build()
.toResponse(HttpResponse.BodyHandlers.ofByteArray()); .toResponse();
if (optionalResponse.isEmpty()) { if (optionalResponse.isEmpty()) {
throw new TikTokSignServerException("Unable to get websocket connection credentials"); throw new TikTokSignServerException("Unable to get websocket connection credentials");
} }

9
Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java
View File

@@ -39,7 +39,7 @@ public class HttpClient {
protected final String url; protected final String url;
private final Pattern pattern = Pattern.compile("charset=(.*?)(?=&|$)"); private final Pattern pattern = Pattern.compile("charset=(.*?)(?=&|$)");
public <T> Optional<HttpResponse<T>> toResponse(HttpResponse.BodyHandler<T> bodyHandler) { public Optional<HttpResponse<byte[]>> toResponse() {
var client = prepareClient(); var client = prepareClient();
var request = prepareGetRequest(); var request = prepareGetRequest();
try { try {
@@ -55,14 +55,15 @@ public class HttpClient {
} }
public Optional<String> toJsonResponse() { public Optional<String> toJsonResponse() {
var optional = toResponse(HttpResponse.BodyHandlers.ofString()); var optional = toResponse();
if (optional.isEmpty()) { if (optional.isEmpty()) {
return Optional.empty(); return Optional.empty();
} }
var response = optional.get(); var response = optional.get();
var body = response.body(); var body = response.body();
return Optional.of(body); var charset = charsetFrom(response.headers());
return Optional.of(new String(body,charset));
} }
private Charset charsetFrom(HttpHeaders headers) { private Charset charsetFrom(HttpHeaders headers) {
@@ -80,7 +81,7 @@ public class HttpClient {
} }
public Optional<byte[]> toBinaryResponse() { public Optional<byte[]> toBinaryResponse() {
var optional = toResponse(HttpResponse.BodyHandlers.ofByteArray()); var optional = toResponse();
if (optional.isEmpty()) { if (optional.isEmpty()) {
return Optional.empty(); return Optional.empty();
} }