Add session id to websocket connection to get authenticated WS as well as optional customizable type for disconnecting websocket client in various ways.

Add TikTok Target Identity Data Center cookie to make sessionid effective and verifiable.

.github/workflows/maven-publish.yml

@@ -46,7 +46,7 @@ jobs:
       run: mkdir staging && cp Client/target/Client-${{steps.version.outputs.version_tag}}-all.jar staging
       
     - name: 5 set up a cache for maven
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
          path: ~/.m2
          key: ${{runner.os}}-m2-${{hashFiles('**/pom.xml')}}

API/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.9.0-Release</version>
+        <version>1.10.5-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>
@@ -80,4 +80,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Priority.java

@@ -23,11 +23,12 @@
 package io.github.jwdeveloper.tiktok.annotations;
 
 /**
- * HIGHEST 1
- * HIGH 2
- * NORMAL 3
- * LOW 4
- * LOWEST 5
+ ORDER -
+ * HIGHEST 1st,
+ * HIGH 2nd,
+ * NORMAL 3rd,
+ * LOW 4th,
+ * LOWEST 5th
  */
 public enum Priority {
     LOWEST(2), LOW(1), NORMAL(0), HIGH(-1), HIGHEST(-2);

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

@@ -22,25 +22,36 @@
  */
 package io.github.jwdeveloper.tiktok.data.events;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastCaptionMessage;
 import lombok.Value;
 
+import java.util.*;
+
 @Value
 @EventMeta(eventType = EventType.Message)
 public class TikTokCaptionEvent extends TikTokHeaderEvent {
     Long captionTimeStamp;
-
-    String iSOLanguage;
-
-    String text;
+    List<CaptionContent> contents;
 
     public TikTokCaptionEvent(WebcastCaptionMessage msg) {
         super(msg.getCommon());
-        captionTimeStamp = msg.getTimeStamp();
-        iSOLanguage = msg.getCaptionData().getLanguage();
-        text = msg.getCaptionData().getText();
+        captionTimeStamp = msg.getTimestampMs();
+        contents = new ArrayList<>();
+        for (WebcastCaptionMessage.CaptionContent captionContent : msg.getContentList())
+			contents.add(new CaptionContent(captionContent));
+    }
+
+    @Value
+    public static class CaptionContent {
+        String iSOLanguage;
+
+        String text;
+
+        public CaptionContent(WebcastCaptionMessage.CaptionContent captionContent) {
+            this.iSOLanguage = captionContent.getLang();
+            this.text = captionContent.getContent();
+        }
     }
 }

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

@@ -58,7 +58,7 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
         var builder = WebcastChatMessage.newBuilder();
         builder.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
                 .setNickname(userName)
-                .setDisplayId(userName)
+                .setUsername(userName)
                 .build());
         builder.setContentLanguage("en");
         builder.setVisibleToSender(true);

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

@@ -47,9 +47,9 @@ public class TikTokGoalUpdateEvent extends TikTokHeaderEvent {
         goalId = msg.getGoal().getId();
         description = msg.getGoal().getDescription();
         users = msg.getGoal()
-                .getContributorsListList()
-                .stream()
-                .map(u -> new User(u.getUserId(), u.getDisplayId(), Picture.map(u.getAvatar())))
-                .toList();
+            .getContributorsList()
+            .stream()
+            .map(u -> new User(u.getUserId(), u.getDisplayId(), Picture.map(u.getAvatar())))
+            .toList();
     }
-}
+}

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

@@ -22,8 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.data.events;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastInRoomBannerMessage;
 import lombok.Getter;
@@ -35,6 +34,6 @@ public class TikTokInRoomBannerEvent extends TikTokHeaderEvent {
 
 	public TikTokInRoomBannerEvent(WebcastInRoomBannerMessage msg) {
 		super(msg.getHeader());
-		json = msg.getJson();
+		json = msg.getExtraMap().toString();
 	}
 }

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

@@ -22,16 +22,14 @@
  */
 package io.github.jwdeveloper.tiktok.data.events;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.data.models.LinkMicArmy;
-import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.messages.enums.LinkMicBattleStatus;
+import io.github.jwdeveloper.tiktok.data.models.*;
+import io.github.jwdeveloper.tiktok.messages.enums.*;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicArmies;
 import lombok.Getter;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * Triggered every time a battle participant receives points. Contains the current status of the battle and the army that suported the group.
@@ -47,13 +45,28 @@ public class TikTokLinkMicArmiesEvent extends TikTokHeaderEvent {
 
     private final Picture picture;
 
-    private final List<LinkMicArmy> armies;
+    private final Map<Long, LinkMicArmy> armies;
+
+    private final BattleType battleType;
 
     public TikTokLinkMicArmiesEvent(WebcastLinkMicArmies msg) {
         super(msg.getCommon());
-        battleId = msg.getId();
-        armies = msg.getBattleItemsList().stream().map(LinkMicArmy::new).toList();
-        picture = Picture.map(msg.getImage());
-        finished = msg.getBattleStatus() == LinkMicBattleStatus.ARMY_FINISHED;
+        battleId = msg.getBattleId();
+        armies = new HashMap<>();
+        picture = Picture.map(msg.getGifIconImage());
+        finished = msg.getTriggerReason() == TriggerReason.TRIGGER_REASON_BATTLE_END;
+        battleType = msg.getBattleSettings().getBattleType();
+
+        switch (battleType) {
+            case BATTLE_TYPE_NORMAL_BATTLE -> // 1v1 | Fields present - armies
+				msg.getArmiesMap().forEach((aLong, userArmies) -> armies.put(aLong, new LinkMicArmy(userArmies)));
+            case BATTLE_TYPE_TEAM_BATTLE -> // 2v2 | Fields present - team_armies
+				msg.getTeamArmiesList().forEach(teamArmy -> armies.put(teamArmy.getTeamId(), new LinkMicArmy(teamArmy.getUserArmies())));
+            case BATTLE_TYPE_INDIVIDUAL_BATTLE -> // 1v1v1 or 1v1v1v1 | Fields present - team_armies
+				msg.getTeamArmiesList().forEach(teamArmy -> armies.put(teamArmy.getTeamId(), new LinkMicArmy(teamArmy.getUserArmies())));
+            case BATTLE_TYPE_1_V_N -> { // 1 vs Many | Have no data for this yet
+                // Most complicated and uncommon battle type - When more data is collected, this will be updated.
+            }
+        }
     }
 }

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

@@ -24,13 +24,15 @@ 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.data.models.battles.Team;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.data.*;
+import io.github.jwdeveloper.tiktok.messages.enums.*;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
 import lombok.Getter;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Triggered every time a battle starts & ends
@@ -44,94 +46,118 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
      true if battle is finished otherwise false
      */
     private final boolean finished;
-    private final Team team1, team2;
+    private final List<Team> teams;
+    private final BattleType battleType;
 
     public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
         super(msg.getCommon());
-        battleId = msg.getId();
-        finished = msg.getBattleStatus() == LinkMicBattleStatus.BATTLE_FINISHED;
-        if (msg.getHostTeamCount() == 2) { // 1v1 battle
-            team1 = new Team1v1(msg.getHostTeam(0), msg);
-            team2 = new Team1v1(msg.getHostTeam(1), msg);
-        } else { // 2v2 battle
-            if (isFinished()) {
-                team1 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg);
-                team2 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg);
-            } else {
-                team1 = new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg);
-                team2 = new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg);
+        battleId = msg.getBattleId();
+        finished = msg.getAction() == BattleAction.BATTLE_ACTION_FINISH;
+        battleType = msg.getBattleSetting().getBattleType();
+        teams = new ArrayList<>();
+        switch (battleType) {
+            case BATTLE_TYPE_NORMAL_BATTLE -> { // 1v1 | Fields present - anchor_info, battle_combos
+                for (Long userId : msg.getAnchorInfoMap().keySet())
+					teams.add(new Team(msg.getAnchorInfoOrThrow(userId), msg.getBattleCombosOrThrow(userId)));
+                if (finished) { // Additional fields present - battle_result, armies
+                    for (Team team : teams) {
+                        Long userId = team.getHosts().get(0).getId();
+                        team.setTotalPoints((int) msg.getBattleResultOrThrow(userId).getScore());
+                        team.setViewers(msg.getArmiesOrThrow(userId).getUserArmyList().stream().collect(Collectors.toMap(User::new, bua -> (int) bua.getScore())));
+                    }
+                }
+            }
+            case BATTLE_TYPE_TEAM_BATTLE -> { // 2v2 | Fields present - anchor_info
+                if (finished) { // Additional fields present - team_battle_result, team_armies
+                    for (BattleTeamUserArmies army : msg.getTeamArmiesList()) {
+                        Team team = new Team(army.getTeamId(), army.getTeamUsersList().stream()
+                            .map(BattleTeamUser::getUserId).map(userId -> new User(msg.getAnchorInfoOrThrow(userId).getUser())).toList());
+                        team.setTotalPoints((int) army.getTeamTotalScore());
+                        team.setViewers(army.getUserArmies().getUserArmyList().stream().collect(Collectors.toMap(User::new, bua -> (int) bua.getScore())));
+                        teams.add(team);
+                    }
+                } else { // Additional fields present - team_users
+                    for (WebcastLinkMicBattle.TeamUsersInfo teamUsersInfo : msg.getTeamUsersList())
+						teams.add(new Team(teamUsersInfo.getTeamId(), teamUsersInfo.getUserIdsList().stream()
+                            .map(userId -> new User(msg.getAnchorInfoOrThrow(userId).getUser())).toList()));
+                }
+            }
+            case BATTLE_TYPE_INDIVIDUAL_BATTLE -> { // 1v1v1 or 1v1v1v1 | Fields present - anchor_info
+                teams.addAll(msg.getAnchorInfoMap().values().stream().map(Team::new).toList());
+                if (finished) { // Additional fields present - team_battle_result, team_armies
+                    for (Team team : teams) {
+                        Long userId = team.getHosts().get(0).getId();
+						BattleTeamUserArmies army = msg.getTeamArmiesList().stream().filter(btua -> btua.getTeamId() == userId).findFirst().orElseThrow();
+                        team.setTotalPoints((int) army.getTeamTotalScore());
+                        team.setViewers(army.getUserArmies().getUserArmyList().stream().collect(Collectors.toMap(User::new, bua -> (int) bua.getScore())));
+                    }
+                }
+            }
+            case BATTLE_TYPE_1_V_N -> { // 1 vs Many | Have no data for this yet
+                // Most complicated and uncommon battle type - When more data is collected, this will be updated.
             }
         }
