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

Removal of blank spaces and unused imports/dependencies

Browse Source 
Optimize picture download memory usage and add option to convert to unsigned url
Convert response data classes to final and add toString with `@Data`
Made sending requests dynamic by allowing passing of BodyHandler to class
This commit is contained in:
kohlerpop1
2024-11-22 22:31:23 -05:00
parent 2dc3001e7b
commit 14bf9c8c9b
10 changed files with 33 additions and 39 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

@@ -225,7 +225,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
if (clientSettings.getApiKey() != null)
builder.withParam("apiKey", clientSettings.getApiKey());
var result = builder.build().toResponse();
var result = builder.build().toHttpResponse(HttpResponse.BodyHandlers.ofByteArray());
if (result.isFailure())
throw new TikTokSignServerException("Unable to get websocket connection credentials - "+result);

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

@@ -42,11 +42,11 @@ public class HttpClient {
protected final String url;
private final Pattern pattern = Pattern.compile("charset=(.*?)(?=&|$)");
public ActionResult<HttpResponse<byte[]>> toResponse() {
public <T> ActionResult<HttpResponse<T>> toHttpResponse(HttpResponse.BodyHandler<T> handler) {
var client = prepareClient();
var request = prepareGetRequest();
try {
var response = client.send(request, HttpResponse.BodyHandlers.ofByteArray());
var response = client.send(request, handler);
var result = ActionResult.of(response);
return switch (response.statusCode()) {
case 420 -> result.message("HttpResponse Code:", response.statusCode(), "| IP Cloudflare Blocked.").failure();
@@ -68,8 +68,12 @@ public class HttpClient {
}
}
public <T> ActionResult<T> toResponse(HttpResponse.BodyHandler<T> handler) {
return toHttpResponse(handler).map(HttpResponse::body);
}
public ActionResult<String> toJsonResponse() {
return toResponse().map(content -> new String(content.body(), charsetFrom(content.headers())));
return toResponse(HttpResponse.BodyHandlers.ofString());
}
private Charset charsetFrom(HttpHeaders headers) {
@@ -87,7 +91,7 @@ public class HttpClient {
}
public ActionResult<byte[]> toBinaryResponse() {
return toResponse().map(HttpResponse::body);
return toResponse(HttpResponse.BodyHandlers.ofByteArray());
}
public URI toUri() {

4
Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java
View File

@@ -77,7 +77,7 @@ public class HttpProxyClient extends HttpClient {
throw new TikTokProxyRequestException(e);
} catch (IOException e) {
if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
return super.toResponse();
return super.toHttpResponse(HttpResponse.BodyHandlers.ofByteArray());
throw new TikTokProxyRequestException(e);
} catch (Exception e) {
throw new TikTokLiveRequestException(e);
@@ -122,7 +122,7 @@ public class HttpProxyClient extends HttpClient {
return ActionResult.success(response);
} catch (IOException e) {
if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
return super.toResponse();
return super.toHttpResponse(HttpResponse.BodyHandlers.ofByteArray());
if (proxySettings.isAutoDiscard())
proxySettings.remove();
throw new TikTokProxyRequestException(e);