Merge pull request #112 from jwdeveloper/develop-1.8.11

kohlerpop1 · web-flow · commit f6fbd60ecaed · 2024-11-28T21:18:46.000-05:00
Develop 1.8.11
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java
@@ -28,8 +28,6 @@
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import lombok.Getter;
 
-
-
 @Getter
 @EventMeta(eventType = EventType.Debug)
 public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>
@@ -42,4 +40,4 @@ public WebcastResponse.Message getMessage()
     {
         return this.getData();
     }
-}
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java
@@ -30,6 +30,7 @@
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URL;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 public class Picture {
@@ -85,8 +86,7 @@ private BufferedImage download(String urlString) {
             throw new TikTokLiveException("Unable map downloaded image", e);
         }
 
-        var bais = new ByteArrayInputStream(baos.toByteArray());
-        try {
+        try (var bais = new ByteArrayInputStream(baos.toByteArray())) {
             return ImageIO.read(bais);
         } catch (IOException e) {
             throw new TikTokLiveException("Unable map downloaded image bytes to Image", e);
@@ -97,8 +97,25 @@ public static Picture empty() {
         return new Picture("");
     }
 
+    public Picture asUnsigned() {
+        if (link == null || link.isEmpty())
+            return this;
+        // p16-sign-va.tiktokcdn.com -> p16-va.tiktokcdn.com || p16-sign.tiktokcdn.com -> p16.tiktokcdn.com
+        return new Picture(link.replace("-sign-", "-").replace("-sign.", "."));
+    }
+
     @Override
     public String toString() {
         return "Picture{link='" + link + "', image=" + image + "}";
     }
+
+    @Override
+    public final boolean equals(Object o) {
+        return o == this || o instanceof Picture picture && picture.link != null && picture.link.equals(link);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(link);
+    }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/GiftsData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/GiftsData.java
@@ -29,11 +29,11 @@
 
 public class GiftsData
 {
-    @Getter
+    @Data
     @AllArgsConstructor
     public static final class Response
     {
-        private String json;
-        private List<Gift> gifts;
+        private final String json;
+        private final List<Gift> gifts;
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveConnectionData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveConnectionData.java
@@ -28,20 +28,19 @@
 import lombok.Getter;
 
 import java.net.URI;
-import java.time.Duration;
 
 public class LiveConnectionData {
     @Getter
     @AllArgsConstructor
     public static class Request {
-        private String roomId;
+        private final String roomId;
     }
 
-    @Getter
+    @Data
     @AllArgsConstructor
     public static class Response {
-        private String websocketCookies;
-        private URI websocketUrl;
-        private WebcastResponse webcastResponse;
+        private final String websocketCookies;
+        private final URI websocketUrl;
+        private final WebcastResponse webcastResponse;
     }
-}
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveData.java
@@ -31,7 +31,7 @@ public class LiveData {
     @Getter
     @AllArgsConstructor
     public static class Request {
-        private String roomId;
+        private final String roomId;
     }
 
     @Data
@@ -46,11 +46,7 @@ public static class Response {
         private boolean ageRestricted;
         private User host;
         private LiveType liveType;
-        public Response() {
-
-        }
-
-
+        public Response() {}
     }
 
     public enum LiveStatus {
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveUserData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveUserData.java
@@ -38,7 +38,7 @@ public Request(String userName) {
         }
     }
 
-    @Getter
+    @Data
     @AllArgsConstructor
     public static class Response {
         private final String json;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java
@@ -22,19 +22,10 @@
  */
 package io.github.jwdeveloper.tiktok.live;
 
-import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData;
-import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
-import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
-import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
-import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
-import io.github.jwdeveloper.tiktok.utils.Stopwatch;
-
-import java.time.Duration;
 
 public interface LiveMessagesHandler {
     void handle(LiveClient client, WebcastResponse webcastResponse);
 
     void handleSingleMessage(LiveClient client, WebcastResponse.Message message);
-}
+}
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java
@@ -225,7 +225,7 @@ protected ActionResult<HttpResponse<byte[]>> getByteResponse(String room_id) {
         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);
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java
@@ -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 ActionResult<HttpResponse<byte[]>> toResponse() {
         }
     }
 
+    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 @@ private Charset charsetFrom(HttpHeaders headers) {
     }
 
     public ActionResult<byte[]> toBinaryResponse() {
-        return toResponse().map(HttpResponse::body);
+        return toResponse(HttpResponse.BodyHandlers.ofByteArray());
     }
 
     public URI toUri() {
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java
@@ -77,7 +77,7 @@ public ActionResult<HttpResponse<byte[]>> handleHttpProxyRequest() {
 				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 void checkServerTrusted(X509Certificate[] x509Certificates, String s) {}
 					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);
diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/DownloadData.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/DownloadData.java
@@ -34,6 +34,6 @@ public class DownloadData {
     private String sessionId;
 
     public String getFullUrl() {
-		return downloadLiveUrl + (downloadLiveUrl.contains("?") ? "&" : "?") + "_webnoredir=1&session_id=" + sessionId;
+		return downloadLiveUrl + (downloadLiveUrl.contains("?") ? "&" : "?") + "_webnoredir=1&_session_id=" + sessionId;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@`
`28`	`28`	`import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;`
`29`	`29`	`import lombok.Getter;`
`30`	`30`
`31`		`-`
`32`		`-`
`33`	`31`	`@Getter`
`34`	`32`	`@EventMeta(eventType = EventType.Debug)`
`35`	`33`	`public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>`
`@@ -42,4 +40,4 @@ public WebcastResponse.Message getMessage()`
`42`	`40`	`{`
`43`	`41`	`return this.getData();`
`44`	`42`	`}`
`45`		`-}`
	`43`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@`
`29`	`29`
`30`	`30`	`public class GiftsData`
`31`	`31`	`{`
`32`		`- @Getter`
	`32`	`+ @Data`
`33`	`33`	`@AllArgsConstructor`
`34`	`34`	`public static final class Response`
`35`	`35`	`{`
`36`		`- private String json;`
`37`		`- private List<Gift> gifts;`
	`36`	`+ private final String json;`
	`37`	`+ private final List<Gift> gifts;`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public Request(String userName) {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- @Getter`
	`41`	`+ @Data`
`42`	`42`	`@AllArgsConstructor`
`43`	`43`	`public static class Response {`
`44`	`44`	`private final String json;`