-
-        // Info:
-        // - msg.getDetailsList() & msg.getViewerTeamList() both only have content when battle is finished
-        // - msg.getDetailsCount() & msg.getViewerTeamCount() always is 2 only when battle is finished
-        // - 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!");
-        List<Team> list = getTeams(battleHostName);
-        return list.isEmpty() ? null : list.get(0).getAs1v1Team();
-    }
-
-    public Team2v2 get2v2Team(String battleHostName) {
-        if (!is2v2())
-            throw new TikTokLiveException("Teams are not instance of 2v2 battle!");
-        List<Team> list = getTeams(battleHostName);
-        return list.isEmpty() ? null : list.get(0).getAs2v2Team();
-    }
-
-    /**
-     * @param battleHostName name of host to search
-     * @return Team1v1 instance not containing name of host */
-    public Team1v1 get1v1OpponentTeam(String battleHostName) {
-        if (!is1v1())
-            throw new TikTokLiveException("Teams are not instance of 1v1 battle!");
-		List<Team> list = getTeams(battleHostName);
-        return list.isEmpty() ? null : list.get(1).getAs1v1Team();
-    }
-
-    public Team2v2 get2x2OpponentTeam(String battleHostName) {
-        if (!is2v2())
-            throw new TikTokLiveException("Teams are not instance of 2v2 battle!");
-		List<Team> list = getTeams(battleHostName);
-        return list.isEmpty() ? null : list.get(1).getAs2v2Team();
-    }
-
-    /**
-     * @param battleHostName name of host to search
-     * @return {@link List<Team>} with host team first, then opponent team
-     * <p> Empty if host is in neither otherwise always 2 in length;
-     */
-    public List<Team> getTeams(String battleHostName) {
-        if (is1v1()) {
-            if (team1.getAs1v1Team().getHost().getName().equals(battleHostName))
-                return List.of(team1, team2);
-            if (team2.getAs1v1Team().getHost().getName().equals(battleHostName))
-                return List.of(team2, team1);
-        } else {
-            if (team1.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
-                return List.of(team1, team2);
-            if (team2.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
-                return List.of(team2, team1);
-        }
-        return List.of();
     }
 
+    /** 1 host vs 1 host */
     public boolean is1v1() {
-        return team1.is1v1Team() || team2.is1v1Team();
+        return battleType == BattleType.BATTLE_TYPE_NORMAL_BATTLE;
     }
 
+    /** 2 hosts vs 2 hosts*/
     public boolean is2v2() {
-        return team1.is2v2Team() || team2.is2v2Team();
+        return battleType == BattleType.BATTLE_TYPE_TEAM_BATTLE;
+    }
+
+    /** Up to four users battling each other all on separate teams */
+    public boolean isIndividual() {
+        return battleType == BattleType.BATTLE_TYPE_INDIVIDUAL_BATTLE;
+    }
+
+    /** 1 host vs N hosts | N max value unknown */
+    public boolean isMultiTeam() {
+        return battleType == BattleType.BATTLE_TYPE_1_V_N;
     }
 
     public boolean isTie() {
-        return isFinished() && team1.getTotalPoints() == team2.getTotalPoints();
+        return isFinished() && isTeamsTie();
+    }
+
+    private boolean isTeamsTie() {
+        int referencePoints = teams.get(0).getTotalPoints();
+        return teams.stream().allMatch(team -> team.getTotalPoints() == referencePoints);
+    }
+
+    /**
+     * @param battleHostName name of host to search
+     * @return Team instance containing name of host or null if no team found */
+    public Team getTeam(String battleHostName) {
+        List<Team> list = getTeams(battleHostName);
+        return list.isEmpty() ? null : list.get(0);
+    }
+
+    /**
+     * @param battleHostName name of host to search
+     * @return Team instances not containing name of host */
+    public List<Team> getOpponentTeams(String battleHostName) {
+        List<Team> list = getTeams(battleHostName);
+        return list.isEmpty() ? null : list;
+    }
+
+    /**
+     * @param battleHostName name of host to search
+     * @return {@link List<Team>} with host team first, then opponent teams
+     * <p> If host is in neither or teams is empty, returns empty
+     * <p> Otherwise always teams.length in length;
+     */
+    public List<Team> getTeams(String battleHostName) {
+        if (teams.isEmpty() || teams.stream().noneMatch(team -> team.contains(battleHostName)))
+            return Collections.EMPTY_LIST;
+        Team hostTeam = teams.stream().filter(team -> team.contains(battleHostName)).findFirst().orElseThrow();
+        List<Team> opponentTeams = teams.stream().filter(team -> !team.contains(battleHostName)).toList();
+        List<Team> teams = new ArrayList<>();
+        teams.add(hostTeam);
+        teams.addAll(opponentTeams);
+        return teams;
     }
 }

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

@@ -40,9 +40,9 @@ public class TikTokQuestionEvent extends TikTokHeaderEvent {
     public TikTokQuestionEvent(WebcastQuestionNewMessage msg) {
         super(msg.getCommon());
         var data = msg.getDetails();
-        questionId = data.getId();
-        text = data.getText();
-        time = data.getTimeStamp();
+        questionId = data.getQuestionId();
+        text = data.getContent();
+        time = data.getCreateTime();
         user = User.map(data.getUser());
     }
-}
+}

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

@@ -53,9 +53,9 @@ public class TikTokSubscribeEvent extends TikTokHeaderEvent {
     public static TikTokSubscribeEvent of(String userName) {
         return new TikTokSubscribeEvent(WebcastMemberMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setDisplayId(userName)
+                        .setUsername(userName)
                         .setNickname(userName)
                         .build())
                 .build());
     }
-}
+}

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

@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.data.events.common;
 
-import io.github.jwdeveloper.tiktok.messages.data.Common;
+import io.github.jwdeveloper.tiktok.messages.data.*;
 import lombok.Getter;
 
 @Getter
@@ -31,7 +31,7 @@ public class TikTokHeaderEvent extends TikTokEvent {
     private final long roomId;
     private final long timeStamp;
 
-    public TikTokHeaderEvent(Common header) {
+    public TikTokHeaderEvent(CommonMessageData header) {
         this(header.getMsgId(), header.getRoomId(), header.getCreateTime());
     }
 
@@ -46,4 +46,4 @@ public class TikTokHeaderEvent extends TikTokEvent {
         roomId = 0;
         timeStamp = 0;
     }
-}
+}

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

@@ -35,9 +35,15 @@ public class TikTokPreConnectionEvent extends TikTokLiveClientEvent
 	private final LiveUserData.Response userData;
 	private final LiveData.Response roomData;
 	@Setter boolean cancelConnection = false;
+	@Setter String reason = "TikTokPreConnectionEvent cancelled connection!";
 
 	public TikTokPreConnectionEvent(LiveUserData.Response userData, LiveData.Response liveData) {
 		this.userData = userData;
 		this.roomData = liveData;
 	}
+
+	public void setCancelConnection(boolean cancelConnection, String reason) {
+		this.cancelConnection = cancelConnection;
+		this.reason = reason;
+	}
 }

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

@@ -24,6 +24,7 @@ package io.github.jwdeveloper.tiktok.data.events.link;
 
 import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.models.users.ListUser;
+import io.github.jwdeveloper.tiktok.messages.enums.LinkmicMultiLiveEnum;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
 import lombok.Getter;
 
@@ -34,7 +35,7 @@ import java.util.List;
 public class TikTokLinkEnterEvent extends TikTokLinkEvent {
 
     private final List<ListUser> listUsers;
-    private final int anchorMultiLiveEnum;
+    private final LinkmicMultiLiveEnum anchorMultiLiveEnum;
 
     public TikTokLinkEnterEvent(WebcastLinkMessage msg) {
         super(msg);

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

@@ -23,6 +23,7 @@
 package io.github.jwdeveloper.tiktok.data.events.link;
 
 import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.enums.*;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
 import lombok.Getter;
 
@@ -30,7 +31,11 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkMediaChangeEvent extends TikTokLinkEvent {
 
-    private final long op, toUserId, anchorId, roomId, changeScene;
+    private final GuestMicCameraManageOp op;
+    private final long toUserId;
+    private final long anchorId;
+    private final long roomId;
+    private final GuestMicCameraChangeScene changeScene;
 
     public TikTokLinkMediaChangeEvent(WebcastLinkMessage msg) {
         super(msg);

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

@@ -23,6 +23,7 @@
 package io.github.jwdeveloper.tiktok.data.events.link;
 
 import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.enums.MuteStatus;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
 import lombok.Getter;
 
@@ -30,7 +31,8 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkMuteEvent extends TikTokLinkEvent {
 
-    private final long userId, status;
+    private final long userId;
+    private final MuteStatus status;
 
     public TikTokLinkMuteEvent(WebcastLinkMessage msg) {
         super(msg);
@@ -41,4 +43,8 @@ public class TikTokLinkMuteEvent extends TikTokLinkEvent {
         this.userId = content.getUserId();
         this.status = content.getStatus();
     }
+
+    public boolean isMuted() {
+        return status == MuteStatus.MUTE_STATUS_MUTE;
+    }
 }

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

@@ -39,7 +39,7 @@ public class TikTokRoomPinEvent extends TikTokHeaderEvent
 	public TikTokRoomPinEvent(WebcastRoomPinMessage msg, TikTokCommentEvent commentEvent)
 	{
 		super(msg.getCommon());
-		this.timestamp = msg.getTimestamp();
+		this.timestamp = msg.getPinTime();
 		this.pinnedMessage = commentEvent;
 	}
 }

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

@@ -45,7 +45,7 @@ public class TikTokFollowEvent extends TikTokHeaderEvent {
     public static TikTokFollowEvent of(String userName) {
         return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setDisplayId(userName)
+                        .setUsername(userName)
                         .setNickname(userName)
                         .build())
                 .build());

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

@@ -52,7 +52,7 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
     {
         return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setDisplayId(userName)
+                        .setUsername(userName)
                         .setNickname(userName)
                         .build())
                 .build());

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

@@ -62,9 +62,9 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
                 .setCount(likes)
                 .setTotal(likes)
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setDisplayId(userName)
+                        .setUsername(userName)
                         .setNickname(userName)
                         .build())
                 .build());
     }
-}
+}

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

@@ -22,11 +22,9 @@
  */
 package io.github.jwdeveloper.tiktok.data.events.social;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.annotations.*;
 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.WebcastSocialMessage;
 import lombok.Getter;
 
@@ -52,7 +50,7 @@ public class TikTokShareEvent extends TikTokHeaderEvent {
     public static TikTokShareEvent of(String userName, int shaders) {
         return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setDisplayId(userName)
+                        .setUsername(userName)
                         .setNickname(userName)
                         .build())
                 .build(), shaders);

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

@@ -22,17 +22,11 @@
  */
 package io.github.jwdeveloper.tiktok.data.events.websocket;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Value;
-
-import java.time.Duration;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
+import lombok.*;
 
 
 
@@ -47,7 +41,7 @@ public class TikTokWebsocketMessageEvent extends TikTokEvent {
      *  message.payload - Bytes array that contains actual data of message.
      *                    Example of parsing, WebcastGiftMessage giftMessage = WebcastGiftMessage.parseFrom(message.getPayload());
      */
-    private WebcastResponse.Message message;
+    private ProtoMessageFetchResult.BaseProtoMessage message;
 
     /*
      * TikTokLiveJava event that was created from TikTok message data
@@ -61,4 +55,4 @@ public class TikTokWebsocketMessageEvent extends TikTokEvent {
     private MessageMetaData metaData;
 
 
-}
+}

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

@@ -22,17 +22,15 @@
  */
 package io.github.jwdeveloper.tiktok.data.events.websocket;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
+import lombok.*;
 
 @Getter
 @AllArgsConstructor
 @EventMeta(eventType = EventType.Debug)
 public class TikTokWebsocketResponseEvent extends TikTokEvent
 {
-    private WebcastResponse response;
-}
+    private ProtoMessageFetchResult response;
+}

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

@@ -25,18 +25,18 @@ package io.github.jwdeveloper.tiktok.data.events.websocket;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 import lombok.Getter;
 
 @Getter
 @EventMeta(eventType = EventType.Debug)
