Update version in pom.xml

Develop 1.6.4

.gitignore

@@ -1,10 +1,11 @@
 backend-infrastructure/.aws-sam
 
-# Created by https://www.gitignore.io/api/osx,linux,python,windows,pycharm,visualstudiocode
 
+.db
+# Created by https://www.gitignore.io/api/osx,linux,python,windows,pycharm,visualstudiocode
+*.db
 ### Linux ###
 *~
-
 # 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.0.9-Release</version>
+        <version>1.7.0-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>

API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java

@@ -1,91 +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;
-
-import lombok.Data;
-
-import java.time.Duration;
-import java.util.Map;
-import java.util.logging.Level;
-
-@Data
-public class ClientSettings {
-    /**
-     * Timeout for Connections
-     */
-    private Duration timeout;
-
-    /**
-     * ISO-Language for Client
-     */
-
-    private String clientLanguage;
-
-    /**
-     * Whether to Retry if Connection Fails
-     */
-    private boolean retryOnConnectionFailure;
-
-
-    /**
-     * Before retrying connect, wait for select amount of time
-     */
-    private Duration retryConnectionTimeout;
-
-    /**
-     * Whether to print Logs to Console
-     */
-
-    private boolean printToConsole = true;
-    /**
-     * LoggingLevel for Logs
-     */
-    private Level logLevel;
-
-
-    /**
-     * Optional: Use it if you need to change TikTok live hostname in builder
-     */
-    private String hostName;
-
-
-    /**
-     * Parameters used in requests to TikTok api
-     */
-    private Map<String, Object> clientParameters;
-
-
-    /*
-     *  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
-     */
-    private String sessionId;
-
-    /*
-     * Optional: By default roomID is fetched before connect to live, but you can set it manually
-     *
-     */
-    private String roomId;
-
-}
-

API/src/main/java/io/github/jwdeveloper/tiktok/data/dto/ProxyData.java

