MINOR

Develop 1.6.4

.gitignore

@@ -1,10 +1,11 @@
 backend-infrastructure/.aws-sam
 
+
+.db
 # Created by https://www.gitignore.io/api/osx,linux,python,windows,pycharm,visualstudiocode
 *.db
 ### Linux ###
 *~
-.db
 # temporary files which can be created if a process still has a handle open of a deleted file
 .fuse_hidden*
 

API/pom.xml

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

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

@@ -38,8 +38,7 @@ public class TikTokBarrageEvent extends TikTokHeaderEvent {
     private final Picture rightIcon;
     private final String eventName;
     private final int duration;
-
+    private final BarrageParam barrageParam;
-    private BarrageParam barrageParam;
 
     public TikTokBarrageEvent(WebcastBarrageMessage msg) {
         super(msg.getCommon());
@@ -49,6 +48,5 @@ public class TikTokBarrageEvent extends TikTokHeaderEvent {
         rightIcon = Picture.map(msg.getRightIcon());
         duration = msg.getDuration();
         barrageParam = BarrageParam.map(msg);
-
     }
 }

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

@@ -40,7 +40,7 @@ import java.util.List;
 public class TikTokCommentEvent extends TikTokHeaderEvent {
     private final User user;
     private final String text;
-    private final String getUserLanguage;
+    private final String userLanguage;
     private final User mentionedUser;
     private final List<Picture> pictures;
     private final boolean visibleToSender;
@@ -50,8 +50,20 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
         user = User.map(msg.getUser(), msg.getUserIdentity());
         text = msg.getContent();
         visibleToSender = msg.getVisibleToSender();
-        getUserLanguage = msg.getContentLanguage();
+        userLanguage = msg.getContentLanguage();
         mentionedUser = User.map(msg.getAtUser());
         pictures = msg.getEmotesListList().stream().map(e -> Picture.map(e.getEmote().getImage())).toList();
     }
+
+
+    public static TikTokCommentEvent of(String userName, String message) {
+        var builder = WebcastChatMessage.newBuilder();
+        builder.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setNickname(userName)
+                .build());
+        builder.setContentLanguage("en");
+        builder.setVisibleToSender(true);
+        builder.setContent(message);
+        return new TikTokCommentEvent(builder.build());
+    }
 }

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

@@ -30,14 +30,10 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokDetectEvent extends TikTokHeaderEvent {
-   String language;
+    private final String language;
-
 
     public TikTokDetectEvent(WebcastMsgDetectMessage msg) {
         super(msg.getCommon());
         language = msg.getFromRegion();
     }
-
-
-
 }

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

@@ -30,9 +30,11 @@ import lombok.Getter;
  * Triggered when the connection gets disconnected. In that case you can call connect() again to have a reconnect logic.
  * Note that you should wait a little bit before attempting a reconnect to to avoid being rate-limited.
  */
+@Getter
 @EventMeta(eventType = EventType.Control)
 public class TikTokDisconnectedEvent extends TikTokLiveClientEvent {
-	@Getter private final String reason;
+	private final String reason;
+
 	public TikTokDisconnectedEvent(String reason) {
 		this.reason = reason.isBlank() ? "None" : reason;
 	}

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

@@ -34,9 +34,10 @@ import java.util.List;
 @EventMeta(eventType = EventType.Message)
 public class TikTokIMDeleteEvent extends TikTokHeaderEvent {
 
-    List<Long> userIds;
+    private final List<Long> msgIds, userIds;
     public TikTokIMDeleteEvent(WebcastImDeleteMessage msg) {
         super(msg.getCommon());
+        this.msgIds = msg.getDeleteMsgIdsListList();
         this.userIds = msg.getDeleteUserIdsListList();
     }
 }

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

@@ -33,11 +33,7 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkLayerEvent extends TikTokHeaderEvent {
 
-
     public TikTokLinkLayerEvent(WebcastLinkLayerMessage msg) {
         super(msg.getCommon());
-
     }
-
-
 }

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

@@ -27,12 +27,12 @@ import io.github.jwdeveloper.tiktok.annotations.EventType;
 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.messages.webcast.WebcastLinkMicArmies;
 import lombok.Getter;
 
 import java.util.List;
 
-
 /**
  * Triggered every time a battle participant receives points. Contains the current status of the battle and the army that suported the group.
  */
@@ -40,8 +40,10 @@ import java.util.List;
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkMicArmiesEvent extends TikTokHeaderEvent {
     private final Long battleId;
-
+    /**
-    private final Integer battleStatus;
+     true if battle is finished otherwise false
+     */
+    private final boolean finished;
 
     private final Picture picture;
 
@@ -52,6 +54,6 @@ public class TikTokLinkMicArmiesEvent extends TikTokHeaderEvent {
         battleId = msg.getId();
         armies = msg.getBattleItemsList().stream().map(LinkMicArmy::new).toList();
         picture = Picture.map(msg.getImage());
-        battleStatus = msg.getBattleStatus();
+        finished = msg.getBattleStatus() == LinkMicBattleStatus.ARMY_FINISHED;
     }
 }

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

@@ -22,29 +22,62 @@
  */
 package io.github.jwdeveloper.tiktok.data.events;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.data.models.LinkMicBattleTeam;
+import io.github.jwdeveloper.tiktok.data.models.battles.*;
+import io.github.jwdeveloper.tiktok.messages.enums.LinkMicBattleStatus;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.Getter;
+import lombok.*;
 
-import java.util.List;
+import java.util.*;
 
 /**
- * Triggered every time a battle starts.
+ * Triggered every time a battle starts & ends
  */
 @Getter
 @EventMeta(eventType = EventType.Message)
-public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent {
+public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
+{
     private final Long battleId;
-  private final List<LinkMicBattleTeam> team1;
+    /**
-  private final List<LinkMicBattleTeam> team2;
+     true if battle is finished otherwise false
+     */
+    private final boolean finished;
+    @Getter(AccessLevel.NONE)
+    private final boolean oneVsOne;
+    private final List<Team> teams;
 
     public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
         super(msg.getCommon());
         battleId = msg.getId();
-    team1 = msg.getTeams1List().stream().map(LinkMicBattleTeam::new).toList();
+        finished = msg.getBattleStatus() == LinkMicBattleStatus.BATTLE_FINISHED;
-    team2 = msg.getTeams2List().stream().map(LinkMicBattleTeam::new).toList();
+        teams = new ArrayList<>();
+        if (msg.getHostTeamCount() == 2) { // 1v1 battle
+            teams.add(new Team1v1(msg.getHostTeam(0), msg));
+            teams.add(new Team1v1(msg.getHostTeam(1), msg));
+            oneVsOne = true;
+        } else { // 2v2 battle
+            if (isFinished()) {
+                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg));
+                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg));
+            } else {
+                teams.add(new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg));
+                teams.add(new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg));
+            }
+            oneVsOne = false;
+        }
+
+        // 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
+    }
+
+    public boolean is1v1() {
+        return oneVsOne;
+    }
+
+    public boolean is2v2() {
+        return !oneVsOne;
     }
 }

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

@@ -36,6 +36,4 @@ public class TikTokLinkMicMethodEvent extends TikTokHeaderEvent {
 		super(msg.getCommon());
 
 	}
-
-
 }

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

@@ -42,5 +42,4 @@ public class TikTokRankTextEvent extends TikTokHeaderEvent {
 		label = text.getPattern();
 		eventType = text.getKey();
 	}
-
 }

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

@@ -35,11 +35,9 @@ public class TikTokRankUpdateEvent extends TikTokHeaderEvent {
 
 	public TikTokRankUpdateEvent(WebcastHourlyRankMessage msg) {
 		super(msg.getCommon());
-
 	}
 
 	public TikTokRankUpdateEvent(WebcastRankUpdateMessage msg) {
 		super(msg.getCommon());
 	}
-
 }

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

@@ -52,5 +52,4 @@ public class TikTokShopEvent extends TikTokHeaderEvent {
 		shopUrl = data.getShopUrl();
 		shopName = data.getShopName();
 	}
-
 }

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

@@ -36,10 +36,10 @@ import lombok.Getter;
  */
 @Getter
 @EventMeta(eventType = EventType.Message)
-public class TikTokSubscribeEvent extends TikTokHeaderEvent
+public class TikTokSubscribeEvent extends TikTokHeaderEvent {
-{
     private final User user;
 
+
     public TikTokSubscribeEvent(WebcastMemberMessage msg) {
         super(msg.getCommon());
         user = User.map(msg.getUser());
@@ -52,4 +52,11 @@ public class TikTokSubscribeEvent extends TikTokHeaderEvent
         user.addAttribute(UserAttribute.Subscriber);
     }
 
+    public static TikTokSubscribeEvent of(String userName) {
+        return new TikTokSubscribeEvent(WebcastMemberMessage.newBuilder()
+                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setNickname(userName)
+                        .build())
+                .build());
+    }
 }

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

@@ -30,12 +30,13 @@ import lombok.*;
 /**
  * Triggered before the connection is established.
  */
+@Getter
 @EventMeta(eventType = EventType.Control)
 public class TikTokPreConnectionEvent extends TikTokLiveClientEvent
 {
-	@Getter private final LiveUserData.Response userData;
+	private final LiveUserData.Response userData;
-	@Getter private final LiveData.Response roomData;
+	private final LiveData.Response roomData;
-	@Getter @Setter boolean cancelConnection = false;
+	@Setter boolean cancelConnection = false;
 
 	public TikTokPreConnectionEvent(LiveUserData.Response userData, LiveData.Response liveData) {
 		this.userData = userData;

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

@@ -22,10 +22,9 @@
  */
 package io.github.jwdeveloper.tiktok.data.events.gift;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
+import io.github.jwdeveloper.tiktok.data.models.gifts.*;
-import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.Getter;
@@ -34,7 +33,7 @@ import lombok.Getter;
 /**
  * Triggered every time gift is sent
  *
- * @see GiftSendType it has 3 states
+ * @see GiftComboStateType it has 3 states
  *
  * <p>Example when user sends gift with combo</p>
  * <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
@@ -47,10 +46,21 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 @Getter
 public class TikTokGiftComboEvent extends TikTokGiftEvent {
-    private final GiftSendType comboState;
+    private final GiftComboStateType comboState;
 
-    public TikTokGiftComboEvent(Gift gift, User host, WebcastGiftMessage msg, GiftSendType comboState) {
+    public TikTokGiftComboEvent(Gift gift, User host, WebcastGiftMessage msg, GiftComboStateType comboState) {
         super(gift, host, msg);
         this.comboState = comboState;
     }
+
+    public static TikTokGiftComboEvent of(Gift gift, int combo, GiftComboStateType comboState) {
+        return new TikTokGiftComboEvent(
+                gift,
+                new User(0L, "Test", new Picture("")),
+                WebcastGiftMessage
+                        .newBuilder()
+                        .setComboCount(combo)
+                        .build(),
+                comboState);
+    }
 }

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

@@ -23,18 +23,14 @@
 package io.github.jwdeveloper.tiktok.data.events.gift;
 
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
+import io.github.jwdeveloper.tiktok.data.models.gifts.*;
-import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.Getter;
 
-import java.util.ArrayList;
-
 
 /**
  * Triggered when user sends gifts that has
@@ -60,4 +56,20 @@ public class TikTokGiftEvent extends TikTokHeaderEvent {
         }
         combo = msg.getComboCount();
     }
+
+    public TikTokGiftEvent(Gift gift) {
+        this.gift = gift;
+        user = new User(0L, "sender", new Picture(""));
+        toUser = new User(0L, "receiver", new Picture(""));
+        combo = 1;
+    }
+
+
+    public static TikTokGiftEvent of(Gift gift) {
+        return new TikTokGiftEvent(gift);
+    }
+
+    public static TikTokGiftEvent of(String name, int id, int diamonds) {
+        return TikTokGiftEvent.of(new Gift(id, name, diamonds, ""));
+    }
 }

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

@@ -20,34 +20,26 @@
  * 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.tools.db.tables;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import java.io.PrintWriter;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import java.io.StringWriter;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-public class ExceptionInfoModel
+@Getter
-{
+@EventMeta(eventType = EventType.Message)
-    private String message;
+public class TikTokLinkAcceptNoticeEvent extends TikTokLinkEvent {
-    private String stackTrace;
 
-    public ExceptionInfoModel(Throwable throwable) {
+    private final long fromUserId, fromRoomId, toUserId;
-        this.message = throwable.getMessage();
-        this.stackTrace = getStackTraceAsString(throwable);
-    }
 
-    public static String getStackTraceAsString(Throwable throwable) {
+    public TikTokLinkAcceptNoticeEvent(WebcastLinkMessage msg) {
-        StringWriter sw = new StringWriter();
+        super(msg);
-        PrintWriter pw = new PrintWriter(sw);
+        if (!msg.hasAcceptNoticeContent())
-        throwable.printStackTrace(pw);
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Accept Notice Content!");
-        return sw.toString();
-    }
 
-    // Getters for message and stackTrace
+        var content = msg.getAcceptNoticeContent();
-    public String getMessage() {
+        this.fromUserId = content.getFromUserId();
-        return message;
+        this.fromRoomId = content.getFromRoomId();
-    }
+        this.toUserId = content.getToUserId();
-
-    public String getStackTrace() {
-        return stackTrace;
     }
 }

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

@@ -20,18 +20,17 @@
  * 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;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import lombok.Value;
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-@Value
+@Getter
-public class EnumValue
+@EventMeta(eventType = EventType.Message)
-{
+public class TikTokLinkApplyEvent extends TikTokLinkEvent {
-    public int value;
-    public String name;
 
-    public static EnumValue Map(Enum<?> _enum)
+    public TikTokLinkApplyEvent(WebcastLinkMessage msg) {
-    {
+        super(msg);
-        return new EnumValue(_enum.ordinal() ,_enum.name());
     }
 }

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

@@ -20,18 +20,27 @@
  * 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.tools.collector.client;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import io.github.jwdeveloper.tiktok.tools.db.TikTokDatabase;
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-public class TikTokClientFactory {
+@Getter
-    private final MessagesManager messageCollector;
+@EventMeta(eventType = EventType.Message)
-    private final TikTokDatabase tikTokDatabase;
+public class TikTokLinkCancelEvent extends TikTokLinkEvent {
 
-    public TikTokClientFactory(MessagesManager messageCollector, TikTokDatabase tikTokDatabase) {
+    private final long fromUserId, toUserId, cancelType, actionId;
-        this.messageCollector = messageCollector;
+
-        this.tikTokDatabase = tikTokDatabase;
+    public TikTokLinkCancelEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasCancelContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Cancel Content!");
+
+        var content = msg.getCancelContent();
+        this.fromUserId = content.getFromUserId();
+        this.toUserId = content.getToUserId();
+        this.cancelType = content.getCancelType();
+        this.actionId = content.getActionId();
     }
-
-
 }

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

@@ -20,22 +20,20 @@
  * 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;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-import io.github.jwdeveloper.tiktok.data.models.users.User;
+@Getter
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
+@EventMeta(eventType = EventType.Message)
-import lombok.Value;
+public class TikTokLinkCloseEvent extends TikTokLinkEvent {
 
-import java.util.List;
+    public TikTokLinkCloseEvent(WebcastLinkMessage msg) {
-
+        super(msg);
-@Value
+        // if (!msg.hasCloseContent())
-public class LinkMicBattleTeam {
+        //     throw new IllegalArgumentException("Expected WebcastLinkMessage with Close Content!");
-    Long teamId;
+        // Proto Empty
-    List<User> users;
-
-    public LinkMicBattleTeam(WebcastLinkMicBattle.LinkMicBattleTeam team) {
-        this.teamId = team.getId();
-        this.users = team.getUsersList().stream().map(User::new).toList();
     }
 }

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkCohostListChangeEvent extends TikTokLinkEvent {
+
+    public TikTokLinkCohostListChangeEvent(WebcastLinkMessage msg) {
+        super(msg);
+        // if (!msg.hasCohostListChangeContent())
+        //     throw new IllegalArgumentException("Expected WebcastLinkMessage with Cohost List Change Content!");
+        // Proto Empty
+    }
+}

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

@@ -20,18 +20,25 @@
  * 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.http.mappers;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import com.google.gson.JsonParser;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.data.requests.SignServerResponse;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-public class SignServerResponseMapper {
+@Getter
-    public SignServerResponse map(String json) {
+@EventMeta(eventType = EventType.Message)
-        var parsedJson = JsonParser.parseString(json);
+public class TikTokLinkCreateEvent extends TikTokLinkEvent {
-        var jsonObject = parsedJson.getAsJsonObject();
 
-        var signUrl = jsonObject.get("signedUrl").getAsString();
+    private final long hostId, roomId, linkType;
-        var userAgent = jsonObject.get("User-Agent").getAsString();
+    public TikTokLinkCreateEvent(WebcastLinkMessage msg) {
-        return new SignServerResponse(signUrl, userAgent);
+        super(msg);
+        if (!msg.hasCreateContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Create Content!");
+
+        var content = msg.getCreateContent();
+        this.hostId = content.getOwnerId();
+        this.roomId = content.getOwnerRoomId();
+        this.linkType = content.getLinkType();
     }
 }

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.data.models.users.ListUser;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkEnterEvent extends TikTokLinkEvent {
+
+    private final List<ListUser> listUsers;
+    private final int anchorMultiLiveEnum;
+
+    public TikTokLinkEnterEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasEnterContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Enter Content!");
+
+        var content = msg.getEnterContent();
+        this.listUsers = content.getLinkedUsersListList().stream().map(ListUser::map).toList();
+        this.anchorMultiLiveEnum = content.getAnchorMultiLiveEnum();
+    }
+}

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

@@ -20,24 +20,24 @@
  * 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.events;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
-import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
 import lombok.Getter;
 
-import java.util.List;
-
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkEvent extends TikTokHeaderEvent {
 
+    private final String extra, transferExtra;
+    private final long expireTimestamp;
 
     public TikTokLinkEvent(WebcastLinkMessage msg) {
         super(msg.getCommon());
-
+        this.extra = msg.getExtra();
+        this.expireTimestamp = msg.getExpireTimestamp();
+        this.transferExtra = msg.getTransferExtra();
     }
 }

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

@@ -20,25 +20,27 @@
  * 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.tools.collector.api;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.tools.db.TikTokDatabase;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-import java.util.function.Consumer;
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkInviteEvent extends TikTokLinkEvent {
 
-public interface DataCollectorBuilder extends DataFilters<DataCollectorBuilder> {
+    private final long roomId;
-    DataCollectorBuilder setOutputPath(String path);
+    private final User inviter;
-    DataCollectorBuilder setSessionTag(String sessionTimestamp);
 
-    DataCollectorBuilder setDatabase(TikTokDatabase database);
+    public TikTokLinkInviteEvent(WebcastLinkMessage msg) {
-
+        super(msg);
-    DataCollectorBuilder configureLiveClient(Consumer<LiveClientBuilder> consumer);
+		if (!msg.hasInviteContent())
-
+			throw new IllegalArgumentException("Expected WebcastLinkMessage with Invite Content!");
-    DataCollectorBuilder addUser(String user);
-
-    DataCollector buildAndRun();
-
-    DataCollector build();
 
+        var content = msg.getInviteContent();
+        this.roomId = content.getFromRoomId();
+        this.inviter = User.map(content.getFromUser());
+	}
 }

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

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkKickOutEvent extends TikTokLinkEvent {
+
+    private final long fromUserId;
+    private final KickOutReason kickOutReason;
+
+    public TikTokLinkKickOutEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasKickOutContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Kick Out Content!");
+
+        var content = msg.getKickOutContent();
+        this.fromUserId = content.getFromUserId();
+        this.kickOutReason = KickOutReason.values()[content.getKickoutReasonValue()];
+    }
+
+    public enum KickOutReason {
+        KICKOUT_REASON_UNKNOWN,
+        KICKOUT_REASON_FIRST_FRAME_TIMEOUT,
+        KICKOUT_REASON_BY_HOST,
+        KICKOUT_REASON_RTC_LOST_CONNECTION,
+        KICKOUT_REASON_BY_PUNISH,
+        KICKOUT_REASON_BY_ADMIN,
+        KICKOUT_REASON_HOST_REMOVE_ALL_GUESTS
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkLeaveEvent extends TikTokLinkEvent {
+
+    private final long userId, sendLeaveUid, leaveReason;
+    private final String linkmicIdStr;
+
+    public TikTokLinkLeaveEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasLeaveContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Leave Content!");
+
+        var content = msg.getLeaveContent();
+        this.userId = content.getUserId();
+        this.linkmicIdStr = content.getLinkmicIdStr();
+        this.sendLeaveUid = content.getSendLeaveUid();
+        this.leaveReason = content.getLeaveReason();
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkLinkedListChangeEvent extends TikTokLinkEvent {
+
+    public TikTokLinkLinkedListChangeEvent(WebcastLinkMessage msg) {
+        super(msg);
+        // if (!msg.hasLinkedListChangeContent())
+        //     throw new IllegalArgumentException("Expected WebcastLinkMessage with Linked List Change Content!");
+        // Proto Empty
+    }
+}

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.data.models.users.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkListChangeEvent extends TikTokLinkEvent {
+
+    private final List<ListUser> linkedUsers, appliedUsers, connectingUsers;
+
+    public TikTokLinkListChangeEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasListChangeContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with List Change Content!");
+
+        var content = msg.getListChangeContent();
+        this.linkedUsers = content.getLinkedUsersList().stream().map(ListUser::map).toList();
+        this.appliedUsers = content.getAppliedUsersList().stream().map(ListUser::map).toList();
+        this.connectingUsers = content.getConnectingUsersList().stream().map(ListUser::map).toList();
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMediaChangeEvent extends TikTokLinkEvent {
+
+    private final long op, toUserId, anchorId, roomId, changeScene;
+
+    public TikTokLinkMediaChangeEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasMediaChangeContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Media Change Content!");
+
+        var content = msg.getMediaChangeContent();
+        this.op = content.getOp();
+        this.toUserId = content.getToUserId();
+        this.anchorId = content.getAnchorId();
+        this.roomId = content.getRoomId();
+        this.changeScene = content.getChangeScene();
+    }
+}

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

@@ -20,24 +20,20 @@
  * 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.events;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
+import lombok.Getter;
 
-import io.github.jwdeveloper.tiktok.data.models.users.User;
+@Getter
-import lombok.Data;
-
-
-@Data
 @EventMeta(eventType = EventType.Message)
-public class CustomEvent extends TikTokHeaderEvent {
+public class TikTokLinkMicIdxUpdateEvent extends TikTokLinkEvent {
-    private final User user;
-    private final String title;
 
-    public CustomEvent(User user, String title) {
+    public TikTokLinkMicIdxUpdateEvent(WebcastLinkMessage msg) {
-        this.user = user;
+        super(msg);
-        this.title = title;
+        // if (!msg.hasMicIdxUpdateContent())
+        //     throw new IllegalArgumentException("Expected WebcastLinkMessage with Mic Idx Update Content!");
+        // Proto Empty
     }
 }

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

@@ -20,31 +20,25 @@
  * 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.events_generator;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import lombok.Data;
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-import java.util.ArrayList;
+@Getter
-import java.util.List;
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMuteEvent extends TikTokLinkEvent {
 
-@Data
+    private final long userId, status;
-public class CSharpClassInfo
-{
-    private String className;
-    private List<FieldInfo> fields = new ArrayList<>();
-    private List<ConstructorInfo> constructors = new ArrayList<>();
 
-    public void addField(String type, String fields)
+    public TikTokLinkMuteEvent(WebcastLinkMessage msg) {
-    {
+        super(msg);
-        this.fields.add(new FieldInfo(type,fields));
+        if (!msg.hasMuteContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Mute Content!");
+
+        var content = msg.getMuteContent();
+        this.userId = content.getUserId();
+        this.status = content.getStatus();
     }
-
-    public void addConstructor(List<FieldInfo> arguments)
-    {
-        this.constructors.add(new ConstructorInfo(arguments));
-    }
-
-    public record FieldInfo(String type, String name){};
-
-    public record ConstructorInfo(List<FieldInfo> arguemtns){};
 }

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

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkRandomMatchEvent extends TikTokLinkEvent {
+
+    private final User user;
+    private final long roomId, inviteType, innerChannelId;
+    private final String matchId;
+
+    public TikTokLinkRandomMatchEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasRandomMatchContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Random Match Content!");
+
+        var content = msg.getRandomMatchContent();
+        this.user = User.map(content.getUser());
+        this.roomId = content.getRoomId();
+        this.inviteType = content.getInviteType();
+        this.matchId = content.getMatchId();
+        this.innerChannelId = content.getInnerChannelId();
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkReplyEvent extends TikTokLinkEvent {
+
+    private final long roomId;
+    private final User fromUser, toUser;
+
+    public TikTokLinkReplyEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasReplyContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Reply Content!");
+
+        var content = msg.getReplyContent();
+        this.roomId = content.getFromRoomId();
+        this.fromUser = User.map(content.getFromUser());
+        this.toUser = User.map(content.getToUser());
+    }
+}

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkSysKickOutEvent extends TikTokLinkEvent {
+
+    private final long userId;
+    private final String linkmicIdStr;
+
+    public TikTokLinkSysKickOutEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasSysKickOutContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Sys Kick Out Content!");
+
+        var content = msg.getSysKickOutContent();
+        this.userId = content.getUserId();
+        this.linkmicIdStr = content.getLinkmicIdStr();
+    }
+}

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

@@ -20,29 +20,25 @@
  * 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.events_generator;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import lombok.Data;
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-import java.util.ArrayList;
+@Getter
-import java.util.List;
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkUpdateUserEvent extends TikTokLinkEvent {
 
-@Data
+    private final long fromUserId, toUserId;
-public class EventGeneratorSettings
-{
-    private String inputDictionary;
 
-    private String outputDictionary;
+    public TikTokLinkUpdateUserEvent(WebcastLinkMessage msg) {
-    private List<String> ignoredFiles = new ArrayList<>();
+        super(msg);
+        if (!msg.hasUpdateUserContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Update User Content!");
 
-    private String prefix;
+        var content = msg.getUpdateUserContent();
-
+        this.fromUserId = content.getFromUserId();
-    private String endFix;
+        this.toUserId = content.getToUserId();
-
-    private boolean isTikTokEvent;
-
-    public void addIgnoredClass(String name)
-    {
-        ignoredFiles.add(name);
     }
 }

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkUpdateUserSettingEvent extends TikTokLinkEvent {
+
+    public TikTokLinkUpdateUserSettingEvent(WebcastLinkMessage msg) {
+        super(msg);
+        // if (!msg.hasUpdateUserSettingContent())
+        //     throw new IllegalArgumentException("Expected WebcastLinkMessage with Update User Setting Content!");
+        // Proto Empty
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.data.models.Text;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkUserToastEvent extends TikTokLinkEvent {
+
+    private final long userId, roomId;
+    private final Text displayText;
+
+    public TikTokLinkUserToastEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasUserToastContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with User Toast Content!");
+
+        var content = msg.getUserToastContent();
+        this.userId = content.getUserId();
+        this.roomId = content.getRoomId();
+        this.displayText = Text.map(content.getDisplayText());
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023-2023 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.events.link;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkWaitListChangeEvent extends TikTokLinkEvent {
+
+    public TikTokLinkWaitListChangeEvent(WebcastLinkMessage msg) {
+        super(msg);
+        // if (!msg.hasWaitingListChangeContent())
+        //     throw new IllegalArgumentException("Expected WebcastLinkMessage with Waiting List Change Content!");
+        // Proto Empty
+    }
+}

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

@@ -30,7 +30,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 
-/*
+/**
 Triggered when LiveRoomInfo got updated such as likes, viewers, ranking ....
  */
 @Getter

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

@@ -33,9 +33,8 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 public class TikTokRoomPinEvent extends TikTokHeaderEvent
 {
-
+	private final TikTokCommentEvent pinnedMessage;
-  private TikTokCommentEvent pinnedMessage;
+	private final long timestamp;
-  private long timestamp;
 
 	public TikTokRoomPinEvent(WebcastRoomPinMessage msg, TikTokCommentEvent commentEvent)
 	{
@@ -43,5 +42,4 @@ public class TikTokRoomPinEvent extends TikTokHeaderEvent
 		this.timestamp = msg.getTimestamp();
 		this.pinnedMessage = commentEvent;
 	}
-
 }

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

@@ -45,4 +45,12 @@ public class TikTokFollowEvent extends TikTokHeaderEvent
         totalFollowers = msg.getFollowCount();
     }
 
+    public static TikTokFollowEvent of(String userName)
+    {
+        return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setNickname(userName)
+                .build())
+            .build());
+    }
 }

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