-public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>
+public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<ProtoMessageFetchResult.BaseProtoMessage>
 {
-    public TikTokWebsocketUnhandledMessageEvent(WebcastResponse.Message data) {
+    public TikTokWebsocketUnhandledMessageEvent(ProtoMessageFetchResult.BaseProtoMessage data) {
         super(data);
     }
 
-    public WebcastResponse.Message getMessage()
+    public ProtoMessageFetchResult.BaseProtoMessage getMessage()
     {
         return this.getData();
     }

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

@@ -23,27 +23,21 @@
 package io.github.jwdeveloper.tiktok.data.models;
 
 import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.data.LinkMicArmiesItems;
+import io.github.jwdeveloper.tiktok.messages.data.BattleUserArmies;
 import lombok.Value;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Value
 public class LinkMicArmy {
     Long armyId;
-    List<Army> armies;
+    int totalPoints;
+    Map<User, Integer> armies;
 
-    public LinkMicArmy(LinkMicArmiesItems army) {
-        armyId = army.getHostUserId();
-        armies = army.getBattleGroupsList()
-                .stream()
-                .map(x -> new Army(x.getUsersList().stream().map(User::map).toList(), x.getPoints()))
-                .toList();
-    }
-
-    @Value
-    public static class Army {
-        List<User> Users;
-        Integer Points;
+    public LinkMicArmy(BattleUserArmies userArmies) {
+        armyId = Long.parseLong(userArmies.getAnchorIdStr());
+        totalPoints = (int) userArmies.getHostScore();
+        armies = userArmies.getUserArmyList().stream().collect(Collectors.toMap(User::new, bua -> (int) bua.getScore()));
     }
 }

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

@@ -25,7 +25,7 @@ package io.github.jwdeveloper.tiktok.data.models.badges;
 public class Badge {
 
     public static Badge map(io.github.jwdeveloper.tiktok.messages.data.BadgeStruct badge) {
-        return switch (badge.getDisplayType()) {
+        return switch (badge.getBadgeDisplayType()) {
             case BADGEDISPLAYTYPE_TEXT -> new TextBadge(badge.getText());
             case BADGEDISPLAYTYPE_IMAGE -> new PictureBadge(badge.getImage());
             case BADGEDISPLAYTYPE_STRING -> new StringBadge(badge.getStr());

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

@@ -22,53 +22,67 @@
  */
 package io.github.jwdeveloper.tiktok.data.models.battles;
 
-import lombok.Getter;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.enums.BattleType;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
+import lombok.Data;
 
-public abstract class Team {
+import java.util.*;
+
+@Data
+public class Team {
+    /** TeamId used for all battle types */
+    private final long teamId;
     /** Value >= 0 when finished otherwise -1 */
-    @Getter protected int totalPoints;
+    private int totalPoints = -1;
+    /** Value >= 0 when battle type is {@link BattleType}.{@code BATTLE_TYPE_NORMAL_BATTLE} otherwise -1 */
+    private int winStreak = -1;
+    /** Up to N hosts */
+    private final List<User> hosts;
+    /** Populated when finished */
+    private Map<User, Integer> viewers = new HashMap<>();
 
-    /**
-     * Provides a check for verifying if this team represents a 1v1 Team.
-     * @return true if this team is of type {@link Team1v1}, false otherwise.
-     */
-    public boolean is1v1Team() {
-        return this instanceof Team1v1;
+    // public Team(WebcastLinkMicBattle.BattleUserInfoWrapper anchorInfo, WebcastLinkMicBattle msg) {
+    //     long hostId = anchorInfo.getUserId();
+    //     this.winStreak = msg.getBattleCombosOrDefault(hostId, WebcastLinkMicBattle.BattleComboInfo.newBuilder().setComboCount(-1).build()).getComboCount();
+    //     this.totalPoints = (int) msg.getBattleResultOrDefault(hostId, WebcastLinkMicBattle.BattleResult.newBuilder().setScore(-1).build()).getScore();
+    //     this.host = new User(anchorInfo.getUserInfo().getUser());
+    //     this.viewers = new HashMap<>();
+    //     Optional.ofNullable(msg.getArmiesMap().get(host.getId())).ifPresent(armies ->
+    //         armies.getUserArmiesList().forEach(userArmy ->
+    //             viewers.put(new User(userArmy), (int) userArmy.getScore())));
+    // }
+    //
+    // public Team(WebcastLinkMicBattle.BattleTeamResult battleTeamResult, WebcastLinkMicBattle msg) {
+    //     this.totalPoints = (int) battleTeamResult.getTotalScore();
+    //     var host = new User(msg.getAnchorInfoList().stream().filter(data -> data.getUserId() == battleTeamResult.getTeamUsers(0).getUserId()).findFirst().orElseThrow().getUserInfo().getUser());
+    //     var cohost = new User(msg.getAnchorInfoList().stream().filter(data -> data.getUserId() == battleTeamResult.getTeamUsers(1).getUserId()).findFirst().orElseThrow().getUserInfo().getUser());
+    //     this.hosts = List.of(host, cohost);
+    //     this.viewers = new HashMap<>();
+    //     Optional.ofNullable(msg.getArmiesMap().get(host.getId())).ifPresent(armies ->
+    //         armies.getUserArmiesList().forEach(userArmy ->
+    //             viewers.put(new User(userArmy), (int) userArmy.getScore())));
+    //     Optional.ofNullable(msg.getArmiesMap().get(cohost.getId())).ifPresent(armies ->
+    //         armies.getUserArmiesList().forEach(userArmy ->
+    //             viewers.put(new User(userArmy), (int) userArmy.getScore())));
+    // }
+    //
+    public Team(long teamId, List<User> hosts) {
+        this.teamId = teamId;
+        this.hosts = List.copyOf(hosts);
     }
 
-    /**
-     * Provides a check for verifying if this team represents a 1v1 Team.
-     * @return true if this team is of type {@link Team1v1}, false otherwise.
-     */
-    public boolean is2v2Team() {
-        return this instanceof Team2v2;
+    public Team(WebcastLinkMicBattle.BattleUserInfo anchorInfo) {
+        this.hosts = List.of(new User(anchorInfo.getUser()));
+        this.teamId = hosts.get(0).getId();
     }
 
-    /**
-     * Convenience method to get this team as a {@link Team1v1}. If this team is of some
-     * other type, an {@link IllegalStateException} will result. Hence it is best to use this method
-     * after ensuring that this element is of the desired type by calling {@link #is1v1Team()} first.
-     *
-     * @return this team as a {@link Team1v1}.
-     * @throws IllegalStateException if this team is of another type.
-     */
-    public Team1v1 getAs1v1Team() {
-        if (is1v1Team())
-            return (Team1v1) this;
-        throw new IllegalStateException("Not a 1v1Team: " + this);
+    public Team(WebcastLinkMicBattle.BattleUserInfo anchorInfo, WebcastLinkMicBattle.BattleComboInfo battleCombo) {
+        this(anchorInfo);
+        this.winStreak = (int) battleCombo.getComboCount();
     }
 
-    /**
-     * Convenience method to get this team as a {@link Team2v2}. If this team is of some
-     * other type, an {@link IllegalStateException} will result. Hence it is best to use this method
-     * after ensuring that this element is of the desired type by calling {@link #is2v2Team()} first.
-     *
-     * @return this team as a {@link Team2v2}.
-     * @throws IllegalStateException if this team is of another type.
-     */
-    public Team2v2 getAs2v2Team() {
-        if (is2v2Team())
-            return (Team2v2) this;
-        throw new IllegalStateException("Not a 2v2Team: " + this);
+    public boolean contains(String name) {
+        return hosts.stream().anyMatch(user -> user.getName().equals(name));
     }
 }

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

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2023-2024 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.models.battles;
-
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.Getter;
-
-import java.util.*;
-
-@Getter
-public class Team1v1 extends Team {
-    private final int winStreak;
-    private final User host;
-    private final List<Viewer> viewers;
-
-    public Team1v1(WebcastLinkMicBattle.LinkMicBattleHost hostTeam, WebcastLinkMicBattle msg) {
-        long hostId = hostTeam.getId();
-        this.winStreak = msg.getTeamDataList().stream().filter(data -> data.getTeamId() == hostId).map(data -> data.getData().getWinStreak()).findFirst().orElse(-1);
-        this.totalPoints = msg.getDetailsList().stream().filter(dets -> dets.getId() == hostId).map(dets -> dets.getSummary().getPoints()).findFirst().orElse(-1);
-        this.host = new User(hostTeam.getHostGroup(0).getHost(0));
-        this.viewers = msg.getViewerTeamList().stream().filter(team -> team.getId() == hostId).findFirst().map(topViewers ->
-            topViewers.getViewerGroup(0).getViewerList().stream().map(Viewer::new).toList()).orElseGet(ArrayList::new);
-    }
-}

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

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023-2024 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.models.battles;
-
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.Getter;
-
-import java.util.*;
-
-@Getter
-public class Team2v2 extends Team {
-    private final List<User> hosts;
-    private final List<Viewer> viewers;
-
-    public Team2v2(WebcastLinkMicBattle.LinkMicBattleHost hostTeam1, WebcastLinkMicBattle.LinkMicBattleHost hostTeam2, WebcastLinkMicBattle msg) {
-        this.totalPoints = -1;
-        this.hosts = List.of(new User(hostTeam1.getHostGroup(0).getHost(0)), new User(hostTeam2.getHostGroup(0).getHost(0)));
-        this.viewers = new ArrayList<>();
-    }
-
-    public Team2v2(WebcastLinkMicBattle.Host2v2Data hd, WebcastLinkMicBattle msg) {
-        this.totalPoints = hd.getTotalPoints();
-        var host = new User(msg.getHostTeamList().stream().filter(data -> data.getId() == hd.getHostdata(0).getHostId()).findFirst().orElseThrow().getHostGroup(0).getHost(0));
-        var cohost = new User(msg.getHostTeamList().stream().filter(data -> data.getId() == hd.getHostdata(1).getHostId()).findFirst().orElseThrow().getHostGroup(0).getHost(0));
-        this.hosts = List.of(host, cohost);
-        this.viewers = msg.getViewerTeamList().stream().filter(team -> team.getId() == host.getId() || team.getId() == cohost.getId()).findFirst().map(topViewers ->
-            topViewers.getViewerGroup(0).getViewerList().stream().map(Viewer::new).toList()).orElseGet(ArrayList::new);
-    }
-}

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

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.data.models.users;
 
+import io.github.jwdeveloper.tiktok.messages.enums.*;
 import lombok.Getter;
 
 @Getter
@@ -29,14 +30,19 @@ public class ListUser
 {
     private final User user;
     private final LinkType linkType;
-    private final long linkMicId, linkStatus, modifyTime, linkerId;
-    private final int userPosition, silenceStatus, roleType;
+    private final long linkMicId;
+    private final LinkmicRoleType linkStatus;
+    private final long modifyTime;
+    private final long linkerId;
+    private final int userPosition;
+    private final LinkSilenceStatus silenceStatus;
+    private final LinkRoleType roleType;
 
     public ListUser(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) {
         this.user = User.map(listUser.getUser());
         this.linkMicId = listUser.getLinkmicId();
         this.linkStatus = listUser.getLinkStatus();
-        this.linkType = LinkType.values()[listUser.getLinkTypeValue()];
+        this.linkType = listUser.getLinkType();
         this.userPosition = listUser.getUserPosition();
         this.silenceStatus = listUser.getSilenceStatus();
         this.modifyTime = listUser.getModifyTime();
@@ -48,12 +54,6 @@ public class ListUser
         return new ListUser(listUser);
     }
 
-    public enum LinkType {
-        UNKNOWN,
-        AUDIO,
-        VIDEO
-    }
-
     @Override
     public String toString() {
         return "ListUser{" +

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

@@ -24,6 +24,7 @@ package io.github.jwdeveloper.tiktok.data.models.users;
 
 import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.data.models.badges.Badge;
+import io.github.jwdeveloper.tiktok.messages.data.BattleUserArmy;
 import io.github.jwdeveloper.tiktok.messages.webcast.*;
 import lombok.*;
 
@@ -139,12 +140,16 @@ public class User {
         this(id, name, profileId, null, picture, 0, 0, List.of(Badge.empty()));
     }
 
-    public User(WebcastLinkMicBattle.LinkMicBattleHost.HostGroup.Host host) {
-        this(host.getId(), host.getName(), host.getProfileId(), Picture.map(host.getImages(0)));
+    public User(WebcastLinkMicBattle.BattleUserInfo.BattleBaseUserInfo host) {
+        this(host.getUserId(), host.getDisplayId(), host.getNickName(), Picture.map(host.getAvatarThumb()));
+    }
+
+    public User(BattleUserArmy topViewer) {
+        this(topViewer.getUserId(), topViewer.getNickname(), Picture.map(topViewer.getAvatarThumb()));
     }
 
     public User(io.github.jwdeveloper.tiktok.messages.data.User user) {
-        this(user.getId(), user.getDisplayId(), Picture.map(user.getAvatarThumb()));
+        this(user.getId(), user.getUsername(), Picture.map(user.getAvatarThumb()));
         signature = user.getBioDescription();
         profileName = user.getNickname();
         following = user.getFollowInfo().getFollowingCount();

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

@@ -22,10 +22,8 @@
  */
 package io.github.jwdeveloper.tiktok.data.requests;
 
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
+import lombok.*;
 
 import java.net.URI;
 
@@ -41,6 +39,6 @@ public class LiveConnectionData {
     public static class Response {
         private final String websocketCookies;
         private final URI websocketUrl;
-        private final WebcastResponse webcastResponse;
+        private final ProtoMessageFetchResult webcastResponse;
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/settings/LiveClientSettings.java

@@ -90,11 +90,18 @@ public class LiveClientSettings {
     private boolean throwOnAgeRestriction;
 
     /**
-	 * Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId
-	 * @see <a href="https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages">Documentation: How to obtain sessionId</a>
+	 * Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId.
+     * <p>This requires {@link #ttTargetIdc} also being set correctly for sessionid to be effective.
+	 * @apiNote This cookie is supplied by <a href="https://www.tiktok.com">TikTok</a> and can be found in your browser cookies.
 	 */
     private String sessionId;
 
+    /**
+     * Used with {@link #sessionId} to verify it is valid and return extra chat messages and 18+ content.
+     * @apiNote This cookie is supplied by <a href="https://www.tiktok.com">TikTok</a> and can be found in your browser cookies.
+     */
+    private String ttTargetIdc;
+
     /**
      * Optional: By default roomID is fetched before connect to live, but you can set it manually
      */

API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveMessageException.java

@@ -23,7 +23,7 @@
 package io.github.jwdeveloper.tiktok.exceptions;
 
 
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 import lombok.Getter;
 
 import java.util.Base64;
@@ -31,13 +31,13 @@ import java.util.Base64;
 public class TikTokLiveMessageException extends TikTokLiveException {
 
     @Getter
-    private final WebcastResponse.Message webcastMessage;
+    private final ProtoMessageFetchResult.BaseProtoMessage webcastMessage;
     @Getter
-    private final WebcastResponse webcastResponse;
+    private final ProtoMessageFetchResult webcastResponse;
 
 
-    public TikTokLiveMessageException(WebcastResponse.Message message,
-                                      WebcastResponse webcastResponse,
+    public TikTokLiveMessageException(ProtoMessageFetchResult.BaseProtoMessage message,
+                                      ProtoMessageFetchResult webcastResponse,
                                       Throwable cause) {
         super("Error while handling Message: " + message.getMethod() + ": \n", cause);
         this.webcastMessage = message;
@@ -58,4 +58,4 @@ public class TikTokLiveMessageException extends TikTokLiveException {
     {
         return  Base64.getEncoder().encodeToString(webcastResponse.toByteArray());
     }
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLivePreConnectionException.java

@@ -20,20 +20,18 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.data.models.battles;
+package io.github.jwdeveloper.tiktok.exceptions;
 
-import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
 import lombok.Getter;
 
 @Getter
-public class Viewer {
-    private final User user;
-    private final int points;
+public class TikTokLivePreConnectionException extends TikTokLiveException
+{
+    private final TikTokPreConnectionEvent preconnectEvent;
 
-    public Viewer(WebcastLinkMicBattle.LinkMicBattleTopViewers.TopViewerGroup.TopViewer topViewer) {
-        this.user = new User(topViewer.getId(), null, topViewer.getProfileId(), Picture.map(topViewer.getImages(0)));
-        this.points = topViewer.getPoints();
+    public TikTokLivePreConnectionException(TikTokPreConnectionEvent preconnectEvent) {
+        super(preconnectEvent.getReason());
+        this.preconnectEvent = preconnectEvent;
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java

@@ -51,9 +51,17 @@ public interface LiveClient {
 
     /**
      * Disconnects the connection.
+     * @param type
+     * <p>0 - Normal - Initiates disconnection and returns
+     * <p>1 - Disconnects blocking and returns after closure
+     * <p>2 - Disconnects and kills connection to websocket
+     * <p>Default {@link #disconnect()} is 0
      */
-    void disconnect();
+    void disconnect(int type);
 
+    default void disconnect() {
+        disconnect(0);
+    }
 
     /**
      * Use to manually invoke event

API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveMessagesHandler.java

@@ -22,10 +22,10 @@
  */
 package io.github.jwdeveloper.tiktok.live;
 
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 
 public interface LiveMessagesHandler {
-    void handle(LiveClient client, WebcastResponse webcastResponse);
+    void handle(LiveClient client, ProtoMessageFetchResult webcastResponse);
 
-    void handleSingleMessage(LiveClient client, WebcastResponse.Message message);
+    void handleSingleMessage(LiveClient client, ProtoMessageFetchResult.BaseProtoMessage message);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/utils/ProtocolUtils.java

@@ -22,10 +22,8 @@
  */
 package io.github.jwdeveloper.tiktok.utils;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.UnknownFieldSet;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import com.google.protobuf.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 
 import java.util.Base64;
 
@@ -35,7 +33,7 @@ public class ProtocolUtils {
         return Base64.getEncoder().encodeToString(bytes);
     }
 
-    public static String toBase64(WebcastResponse.Message bytes) {
+    public static String toBase64(ProtoMessageFetchResult.BaseProtoMessage bytes) {
         return Base64.getEncoder().encodeToString(bytes.toByteArray());
     }
 
@@ -107,10 +105,10 @@ public class ProtocolUtils {
         }
     }
 
-    public static WebcastResponse.Message fromBase64ToMessage(String base64) throws InvalidProtocolBufferException {
+    public static ProtoMessageFetchResult.BaseProtoMessage fromBase64ToMessage(String base64) throws InvalidProtocolBufferException {
         var bytes = fromBase64(base64);
-        return WebcastResponse.Message.parseFrom(bytes);
+        return ProtoMessageFetchResult.BaseProtoMessage.parseFrom(bytes);
     }
 
 
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java

@@ -27,5 +27,6 @@ import io.github.jwdeveloper.tiktok.live.LiveClient;
 
 public interface LiveSocketClient {
     void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient);
-    void stop();
-}
+    void stop(int type);
+    boolean isConnected();
+}

API/src/main/proto/enums.proto

@@ -35,14 +35,6 @@ enum LinkmicApplierSortSetting {
   LINKMIC_APPLIER_SORT_SETTING_BY_GIFT_SCORE = 1;
 }
 
-enum LinkMicBattleStatus {
-  BATTLE_ARMY_UNKNOWN = 0;
-  ARMY_ONGOING = 1;
-  ARMY_FINISHED = 2;
-  BATTLE_ONGOING = 4;
-  BATTLE_FINISHED = 5;
-}
-
 enum HashtagNamespace {
   GLOBAL = 0;
   GAMING = 1;
@@ -64,7 +56,6 @@ enum KickoutReason {
   KICKOUT_REASON_HOST_REMOVE_ALL_GUESTS = 6;
 }
 
-
 enum GroupStatus {
   GROUP_STATUS_UNKNOWN = 0;
   GROUP_STATUS_WAITING = 1;
@@ -183,7 +174,6 @@ enum LinkLayerMessageType
   Linker_Group_Change = 18;
 }
 
-
 enum BarrageType
 {
   BarrageType_Unknown = 0;
@@ -212,21 +202,18 @@ enum EnvelopeBusinessType
   BusinessTypeEoYDiamond = 6;
   BusinessTypeFanClubGtM = 7;
 }
-enum EnvelopeFollowShowStatus
-{
-  EnvelopeFollowShowUnknown = 0;
-  EnvelopeFollowShow = 1;
-  EnvelopeFollowNotShow = 2;
+enum EnvelopeFollowShowStatus {
+  ENVELOPE_FOLLOW_SHOW_STATUS_ENVELOPE_FOLLOW_SHOW_UNKNOWN = 0;
+  ENVELOPE_FOLLOW_SHOW_STATUS_ENVELOPE_FOLLOW_SHOW = 1;
+  ENVELOPE_FOLLOW_SHOW_STATUS_ENVELOPE_FOLLOW_NOT_SHOW = 2;
 }
 
-enum EnvelopeDisplay
-{
-  EnvelopeDisplayUnknown = 0;
-  EnvelopeDisplayNew = 1;
-  EnvelopeDisplayHide = 2;
+enum EnvelopeDisplay {
+  ENVELOPE_DISPLAY_UNKNOWN = 0;
+  ENVELOPE_DISPLAY_NEW = 1;
+  ENVELOPE_DISPLAY_HIDE = 2;
 }
 
-
 enum CommonContentCase {
   COMMON_CONTENT_NOT_SET = 0;
   CREATE_CHANNEL_CONTENT = 100;
@@ -249,7 +236,6 @@ enum CommonContentCase {
   GROUP_CHANGE_CONTENT = 118;
 }
 
-
 enum LinkMessageType {
   TYPE_LINKER_UNKNOWN = 0;
   TYPE_LINKER_CREATE = 1;
@@ -294,10 +280,544 @@ enum MessageType {
   MESSAGETYPE_SUBGIFTSENDSUCCEEDANCHORNOTICE = 10;
   MESSAGETYPE_SUBGIFTLOWVERSIONUPGRADENOTICE = 11;
   MESSAGETYPE_SUBGIFTUSERBUYAUTHNOTICE = 12;
+  MESSAGETYPE_SUBCOMMONTEXTNOTICE = 13;
+  MESSAGETYPE_SUBMODERATORPINPERK = 14;
 }
 
 enum Scene {
   SCENE_UNKNOWN = 0;
   SCENE_CO_HOST = 2;
   SCENE_MULTI_LIVE = 4;
+}
+
+enum RewardCondition {
+  REWARD_CONDITION_SUBSCRIPTION = 0;
+  REWARD_CONDITION_SUB_WAVE_CUSTOM = 1;
+}
+
+enum UserEmoteUploadSource {
+  USER_EMOTE_UPLOAD_SOURCE_EMOTE_UPLOAD_SOURCE_ANCHOR = 0;
+  USER_EMOTE_UPLOAD_SOURCE_EMOTE_UPLOAD_SOURCE_SUBSCRIBER = 1;
+  USER_EMOTE_UPLOAD_SOURCE_EMOTE_UPLOAD_SOURCE_MODERATOR = 2;
+}
+
+enum EmoteScene {
+  EMOTE_SCENE_SUBSCRIPTION = 0;
+  EMOTE_SCENE_GAME = 1;
+}
+
+enum PunishTypeId {
+  PUNISH_TYPE_IDUN_KNOWN = 0;
+  PUNISH_TYPE_ID_BAN_LINK_MIC = 9;
+  PUNISH_TYPE_ID_BAN_GAME_PARTNERSHIP = 25;
+  PUNISH_TYPE_ID_REMOVE_GAME_PARTNERSHIP = 26;
+  PUNISH_TYPE_ID_BANCO_HOST_LINK_MIC = 55;
+  PUNISH_TYPE_ID_AUTHORITY_LIMIT_MATCH = 57;
+  PUNISH_TYPE_ID_BAN_VOICE_CHAT = 59;
+  PUNISH_TYPE_ID_BAN_LIVE_GOAL = 64;
+  PUNISH_TYPE_ID_VIEWER_LIMIT = 70;
+}
+
+enum MultiplierType {
+  MULTIPLIER_TYPE_UNSPECIFIED = 0;
+  MULTIPLIER_TYPE_CRITICAL_STRIKE = 1;
+  MULTIPLIER_TYPE_TOP_2 = 2;
+  MULTIPLIER_TYPE_TOP_3 = 3;
+}
+
+enum LinkmicGiftExpressionStrategy {
+  LINKMIC_GIFT_EXPRESSION_STRATEGY_CONTROL_V_1 = 0;
+  LINKMIC_GIFT_EXPRESSION_STRATEGY_EXPERIMENT_V_1 = 1;
+  LINKMIC_GIFT_EXPRESSION_STRATEGY_EXPERIMENT_V_2 = 2;
+}
+
+enum GiftMessageVersion {
+  GIFT_MESSAGE_VERSION_0 = 0;
+  GIFT_MESSAGE_VERSION_1 = 1;
+}
+
+enum TagType {
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_UNKNOWN = 0;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_USER_GRADE = 1;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_FANS_LEVEL = 2;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_WATCH_ME_DAYS_AGO = 3;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_CUSTOM = 4;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_TITLE_GIFT = 5;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_FIRST_JOINED_TEAM = 6;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_PAY_ACCOMPANY_DAYS = 7;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_SPONSOR_GIFT_LAST_ROOM = 8;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_MATCH_MVP_LAST_ROOM = 9;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_LARGE_AMOUNT_GIFT_LAST_ROOM = 10;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_COMMENT_LAST_ROOM = 11;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_RECENT_TITLED_GIFT = 12;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_MEET_ANNIVERSARY = 13;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_FANS_SLEEP = 14;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_NOT_SEND_HEART_ME = 15;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_NOT_JOIN_TEAM = 16;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_FIRST_WATCH_LIVE = 17;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_RECENT_COMMENT = 18;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_RECENT_GIFT_TIMES = 19;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_RECENT_WATCH_LIVE_DURATION = 20;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_RECENT_GIFT = 21;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_RECENT_LIVE_CONTRIBUTION_TOP = 22;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_JUST_UPGRADE = 28;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_FAN_TOTAL_WATCH_DURATION = 29;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_FAN_TOTAL_COMMENT_NUM = 30;
+  TAG_TYPE_CREATOR_CR_M_TAG_TYPE_FAN_TOTAL_GIFT_SENT_NUM = 31;
+}
+
+enum TopicActionType {
+  TOPIC_ACTION_TYPE_UNKNOWN = 0;
+  TOPIC_ACTION_TYPE_FOLLOW = 1;
+}
+
+enum UserMetricsType {
+  USER_METRICS_TYPE_UNKNOWN = 0;
+  USER_METRICS_TYPE_GRADE = 1;
+  USER_METRICS_TYPE_SUBSCRIBE = 2;
+  USER_METRICS_TYPE_FOLLOW = 3;
+  USER_METRICS_TYPE_FANS_CLUB = 4;
+  USER_METRICS_TYPE_TOP_VIEWER = 5;
+  USER_METRICS_TYPE_GIFT = 6;
+}
+
+enum GiftMessageIgnoreConfig {
+  GIFT_MESSAGE_IGNORE_CONFIG_NOT_IGNORE = 0;
+  GIFT_MESSAGE_IGNORE_CONFIG_IGNORE_TRAY = 1;
+  GIFT_MESSAGE_IGNORE_CONFIG_IGNORE_PS_M = 2;
+  GIFT_MESSAGE_IGNORE_CONFIG_IGNORE_TRAY_AND_PS_M = 3;
+}
+
+enum HorizontalOnclickTriggerType {
+  HORIZONTAL_ONCLICK_TRIGGER_TYPE_ONCLICK_TRIGGER_TYPE_UNKNOWN = 0;
+  HORIZONTAL_ONCLICK_TRIGGER_TYPE_ONCLICK_TRIGGER_TYPE_LEFT = 1;
+  HORIZONTAL_ONCLICK_TRIGGER_TYPE_ONCLICK_TRIGGER_TYPE_MIDDLE = 2;
+  HORIZONTAL_ONCLICK_TRIGGER_TYPE_ONCLICK_TRIGGER_TYPE_RIGHT = 3;
+  HORIZONTAL_ONCLICK_TRIGGER_TYPE_ONCLICK_TRIGGER_TYPE_ALL_AREA = 4;
+}
+
+enum ShowType {
+  SHOW_TYPE_NORMAL = 0;
+  SHOW_TYPE_FADE_IN_OUT = 1;
+}
+
+enum RenderType {
+  RENDER_TYPE_NATIVE = 0;
+  RENDER_TYPE_HYBRID = 1;
+  RENDER_TYPE_ALPHA = 2;
+}
+
+enum IconDisplayType {
+  ICON_DISPLAY_TYPE_IMAGE = 0;
+  ICON_DISPLAY_TYPE_BADGE = 1;
+}
+
+enum CommentTag {
+  COMMENT_TAG_NORMAL = 0;
+  COMMENT_TAG_CANDIDATE = 1;
+  COMMENT_TAG_OVERAGE = 2;
+}
+
+enum PerceptionDialogIconType {
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_NONE = 0;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_WARNING = 1;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_LINK_MIC = 2;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_GUEST_LINK_MIC = 3;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_LIVE = 4;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_TREASURE_BOX = 5;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_MUTE = 6;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_GAMEPAD_ACCESS_REVOKED = 7;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_BAN_REPORT_LIVE_SINGLE_ROOM = 8;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_BAN_REPORT_LIVE_ALL_ROOM = 9;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_BAN_REPORT_LIVE_GREEN_SCREEN = 10;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_GIFT = 11;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_APPEAL_SUCCESS = 12;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_MATCH = 13;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_LIVE_GOAL = 14;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_SUBSCRIPTION = 15;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_STAR_COMMENT = 16;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_RANKING = 17;
+  PERCEPTION_DIALOG_ICON_TYPE_ICON_TYPE_COMMON = 18;
+}
+
+enum GoalMessageSource {
+  GOAL_MESSAGE_SOURCE_UNKNOWN = 0;
+  GOAL_MESSAGE_SOURCE_COMMIT = 1;
+  GOAL_MESSAGE_SOURCE_PROGRESS_UPDATE = 2;
+  GOAL_MESSAGE_SOURCE_PIN = 3;
+  GOAL_MESSAGE_SOURCE_UNPIN = 4;
+  GOAL_MESSAGE_SOURCE_REVIEW_CALLBACK = 5;
+  GOAL_MESSAGE_SOURCE_SUSPEND = 6;
+  GOAL_MESSAGE_SOURCE_CHALLENGE_PROMPT = 7;
+}
+
+enum ExhibitionType {
+  EXHIBITION_TYPE_DEFAULT = 0;
+  EXHIBITION_TYPE_FOLD = 1;
+  EXHIBITION_TYPE_PUBLIC_SCREEN = 2;
+}
+
+enum GiftSource {
+  GIFT_SOURCE_UNKNOWN = 0;
+  GIFT_SOURCE_PLATFORM = 1;
+  GIFT_SOURCE_USER_BUY_RANDOM = 2;
+  GIFT_SOURCE_USER_BUY_SPECIFIC = 3;
+}
+
+enum MessageDisplayStyle {
+  MESSAGE_DISPLAY_STYLE_DEFAULT = 0;
+  MESSAGE_DISPLAY_STYLE_POPUP = 1;
+}
+
+enum ProfitRankType {
+  PROFIT_RANK_TYPE_TYPE_HOURLY_RANK = 0;
+  PROFIT_RANK_TYPE_TYPE_WEEKLY_RANK = 1;
+  PROFIT_RANK_TYPE_TYPE_HOURLY_STAR_RANK = 2;
+  PROFIT_RANK_TYPE_TYPE_WEEKLY_RISING_RANK_ACTIVITY = 3;
+  PROFIT_RANK_TYPE_TYPE_WEEKLY_RISING_RANK = 4;
+  PROFIT_RANK_TYPE_TYPE_WEEKLY_ROOKIE = 5;
+  PROFIT_RANK_TYPE_TYPE_E_COMMERCE_WEEKLY = 6;
+  PROFIT_RANK_TYPE_TYPE_E_COMMERCE_DAILY = 7;
+  PROFIT_RANK_TYPE_TYPE_DAILY_RANK = 8;
+  PROFIT_RANK_TYPE_TYPE_FIRST_GIFT_RANK = 9;
+  PROFIT_RANK_TYPE_TYPE_GAME_RANK = 10;
+  PROFIT_RANK_TYPE_TYPE_DAILY_GAME = 11;
+  PROFIT_RANK_TYPE_TYPE_HALL_OF_FAME_RANK = 12;
+  PROFIT_RANK_TYPE_TYPE_RANK_LEAGUE = 13;
+  PROFIT_RANK_TYPE_DAILY_ROOKIE = 14;
+  PROFIT_RANK_TYPE_TYPE_TEAM_RANK = 15;
+  PROFIT_RANK_TYPE_TYPE_CLASS_RANK = 16;
+  PROFIT_RANK_TYPE_TYPE_DAILY_GAME_PUB_G = 20;
+  PROFIT_RANK_TYPE_TYPE_DAILY_GAME_MLB_B = 21;
+  PROFIT_RANK_TYPE_TYPE_DAILY_GAME_FREE_FIRE = 22;
+  PROFIT_RANK_TYPE_TYPE_WEEKLY_GAME_SUBCATEGORY_ONE = 23;
+  PROFIT_RANK_TYPE_TYPE_WEEKLY_GAME_SUBCATEGORY_TWO = 24;
+  PROFIT_RANK_TYPE_TYPE_WEEKLY_GAME_SUBCATEGORY_THREE = 25;
+}
+
+enum UnionAnimationInfoType {
+  UNION_ANIMATION_INFO_TYPE_NO_UNION_ANIMATION = 0;
+  UNION_ANIMATION_INFO_TYPE_LOOP = 1;
+  UNION_ANIMATION_INFO_TYPE_LOCK = 2;
+}
+
+enum DisplayStyle {
+  DISPLAY_STYLE_NORMAL = 0;
+  DISPLAY_STYLE_STAY = 1;
+  DISPLAY_STYLE_CHAT = 2;
+}
+
+enum HitABStatus {
+  HIT_A_B_STATUS_HIT_AB_STATUS_NO_HIT = 0;
+  HIT_A_B_STATUS_HIT_AB_STATUS_ENTER_FROM_EXTERNAL_LINK_NEW_TEXT = 1;
+  HIT_A_B_STATUS_HIT_AB_STATUS_ENTER_FROM_RE_POST_NEW_TEXT = 2;
+}
+
+enum PollKind {
+  POLL_KIND_NORMAL = 0;
+  POLL_KIND_GIFT = 1;
+  POLL_KIND_CUSTOMIZABLE = 2;
+  POLL_KIND_CUSTOMIZABLE_GIFT = 3;
+  POLL_KIND_QUICK_GIFT = 4;
+  POLL_KIND_EMOTE = 5;
+}
+
+enum PollTemplateStatus {
+  POLL_TEMPLATE_STATUS_TO_BE_REVIEWED = 0;
+  POLL_TEMPLATE_STATUS_UNDER_REVIEW = 1;
+  POLL_TEMPLATE_STATUS_REVIEWED = 2;
+  POLL_TEMPLATE_STATUS_REFUSED = 3;
+}
+
+enum PollAppealStatus {
+  POLL_APPEAL_STATUS_UNKNOWN = 0;
+  POLL_APPEAL_STATUS_PASS = 1;
+  POLL_APPEAL_STATUS_FAIL = 2;
+}
+
+enum RankTestMessageScene {
+  RANK_TEST_MESSAGE_SCENE_UNKNOWN = 0;
+  RANK_TEST_MESSAGE_SCENE_ONLINE_AUDIENCE_TOP_N_UPDATE_PUBLIC_SCREEN = 1;
+}
+
+enum TriggerReason {
+  TRIGGER_REASON_UNKNOWN = 0;
+  TRIGGER_REASON_SCORE_UPDATE = 1;
+  TRIGGER_REASON_BATTLE_END = 2;
+  TRIGGER_REASON_OPT_OUT_UPDATE = 3;
+  TRIGGER_REASON_KEEP_ALIVE = 4;
+}
+
+enum Reason {
+  REASON_TIME_UP = 0;
+  REASON_CUT_SHORT = 1;
+}
+
+enum BattleTaskMessageType {
+  BATTLE_TASK_MESSAGE_TYPE_START = 0;
+  BATTLE_TASK_MESSAGE_TYPE_TASK_UPDATE = 1;
+  BATTLE_TASK_MESSAGE_TYPE_TASK_SETTLE = 2;
+  BATTLE_TASK_MESSAGE_TYPE_REWARD_SETTLE = 3;
+}
+
+enum RewardStatus {
+  REWARD_STATUS_SUCCEED = 0;
+  REWARD_STATUS_FAILED = 1;
+}
+
+enum BattleAction {
+  BATTLE_ACTION_UNKNOWN = 0;
+  BATTLE_ACTION_INVITE = 1;
+  BATTLE_ACTION_REJECT = 2;
+  BATTLE_ACTION_CANCEL = 3;
+  BATTLE_ACTION_OPEN = 4;
+  BATTLE_ACTION_FINISH = 5;
+  BATTLE_ACTION_CUT_SHORT = 6;
+  BATTLE_ACTION_ACCEPT = 7;
+  BATTLE_ACTION_QUIT_APPLY = 8;
+  BATTLE_ACTION_DECLINE_QUIT = 9;
+  BATTLE_ACTION_DECLINE_OFF_QUIT = 10;
+  BATTLE_ACTION_LEAVE_LINK_MIC = 11;
+}
+
+enum Result {
+  RESULT_WIN = 0;
+  RESULT_LOSE = 1;
+  RESULT_DRAW = 2;
+}
+
+enum GiftPermissionType {
+  GIFT_PERMISSION_TYPE_UNKNOWN_TYPE = 0;
+  GIFT_PERMISSION_TYPE_NO_GIFT_PERMISSION = 1;
+  GIFT_PERMISSION_TYPE_ANCHOR_CLOSE = 2;
+  GIFT_PERMISSION_TYPE_HAS_GIFT_PERMISSION = 3;
+  GIFT_PERMISSION_TYPE_ANCHOR_BANNED = 4;
+}
+
+enum BattleABTestType {
+  BATTLE_A_B_TEST_TYPE_UNKNOWN_AB_TEST_TYPE = 0;
+  BATTLE_A_B_TEST_TYPE_MEANWHILE_INVITE = 1;
+  BATTLE_A_B_TEST_TYPE_SPECIFIED_GIFT = 2;
+  BATTLE_A_B_TEST_TYPE_RT_C_MESSAGE_CHANNEL = 3;
+  BATTLE_A_B_TEST_TYPE_CONNECTION_TIME_OUT = 4;
+  BATTLE_A_B_TEST_TYPE_REMATCH_SKIP_TEAMMATE = 5;
+  BATTLE_A_B_TEST_TYPE_OPT_INVITEE_4048 = 6;
+  BATTLE_A_B_TEST_TYPE_BATTLE_AB_TEST_TYPE_TIME_CALIBRATE = 7;
+}
+
+enum PlayScene {
+  PLAY_SCENE_UNKNOWN = 0;
+  PLAY_SCENE_COUNTDOWN_FOR_ALL = 1;
+  PLAY_SCENE_COUNTDOWN_FOR_SINGLE = 2;
+  PLAY_SCENE_LIVE_SHOW = 3;
+  PLAY_SCENE_AIG_C = 4;
+  PLAY_SCENE_KARAOKE = 5;
+  PLAY_SCENE_DRAW_GUESS = 6;
+  PLAY_SCENE_ENLARGE_GRID = 7;
+  PLAY_SCENE_GIFT_PRIORITY_LINK = 8;
+  PLAY_SCENE_GIFT_THRESHOLD_LINK = 9;
+  PLAY_SCENE_NOTICE_BOARD = 10;
+  PLAY_SCENE_PLAY_BOOK = 11;
+  PLAY_SCENE_GUEST_SHOWDOWN = 12;
+}
+
+enum LinkType {
+  LINK_TYPE_TYPE_UNKNOWN = 0;
+  LINK_TYPE_TYPE_VIDEO = 1;
+  LINK_TYPE_TYPE_AUDIO = 2;
+  LINK_TYPE_TYPE_VIRTUAL = 3;
+}
+
+enum LinkSilenceStatus {
+  LINK_SILENCE_STATUS_STATUS_UN_SILENCE = 0;
+  LINK_SILENCE_STATUS_STATUS_SILENCE_BY_SELF = 1;
+  LINK_SILENCE_STATUS_STATUS_SILENCE_BY_OWNER = 2;
+}
+
+enum LinkmicRoleType {
+  LINKMIC_ROLE_TYPE_ROLE_TYPE_UNKOWN = 0;
+  LINKMIC_ROLE_TYPE_LEADER = 1;
+  LINKMIC_ROLE_TYPE_PLAYER = 2;
+  LINKMIC_ROLE_TYPE_INVITEE = 3;
+}
+
+enum LinkRoleType {
+  LINK_ROLE_TYPE_TYPE_ROLE_TYPE_UNKOWN = 0;
+  LINK_ROLE_TYPE_TYPE_LEADER = 1;
+  LINK_ROLE_TYPE_TYPE_PLAYER = 2;
+  LINK_ROLE_TYPE_TYPE_INVITEE = 3;
+  LINK_ROLE_TYPE_TYPE_APPLIER = 4;
+}
+
+enum MuteStatus {
+  MUTE_STATUS_MUTE = 0;
+  MUTE_STATUS_UN_MUTE = 1;
+}
+
+enum GuestMicCameraManageOp {
+  GUEST_MIC_CAMERA_MANAGE_OP_OPEN_MIC = 0;
+  GUEST_MIC_CAMERA_MANAGE_OP_OPEN_CAMERA = 1;
+  GUEST_MIC_CAMERA_MANAGE_OP_CLOSE_MIC = 2;
+  GUEST_MIC_CAMERA_MANAGE_OP_CLOSE_CAMERA = 3;
+  GUEST_MIC_CAMERA_MANAGE_OP_CLOSE_MIC_PUNISH = 4;
+}
+
+enum GuestMicCameraChangeScene {
+  GUEST_MIC_CAMERA_CHANGE_SCENE_CHANGE_SCENE_UNKNOWN = 0;
+  GUEST_MIC_CAMERA_CHANGE_SCENE_LIVE_SHOW_BY_ANCHOR_AUTO = 1;
+  GUEST_MIC_CAMERA_CHANGE_SCENE_LIVE_SHOW_BY_SERVER_NORMAL = 2;
+  GUEST_MIC_CAMERA_CHANGE_SCENE_LIVE_SHOW_BY_SHOW_END = 3;
+}
+
+enum LinkMicUserAdminType {
+  LINK_MIC_USER_ADMIN_TYPE_UNDEFINED_TYPE = 0;
+  LINK_MIC_USER_ADMIN_TYPE_MANAGER_TYPE = 1;
+  LINK_MIC_USER_ADMIN_TYPE_HOST_TYPE = 2;
+}
+
+enum LinkmicMultiLiveEnum {
+  LINKMIC_MULTI_LIVE_ENUM_DEFAULT = 0;
+  LINKMIC_MULTI_LIVE_ENUM_ANCHOR_USE_NEW_LAYOUT = 1;
+}
+
+enum PollEndType {
+  POLL_END_TYPE_POLL_END_BY_TIME = 0;
+  POLL_END_TYPE_POLL_END_BY_OWNER = 1;
+  POLL_END_TYPE_POLL_END_BY_OTHER = 2;
+  POLL_END_TYPE_POLL_END_BY_ADMIN = 3;
+}
+
+enum CohostABTestType {
+  COHOST_A_B_TEST_TYPE_COHOST_AB_TEST_TYPE_UNKNOWN = 0;
+  COHOST_A_B_TEST_TYPE_COHOST_AB_TEST_TYPE_LINK_TIME_OUT_STRATEGY = 1;
+  COHOST_A_B_TEST_TYPE_COHOST_AB_TEST_TYPE_COHOST_RESERVATION = 2;
+  COHOST_A_B_TEST_TYPE_COHOST_AB_TEST_TYPE_QUICK_PAIR_NEW_ARCH_SWITCH = 3;
+  COHOST_A_B_TEST_TYPE_COHOST_AB_TEST_TYPE_COHOST_INVITATION_TEXT = 4;
+}
+
+enum OptPairStatus {
+  OPT_PAIR_STATUS_UNKNOWN = 0;
+  OPT_PAIR_STATUS_OFFLINE = 1;
+  OPT_PAIR_STATUS_FINISHED = 2;
+}
+
+enum ContentPositionType {
+  CONTENT_POSITION_TYPE_UNKNOWN = 0;
+  CONTENT_POSITION_TYPE_STREAM = 1;
+  CONTENT_POSITION_TYPE_LIVE_STUDIO_STREAM_PORTRAIT = 2;
+  CONTENT_POSITION_TYPE_LIVE_STUDIO_STREAM_LANDSCAPE = 3;
+}
+
+enum MultiGuestOutsideRoomInviteSource {
+  MULTI_GUEST_OUTSIDE_ROOM_INVITE_SOURCE_OUTSIDE_ROOM_INVITE_SOURCE_UNKNOWN = 0;
+  MULTI_GUEST_OUTSIDE_ROOM_INVITE_SOURCE_OUTSIDE_ROOM_INVITE_SOURCE_PANEL = 1;
+  MULTI_GUEST_OUTSIDE_ROOM_INVITE_SOURCE_OUTSIDE_ROOM_INVITE_SOURCE_CAPSULE = 2;
+  MULTI_GUEST_OUTSIDE_ROOM_INVITE_SOURCE_OUTSIDE_ROOM_INVITE_SOURCE_EMPTY_POSITION = 3;
+}
+
+enum LinkUserType {
+  LINK_USER_TYPE_DEFAULT = 0;
+  LINK_USER_TYPE_KARAOKE = 1;
+}
+
+enum ContentInviteSource {
+  CONTENT_INVITE_SOURCE_INVITE_SOURCE_UNKNOWN = 0;
+  CONTENT_INVITE_SOURCE_INVITE_SOURCE_PANEL_GO_LIVE = 1;
+  CONTENT_INVITE_SOURCE_INVITE_SOURCE_MUTUAL_NOTICE = 2;
+  CONTENT_INVITE_SOURCE_INVITE_SOURCE_USER_PROFILE = 3;
+  CONTENT_INVITE_SOURCE_INVITE_SOURCE_RESERVE = 4;
+}
+
+enum LinkmicShareRevenueSetting {
+  LINKMIC_SHARE_REVENUE_SETTING_LINK_MIC_SHARE_REVENUE_NOT_SET = 0;
+  LINKMIC_SHARE_REVENUE_SETTING_LINK_MIC_SHARE_REVENUE_OPEN = 1;
+  LINKMIC_SHARE_REVENUE_SETTING_LINK_MIC_SHARE_REVENUE_CLOSE = 2;
+}
+
+enum PosIdentityType {
+  POS_IDENTITY_TYPE_IDENTITY_EMPTY_SLOT = 0;
+  POS_IDENTITY_TYPE_IDENTITY_RT_C_USER_ID = 1;
+  POS_IDENTITY_TYPE_IDENTITY_RT_C_STREAM_ID = 2;
+  POS_IDENTITY_TYPE_IDENTITY_LIVE_USER_ID = 3;
+}
+
+enum JoinType {
+  JOIN_TYPE_UNKNOWN = 0;
+  JOIN_TYPE_CHANNEL_APPLY = 1;
+  JOIN_TYPE_CHANNEL_INVITE = 2;
+  JOIN_TYPE_GROUP_APPLY = 100;
+  JOIN_TYPE_GROUP_APPLY_FOLLOW = 101;
+  JOIN_TYPE_GROUP_INVITE = 102;
+  JOIN_TYPE_GROUP_INVITE_FOLLOW = 103;
+  JOIN_TYPE_GROUP_OWNER_JOIN = 104;
+}
+
+enum CohostLayoutMode {
+  COHOST_LAYOUT_MODE_NORMAL = 0;
+  COHOST_LAYOUT_MODE_SCREEN_SHARE = 1;
+}
+
+enum TagClassification {
+  TAG_CLASSIFICATION_UNKNOWN = 0;
+  TAG_CLASSIFICATION_COHOST_HISTORY = 1;
+  TAG_CLASSIFICATION_FIRST_DEGREE_RELATION = 2;
+  TAG_CLASSIFICATION_SECOND_DEGREE_RELATION = 3;
+  TAG_CLASSIFICATION_RANK = 4;
+  TAG_CLASSIFICATION_SIMILAR_INTERESTS = 5;
+}
+
+enum SourceType {
+  SOURCE_TYPE_UNKNOWN = 0;
+  SOURCE_TYPE_FRIEND_LIST = 1;
+  SOURCE_TYPE_RECOMMEND_LIST = 2;
+  SOURCE_TYPE_RECENT = 3;
+  SOURCE_TYPE_OTHER_FOLLOW = 4;
+  SOURCE_TYPE_QUICK_PAIR = 5;
+  SOURCE_TYPE_ACTIVITY = 6;
+  SOURCE_TYPE_QUICK_RECOMMEND = 7;
+  SOURCE_TYPE_OFFICIAL_CHANNEL = 8;
+  SOURCE_TYPE_BEST_TEAMMATE = 9;
+  SOURCE_TYPE_RESERVATION = 10;
+  SOURCE_TYPE_PAIRING = 11;
+  SOURCE_TYPE_PAIRING_ON_RESERVATION = 12;
+  SOURCE_TYPE_TOPIC_QUICK_PAIR = 13;
+  SOURCE_TYPE_TOPIC_QUICK_RECOMMEND = 14;
+  SOURCE_TYPE_ONLINE_FRIEND_CAPSULE = 15;
+  SOURCE_TYPE_WEEKLY_RANK = 20;
+  SOURCE_TYPE_HOURLY_RANK = 21;
+  SOURCE_TYPE_WEEKLY_RISING = 23;
+  SOURCE_TYPE_WEEKLY_ROOKIE = 24;
+  SOURCE_TYPE_CONNECTION_LIST = 25;
+  SOURCE_TYPE_DAILY_RANK = 26;
+  SOURCE_TYPE_DAILY_RANK_HALL_OF_FAME = 27;
+  SOURCE_TYPE_RESERVATION_BUBBLE = 28;
+  SOURCE_TYPE_PAIRING_BUBBLE = 29;
+  SOURCE_TYPE_LEAGUE_PHASE_ONE = 30;
+  SOURCE_TYPE_LEAGUE_PHASE_TWO = 31;
+  SOURCE_TYPE_LEAGUE_PHASE_THREE = 32;
+  SOURCE_TYPE_DAILY_ROOKIE = 33;
+  SOURCE_TYPE_MAY_KNOW_LIST = 34;
+  SOURCE_TYPE_BANNER = 35;
+  SOURCE_TYPE_FANS_TEAM_RANK = 36;
+  SOURCE_TYPE_SEARCH = 37;
+  SOURCE_TYPE_E_OY_RANK_LIST = 38;
+  SOURCE_TYPE_LEAGUE_CAMPAIGN_RANK = 39;
+  SOURCE_TYPE_CREATOR_CLASS_RANK = 40;
+  SOURCE_TYPE_HISTORY = 41;
+  SOURCE_TYPE_QUICK_RECOMMEND_DURING_COHOST = 43;
+}
+
+enum BattleType {
+  BATTLE_TYPE_UNKNOWN_BATTLE_TYPE = 0;
+  BATTLE_TYPE_NORMAL_BATTLE = 1;
+  BATTLE_TYPE_TEAM_BATTLE = 2;
+  BATTLE_TYPE_INDIVIDUAL_BATTLE = 3;
+  BATTLE_TYPE_1_V_N = 4;
+  BATTLE_TYPE_TAKE_THE_STAGE = 51;
+  BATTLE_TYPE_GROUP_SHOW = 52;
+}
+
+enum BattleInviteType {
+  BATTLE_INVITE_TYPE_NORMAL = 0;
+  BATTLE_INVITE_TYPE_AGAIN = 1;
 }

Client/pom.xml

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

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

@@ -31,9 +31,9 @@ import io.github.jwdeveloper.tiktok.data.requests.*;
 import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
 import io.github.jwdeveloper.tiktok.exceptions.*;
 import io.github.jwdeveloper.tiktok.http.LiveHttpClient;
-import io.github.jwdeveloper.tiktok.listener.*;
+import io.github.jwdeveloper.tiktok.listener.ListenersManager;
 import io.github.jwdeveloper.tiktok.live.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 import io.github.jwdeveloper.tiktok.models.ConnectionState;
 import io.github.jwdeveloper.tiktok.websocket.LiveSocketClient;
 import lombok.Getter;
@@ -140,7 +140,7 @@ public class TikTokLiveClient implements LiveClient
         var preconnectEvent = new TikTokPreConnectionEvent(userData, liveData);
         tikTokEventHandler.publish(this, preconnectEvent);
         if (preconnectEvent.isCancelConnection())
-            throw new TikTokLiveException("TikTokPreConnectionEvent cancelled connection!");
+            throw new TikTokLivePreConnectionException(preconnectEvent);
 
         if (clientSettings.isFetchGifts())
             giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
@@ -153,13 +153,12 @@ public class TikTokLiveClient implements LiveClient
         tikTokEventHandler.publish(this, new TikTokRoomInfoEvent(roomInfo));
     }
 
-    public void disconnect() {
-        if (roomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) {
-            return;
-        }
-        setState(ConnectionState.DISCONNECTED);
-        webSocketClient.stop();
-    }
+    public void disconnect(int type) {
+        if (webSocketClient.isConnected())
+            webSocketClient.stop(type);
+		if (!roomInfo.hasConnectionState(ConnectionState.DISCONNECTED))
+			setState(ConnectionState.DISCONNECTED);
+	}
 
     private void setState(ConnectionState connectionState) {
         logger.info("TikTokLive client state: " + connectionState.name());
@@ -174,17 +173,16 @@ public class TikTokLiveClient implements LiveClient
     public void publishMessage(String webcastMessageName, String payloadBase64) {
         this.publishMessage(webcastMessageName, Base64.getDecoder().decode(payloadBase64));
     }
+
     @Override
     public void publishMessage(String webcastMessageName, byte[] payload) {
-
-        var builder = WebcastResponse.Message.newBuilder();
+        var builder = ProtoMessageFetchResult.BaseProtoMessage.newBuilder();
         builder.setMethod(webcastMessageName);
         builder.setPayload(ByteString.copyFrom(payload));
         var message = builder.build();
         messageHandler.handleSingleMessage(this, message);
     }
 
-
     public void connectAsync(Consumer<LiveClient> onConnection) {
         connectAsync().thenAccept(onConnection);
     }

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

@@ -30,7 +30,7 @@ import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
 import io.github.jwdeveloper.tiktok.exceptions.*;
 import io.github.jwdeveloper.tiktok.http.*;
 import io.github.jwdeveloper.tiktok.http.mappers.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 
 import java.net.http.HttpResponse;
 import java.util.function.Consumer;
@@ -113,6 +113,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             .withParam("uniqueId", request.getUserName())
             .withParam("sourceType", "54") //MAGIC NUMBER, WHAT 54 means?
             .withCookie("sessionid", clientSettings.getSessionId())
+            .withCookie("tt-target-idc", clientSettings.getTtTargetIdc())
             .build()
             .toJsonResponse();
 
@@ -141,6 +142,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
         var result = httpFactory.client(url)
             .withParam("room_id", request.getRoomId())
             .withCookie("sessionid", clientSettings.getSessionId())
+            .withCookie("tt-target-idc", clientSettings.getTtTargetIdc())
             .build()
             .toJsonResponse();
 
@@ -163,7 +165,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
                 throw new TikTokSignServerException("Sign server did not return the x-set-tt-cookie header - "+result);
             }
             var websocketCookie = resultHeader.getContent();
-            var webcastResponse = WebcastResponse.parseFrom(credentialsResponse.body());
+            var webcastResponse = ProtoMessageFetchResult.parseFrom(credentialsResponse.body());
             var webSocketUrl = httpFactory
                     .client(webcastResponse.getPushServer())
                     .withParam("room_id", request.getRoomId())
@@ -197,6 +199,8 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             .withParam("client", "ttlive-java")
             .withParam("room_id", room_id);
 
+        if (clientSettings.getSessionId() != null) // Allows receiving of all comments and Subscribe Events
+            builder.withParam("session_id", clientSettings.getSessionId());
         if (clientSettings.getApiKey() != null)
             builder.withParam("apiKey", clientSettings.getApiKey());
 

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

@@ -24,12 +24,9 @@ package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.data.requests.GiftsData;
-import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
-import io.github.jwdeveloper.tiktok.data.requests.LiveData;
-import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
+import io.github.jwdeveloper.tiktok.data.requests.*;
 import io.github.jwdeveloper.tiktok.http.LiveHttpClient;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 
 import java.net.URI;
 import java.util.List;
@@ -62,6 +59,6 @@ public class TikTokLiveHttpOfflineClient implements LiveHttpClient {
     public LiveConnectionData.Response fetchLiveConnectionData(LiveConnectionData.Request request) {
         return new LiveConnectionData.Response("",
                 URI.create("https://example.live"),
-                WebcastResponse.newBuilder().build());
+                ProtoMessageFetchResult.newBuilder().build());
     }
 }

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

@@ -25,15 +25,11 @@ package io.github.jwdeveloper.tiktok;
 
 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.data.events.websocket.*;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
-import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.live.LiveEventsHandler;
-import io.github.jwdeveloper.tiktok.live.LiveMessagesHandler;
+import io.github.jwdeveloper.tiktok.live.*;
 import io.github.jwdeveloper.tiktok.mappers.LiveMapper;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 import io.github.jwdeveloper.tiktok.utils.Stopwatch;
 
 import java.time.Duration;
@@ -48,7 +44,7 @@ public class TikTokLiveMessageHandler implements LiveMessagesHandler {
         this.mapper = mapper;
     }
 
-    public void handle(LiveClient client, WebcastResponse webcastResponse) {
+    public void handle(LiveClient client, ProtoMessageFetchResult webcastResponse) {
         tikTokEventHandler.publish(client, new TikTokWebsocketResponseEvent(webcastResponse));
         for (var message : webcastResponse.getMessagesList()) {
             try {
@@ -60,7 +56,7 @@ public class TikTokLiveMessageHandler implements LiveMessagesHandler {
         }
     }
 
-    public void handleSingleMessage(LiveClient client, WebcastResponse.Message message) {
+    public void handleSingleMessage(LiveClient client, ProtoMessageFetchResult.BaseProtoMessage message) {
         var messageClassName = message.getMethod();
         if (!mapper.isRegistered(messageClassName)) {
             tikTokEventHandler.publish(client, new TikTokWebsocketUnhandledMessageEvent(message));

Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/handlers/TikTokCommonEventHandler.java

@@ -25,18 +25,14 @@ package io.github.jwdeveloper.tiktok.mappers.handlers;
 import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEndEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollStartEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollUpdateEvent;
+import io.github.jwdeveloper.tiktok.data.events.poll.*;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent;
 import io.github.jwdeveloper.tiktok.data.models.chest.Chest;
 import io.github.jwdeveloper.tiktok.messages.enums.EnvelopeDisplay;
 import io.github.jwdeveloper.tiktok.messages.webcast.*;
 import lombok.SneakyThrows;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 public class TikTokCommonEventHandler
 {
@@ -55,7 +51,7 @@ public class TikTokCommonEventHandler
     @SneakyThrows
     public TikTokEvent handlePinMessage(byte[] msg) {
         var pinMessage = WebcastRoomPinMessage.parseFrom(msg);
-        var chatMessage = WebcastChatMessage.parseFrom(pinMessage.getPinnedMessage());
+        var chatMessage = pinMessage.getChatMessage();
         var chatEvent = new TikTokCommentEvent(chatMessage);
         return new TikTokRoomPinEvent(pinMessage, chatEvent);
     }
@@ -75,7 +71,7 @@ public class TikTokCommonEventHandler
     @SneakyThrows
     public List<TikTokEvent> handleEnvelop(byte[] data) {
         var msg = WebcastEnvelopeMessage.parseFrom(data);
-        if (msg.getDisplay() != EnvelopeDisplay.EnvelopeDisplayNew) {
+        if (msg.getDisplay() != EnvelopeDisplay.ENVELOPE_DISPLAY_NEW) {
             return Collections.emptyList();
         }
         var totalDiamonds = msg.getEnvelopeInfo().getDiamondCount();

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

@@ -26,10 +26,9 @@ import io.github.jwdeveloper.tiktok.data.dto.ProxyData;
 import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
 import io.github.jwdeveloper.tiktok.data.settings.*;
 import io.github.jwdeveloper.tiktok.exceptions.*;
-import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.live.LiveEventsHandler;
-import io.github.jwdeveloper.tiktok.live.LiveMessagesHandler;
+import io.github.jwdeveloper.tiktok.live.*;
 import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.framing.CloseFrame;
 
 import javax.net.ssl.*;
 import java.net.Proxy;
@@ -42,7 +41,6 @@ public class TikTokWebSocketClient implements LiveSocketClient {
     private final LiveEventsHandler tikTokEventHandler;
     private final WebSocketHeartbeatTask heartbeatTask;
     private WebSocketClient webSocketClient;
-    private boolean isConnected;
 
     public TikTokWebSocketClient(
             LiveClientSettings clientSettings,
@@ -54,25 +52,23 @@ public class TikTokWebSocketClient implements LiveSocketClient {
         this.messageHandler = messageHandler;
         this.tikTokEventHandler = tikTokEventHandler;
         this.heartbeatTask = heartbeatTask;
-        isConnected = false;
     }
 
     @Override
     public void start(LiveConnectionData.Response connectionData, LiveClient liveClient) {
-        if (isConnected) {
-            stop();
-        }
+        if (isConnected())
+			stop(0);
 
         messageHandler.handle(liveClient, connectionData.getWebcastResponse());
 
         var headers = new HashMap<>(clientSettings.getHttpSettings().getHeaders());
         headers.put("Cookie", connectionData.getWebsocketCookies());
         webSocketClient = new TikTokWebSocketListener(connectionData.getWebsocketUrl(),
-                headers,
-                clientSettings.getHttpSettings().getTimeout().toMillisPart(),
-                messageHandler,
-                tikTokEventHandler,
-                liveClient);
+            headers,
+            clientSettings.getHttpSettings().getTimeout().toMillisPart(),
+            messageHandler,
+            tikTokEventHandler,
+            liveClient);
 
         ProxyClientSettings proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled() && proxyClientSettings.isAllowWebsocket())
@@ -85,9 +81,7 @@ public class TikTokWebSocketClient implements LiveSocketClient {
         try {
             webSocketClient.connect();
             heartbeatTask.run(webSocketClient, clientSettings.getPingInterval());
-            isConnected = true;
         } catch (Exception e) {
-            isConnected = false;
             throw new TikTokLiveException("Failed to connect to the websocket", e);
         }
     }
@@ -117,14 +111,12 @@ public class TikTokWebSocketClient implements LiveSocketClient {
             ProxyData proxyData = proxySettings.next();
 			if (tryProxyConnection(proxySettings, proxyData)) {
 				heartbeatTask.run(webSocketClient, clientSettings.getPingInterval());
-				isConnected = true;
-				break;
+				return;
 			}
             if (proxySettings.isAutoDiscard())
                 proxySettings.remove();
 		}
-        if (!isConnected)
-            throw new TikTokLiveException("Failed to connect to the websocket");
+        throw new TikTokLiveException("Failed to connect to the websocket");
     }
 
     public boolean tryProxyConnection(ProxyClientSettings proxySettings, ProxyData proxyData) {
@@ -137,12 +129,25 @@ public class TikTokWebSocketClient implements LiveSocketClient {
         }
     }
 
-    public void stop() {
-        if (isConnected && webSocketClient != null && webSocketClient.isOpen()) {
-            webSocketClient.closeConnection(0, "");
+    public void stop(int type) {
+        if (isConnected()) {
+            switch (type) {
+				case 1 -> {
+					try {
+						webSocketClient.closeBlocking();
+					} catch (InterruptedException e) {
+                        throw new TikTokLiveException("Failed to stop the websocket");
+                    }
+				}
+                case 2 -> webSocketClient.closeConnection(CloseFrame.NORMAL, "");
+                default -> webSocketClient.close();
+            }
             heartbeatTask.stop();
         }
         webSocketClient = null;
-        isConnected = false;
+    }
+
+    public boolean isConnected() {
+        return webSocketClient != null && webSocketClient.isOpen();
     }
 }

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

@@ -121,11 +121,11 @@ public class TikTokWebSocketListener extends WebSocketClient {
         }
     }
 
-    private WebcastResponse getWebResponseMessage(ByteString buffer) {
+    private ProtoMessageFetchResult getWebResponseMessage(ByteString buffer) {
         try {
-            return WebcastResponse.parseFrom(buffer);
+            return ProtoMessageFetchResult.parseFrom(buffer);
         } catch (Exception e) {
-            throw new TikTokProtocolBufferException("Unable to parse WebcastResponse", buffer.toByteArray(), e);
+            throw new TikTokProtocolBufferException("Unable to parse ProtoMessageFetchResult", buffer.toByteArray(), e);
         }
     }
 

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

@@ -44,10 +44,13 @@ public class TikTokWebSocketOfflineClient implements LiveSocketClient {
     }
 
     @Override
-    public void stop() {
-        if (liveClient == null) {
-            return;
-        }
-        handler.publish(liveClient, new TikTokDisconnectedEvent("Stopping"));
+    public void stop(int type) {
+		if (liveClient != null)
+			handler.publish(liveClient, new TikTokDisconnectedEvent("Stopping"));
+	}
+
+    @Override
+    public boolean isConnected() {
+        return false;
     }
 }

Client/src/test/java/io/github/jwdeveloper/tiktok/handlers/events/TikTokGiftEventHandlerTest.java

@@ -30,7 +30,6 @@ import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
 import io.github.jwdeveloper.tiktok.data.models.gifts.GiftComboStateType;
 import io.github.jwdeveloper.tiktok.gifts.TikTokGiftsManager;
 import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler;
-import io.github.jwdeveloper.tiktok.messages.data.GiftStruct;
 import io.github.jwdeveloper.tiktok.messages.data.Image;
 import io.github.jwdeveloper.tiktok.messages.data.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
@@ -111,7 +110,7 @@ class TikTokGiftEventHandlerTest {
                                              int userId,
                                              boolean streakable) {
         var builder = WebcastGiftMessage.newBuilder();
-        var giftBuilder = GiftStruct.newBuilder();
+        var giftBuilder = io.github.jwdeveloper.tiktok.messages.data.Gift.newBuilder();
         var userBuilder = User.newBuilder();
 
 
@@ -129,4 +128,4 @@ class TikTokGiftEventHandlerTest {
     }
 
 
-}
+}

README.md

@@ -70,7 +70,7 @@ Maven
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.9.1-Release</version>
+             <version>1.10.0-Release</version>
             <scope>compile</scope>
         </dependency>
    </dependencies>
@@ -87,7 +87,7 @@ dependencyResolutionManagement {
 	}
 
 dependencies {
-	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.9.1-Release'
+	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.10.0-Release'
 	}
 ```
 

examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.9.0-Release</version>
+        <version>1.10.5-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -72,12 +72,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>io.github.jwdeveloper.tiktok</groupId>
-            <artifactId>extension-collector</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <properties>

extension-collector/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
         <artifactId>TikTokLiveJava</artifactId>
-        <version>1.9.0-Release</version>
+        <version>1.10.5-Release</version>
     </parent>
 
 
@@ -30,12 +30,6 @@
             <artifactId>mongodb-driver-sync</artifactId>
             <version>4.4.0</version>
         </dependency>
-        <dependency>
-            <groupId>io.github.jwdeveloper.tiktok</groupId>
-            <artifactId>API</artifactId>
-            <version>1.9.0-Release</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>

extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/impl/DataCollectorListener.java

@@ -29,16 +29,14 @@ import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
-import io.github.jwdeveloper.tiktok.extension.collector.api.LiveDataCollector;
-import io.github.jwdeveloper.tiktok.extension.collector.api.Storage;
+import io.github.jwdeveloper.tiktok.extension.collector.api.*;
 import io.github.jwdeveloper.tiktok.extension.collector.api.settings.CollectorListenerSettings;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 import io.github.jwdeveloper.tiktok.utils.JsonUtil;
 import org.bson.Document;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import java.io.*;
 import java.time.LocalDateTime;
 import java.util.Base64;
 
@@ -77,12 +75,12 @@ public class DataCollectorListener implements LiveDataCollector {
         includeError(liveClient, event);
     }
 
-    private void includeResponse(LiveClient liveClient, WebcastResponse message) {
+    private void includeResponse(LiveClient liveClient, ProtoMessageFetchResult message) {
         var messageContent = Base64.getEncoder().encodeToString(message.toByteArray());
         insertDocument(liveClient, createDocument("response", "webcast", messageContent));
     }
 
-    private void includeMessage(LiveClient liveClient, WebcastResponse.Message message) {
+    private void includeMessage(LiveClient liveClient, ProtoMessageFetchResult.BaseProtoMessage message) {
         var method = message.getMethod();
         var messageContent = Base64.getEncoder().encodeToString(message.getPayload().toByteArray());
         insertDocument(liveClient, createDocument("message", method, messageContent));

extension-recorder/pom.xml

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

extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java

@@ -63,12 +63,14 @@ public class RecorderListener implements LiveRecorder {
 
         liveClient.getLogger().info("Searching for live download url");
         downloadData = settings.getPrepareDownloadData() != null ?
-                settings.getPrepareDownloadData().apply(json) :
-                mapToDownloadData(json);
+            settings.getPrepareDownloadData().apply(json) :
+            mapToDownloadData(json);
 
-        if (downloadData.getDownloadLiveUrl().isEmpty())
-            liveClient.getLogger().warning("Unable to find download live url!");
-        else
+        if (downloadData.getDownloadLiveUrl().isEmpty()) {
+			liveClient.getLogger().warning("Unable to find download live url!");
+            if (settings.isCancelConnectionIfNotFound())
+                event.setCancelConnection(true, "Unable to find download live url!");
+		} else
             liveClient.getLogger().info("Live download url found!");
     }
 

extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/RecorderSettings.java

@@ -40,6 +40,10 @@ public class RecorderSettings {
     private File outputFile;
     private Function<String,DownloadData> prepareDownloadData;
     private boolean stopOnDisconnect = true;
+    /**
+     True to Cancel connection to live if the download url is not found
+     */
+    private boolean cancelConnectionIfNotFound = false;
 
     public static RecorderSettings DEFAULT() {
         return new RecorderSettings();

pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.github.jwdeveloper.tiktok</groupId>
     <artifactId>TikTokLiveJava</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.0-Release</version>
+    <version>1.10.5-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.9.0-Release</version>
+        <version>1.10.5-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>