Merge pull request #114 from jwdeveloper/develop-1.8.12

Develop 1.8.12

API/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.9-Release</version>
+        <version>1.8.11-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java

@@ -36,11 +36,6 @@ public class TikTokDisconnectedEvent extends TikTokLiveClientEvent {
 		this.reason = reason.isBlank() ? "None" : reason;
 	}
 
-	public TikTokDisconnectedEvent() {
-		this("None");
-	}
-
-
 	public static TikTokDisconnectedEvent of(String reason)
 	{
 		return new TikTokDisconnectedEvent(reason);

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java

@@ -25,11 +25,10 @@ package io.github.jwdeveloper.tiktok.data.events;
 import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.battles.*;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.messages.enums.LinkMicBattleStatus;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.*;
+import lombok.Getter;
-
-import java.util.*;
 
 /**
  * Triggered every time a battle starts & ends
@@ -43,23 +42,22 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
      true if battle is finished otherwise false
      */
     private final boolean finished;
-    private final List<Team> teams;
+    private final Team team1, team2;
 
     public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
         super(msg.getCommon());
         battleId = msg.getId();
         finished = msg.getBattleStatus() == LinkMicBattleStatus.BATTLE_FINISHED;
-        teams = new ArrayList<>();
         if (msg.getHostTeamCount() == 2) { // 1v1 battle
-            teams.add(new Team1v1(msg.getHostTeam(0), msg));
+            team1 = new Team1v1(msg.getHostTeam(0), msg);
-            teams.add(new Team1v1(msg.getHostTeam(1), msg));
+            team2 = new Team1v1(msg.getHostTeam(1), msg);
         } else { // 2v2 battle
             if (isFinished()) {
-                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg));
+                team1 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg);
-                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg));
+                team2 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg);
             } else {
-                teams.add(new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg));
+                team1 = new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg);
-                teams.add(new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg));
+                team2 = new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg);
             }
         }
 
@@ -69,15 +67,38 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
         // - msg.getHostTeamCount() always is 2 for 1v1 or 4 for 2v2
     }
 
+    /**
+     * @param battleHostName name of host to search
+     * @return Team1v1 instance containing name of host or null if no team found */
+    public Team1v1 get1v1Team(String battleHostName) {
+        if (!is1v1())
+            throw new TikTokLiveException("Teams are not instance of 1v1 battle!");
+        if (team1.getAs1v1Team().getHost().getName().equals(battleHostName))
+            return team1.getAs1v1Team();
+        if (team2.getAs1v1Team().getHost().getName().equals(battleHostName))
+            return team2.getAs1v1Team();
+        return null;
+    }
+
+    public Team2v2 get2v2Team(String battleHostName) {
+        if (!is2v2())
+            throw new TikTokLiveException("Teams are not instance of 2v2 battle!");
+        if (team1.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
+            return team1.getAs2v2Team();
+        if (team2.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
+            return team2.getAs2v2Team();
+        return null;
+    }
+
     public boolean is1v1() {
-        return teams.get(0) instanceof Team1v1;
+        return team1.is1v1Team() || team2.is1v1Team();
     }
 
     public boolean is2v2() {
-        return teams.get(0) instanceof Team2v2;
+        return team1.is2v2Team() || team2.is2v2Team();
     }
 
     public boolean isTie() {
-        return isFinished() && teams.get(0).getTotalPoints() == teams.get(1).getTotalPoints();
+        return isFinished() && team1.getTotalPoints() == team2.getTotalPoints();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java

@@ -35,4 +35,4 @@ public class TikTokUnhandledMemberEvent extends TikTokUnhandledEvent<WebcastMemb
     public TikTokUnhandledMemberEvent(WebcastMemberMessage data) {
         super(data);
     }
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java

@@ -26,7 +26,6 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
@@ -58,4 +57,4 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
                         .build())
                 .build());
     }
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java

@@ -28,8 +28,6 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent;
 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 class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<W
     {
         return this.getData();
     }
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java

@@ -30,6 +30,7 @@ import java.awt.*;
 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 @@ public class Picture {
             throw new TikTokLiveException("Unable map downloaded image", e);
         }
 
-        var bais = new ByteArrayInputStream(baos.toByteArray());
+        try (var bais = new ByteArrayInputStream(baos.toByteArray())) {
-        try {
             return ImageIO.read(bais);
         } catch (IOException e) {
             throw new TikTokLiveException("Unable map downloaded image bytes to Image", e);
@@ -97,8 +97,25 @@ public class Picture {
         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);
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/GiftsData.java

@@ -29,11 +29,11 @@ import java.util.List;
 
 public class GiftsData
 {
-    @Getter
+    @Data
     @AllArgsConstructor
     public static final class Response
     {
-        private String json;
+        private final String json;
-        private List<Gift> gifts;
+        private final List<Gift> gifts;
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveConnectionData.java

@@ -28,20 +28,19 @@ import lombok.Data;
 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 final String websocketCookies;
-        private URI websocketUrl;
+        private final URI websocketUrl;
-        private WebcastResponse webcastResponse;
+        private final WebcastResponse webcastResponse;
     }
-}
+}

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 class LiveData {
         private boolean ageRestricted;
         private User host;
         private LiveType liveType;
-        public Response() {
+        public Response() {}
-
-        }
-
-
     }
 
     public enum LiveStatus {

API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveUserData.java

@@ -38,7 +38,7 @@ public class LiveUserData {
         }
     }
 
-    @Getter
+    @Data
     @AllArgsConstructor
     public static class Response {
         private final String json;

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);
-}
+}

Client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.9-Release</version>
+        <version>1.8.11-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -83,7 +83,7 @@ public class TikTokLiveClient implements LiveClient
         } catch (TikTokLiveException e) {
             setState(ConnectionState.DISCONNECTED);
             tikTokEventHandler.publish(this, new TikTokErrorEvent(e));
-            tikTokEventHandler.publish(this, new TikTokDisconnectedEvent());
+            tikTokEventHandler.publish(this, new TikTokDisconnectedEvent("Exception: "+e.getMessage()));
 
             if (e instanceof TikTokLiveOfflineHostException && clientSettings.isRetryOnConnectionFailure()) {
                 try {

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

@@ -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);

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 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() {

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

@@ -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);

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java

@@ -48,6 +48,6 @@ public class TikTokWebSocketOfflineClient implements LiveSocketClient {
         if (liveClient == null) {
             return;
         }
-        handler.publish(liveClient, new TikTokDisconnectedEvent());
+        handler.publish(liveClient, new TikTokDisconnectedEvent("Stopping"));
     }
-}
+}

examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.9-Release</version>
+        <version>1.8.11-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

extension-collector/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
         <artifactId>TikTokLiveJava</artifactId>
-        <version>1.8.9-Release</version>
+        <version>1.8.11-Release</version>
     </parent>
 
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.8.9-Release</version>
+            <version>1.8.11-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

extension-recorder/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.9-Release</version>
+        <version>1.8.11-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extension-recorder</artifactId>

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;
 	}
 }

pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.github.jwdeveloper.tiktok</groupId>
     <artifactId>TikTokLiveJava</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.9-Release</version>
+    <version>1.8.11-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>

tools-readme/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.9-Release</version>
+        <version>1.8.11-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>