Skip to content

Commit 2c12b71

Browse files
kohlerpop1jwdeveloper
authored andcommitted
Push for proxy test pt 2!
1 parent bc3386d commit 2c12b71

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ HttpResponse<byte[]> getWebsocketCredentialsResponse(String signedUrl) {
182182
var optionalResponse = httpFactory
183183
.clientEmpty(signedUrl)
184184
.build()
185-
.toResponse(HttpResponse.BodyHandlers.ofByteArray());
185+
.toResponse();
186186
if (optionalResponse.isEmpty()) {
187187
throw new TikTokSignServerException("Unable to get websocket connection credentials");
188188
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class HttpClient {
3939
protected final String url;
4040
private final Pattern pattern = Pattern.compile("charset=(.*?)(?=&|$)");
4141

42-
public <T> Optional<HttpResponse<T>> toResponse(HttpResponse.BodyHandler<T> bodyHandler) {
42+
public Optional<HttpResponse<byte[]>> toResponse() {
4343
var client = prepareClient();
4444
var request = prepareGetRequest();
4545
try {
@@ -55,14 +55,15 @@ public <T> Optional<HttpResponse<T>> toResponse(HttpResponse.BodyHandler<T> body
5555
}
5656

5757
public Optional<String> toJsonResponse() {
58-
var optional = toResponse(HttpResponse.BodyHandlers.ofString());
58+
var optional = toResponse();
5959
if (optional.isEmpty()) {
6060
return Optional.empty();
6161
}
6262

6363
var response = optional.get();
6464
var body = response.body();
65-
return Optional.of(body);
65+
var charset = charsetFrom(response.headers());
66+
return Optional.of(new String(body,charset));
6667
}
6768

6869
private Charset charsetFrom(HttpHeaders headers) {
@@ -80,7 +81,7 @@ private Charset charsetFrom(HttpHeaders headers) {
8081
}
8182

8283
public Optional<byte[]> toBinaryResponse() {
83-
var optional = toResponse(HttpResponse.BodyHandlers.ofByteArray());
84+
var optional = toResponse();
8485
if (optional.isEmpty()) {
8586
return Optional.empty();
8687
}

0 commit comments

Comments
 (0)