@@ -0,0 +1,66 @@
+/*
+ * 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.dto;
+
+import lombok.*;
+
+import java.net.*;
+
+@Data
+@AllArgsConstructor
+public class ProxyData
+{
+	private final String address;
+	private final int port;
+
+	public static ProxyData map(String string) {
+		if (string == null || string.isBlank())
+			throw new IllegalArgumentException("Provided address cannot be null or empty!");
+		int portIndex = string.lastIndexOf(':');
+		try {
+			String address = string.substring(0, portIndex);
+			int port = Integer.parseInt(string.substring(portIndex+1));
+
+			// Port validation
+			if (port < 0 || port > 65535)
+				throw new IndexOutOfBoundsException("Port out of range: "+port);
+
+			// IP Validation
+			InetAddress res = InetAddress.getByName(address);
+
+			return new ProxyData(address, port);
+		} catch (NumberFormatException e) {
+			throw new IllegalArgumentException("Port must be a valid integer!");
+		} catch (UnknownHostException e) {
+			throw new IllegalArgumentException("Address must be valid IPv4, IPv6, or domain name!");
+		}
+	}
+
+	public ProxyData clone() {
+		return new ProxyData(address, port);
+	}
+
+	public InetSocketAddress toSocketAddress() {
+		return new InetSocketAddress(address, port);
+	}
+}

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/TikTokCaptionEvent.java

@@ -38,9 +38,9 @@ public class TikTokCaptionEvent extends TikTokHeaderEvent {
     String text;
 
     public TikTokCaptionEvent(WebcastCaptionMessage msg) {
-         super(msg.getCommon());
+        super(msg.getCommon());
         captionTimeStamp = msg.getTimeStamp();
         iSOLanguage = msg.getCaptionData().getLanguage();
         text = msg.getCaptionData().getText();
     }
-}
+}

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

@@ -40,18 +40,30 @@ 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;
 
     public TikTokCommentEvent(WebcastChatMessage msg) {
         super(msg.getCommon());
-        user = User.map(msg.getUser(),msg.getUserIdentity());
+        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) {
-  public TikTokDetectEvent(WebcastMsgDetectMessage msg) {
+        super(msg.getCommon());
-    super(msg.getCommon());
+        language = msg.getFromRegion();
-    language = msg.getFromRegion();
+    }
-  }
+}
-
-
-
-}

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

@@ -24,12 +24,22 @@ package io.github.jwdeveloper.tiktok.data.events;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
-
+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 {
-}
+	private final String reason;
+
+	public TikTokDisconnectedEvent(String reason) {
+		this.reason = reason.isBlank() ? "None" : reason;
+	}
+
+	public TikTokDisconnectedEvent() {
+		this("None");
+	}
+}

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

@@ -36,9 +36,9 @@ import lombok.Value;
 @Value
 @EventMeta(eventType = EventType.Message)
 public class TikTokEnvelopeEvent extends TikTokHeaderEvent {
-  User user;
+	User user;
-  public TikTokEnvelopeEvent(WebcastEnvelopeMessage msg) {
+	public TikTokEnvelopeEvent(WebcastEnvelopeMessage msg) {
-    super(msg.getCommon());
+		super(msg.getCommon());
-    user = User.map(msg.getEnvelopeInfo());
+		user = User.map(msg.getEnvelopeInfo());
-  }
+	}
-}
+}

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/TikTokInRoomBannerEvent.java

@@ -31,10 +31,10 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokInRoomBannerEvent extends TikTokHeaderEvent {
-  private final String json;
+	private final String json;
 
-  public TikTokInRoomBannerEvent(WebcastInRoomBannerMessage msg) {
+	public TikTokInRoomBannerEvent(WebcastInRoomBannerMessage msg) {
-    super(msg.getHeader());
+		super(msg.getHeader());
-    json = msg.getJson();
+		json = msg.getJson();
-  }
+	}
-}
+}

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 Long battleId;
-  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) {
+    public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
-    super(msg.getCommon());
+        super(msg.getCommon());
-    battleId = msg.getId();
+        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

@@ -32,10 +32,8 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkMicMethodEvent extends TikTokHeaderEvent {
 
-  public TikTokLinkMicMethodEvent(WebcastLinkMicMethod msg) {
+	public TikTokLinkMicMethodEvent(WebcastLinkMicMethod msg) {
-    super(msg.getCommon());
+		super(msg.getCommon());
 
-  }
+	}
-
+}
-
-}

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

@@ -32,15 +32,14 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokRankTextEvent extends TikTokHeaderEvent {
-  private final String eventType;
+	private final String eventType;
 
-  private final String label;
+	private final String label;
 
-  public TikTokRankTextEvent(WebcastRankTextMessage msg) {
+	public TikTokRankTextEvent(WebcastRankTextMessage msg) {
-    super(msg.getCommon());
+		super(msg.getCommon());
-    var text = Text.map(msg.getSelfGetBadgeMsg());
+		var text = Text.map(msg.getSelfGetBadgeMsg());
-    label = text.getPattern();
+		label = text.getPattern();
-    eventType = text.getKey();
+		eventType = text.getKey();
-  }
+	}
-
+}
-}

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

@@ -33,13 +33,11 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 public class TikTokRankUpdateEvent extends TikTokHeaderEvent {
 
-  public TikTokRankUpdateEvent(WebcastHourlyRankMessage msg) {
+	public TikTokRankUpdateEvent(WebcastHourlyRankMessage msg) {
-    super(msg.getCommon());
+		super(msg.getCommon());
+	}
 
-  }
+	public TikTokRankUpdateEvent(WebcastRankUpdateMessage msg) {
-
+		super(msg.getCommon());
-  public TikTokRankUpdateEvent(WebcastRankUpdateMessage msg) {
+	}
-    super(msg.getCommon());
+}
-  }
-
-}

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

@@ -32,25 +32,24 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokShopEvent extends TikTokHeaderEvent {
-  private final String title;
+	private final String title;
 
-  private final String price;
+	private final String price;
 
-  private final Picture picture;
+	private final Picture picture;
 
-  private final String shopUrl;
+	private final String shopUrl;
 
-  private final String shopName;
+	private final String shopName;
 
-  //Not working
+	//Not working
-  public TikTokShopEvent(WebcastOecLiveShoppingMessage msg) {
+	public TikTokShopEvent(WebcastOecLiveShoppingMessage msg) {
-    super(msg.getCommon());
+		super(msg.getCommon());
-    var data = msg.getShopData();
+		var data = msg.getShopData();
-    title = data.getTitle();
+		title = data.getTitle();
-    price = data.getPriceString();
+		price = data.getPriceString();
-    picture = new Picture(data.getImageUrl());
+		picture = new Picture(data.getImageUrl());
-    shopUrl = data.getShopUrl();
+		shopUrl = data.getShopUrl();
-    shopName = data.getShopName();
+		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/TikTokConnectingEvent.java

@@ -20,24 +20,18 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.data.events;
+package io.github.jwdeveloper.tiktok.data.events.control;
 
 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.events.common.TikTokLiveClientEvent;
-
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import lombok.Data;
 
 
-@Data
+/**
-@EventMeta(eventType = EventType.Message)
+ * Triggered when client is connecting to live is successfully established.
-public class CustomEvent extends TikTokHeaderEvent {
+ */
-    private final User user;
+@EventMeta(eventType = EventType.Control)
-    private final String title;
+public class TikTokConnectingEvent extends TikTokLiveClientEvent
+{
 
-    public CustomEvent(User user, String title) {
-        this.user = user;
-        this.title = title;
-    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/control/TikTokPreConnectionEvent.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.control;
+
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
+import io.github.jwdeveloper.tiktok.data.requests.*;
+import lombok.*;
+
+/**
+ * Triggered before the connection is established.
+ */
+@Getter
+@EventMeta(eventType = EventType.Control)
+public class TikTokPreConnectionEvent extends TikTokLiveClientEvent
+{
+	private final LiveUserData.Response userData;
+	private final LiveData.Response roomData;
+	@Setter boolean cancelConnection = false;
+
+	public TikTokPreConnectionEvent(LiveUserData.Response userData, LiveData.Response liveData) {
+		this.userData = userData;
+		this.roomData = liveData;
+	}
+}

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

@@ -22,10 +22,10 @@
  */
 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;
 
@@ -33,23 +33,34 @@ 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>
  * <p>Combo: 4 -> comboState = GiftSendType.Active</p>
  * <p>Combo: 8 -> comboState = GiftSendType.Active</p>
  * <p>Combo: 12 -> comboState = GiftSendType.Finsihed</p>
- *
+ * <p>
  * Remember if comboState is Finsihed both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
  */
 @EventMeta(eventType = EventType.Message)
 @Getter
 public class TikTokGiftComboEvent extends TikTokGiftEvent {
-    private final GiftSendType comboState;
+    private final GiftComboStateType comboState;
 
-    public TikTokGiftComboEvent(Gift gift, WebcastGiftMessage msg, GiftSendType comboState) {
+    public TikTokGiftComboEvent(Gift gift, User host, WebcastGiftMessage msg, GiftComboStateType comboState) {
-        super(gift, msg);
+        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
@@ -49,11 +45,31 @@ public class TikTokGiftEvent extends TikTokHeaderEvent {
     private final User toUser;
     private final int combo;
 
-    public TikTokGiftEvent(Gift gift, WebcastGiftMessage msg) {
+    public TikTokGiftEvent(Gift gift, User liveHost, WebcastGiftMessage msg) {
         super(msg.getCommon());
         this.gift = gift;
         user = User.map(msg.getUser(), msg.getUserIdentity());
-        toUser = new User(msg.getUserGiftReciever().getUserId(), "", "", new Picture(""), 0, 0, new ArrayList<>());
+        if (msg.getToUser().getNickname().isEmpty()) {
+            toUser = liveHost;
+        } else {
+            toUser = User.map(msg.getToUser());
+        }
         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/http/TikTokHttpResponseEvent.java

@@ -1,3 +1,25 @@
+/*
+ * 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.http;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;

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

@@ -20,16 +20,19 @@
  * 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.http;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.requests.LiveData;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
-public interface DataFilters<T> {
+@Getter
-     T addMessageFilter(Class<? extends com.google.protobuf.GeneratedMessageV3> message);
+@AllArgsConstructor
-
+@EventMeta(eventType = EventType.Debug)
-     T addMessageFilter(String message);
+public class TikTokRoomDataResponseEvent extends TikTokEvent
-
+{
-     T addEventFilter(Class<? extends TikTokEvent> event);
+    private final LiveData.Response liveData;
-
-     T addEventFilter(String event);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/link/TikTokLinkAcceptNoticeEvent.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 TikTokLinkAcceptNoticeEvent extends TikTokLinkEvent {
+
+    private final long fromUserId, fromRoomId, toUserId;
+
+    public TikTokLinkAcceptNoticeEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasAcceptNoticeContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Accept Notice Content!");
+
+        var content = msg.getAcceptNoticeContent();
+        this.fromUserId = content.getFromUserId();
+        this.fromRoomId = content.getFromRoomId();
+        this.toUserId = content.getToUserId();
+    }
+}

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

@@ -20,17 +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.tools.tester.mockClient;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-public class TikTokLiveMock
+import io.github.jwdeveloper.tiktok.annotations.*;
-{
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-    public static TikTokMockBuilder create(String host)
+import lombok.Getter;
-    {
-        return new TikTokMockBuilder(host);
-    }
 
-    public static TikTokMockBuilder create()
+@Getter
-    {
+@EventMeta(eventType = EventType.Message)
-        return create("MockHostName");
+public class TikTokLinkApplyEvent extends TikTokLinkEvent {
+
+    public TikTokLinkApplyEvent(WebcastLinkMessage msg) {
+        super(msg);
     }
-}
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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 TikTokLinkCreateEvent extends TikTokLinkEvent {
+
+    private final long hostId, roomId, linkType;
+    public TikTokLinkCreateEvent(WebcastLinkMessage msg) {
+        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,17 +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.live;
+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;
 
-import java.util.List;
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkInviteEvent extends TikTokLinkEvent {
 
-public interface UserManager
+    private final long roomId;
-{
+    private final User inviter;
-     TrackedUser observeUser(User user);
 
-     TrackedUser getTrackedUser(Long id);
+    public TikTokLinkInviteEvent(WebcastLinkMessage msg) {
+        super(msg);
+		if (!msg.hasInviteContent())
+			throw new IllegalArgumentException("Expected WebcastLinkMessage with Invite Content!");
 
-     List<TrackedUser> getTrackedUsers();
+        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

@@ -20,44 +20,36 @@
  * 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.tester.mockClient.mocks;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import io.github.jwdeveloper.tiktok.ClientSettings;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.http.TikTokApiService;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import io.github.jwdeveloper.tiktok.http.TikTokHttpClient;
+import lombok.Getter;
-import io.github.jwdeveloper.tiktok.live.LiveRoomMeta;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 
-import java.util.logging.Logger;
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkKickOutEvent extends TikTokLinkEvent {
 
-public class ApiServiceMock extends TikTokApiService {
+    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!");
 
-    public ApiServiceMock(TikTokHttpClient apiClient, Logger logger, ClientSettings clientSettings) {
+        var content = msg.getKickOutContent();
-        super(apiClient, logger, clientSettings);
+        this.fromUserId = content.getFromUserId();
+        this.kickOutReason = KickOutReason.values()[content.getKickoutReasonValue()];
     }
 
-    @Override
+    public enum KickOutReason {
-    public void updateSessionId() {
+        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
     }
-
+}
-    @Override
-    public LiveRoomMeta fetchRoomInfo()
-    {
-        var meta = new LiveRoomMeta();
-        meta.setStatus(LiveRoomMeta.LiveRoomStatus.HostOnline);
-        return meta;
-    }
-
-    @Override
-    public WebcastResponse fetchClientData() {
-        return WebcastResponse.newBuilder().build();
-    }
-
-
-    @Override
-    public String fetchRoomId(String userName) {
-        return "mock-room-id";
-    }
-}

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,26 +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.live;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import lombok.Data;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-@Data
+@Getter
-public class LiveRoomMeta {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicIdxUpdateEvent extends TikTokLinkEvent {
 
-    private LiveRoomStatus status;
+    public TikTokLinkMicIdxUpdateEvent(WebcastLinkMessage msg) {
-    private boolean ageRestricted;
+        super(msg);
-    private String titie;
+        // if (!msg.hasMicIdxUpdateContent())
-    private int likeCount;
+        //     throw new IllegalArgumentException("Expected WebcastLinkMessage with Mic Idx Update Content!");
-    private int totalViewers;
+        // Proto Empty
-    private int viewers;
-    private User host;
-
-    public enum LiveRoomStatus
-    {
-        HostNotFound,
-        HostOnline,
-        HostOffline
     }
-}
+}

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

@@ -20,33 +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;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import java.util.HashMap;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import java.util.Map;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import java.util.Set;
+import lombok.Getter;
 
-public class TikTokCookieJar {
+@Getter
-    private final Map<String, String> cookies;
+@EventMeta(eventType = EventType.Message)
-    public TikTokCookieJar() {
+public class TikTokLinkMuteEvent extends TikTokLinkEvent {
-        cookies = new HashMap<>();
+
+    private final long userId, status;
+
+    public TikTokLinkMuteEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasMuteContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Mute Content!");
+
+        var content = msg.getMuteContent();
+        this.userId = content.getUserId();
+        this.status = content.getStatus();
     }
-
+}
-    public String get(String key) {
-        return cookies.get(key);
-    }
-
-    public void set(String key, String value) {
-        cookies.put(key, value);
-    }
-
-    public String parseCookies()
-    {
-        var sb = new StringBuilder();
-        for(var entry : cookies.entrySet())
-        {
-            sb.append(entry.getKey()).append("=").append(entry.getValue()).append(";");
-        }
-        return sb.toString();
-    }
-}

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

@@ -0,0 +1,44 @@
+/*
+ * 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 TikTokLinkUpdateUserEvent extends TikTokLinkEvent {
+
+    private final long fromUserId, toUserId;
+
+    public TikTokLinkUpdateUserEvent(WebcastLinkMessage msg) {
+        super(msg);
+        if (!msg.hasUpdateUserContent())
+            throw new IllegalArgumentException("Expected WebcastLinkMessage with Update User Content!");
+
+        var content = msg.getUpdateUserContent();
+        this.fromUserId = content.getFromUserId();
+        this.toUserId = content.getToUserId();
+    }
+}

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
@@ -39,4 +39,4 @@ Triggered when LiveRoomInfo got updated such as likes, viewers, ranking ....
 public class TikTokRoomInfoEvent extends TikTokEvent
 {
     LiveRoomInfo roomInfo;
-}
+}

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

@@ -33,15 +33,13 @@ import lombok.Getter;
 @EventMeta(eventType = EventType.Message)
 public class TikTokRoomPinEvent extends TikTokHeaderEvent
 {
+	private final TikTokCommentEvent pinnedMessage;
+	private final long timestamp;
 
-  private TikTokCommentEvent pinnedMessage;
+	public TikTokRoomPinEvent(WebcastRoomPinMessage msg, TikTokCommentEvent commentEvent)
-  private long timestamp;
+	{
-
+		super(msg.getCommon());
-  public TikTokRoomPinEvent(WebcastRoomPinMessage msg, TikTokCommentEvent commentEvent)
+		this.timestamp = msg.getTimestamp();
-  {
+		this.pinnedMessage = commentEvent;
-    super(msg.getCommon());
+	}
-    this.timestamp = msg.getTimestamp();
+}
-    this.pinnedMessage = commentEvent;
-  }
-
-}

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

@@ -36,13 +36,21 @@ import lombok.Value;
 @EventMeta(eventType = EventType.Message)
 public class TikTokFollowEvent extends TikTokHeaderEvent
 {
-   User user;
+    User user;
-   int totalFollowers;
+    int totalFollowers;
 
-  public TikTokFollowEvent(WebcastSocialMessage msg) {
+    public TikTokFollowEvent(WebcastSocialMessage msg) {
-    super(msg.getCommon());
+        super(msg.getCommon());
-    user = User.map(msg.getUser());
+        user = User.map(msg.getUser());
-    totalFollowers = msg.getFollowCount();
+        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

@@ -35,19 +35,18 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokShareEvent extends TikTokHeaderEvent {
-  private final User user;
+	private final User user;
-  private final int totalShares;
+	private final int totalShares;
 
-  public TikTokShareEvent(WebcastSocialMessage msg, Integer amount) {
+	public TikTokShareEvent(WebcastSocialMessage msg, Integer amount) {
-    super(msg.getCommon());
+		super(msg.getCommon());
-    user = User.map(msg.getUser());
+		user = User.map(msg.getUser());
-    this.totalShares = amount;
+		this.totalShares = amount;
-  }
+	}
 
-  public TikTokShareEvent(WebcastSocialMessage msg) {
+	public TikTokShareEvent(WebcastSocialMessage msg) {
-    super(msg.getCommon());
+		super(msg.getCommon());
-    user = User.map(msg.getUser());
+		user = User.map(msg.getUser());
-    totalShares = 1;
+		totalShares = 1;
-  }
+	}
-
+}
-}

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

@@ -46,4 +46,4 @@ public class LinkMicArmy {
         List<User> Users;
         Integer Points;
     }
-}
+}

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

@@ -28,15 +28,10 @@ import lombok.Getter;
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
+import java.io.*;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-
 public class Picture {
 
     @Getter
@@ -49,12 +44,11 @@ public class Picture {
     }
 
     public static Picture map(io.github.jwdeveloper.tiktok.messages.data.Image profilePicture) {
-
+        var index = profilePicture.getUrlCount() - 1;
-        var index = profilePicture.getUrlListCount() - 1;
         if (index < 0) {
             return new Picture("");
         }
-        var url = profilePicture.getUrlList(index);
+        var url = profilePicture.getUrl(index);
         return new Picture(url);
     }
 
@@ -74,12 +68,11 @@ public class Picture {
         return CompletableFuture.supplyAsync(this::downloadImage);
     }
 
-    private BufferedImage download(String urlString)
+    private BufferedImage download(String urlString) {
-    {
+        if (urlString.isEmpty()) {
-        if(urlString.isEmpty())
-        {
             return null;
         }
+
         var baos = new ByteArrayOutputStream();
         try (var is = new URL(urlString).openStream()) {
             var byteChunk = new byte[4096];
@@ -100,7 +93,12 @@ public class Picture {
         }
     }
 
-    public static Picture Empty() {
+    public static Picture empty() {
         return new Picture("");
     }
-}
+
+    @Override
+    public String toString() {
+        return "Picture{link='" + link + "', image=" + image + "}";
+    }
+}

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

@@ -37,6 +37,4 @@ public class Badge {
     public static Badge empty() {
         return new Badge();
     }
-
+}
-
-}

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

@@ -24,19 +24,22 @@ package io.github.jwdeveloper.tiktok.data.models.badges;
 
 import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+import lombok.Getter;
 
+@Getter
 public class CombineBadge extends Badge {
     private final Picture picture;
     private final String text;
     private final String subText;
 
-
     public CombineBadge(BadgeStruct.CombineBadge combineBadge) {
-
         picture = Picture.map(combineBadge.getIcon());
         text = combineBadge.getText().getDefaultPattern();
         subText = combineBadge.getStr();
     }
 
-
+    @Override
-}
+    public String toString() {
+        return "CombineBadge{picture=" + picture +", text='" + text + "', subText='" + subText + "'}";
+    }
+}

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

@@ -24,12 +24,18 @@ package io.github.jwdeveloper.tiktok.data.models.badges;
 
 import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+import lombok.Getter;
 
+@Getter
 public class PictureBadge extends Badge {
-
     private final Picture picture;
-    public PictureBadge(BadgeStruct.ImageBadge imageBadge) {
 
+    public PictureBadge(BadgeStruct.ImageBadge imageBadge) {
         picture = Picture.map(imageBadge.getImage());
     }
-}
+
+    @Override
+    public String toString() {
+        return "PictureBadge{picture=" + picture + "}";
+    }
+}

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

@@ -23,12 +23,18 @@
 package io.github.jwdeveloper.tiktok.data.models.badges;
 
 import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+import lombok.Getter;
 
+@Getter
 public class StringBadge extends Badge {
+    private final String text;
 
-    public String text;
     public StringBadge(BadgeStruct.StringBadge stringBadge) {
-
         this.text = stringBadge.getStr();
     }
-}
+
+    @Override
+    public String toString() {
+        return "StringBadge{text='" + text + "'}";
+    }
+}

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

@@ -23,13 +23,18 @@
 package io.github.jwdeveloper.tiktok.data.models.badges;
 
 import io.github.jwdeveloper.tiktok.messages.data.BadgeStruct;
+import lombok.Getter;
 
-public class TextBadge extends Badge
+@Getter
-{
+public class TextBadge extends Badge {
     private final String text;
 
-    public TextBadge(BadgeStruct.TextBadge textBadge)
+    public TextBadge(BadgeStruct.TextBadge textBadge) {
-    {
         this.text = textBadge.getDefaultPattern();
     }
-}
+
+    @Override
+    public String toString() {
+        return "TextBadge{text='" + text + "'}";
+    }
+}

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/http/HttpData.java

@@ -1,3 +1,25 @@
+/*
+ * 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.models.http;
 
 import lombok.Data;

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;
 
@@ -43,13 +43,12 @@ public class User {
     private long followers;
     private List<Badge> badges;
     @Getter(AccessLevel.NONE)
-    private Set<UserAttribute> attributes;
+    private final Set<UserAttribute> attributes = new HashSet<>();
-
-
 
     public List<UserAttribute> getAttributes() {
         return attributes.stream().toList();
     }
+
     public boolean hasAttribute(UserAttribute userFlag) {
         return attributes.contains(userFlag);
     }
@@ -106,7 +105,6 @@ public class User {
         this.following = following;
         this.followers = followers;
         this.badges = badges;
-        this.attributes = new HashSet<>();
     }
 
     public User(Long id,
@@ -123,14 +121,12 @@ public class User {
         this.following = following;
         this.followers = followers;
         this.badges = badges;
-        this.attributes = new HashSet<>();
     }
 
     public User(Long userId,
                 String nickName) {
         this.id = userId;
         this.name = nickName;
-        this.attributes = new HashSet<>();
     }
 
     public User(Long userId,
@@ -140,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();
@@ -163,10 +167,9 @@ public class User {
         }
     }
 
-
     public static User EMPTY = new User(0L,
             "",
-            Picture.Empty(),
+            Picture.empty(),
             0,
             0,
             List.of(Badge.empty()));
@@ -213,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

@@ -20,17 +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.live;
+package io.github.jwdeveloper.tiktok.data.requests;
 
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
-import io.github.jwdeveloper.tiktok.data.models.users.User;
+import lombok.*;
 
 import java.util.List;
 
-public interface TrackedUser
+public class GiftsData
 {
-     List<TikTokEvent> getInvokedEvents();
+    @Getter
-     List<Gift> getGifs();
+    @AllArgsConstructor
-     User getUserData();
+    public static final class Response
-}
+    {
+        private String json;
+        private List<Gift> gifts;
+    }
+}

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

@@ -20,29 +20,28 @@
  * 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.requests;
 
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
 
-import java.util.ArrayList;
+import java.net.URI;
-import java.util.List;
+import java.time.Duration;
 
-@Data
+public class LiveConnectionData {
-public class EventGeneratorSettings
+    @Getter
-{
+    @AllArgsConstructor
-    private String inputDictionary;
+    public static class Request {
+        private String roomId;
+    }
 
-    private String outputDictionary;
+    @Getter
-    private List<String> ignoredFiles = new ArrayList<>();
+    @AllArgsConstructor
-
+    public static class Response {
-    private String prefix;
+        private String websocketCookies;
-
+        private URI websocketUrl;
-    private String endFix;
+        private WebcastResponse webcastResponse;
-
-    private boolean isTikTokEvent;
-
-    public void addIgnoredClass(String name)
-    {
-        ignoredFiles.add(name);
     }
 }

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

@@ -0,0 +1,68 @@
+/*
+ * 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 io.github.jwdeveloper.tiktok.data.models.users.User;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+public class LiveData {
+    @Getter
+    @AllArgsConstructor
+    public static class Request {
+        private String roomId;
+    }
+
+    @Data
+    @AllArgsConstructor
+    public static class Response {
+        private String json;
+        private LiveStatus liveStatus;
+        private String title;
+        private int likes;
+        private int viewers;
+        private int totalViewers;
+        private boolean ageRestricted;
+        private User host;
+        private LiveType liveType;
+        public Response() {
+
+        }
+
+
+    }
+
+    public enum LiveStatus {
+        HostNotFound,
+        HostOnline,
+        HostOffline,
+    }
+
+    public enum LiveType {
+        SOLO,
+        BOX,
+        BATTLE,
+        CO_HOST
+    }
+}

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

@@ -20,34 +20,39 @@
  * 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.requests;
 
-import java.io.PrintWriter;
+import lombok.*;
-import java.io.StringWriter;
 
-public class ExceptionInfoModel
+public class LiveUserData {
-{
-    private String message;
-    private String stackTrace;
 
-    public ExceptionInfoModel(Throwable throwable) {
+    @Getter
-        this.message = throwable.getMessage();
+    @AllArgsConstructor
-        this.stackTrace = getStackTraceAsString(throwable);
+    public static class Request {
+        private String userName;
     }
 
-    public static String getStackTraceAsString(Throwable throwable) {
+    @Getter
-        StringWriter sw = new StringWriter();
+    @AllArgsConstructor
-        PrintWriter pw = new PrintWriter(sw);
+    public static class Response {
-        throwable.printStackTrace(pw);
+        private String json;
-        return sw.toString();
+        private UserStatus userStatus;
+        private String roomId;
+        private long startedAtTimeStamp;
+
+        public boolean isLiveOnline() {
+            return userStatus == LiveUserData.UserStatus.Live || userStatus == LiveUserData.UserStatus.LivePaused;
+        }
+
+        public boolean isHostNameValid() {
+            return userStatus != LiveUserData.UserStatus.NotFound;
+        }
     }
 
-    // Getters for message and stackTrace
+    public enum UserStatus {
-    public String getMessage() {
+        NotFound,
-        return message;
+        Offline,
+        LivePaused,
+        Live,
     }
-
+}
-    public String getStackTrace() {
-        return stackTrace;
-    }
-}

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

@@ -0,0 +1,104 @@
+/*
+ * 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.settings;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Consumer;
+
+
+@Getter
+public class HttpClientSettings {
+
+    private final Map<String, Object> params;
+
+    private final Map<String, String> headers;
+
+    private final Map<String, String> cookies;
+
+    @Setter
+    private ProxyClientSettings proxyClientSettings;
+
+    private Consumer<HttpClient.Builder> onClientCreating;
+
+    private Consumer<HttpRequest.Builder> onRequestCreating;
+
+    @Setter
+    private Duration timeout;
+
+    public HttpClientSettings() {
+        this.params = new TreeMap<>();
+        this.headers = new HashMap<>();
+        this.cookies = new HashMap<>();
+        this.timeout = Duration.ofSeconds(2);
+        this.proxyClientSettings = new ProxyClientSettings();
+        this.onClientCreating = (x) -> {};
+        this.onRequestCreating = (x) -> {};
+    }
+
+    /**
+     * @param consumer Use to configure proxy settings for http client
+     */
+    public void configureProxy(Consumer<ProxyClientSettings> consumer) {
+        proxyClientSettings.setEnabled(true);
+        consumer.accept(proxyClientSettings);
+    }
+
+    /**
+     * @param onRequestCreating Every time new Http request in created this method will be triggered
+     *                          use to modify request
+     */
+    public void onRequestCreating(Consumer<HttpRequest.Builder> onRequestCreating) {
+        this.onRequestCreating = onRequestCreating;
+    }
+
+    /**
+     * @param onClientCreating Every time new instance of Http client request in created this method will be triggered
+     *                         use to modify http client
+     */
+    public void onClientCreating(Consumer<HttpClient.Builder> onClientCreating) {
+        this.onClientCreating = onClientCreating;
+    }
+
+    @Override
+    public HttpClientSettings clone() {
+
+        var newSettings = new HttpClientSettings();
+        newSettings.setTimeout(this.getTimeout());
+        newSettings.onRequestCreating(this.onRequestCreating);
+        newSettings.onClientCreating(this.onClientCreating);
+        newSettings.getHeaders().putAll(new TreeMap<>(this.headers));
+        newSettings.getCookies().putAll(new TreeMap<>(this.cookies));
+        newSettings.getParams().putAll(new TreeMap<>(this.params));
+        newSettings.proxyClientSettings = this.proxyClientSettings;
+
+        return newSettings;
+    }
+}

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

@@ -20,7 +20,9 @@
  * 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;
+package io.github.jwdeveloper.tiktok.data.settings;
+
+import lombok.Data;
 
 import java.time.Duration;
 import java.util.HashMap;
@@ -28,44 +30,98 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.logging.Level;
 
-public class Constants {
+@Data
+public class LiveClientSettings {
 
     /**
-     * Web-URL for TikTok
+     *  Sets client to offline mode, prohibits connection to TikTok servers
+     *  @apiNote Useful when testing client with custom events
      */
-    public static final String TIKTOK_URL_WEB = "https://www.tiktok.com/";
+    private boolean offline;
-    /**
-     * WebCast-BaseURL for TikTok
-     */
-    public static final String TIKTOK_URL_WEBCAST = "https://webcast.tiktok.com/webcast/";
-    /**
-     * Signing API by Isaac Kogan
-     * https://github-wiki-see.page/m/isaackogan/TikTokLive/wiki/All-About-Signatures
-     */
-    public static final String TIKTOK_SIGN_API = "https://tiktok.eulerstream.com/webcast/sign_url";
 
     /**
-     * Default TimeOut for Connections
+     * Fetch and download gifts data before TikTokLive starts
+     * @apiNote If `false`, client.giftManager() does not contain initial gifts
      */
-    public static final int DEFAULT_TIMEOUT = 20;
+    private boolean fetchGifts = true;
-
 
     /**
-     * Default Settings for Client
+     * ISO-Language for Client
      */
-    public static ClientSettings DefaultClientSettings() {
+    private String clientLanguage;
-        var clientSettings = new ClientSettings();
+
-        clientSettings.setTimeout(Duration.ofSeconds(DEFAULT_TIMEOUT));
+    /**
+     * Whether to Retry if Connection Fails
+     */
+    private boolean retryOnConnectionFailure;
+
+    /**
+     * Before retrying connect, wait for select amount of time
+     */
+    private Duration retryConnectionTimeout;
+
+    /**
+     * Whether to print Logs to Console
+     */
+    private boolean printToConsole = true;
+
+    /**
+     * LoggingLevel for Logs
+     */
+    private Level logLevel;
+
+    /**
+     * Optional: Use it if you need to change TikTok live hostname in builder
+     */
+    private String hostName;
+
+    /**
+     * Parameters used in requests to TikTok api
+     */
+    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
+	 * @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;
+
+    /**
+     * 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());
+        httpSettings.setTimeout(Duration.ofSeconds(3));
+
+        var clientSettings = new LiveClientSettings();
         clientSettings.setClientLanguage("en-US");
         clientSettings.setRetryOnConnectionFailure(false);
         clientSettings.setRetryConnectionTimeout(Duration.ofSeconds(1));
         clientSettings.setPrintToConsole(false);
         clientSettings.setLogLevel(Level.ALL);
-        clientSettings.setClientParameters(Constants.DefaultClientParams());
+
+        clientSettings.setHttpSettings(httpSettings);
         return clientSettings;
     }
 
-
     /**
      * Default Parameters for HTTP-Request
      */
@@ -104,26 +160,22 @@ public class Constants {
         clientParams.put("webcast_sdk_version", "1.3.0");
         clientParams.put("update_version_code", "1.3.0");
 
-
         return clientParams;
     }
 
-
     /**
      * Default Headers for HTTP-Request
      */
     public static Map<String, String> DefaultRequestHeaders() {
         var headers = new HashMap<String, String>();
 
-        headers.put("authority","www.tiktok.com");
+        headers.put("authority", "www.tiktok.com");
-        headers.put("Connection", "keep-alive");
         headers.put("Cache-Control", "max-age=0");
         headers.put("Accept", "text/html,application/json,application/protobuf");
         headers.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36");
         headers.put("Referer", "https://www.tiktok.com/");
         headers.put("Origin", "https://www.tiktok.com");
         headers.put("Accept-Language", "en-US,en; q=0.9");
-        headers.put("Accept-Encoding", "gzip, deflate");
         return headers;
     }
-}
+}

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

@@ -0,0 +1,121 @@
+/*
+ * 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.settings;
+
+import io.github.jwdeveloper.tiktok.data.dto.ProxyData;
+import lombok.*;
+
+import java.net.*;
+import java.util.*;
+import java.util.function.Consumer;
+
+@Getter
+@Setter
+public class ProxyClientSettings implements Iterator<ProxyData>
+{
+    private boolean enabled, autoDiscard = true, fallback = true;
+    private Rotation rotation = Rotation.CONSECUTIVE;
+    private final List<ProxyData> proxyList = new ArrayList<>();
+    private int index = -1;
+    private Proxy.Type type = Proxy.Type.DIRECT;
+    private Consumer<ProxyData> onProxyUpdated = x -> {};
+
+    public boolean addProxy(String addressPort) {
+        return proxyList.add(ProxyData.map(addressPort));
+    }
+
+    public boolean addProxy(String address, int port) {
+        return addProxy(new InetSocketAddress(address, port));
+    }
+
+    public boolean addProxy(InetSocketAddress inetAddress) {
+        return proxyList.add(new ProxyData(inetAddress.getHostString(), inetAddress.getPort()));
+    }
+
+    public void addProxies(List<String> list) {
+        list.forEach(this::addProxy);
+    }
+
+    @Override
+    public boolean hasNext() {
+        return !proxyList.isEmpty();
+    }
+
+    @Override
+    public ProxyData next() {
+        var nextProxy = switch (rotation)
+        {
+            case CONSECUTIVE -> {
+                index = (index+1) % proxyList.size();
+                yield proxyList.get(index).clone();
+            }
+            case RANDOM -> {
+                index = new Random().nextInt(proxyList.size());
+                yield proxyList.get(index).clone();
+            }
+            case NONE -> {
+                index = Math.max(index, 0);
+                yield proxyList.get(index).clone();
+            }
+        };
+        onProxyUpdated.accept(nextProxy);
+        return nextProxy;
+	}
+
+    @Override
+    public void remove() {
+        proxyList.remove(index);
+    }
+
+    public void setIndex(int index) {
+        if (index == 0 && proxyList.isEmpty())
+            this.index = 0;
+        else {
+            if (index < 0 || index >= proxyList.size())
+                throw new IndexOutOfBoundsException("Index " + index + " exceeds list of size: " + proxyList.size());
+            this.index = index;
+        }
+    }
+
+    public ProxyClientSettings clone()
+    {
+        ProxyClientSettings settings = new ProxyClientSettings();
+        settings.setEnabled(enabled);
+        settings.setRotation(rotation);
+        settings.setIndex(index);
+        settings.setType(type);
+        settings.setOnProxyUpdated(onProxyUpdated);
+        proxyList.forEach(proxyData -> settings.addProxy(proxyData.getAddress(), proxyData.getPort()));
+        return settings;
+    }
+
+    public enum Rotation
+    {
+        /** Rotate addresses consecutively, from proxy 0 -> 1 -> 2 -> ...etc. */
+        CONSECUTIVE,
+        /** Rotate addresses randomly, from proxy 0 -> 69 -> 420 -> 1 -> ...etc. */
+        RANDOM,
+        /** Don't rotate addresses at all, pin to the indexed address. */
+        NONE
+    }
+}

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

@@ -23,7 +23,7 @@
 package io.github.jwdeveloper.tiktok.exceptions;
 
 
-/*
+/**
  * Happens while bad response from Http request to TikTok
  */
 public class TikTokLiveRequestException extends TikTokLiveException
@@ -46,4 +46,4 @@ public class TikTokLiveRequestException extends TikTokLiveException
     public TikTokLiveRequestException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
-}
+}

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

@@ -20,31 +20,30 @@
  * 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.exceptions;
 
-import lombok.Data;
 
-import java.util.ArrayList;
+/*
-import java.util.List;
+ * Happens while bad response from http proxy request to TikTok
-
+ */
-@Data
+public class TikTokProxyRequestException extends TikTokLiveException
-public class CSharpClassInfo
 {
-    private String className;
+    public TikTokProxyRequestException() {
-    private List<FieldInfo> fields = new ArrayList<>();
-    private List<ConstructorInfo> constructors = new ArrayList<>();
-
-    public void addField(String type, String fields)
-    {
-        this.fields.add(new FieldInfo(type,fields));
     }
 
-    public void addConstructor(List<FieldInfo> arguments)
+    public TikTokProxyRequestException(String message) {
-    {
+        super(message);
-        this.constructors.add(new ConstructorInfo(arguments));
     }
 
-    public record FieldInfo(String type, String name){};
+    public TikTokProxyRequestException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-    public record ConstructorInfo(List<FieldInfo> arguemtns){};
+    public TikTokProxyRequestException(Throwable cause) {
-}
+        super(cause);
+    }
+
+    public TikTokProxyRequestException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokSignServerException.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.exceptions;
+
+public class TikTokSignServerException extends TikTokLiveRequestException
+{
+    public TikTokSignServerException() {
+    }
+
+    public TikTokSignServerException(String message) {
+        super(message);
+    }
+
+    public TikTokSignServerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public TikTokSignServerException(Throwable cause) {
+        super(cause);
+    }
+
+    public TikTokSignServerException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

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

@@ -0,0 +1,72 @@
+/*
+ * 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.http;
+
+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;
+
+public interface LiveHttpClient
+{
+    /**
+     * @return {@link GiftsData.Response} list of gifts that are compiled and available on github
+     */
+    GiftsData.Response fetchGiftsData();
+
+    /**
+     * @return {@link GiftsData.Response} list of gifts that are available in your region / livestream
+     */
+    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 {@link LiveData.Response}
+     */
+    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 {@link LiveConnectionData.Response}
+     */
+    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,53 +22,52 @@
  */
 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>
+ * {@code TikTokLive.newClient("someuser").addListener(listener);}
+ * <p>
+ * After registertion, all listeners are kept in Listener manager - {@link  LiveClient#getListenersManager()}
+ * <p>
+ * Method in TikTokEventListener should meet requirements below to be detected
+ * <p>- @TikTokEventObserver annotation
+ * <p>- 2 parameters of (LiveClient, Class extending TikTokEvent)
+ * <pre>
+ * {@code
+ * 	public static class CustomListener implements TikTokEventListener
+ *  {
+ *  	@TikTokEventObserver
+ *      public void onError(LiveClient liveClient, TikTokErrorEvent event)
+ *      {
+ *      	System.out.println(event.getException().getMessage());
+ *      }
  *
- *  TikTokLive.newClient("someuser").addListener(listener)
+ *      @TikTokEventObserver
+ *      public void onCommentMessage(LiveClient liveClient, TikTokCommentEvent event)
+ *      {
+ *          System.out.println(event.getText());
+ *      }
  *
- *  After registertion all listeners are kept in Listener manager
+ *      @TikTokEventObserver
- *  that could be obtained by client.getListenerManager();
+ *      public void onGiftMessage(LiveClient liveClient, TikTokGiftMessageEvent event)
- *
+ *      {
- *  Method in TikTokEventListener should meet 4 requirements to be detected
+ *          System.out.println(event.getGift().getDescription());
- *         - must have @TikTokEventHandler annotation
+ *      }
- *         - must have 2 parameters
- *         - first parameter must be LiveClient
- *         - second must be class that extending TikTokEvent
- *
- *  public static class CustomListener implements TikTokEventListener
- *     {
- *         @TikTokEventHandler
- *         public void onError(LiveClient liveClient, TikTokErrorEvent event)
- *         {
- *             System.out.println(event.getException().getMessage());
- *         }
- *
- *         @TikTokEventHandler
- *         public void onCommentMessage(LiveClient liveClient, TikTokCommentEvent event)
- *         {
- *             System.out.println(event.getText());
- *         }
- *
- *         @TikTokEventHandler
- *         public void onGiftMessage(LiveClient liveClient, TikTokGiftMessageEvent event)
- *         {
- *             System.out.println(event.getGift().getDescription());
- *         }
- *
- *         @TikTokEventHandler
- *         public void onAnyEvent(LiveClient liveClient, TikTokEvent event)
- *         {
- *             System.out.println(event.getClass().getSimpleName());
- *         }
- *     }
  *
+ *      @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

@@ -57,14 +57,23 @@ public interface LiveClient {
 
 
     /**
-     * You to manually trigger event
+     * Use to manually invoke event
      */
-     void publishEvent(TikTokEvent event);
+    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

@@ -42,11 +42,12 @@ public interface LiveRoomInfo
       */
      int getTotalViewersCount();
      int getLikesCount();
+     long getStartTime();
      boolean isAgeRestricted();
      String getRoomId();
      String getHostName();
      String getTitle();
-     User getHostUser();
+     User getHost();
      List<RankingUser> getUsersRanking();
      ConnectionState getConnectionState();
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventsBuilder.java

@@ -24,6 +24,7 @@ package io.github.jwdeveloper.tiktok.live.builder;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.*;
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
@@ -149,6 +150,13 @@ public interface EventsBuilder<T> {
      */
     T onConnected(EventConsumer<TikTokConnectedEvent> action);
 
+    /**
+     * Invoked before client has been successfully connected to live
+     * @param action
+     * @return
+     */
+    T onPreConnection(EventConsumer<TikTokPreConnectionEvent> action);
+
     /**
      * Invoked when client tries to reconnect
      * @param action
@@ -215,6 +223,4 @@ public interface EventsBuilder<T> {
     //T onLinkMicBattle(TikTokEventConsumer<TikTokLinkMicBattleEvent> event);
 
     //T onUnhandledControl(TikTokEventConsumer<TikTokUnhandledControlEvent> event);
-}
+}
-
-

API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/LiveClientBuilder.java

@@ -22,15 +22,13 @@
  */
 package io.github.jwdeveloper.tiktok.live.builder;
 
-import io.github.jwdeveloper.tiktok.ClientSettings;
+import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.mappers.TikTokMapper;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 public interface LiveClientBuilder extends EventsBuilder<LiveClientBuilder> {
 
@@ -48,11 +46,11 @@ public interface LiveClientBuilder extends EventsBuilder<LiveClientBuilder> {
 
     /**
      * Configuration of client settings
-     * @see ClientSettings
+     * @see LiveClientSettings
      * @param onConfigure
      * @return
      */
-    LiveClientBuilder configure(Consumer<ClientSettings> onConfigure);
+    LiveClientBuilder configure(Consumer<LiveClientSettings> onConfigure);
 
     /**
      * @see TikTokEventListener

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapper.java

@@ -47,6 +47,9 @@ public interface TikTokMapper {
 
     TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, Function<byte[], TikTokEvent> onMapping);
 
+    TikTokMapperModel forAnyMessage();
+
+
     boolean isRegistered(String mapperName);
 
     <T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName);

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperHelper.java

@@ -1,3 +1,25 @@
+/*
+ * 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.mappers;
 
 import com.google.protobuf.GeneratedMessageV3;

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokMapperModel.java

@@ -1,3 +1,25 @@
+/*
+ * 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.mappers;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/AfterMappingAction.java

@@ -1,3 +1,25 @@
+/*
+ * 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.mappers.data;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingAction.java

@@ -1,3 +1,25 @@
+/*
+ * 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.mappers.data;
 
 import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;

API/src/main/java/io/github/jwdeveloper/tiktok/mappers/data/MappingResult.java

@@ -1,3 +1,25 @@
+/*
+ * 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.mappers.data;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;

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

@@ -36,6 +36,11 @@ public class ProtoBufferObject {
         this.fields = new TreeMap<>();
     }
 
+    public Object getField(int index)
+    {
+        return fields.get(index);
+    }
+
     public void addField(int index, String type, Object value) {
         fields.put(index, new ProtoBufferField(type, value));
     }

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

@@ -22,11 +22,11 @@
  */
 package io.github.jwdeveloper.tiktok.websocket;
 
+import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 
 public interface SocketClient {
-    void start(WebcastResponse webcastResponse, LiveClient tikTokLiveClient);
+    void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient);
-
     void stop();
 }

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;
 }
 
@@ -976,131 +977,146 @@ message FanTicketRoomNoticeContent {
 }
 
 message LinkerAcceptNoticeContent {
-  int64 FromUserId = 1;
+  int64 fromUserId = 1;
-  int64 FromRoomId = 2;
+  int64 fromRoomId = 2;
-  int64 ToUserId = 3;
+  int64 toUserId = 3;
 }
 
 message LinkerCancelContent {
-  int64 FromUserId = 1;
+  int64 fromUserId = 1;
-  int64 ToUserId = 2;
+  int64 toUserId = 2;
-  int64 CancelType = 3;
+  int64 cancelType = 3;
-  int64 ActionId = 4;
+  int64 actionId = 4;
 }
 
+message ListUser {
+  User user = 1;
+  int64 linkmicId = 2;
+  string linkmicIdStr = 3;
+  int64 linkStatus = 4; // Enum
+  LinkType linkType = 5; // Enum
+  int32 userPosition = 6;
+  int32 silenceStatus = 7; // Enum
+  int64 modifyTime = 8;
+  int64 linkerId = 9;
+  int32 roleType = 10; // Enum
+
+  enum LinkType {
+    LINK_UNKNOWN = 0;
+    AUDIO = 1;
+    VIDEO = 2;
+  }
+}
+
+
+//it is just empty
 message LinkerCloseContent {
 
 }
 
 message LinkerCreateContent {
-  int64 OwnerId = 1;
+  int64 ownerId = 1;
-  int64 OwnerRoomId = 2;
+  int64 ownerRoomId = 2;
-  int64 LinkType = 3;
+  int64 linkType = 3;
 }
 
+
+
 message LinkerEnterContent {
-  repeated User LinkedUsersList = 1;
+  repeated ListUser linkedUsersList = 1;
-  // LinkmicMultiLiveEnum AnchorMultiLiveEnum = 2;
+  int32 anchorMultiLiveEnum = 2; // Enum
-  // Data.LinkmicUserSettingInfo AnchorSettingInfo = 3;
+  LinkmicUserSettingInfo anchorSettingInfo = 3;;
 }
 
 message LinkerInviteContent {
-  int64 FromUserId = 1;
+  int64 fromUserId = 1;
-  int64 FromRoomId = 2;
+  int64 fromRoomId = 2;
-  string ToRtcExtInfo = 3;
+  string toRtcExtInfo = 3;
-  bool RtcJoinChannel = 4;
+  bool rtcJoinChannel = 4;
-  int64 Vendor = 5;
+  int64 vendor = 5;
-  string SecFromUserId = 6;
+  string secFromUserId = 6;
-  string ToLinkmicIdStr = 7;
+  string toLinkmicIdStr = 7;
-  User FromUser = 8;
+  User fromUser = 8;
-  int64 RequiredMicIdx = 9;
+  int64 requiredMicIdx = 9;
-  map<int64, string> RtcExtInfoMap = 10;
-  //Data.LinkmicMultiLiveEnum AnchorMultiLiveEnum = 11;
-  //Data.LinkmicUserSettingInfo AnchorSettingInfo = 12;
-  string InviterLinkmicIdStr = 13;
-  //  InviteTopHostInfo FromTopHostInfo = 16;
-  int64 ActionId = 17;
-  // repeated LinkmicUserInfo LinkedUsersList = 18;
-  // Data.PerceptionDialogInfo Dialog = 19;
-  // Data.PunishEventInfo PunishInfo = 20;
-  int32 FromRoomAgeRestricted = 21;
-  // Data.Tag FromTag = 22;
-  // repeated Data.CohostABTestSetting AbTestSettingList = 23;
-  // Data.LinkerInviteMessageExtra LinkerInviteMsgExtra = 101;
 }
 
 message LinkerKickOutContent {
-  int64 FromUserId = 1;
+  int64 fromUserId = 1;
-  //LinkMic.KickoutReason KickoutReason = 2;
+  KickoutReason kickoutReason = 2; // Enum
 }
 
 message LinkerLeaveContent {
-  int64 UserId = 1;
+  int64 userId = 1;
-  string LinkmicIdStr = 2;
+  string linkmicIdStr = 2;
-  int64 SendLeaveUid = 3;
+  int64 sendLeaveUid = 3;
-  int64 LeaveReason = 4;
+  int64 leaveReason = 4;
 }
 
+//Empty
 message LinkerLinkedListChangeContent {
-  repeated User LinkedUsersList = 1;
+
 }
+//Empty
+message CohostListChangeContent {
+}
+
 
 message LinkerListChangeContent {
-  repeated LinkLayerListUser LinkedUsersList = 1;
+  repeated ListUser linkedUsers = 1;
-  repeated LinkLayerListUser AppliedUsersList = 2;
+  repeated ListUser appliedUsers = 2;
-  repeated LinkLayerListUser ConnectingUsersList = 3;
+  repeated ListUser connectingUsers = 3;
 }
 
 message LinkerMediaChangeContent {
-  // MicIdxOperation Op = 1;
+  int64 op = 1; // Enum
-  int64 ToUserId = 2;
+  int64 toUserId = 2;
-  int64 AnchorId = 3;
+  int64 anchorId = 3;
-  int64 RoomId = 4;
+  int64 roomId = 4;
-  // LinkerSceneType ChangeScene = 5;
+  int64 changeScene = 5; // Enum
 }
 
+//Empty
 message LinkerMicIdxUpdateContent {
-  LinkerMicIdxUpdateInfo MicIdxUpdateInfo = 1;
+
 }
 
-message LinkerMicIdxUpdateInfo {
-  // MicIdxOperation Op = 1;
-  int64 UserId = 2;
-  int64 MicIdx = 3;
-}
 
 message LinkerMuteContent {
-  int64 UserId = 1;
+  int64 userId = 1;
-  // Data.MuteStatus Status = 2;
+  int64 status = 2; // Enum
 }
 
 message LinkerRandomMatchContent {
-  User User = 1;
+  User user = 1;
-  int64 RoomId = 2;
+  int64 roomId = 2;
-  int64 InviteType = 3;
+  int64 inviteType = 3;
-  string MatchId = 4;
+  string matchId = 4;
-  int64 InnerChannelId = 5;
+  int64 innerChannelId = 5;
 }
 
 message LinkerReplyContent {
-  int64 FromUserId = 1;
+  int64 fromUserId = 1;
-  int64 FromRoomId = 2;
+  int64 fromRoomId = 2;
-  // LinkmicInfo FromUserLinkmicInfo = 3;
+  LinkmicInfo fromUserLinkmicInfo = 3;
-  int64 ToUserId = 4;
+  int64 toUserId = 4;
-  //  LinkmicInfo ToUserLinkmicInfo = 5;
+  LinkmicInfo toUserLinkmicInfo = 5;
-  int64 LinkType = 6;
+  int64 linkType = 6;
-  int64 ReplyStatus = 7;
+  int64 replyStatus = 7;
-  LinkerSetting LinkerSetting = 8;
+  LinkerSetting linkerSetting = 8;
-  User FromUser = 9;
+  User fromUser = 9;
-  User ToUser = 10;
+  User toUser = 10;
-  map<int64, string> RtcExtInfoMap = 11;
+
-  LinkerMicIdxUpdateInfo InviteeMicIdxUpdateInfo = 12;
+  message LinkmicInfo {
-  map<int64, int64> ApplierMicIdxInfoMap = 13;
+    string accessKey = 1;
-  //  Data.LinkmicMultiLiveEnum AnchorMultiLiveEnum = 14;
+    int64 linkMicId = 2;
-  //  Data.LinkmicUserSettingInfo AnchorSettingInfo = 15;
+    bool joinable = 3;
-  int64 ActionId = 16;
+    int32 confluenceType = 4;
-  // repeated LinkmicUserInfo LinkedUsersList = 17;
+    string rtcExtInfo = 5;
-  int64 SourceType = 18;
+    string rtcAppId = 6;
+    string rtcAppSign = 7;
+    string linkmicIdStr = 8;
+    int64 vendor = 9;
+  }
 }
 
 message LinkerSetting {
@@ -1113,20 +1129,27 @@ message LinkerSetting {
 }
 
 message LinkerSysKickOutContent {
-  int64 UserId = 1;
+  int64 userId = 1;
-  string LinkmicIdStr = 2;
+  string linkmicIdStr = 2;
+}
+
+message LinkmicUserToastContent {
+  int64 userId = 1;
+  int64 roomId = 2;
+  Text displayText = 3;
 }
 
 message LinkerUpdateUserContent {
-  int64 FromUserId = 1;
+  int64 fromUserId = 1;
-  int64 ToUserId = 2;
+  int64 toUserId = 2;
-  map<string, string> UpdateInfoMap = 3;
 }
 
+//Empty
 message LinkerUpdateUserSettingContent {
-  // Data.LinkmicUserSettingInfo UpdateUserSettingInfo = 1;
+
 }
 
+//Empty
 message LinkerWaitingListChangeContent {
 
 }

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;
@@ -241,6 +249,35 @@ enum CommonContentCase {
 }
 
 
+enum LinkMessageType {
+  TYPE_LINKER_UNKNOWN = 0;
+  TYPE_LINKER_CREATE = 1;
+  TYPE_LINKER_CLOSE = 2;
+  TYPE_LINKER_INVITE = 3;
+  TYPE_LINKER_APPLY = 4;
+  TYPE_LINKER_REPLY = 5;
+  TYPE_LINKER_ENTER = 6;
+  TYPE_LINKER_LEAVE = 7;
+  TYPE_LINKER_PERMIT = 8;
+  TYPE_LINKER_CANCEL_INVITE = 9;
+  TYPE_LINKER_WAITING_LIST_CHANGE = 10;
+  TYPE_LINKER_LINKED_LIST_CHANGE = 11;
+  TYPE_LINKER_UPDATE_USER = 12;
+  TYPE_LINKER_KICK_OUT = 13;
+  TYPE_LINKER_CANCEL_APPLY = 14;
+  TYPE_LINKER_MUTE = 15;
+  TYPE_LINKER_MATCH = 16;
+  TYPE_LINKER_UPDATE_USER_SETTING = 17;
+  TYPE_LINKER_MIC_IDX_UPDATE = 18;
+  TYPE_LINKER_LEAVE_V2 = 19;
+  TYPE_LINKER_WAITING_LIST_CHANGE_V2 = 20;
+  TYPE_LINKER_LINKED_LIST_CHANGE_V2 = 21;
+  TYPE_LINKER_COHOST_LIST_CHANGE = 22;
+  TYPE_LINKER_MEDIA_CHANGE = 23;
+  TYPE_LINKER_ACCEPT_NOTICE = 24;
+  TYPE_LINKER_SYS_KICK_OUT = 101;
+  TYPE_LINKMIC_USER_TOAST = 102;
+}
 
 enum MessageType {
   MESSAGETYPE_SUBSUCCESS = 0;

API/src/main/proto/webcast.proto

@@ -18,17 +18,13 @@ message WebcastPushFrame {
   uint64 LogId = 2;
   uint64 Service = 3;
   uint64 Method = 4;
-  map<string,string> headers = 5;
+  map<string, string> headers = 5;
   string PayloadEncoding = 6;
   string PayloadType = 7;
   bytes Payload = 8;
 
 }
 
-message WebcastWebsocketAck {
-  uint64 Id = 1;
-  string Type = 2;
-}
 
 
 //@WebcastResponse
@@ -68,6 +64,7 @@ message WebcastGiftMessage {
   int32 repeatCount = 5;
   int32 comboCount = 6;
   User user = 7;
+  User toUser = 8;
   int32 repeatEnd = 9;
   int64 groupId = 11;
   int64 incomeTaskgifts = 12;
@@ -84,8 +81,8 @@ message WebcastGiftMessage {
 
   message UserGiftReciever
   {
-      int64 userId =1;
+    int64 userId = 1;
-      string deviceName = 10;
+    string deviceName = 10;
   }
 
   message GiftIMPriority {
@@ -203,7 +200,7 @@ message WebcastChatMessage {
   int32 quickChatScene = 16;
   int32 communityFlaggedStatus = 17;
   UserIdentity UserIdentity = 18;
-  map<int32,string> CommentQualityScores = 19;
+  map<int32, string> CommentQualityScores = 19;
 
   // @EmoteWithIndex
   // proto.webcast.im.ChatMessage
@@ -283,14 +280,14 @@ message WebcastGoalUpdateMessage {
   int64 contributorId = 4;
   Image contributorAvatar = 5;
   string contributorDisplayId = 6;
-//  SubGoal contributeSubgoal = 7;
+  //  SubGoal contributeSubgoal = 7;
   int64 contributeCount = 9;
   int64 contributeScore = 10;
   int64 giftRepeatCount = 11;
   string contributorIdStr = 12;
   bool pin = 13;
   bool unpin = 14;
- // GoalPinInfo pinInfo = 15;
+  // GoalPinInfo pinInfo = 15;
 }
 
 // Message related to Chat-moderation?
@@ -354,7 +351,7 @@ message WebcastSocialMessage {
 message WebcastSubNotifyMessage {
   Common common = 1;
   User user = 2;
-//  ExhibitionType exhibitionType = 3; // Enum
+  //  ExhibitionType exhibitionType = 3; // Enum
   int64 subMonth = 4;
   SubscribeType subscribeType = 5; // Enum
   OldSubscribeStatus oldSubscribeStatus = 6; // Enum
@@ -524,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;
@@ -577,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;
@@ -589,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 LinkMicBattleDetailsSummary {
+      uint64 id = 1;
+      uint32 unknownData2 = 2;
+      uint32 points = 3;
+    }
   }
 
-  message LinkMicBattleTeam {
+  message LinkMicBattleTopViewers {
     uint64 id = 1;
-    repeated User users = 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 LinkMicBattleTeamData {
+  message LinkMicBattleHost {
-    uint64 teamId = 1;
+    uint64 id = 1;
-    LinkMicBattleData data = 2;
+    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;
+      }
+    }
   }
 }
 
@@ -681,7 +733,7 @@ message WebcastMsgDetectMessage {
     bool detectP2PMsg = 3;
     bool detectRoomMsg = 4;
     bool httpOptimize = 5;
-}
+  }
 }
 
 //@WebcastOecLiveShoppingMessage
@@ -732,7 +784,7 @@ message WebcastSystemMessage {
 //@WebcastLinkMessage
 message WebcastLinkMessage {
   Common common = 1;
-  MessageType MessageType = 2;
+  LinkMessageType MessageType = 2;
   int64 LinkerId = 3;
   Scene Scene = 4;
   LinkerInviteContent InviteContent = 5;
@@ -751,14 +803,14 @@ message WebcastLinkMessage {
   LinkerUpdateUserSettingContent UpdateUserSettingContent = 18;
   LinkerMicIdxUpdateContent MicIdxUpdateContent = 19;
   LinkerListChangeContent ListChangeContent = 20;
- // CohostListChangeContent CohostListChangeContent = 21;
+  CohostListChangeContent CohostListChangeContent = 21;
   LinkerMediaChangeContent MediaChangeContent = 22;
-  LinkerAcceptNoticeContent ReplyAcceptNoticeContent = 23;
+  LinkerAcceptNoticeContent AcceptNoticeContent = 23;
   LinkerSysKickOutContent SysKickOutContent = 101;
- // LinkmicUserToastContent UserToastContent = 102;
+  LinkmicUserToastContent UserToastContent = 102;
-  string Extra = 200;
+  string extra = 200;
-  int64 ExpireTimestamp = 201;
+  int64 expireTimestamp = 201;
-  string TransferExtra = 202;
+  string transferExtra = 202;
 }
 
 
@@ -795,6 +847,4 @@ message RoomVerifyMessage {
   string content = 3;
   int64 noticeType = 4;
   bool closeRoom = 5;
-}
+}
-
-