@@ -26,6 +26,7 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
@@ -47,4 +48,13 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
         user = User.map(msg.getUser());
         totalUsers = msg.getMemberCount();
     }
+
+    public static TikTokJoinEvent of(String userName)
+    {
+        return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
+                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setNickname(userName)
+                        .build())
+                .build());
+    }
 }

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

@@ -57,4 +57,15 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
         likes = msg.getCount();
         totalLikes = msg.getTotal();
     }
+
+    public static TikTokLikeEvent of(String userName, int likes)
+    {
+        return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
+                .setCount(likes)
+                .setTotal(likes)
+                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setNickname(userName)
+                        .build())
+                .build());
+    }
 }

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

@@ -49,5 +49,4 @@ public class TikTokShareEvent extends TikTokHeaderEvent {
 		user = User.map(msg.getUser());
 		totalShares = 1;
 	}
-
 }

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

@@ -44,11 +44,11 @@ public class Picture {
     }
 
     public static Picture map(io.github.jwdeveloper.tiktok.messages.data.Image profilePicture) {
-        var index = profilePicture.getUrlListCount() - 1;
+        var index = profilePicture.getUrlCount() - 1;
         if (index < 0) {
             return new Picture("");
         }
-        var url = profilePicture.getUrlList(index);
+        var url = profilePicture.getUrl(index);
         return new Picture(url);
     }
 
@@ -93,7 +93,7 @@ public class Picture {
         }
     }
 
-    public static Picture Empty() {
+    public static Picture empty() {
         return new Picture("");
     }
 

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

@@ -0,0 +1,47 @@
+package io.github.jwdeveloper.tiktok.data.models.battles;
+
+public abstract class Team {
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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);
+    }
+}

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

