Push for proxy test pt 2!

This commit is contained in:
kohlerpop1
2024-01-11 11:35:34 -05:00
committed by Jacek W
parent bc8c56982f
commit a89e2c2e08
2 changed files with 6 additions and 5 deletions

View File

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

View File

@@ -39,7 +39,7 @@ public class HttpClient {
protected final String url;
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 request = prepareGetRequest();
try {
@@ -55,14 +55,15 @@ public class HttpClient {
}
public Optional<String> toJsonResponse() {
var optional = toResponse(HttpResponse.BodyHandlers.ofString());
var optional = toResponse();
if (optional.isEmpty()) {
return Optional.empty();
}
var response = optional.get();
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) {
@@ -80,7 +81,7 @@ public class HttpClient {
}
public Optional<byte[]> toBinaryResponse() {
var optional = toResponse(HttpResponse.BodyHandlers.ofByteArray());
var optional = toResponse();
if (optional.isEmpty()) {
return Optional.empty();
}