@@ -0,0 +1,26 @@
+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
+{
+    /** Value >= 0 when finished otherwise -1 */
+    private final int totalPoints;
+    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

@@ -0,0 +1,31 @@
+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 {
+    /** Value >= 0 when finished otherwise -1 */
+    private final int totalPoints;
+
+    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/battles/Viewer.java

@@ -0,0 +1,17 @@
+package io.github.jwdeveloper.tiktok.data.models.battles;
+
+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 lombok.Getter;
+
+@Getter
+public class Viewer {
+    private final User user;
+    private final int points;
+
+    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();
+    }
+}

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

@@ -22,19 +22,15 @@
  */
 package io.github.jwdeveloper.tiktok.data.models.gifts;
 
-public enum GiftSendType
+public enum GiftComboStateType {
-{
     Finished,
     Begin,
     Active;
 
-
+    public static GiftComboStateType fromNumber(long number) {
-    public static GiftSendType fromNumber(long number)
-    {
         return switch ((int) number) {
-            case 0 -> GiftSendType.Finished;
+            case 1, 2, 4 -> GiftComboStateType.Active;
-            case 1, 2, 4 -> GiftSendType.Active;
+            default -> GiftComboStateType.Finished;
-            default -> GiftSendType.Finished;
         };
     }
 }

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

@@ -0,0 +1,34 @@
+package io.github.jwdeveloper.tiktok.data.models.users;
+
+import lombok.Getter;
+
+@Getter
+public class ListUser
+{
+    private final User user;
+    private final LinkType linkType;
+    private final long linkMicId, linkStatus, modifyTime, linkerId;
+    private final int userPosition, silenceStatus, 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.userPosition = listUser.getUserPosition();
+        this.silenceStatus = listUser.getSilenceStatus();
+        this.modifyTime = listUser.getModifyTime();
+        this.linkerId = listUser.getLinkerId();
+        this.roleType = listUser.getRoleType();
+    }
+
+    public static ListUser map(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) {
+        return new ListUser(listUser);
+    }
+
+    public enum LinkType {
+        UNKNOWN,
+        AUDIO,
+        VIDEO
+    }
+}

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

@@ -24,7 +24,7 @@ package io.github.jwdeveloper.tiktok.data.models.users;
 
 import io.github.jwdeveloper.tiktok.data.models.badges.Badge;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage;
+import io.github.jwdeveloper.tiktok.messages.webcast.*;
 import lombok.AccessLevel;
 import lombok.Getter;
 
@@ -136,6 +136,14 @@ public class User {
         this.picture = picture;
     }
 
+    public User(long id, String name, String profileId, Picture picture) {
+        this(id, name, profileId, 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(io.github.jwdeveloper.tiktok.messages.data.User user) {
         this(user.getId(), user.getDisplayId(), Picture.map(user.getAvatarThumb()));
         profileName = user.getNickname();
@@ -159,10 +167,9 @@ public class User {
         }
     }
 
-
     public static User EMPTY = new User(0L,
             "",
-            Picture.Empty(),
+            Picture.empty(),
             0,
             0,
             List.of(Badge.empty()));
@@ -209,4 +216,18 @@ public class User {
                 0,
                 List.of(Badge.empty()));
     }
+
+    @Override
+    public String toString() {
+        return "User{" +
+            "id=" + id +
+            ", name='" + name + "'" +
+            ", profileName='" + profileName + "'" +
+            ", picture=" + picture +
+            ", following=" + following +
+            ", followers=" + followers +
+            ", badges=" + badges +
+            ", attributes=" + attributes +
+			"}";
+    }
 }

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

@@ -23,35 +23,17 @@
 package io.github.jwdeveloper.tiktok.data.requests;
 
 import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
-import lombok.AllArgsConstructor;
+import lombok.*;
-import lombok.Data;
-import lombok.Getter;
 
 import java.util.List;
 
 public class GiftsData
 {
-    @Getter
-    public final class Request
-    {
-
-    }
-
     @Getter
     @AllArgsConstructor
     public static final class Response
     {
         private String json;
-        private List<GiftModel> gifts;
+        private List<Gift> gifts;
     }
-
-    @Data
-    public static class GiftModel
-    {
-        private int id;
-        private String name;
-        private int diamondCost;
-        private String image;
-    }
-
 }

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

@@ -35,6 +35,7 @@ public class LiveData {
     }
 
     @Data
+    @AllArgsConstructor
     public static class Response {
         private String json;
         private LiveStatus liveStatus;
@@ -45,6 +46,11 @@ public class LiveData {
         private boolean ageRestricted;
         private User host;
         private LiveType liveType;
+        public Response() {
+
+        }
+
+
     }
 
     public enum LiveStatus {

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

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2023-2023 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.requests;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class SignServerResponse
-{
-    private String signedUrl;
-
-    private String userAgent;
-}

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

@@ -34,30 +34,24 @@ import java.util.TreeMap;
 import java.util.function.Consumer;
 
 
+@Getter
 public class HttpClientSettings {
 
-    @Getter
+    private final Map<String, Object> params;
-    final Map<String, Object> params;
 
-    @Getter
+    private final Map<String, String> headers;
-    final Map<String, String> headers;
 
-    @Getter
+    private final Map<String, String> cookies;
-    final Map<String, String> cookies;
-
-    @Getter
-    @Setter
-    ProxyClientSettings proxyClientSettings;
-
-    @Getter
-    Consumer<HttpClient.Builder> onClientCreating;
-
-    @Getter
-    Consumer<HttpRequest.Builder> onRequestCreating;
 
     @Setter
-    @Getter
+    private ProxyClientSettings proxyClientSettings;
-    Duration timeout;
+
+    private Consumer<HttpClient.Builder> onClientCreating;
+
+    private Consumer<HttpRequest.Builder> onRequestCreating;
+
+    @Setter
+    private Duration timeout;
 
     public HttpClientSettings() {
         this.params = new TreeMap<>();
@@ -65,10 +59,8 @@ public class HttpClientSettings {
         this.cookies = new HashMap<>();
         this.timeout = Duration.ofSeconds(2);
         this.proxyClientSettings = new ProxyClientSettings();
-        this.onClientCreating = (x) -> {
+        this.onClientCreating = (x) -> {};
-        };
+        this.onRequestCreating = (x) -> {};
-        this.onRequestCreating = (x) -> {
-        };
     }
 
     /**

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

@@ -33,6 +33,18 @@ import java.util.logging.Level;
 @Data
 public class LiveClientSettings {
 
+    /**
+     *  Sets client to offline mode, prohibits connection to TikTok servers
+     *  @apiNote Useful when testing client with custom events
+     */
+    private boolean offline;
+
+    /**
+     * Fetch and download gifts data before TikTokLive starts
+     * @apiNote If `false`, client.giftManager() does not contain initial gifts
+     */
+    private boolean fetchGifts = true;
+
     /**
      * ISO-Language for Client
      */
@@ -68,20 +80,32 @@ public class LiveClientSettings {
      */
     private HttpClientSettings httpSettings;
 
+    /**
+     * Interval of time in milliseconds between pings to TikTok
+     * @apiNote Min: 250 (0.25 seconds), Default: 5000 (5 seconds)
+     */
+    private long pingInterval = 5000;
+
+    /** Throw an exception on 18+ Age Restriction */
+    private boolean throwOnAgeRestriction;
+
     /**
 	 * Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId
-     *  documentation how to obtain sessionId https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages
+	 * @see <a href="https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages">Documentation: How to obtain sessionId</a>
 	 */
     private String sessionId;
 
     /**
      * Optional: By default roomID is fetched before connect to live, but you can set it manually
-     *
      */
     private String roomId;
 
-    public static LiveClientSettings createDefault()
+    /**
-    {
+     * Optional: API Key for increased limit to signing server
+     */
+    private String apiKey;
+
+    public static LiveClientSettings createDefault() {
         var httpSettings = new HttpClientSettings();
         httpSettings.getParams().putAll(DefaultClientParams());
         httpSettings.getHeaders().putAll(DefaultRequestHeaders());

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

@@ -33,7 +33,7 @@ import java.util.function.Consumer;
 @Setter
 public class ProxyClientSettings implements Iterator<ProxyData>
 {
-    private boolean enabled, lastSuccess, autoDiscard = true, fallback = true;
+    private boolean enabled, autoDiscard = true, fallback = true;
     private Rotation rotation = Rotation.CONSECUTIVE;
     private final List<ProxyData> proxyList = new ArrayList<>();
     private int index = -1;
@@ -63,10 +63,6 @@ public class ProxyClientSettings implements Iterator<ProxyData>
 
     @Override
     public ProxyData next() {
-		return lastSuccess ? proxyList.get(index) : rotate();
-	}
-
-    public ProxyData rotate() {
         var nextProxy = switch (rotation)
         {
             case CONSECUTIVE -> {
@@ -89,7 +85,6 @@ public class ProxyClientSettings implements Iterator<ProxyData>
     @Override
     public void remove() {
         proxyList.remove(index);
-        lastSuccess = false; // index is no longer valid and lastSuccess needs falsified
     }
 
     public void setIndex(int index) {

API/src/main/java/io/github/jwdeveloper/tiktok/http/LiveHttpClient.java

@@ -27,38 +27,46 @@ import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
 import io.github.jwdeveloper.tiktok.data.requests.LiveData;
 import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
 
-public interface LiveHttpClient {
+public interface LiveHttpClient
-
+{
-
     /**
-     * @return list of gifts that are available in your country
+     * @return {@link GiftsData.Response} list of gifts that are compiled and available on github
      */
     GiftsData.Response fetchGiftsData();
 
     /**
-     * Returns information about user that is having a livestream
+     * @return {@link GiftsData.Response} list of gifts that are available in your region / livestream
-     *
-     * @param userName
-     * @return
      */
-    LiveUserData.Response fetchLiveUserData(String userName);
+    GiftsData.Response fetchRoomGiftsData(String room_id);
+
+    /**
+     * Returns information about user that is having a livestream
+     * @param userName name of user
+     * @return {@link LiveUserData.Response}
+     */
+    default LiveUserData.Response fetchLiveUserData(String userName) {
+        return fetchLiveUserData(new LiveUserData.Request(userName));
+    }
 
     LiveUserData.Response fetchLiveUserData(LiveUserData.Request request);
 
     /**
      * @param roomId can be obtained from browsers cookies or by invoked fetchLiveUserData
-     * @return
+     * @return {@link LiveData.Response}
      */
-    LiveData.Response fetchLiveData(String roomId);
+    default LiveData.Response fetchLiveData(String roomId) {
+        return fetchLiveData(new LiveData.Request(roomId));
+    }
 
     LiveData.Response fetchLiveData(LiveData.Request request);
 
-
     /**
      * @param roomId can be obtained from browsers cookies or by invoked fetchLiveUserData
-     * @return
+     * @return {@link LiveConnectionData.Response}
      */
-    LiveConnectionData.Response fetchLiveConnectionData(String roomId);
+    default LiveConnectionData.Response fetchLiveConnectionData(String roomId) {
+        return fetchLiveConnectionData(new LiveConnectionData.Request(roomId));
+    }
 
     LiveConnectionData.Response fetchLiveConnectionData(LiveConnectionData.Request request);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListener.java

@@ -22,51 +22,50 @@
  */
 package io.github.jwdeveloper.tiktok.listener;
 
+import io.github.jwdeveloper.tiktok.live.LiveClient;
 
 /**
- *
+ * ListenersManager
- * @see ListenersManager
+ * <p>
- *
  * TikTokEventListener is an alternative way of handing TikTok events.
- *
+ * <p>
- *  TikTokLive.newClient("someuser").addListener(listener)
+ * {@code TikTokLive.newClient("someuser").addListener(listener);}
- *
+ * <p>
- *  After registertion all listeners are kept in Listener manager
+ * After registertion, all listeners are kept in Listener manager - {@link  LiveClient#getListenersManager()}
- *  that could be obtained by client.getListenerManager();
+ * <p>
- *
+ * Method in TikTokEventListener should meet requirements below to be detected
- *  Method in TikTokEventListener should meet 4 requirements to be detected
+ * <p>- @TikTokEventObserver annotation
- *         - must have @TikTokEventHandler annotation
+ * <p>- 2 parameters of (LiveClient, Class extending TikTokEvent)
- *         - must have 2 parameters
+ * <pre>
- *         - first parameter must be LiveClient
+ * {@code
- *         - second must be class that extending TikTokEvent
- *
  * 	public static class CustomListener implements TikTokEventListener
  *  {
- *         @TikTokEventHandler
+ *  	@TikTokEventObserver
  *      public void onError(LiveClient liveClient, TikTokErrorEvent event)
  *      {
  *      	System.out.println(event.getException().getMessage());
  *      }
  *
- *         @TikTokEventHandler
+ *      @TikTokEventObserver
  *      public void onCommentMessage(LiveClient liveClient, TikTokCommentEvent event)
  *      {
  *          System.out.println(event.getText());
  *      }
  *
- *         @TikTokEventHandler
+ *      @TikTokEventObserver
  *      public void onGiftMessage(LiveClient liveClient, TikTokGiftMessageEvent event)
  *      {
  *          System.out.println(event.getGift().getDescription());
  *      }
  *
- *         @TikTokEventHandler
+ *      @TikTokEventObserver
  *      public void onAnyEvent(LiveClient liveClient, TikTokEvent event)
  *      {
  *          System.out.println(event.getClass().getSimpleName());
  *      }
  *   }
- *
+ *  }
+ *  </pre>
  */
 public interface TikTokEventListener
 {

API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListenerBase.java

@@ -0,0 +1,134 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+import io.github.jwdeveloper.tiktok.data.events.*;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
+import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent;
+import io.github.jwdeveloper.tiktok.data.events.gift.*;
+import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
+import io.github.jwdeveloper.tiktok.data.events.link.*;
+import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent;
+import io.github.jwdeveloper.tiktok.data.events.room.*;
+import io.github.jwdeveloper.tiktok.data.events.social.*;
+import io.github.jwdeveloper.tiktok.data.events.websocket.*;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+
+public abstract class TikTokEventListenerBase implements TikTokEventListener
+{
+	public void onUnhandledSocial(LiveClient client, TikTokUnhandledSocialEvent event) {}
+
+	public void onChest(LiveClient client, TikTokChestEvent event) {}
+
+	public void onLinkMicFanTicket(LiveClient client, TikTokLinkMicFanTicketEvent event) {}
+
+	public void onEnvelope(LiveClient client, TikTokEnvelopeEvent event) {}
+
+	public void onShop(LiveClient client, TikTokShopEvent event) {}
+
+	public void onDetect(LiveClient client, TikTokDetectEvent event) {}
+
+	public void onLinkLayer(LiveClient client, TikTokLinkLayerEvent event) {}
+
+	public void onConnected(LiveClient client, TikTokConnectedEvent event) {}
+
+	public void onPreConnection(LiveClient client, TikTokPreConnectionEvent event) {}
+
+	public void onCaption(LiveClient client, TikTokCaptionEvent event) {}
+
+	public void onQuestion(LiveClient client, TikTokQuestionEvent event) {}
+
+	public void onRoomPin(LiveClient client, TikTokRoomPinEvent event) {}
+
+	public void onRoomInfo(LiveClient client, TikTokRoomInfoEvent event) {}
+
+	public void onLivePaused(LiveClient client, TikTokLivePausedEvent event) {}
+
+	public void onLiveUnpaused(LiveClient client, TikTokLiveUnpausedEvent event) {}
+
+	public void onLike(LiveClient client, TikTokLikeEvent event) {}
+
+	public void onLink(LiveClient client, TikTokLinkEvent event) {}
+	public void onLinkInvite(LiveClient client, TikTokLinkInviteEvent event) {}
+	public void onLinkReply(LiveClient client, TikTokLinkReplyEvent event) {}
+	public void onLinkCreate(LiveClient client, TikTokLinkCreateEvent event) {}
+	public void onLinkClose(LiveClient client, TikTokLinkCloseEvent event) {}
+	public void onLinkEnter(LiveClient client, TikTokLinkEnterEvent event) {}
+	public void onLinkLeave(LiveClient client, TikTokLinkLeaveEvent event) {}
+	public void onLinkCancel(LiveClient client, TikTokLinkCancelEvent event) {}
+	public void onLinkKickOut(LiveClient client, TikTokLinkKickOutEvent event) {}
+	public void onLinkLinkedListChange(LiveClient client, TikTokLinkLinkedListChangeEvent event) {}
+	public void onLinkUpdateUser(LiveClient client, TikTokLinkUpdateUserEvent event) {}
+	public void onLinkWaitListChange(LiveClient client, TikTokLinkWaitListChangeEvent event) {}
+	public void onLinkMute(LiveClient client, TikTokLinkMuteEvent event) {}
+	public void onLinkRandomMatch(LiveClient client, TikTokLinkRandomMatchEvent event) {}
+	public void onLinkUpdateUserSettings(LiveClient client, TikTokLinkUpdateUserSettingEvent event) {}
+	public void onLinkMicIdxUpdate(LiveClient client, TikTokLinkMicIdxUpdateEvent event) {}
+	public void onLinkListChange(LiveClient client, TikTokLinkListChangeEvent event) {}
+	public void onLinkCohostListChange(LiveClient client, TikTokLinkCohostListChangeEvent event) {}
+	public void onLinkMediaChange(LiveClient client, TikTokLinkMediaChangeEvent event) {}
+	public void onLinkAcceptNotice(LiveClient client, TikTokLinkAcceptNoticeEvent event) {}
+	public void onLinkSysKickOut(LiveClient client, TikTokLinkSysKickOutEvent event) {}
+	public void onLinkUserToast(LiveClient client, TikTokLinkUserToastEvent event) {}
+
+	public void onBarrage(LiveClient client, TikTokBarrageEvent event) {}
+
+	public void onGift(LiveClient client, TikTokGiftEvent event) {}
+
+	public void onGiftCombo(LiveClient client, TikTokGiftComboEvent event) {}
+
+	public void onLinkMicArmies(LiveClient client, TikTokLinkMicArmiesEvent event) {}
+
+	public void onEmote(LiveClient client, TikTokEmoteEvent event) {}
+
+	public void onUnauthorizedMember(LiveClient client, TikTokUnauthorizedMemberEvent event) {}
+
+	public void onInRoomBanner(LiveClient client, TikTokInRoomBannerEvent event) {}
+
+	public void onLinkMicMethod(LiveClient client, TikTokLinkMicMethodEvent event) {}
+
+	public void onSubscribe(LiveClient client, TikTokSubscribeEvent event) {}
+
+	public void onPoll(LiveClient client, TikTokPollEvent event) {}
+
+	public void onFollow(LiveClient client, TikTokFollowEvent event) {}
+
+	public void onComment(LiveClient client, TikTokCommentEvent event) {}
+
+	public void onHttpResponse(LiveClient client, TikTokHttpResponseEvent action) {}
+
+	public void onGoalUpdate(LiveClient client, TikTokGoalUpdateEvent event) {}
+
+	public void onRankUpdate(LiveClient client, TikTokRankUpdateEvent event) {}
+
+	public void onIMDelete(LiveClient client, TikTokIMDeleteEvent event) {}
+
+	public void onLiveEnded(LiveClient client, TikTokLiveEndedEvent event) {}
+
+	public void onError(LiveClient client, TikTokErrorEvent event) {}
+
+	public void onJoin(LiveClient client, TikTokJoinEvent event) {}
+
+	public void onRankText(LiveClient client, TikTokRankTextEvent event) {}
+
+	public void onShare(LiveClient client, TikTokShareEvent event) {}
+
+	public void onUnhandledMember(LiveClient client, TikTokUnhandledMemberEvent event) {}
+
+	public void onSubNotify(LiveClient client, TikTokSubNotifyEvent event) {}
+
+	public void onLinkMicBattle(LiveClient client, TikTokLinkMicBattleEvent event) {}
+
+	public void onDisconnected(LiveClient client, TikTokDisconnectedEvent event) {}
+
+	public void onUnhandledControl(LiveClient client, TikTokUnhandledControlEvent event) {}
+
+	public void onEvent(LiveClient client, TikTokEvent event) {}
+
+	public void onWebsocketResponse(LiveClient client, TikTokWebsocketResponseEvent event) {}
+
+	public void onWebsocketMessage(LiveClient client, TikTokWebsocketMessageEvent event) {}
+
+	public void onWebsocketUnhandledMessage(LiveClient client, TikTokWebsocketUnhandledMessageEvent event) {}
+
+	public void onReconnecting(LiveClient client, TikTokReconnectingEvent event) {}
+}

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

@@ -22,42 +22,65 @@
  */
 package io.github.jwdeveloper.tiktok.live;
 
-import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
+import com.google.gson.JsonObject;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
+import io.github.jwdeveloper.tiktok.data.models.gifts.*;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
 
-public interface GiftManager {
+public interface GiftsManager {
 
     /**
-     * In case you can't find your gift in Gift enum. You can register gift
+     * You can create and attach your own custom gift to manager
-     * manually here to make it detected while TikTokGiftEvent
      *
-     * @param id gift's id
+     * @param gift
-     * @param name gift's name
-     * @param diamondCost diamond cost
-     * @return
      */
-    Gift registerGift(int id, String name, int diamondCost, Picture picture);
+    void attachGift(Gift gift);
+
+    /**
+     * You can create and attach your own custom gift to manager
+     *
+     * @param gifts
+     */
+    void attachGiftsList(List<Gift> gifts);
+
+    /**
+     * finds gift by name
+     * When gift not found return Gift.UNDEFINED;
+     *
+     * @param name gift name
+     */
+    Gift getByName(String name);
+
+    /**
+     * finds gift by id
+     * When gift not found return Gift.UNDEFINED;
+     *
+     * @param giftId giftId
+     */
+    Gift getById(int giftId);
 
 
     /**
-     *
+     * finds gift by filter
-     * @param giftId
+     * When gift not found return Gift.UNDEFINED;
-     * @return
      */
-    Gift findById(int giftId);
+    Gift getByFilter(Predicate<Gift> filter);
+
+    List<Gift> getManyByFilter(Predicate<Gift> filter);
 
     /**
-     *
+     * @return list of all gifts
-     * @param giftName
-     * @return
      */
-    Gift findByName(String giftName);
+    List<Gift> toList();
+
 
     /**
-     *
+     * @return list of all map of all gifts where Integer is gift Id
-     * @return all gifts
      */
-    List<Gift> getGifts();
+    Map<Integer, Gift> toMap();
 }

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

@@ -61,10 +61,19 @@ public interface LiveClient {
      */
     void publishEvent(TikTokEvent event);
 
+
+    /**
+     * @param webcastMessageName name of TikTok protocol-buffer message
+     * @param payloadBase64      protocol-buffer message bytes payload
+     */
+    void publishMessage(String webcastMessageName, String payloadBase64);
+
+    void publishMessage(String webcastMessageName, byte[] payload);
+
     /**
      * Get information about gifts
      */
-    GiftManager getGiftManager();
+    GiftsManager getGiftManager();
 
     /**
      * Gets the current room info from TikTok API including streamer info, room status and statistics.

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

@@ -47,7 +47,7 @@ public interface LiveRoomInfo
      String getRoomId();
      String getHostName();
      String getTitle();
-     User getHostUser();
+     User getHost();
      List<RankingUser> getUsersRanking();
      ConnectionState getConnectionState();
 }

API/src/main/proto/data.proto

@@ -102,7 +102,8 @@ message Text {
 
 // @Image
 message Image {
-  repeated string urlList = 1;
+  repeated string url = 1;
+  string extras = 2;
   bool isAnimated = 9;
 }
 
@@ -1061,9 +1062,9 @@ message CohostListChangeContent {
 
 
 message LinkerListChangeContent {
-  repeated ListUser linkedUsersList = 1;
+  repeated ListUser linkedUsers = 1;
-  repeated ListUser appliedUsersList = 2;
+  repeated ListUser appliedUsers = 2;
-  repeated ListUser connectingUsersList = 3;
+  repeated ListUser connectingUsers = 3;
 }
 
 message LinkerMediaChangeContent {

API/src/main/proto/enums.proto

@@ -35,6 +35,14 @@ 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;
@@ -242,21 +250,21 @@ enum CommonContentCase {
 
 
 enum LinkMessageType {
-  TPYE_LINKER_UNKNOWN = 0;
+  TYPE_LINKER_UNKNOWN = 0;
   TYPE_LINKER_CREATE = 1;
   TYPE_LINKER_CLOSE = 2;
   TYPE_LINKER_INVITE = 3;
   TYPE_LINKER_APPLY = 4;
   TYPE_LINKER_REPLY = 5;
-  TPYE_LINKER_ENTER = 6;
+  TYPE_LINKER_ENTER = 6;
-  TPYE_LINKER_LEAVE = 7;
+  TYPE_LINKER_LEAVE = 7;
   TYPE_LINKER_PERMIT = 8;
-  TPYE_LINKER_CANCEL_INVITE = 9;
+  TYPE_LINKER_CANCEL_INVITE = 9;
   TYPE_LINKER_WAITING_LIST_CHANGE = 10;
   TYPE_LINKER_LINKED_LIST_CHANGE = 11;
   TYPE_LINKER_UPDATE_USER = 12;
-  TPYE_LINKER_KICK_OUT = 13;
+  TYPE_LINKER_KICK_OUT = 13;
-  TPYE_LINKER_CANCEL_APPLY = 14;
+  TYPE_LINKER_CANCEL_APPLY = 14;
   TYPE_LINKER_MUTE = 15;
   TYPE_LINKER_MATCH = 16;
   TYPE_LINKER_UPDATE_USER_SETTING = 17;
@@ -267,8 +275,8 @@ enum LinkMessageType {
   TYPE_LINKER_COHOST_LIST_CHANGE = 22;
   TYPE_LINKER_MEDIA_CHANGE = 23;
   TYPE_LINKER_ACCEPT_NOTICE = 24;
-  TPYE_LINKER_SYS_KICK_OUT = 101;
+  TYPE_LINKER_SYS_KICK_OUT = 101;
-  TPYE_LINKMIC_USER_TOAST = 102;
+  TYPE_LINKMIC_USER_TOAST = 102;
 }
 
 enum MessageType {

API/src/main/proto/webcast.proto

@@ -521,7 +521,7 @@ message WebcastLinkMicArmies {
   uint64 id2 = 4;
   uint64 timeStamp1 = 5;
   uint64 timeStamp2 = 6;
-  int32 battleStatus = 7; // SHOULD BE AN ENUM
+  LinkMicBattleStatus battleStatus = 7;
   uint64 data1 = 8;
   uint64 data2 = 9;
   uint32 data3 = 10;
@@ -574,11 +574,26 @@ message WebcastLinkMicBattle {
   Common common = 1;
   uint64 id = 2;
   LinkMicBattleConfig battleConfig = 3;
-  uint32 data2 = 4;
+  LinkMicBattleStatus battleStatus = 4;
   repeated LinkMicBattleDetails details = 5;
-  repeated LinkMicBattleTeam teams1 = 9;
+  repeated LinkMicBattleTopViewers viewerTeam = 9;
-  repeated LinkMicBattleTeam teams2 = 10;
+  repeated LinkMicBattleHost hostTeam = 10;
   repeated LinkMicBattleTeamData teamData = 13;
+  uint64 unknownData16 = 16;
+  repeated Host2v2Data hostData2v2 = 17;
+
+  message Host2v2Data {
+    uint32 teamNumber = 1;
+    repeated HostData hostdata = 2;
+    uint32 unknownData3 = 3;
+    uint32 totalPoints = 4;
+
+    message HostData {
+      uint64 hostId = 1;
+      uint32 points = 2;
+      string hostIdStr = 3;
+    }
+  }
 
   message LinkMicBattleConfig {
     uint64 id1 = 1;
@@ -586,29 +601,69 @@ message WebcastLinkMicBattle {
     uint32 data1 = 3;
     uint64 id2 = 4;
     uint32 data2 = 5;
+    uint32 data3 = 6;
+    uint32 data4 = 8;
+  }
+
+  message LinkMicBattleTeamData {
+    uint64 teamId = 1;
+    LinkMicBattleData data = 2;
   }
 
   message LinkMicBattleData {
     uint64 id = 1;
     uint32 data1 = 2;
-    uint32 data2 = 3;
+    uint32 winStreak = 3;
     uint32 data3 = 5;
     string url = 6;
   }
 
   message LinkMicBattleDetails {
     uint64 id = 1;
-    LinkMicBattleData details = 2;
+    LinkMicBattleDetailsSummary summary = 2;
-  }
 
-  message LinkMicBattleTeam {
+    message LinkMicBattleDetailsSummary {
       uint64 id = 1;
-    repeated User users = 2;
+      uint32 unknownData2 = 2;
+      uint32 points = 3;
+    }
   }
 
-  message LinkMicBattleTeamData {
+  message LinkMicBattleTopViewers {
-    uint64 teamId = 1;
+    uint64 id = 1;
-    LinkMicBattleData data = 2;
+    repeated TopViewerGroup viewerGroup = 2;
+
+    message TopViewerGroup {
+      repeated TopViewer viewer = 1;
+      uint32 points = 2;
+      string hostIdOrTeamNum = 3; // 1v1 Battle = HostId | 2v2 Battle = Team # - 1 & 2
+
+      message TopViewer {
+        uint64 id = 1;
+        uint32 points = 2;
+        string profileId = 3;
+        repeated Image images = 4;
+        string stringId = 6;
+      }
+    }
+  }
+
+  message LinkMicBattleHost {
+    uint64 id = 1;
+    repeated HostGroup hostGroup = 2;
+
+    message HostGroup {
+      repeated Host host = 1;
+      uint32 points = 2;
+      string hostId = 3;
+
+      message Host {
+        uint64 id = 1;
+        string profileId = 2;
+        repeated Image images = 3;
+        string name = 4;
+      }
+    }
   }
 }
 
@@ -750,7 +805,7 @@ message WebcastLinkMessage {
   LinkerListChangeContent ListChangeContent = 20;
   CohostListChangeContent CohostListChangeContent = 21;
   LinkerMediaChangeContent MediaChangeContent = 22;
-  LinkerAcceptNoticeContent ReplyAcceptNoticeContent = 23;
+  LinkerAcceptNoticeContent AcceptNoticeContent = 23;
   LinkerSysKickOutContent SysKickOutContent = 101;
   LinkmicUserToastContent UserToastContent = 102;
   string extra = 200;
@@ -793,5 +848,3 @@ message RoomVerifyMessage {
   int64 noticeType = 4;
   bool closeRoom = 5;
 }
-
-

Client/pom.xml

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

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

@@ -23,7 +23,9 @@
 package io.github.jwdeveloper.tiktok;
 
 
+import io.github.jwdeveloper.tiktok.gifts.TikTokGiftsManager;
 import io.github.jwdeveloper.tiktok.http.LiveHttpClient;
+import io.github.jwdeveloper.tiktok.live.GiftsManager;
 import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
 
 import java.util.concurrent.CompletableFuture;
@@ -31,8 +33,9 @@ import java.util.concurrent.CompletableFuture;
 public class TikTokLive {
 
     /**
+     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
+     *
      * @param hostName profile name of Tiktok user could be found in profile link
-     *                 example: https://www.tiktok.com/@dostawcavideo  hostName would be dostawcavideo
      * @return LiveClientBuilder
      */
     public static LiveClientBuilder newClient(String hostName) {
@@ -40,46 +43,42 @@ public class TikTokLive {
     }
 
     /**
+     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
      *
      * @param hostName profile name of Tiktok user could be found in profile link
-     *    example: https://www.tiktok.com/@dostawcavideo  hostName would be dostawcavideo
      * @return true if live is Online, false if is offline
      */
-    public static boolean isLiveOnline(String hostName)
+    public static boolean isLiveOnline(String hostName) {
-    {
         return requests().fetchLiveUserData(hostName).isLiveOnline();
     }
 
     /**
+     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
      *
      * @param hostName profile name of Tiktok user could be found in profile link
-     *    example: https://www.tiktok.com/@dostawcavideo  hostName would be dostawcavideo
      * @return true if live is Online, false if is offline
      */
-    public static CompletableFuture<Boolean> isLiveOnlineAsync(String hostName)
+    public static CompletableFuture<Boolean> isLiveOnlineAsync(String hostName) {
-    {
         return CompletableFuture.supplyAsync(() -> isLiveOnline(hostName));
     }
 
     /**
+     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
      *
      * @param hostName profile name of Tiktok user could be found in profile link
-     *    example: https://www.tiktok.com/@dostawcavideo  hostName would be dostawcavideo
      * @return true is hostName name is valid and exists, false if not
      */
-    public static boolean isHostNameValid(String hostName)
+    public static boolean isHostNameValid(String hostName) {
-    {
         return requests().fetchLiveUserData(hostName).isHostNameValid();
     }
 
     /**
+     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
      *
      * @param hostName profile name of Tiktok user could be found in profile link
-     *    example: https://www.tiktok.com/@dostawcavideo  hostName would be dostawcavideo
      * @return true is hostName name is valid and exists, false if not
      */
-    public static CompletableFuture<Boolean> isHostNameValidAsync(String hostName)
+    public static CompletableFuture<Boolean> isHostNameValidAsync(String hostName) {
-    {
         return CompletableFuture.supplyAsync(() -> isHostNameValid(hostName));
     }
 
@@ -91,4 +90,20 @@ public class TikTokLive {
     public static LiveHttpClient requests() {
         return new TikTokLiveHttpClient();
     }
+
+    private static GiftsManager giftsManager;
+
+    /**
+     * Fetch gifts from endpoint and returns GiftManager
+     *
+     * @return GiftsManager
+     */
+    public static GiftsManager gifts() {
+        if (giftsManager == null) {
+            synchronized (GiftsManager.class) {
+                giftsManager = new TikTokGiftsManager(requests().fetchGiftsData().getGifts());
+            }
+        }
+        return giftsManager;
+    }
 }

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

@@ -22,52 +22,51 @@
  */
 package io.github.jwdeveloper.tiktok;
 
-import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
+import com.google.protobuf.ByteString;
-import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
+import io.github.jwdeveloper.tiktok.data.events.*;
-import io.github.jwdeveloper.tiktok.data.events.TikTokReconnectingEvent;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.control.*;
 import io.github.jwdeveloper.tiktok.data.events.http.TikTokRoomDataResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
-import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
+import io.github.jwdeveloper.tiktok.data.requests.*;
-import io.github.jwdeveloper.tiktok.data.requests.LiveData;
-import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
-import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
-import io.github.jwdeveloper.tiktok.listener.ListenersManager;
-import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
-import io.github.jwdeveloper.tiktok.live.GiftManager;
-import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.live.LiveRoomInfo;
-import io.github.jwdeveloper.tiktok.models.ConnectionState;
 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.live.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.models.ConnectionState;
 import io.github.jwdeveloper.tiktok.websocket.SocketClient;
 
+import java.util.Base64;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 
 public class TikTokLiveClient implements LiveClient {
     private final TikTokRoomInfo liveRoomInfo;
-    private final TikTokGiftManager tikTokGiftManager;
+    private final LiveHttpClient httpClient;
-    private final TikTokLiveHttpClient httpClient;
     private final SocketClient webSocketClient;
     private final TikTokLiveEventHandler tikTokEventHandler;
     private final LiveClientSettings clientSettings;
     private final TikTokListenersManager listenersManager;
     private final Logger logger;
+    private final GiftsManager giftsManager;
+    private final TikTokLiveMessageHandler messageHandler;
 
-    public TikTokLiveClient(TikTokRoomInfo tikTokLiveMeta,
+    public TikTokLiveClient(
-                            TikTokLiveHttpClient tiktokHttpClient,
+            TikTokLiveMessageHandler messageHandler,
+            GiftsManager giftsManager,
+            TikTokRoomInfo tikTokLiveMeta,
+            LiveHttpClient tiktokHttpClient,
             SocketClient webSocketClient,
-                            TikTokGiftManager tikTokGiftManager,
             TikTokLiveEventHandler tikTokEventHandler,
             LiveClientSettings clientSettings,
             TikTokListenersManager listenersManager,
             Logger logger) {
+        this.messageHandler = messageHandler;
+        this.giftsManager = giftsManager;
         this.liveRoomInfo = tikTokLiveMeta;
-        this.tikTokGiftManager = tikTokGiftManager;
         this.httpClient = tiktokHttpClient;
         this.webSocketClient = webSocketClient;
         this.tikTokEventHandler = tikTokEventHandler;
@@ -103,7 +102,8 @@ public class TikTokLiveClient implements LiveClient {
             if (e instanceof TikTokLiveOfflineHostException && clientSettings.isRetryOnConnectionFailure()) {
                 try {
                     Thread.sleep(clientSettings.getRetryConnectionTimeout().toMillis());
-                } catch (Exception ignored) {}
+                } catch (Exception ignored) {
+                }
                 logger.info("Reconnecting");
                 tikTokEventHandler.publish(this, new TikTokReconnectingEvent());
                 this.connect();
@@ -127,22 +127,29 @@ public class TikTokLiveClient implements LiveClient {
         var userData = httpClient.fetchLiveUserData(userDataRequest);
         liveRoomInfo.setStartTime(userData.getStartedAtTimeStamp());
         liveRoomInfo.setRoomId(userData.getRoomId());
-        if (userData.getUserStatus() == LiveUserData.UserStatus.Offline) {
+
-            throw new TikTokLiveOfflineHostException("User is offline: "+liveRoomInfo.getHostUser());
+        if (clientSettings.isFetchGifts())
-        }
+            giftsManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
-        if (userData.getUserStatus() == LiveUserData.UserStatus.NotFound) {
+
-            throw new TikTokLiveOfflineHostException("User not found: "+liveRoomInfo.getHostUser());
+        if (userData.getUserStatus() == LiveUserData.UserStatus.Offline)
-        }
+            throw new TikTokLiveOfflineHostException("User is offline: " + liveRoomInfo.getHostName());
+
+        if (userData.getUserStatus() == LiveUserData.UserStatus.NotFound)
+            throw new TikTokLiveOfflineHostException("User not found: " + liveRoomInfo.getHostName());
 
         var liveDataRequest = new LiveData.Request(userData.getRoomId());
         var liveData = httpClient.fetchLiveData(liveDataRequest);
+
+        if (liveData.isAgeRestricted() && clientSettings.isThrowOnAgeRestriction())
+            throw new TikTokLiveException("Livestream for " + liveRoomInfo.getHostName() + " is 18+ or age restricted!");
+
+        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostNotFound)
+            throw new TikTokLiveOfflineHostException("LiveStream for " + liveRoomInfo.getHostName() + " could not be found.");
+
+        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostOffline)
+            throw new TikTokLiveOfflineHostException("LiveStream for " + liveRoomInfo.getHostName() + " not found, is the Host offline?");
+
         tikTokEventHandler.publish(this, new TikTokRoomDataResponseEvent(liveData));
-        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostNotFound) {
-            throw new TikTokLiveOfflineHostException("LiveStream for Host name could not be found.");
-        }
-        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostOffline) {
-            throw new TikTokLiveOfflineHostException("LiveStream for not be found, is the Host offline?");
-        }
 
         liveRoomInfo.setTitle(liveData.getTitle());
         liveRoomInfo.setViewersCount(liveData.getViewers());
@@ -180,6 +187,25 @@ public class TikTokLiveClient implements LiveClient {
         tikTokEventHandler.publish(this, event);
     }
 
+    @Override
+    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();
+        builder.setMethod(webcastMessageName);
+        builder.setPayload(ByteString.copyFrom(payload));
+        var message = builder.build();
+        messageHandler.handleSingleMessage(this, message);
+    }
+
+    @Override
+    public GiftsManager getGiftManager() {
+        return giftsManager;
+    }
+
     public LiveRoomInfo getRoomInfo() {
         return liveRoomInfo;
     }
@@ -193,9 +219,4 @@ public class TikTokLiveClient implements LiveClient {
     public Logger getLogger() {
         return logger;
     }
-
-    @Override
-    public GiftManager getGiftManager() {
-        return tikTokGiftManager;
-    }
 }

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

@@ -22,66 +22,51 @@
  */
 package io.github.jwdeveloper.tiktok;
 
+import io.github.jwdeveloper.tiktok.common.LoggerFactory;
 import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
 import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent;
-import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
+import io.github.jwdeveloper.tiktok.data.events.gift.*;
-import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
+import io.github.jwdeveloper.tiktok.data.events.link.*;
 import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent;
-import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
+import io.github.jwdeveloper.tiktok.data.events.room.*;
-import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent;
+import io.github.jwdeveloper.tiktok.data.events.social.*;
-import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent;
+import io.github.jwdeveloper.tiktok.data.events.websocket.*;
-import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent;
-import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent;
-import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent;
-import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
-import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
-import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
-import io.github.jwdeveloper.tiktok.http.HttpClientFactory;
-import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
-import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
-import io.github.jwdeveloper.tiktok.live.GiftManager;
-import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.live.builder.EventConsumer;
-import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
-import io.github.jwdeveloper.tiktok.mappers.TikTokGenericEventMapper;
-import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapper;
-import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapperHelper;
-import io.github.jwdeveloper.tiktok.mappers.TikTokMapper;
-import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokCommonEventHandler;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokRoomInfoEventHandler;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokSocialMediaEventHandler;
-import io.github.jwdeveloper.tiktok.messages.webcast.*;
 import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
-import io.github.jwdeveloper.tiktok.utils.ConsoleColors;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketClient;
+import io.github.jwdeveloper.tiktok.gifts.TikTokGiftsManager;
+import io.github.jwdeveloper.tiktok.http.HttpClientFactory;
+import io.github.jwdeveloper.tiktok.listener.*;
+import io.github.jwdeveloper.tiktok.live.*;
+import io.github.jwdeveloper.tiktok.live.builder.*;
+import io.github.jwdeveloper.tiktok.mappers.*;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.handlers.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.*;
+import io.github.jwdeveloper.tiktok.websocket.*;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
-import java.util.logging.*;
+import java.util.logging.Logger;
+
+import static io.github.jwdeveloper.tiktok.messages.enums.LinkMessageType.*;
 
 public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
     protected final LiveClientSettings clientSettings;
-    protected final Logger logger;
+    protected final TikTokLiveEventHandler eventHandler;
-    protected final TikTokLiveEventHandler tikTokEventHandler;
     protected final List<TikTokEventListener> listeners;
     protected Consumer<TikTokMapper> onCustomMappings;
+    protected Logger logger;
+    protected GiftsManager giftsManager;
 
-    public TikTokLiveClientBuilder(String userName)
+    public TikTokLiveClientBuilder(String userName) {
-    {
         this.clientSettings = LiveClientSettings.createDefault();
         this.clientSettings.setHostName(userName);
-        this.tikTokEventHandler = new TikTokLiveEventHandler();
+        this.eventHandler = new TikTokLiveEventHandler();
-        this.logger = Logger.getLogger(TikTokLive.class.getSimpleName() + " " + userName);
         this.listeners = new ArrayList<>();
         this.onCustomMappings = (e) -> {
         };
@@ -92,55 +77,36 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
-
     public TikTokLiveClientBuilder configure(Consumer<LiveClientSettings> onConfigure) {
         onConfigure.accept(clientSettings);
         return this;
     }
 
     public TikTokLiveClientBuilder addListener(TikTokEventListener listener) {
+        if (listener != null)
             listeners.add(listener);
         return this;
     }
 
     protected void validate() {
-        if (clientSettings.getClientLanguage() == null || clientSettings.getClientLanguage().isEmpty()) {
+        if (clientSettings.getClientLanguage() == null || clientSettings.getClientLanguage().isEmpty())
             clientSettings.setClientLanguage("en");
-        }
 
-
+        if (clientSettings.getHostName() == null || clientSettings.getHostName().isEmpty())
-        if (clientSettings.getHostName() == null || clientSettings.getHostName().isEmpty()) {
             throw new TikTokLiveException("HostName can not be null");
-        }
 
-        if (clientSettings.getHostName().startsWith("@")) {
+        if (clientSettings.getHostName().startsWith("@"))
             clientSettings.setHostName(clientSettings.getHostName().substring(1));
-        }
 
+        if (clientSettings.getPingInterval() < 250)
+            throw new TikTokLiveException("Minimum allowed ping interval is 250 millseconds");
 
         var httpSettings = clientSettings.getHttpSettings();
         httpSettings.getParams().put("app_language", clientSettings.getClientLanguage());
         httpSettings.getParams().put("webcast_language", clientSettings.getClientLanguage());
 
-
+        this.logger = LoggerFactory.create(clientSettings.getHostName(), clientSettings);
-        var handler = new ConsoleHandler();
+        this.giftsManager = clientSettings.isFetchGifts() ? TikTokLive.gifts() : new TikTokGiftsManager(List.of());
-        handler.setFormatter(new Formatter() {
-            @Override
-            public String format(LogRecord record) {
-                var sb = new StringBuilder();
-                sb.append(ConsoleColors.GREEN).append("[").append(record.getLoggerName()).append("] ");
-                sb.append(ConsoleColors.GREEN).append("[").append(record.getLevel()).append("]: ");
-                sb.append(ConsoleColors.WHITE_BRIGHT).append(record.getMessage());
-                sb.append(ConsoleColors.RESET).append("\n");
-                return sb.toString();
-            }
-        });
-        logger.setUseParentHandlers(false);
-        logger.addHandler(handler);
-        logger.setLevel(clientSettings.getLogLevel());
-        if (!clientSettings.isPrintToConsole()) {
-            logger.setLevel(Level.OFF);
-        }
     }
 
     public LiveClient build() {
@@ -149,35 +115,37 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         var tiktokRoomInfo = new TikTokRoomInfo();
         tiktokRoomInfo.setHostName(clientSettings.getHostName());
 
-        var listenerManager = new TikTokListenersManager(listeners, tikTokEventHandler);
+        var listenerManager = new TikTokListenersManager(listeners, eventHandler);
-
-        var giftManager = new TikTokGiftManager(logger);
-        var eventsMapper = createMapper(giftManager, tiktokRoomInfo);
-        var messageHandler = new TikTokLiveMessageHandler(tikTokEventHandler, eventsMapper);
-
 
         var httpClientFactory = new HttpClientFactory(clientSettings);
-        var tikTokLiveHttpClient = new TikTokLiveHttpClient(httpClientFactory, clientSettings);
 
-        var webSocketClient = new TikTokWebSocketClient(
+        var liveHttpClient = clientSettings.isOffline() ?
+                new TikTokLiveHttpOfflineClient() :
+                new TikTokLiveHttpClient(httpClientFactory, clientSettings);
+
+        var eventsMapper = createMapper(giftsManager, tiktokRoomInfo);
+        var messageHandler = new TikTokLiveMessageHandler(eventHandler, eventsMapper);
+
+        var webSocketClient = clientSettings.isOffline() ?
+                new TikTokWebSocketOfflineClient(eventHandler) :
+                new TikTokWebSocketClient(
                         clientSettings,
                         messageHandler,
-                tikTokEventHandler);
+                        eventHandler);
 
-        return new TikTokLiveClient(tiktokRoomInfo,
+        return new TikTokLiveClient(
-                tikTokLiveHttpClient,
+                messageHandler,
+                giftsManager,
+                tiktokRoomInfo,
+                liveHttpClient,
                 webSocketClient,
-                giftManager,
+                eventHandler,
-                tikTokEventHandler,
                 clientSettings,
                 listenerManager,
                 logger);
     }
 
-    public TikTokLiveMapper createMapper(GiftManager giftManager, TikTokRoomInfo roomInfo) {
+    public TikTokLiveMapper createMapper(GiftsManager giftsManager, TikTokRoomInfo roomInfo) {
-        /*
-          //
-         */
 
 
         var eventMapper = new TikTokGenericEventMapper();
@@ -185,7 +153,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
         //ConnectionEvents events
         var commonHandler = new TikTokCommonEventHandler();
-        var giftHandler = new TikTokGiftEventHandler(giftManager, roomInfo);
+        var giftHandler = new TikTokGiftEventHandler(giftsManager, roomInfo);
         var roomInfoHandler = new TikTokRoomInfoEventHandler(roomInfo);
         var socialHandler = new TikTokSocialMediaEventHandler(roomInfo);
 
@@ -241,8 +209,41 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
 
         //LinkMic events
-        //  mapper.webcastObjectToConstructor(WebcastLinkMicBattle.class, TikTokLinkMicBattleEvent.class);
+        mapper.forMessage(WebcastLinkMicBattle.class, (inputBytes, messageName, mapperHelper) -> {
-        //  mapper.webcastObjectToConstructor(WebcastLinkMicArmies.class, TikTokLinkMicArmiesEvent.class);
+            var message = mapperHelper.bytesToWebcastObject(inputBytes, WebcastLinkMicBattle.class);
+            return MappingResult.of(message, new TikTokLinkMicBattleEvent(message));
+        });
+        mapper.forMessage(WebcastLinkMicArmies.class, (inputBytes, messageName, mapperHelper) -> {
+            var message = mapperHelper.bytesToWebcastObject(inputBytes, WebcastLinkMicArmies.class);
+            return MappingResult.of(message, new TikTokLinkMicArmiesEvent(message));
+        });
+        mapper.forMessage(WebcastLinkMessage.class, ((inputBytes, messageName, mapperHelper) -> {
+            var message = mapperHelper.bytesToWebcastObject(inputBytes, WebcastLinkMessage.class);
+            return MappingResult.of(message, switch (message.getMessageType()) {
+                case TYPE_LINKER_INVITE -> new TikTokLinkInviteEvent(message);
+                case TYPE_LINKER_REPLY -> new TikTokLinkReplyEvent(message);
+                case TYPE_LINKER_CREATE -> new TikTokLinkCreateEvent(message);
+                case TYPE_LINKER_CLOSE -> new TikTokLinkCloseEvent(message);
+                case TYPE_LINKER_ENTER -> new TikTokLinkEnterEvent(message);
+                case TYPE_LINKER_LEAVE -> new TikTokLinkLeaveEvent(message);
+                case TYPE_LINKER_CANCEL_INVITE, TYPE_LINKER_CANCEL_APPLY -> new TikTokLinkCancelEvent(message);
+                case TYPE_LINKER_KICK_OUT -> new TikTokLinkKickOutEvent(message);
+                case TYPE_LINKER_LINKED_LIST_CHANGE -> new TikTokLinkLinkedListChangeEvent(message);
+                case TYPE_LINKER_UPDATE_USER -> new TikTokLinkUpdateUserEvent(message);
+                case TYPE_LINKER_WAITING_LIST_CHANGE, TYPE_LINKER_WAITING_LIST_CHANGE_V2 -> new TikTokLinkWaitListChangeEvent(message);
+                case TYPE_LINKER_MUTE -> new TikTokLinkMuteEvent(message);
+                case TYPE_LINKER_MATCH -> new TikTokLinkRandomMatchEvent(message);
+                case TYPE_LINKER_UPDATE_USER_SETTING -> new TikTokLinkUpdateUserSettingEvent(message);
+                case TYPE_LINKER_MIC_IDX_UPDATE -> new TikTokLinkMicIdxUpdateEvent(message);
+                case TYPE_LINKER_LINKED_LIST_CHANGE_V2 -> new TikTokLinkListChangeEvent(message);
+                case TYPE_LINKER_COHOST_LIST_CHANGE -> new TikTokLinkCohostListChangeEvent(message);
+                case TYPE_LINKER_MEDIA_CHANGE -> new TikTokLinkMediaChangeEvent(message);
+                case TYPE_LINKER_ACCEPT_NOTICE -> new TikTokLinkAcceptNoticeEvent(message);
+                case TYPE_LINKER_SYS_KICK_OUT -> new TikTokLinkSysKickOutEvent(message);
+                case TYPE_LINKMIC_USER_TOAST -> new TikTokLinkUserToastEvent(message);
+                default -> new TikTokLinkEvent(message);
+            });
+        }));
         // mapper.webcastObjectToConstructor(WebcastLinkMicMethod.class, TikTokLinkMicMethodEvent.class);
         //  mapper.webcastObjectToConstructor(WebcastLinkMicFanTicketMethod.class, TikTokLinkMicFanTicketEvent.class);
 
@@ -277,262 +278,360 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
     }
 
     public TikTokLiveClientBuilder onUnhandledSocial(EventConsumer<TikTokUnhandledSocialEvent> event) {
-        tikTokEventHandler.subscribe(TikTokUnhandledSocialEvent.class, event);
+        eventHandler.subscribe(TikTokUnhandledSocialEvent.class, event);
         return this;
     }
 
-    //  @Override
     public LiveClientBuilder onChest(EventConsumer<TikTokChestEvent> event) {
-        tikTokEventHandler.subscribe(TikTokChestEvent.class, event);
+        eventHandler.subscribe(TikTokChestEvent.class, event);
         return this;
     }
 
-
     public TikTokLiveClientBuilder onLinkMicFanTicket(EventConsumer<TikTokLinkMicFanTicketEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLinkMicFanTicketEvent.class, event);
+        eventHandler.subscribe(TikTokLinkMicFanTicketEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onEnvelope(EventConsumer<TikTokEnvelopeEvent> event) {
-        tikTokEventHandler.subscribe(TikTokEnvelopeEvent.class, event);
+        eventHandler.subscribe(TikTokEnvelopeEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onShop(EventConsumer<TikTokShopEvent> event) {
-        tikTokEventHandler.subscribe(TikTokShopEvent.class, event);
+        eventHandler.subscribe(TikTokShopEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onDetect(EventConsumer<TikTokDetectEvent> event) {
-        tikTokEventHandler.subscribe(TikTokDetectEvent.class, event);
+        eventHandler.subscribe(TikTokDetectEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onLinkLayer(EventConsumer<TikTokLinkLayerEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLinkLayerEvent.class, event);
+        eventHandler.subscribe(TikTokLinkLayerEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onConnected(EventConsumer<TikTokConnectedEvent> event) {
-        tikTokEventHandler.subscribe(TikTokConnectedEvent.class, event);
+        eventHandler.subscribe(TikTokConnectedEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onPreConnection(EventConsumer<TikTokPreConnectionEvent> event) {
-        tikTokEventHandler.subscribe(TikTokPreConnectionEvent.class, event);
+        eventHandler.subscribe(TikTokPreConnectionEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onCaption(EventConsumer<TikTokCaptionEvent> event) {
-        tikTokEventHandler.subscribe(TikTokCaptionEvent.class, event);
+        eventHandler.subscribe(TikTokCaptionEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onQuestion(EventConsumer<TikTokQuestionEvent> event) {
-        tikTokEventHandler.subscribe(TikTokQuestionEvent.class, event);
+        eventHandler.subscribe(TikTokQuestionEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onRoomPin(EventConsumer<TikTokRoomPinEvent> event) {
-        tikTokEventHandler.subscribe(TikTokRoomPinEvent.class, event);
+        eventHandler.subscribe(TikTokRoomPinEvent.class, event);
         return this;
     }
 
     @Override
     public <E extends TikTokEvent> LiveClientBuilder onEvent(Class<E> eventClass, EventConsumer<E> event) {
-        tikTokEventHandler.subscribe(eventClass, event);
+        eventHandler.subscribe(eventClass, event);
         return this;
     }
 
-
     @Override
     public TikTokLiveClientBuilder onRoomInfo(EventConsumer<TikTokRoomInfoEvent> event) {
-        tikTokEventHandler.subscribe(TikTokRoomInfoEvent.class, event);
+        eventHandler.subscribe(TikTokRoomInfoEvent.class, event);
         return this;
     }
 
-
     public TikTokLiveClientBuilder onLivePaused(EventConsumer<TikTokLivePausedEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLivePausedEvent.class, event);
+        eventHandler.subscribe(TikTokLivePausedEvent.class, event);
         return this;
     }
 
     @Override
     public TikTokLiveClientBuilder onLiveUnpaused(EventConsumer<TikTokLiveUnpausedEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLiveUnpausedEvent.class, event);
+        eventHandler.subscribe(TikTokLiveUnpausedEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onLike(EventConsumer<TikTokLikeEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLikeEvent.class, event);
+        eventHandler.subscribe(TikTokLikeEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onLink(EventConsumer<TikTokLinkEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLinkEvent.class, event);
+        eventHandler.subscribe(TikTokLinkEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkInvite(EventConsumer<TikTokLinkInviteEvent> event) {
+        eventHandler.subscribe(TikTokLinkInviteEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkReply(EventConsumer<TikTokLinkReplyEvent> event) {
+        eventHandler.subscribe(TikTokLinkReplyEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkCreate(EventConsumer<TikTokLinkCreateEvent> event) {
+        eventHandler.subscribe(TikTokLinkCreateEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkClose(EventConsumer<TikTokLinkCloseEvent> event) {
+        eventHandler.subscribe(TikTokLinkCloseEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkEnter(EventConsumer<TikTokLinkEnterEvent> event) {
+        eventHandler.subscribe(TikTokLinkEnterEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkLeave(EventConsumer<TikTokLinkLeaveEvent> event) {
+        eventHandler.subscribe(TikTokLinkLeaveEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkCancel(EventConsumer<TikTokLinkCancelEvent> event) {
+        eventHandler.subscribe(TikTokLinkCancelEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkKickOut(EventConsumer<TikTokLinkKickOutEvent> event) {
+        eventHandler.subscribe(TikTokLinkKickOutEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkLinkedListChange(EventConsumer<TikTokLinkLinkedListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkLinkedListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkUpdateUser(EventConsumer<TikTokLinkUpdateUserEvent> event) {
+        eventHandler.subscribe(TikTokLinkUpdateUserEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkWaitListChange(EventConsumer<TikTokLinkWaitListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkWaitListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMute(EventConsumer<TikTokLinkMuteEvent> event) {
+        eventHandler.subscribe(TikTokLinkMuteEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkRandomMatch(EventConsumer<TikTokLinkRandomMatchEvent> event) {
+        eventHandler.subscribe(TikTokLinkRandomMatchEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkUpdateUserSettings(EventConsumer<TikTokLinkUpdateUserSettingEvent> event) {
+        eventHandler.subscribe(TikTokLinkUpdateUserSettingEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMicIdxUpdate(EventConsumer<TikTokLinkMicIdxUpdateEvent> event) {
+        eventHandler.subscribe(TikTokLinkMicIdxUpdateEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkListChange(EventConsumer<TikTokLinkListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkCohostListChange(EventConsumer<TikTokLinkCohostListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkCohostListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMediaChange(EventConsumer<TikTokLinkMediaChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkMediaChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkAcceptNotice(EventConsumer<TikTokLinkAcceptNoticeEvent> event) {
+        eventHandler.subscribe(TikTokLinkAcceptNoticeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkSysKickOut(EventConsumer<TikTokLinkSysKickOutEvent> event) {
+        eventHandler.subscribe(TikTokLinkSysKickOutEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkUserToast(EventConsumer<TikTokLinkUserToastEvent> event) {
+        eventHandler.subscribe(TikTokLinkUserToastEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onBarrage(EventConsumer<TikTokBarrageEvent> event) {
-        tikTokEventHandler.subscribe(TikTokBarrageEvent.class, event);
+        eventHandler.subscribe(TikTokBarrageEvent.class, event);
         return this;
     }
 
-
     public TikTokLiveClientBuilder onGift(EventConsumer<TikTokGiftEvent> event) {
-        tikTokEventHandler.subscribe(TikTokGiftEvent.class, event);
+        eventHandler.subscribe(TikTokGiftEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onGiftCombo(EventConsumer<TikTokGiftComboEvent> event) {
-        tikTokEventHandler.subscribe(TikTokGiftComboEvent.class, event);
+        eventHandler.subscribe(TikTokGiftComboEvent.class, event);
         return this;
     }
 
-
     public TikTokLiveClientBuilder onLinkMicArmies(EventConsumer<TikTokLinkMicArmiesEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLinkMicArmiesEvent.class, event);
+        eventHandler.subscribe(TikTokLinkMicArmiesEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onEmote(EventConsumer<TikTokEmoteEvent> event) {
-        tikTokEventHandler.subscribe(TikTokEmoteEvent.class, event);
+        eventHandler.subscribe(TikTokEmoteEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onUnauthorizedMember(EventConsumer<TikTokUnauthorizedMemberEvent> event) {
-        tikTokEventHandler.subscribe(TikTokUnauthorizedMemberEvent.class, event);
+        eventHandler.subscribe(TikTokUnauthorizedMemberEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onInRoomBanner(EventConsumer<TikTokInRoomBannerEvent> event) {
-        tikTokEventHandler.subscribe(TikTokInRoomBannerEvent.class, event);
+        eventHandler.subscribe(TikTokInRoomBannerEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onLinkMicMethod(EventConsumer<TikTokLinkMicMethodEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLinkMicMethodEvent.class, event);
+        eventHandler.subscribe(TikTokLinkMicMethodEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onSubscribe(EventConsumer<TikTokSubscribeEvent> event) {
-        tikTokEventHandler.subscribe(TikTokSubscribeEvent.class, event);
+        eventHandler.subscribe(TikTokSubscribeEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onPoll(EventConsumer<TikTokPollEvent> event) {
-        tikTokEventHandler.subscribe(TikTokPollEvent.class, event);
+        eventHandler.subscribe(TikTokPollEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onFollow(EventConsumer<TikTokFollowEvent> event) {
-        tikTokEventHandler.subscribe(TikTokFollowEvent.class, event);
+        eventHandler.subscribe(TikTokFollowEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onComment(EventConsumer<TikTokCommentEvent> event) {
-        tikTokEventHandler.subscribe(TikTokCommentEvent.class, event);
+        eventHandler.subscribe(TikTokCommentEvent.class, event);
         return this;
     }
 
     @Override
     public LiveClientBuilder onHttpResponse(EventConsumer<TikTokHttpResponseEvent> action) {
-        tikTokEventHandler.subscribe(TikTokHttpResponseEvent.class, action);
+        eventHandler.subscribe(TikTokHttpResponseEvent.class, action);
         return this;
     }
 
     public TikTokLiveClientBuilder onGoalUpdate(EventConsumer<TikTokGoalUpdateEvent> event) {
-        tikTokEventHandler.subscribe(TikTokGoalUpdateEvent.class, event);
+        eventHandler.subscribe(TikTokGoalUpdateEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onRankUpdate(EventConsumer<TikTokRankUpdateEvent> event) {
-        tikTokEventHandler.subscribe(TikTokRankUpdateEvent.class, event);
+        eventHandler.subscribe(TikTokRankUpdateEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onIMDelete(EventConsumer<TikTokIMDeleteEvent> event) {
-        tikTokEventHandler.subscribe(TikTokIMDeleteEvent.class, event);
+        eventHandler.subscribe(TikTokIMDeleteEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onLiveEnded(EventConsumer<TikTokLiveEndedEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLiveEndedEvent.class, event);
+        eventHandler.subscribe(TikTokLiveEndedEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onError(EventConsumer<TikTokErrorEvent> event) {
-        tikTokEventHandler.subscribe(TikTokErrorEvent.class, event);
+        eventHandler.subscribe(TikTokErrorEvent.class, event);
         return this;
     }
 
-
     public TikTokLiveClientBuilder onJoin(EventConsumer<TikTokJoinEvent> event) {
-        tikTokEventHandler.subscribe(TikTokJoinEvent.class, event);
+        eventHandler.subscribe(TikTokJoinEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onRankText(EventConsumer<TikTokRankTextEvent> event) {
-        tikTokEventHandler.subscribe(TikTokRankTextEvent.class, event);
+        eventHandler.subscribe(TikTokRankTextEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onShare(EventConsumer<TikTokShareEvent> event) {
-        tikTokEventHandler.subscribe(TikTokShareEvent.class, event);
+        eventHandler.subscribe(TikTokShareEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onUnhandledMember(EventConsumer<TikTokUnhandledMemberEvent> event) {
-        tikTokEventHandler.subscribe(TikTokUnhandledMemberEvent.class, event);
+        eventHandler.subscribe(TikTokUnhandledMemberEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onSubNotify(EventConsumer<TikTokSubNotifyEvent> event) {
-        tikTokEventHandler.subscribe(TikTokSubNotifyEvent.class, event);
+        eventHandler.subscribe(TikTokSubNotifyEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onLinkMicBattle(EventConsumer<TikTokLinkMicBattleEvent> event) {
-        tikTokEventHandler.subscribe(TikTokLinkMicBattleEvent.class, event);
+        eventHandler.subscribe(TikTokLinkMicBattleEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onDisconnected(EventConsumer<TikTokDisconnectedEvent> event) {
-        tikTokEventHandler.subscribe(TikTokDisconnectedEvent.class, event);
+        eventHandler.subscribe(TikTokDisconnectedEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onUnhandledControl(EventConsumer<TikTokUnhandledControlEvent> event) {
-        tikTokEventHandler.subscribe(TikTokUnhandledControlEvent.class, event);
+        eventHandler.subscribe(TikTokUnhandledControlEvent.class, event);
         return this;
     }
 
     public TikTokLiveClientBuilder onEvent(EventConsumer<TikTokEvent> event) {
-        tikTokEventHandler.subscribe(TikTokEvent.class, event);
+        eventHandler.subscribe(TikTokEvent.class, event);
         return this;
     }
 
     @Override
     public TikTokLiveClientBuilder onWebsocketResponse(EventConsumer<TikTokWebsocketResponseEvent> event) {
-        tikTokEventHandler.subscribe(TikTokWebsocketResponseEvent.class, event);
+        eventHandler.subscribe(TikTokWebsocketResponseEvent.class, event);
         return this;
     }
 
     @Override
     public TikTokLiveClientBuilder onWebsocketMessage(EventConsumer<TikTokWebsocketMessageEvent> event) {
-        tikTokEventHandler.subscribe(TikTokWebsocketMessageEvent.class, event);
+        eventHandler.subscribe(TikTokWebsocketMessageEvent.class, event);
         return this;
     }
 
     @Override
     public TikTokLiveClientBuilder onWebsocketUnhandledMessage(EventConsumer<TikTokWebsocketUnhandledMessageEvent> event) {
-        tikTokEventHandler.subscribe(TikTokWebsocketUnhandledMessageEvent.class, event);
+        eventHandler.subscribe(TikTokWebsocketUnhandledMessageEvent.class, event);
         return this;
     }
 
     @Override
     public TikTokLiveClientBuilder onReconnecting(EventConsumer<TikTokReconnectingEvent> event) {
-        tikTokEventHandler.subscribe(TikTokReconnectingEvent.class, event);
+        eventHandler.subscribe(TikTokReconnectingEvent.class, event);
         return this;
     }
 }

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

@@ -23,39 +23,42 @@
 package io.github.jwdeveloper.tiktok;
 
 import com.google.protobuf.InvalidProtocolBufferException;
+import io.github.jwdeveloper.tiktok.common.*;
 import io.github.jwdeveloper.tiktok.data.requests.*;
-import io.github.jwdeveloper.tiktok.data.settings.*;
+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 java.net.http.HttpResponse;
-import java.util.Optional;
+import java.util.logging.Logger;
-
-public class TikTokLiveHttpClient implements LiveHttpClient {
 
+public class TikTokLiveHttpClient implements LiveHttpClient
+{
     /**
-     * Signing API by Isaac Kogan
+	 * <a href="https://github-wiki-see.page/m/isaackogan/TikTokLive/wiki/All-About-Signatures">Signing API by Isaac Kogan</a>
-     * https://github-wiki-see.page/m/isaackogan/TikTokLive/wiki/All-About-Signatures
 	 */
-    private static final String TIKTOK_SIGN_API = "https://tiktok.eulerstream.com/webcast/sign_url";
+    private static final String TIKTOK_SIGN_API = "https://tiktok.eulerstream.com/webcast/fetch";
     private static final String TIKTOK_URL_WEB = "https://www.tiktok.com/";
     private static final String TIKTOK_URL_WEBCAST = "https://webcast.tiktok.com/webcast/";
+    public static final String TIKTOK_GIFTS_URL = "https://raw.githubusercontent.com/TikTok-LIVE-Private/GiftsGenerator/master/page/public/gifts.json";
+    public static final String TIKTOK_ROOM_GIFTS_URL = TIKTOK_URL_WEBCAST+"gift/list/";
+    public static final int TIKTOK_AGE_RESTRICTED_CODE = 4003110;
 
     private final HttpClientFactory httpFactory;
     private final LiveClientSettings clientSettings;
     private final LiveUserDataMapper liveUserDataMapper;
     private final LiveDataMapper liveDataMapper;
-    private final SignServerResponseMapper signServerResponseMapper;
     private final GiftsDataMapper giftsDataMapper;
+    private final Logger logger;
 
     public TikTokLiveHttpClient(HttpClientFactory factory, LiveClientSettings settings) {
         this.httpFactory = factory;
-        clientSettings = settings;
+        this.clientSettings = settings;
+        this.logger = LoggerFactory.create("HttpClient-"+hashCode(), clientSettings);
         liveUserDataMapper = new LiveUserDataMapper();
         liveDataMapper = new LiveDataMapper();
-        signServerResponseMapper = new SignServerResponseMapper();
         giftsDataMapper = new GiftsDataMapper();
     }
 
@@ -63,136 +66,122 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
         this(new HttpClientFactory(LiveClientSettings.createDefault()), LiveClientSettings.createDefault());
     }
 
-
+    public GiftsData.Response fetchRoomGiftsData(String room_id) {
-    public GiftsData.Response fetchGiftsData() {
-        var url = TIKTOK_URL_WEBCAST + "gift/list/";
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    var optional = httpFactory.client(url)
+                    return getRoomGiftsData(room_id);
-                            .build()
-                            .toJsonResponse();
-
-                    if (optional.isEmpty()) {
-                        throw new TikTokLiveRequestException("Unable to fetch gifts information's");
-                    }
-                    var json = optional.get();
-                    return giftsDataMapper.map(json);
                 } catch (TikTokProxyRequestException ignored) {}
             }
         }
-        var optional = httpFactory.client(url)
+        return getRoomGiftsData(room_id);
+    }
+
+    public GiftsData.Response getRoomGiftsData(String room_id) {
+        var result = httpFactory.client(TIKTOK_ROOM_GIFTS_URL)
+            .withParam("room_id", room_id)
             .build()
             .toJsonResponse();
 
-        if (optional.isEmpty()) {
+        if (result.isFailure())
-            throw new TikTokLiveRequestException("Unable to fetch gifts information's");
+            throw new TikTokLiveRequestException("Unable to fetch gifts information's - "+result);
+
+        var json = result.getContent();
+        return giftsDataMapper.mapRoom(json);
     }
 
-        var json = optional.get();
+    public GiftsData.Response fetchGiftsData() {
+        var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
+        if (proxyClientSettings.isEnabled()) {
+            while (proxyClientSettings.hasNext()) {
+                try {
+                    return getGiftsData();
+                } catch (TikTokProxyRequestException ignored) {}
+            }
+        }
+        return getGiftsData();
+    }
+
+    public GiftsData.Response getGiftsData() {
+        var result = httpFactory.client(TIKTOK_GIFTS_URL)
+            .build()
+            .toJsonResponse();
+
+        if (result.isFailure())
+            throw new TikTokLiveRequestException("Unable to fetch gifts information's - "+result);
+
+        var json = result.getContent();
         return giftsDataMapper.map(json);
     }
 
-
-    @Override
-    public LiveUserData.Response fetchLiveUserData(String userName) {
-        return fetchLiveUserData(new LiveUserData.Request(userName));
-    }
-
     @Override
     public LiveUserData.Response fetchLiveUserData(LiveUserData.Request request) {
-        var url = TIKTOK_URL_WEB + "api-live/user/room";
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    var optional = httpFactory.client(url)
+                    return getLiveUserData(request);
-                        .withParam("uniqueId", request.getUserName())
-                        .withParam("sourceType", "54")
-                        .build()
-                        .toJsonResponse();
-
-                    if (optional.isEmpty()) {
-                        throw new TikTokLiveRequestException("Unable to get information's about user");
-                    }
-
-                    var json = optional.get();
-                    return liveUserDataMapper.map(json);
                 } catch (TikTokProxyRequestException ignored) {}
             }
         }
-        var optional = httpFactory.client(url)
+        return getLiveUserData(request);
+    }
+
+    public LiveUserData.Response getLiveUserData(LiveUserData.Request request) {
+        var url = TIKTOK_URL_WEB + "api-live/user/room";
+        var result = httpFactory.client(url)
             .withParam("uniqueId", request.getUserName())
             .withParam("sourceType", "54")
             .build()
             .toJsonResponse();
 
-        if (optional.isEmpty()) {
+        if (result.isFailure())
-            throw new TikTokLiveRequestException("Unable to get information's about user");
+            throw new TikTokLiveRequestException("Unable to get information's about user - "+result);
-        }
 
-        var json = optional.get();
+        var json = result.getContent();
-        return liveUserDataMapper.map(json);
+        return liveUserDataMapper.map(json, logger);
-    }
-
-    @Override
-    public LiveData.Response fetchLiveData(String roomId) {
-        return fetchLiveData(new LiveData.Request(roomId));
     }
 
     @Override
     public LiveData.Response fetchLiveData(LiveData.Request request) {
-        var url = TIKTOK_URL_WEBCAST + "room/info";
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    var optional = httpFactory.client(url)
+                    return getLiveData(request);
-                        .withParam("room_id", request.getRoomId())
-                        .build()
-                        .toJsonResponse();
-
-                    if (optional.isEmpty()) {
-                        throw new TikTokLiveRequestException("Unable to get info about live room");
-                    }
-
-                    var json = optional.get();
-                    return liveDataMapper.map(json);
                 } catch (TikTokProxyRequestException ignored) {}
             }
         }
-        var optional = httpFactory.client(url)
+        return getLiveData(request);
+    }
+
+    public LiveData.Response getLiveData(LiveData.Request request) {
+        var url = TIKTOK_URL_WEBCAST + "room/info";
+        var result = httpFactory.client(url)
             .withParam("room_id", request.getRoomId())
             .build()
             .toJsonResponse();
 
-        if (optional.isEmpty()) {
+        if (result.isFailure())
-            throw new TikTokLiveRequestException("Unable to get info about live room");
+            throw new TikTokLiveRequestException("Unable to get info about live room - "+result);
-        }
 
-        var json = optional.get();
+        var json = result.getContent();
         return liveDataMapper.map(json);
     }
 
-    @Override
-    public LiveConnectionData.Response fetchLiveConnectionData(String roomId) {
-        return fetchLiveConnectionData(new LiveConnectionData.Request(roomId));
-    }
-
     @Override
     public LiveConnectionData.Response fetchLiveConnectionData(LiveConnectionData.Request request) {
-		HttpResponse<byte[]> credentialsResponse = getOptionalProxyResponse(request).orElseGet(()-> {
+        var result = getStartingPayload(request);
-            SignServerResponse signServerResponse = getSignedUrl(request.getRoomId());
+        HttpResponse<byte[]> credentialsResponse = result.getContent(); // Always guaranteed to have response
-            return getWebsocketCredentialsResponse(signServerResponse.getSignedUrl());
-        });
 
         try {
-            var optionalHeader = credentialsResponse.headers().firstValue("set-cookie");
+            var resultHeader = ActionResult.of(credentialsResponse.headers().firstValue("x-set-tt-cookie"));
-            if (optionalHeader.isEmpty()) {
+            if (resultHeader.isFailure()) {
-                throw new TikTokSignServerException("Sign server did not return the set-cookie header");
+                logger.warning("Sign Server Headers: "+request.getRoomId()+" - "+credentialsResponse.headers().map());
+                throw new TikTokSignServerException("Sign server did not return the x-set-tt-cookie header - "+result);
             }
-            var websocketCookie = optionalHeader.get();
+            var websocketCookie = resultHeader.getContent();
             var webcastResponse = WebcastResponse.parseFrom(credentialsResponse.body());
             var webSocketUrl = httpFactory
                     .client(webcastResponse.getPushServer())
@@ -206,57 +195,36 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
 
             return new LiveConnectionData.Response(websocketCookie, webSocketUrl, webcastResponse);
         } catch (InvalidProtocolBufferException e) {
-            throw new TikTokSignServerException("Unable to parse websocket credentials response to WebcastResponse");
+            throw new TikTokSignServerException("Unable to parse websocket credentials response to WebcastResponse - "+result);
         }
     }
 
-    SignServerResponse getSignedUrl(String roomId) {
+    private ActionResult<HttpResponse<byte[]>> getStartingPayload(LiveConnectionData.Request request) {
-        var urlToSign = httpFactory
-                .client(TikTokLiveHttpClient.TIKTOK_URL_WEBCAST + "im/fetch")
-                .withParam("room_id", roomId)
-                .build()
-                .toUrl();
-
-
-        var optional = httpFactory
-                .client(TikTokLiveHttpClient.TIKTOK_SIGN_API)
-                .withParam("client", "ttlive-java")
-                .withParam("uuc", "1")
-                .withParam("url", urlToSign.toString())
-                .build()
-                .toJsonResponse();
-
-        if (optional.isEmpty()) {
-            throw new TikTokSignServerException("Unable to sign url: " + urlToSign);
-        }
-
-        var json = optional.get();
-        return signServerResponseMapper.map(json);
-    }
-
-    HttpResponse<byte[]> getWebsocketCredentialsResponse(String signedUrl) {
-        var optionalResponse = httpFactory
-                .clientEmpty(signedUrl)
-                .build()
-                .toResponse();
-        if (optionalResponse.isEmpty()) {
-            throw new TikTokSignServerException("Unable to get websocket connection credentials");
-        }
-        return optionalResponse.get();
-    }
-
-    Optional<HttpResponse<byte[]>> getOptionalProxyResponse(LiveConnectionData.Request request) {
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    SignServerResponse signServerResponse = getSignedUrl(request.getRoomId());
+                    return getByteResponse(request.getRoomId());
-                    HttpResponse<byte[]> credentialsResponse = getWebsocketCredentialsResponse(signServerResponse.getSignedUrl());
-                    clientSettings.getHttpSettings().getProxyClientSettings().rotate();
-                    return Optional.of(credentialsResponse);
                 } catch (TikTokProxyRequestException | TikTokSignServerException ignored) {}
             }
         }
-        return Optional.empty();
+        return getByteResponse(request.getRoomId());
+    }
+
+    private ActionResult<HttpResponse<byte[]>> getByteResponse(String room_id) {
+        HttpClientBuilder builder = httpFactory.client(TIKTOK_SIGN_API)
+            .withParam("client", "ttlive-java")
+            .withParam("uuc", "1")
+            .withParam("room_id", room_id);
+
+        if (clientSettings.getApiKey() != null)
+            builder.withParam("apiKey", clientSettings.getApiKey());
+
+        var result = builder.build().toResponse();
+
+        if (result.isFailure())
+            throw new TikTokSignServerException("Unable to get websocket connection credentials - "+result);
+
+        return result;
     }
 }

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

@@ -0,0 +1,50 @@
+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.http.LiveHttpClient;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+
+import java.net.URI;
+import java.util.List;
+
+public class TikTokLiveHttpOfflineClient implements LiveHttpClient {
+    @Override
+    public GiftsData.Response fetchGiftsData() {
+        return new GiftsData.Response("", List.of());
+    }
+
+    @Override
+    public GiftsData.Response fetchRoomGiftsData(String room_id) {
+        return new GiftsData.Response("", List.of());
+    }
+
+    @Override
+    public LiveUserData.Response fetchLiveUserData(LiveUserData.Request request) {
+        return new LiveUserData.Response("", LiveUserData.UserStatus.Live, "offline_room_id", 0);
+    }
+
+    @Override
+    public LiveData.Response fetchLiveData(LiveData.Request request) {
+        return new LiveData.Response("",
+                LiveData.LiveStatus.HostOnline,
+                "offline live",
+                0,
+                0,
+                0,
+                false,
+                new User(0L, "offline user", new Picture("")),
+                LiveData.LiveType.SOLO);
+    }
+
+    @Override
+    public LiveConnectionData.Response fetchLiveConnectionData(LiveConnectionData.Request request) {
+        return new LiveConnectionData.Response("",
+                URI.create("https://example.live"),
+                WebcastResponse.newBuilder().build());
+    }
+}

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

@@ -61,11 +61,6 @@ public class TikTokRoomInfo implements LiveRoomInfo {
         return connectionState == state;
     }
 
-    @Override
-    public User getHostUser() {
-        return host;
-    }
-
     public void updateRanking(List<RankingUser> rankingUsers) {
         usersRanking.clear();
         usersRanking.addAll(rankingUsers);

Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java

@@ -0,0 +1,113 @@
+package io.github.jwdeveloper.tiktok.common;
+
+import com.google.gson.*;
+import io.github.jwdeveloper.tiktok.http.mappers.*;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.net.http.*;
+import java.util.Optional;
+import java.util.function.Function;
+
+@Data
+public class ActionResult<T> {
+
+	private static final Gson gson = new Gson().newBuilder().disableHtmlEscaping()
+		.registerTypeHierarchyAdapter(HttpResponse.class, new HttpResponseJsonMapper())
+		.registerTypeHierarchyAdapter(HttpRequest.class, new HttpRequestJsonMapper())
+		.setPrettyPrinting().create();
+
+	private boolean success = true;
+	private String message;
+	private T content;
+	@Accessors(chain = true, fluent = true)
+	private ActionResult<?> previous;
+
+	protected ActionResult(T object) {
+		this.content = object;
+	}
+
+	protected ActionResult(T object, boolean success) {
+		this(object);
+		this.success = success;
+	}
+
+	protected ActionResult(T object, boolean success, String message) {
+		this(object, success);
+		this.message = message;
+	}
+
+	public static <T> ActionResultBuilder<T> of(T content) {
+		return new ActionResultBuilder<>(content);
+	}
+
+	public static <T> ActionResult<T> of(Optional<T> optional) {
+		return new ActionResult<>(optional.orElse(null), optional.isPresent());
+	}
+
+	public boolean isFailure() {
+		return !isSuccess();
+	}
+
+	public boolean hasMessage() {
+		return message != null;
+	}
+
+	public boolean hasPrevious() {
+		return previous != null;
+	}
+
+	public boolean hasContent() {
+		return content != null;
+	}
+
+	public <Output> ActionResult<Output> cast(Output output) {
+		return new ActionResult<>(output, this.isSuccess(), this.getMessage());
+	}
+
+	public <Output> ActionResult<Output> cast() {
+		return cast(null);
+	}
+
+	public <U> ActionResult<U> map(Function<? super T, ? extends U> mapper) {
+		return hasContent() ? cast(mapper.apply(content)) : cast();
+	}
+
+	public static <T> ActionResult<T> success(T payload, String message) {
+		return new ActionResult<>(payload, true, message);
+	}
+
+	public static <T> ActionResult<T> success(T payload) {
+		return success(payload, null);
+	}
+
+	public static <T> ActionResult<T> success() {
+		return success(null);
+	}
+
+	public static <T> ActionResult<T> failure(T target, String message) {
+		return new ActionResult<>(target, false, message);
+	}
+
+	public static <T> ActionResult<T> failure(String message) {
+		return failure(null, message);
+	}
+
+	public static <T> ActionResult<T> failure() {
+		return failure(null);
+	}
+
+	public JsonObject toJson() {
+		JsonObject map = new JsonObject();
+		map.addProperty("success", success);
+		map.add("content", gson.toJsonTree(content));
+		map.addProperty("message", message);
+		map.add("previous", hasPrevious() ? previous.toJson() : null);
+		return map;
+	}
+
+	@Override
+	public String toString() {
+		return "ActionResult: "+gson.toJson(toJson());
+	}
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResultBuilder.java

@@ -0,0 +1,32 @@
+package io.github.jwdeveloper.tiktok.common;
+
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public class ActionResultBuilder<T>
+{
+	private final T content;
+	private String message;
+	@Setter @Accessors(fluent = true, chain = true)
+	private ActionResult<?> previous;
+
+	public ActionResultBuilder(T content) {
+		this.content = content;
+	}
+
+	public ActionResultBuilder<T> message(Object... messages) {
+		this.message = Arrays.stream(messages).map(Object::toString).collect(Collectors.joining(" "));
+		return this;
+	}
+
+	public ActionResult<T> success() {
+		return ActionResult.success(content, message).previous(previous);
+	}
+
+	public ActionResult<T> failure() {
+		return ActionResult.success(content, message).previous(previous);
+	}
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/common/LoggerFactory.java

@@ -0,0 +1,34 @@
+package io.github.jwdeveloper.tiktok.common;
+
+import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
+import io.github.jwdeveloper.tiktok.utils.ConsoleColors;
+
+import java.util.logging.*;
+
+public class LoggerFactory
+{
+	public static Logger create(String name, LiveClientSettings settings) {
+		Logger logger = Logger.getLogger(name);
+		if (logger.getHandlers().length == 0) {
+			var handler = new ConsoleHandler();
+			handler.setFormatter(new Formatter()
+			{
+				@Override
+				public String format(LogRecord record) {
+					var sb = new StringBuilder();
+					sb.append(ConsoleColors.GREEN).append("[").append(record.getLoggerName()).append("] ");
+					sb.append(ConsoleColors.GREEN).append("[").append(record.getLevel()).append("]: ");
+					sb.append(ConsoleColors.WHITE_BRIGHT).append(record.getMessage());
+					sb.append(ConsoleColors.RESET).append("\n");
+					return sb.toString();
+				}
+			});
+			logger.setUseParentHandlers(false);
+			logger.addHandler(handler);
+			logger.setLevel(settings.getLogLevel());
+			if (!settings.isPrintToConsole())
+				logger.setLevel(Level.OFF);
+		}
+		return logger;
+	}
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManager.java

@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2023-2023 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.gifts;
-
-import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.live.GiftManager;
-import sun.misc.Unsafe;
-
-import java.util.*;
-import java.util.logging.Logger;
-
-public class TikTokGiftManager implements GiftManager {
-
-    private final Map<Integer, Gift> indexById;
-    private final Map<String, Gift> indexByName;
-    private final Logger logger;
-
-    public TikTokGiftManager(Logger logger)
-    {
-        indexById = new HashMap<>();
-        indexByName = new HashMap<>();
-        this.logger = logger;
-        init();
-    }
-
-    protected void init() {
-        for (var gift : Gift.values()) {
-            indexById.put(gift.getId(), gift);
-            indexByName.put(gift.getName(), gift);
-        }
-    }
-
-    public Gift registerGift(int id, String name, int diamondCost, Picture picture) {
-        try {
-            var constructor = Unsafe.class.getDeclaredConstructors()[0];
-            constructor.setAccessible(true);
-            var unsafe = (Unsafe) constructor.newInstance();
-            Gift enumInstance = (Gift) unsafe.allocateInstance(Gift.class);
-
-            var field = Gift.class.getDeclaredField("id");
-            field.setAccessible(true);
-            field.set(enumInstance, id);
-
-            field = Gift.class.getDeclaredField("name");
-            field.setAccessible(true);
-            field.set(enumInstance, name);
-
-
-         //   EnumSet
-            field = Gift.class.getDeclaredField("diamondCost");
-            field.setAccessible(true);
-            field.set(enumInstance, diamondCost);
-
-            field = Gift.class.getDeclaredField("picture");
-            field.setAccessible(true);
-            field.set(enumInstance, picture);
-
-            indexById.put(enumInstance.getId(), enumInstance);
-            indexByName.put(enumInstance.getName(), enumInstance);
-
-            return enumInstance;
-        } catch (Exception e) {
-            throw new TikTokLiveException("Unable to register gift: " + name + ": " + id);
-        }
-    }
-
-    public Gift findById(int giftId) {
-        Gift gift = indexById.get(giftId);
-        return gift == null ? Gift.UNDEFINED : gift;
-    }
-
-    public Gift findByName(String giftName) {
-        Gift gift = indexByName.get(giftName);
-        return gift == null ? Gift.UNDEFINED : gift;
-    }
-
-    @Override
-    public List<Gift> getGifts() {
-        return indexById.values().stream().toList();
-    }
-}

Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftsManager.java

@@ -0,0 +1,57 @@
+package io.github.jwdeveloper.tiktok.gifts;
+
+import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
+import io.github.jwdeveloper.tiktok.live.GiftsManager;
+
+import java.util.*;
+import java.util.function.*;
+import java.util.stream.Collectors;
+
+public class TikTokGiftsManager implements GiftsManager {
+    private final Map<Integer, Gift> giftsByIdIndex;
+
+    public TikTokGiftsManager(List<Gift> giftList)
+    {
+        giftsByIdIndex = giftList.stream().collect(Collectors.toConcurrentMap(Gift::getId, Function.identity()));
+    }
+
+    public void attachGift(Gift gift) {
+        giftsByIdIndex.put(gift.getId(), gift);
+    }
+
+    public void attachGiftsList(List<Gift> gifts) {
+        gifts.forEach(this::attachGift);
+    }
+
+    public Gift getByName(String name) {
+        return getByFilter(e -> e.getName().equalsIgnoreCase(name));
+    }
+
+    public Gift getById(int giftId) {
+        return giftsByIdIndex.getOrDefault(giftId, Gift.UNDEFINED);
+    }
+
+    public Gift getByFilter(Predicate<Gift> filter) {
+        return giftsByIdIndex.values()
+                .stream()
+                .filter(filter)
+                .findFirst()
+                .orElse(Gift.UNDEFINED);
+    }
+
+    @Override
+    public List<Gift> getManyByFilter(Predicate<Gift> filter) {
+        return giftsByIdIndex.values()
+                .stream()
+                .filter(filter)
+                .toList();
+    }
+
+    public List<Gift> toList() {
+        return giftsByIdIndex.values().stream().toList();
+    }
+
+    public Map<Integer, Gift> toMap() {
+        return Collections.unmodifiableMap(giftsByIdIndex);
+    }
+}

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

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.http;
 
+import io.github.jwdeveloper.tiktok.common.ActionResult;
 import io.github.jwdeveloper.tiktok.data.settings.HttpClientSettings;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 import lombok.AllArgsConstructor;
@@ -29,41 +30,46 @@ import lombok.AllArgsConstructor;
 import java.net.*;
 import java.net.http.*;
 import java.nio.charset.*;
+import java.time.*;
 import java.util.*;
 import java.util.regex.*;
 import java.util.stream.Collectors;
 
 @AllArgsConstructor
 public class HttpClient {
+
     protected final HttpClientSettings httpClientSettings;
     protected final String url;
     private final Pattern pattern = Pattern.compile("charset=(.*?)(?=&|$)");
 
-    public Optional<HttpResponse<byte[]>> toResponse() {
+    public ActionResult<HttpResponse<byte[]>> toResponse() {
         var client = prepareClient();
         var request = prepareGetRequest();
         try {
             var response = client.send(request, HttpResponse.BodyHandlers.ofByteArray());
-            if (response.statusCode() != 200) {
+            var result = ActionResult.of(response);
-                return Optional.empty();
+            return switch (response.statusCode()) {
+                case 420 -> result.message("HttpResponse Code:", response.statusCode(), "| IP Cloudflare Blocked.").failure();
+                case 429 -> {
+                    var wait = response.headers().firstValue("ratelimit-reset");
+					if (wait.isEmpty())
+                        yield result.message("HttpResponse Code:", response.statusCode(), "| Sign server rate limit reached. Try again later.").failure();
+                    Duration duration = Duration.ofSeconds(Long.parseLong(wait.get()));
+                    yield result.message("HttpResponse Code:", response.statusCode(),
+                        String.format("| Sign server rate limit reached. Try again in %02d:%02d.", duration.toMinutesPart(), duration.toSecondsPart())).failure();
 				}
-
+                case 500, 501, 502, 503 -> result.message("HttpResponse Code:", response.statusCode(), "| Sign server Error. Try again later.").failure();
-            return Optional.of(response);
+                case 504 -> result.message("HttpResponse Code:", response.statusCode(), "| Sign server Timeout. Try again later.").failure();
+                case 200 -> result.success();
+                default -> result.message("HttpResponse Code:", response.statusCode()).failure();
+            };
 		} catch (Exception e) {
             throw new TikTokLiveRequestException(e);
         }
     }
 
-    public Optional<String> toJsonResponse() {
+    public ActionResult<String> toJsonResponse() {
-        var optional = toResponse();
+        return toResponse().map(content -> new String(content.body(), charsetFrom(content.headers())));
-        if (optional.isEmpty()) {
-            return Optional.empty();
-        }
-
-        var response = optional.get();
-        var body = response.body();
-        var charset = charsetFrom(response.headers());
-        return Optional.of(new String(body,charset));
     }
 
     private Charset charsetFrom(HttpHeaders headers) {
@@ -80,13 +86,8 @@ public class HttpClient {
         }
     }
 
-    public Optional<byte[]> toBinaryResponse() {
+    public ActionResult<byte[]> toBinaryResponse() {
-        var optional = toResponse();
+        return toResponse().map(HttpResponse::body);
-        if (optional.isEmpty()) {
-            return Optional.empty();
-        }
-        var body = optional.get().body();
-        return Optional.of(body);
     }
 
     public URI toUrl() {

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

@@ -78,7 +78,8 @@ public class HttpClientBuilder {
     }
 
     public HttpClient build() {
-        if (httpClientSettings.getProxyClientSettings().isEnabled())
+        var proxyClientSettings = httpClientSettings.getProxyClientSettings();
+        if (proxyClientSettings.isEnabled() && proxyClientSettings.hasNext())
             return new HttpProxyClient(httpClientSettings, url);
         return new HttpClient(httpClientSettings, url);
     }

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

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.http;
 
+import io.github.jwdeveloper.tiktok.common.ActionResult;
 import io.github.jwdeveloper.tiktok.data.settings.*;
 import io.github.jwdeveloper.tiktok.exceptions.*;
 
@@ -35,8 +36,8 @@ import java.security.cert.X509Certificate;
 import java.util.*;
 import java.util.stream.Collectors;
 
-public class HttpProxyClient extends HttpClient
+public class HttpProxyClient extends HttpClient {
-{
+
 	private final ProxyClientSettings proxySettings;
 
 	public HttpProxyClient(HttpClientSettings httpClientSettings, String url) {
@@ -44,14 +45,14 @@ public class HttpProxyClient extends HttpClient
 		this.proxySettings = httpClientSettings.getProxyClientSettings();
 	}
 
-	public Optional<HttpResponse<byte[]>> toResponse() {
+	public ActionResult<HttpResponse<byte[]>> toResponse() {
 		return switch (proxySettings.getType()) {
 			case HTTP, DIRECT -> handleHttpProxyRequest();
 			default -> handleSocksProxyRequest();
 		};
 	}
 
-	public Optional<HttpResponse<byte[]>> handleHttpProxyRequest() {
+	public ActionResult<HttpResponse<byte[]>> handleHttpProxyRequest() {
 		var builder = java.net.http.HttpClient.newBuilder()
 			.followRedirects(java.net.http.HttpClient.Redirect.NORMAL)
 			.cookieHandler(new CookieManager())
@@ -67,16 +68,12 @@ public class HttpProxyClient extends HttpClient
 				var request = prepareGetRequest();
 
 				var response = client.send(request, HttpResponse.BodyHandlers.ofByteArray());
-				if (response.statusCode() != 200) {
+				if (response.statusCode() != 200)
-					proxySettings.setLastSuccess(false);
 					continue;
-				}
+				return ActionResult.success(response);
-				proxySettings.setLastSuccess(true);
-				return Optional.of(response);
 			} catch (HttpConnectTimeoutException | ConnectException e) {
 				if (proxySettings.isAutoDiscard())
 					proxySettings.remove();
-				proxySettings.setLastSuccess(false);
 				throw new TikTokProxyRequestException(e);
 			} catch (IOException e) {
 				if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
@@ -89,7 +86,7 @@ public class HttpProxyClient extends HttpClient
 		throw new TikTokLiveRequestException("No more proxies available!");
 	}
 
-	private Optional<HttpResponse<byte[]>> handleSocksProxyRequest() {
+	private ActionResult<HttpResponse<byte[]>> handleSocksProxyRequest() {
 		try {
 			SSLContext sc = SSLContext.getInstance("SSL");
 			sc.init(null, new TrustManager[]{ new X509TrustManager() {
@@ -108,6 +105,7 @@ public class HttpProxyClient extends HttpClient
 					socksConnection.setSSLSocketFactory(sc.getSocketFactory());
 					socksConnection.setConnectTimeout(httpClientSettings.getTimeout().toMillisPart());
 					socksConnection.setReadTimeout(httpClientSettings.getTimeout().toMillisPart());
+					httpClientSettings.getHeaders().forEach(socksConnection::setRequestProperty);
 
 					byte[] body = socksConnection.getInputStream().readAllBytes();
 
@@ -121,14 +119,12 @@ public class HttpProxyClient extends HttpClient
 
 					var response = createHttpResponse(body, toUrl(), responseInfo);
 
-					proxySettings.setLastSuccess(true);
+					return ActionResult.success(response);
-					return Optional.of(response);
 				} catch (IOException e) {
 					if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
 						return super.toResponse();
 					if (proxySettings.isAutoDiscard())
 						proxySettings.remove();
-					proxySettings.setLastSuccess(false);
 					throw new TikTokProxyRequestException(e);
 				} catch (Exception e) {
 					throw new TikTokLiveRequestException(e);
@@ -137,13 +133,12 @@ public class HttpProxyClient extends HttpClient
 			throw new TikTokLiveRequestException("No more proxies available!");
 		} catch (NoSuchAlgorithmException | MalformedURLException | KeyManagementException e) {
 			// Should never be reached!
-			System.out.println("handleSocksProxyRequest()! If you see this message, reach us on discord!");
+			System.out.println("handleSocksProxyRequest: If you see this, message us on discord!");
 			e.printStackTrace();
-			return Optional.empty();
 		} catch (TikTokLiveRequestException e) {
 			e.printStackTrace();
-			return Optional.empty();
 		}
+		return ActionResult.failure();
 	}
 
 	private ResponseInfo createResponseInfo(int code, Map<String, List<String>> headers) {

Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/GiftsDataMapper.java

@@ -21,51 +21,64 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 package io.github.jwdeveloper.tiktok.http.mappers;
-import com.google.gson.JsonElement;
+
-import com.google.gson.JsonParser;
+import com.google.gson.*;
+import io.github.jwdeveloper.tiktok.data.models.Picture;
+import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
 import io.github.jwdeveloper.tiktok.data.requests.GiftsData;
-import java.util.ArrayList;
+
+import java.util.List;
 
 public class GiftsDataMapper {
+
     public GiftsData.Response map(String json) {
         var parsedJson = JsonParser.parseString(json);
         var jsonObject = parsedJson.getAsJsonObject();
-
+        var gifts = jsonObject.entrySet()
-        if (!jsonObject.has("data")) {
+                .parallelStream()
-            return new GiftsData.Response(json, new ArrayList<>());
+                .map(e -> mapSingleGift(e.getValue()))
-        }
-        var dataElement = jsonObject.getAsJsonObject("data");
-        if (!dataElement.has("gifts")) {
-            return new GiftsData.Response(json, new ArrayList<>());
-        }
-
-        var gifts = dataElement.get("gifts").getAsJsonArray()
-                .asList()
-                .stream()
-                .map(this::mapSingleGift)
                 .toList();
 
         return new GiftsData.Response(json, gifts);
     }
 
+    private Gift mapSingleGift(JsonElement jsonElement) {
+        var jsonObject = jsonElement.getAsJsonObject();
 
-    private GiftsData.GiftModel mapSingleGift(JsonElement jsonElement) {
+        var id = jsonObject.get("id").getAsInt();
-        var id = jsonElement.getAsJsonObject().get("id").getAsInt();
+        var name = jsonObject.get("name").getAsString();
-        var name = jsonElement.getAsJsonObject().get("name").getAsString();
+        var diamondCost = jsonObject.get("diamondCost").getAsInt();
-        var diamondCost = jsonElement.getAsJsonObject().get("diamond_count").getAsInt();
+        var image = jsonObject.get("image").getAsString();
-        var image = jsonElement.getAsJsonObject()
+        return new Gift(id, name, diamondCost, new Picture(image), jsonObject);
-                .get("image").getAsJsonObject()
-                .get("url_list").getAsJsonArray().get(0).getAsString();
-
-        if (image.endsWith(".webp")) {
-            image = image.replace(".webp", ".jpg");
     }
-        var gift = new GiftsData.GiftModel();
-        gift.setId(id);
-        gift.setName(name);
-        gift.setDiamondCost(diamondCost);
-        gift.setImage(image);
 
-        return gift;
+    public GiftsData.Response mapRoom(String json) {
+        var parsedJson = JsonParser.parseString(json);
+        var jsonObject = parsedJson.getAsJsonObject();
+        if (jsonObject.get("data") instanceof JsonObject data && data.get("gifts") instanceof JsonArray giftArray) {
+            var gifts = giftArray.asList().parallelStream()
+                .map(this::mapSingleRoomGift)
+                .toList();
+
+            return new GiftsData.Response(json, gifts);
+        }
+        return new GiftsData.Response("", List.of());
+    }
+
+    private Gift mapSingleRoomGift(JsonElement jsonElement) {
+        var jsonObject = jsonElement.getAsJsonObject();
+
+        var id = jsonObject.get("id").getAsInt();
+        var name = jsonObject.get("name").getAsString();
+        var diamondCost = jsonObject.get("diamond_count").getAsInt();
+        Picture picture;
+        if (jsonObject.get("image") instanceof JsonObject image && image.get("url_list") instanceof JsonArray urls && !urls.isEmpty()) {
+            String url = urls.get(0).getAsString();
+            if (url.endsWith(".webp"))
+                url = url.substring(0, url.length()-4)+"png";
+            picture = new Picture(url);
+        } else
+            picture = Picture.empty();
+        return new Gift(id, name, diamondCost, picture, jsonObject);
     }
 }

Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpRequestJsonMapper.java

@@ -0,0 +1,21 @@
+package io.github.jwdeveloper.tiktok.http.mappers;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+import java.net.http.HttpRequest;
+
+public class HttpRequestJsonMapper implements JsonSerializer<HttpRequest>
+{
+	@Override
+	public JsonElement serialize(HttpRequest src, Type typeOfSrc, JsonSerializationContext context) {
+		JsonObject object = new JsonObject();
+		object.addProperty("method", src.method());
+		object.add("timeout", context.serialize(src.timeout().toString()));
+		object.addProperty("expectContinue", src.expectContinue());
+		object.add("uri", context.serialize(src.uri()));
+		object.add("version", context.serialize(src.version().toString()));
+		object.add("headers", context.serialize(src.headers().map()));
+		return object;
+	}
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/HttpResponseJsonMapper.java

@@ -0,0 +1,21 @@
+package io.github.jwdeveloper.tiktok.http.mappers;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+import java.net.http.HttpResponse;
+
+public class HttpResponseJsonMapper implements JsonSerializer<HttpResponse>
+{
+	@Override
+	public JsonElement serialize(HttpResponse src, Type typeOfSrc, JsonSerializationContext context) {
+		JsonObject object = new JsonObject();
+		object.addProperty("statusCode", src.statusCode());
+		object.add("request", context.serialize(src.request()));
+		object.add("headers", context.serialize(src.headers().map()));
+		object.add("body", context.serialize(src.body()));
+		object.add("uri", context.serialize(src.uri().toString()));
+		object.add("version", context.serialize(src.version().toString()));
+		return object;
+	}
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveDataMapper.java

@@ -24,6 +24,7 @@ package io.github.jwdeveloper.tiktok.http.mappers;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import io.github.jwdeveloper.tiktok.TikTokLiveHttpClient;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.data.models.users.UserAttribute;
@@ -64,6 +65,8 @@ public class LiveDataMapper {
                 default -> LiveData.LiveStatus.HostNotFound;
             };
             response.setLiveStatus(statusValue);
+        } else if (data.has("prompts") && data.get("prompts").getAsString().isEmpty() && jsonObject.has("status_code")) {
+            response.setAgeRestricted(jsonObject.get("status_code").getAsInt() == TikTokLiveHttpClient.TIKTOK_AGE_RESTRICTED_CODE);
         } else {
             response.setLiveStatus(LiveData.LiveStatus.HostNotFound);
         }

Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java

@@ -22,13 +22,16 @@
  */
 package io.github.jwdeveloper.tiktok.http.mappers;
 
-import com.google.gson.JsonParser;
+import com.google.gson.*;
 import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 
+import java.util.logging.Logger;
+
 public class LiveUserDataMapper
 {
-    public LiveUserData.Response map(String json) {
+    public LiveUserData.Response map(String json, Logger logger) {
+        try {
             var jsonObject = JsonParser.parseString(json).getAsJsonObject();
 
             var message = jsonObject.get("message").getAsString();
@@ -62,5 +65,9 @@ public class LiveUserDataMapper
             };
 
             return new LiveUserData.Response(json, statusEnum, roomId, startTime);
+        } catch (JsonSyntaxException | IllegalStateException e) {
+            logger.warning("Malformed Json: '"+json+"' - Error Message: "+e.getMessage());
+            return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
+        }
     }
 }

Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java

@@ -96,16 +96,17 @@ public class TikTokListenersManager implements ListenersManager {
                         m.isAnnotationPresent(TikTokEventObserver.class)).toList();
         var eventsMap = new HashMap<Class<?>, List<EventConsumer<?>>>();
         for (var method : methods) {
-            var eventClazz = method.getParameterTypes()[1];
+            var liveclientClass = method.getParameterTypes()[0];
+            var eventClass = method.getParameterTypes()[1];
 
-            if (eventClazz.isAssignableFrom(LiveClient.class) &&
+            if (!LiveClient.class.isAssignableFrom(liveclientClass) && !liveclientClass.equals(LiveClient.class)) {
-                    !eventClazz.equals(LiveClient.class)) {
+                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 1st parameter must be instance of " + LiveClient.class.getName()
-                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 1nd parameter must instance of " + LiveClient.class.getName());
+                    + " | Invalid parameter class: "+liveclientClass.getName());
             }
 
-            if (eventClazz.isAssignableFrom(TikTokEvent.class) &&
+            if (!TikTokEvent.class.isAssignableFrom(eventClass) && !eventClass.equals(TikTokEvent.class)) {
-                    !eventClazz.equals(TikTokEvent.class)) {
+                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 2nd parameter must be instance of " + TikTokEvent.class.getName()
-                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 2nd parameter must instance of " + TikTokEvent.class.getName());
+                    + " | Invalid parameter class: "+eventClass.getName());
             }
 
             EventConsumer eventMethodRef = (liveClient, event) ->
@@ -117,7 +118,7 @@ public class TikTokListenersManager implements ListenersManager {
                     throw new TikTokEventListenerMethodException(e);
                 }
             };
-            eventsMap.computeIfAbsent(eventClazz, (a) -> new ArrayList<>()).add(eventMethodRef);
+            eventsMap.computeIfAbsent(eventClass, (a) -> new ArrayList<>()).add(eventMethodRef);
         }
         return new ListenerBindingModel(listener, eventsMap);
     }

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

@@ -24,32 +24,27 @@ package io.github.jwdeveloper.tiktok.mappers.handlers;
 
 import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
+import io.github.jwdeveloper.tiktok.data.events.gift.*;
-import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
+import io.github.jwdeveloper.tiktok.data.models.gifts.*;
-import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
+import io.github.jwdeveloper.tiktok.live.GiftsManager;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.live.GiftManager;
 import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
 import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.SneakyThrows;
-import sun.misc.Unsafe;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 
 public class TikTokGiftEventHandler {
-    private final GiftManager giftManager;
     private final Map<Long, WebcastGiftMessage> giftsMessages;
     private final TikTokRoomInfo tikTokRoomInfo;
 
-    public TikTokGiftEventHandler(GiftManager giftManager, TikTokRoomInfo tikTokRoomInfo) {
+    private final GiftsManager giftsManager;
-        this.giftManager = giftManager;
+
+    public TikTokGiftEventHandler(GiftsManager giftsManager, TikTokRoomInfo tikTokRoomInfo) {
         giftsMessages = new HashMap<>();
         this.tikTokRoomInfo = tikTokRoomInfo;
+        this.giftsManager = giftsManager;
     }
 
     @SneakyThrows
@@ -61,40 +56,40 @@ public class TikTokGiftEventHandler {
 
     public List<TikTokEvent> handleGift(WebcastGiftMessage currentMessage) {
         var userId = currentMessage.getUser().getId();
-        var currentType = GiftSendType.fromNumber(currentMessage.getSendType());
+        var currentType = GiftComboStateType.fromNumber(currentMessage.getSendType());
         var containsPreviousMessage = giftsMessages.containsKey(userId);
 
 
         //If gift is not streakable just return onGift event
         if (currentMessage.getGift().getType() != 1) {
-            var comboEvent = getGiftComboEvent(currentMessage, GiftSendType.Finished);
+            var comboEvent = getGiftComboEvent(currentMessage, GiftComboStateType.Finished);
             var giftEvent = getGiftEvent(currentMessage);
             return List.of(comboEvent, giftEvent);
         }
 
         if (!containsPreviousMessage) {
-            if (currentType == GiftSendType.Finished) {
+            if (currentType == GiftComboStateType.Finished) {
                 return List.of(getGiftEvent(currentMessage));
             } else {
                 giftsMessages.put(userId, currentMessage);
-                return List.of(getGiftComboEvent(currentMessage, GiftSendType.Begin));
+                return List.of(getGiftComboEvent(currentMessage, GiftComboStateType.Begin));
             }
         }
 
         var previousMessage = giftsMessages.get(userId);
-        var previousType = GiftSendType.fromNumber(previousMessage.getSendType());
+        var previousType = GiftComboStateType.fromNumber(previousMessage.getSendType());
-        if (currentType == GiftSendType.Active &&
+        if (currentType == GiftComboStateType.Active &&
-                previousType == GiftSendType.Active) {
+                previousType == GiftComboStateType.Active) {
             giftsMessages.put(userId, currentMessage);
-            return List.of(getGiftComboEvent(currentMessage, GiftSendType.Active));
+            return List.of(getGiftComboEvent(currentMessage, GiftComboStateType.Active));
         }
 
 
-        if (currentType == GiftSendType.Finished &&
+        if (currentType == GiftComboStateType.Finished &&
-                previousType == GiftSendType.Active) {
+                previousType == GiftComboStateType.Active) {
             giftsMessages.clear();
             return List.of(
-                    getGiftComboEvent(currentMessage, GiftSendType.Finished),
+                    getGiftComboEvent(currentMessage, GiftComboStateType.Finished),
                     getGiftEvent(currentMessage));
         }
 
@@ -107,42 +102,28 @@ public class TikTokGiftEventHandler {
         return new TikTokGiftEvent(gift, tikTokRoomInfo.getHost(), message);
     }
 
-    private TikTokGiftEvent getGiftComboEvent(WebcastGiftMessage message, GiftSendType state) {
+    private TikTokGiftEvent getGiftComboEvent(WebcastGiftMessage message, GiftComboStateType state) {
         var gift = getGiftObject(message);
         return new TikTokGiftComboEvent(gift, tikTokRoomInfo.getHost(), message, state);
     }
 
     private Gift getGiftObject(WebcastGiftMessage giftMessage) {
         var giftId = (int) giftMessage.getGiftId();
-        var gift = giftManager.findById(giftId);
+        var gift = giftsManager.getById(giftId);
+        if (gift == Gift.UNDEFINED)
+            gift = giftsManager.getByName(giftMessage.getGift().getName());
         if (gift == Gift.UNDEFINED) {
-            gift = giftManager.findByName(giftMessage.getGift().getName());
+            gift = new Gift(giftId,
-        }
-        if (gift == Gift.UNDEFINED) {
-            gift = giftManager.registerGift(
-                    giftId,
                     giftMessage.getGift().getName(),
                     giftMessage.getGift().getDiamondCount(),
                     Picture.map(giftMessage.getGift().getImage()));
+
+            giftsManager.attachGift(gift);
         }
 
-        if (gift.getPicture().getLink().endsWith(".webp")) {
+        if (gift.getPicture().getLink().endsWith(".webp"))
-            updatePicture(gift, giftMessage);
+            gift.setPicture(Picture.map(giftMessage.getGift().getImage()));
-        }
+
         return gift;
     }
-
-
-    private void updatePicture(Gift gift, WebcastGiftMessage webcastGiftMessage) {
-        try {
-            var picture = Picture.map(webcastGiftMessage.getGift().getImage());
-            var constructor = Unsafe.class.getDeclaredConstructors()[0];
-            constructor.setAccessible(true);
-            var field = Gift.class.getDeclaredField("picture");
-            field.setAccessible(true);
-            field.set(gift, picture);
-        } catch (Exception e) {
-            throw new TikTokLiveException("Unable to update picture in gift: " + gift.toString());
-        }
-    }
 }

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

@@ -63,7 +63,7 @@ public class TikTokWebSocketClient implements SocketClient {
 
         messageHandler.handle(liveClient, connectionData.getWebcastResponse());
 
-        var headers = new HashMap<String, String>();
+		var headers = new HashMap<>(clientSettings.getHttpSettings().getHeaders());
         headers.put("Cookie", connectionData.getWebsocketCookies());
         webSocketClient = new TikTokWebSocketListener(connectionData.getWebsocketUrl(),
                 headers,
@@ -82,7 +82,7 @@ public class TikTokWebSocketClient implements SocketClient {
     private void connectDefault() {
         try {
             webSocketClient.connect();
-            pingingTask.run(webSocketClient);
+            pingingTask.run(webSocketClient, clientSettings.getPingInterval());
             isConnected = true;
         } catch (Exception e) {
             isConnected = false;
@@ -112,7 +112,7 @@ public class TikTokWebSocketClient implements SocketClient {
                     proxySettings.remove();
                 continue;
             }
-            pingingTask.run(webSocketClient);
+            pingingTask.run(webSocketClient, clientSettings.getPingInterval());
             isConnected = true;
             break;
         }

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

@@ -61,7 +61,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
         } catch (Exception e) {
             tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(e));
         }
-        if (isNotClosing()) {
+        if (isOpen()) {
             sendPing();
         }
     }
@@ -79,8 +79,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
             pushFrameBuilder.setPayloadType("ack");
             pushFrameBuilder.setLogId(websocketPushFrame.getLogId());
             pushFrameBuilder.setPayload(webcastResponse.getInternalExtBytes());
-            if (isNotClosing())
+            if (isOpen()) {
-            {
                 this.send(pushFrameBuilder.build().toByteArray());
             }
         }
@@ -90,7 +89,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
         tikTokEventHandler.publish(tikTokLiveClient, new TikTokConnectedEvent());
-        if (isNotClosing()) {
+        if (isOpen()) {
             sendPing();
         }
     }
@@ -104,7 +103,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onError(Exception error) {
         tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(error));
-        if (isNotClosing()) {
+        if (isOpen()) {
             sendPing();
         }
     }
@@ -129,10 +128,6 @@ public class TikTokWebSocketListener extends WebSocketClient {
         }
     }
 
-    private boolean isNotClosing() {
-        return !isClosed() && !isClosing();
-    }
-
     @Override
     public void onMessage(String s) {
         // System.err.println(s);

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

@@ -0,0 +1,31 @@
+package io.github.jwdeveloper.tiktok.websocket;
+
+import io.github.jwdeveloper.tiktok.TikTokLiveEventHandler;
+import io.github.jwdeveloper.tiktok.data.events.TikTokConnectedEvent;
+import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
+import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+
+public class TikTokWebSocketOfflineClient implements SocketClient {
+
+    private final TikTokLiveEventHandler handler;
+    private LiveClient liveClient;
+
+    public TikTokWebSocketOfflineClient(TikTokLiveEventHandler handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient) {
+        liveClient = tikTokLiveClient;
+        handler.publish(liveClient, new TikTokConnectedEvent());
+    }
+
+    @Override
+    public void stop() {
+        if (liveClient == null) {
+            return;
+        }
+        handler.publish(liveClient, new TikTokDisconnectedEvent());
+    }
+}

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

@@ -8,13 +8,13 @@ public class TikTokWebSocketPingingTask
 {
     private Thread thread;
     private boolean isRunning = false;
-    private final int MIN_TIMEOUT = 250;
+    private final int MAX_TIMEOUT = 250;
-    private final int MAX_TIMEOUT = 500;
+    private final int SLEEP_TIME = 500;
 
-    public void run(WebSocket webSocket)
+    public void run(WebSocket webSocket, long pingTaskTime)
     {
         stop();
-        thread = new Thread(() -> pingTask(webSocket));
+        thread = new Thread(() -> pingTask(webSocket, pingTaskTime));
         isRunning = true;
         thread.start();
     }
@@ -26,20 +26,18 @@ public class TikTokWebSocketPingingTask
         isRunning = false;
     }
 
-
+    private void pingTask(WebSocket webSocket, long pingTaskTime)
-    private void pingTask(WebSocket webSocket)
     {
         var random = new Random();
         while (isRunning) {
             try {
                 if (!webSocket.isOpen()) {
-                    Thread.sleep(100);
+                    Thread.sleep(SLEEP_TIME);
                     continue;
                 }
                 webSocket.sendPing();
 
-                var timeout = random.nextInt(MAX_TIMEOUT)+MIN_TIMEOUT;
+                Thread.sleep(pingTaskTime+random.nextInt(MAX_TIMEOUT));
-                Thread.sleep(timeout);
             }
             catch (Exception e) {
                 isRunning = false;

Client/src/test/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManagerTest.java

@@ -22,12 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.gifts;
 
-import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
-import io.github.jwdeveloper.tiktok.data.models.Picture;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 
@@ -35,38 +30,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
 
 public class TikTokGiftManagerTest {
 
-    @InjectMocks
-    TikTokGiftManager giftManager;
-
-    private static final Picture rosePicture = new Picture("https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/eba3a9bb85c33e017f3648eaf88d7189~tplv-obj.png");
-
-    @Test
-    void registerGift() {
-        var fakeGift = giftManager.registerGift(123, "Fake gift", 123123, rosePicture);
-        var gifts = giftManager.getGifts();
-        var optional = gifts.stream().filter(r -> r == fakeGift).findFirst();
-        Assertions.assertTrue(optional.isPresent());
-//        Assertions.assertNotNull(optional.get().name());
-    }
-
-    @Test
-    void findById() {
-        var target = giftManager.registerGift(123, "FAKE", 123123, rosePicture);
-        var result = giftManager.findById(target.getId());
-        Assertions.assertEquals(target, result);
-    }
-
-    @Test
-    void findByName() {
-        var target = giftManager.registerGift(123, "FAKE", 123123, rosePicture);
-        var result = giftManager.findByName(target.getName());
-        Assertions.assertEquals(target, result);
-    }
-
-    @Test
-    void getGifts() {
-        Assertions.assertEquals(Gift.values().length, giftManager.getGifts().size());
-    }
 
 
 

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

@@ -26,8 +26,9 @@ import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
+import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
-import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
+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;
@@ -38,7 +39,7 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
-import java.util.logging.Logger;
+import java.util.List;
 
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -46,13 +47,12 @@ class TikTokGiftEventHandlerTest {
 
     public static TikTokGiftEventHandler handler;
 
-
     @BeforeAll
     public void before() {
-        var manager = new TikTokGiftManager(Logger.getLogger("x"));
+        var manager = new TikTokGiftsManager(List.of());
         var info = new TikTokRoomInfo();
         info.setHost(new io.github.jwdeveloper.tiktok.data.models.users.User(123L, "test", new Picture("")));
-        manager.registerGift(123, "example", 123, new Picture("image.webp"));
+        manager.attachGift(new Gift(123, "example", 123, "image.webp"));
         handler = new TikTokGiftEventHandler(manager, info);
     }
 
@@ -98,9 +98,9 @@ class TikTokGiftEventHandlerTest {
         Assertions.assertEquals(2, result3.size());
         var event3 = (TikTokGiftComboEvent) result3.get(0);
 
-        Assertions.assertEquals(GiftSendType.Begin, event1.getComboState());
+        Assertions.assertEquals(GiftComboStateType.Begin, event1.getComboState());
-        Assertions.assertEquals(GiftSendType.Active, event2.getComboState());
+        Assertions.assertEquals(GiftComboStateType.Active, event2.getComboState());
-        Assertions.assertEquals(GiftSendType.Finished, event3.getComboState());
+        Assertions.assertEquals(GiftComboStateType.Finished, event3.getComboState());
     }
 
 
@@ -117,7 +117,7 @@ class TikTokGiftEventHandlerTest {
 
         giftBuilder.setId(giftId);
         giftBuilder.setName(giftName);
-        giftBuilder.setImage(Image.newBuilder().addUrlList(giftImage).build());
+        giftBuilder.setImage(Image.newBuilder().addUrl(giftImage).build());
         giftBuilder.setType(streakable ? 1 : 0);
         userBuilder.setId(userId);
 

Examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.1.1-Release</version>
+        <version>1.6.4-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>extension-collector</artifactId>
-            <version>1.1.1-Release</version>
+            <version>1.6.4-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>