Fixed bugs:

- addListeners() was throwing exception
  - 404 response code was return while connecting to tiktok for some users
  - configure.setRoomId() method for people that want to set roomId manually
  - client.roomInfo().isAgeRestricted() check if live has age restriction

.github/workflows/maven-publish.yml

@@ -1,4 +1,4 @@
-name: Publish Artifacts
+name: Publish New Version
 
 on:
   workflow_dispatch:
@@ -72,11 +72,8 @@ jobs:
       run: |
             git config --local user.email "action@github.com"
             git config --local user.name "GitHub Action"
-            git add pom.xml
-            git add API/pom.xml
-            git add Client/pom.xml
-            git add TestApplication/pom.xml
-            git add Tools/pom.xml
+            git add README.md
+            git add pom.xml && git add '**/pom.xml'
             git commit -m "Update version in pom.xml"
     - name: Push changes
       uses: ad-m/github-push-action@master

.gitignore

@@ -1,3 +1,143 @@
 # Project exclude paths
 /API/target/
-/Client/target/
+/Client/target/
+*.db
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+/.idea/.gitignore
+/.idea/.name
+/.idea/compiler.xml
+/TestApplication/target/classes/io/github/jwdeveloper/tiktok/ConfigurationExample.class
+/TestApplication/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/TestApplication/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+/Tools/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/Tools/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+/Tools-EventsCollector/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/Tools-ReadmeGenerator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/Tools-ReadmeGenerator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+/.idea/encodings.xml
+/Tools-ReadmeGenerator/target/classes/io/github/jwdeveloper/tiktok/EventsListGenerator$EventTypeComparator.class
+/Tools-ReadmeGenerator/target/classes/io/github/jwdeveloper/tiktok/EventsListGenerator.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/tables/ExceptionInfoModel.class
+/Tools/target/classes/io/github/jwdeveloper/tiktok/utils/FilesUtility.class
+/TestApplication/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/TestApplication/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/Tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/Tools/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/Tools-EventsCollector/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/Tools-ReadmeGenerator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/Tools-ReadmeGenerator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/.idea/jarRepositories.xml
+/TestApplication/target/classes/io/github/jwdeveloper/tiktok/ListenerExample$CustomListener.class
+/TestApplication/target/classes/io/github/jwdeveloper/tiktok/ListenerExample.class
+/Tools-ReadmeGenerator/target/classes/io/github/jwdeveloper/tiktok/LiveClientMethodsGenerator.class
+/TestApplication/target/classes/io/github/jwdeveloper/tiktok/Main.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/Main.class
+/Tools-ReadmeGenerator/target/classes/io/github/jwdeveloper/tiktok/Main.class
+/.idea/misc.xml
+/Tools-ReadmeGenerator/src/main/resources/output.md
+/Tools-ReadmeGenerator/target/classes/output.md
+/TestApplication/target/maven-archiver/pom.properties
+/Tools/target/maven-archiver/pom.properties
+/Tools-EventsCollector/target/maven-archiver/pom.properties
+/Tools-ReadmeGenerator/target/maven-archiver/pom.properties
+/.idea/inspectionProfiles/Project_Default.xml
+/Tools/target/classes/io/github/jwdeveloper/tiktok/protocol/ProtocolGenerator.class
+/Tools-ReadmeGenerator/target/classes/io/github/jwdeveloper/tiktok/ReadmeGenerator.class
+/TestApplication/target/classes/io/github/jwdeveloper/tiktok/SimpleExample.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/db/SqlConsts.class
+/Tools-ReadmeGenerator/target/classes/template.md
+/Tools/target/classes/io/github/jwdeveloper/tiktok/utils/TemplateUtility.class
+/TestApplication/target/TestApplication-0.0.18-Release.jar
+/TestApplication/target/TestApplication-0.0.18-Release-all.jar
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/db/TikTokDatabase.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/tables/TikTokErrorModel$TikTokErrorModelBuilder.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/tables/TikTokErrorModel.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/db/TikTokErrorModelDAO.class
+/target/TikTokLiveJava-0.0.18-Release-all.pom
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/tables/TikTokMessageModel$TikTokMessageModelBuilder.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/tables/TikTokMessageModel.class
+/Tools-EventsCollector/target/classes/io/github/jwdeveloper/tiktok/tools/collector/db/TikTokMessageModelDAO.class
+/Tools/target/Tools-0.0.18-Release.jar
+/Tools/target/Tools-0.0.18-Release-all.jar
+/Tools-EventsCollector/target/Tools-EventsCollector-0.0.18-Release.jar
+/Tools-EventsCollector/target/Tools-EventsCollector-0.0.18-Release-all.jar
+/Tools-ReadmeGenerator/target/Tools-ReadmeGenerator-0.0.18-Release.jar
+/Tools-ReadmeGenerator/target/Tools-ReadmeGenerator-0.0.18-Release-all.jar
+/.idea/vcs.xml

API/pom.xml

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

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

@@ -3,67 +3,81 @@ package io.github.jwdeveloper.tiktok;
 import lombok.Data;
 
 import java.time.Duration;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 
 @Data
 public class ClientSettings {
-    /// <summary>
-    /// Timeout for Connections
-    /// </summary>
+    /**
+     * Timeout for Connections
+     */
     private Duration timeout;
 
     // public RotatingProxy Proxy;
-    /// <summary>
-    /// ISO-Language for Client
-    /// </summary>
+    /**
+     * ISO-Language for Client
+     */
 
     private String clientLanguage;
 
-    /// <summary>
-    /// Whether to Retry if Connection Fails
-    /// </summary>
+    /**
+     * Whether to Retry if Connection Fails
+     */
     private boolean retryOnConnectionFailure;
 
-    /// <summary>
-    /// Wait to connect again for selected amount of time
-    /// </summary>
+
+    /**
+     * Wait to connect again for selected amount of time
+     */
     private Duration retryConnectionTimeout;
 
-    /// <summary>
-    /// Whether to handle Messages received from Room when Connecting
-    /// </summary>
+    /**
+     * Whether to handle Messages received from Room when Connecting
+     */
     private boolean handleExistingMessagesOnConnect;
-    /// <summary>
-    /// Whether to download List of Gifts for Room when Connecting
-    /// </summary>
+    /**
+     * Whether to download List of Gifts for Room when Connecting
+     */
     private boolean downloadGiftInfo;
 
-    /// <summary>
-    /// Whether to print Logs to Console
-    /// </summary>
+    /**
+     * Whether to print Logs to Console
+     */
 
     private boolean printToConsole;
-    /// <summary>
-    /// LoggingLevel for Logs
-    /// </summary>
+    /**
+     * LoggingLevel for Logs
+     */
     private Level logLevel;
 
-    /// <summary>
-    /// Whether to print Base64-Data for Messages to Console
-    /// </summary>
+    /**
+     * Whether to print Base64-Data for Messages to Console
+     */
     private boolean printMessageData;
 
-    /// <summary>
-    /// Tiktok user name
-    /// </summary>
+    /**
+     *  Optional: Use it if you need to change tiktok live hostname in builder
+     */
     private String hostName;
 
 
-    /// <summary>
-    /// Parameters used in requests to tiktok api
-    /// </summary>
+    /**
+     * 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/Constants.java

@@ -8,33 +8,32 @@ import java.util.logging.Level;
 
 public class Constants {
 
-    /// <summary>
-    /// Web-URL for TikTok
-    /// </summary>
+    /**
+     * Web-URL for TikTok
+     */
     public static final String TIKTOK_URL_WEB = "https://www.tiktok.com/";
-    /// <summary>
-    /// WebCast-BaseURL for TikTok
-    /// </summary>
+    /**
+     * WebCast-BaseURL for TikTok
+     */
     public static final String TIKTOK_URL_WEBCAST = "https://webcast.tiktok.com/webcast/";
-    /// <summary>
-    /// Signing API by Isaac Kogan
-    /// https://github-wiki-see.page/m/isaackogan/TikTokLive/wiki/All-About-Signatures
-    /// </summary>
+    /**
+     * 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";
 
-    /// <summary>
-    /// Default TimeOut for Connections
-    /// </summary>
+    /**
+     * Default TimeOut for Connections
+     */
     public static final int DEFAULT_TIMEOUT = 20;
-    /// <summary>
-    /// Default Polling-Time for Socket-Connection
-    /// </summary>
+    /**
+     * Default Polling-Time for Socket-Connection
+     */
     public static final int DEFAULT_POLLTIME = 1;
 
-    /// <summary>
-    /// Default Settings for Client
-    /// </summary>
-
+    /**
+     * Default Settings for Client
+     */
 
 
     public static ClientSettings DefaultClientSettings() {
@@ -53,15 +52,13 @@ public class Constants {
     }
 
 
+    /**
+     * Default Parameters for HTTP-Request
+     */
 
 
-    /// <summary>
-    /// Default Parameters for HTTP-Request
-    /// </summary>
-
-
-    public static Map<String,Object> DefaultClientParams() {
-        var clientParams = new TreeMap<String,Object>();
+    public static Map<String, Object> DefaultClientParams() {
+        var clientParams = new TreeMap<String, Object>();
         clientParams.put("aid", 1988);
         clientParams.put("app_language", "en-US");
         clientParams.put("app_name", "tiktok_web");
@@ -100,11 +97,11 @@ public class Constants {
     }
 
 
-    /// <summary>
-    /// Default Headers for HTTP-Request
-    /// </summary>
-    public static Map<String,String> DefaultRequestHeaders() {
-        var headers = new HashMap<String,String>();
+    /**
+     * Default Headers for HTTP-Request
+     */
+    public static Map<String, String> DefaultRequestHeaders() {
+        var headers = new HashMap<String, String>();
 
         headers.put("Connection", "keep-alive");
         headers.put("Cache-Control", "max-age=0");

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

@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EventMeta
+{
+     EventType eventType();
+}

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

@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
+public enum EventType
+{
+   Control, Message, Custom
+}

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

@@ -1,4 +0,0 @@
-package io.github.jwdeveloper.tiktok.annotations;
-
-public @interface Nullable {
-}

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

@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TikTokEventHandler
+{
+
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java

@@ -3,39 +3,11 @@ package io.github.jwdeveloper.tiktok.events;
 import io.github.jwdeveloper.tiktok.messages.*;
 import lombok.Getter;
 
+/*
+  Base class for all events
+ */
 @Getter
-public class TikTokEvent {
-    private long messageId;
-    private long roomId;
-    private long timeStamp;
+public abstract class TikTokEvent
+{
 
-    public TikTokEvent(MessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(GiftMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(MemberMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(SocialMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(LikeMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(long messageId, long roomId, long timeStamp) {
-        this.messageId = messageId;
-        this.roomId = roomId;
-        this.timeStamp = timeStamp;
-    }
-
-    public TikTokEvent() {
-
-    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java

@@ -1,8 +1,6 @@
 package io.github.jwdeveloper.tiktok.events;
 
 import io.github.jwdeveloper.tiktok.events.messages.*;
-import java.util.function.Consumer;
-
 
 
 public interface TikTokEventBuilder<T> {
@@ -68,7 +66,7 @@ public interface TikTokEventBuilder<T> {
 
     T onError(TikTokEventConsumer<TikTokErrorEvent> event);
 
-    T onUnhandled(TikTokEventConsumer<TikTokUnhandledEvent> event);
+    T onUnhandled(TikTokEventConsumer<TikTokUnhandledWebsocketMessageEvent> event);
 
     T onJoin(TikTokEventConsumer<TikTokJoinEvent> event);
 
@@ -89,6 +87,11 @@ public interface TikTokEventBuilder<T> {
     T onUnhandledControl(TikTokEventConsumer<TikTokUnhandledControlEvent> event);
 
     T onEvent(TikTokEventConsumer<TikTokEvent> event);
+
+    T onWebsocketMessage(TikTokEventConsumer<TikTokWebsocketMessageEvent> event);
+
+    T onReconnecting(TikTokEventConsumer<TikTokReconnectingEvent> event);
+
 }
 
 

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

@@ -0,0 +1,48 @@
+package io.github.jwdeveloper.tiktok.events.base;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.messages.*;
+import lombok.Getter;
+
+@Getter
+public class TikTokHeaderEvent extends TikTokEvent {
+    private final long messageId;
+    private final long roomId;
+    private final long timeStamp;
+
+    public TikTokHeaderEvent(Common header) {
+        this(header.getMsgId(), header.getRoomId(), header.getCreateTime());
+    }
+
+    public TikTokHeaderEvent(MessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(GiftMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(MemberMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(SocialMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(LikeMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(long messageId, long roomId, long timeStamp) {
+        this.messageId = messageId;
+        this.roomId = roomId;
+        this.timeStamp = timeStamp;
+    }
+
+    public TikTokHeaderEvent() {
+        messageId = 0;
+        roomId = 0;
+        timeStamp = 0;
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokLiveClientEvent.java

@@ -0,0 +1,7 @@
+package io.github.jwdeveloper.tiktok.events.base;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+
+
+public class TikTokLiveClientEvent extends TikTokEvent {
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokUnhandledEvent.java

@@ -0,0 +1,12 @@
+package io.github.jwdeveloper.tiktok.events.base;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class TikTokUnhandledEvent<T> extends TikTokEvent
+{
+    private final T data;
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java

@@ -1,29 +1,28 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.BarrageData;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastBarrageMessage;
-import lombok.Getter;
-
-@Getter
-public class TikTokBarrageMessageEvent extends TikTokEvent {
-    private final Picture picture;
-
-    private final Picture picture2;
-
-    private final Picture picture3;
-
-    private final User user;
-    private final BarrageData barrageData;
+import lombok.Value;
 
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokBarrageMessageEvent extends TikTokHeaderEvent {
+    Picture picture;
+    Picture picture2;
+    Picture picture3;
+    User user;
+    BarrageData barrageData;
     public TikTokBarrageMessageEvent(WebcastBarrageMessage msg) {
         super(msg.getHeader());
 
-        picture = new Picture(msg.getPicture());
-        picture2 = new Picture(msg.getPicture2());
-        picture3 = new Picture(msg.getPicture3());
+        picture = new Picture(msg.getImage());
+        picture2 = new Picture(msg.getImage2());
+        picture3 = new Picture(msg.getImage3());
         user = new User(msg.getUserData().getUser());
         barrageData = new BarrageData(msg.getMessage().getEventType(),
                 msg.getMessage().getLabel(),

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

@@ -1,16 +1,19 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastCaptionMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokCaptionEvent extends TikTokEvent {
-    private final Long captionTimeStamp;
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokCaptionEvent extends TikTokHeaderEvent {
+    Long captionTimeStamp;
 
-    private final String iSOLanguage;
+    String iSOLanguage;
 
-    private final String text;
+    String text;
 
     public TikTokCaptionEvent(WebcastCaptionMessage msg) {
         super(msg.getHeader());

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

@@ -1,30 +1,29 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastChatMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastRoomPinMessage;
-import lombok.Getter;
+import lombok.Value;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Getter
-public class TikTokCommentEvent extends TikTokEvent
-{
-    @Nullable
-    private User user;
-    private final String text;
-    private final String language;
-    private final List<User> mentionedUsers;
-    private final List<Picture> pictures;
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokCommentEvent extends TikTokHeaderEvent {
+    User user;
+    String text;
+    String language;
+    List<User> mentionedUsers;
+    List<Picture> pictures;
 
     public TikTokCommentEvent(WebcastRoomPinMessage.RoomPinMessageData data) {
         super(data.getDetails().getRoomId(), data.getDetails().getMessageId(), data.getDetails().getServerTime());
-        if (data.hasSender())
-            user = new User(data.getSender());
+        user = User.MapOrEmpty(data.getSender());
         text = data.getComment();
         language = data.getLanguage();
         mentionedUsers = new ArrayList<>();
@@ -32,12 +31,11 @@ public class TikTokCommentEvent extends TikTokEvent
     }
 
     public TikTokCommentEvent(WebcastChatMessage msg) {
-        super(msg.getHeader());
-        if (msg.hasSender())
-            user = new User(msg.getSender());
-        text = msg.getComment();
-        language = msg.getLanguage();
-        mentionedUsers = msg.getMentionedUsersList().stream().map(User::new).toList();
-        pictures = msg.getImagesList().stream().map(e -> new Picture(e.getPicture())).toList();
+        super(msg.getCommon());
+        user = User.MapOrEmpty(msg.getUser());
+        text = msg.getContent();
+        language = msg.getContentLanguage();
+        mentionedUsers = List.of(User.MapOrEmpty(msg.getAtUser()));
+        pictures = msg.getEmotesListList().stream().map(e -> new Picture(e.getEmote().getImage())).toList();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java

@@ -1,8 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
-
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-
-public class TikTokConnectedEvent extends TikTokEvent
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent;
+@EventMeta(eventType = EventType.Control)
+public class TikTokConnectedEvent extends TikTokLiveClientEvent
 {
 
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectMessageEvent.java

@@ -1,18 +1,22 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastMsgDetectMessage;
 import lombok.Getter;
 
 import java.util.List;
 
 @Getter
-public class TikTokDetectMessageEvent extends TikTokEvent {
-  private final String language;
+@EventMeta(eventType = EventType.Message)
+public class TikTokDetectMessageEvent extends TikTokHeaderEvent {
+   String language;
 
-  private final List<Number> data;
+   List<Number> data;
 
-  private final List<Number> timings;
+   List<Number> timings;
 
   public TikTokDetectMessageEvent(WebcastMsgDetectMessage msg) {
     super(msg.getHeader());;

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

@@ -1,6 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent;
 
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-
-public class TikTokDisconnectedEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Control)
+public class TikTokDisconnectedEvent extends TikTokLiveClientEvent {
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java

@@ -1,25 +1,23 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastEmoteChatMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokEmoteEvent extends TikTokEvent
-{
-    @Nullable
-    private User user;
-    private final String emoteId;
-    private final Picture picture;
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokEmoteEvent extends TikTokHeaderEvent {
+    User user;
+    String emoteId;
+    Picture picture;
 
     public TikTokEmoteEvent(WebcastEmoteChatMessage msg) {
         super(msg.getHeader());
-        if (msg.hasSender()) {
-            user = new User(msg.getSender());
-        }
+        user = User.MapOrEmpty(msg.getSender());
         emoteId = msg.getDetails().getId();
         picture = new Picture(msg.getDetails().getImage().getUrl());
     }

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

@@ -1,14 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastEnvelopeMessage;
 import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokEnvelopeEvent extends TikTokEvent {
-  private final User user;
-
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokEnvelopeEvent extends TikTokHeaderEvent {
+  User user;
   public TikTokEnvelopeEvent(WebcastEnvelopeMessage msg) {
     super(msg.getHeader());
     user = new User(msg.getUser().getId(), msg.getUser().getUsername());

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public class TikTokErrorEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Control)
+public class TikTokErrorEvent extends TikTokLiveClientEvent
 {
     private final Throwable exception;
 }

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

@@ -1,25 +1,22 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokFollowEvent extends TikTokEvent
+@Value
+@EventMeta(eventType = EventType.Custom)
+public class TikTokFollowEvent extends TikTokHeaderEvent
 {
-  @Nullable
-  private User newFollower;
-  private final Long totalFollowers;
+   User newFollower;
+   Long totalFollowers;
 
   public TikTokFollowEvent(WebcastSocialMessage msg) {
     super(msg.getHeader());
-    if(msg.hasSender())
-    {
-      newFollower = new User(msg.getSender());
-    }
+    newFollower = User.MapOrEmpty(msg.getSender());
     totalFollowers = msg.getTotalFollowers();
-
   }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftBroadcastEvent.java

@@ -1,27 +1,32 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.messages.WebcastGiftBroadcastMessage;
 import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokGiftBroadcastEvent extends TikTokEvent
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokGiftBroadcastEvent extends TikTokHeaderEvent
 {
-  private final Picture picture;
+    Picture picture;
 
-  private final String shortURL;
+    String shortURL;
 
-  private final String notifyEventType;
+    String notifyEventType;
 
-  private final String notifyLabel;
+    String notifyLabel;
 
-  private final String notifyType;
+    String notifyType;
 
   public TikTokGiftBroadcastEvent(WebcastGiftBroadcastMessage msg)
   {
     super(msg.getHeader());
-    picture = new Picture(msg.getPicture());
+    picture = new Picture(msg.getImage());
     var data = msg.getData();
     shortURL = data.getUri();
     notifyEventType = data.getRoomNotifyMessage().getData().getType();

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftMessageEvent.java

@@ -1,41 +1,33 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Gift;
-import io.github.jwdeveloper.tiktok.events.objects.TikTokGift;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastGiftMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokGiftMessageEvent extends TikTokEvent {
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokGiftMessageEvent extends TikTokHeaderEvent {
 
-    private final Gift gift;
-
-    @Nullable
-    private User sender;
-
-    private final String purchaseId;
-
-    private final String receipt;
-
-    private final Integer amount;
-
-    private final Boolean streakFinished;
-
-    private final Integer streakIndex;
+      Gift gift;
+      User sender;
+      String purchaseId;
+      String receipt;
+      Long comboCount;
+      Boolean streakFinished;
+      Long streakIndex;
 
     public TikTokGiftMessageEvent(WebcastGiftMessage msg) {
-        super(msg.getHeader());
-        gift = new Gift(msg.getGiftDetails());
-        if (msg.hasSender()) {
-            sender = new User(msg.getSender());
-        }
+        super(msg.getCommon());
+        gift = new Gift(msg.getGift());
+        sender = User.MapOrEmpty(msg.getUser());
         purchaseId = msg.getLogId();
-        receipt = msg.getReceiptJson();
-        amount = msg.getAmount();
-        streakFinished = msg.getRepeatEnd();
+        receipt = msg.getMonitorExtra();
+        comboCount = msg.getComboCount();
+        streakFinished = msg.getRepeatEnd() > 0; //todo check values
         streakIndex = msg.getRepeatCount();
     }
 }

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

@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 
 import io.github.jwdeveloper.tiktok.events.objects.User;
@@ -10,7 +13,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokGoalUpdateEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Message)
+public class TikTokGoalUpdateEvent extends TikTokHeaderEvent
 {
   private final Long goalId;
   private final Picture picture;
@@ -20,10 +24,10 @@ public class TikTokGoalUpdateEvent extends TikTokEvent
 
   public TikTokGoalUpdateEvent(WebcastGoalUpdateMessage msg) {
     super(msg.getHeader());
-    picture = new Picture(msg.getPicture());
+    picture = new Picture(msg.getImage());
     goalId = msg.getId();
     eventType = msg.getData().getType();
     label = msg.getUpdateData().getLabel();
-    users = msg.getUpdateData().getUsersList().stream().map(u ->new User(u.getId(),u.getNickname(),new Picture(u.getProfilePicture()))).toList();
+    users = msg.getUpdateData().getUsersList().stream().map(u ->new User(u.getId(),u.getNickname(),new Picture(u.getProfileImage()))).toList();
   }
 }

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

@@ -1,11 +1,15 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastImDeleteMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokIMDeleteEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokIMDeleteEvent extends TikTokHeaderEvent {
     private final byte[] data;
 
     public TikTokIMDeleteEvent(WebcastImDeleteMessage msg) {

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

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastInRoomBannerMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokInRoomBannerEvent extends TikTokEvent {
-  private String jSON;
+@EventMeta(eventType = EventType.Message)
+public class TikTokInRoomBannerEvent extends TikTokHeaderEvent {
+  private final String jSON;
 
   public TikTokInRoomBannerEvent(WebcastInRoomBannerMessage msg) {
     super(msg.getHeader());;

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

@@ -1,17 +1,17 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokJoinEvent extends TikTokEvent {
-    @Nullable
+@EventMeta(eventType = EventType.Custom)
+public class TikTokJoinEvent extends TikTokHeaderEvent {
     private User user;
-
     private final Long totalViewers;
 
     public TikTokJoinEvent(WebcastSocialMessage msg) {

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

@@ -1,16 +1,17 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokLikeEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Custom)
+public class TikTokLikeEvent extends TikTokHeaderEvent
 {
-    @Nullable
     private User sender;
 
     private final Integer count;

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerMessageEvent.java

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkLayerMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-public class TikTokLinkLayerMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkLayerMessageEvent extends TikTokHeaderEvent {
     private final Long linkId;
     private final LinkData link1;
     private final LinkData link2;

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMessageEvent.java

@@ -1,7 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMessage;
 import lombok.Getter;
@@ -9,10 +10,10 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokLinkMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMessageEvent extends TikTokHeaderEvent {
     private final String token;
 
-    @Nullable
     private User user;
 
     private final List<User> otherUsers;

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

@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.LinkMicArmy;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicArmies;
@@ -9,7 +12,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokLinkMicArmiesEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicArmiesEvent extends TikTokHeaderEvent {
     private final Long battleId;
 
     private final Integer battleStatus;
@@ -22,7 +26,7 @@ public class TikTokLinkMicArmiesEvent extends TikTokEvent {
         super(msg.getHeader());
         battleId = msg.getId();
         armies = msg.getBattleItemsList().stream().map(LinkMicArmy::new).toList();
-        picture = new Picture(msg.getPicture());
+        picture = new Picture(msg.getImage());
         battleStatus = msg.getBattleStatus();
     }
 }

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

@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.LinkMicBattleTeam;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicBattle;
 import lombok.Getter;
@@ -8,7 +11,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokLinkMicBattleEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent {
   private final Long battleId;
   private final List<LinkMicBattleTeam> team1;
   private final List<LinkMicBattleTeam> team2;

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java

@@ -1,11 +1,15 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicFanTicketMethod;
 import lombok.Getter;
 
 @Getter
-public class TikTokLinkMicFanTicketEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicFanTicketEvent extends TikTokHeaderEvent {
     private final Long id;
     private final Integer data1;
     private final Integer data2;

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

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.LinkMicMethod;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicMethod;
 import lombok.Getter;
 
 @Getter
-public class TikTokLinkMicMethodEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicMethodEvent extends TikTokHeaderEvent {
   private final String jSON;
 
   public TikTokLinkMicMethodEvent(WebcastLinkMicMethod msg) {

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java

@@ -1,6 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
-
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 
+@EventMeta(eventType = EventType.Custom)
 public class TikTokLiveEndedEvent extends TikTokEvent {
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java

@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 
+@EventMeta(eventType = EventType.Custom)
 public class TikTokLivePausedEvent extends TikTokEvent {
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokPollMessageEvent.java

@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.PollOption;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastPollMessage;
@@ -9,7 +12,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokPollMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokPollMessageEvent extends TikTokHeaderEvent {
     private final Long id;
 
     private final PollOption option1;

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

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastQuestionNewMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokQuestionEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokQuestionEvent extends TikTokHeaderEvent {
     private final Long questionId;
 
     private final String text;

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

@@ -1,14 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastRankTextMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRankTextEvent extends TikTokEvent {
-  private String eventType;
+@EventMeta(eventType = EventType.Message)
+public class TikTokRankTextEvent extends TikTokHeaderEvent {
+  private final String eventType;
 
-  private String label;
+  private final String label;
 
 
   public TikTokRankTextEvent(WebcastRankTextMessage msg) {

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

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastHourlyRankMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastRankUpdateMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRankUpdateEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokRankUpdateEvent extends TikTokHeaderEvent {
   private final String eventType;
 
   private final String label;

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokReconnectingEvent.java

@@ -0,0 +1,13 @@
+package io.github.jwdeveloper.tiktok.events.messages;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent;
+import lombok.Getter;
+
+@Getter
+@EventMeta(eventType = EventType.Control)
+public class TikTokReconnectingEvent extends TikTokLiveClientEvent
+{
+
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomMessageEvent.java

@@ -1,7 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.RoomMessage;
 import io.github.jwdeveloper.tiktok.messages.SystemMessage;
@@ -10,10 +11,9 @@ import io.github.jwdeveloper.tiktok.messages.WebcastRoomMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRoomMessageEvent extends TikTokEvent {
-    @Nullable
+@EventMeta(eventType = EventType.Message)
+public class TikTokRoomMessageEvent extends TikTokHeaderEvent {
     private User host;
-    @Nullable
     private String hostLanguage;
     private final String message;
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomPinMessageEvent.java

@@ -1,11 +1,15 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastRoomPinMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRoomPinMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokRoomPinMessageEvent extends TikTokHeaderEvent {
   private final Long pinTimeStamp;
   private final TikTokCommentEvent comment;
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomViewerDataEvent.java

@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.TopViewer;
 import io.github.jwdeveloper.tiktok.messages.WebcastRoomUserSeqMessage;
 import lombok.Getter;
@@ -8,7 +11,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokRoomViewerDataEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokRoomViewerDataEvent extends TikTokHeaderEvent {
   private final Integer viewerCount;
   private final List<TopViewer> topViewers;
 

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

@@ -1,31 +1,28 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokShareEvent extends TikTokEvent {
-  private User user;
-
-  private Integer amount;
+@EventMeta(eventType = EventType.Custom)
+public class TikTokShareEvent extends TikTokHeaderEvent {
+  private final User user;
+  private final Integer amount;
 
   public TikTokShareEvent(WebcastSocialMessage msg, Integer amount) {
     super(msg.getHeader());;
-    if(msg.hasSender())
-    {
-      user = new User(msg.getSender());
-    }
+    user = User.MapOrEmpty(msg.getSender());
     this.amount = amount;
   }
 
   public TikTokShareEvent(WebcastSocialMessage msg) {
     super(msg.getHeader());
-    if(msg.hasSender())
-    {
-      user = new User(msg.getSender());
-    }
+    user = User.MapOrEmpty(msg.getSender());
     amount = 1;
   }
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopMessageEvent.java

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.messages.WebcastOecLiveShoppingMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokShopMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokShopMessageEvent extends TikTokHeaderEvent {
   private final String title;
 
   private final String price;

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastSubNotifyMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokSubNotifyEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokSubNotifyEvent extends TikTokHeaderEvent {
     private User user;
 
     public TikTokSubNotifyEvent(WebcastSubNotifyMessage msg) {

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

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokSubscribeEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Custom)
+public class TikTokSubscribeEvent extends TikTokHeaderEvent {
   private User newSubscriber;
 
   public TikTokSubscribeEvent(WebcastMemberMessage msg) {

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java

@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastUnauthorizedMemberMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-public class TikTokUnauthorizedMemberEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokUnauthorizedMemberEvent extends TikTokHeaderEvent {
     private final String data;
 
     private final UnauthorizedMemberData event;

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java

@@ -1,13 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastControlMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
-public class TikTokUnhandledControlEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Custom)
+public class TikTokUnhandledControlEvent extends TikTokUnhandledEvent<WebcastControlMessage> {
 
-    private final WebcastControlMessage message;
+    public TikTokUnhandledControlEvent(WebcastControlMessage data) {
+        super(data);
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledEvent.java

@@ -1,14 +0,0 @@
-package io.github.jwdeveloper.tiktok.events.messages;
-
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-
-@Getter
-@AllArgsConstructor
-public class TikTokUnhandledEvent extends TikTokEvent
-{
-    private final WebcastResponse.Message message;
-}

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

@@ -1,13 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
-public class TikTokUnhandledMemberEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Message)
+public class TikTokUnhandledMemberEvent extends TikTokUnhandledEvent<WebcastMemberMessage>
 {
-    private final WebcastMemberMessage message;
+    public TikTokUnhandledMemberEvent(WebcastMemberMessage data) {
+        super(data);
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java

@@ -1,13 +1,19 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
+import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
-public class TikTokUnhandledSocialEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Custom)
+public class TikTokUnhandledSocialEvent extends TikTokUnhandledEvent<WebcastSocialMessage>
 {
-    private final WebcastSocialMessage message;
+    public TikTokUnhandledSocialEvent(WebcastSocialMessage data) {
+        super(data);
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledWebsocketMessageEvent.java

@@ -0,0 +1,19 @@
+package io.github.jwdeveloper.tiktok.events.messages;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
+import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokUnhandledWebsocketMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>
+{
+    public TikTokUnhandledWebsocketMessageEvent(WebcastResponse.Message data) {
+        super(data);
+    }
+}

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

@@ -0,0 +1,23 @@
+package io.github.jwdeveloper.tiktok.events.messages;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+
+/**
+ * Happens when TikTok websocket receive message from server
+ */
+@Getter
+@AllArgsConstructor
+@EventMeta(eventType = EventType.Custom)
+public class TikTokWebsocketMessageEvent extends TikTokEvent
+{
+    private TikTokEvent event;
+
+    private WebcastResponse.Message message;
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Badge.java

@@ -1,41 +1,77 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import io.github.jwdeveloper.tiktok.messages.BadgeStruct;
+import lombok.Value;
 
+import java.util.ArrayList;
 import java.util.List;
 
-@Getter
+@Value
 public class Badge {
-    private  ComboBadge comboBadges;
-    private final List<TextBadge> textBadges;
-    private final List<ImageBadge> imageBadges;
+    ComboBadge comboBadges;
+    List<TextBadge> textBadges;
+    List<ImageBadge> imageBadges;
 
-    public Badge(io.github.jwdeveloper.tiktok.messages.Badge badge) {
-        textBadges = badge.getTextBadgesList().stream().map(b -> new TextBadge(b.getType(), b.getName())).toList();
-        imageBadges = badge.getImageBadgesList().stream().map(b -> new ImageBadge(b.getDisplayType(), new Picture(b.getImage()))).toList();
-        comboBadges = new ComboBadge(new Picture("badge.getComplexBadge().getImageUrl()"), badge.getComplexBadge().getData());
+    public Badge(ComboBadge comboBadges, List<TextBadge> textBadges, List<ImageBadge> imageBadges) {
+        this.comboBadges = comboBadges;
+        this.textBadges = textBadges;
+        this.imageBadges = imageBadges;
     }
 
-
-    @AllArgsConstructor
-    @Getter
-    public class TextBadge {
-        private final String type;
-        private final String name;
+    public Badge(io.github.jwdeveloper.tiktok.messages.BadgeStruct badge)
+    {
+        comboBadges = ComboBadge.map(badge.getCombine());
+        textBadges = TextBadge.mapAll(badge.getTextList());
+        imageBadges = ImageBadge.mapAll(badge.getImageList());
     }
 
-    @AllArgsConstructor
-    @Getter
-    public class ImageBadge {
-        private final Integer displayType;
-        private final Picture image;
+    @Value
+    public static class TextBadge {
+        EnumValue type;
+        String name;
+
+        public static TextBadge map(BadgeStruct.TextBadge input) {
+            return new TextBadge(EnumValue.Map(input.getDisplayType()),input.getKey());
+        }
+        public static List<TextBadge> mapAll(List<BadgeStruct.TextBadge> list) {
+            return list.stream().map(TextBadge::map).toList();
+        }
     }
 
-    @AllArgsConstructor
-    @Getter
-    public class ComboBadge {
-        private final Picture image;
-        private final String data;
+    @Value
+    public static class ImageBadge {
+        EnumValue displayType;
+        Picture image;
+
+        public static ImageBadge map(BadgeStruct.ImageBadge input) {
+            return new ImageBadge(EnumValue.Map(input.getDisplayType()), Picture.Map(input.getImage()));
+        }
+        public static List<ImageBadge> mapAll(List<BadgeStruct.ImageBadge> list) {
+            return list.stream().map(ImageBadge::map).toList();
+        }
+    }
+
+    @Value
+    public static class ComboBadge {
+        Picture image;
+        String data;
+
+        public static ComboBadge map(BadgeStruct.CombineBadge input) {
+            return new ComboBadge(Picture.Map(input.getIcon()),input.getStr());
+        }
+        public static List<ComboBadge> mapAll(List<BadgeStruct.CombineBadge> list) {
+            return list.stream().map(ComboBadge::map).toList();
+        }
+    }
+
+    public static Badge Empty() {
+        var comboBadge = new ComboBadge(Picture.Empty(), "");
+        var textBadges = new ArrayList<TextBadge>();
+        var imageBadges = new ArrayList<ImageBadge>();
+        return new Badge(comboBadge, textBadges, imageBadges);
+    }
+
+    public static List<Badge> EmptyList() {
+        return new ArrayList<Badge>();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/BarrageData.java

@@ -2,14 +2,15 @@ package io.github.jwdeveloper.tiktok.events.objects;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
+@Value
 public class BarrageData {
-  private final String eventType;
-  private final String label;
-  private final List<BarrageUser> users;
+  String eventType;
+  String label;
+  List<BarrageUser> users;
 
   public BarrageData(String eventType, String label, List<BarrageUser> users)
   {
@@ -18,12 +19,11 @@ public class BarrageData {
     this.users = users;
   }
 
-  @Getter
-  @AllArgsConstructor
-  public static final class BarrageUser
+  @Value
+  public static class BarrageUser
   {
-      private final User user;
+      User user;
 
-      private final String data;
+      String data;
   }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/EnumValue.java

@@ -0,0 +1,15 @@
+package io.github.jwdeveloper.tiktok.events.objects;
+
+import lombok.Value;
+
+@Value
+public class EnumValue
+{
+    public int value;
+    public String name;
+
+    public static EnumValue Map(Enum<?> _enum)
+    {
+        return new EnumValue(_enum.ordinal() ,_enum.name());
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java

@@ -1,27 +1,22 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
+@Value
 public class Gift {
-    private final Long id;
+    Long id;
+    String name;
+    String description;
+    Integer diamondCost;
+    Integer type;
+    Picture picture;
 
-    private final String name;
-
-    private final String description;
-
-    private final Integer diamondCost;
-
-    private final Integer type;
-
-    private final Picture picture;
-
-    public Gift(io.github.jwdeveloper.tiktok.messages.Gift gift) {
+    public Gift(io.github.jwdeveloper.tiktok.messages.GiftStruct gift) {
         id = gift.getId();
         name = gift.getName();
-        description = gift.getDescription();
-        diamondCost = gift.getCoinCount();
-        type = gift.getGiftType();
+        description = gift.getDescribe();
+        diamondCost = gift.getDiamondCount();
+        type = gift.getType();
         picture = new Picture(gift.getImage());
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java

@@ -1,31 +1,28 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
 import io.github.jwdeveloper.tiktok.messages.LinkMicArmiesItems;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
+@Value
 public class LinkMicArmy {
-    private final Long armyId;
-    private final List<Army> armies;
+    Long armyId;
+    List<Army> armies;
 
     public LinkMicArmy(LinkMicArmiesItems army) {
         armyId = army.getHostUserId();
         armies = army.getBattleGroupsList()
                 .stream()
-                .map(x -> new Army(x.getUsersList()
-                        .stream()
-                        .map(User::new).toList(), x.getPoints()))
+                .map(x -> new Army(x.getUsersList().stream().map(User::MapOrEmpty).toList(), x.getPoints()))
+
+
                 .toList();
     }
 
-
-    @Getter
-    @AllArgsConstructor
-    public final class Army {
-        private final List<User> Users;
-        private final Integer Points;
+    @Value
+    public static class Army {
+        List<User> Users;
+        Integer Points;
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java

@@ -3,13 +3,14 @@ package io.github.jwdeveloper.tiktok.events.objects;
 
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicBattle;
 import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
+@Value
 public class LinkMicBattleTeam {
-    private final Long teamId;
-    private final List<User> users;
+    Long teamId;
+    List<User> users;
 
     public LinkMicBattleTeam(WebcastLinkMicBattle.LinkMicBattleTeam team) {
         this.teamId = team.getId();

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java

@@ -1,19 +1,19 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
 import lombok.Getter;
+import lombok.Value;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 @Getter
 public class Picture {
 
-  public final List<String> urls;
-
-  public Picture(io.github.jwdeveloper.tiktok.messages.Picture profilePicture) {
-    this.urls = profilePicture.getUrlsList();
+  List<String> urls;
+  public Picture(io.github.jwdeveloper.tiktok.messages.Image profilePicture) {
+    this.urls = profilePicture.getUrlListList();
   }
-
   public Picture(List<String> urls) {
     this.urls = urls;
   }
@@ -22,4 +22,20 @@ public class Picture {
   {
     this.urls = Arrays.stream(urls).toList();
   }
+
+
+  public static Picture Map(io.github.jwdeveloper.tiktok.messages.Image profilePicture)
+  {
+    return new Picture(profilePicture.getUrlListList());
+  }
+
+  public static Picture Empty()
+  {
+    return new Picture();
+  }
+
+  public static List<Picture> EmptyList()
+  {
+    return new ArrayList<Picture>();
+  }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java

@@ -2,18 +2,17 @@ package io.github.jwdeveloper.tiktok.events.objects;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
-@AllArgsConstructor
+@Value
 public class PollOption {
 
     private final User user;
     private final List<Option> options;
 
-    @Getter
-    @AllArgsConstructor
+    @Value
     public static final class Option {
         private final String label;
 

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TikTokGift.java

@@ -7,19 +7,16 @@ import lombok.Setter;
 @Getter
 public class TikTokGift {
     private final Gift gift;
-    private User sender;
+    private final User sender;
     @Setter
-    private int amount;
-
+    private long amount;
     @Setter
-    private  boolean streakFinished;
+    private boolean streakFinished;
 
     public TikTokGift(WebcastGiftMessage message) {
-        gift = new Gift(message.getGiftDetails());
-        if (message.hasSender()) {
-            sender = new User(message.getSender());
-        }
-        amount = message.getAmount();
-        streakFinished = message.getRepeatEnd();
+        gift = new Gift(message.getGift());
+        sender = User.MapOrEmpty(message.getUser());
+        amount = message.getComboCount();
+        streakFinished = message.getRepeatEnd() > 0;
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TopViewer.java

@@ -1,22 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.objects;
+import lombok.Value;
 
-import lombok.Getter;
-
-@Getter
+@Value
 public class TopViewer {
-  private Integer rank;
+   Integer rank;
 
-  private User user;
+   User user;
 
-  private Integer coinsGiven;
+   Integer coinsGiven;
 
   public TopViewer(io.github.jwdeveloper.tiktok.messages.TopViewer viewer)
   {
     rank = viewer.getRank();
-    if(viewer.hasUser())
-    {
-      user = new User(viewer.getUser());
-    }
+    user = User.MapOrEmpty(viewer.getUser());
     coinsGiven = viewer.getCoinsGiven();
   }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/User.java

@@ -20,14 +20,14 @@ public class User {
 
     private Picture picture1080;
 
-    private Integer following;
+    private long following;
 
-    private Integer followers;
+    private long followers;
 
-    private Integer followsHost;
-    public List<Picture> additionalPictures;
+    private long followsHost;
+    private List<Picture> additionalPictures;
 
-    public List<Badge> badges;
+    private List<Badge> badges;
 
     public User(Long userId,
                 String uniqueId,
@@ -71,17 +71,39 @@ public class User {
 
     public User(io.github.jwdeveloper.tiktok.messages.User user) {
         assert user != null;
-        userId = user.getUserId();
-        uniqueId = user.getUniqueId();
+        userId = user.getId();
+        uniqueId = user.getSpecialId();
         nickName = user.getNickname();
-        description = user.getDescription();
-        profilePicture = new Picture(user.getProfilePicture());
-        picture720 = new Picture(user.getPicture720());
-        picture1080 = new Picture(user.getPicture1080());
-        following = user.getFollowerData().getFollowing();
-        followers = user.getFollowerData().getFollowers();
-        followsHost = user.getFollowerData().getFollowsHost();
-        badges = user.getBadgesList().stream().map(Badge::new).toList();
+        description = user.getBioDescription();
+        profilePicture = new Picture(user.getAvatarThumb());
+        picture720 = new Picture(user.getAvatarMedium());
+        picture1080 = new Picture(user.getAvatarLarge());
+        following = user.getFollowInfo().getFollowingCount();
+        followers = user.getFollowInfo().getFollowerCount();
+        followsHost = user.getFollowInfo().getFollowStatus();
+        badges = user.getBadgeListList().stream().map(Badge::new).toList();
         additionalPictures = new ArrayList<>();
     }
+
+
+    public static User MapOrEmpty(io.github.jwdeveloper.tiktok.messages.User user)
+    {
+        if(user != null)
+        {
+            return new User(user);
+        }
+        return new User(0L,
+                "",
+                "",
+                "",
+                Picture.Empty(),
+                Picture.Empty(),
+                Picture.Empty(),
+                Picture.EmptyList(),
+                0,
+                0,
+                0,
+                Badge.EmptyList());
+
+    }
 }

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

@@ -0,0 +1,23 @@
+package io.github.jwdeveloper.tiktok.exceptions;
+
+public class TikTokEventListenerMethodException extends TikTokLiveException
+{
+    public TikTokEventListenerMethodException() {
+    }
+
+    public TikTokEventListenerMethodException(String message) {
+        super(message);
+    }
+
+    public TikTokEventListenerMethodException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public TikTokEventListenerMethodException(Throwable cause) {
+        super(cause);
+    }
+
+    public TikTokEventListenerMethodException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

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

@@ -21,13 +21,18 @@ public class TikTokLiveMessageException extends TikTokLiveException {
         this.webcastResponse = webcastResponse;
     }
 
-    public void messageToBase64()
+    public String messageName()
     {
-        var decoded = Base64.getEncoder().encodeToString(webcastMessage.getBinary().toByteArray());
+        return webcastMessage.getType();
     }
 
-    public void webcastResponseToBase64()
+    public String messageToBase64()
     {
-        var decoded = Base64.getEncoder().encodeToString(webcastResponse.toByteArray());
+        return Base64.getEncoder().encodeToString(webcastMessage.getBinary().toByteArray());
+    }
+
+    public String webcastResponseToBase64()
+    {
+        return  Base64.getEncoder().encodeToString(webcastResponse.toByteArray());
     }
 }

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

@@ -1,13 +1,12 @@
 package io.github.jwdeveloper.tiktok.http;
 
-import java.net.http.HttpRequest;
 import java.util.Map;
 
 public interface TikTokHttpRequest {
-    TikTokHttpRequest SetQueries(Map<String, Object> queries);
+    TikTokHttpRequest setQueries(Map<String, Object> queries);
 
     TikTokHttpRequest setHeader(String key, String value);
-    String Get(String url);
+    String get(String url);
 
-    String Post(String url, HttpRequest.BodyPublisher data);
+    String post(String url);
 }

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

@@ -0,0 +1,17 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+import java.util.List;
+
+/**
+ *  You can dynamically add or removing TikTokEventListener
+ *
+ * @see TikTokEventListener
+ *
+ */
+public interface ListenersManager
+{
+    List<TikTokEventListener> getListeners();
+    void addListener(TikTokEventListener listener);
+
+    void removeListener(TikTokEventListener listener);
+}

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

@@ -0,0 +1,52 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+
+/**
+ *
+ * @see ListenersManager
+ *
+ * TikTokEventListener is an alternative way of handing TikTok events.
+ *
+ *  TikTokLive.newClient("someuser").addListener(listener)
+ *
+ *  After registertion all listeners are kept in Listener manager
+ *  that could be obtained by client.getListenerManager();
+ *
+ *  Method in TikTokEventListener should meet 4 requirements to be detected
+ *         - 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());
+ *         }
+ *     }
+ *
+ */
+public interface TikTokEventListener
+{
+
+}

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

@@ -6,9 +6,25 @@ import io.github.jwdeveloper.tiktok.models.gifts.TikTokGiftInfo;
 
 import java.util.Map;
 
-public interface GiftManager
-{
-     Map<Integer, TikTokGiftInfo> getGiftsInfo();
+public interface GiftManager {
 
-     Map<GiftId, TikTokGift> getActiveGifts();
+     /**
+      *  Meta information about all TikTok available gifts such as, name, id, description, cost, etc
+      *  TikTokGiftInfos are downloaded only if `clientSettings.setDownloadGiftInfo(true);`
+      *
+      * @return map of metainformations about gitfts where Integer is Gift Id and TikTokGiftInfo is gift data
+      * @see TikTokGiftInfo
+      */
+    Map<Integer, TikTokGiftInfo> getGiftsInfo();
+
+
+     /**
+      *  Active Gifts are updated after TikTokGiftMessageEvent. This map contains gifts that
+      *  recently send to host and have active strike
+      *
+      * @return map of active gifts
+      * @see  TikTokGift
+      * @see  io.github.jwdeveloper.tiktok.events.messages.TikTokGiftMessageEvent
+      */
+    Map<GiftId, TikTokGift> getActiveGifts();
 }

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

@@ -1,11 +1,34 @@
 package io.github.jwdeveloper.tiktok.live;
 
+import io.github.jwdeveloper.tiktok.listener.ListenersManager;
+import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
+
 public interface LiveClient {
 
+    /**
+     * Connects to the live stream.
+     */
     void connect();
 
+    /**
+     * Disconnects the connection.
+     */
     void disconnect();
 
+
+    /**
+     * Get information about gifts
+     */
     GiftManager getGiftManager();
+
+    /**
+     * Gets the current room info from TikTok API including streamer info, room status and statistics.
+     */
     LiveRoomInfo getRoomInfo();
+
+    /**
+     * Manage TikTokEventListener
+     * @see TikTokEventListener
+     */
+    ListenersManager getListenersManager();
 }

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

@@ -3,7 +3,8 @@ package io.github.jwdeveloper.tiktok.live;
 public interface LiveRoomInfo
 {
      int getViewersCount();
-
+     boolean isAgeRestricted();
      String getRoomId();
      String getUserName();
+     ConnectionState getConnectionState();
 }

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

@@ -6,4 +6,6 @@ import lombok.Data;
 public class LiveRoomMeta
 {
    private int status;
+
+   private boolean ageRestricted;
 }

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

@@ -0,0 +1,6 @@
+package io.github.jwdeveloper.tiktok.mappers;
+
+public interface Mapper<SOURCE,TARGET>
+{
+     TARGET mapFrom(SOURCE source);
+}

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

@@ -0,0 +1,38 @@
+package io.github.jwdeveloper.tiktok.utils;
+
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+
+public class CancelationToken
+{
+    private boolean isCanceled =false;
+
+    public void cancel()
+    {
+        isCanceled =true;
+    }
+
+    public boolean isCancel()
+    {
+
+        return isCanceled;
+    }
+
+    public void throwIfCancel()
+    {
+        if(!isCanceled)
+        {
+            return;
+        }
+        throw new TikTokLiveException("Token requested cancelation");
+    }
+
+    public boolean isNotCancel()
+    {
+        return !isCancel();
+    }
+
+    public static CancelationToken create()
+    {
+        return new CancelationToken();
+    }
+}

Client/pom.xml

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

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

@@ -14,6 +14,7 @@ public class TikTokGiftManager implements GiftManager {
 
     @Getter
     private final Map<Integer, TikTokGiftInfo> giftsInfo;
+
     @Getter
     private final Map<GiftId, TikTokGift> activeGifts;
 
@@ -23,10 +24,10 @@ public class TikTokGiftManager implements GiftManager {
     }
 
     public TikTokGift updateActiveGift(WebcastGiftMessage giftMessage) {
-        var giftId = new GiftId(giftMessage.getGiftId(), giftMessage.getSender().getUniqueId());
+        var giftId = new GiftId(giftMessage.getGiftId(), giftMessage.getUser().getIdStr());
         if (activeGifts.containsKey(giftId)) {
             var gift = activeGifts.get(giftId);
-            gift.setAmount(giftMessage.getAmount());
+            gift.setAmount(giftMessage.getComboCount());
         } else {
             var newGift = new TikTokGift(giftMessage);
             activeGifts.put(giftId, newGift);
@@ -34,7 +35,8 @@ public class TikTokGiftManager implements GiftManager {
 
         var gift = activeGifts.get(giftId);
 
-        if (giftMessage.getRepeatEnd()) {
+        if (giftMessage.getRepeatEnd() > 0)
+        {
             gift.setStreakFinished(true);
             activeGifts.remove(giftId);
         }

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

@@ -2,10 +2,13 @@ package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.events.messages.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokReconnectingEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.http.TikTokApiService;
+import io.github.jwdeveloper.tiktok.listener.ListenersManager;
+import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
 import io.github.jwdeveloper.tiktok.live.ConnectionState;
 import io.github.jwdeveloper.tiktok.live.GiftManager;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
@@ -17,25 +20,28 @@ import java.util.logging.Logger;
 public class TikTokLiveClient implements LiveClient {
     private final TikTokRoomInfo liveRoomInfo;
     private final TikTokGiftManager tikTokGiftManager;
-    private final TikTokApiService apiClient;
+    private final TikTokApiService apiService;
     private final TikTokWebSocketClient webSocketClient;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
     private final ClientSettings clientSettings;
+    private final TikTokListenersManager listenersManager;
     private final Logger logger;
 
     public TikTokLiveClient(TikTokRoomInfo tikTokLiveMeta,
                             TikTokApiService tikTokApiService,
                             TikTokWebSocketClient webSocketClient,
                             TikTokGiftManager tikTokGiftManager,
-                            TikTokEventHandler tikTokEventHandler,
+                            TikTokEventObserver tikTokEventHandler,
                             ClientSettings clientSettings,
+                            TikTokListenersManager listenersManager,
                             Logger logger) {
         this.liveRoomInfo = tikTokLiveMeta;
         this.tikTokGiftManager = tikTokGiftManager;
-        this.apiClient = tikTokApiService;
+        this.apiService = tikTokApiService;
         this.webSocketClient = webSocketClient;
         this.tikTokEventHandler = tikTokEventHandler;
         this.clientSettings = clientSettings;
+        this.listenersManager = listenersManager;
         this.logger = logger;
     }
 
@@ -57,6 +63,7 @@ public class TikTokLiveClient implements LiveClient {
                 }
                 catch (Exception ignored){}
                 logger.info("Reconnecting");
+                tikTokEventHandler.publish(this, new TikTokReconnectingEvent());
                 this.connect();
             }
             throw e;
@@ -71,8 +78,6 @@ public class TikTokLiveClient implements LiveClient {
         setState(ConnectionState.DISCONNECTED);
     }
 
-
-
     public void tryConnect() {
         if (liveRoomInfo.hasConnectionState(ConnectionState.CONNECTED))
             throw new TikTokLiveException("Already connected");
@@ -82,9 +87,23 @@ public class TikTokLiveClient implements LiveClient {
         logger.info("Connecting");
         setState(ConnectionState.CONNECTING);
 
-        var roomId = apiClient.fetchRoomId(liveRoomInfo.getUserName());
-        liveRoomInfo.setRoomId(roomId);
-        var roomData = apiClient.fetchRoomInfo();
+
+        apiService.updateSessionId();
+
+        if(clientSettings.getRoomId() != null)
+        {
+
+            liveRoomInfo.setRoomId(clientSettings.getRoomId());
+            logger.info("Using roomID from settings: "+clientSettings.getRoomId());
+        }
+        else
+        {
+            var roomId = apiService.fetchRoomId(liveRoomInfo.getUserName());
+            liveRoomInfo.setRoomId(roomId);
+        }
+
+
+        var roomData = apiService.fetchRoomInfo();
         if (roomData.getStatus() == 0 || roomData.getStatus() == 4) {
             throw new TikTokLiveOfflineHostException("LiveStream for HostID could not be found. Is the Host online?");
         }
@@ -92,10 +111,10 @@ public class TikTokLiveClient implements LiveClient {
         if (clientSettings.isDownloadGiftInfo())
         {
             logger.info("Fetch Gift info");
-            var gifts = apiClient.fetchAvailableGifts();
+            var gifts = apiService.fetchAvailableGifts();
             tikTokGiftManager.loadGifsInfo(gifts);
         }
-        var clientData = apiClient.fetchClientData();
+        var clientData = apiService.fetchClientData();
         webSocketClient.start(clientData, this);
         setState(ConnectionState.CONNECTED);
     }
@@ -104,6 +123,11 @@ public class TikTokLiveClient implements LiveClient {
     public LiveRoomInfo getRoomInfo() {
         return liveRoomInfo;
     }
+    @Override
+    public ListenersManager getListenersManager()
+    {
+        return listenersManager;
+    }
 
     @Override
     public GiftManager getGiftManager() {

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

@@ -5,16 +5,20 @@ import io.github.jwdeveloper.tiktok.events.TikTokEventBuilder;
 import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
 import io.github.jwdeveloper.tiktok.events.messages.*;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
 import io.github.jwdeveloper.tiktok.http.TikTokApiService;
 import io.github.jwdeveloper.tiktok.http.TikTokCookieJar;
-import io.github.jwdeveloper.tiktok.http.TikTokHttpApiClient;
+import io.github.jwdeveloper.tiktok.http.TikTokHttpClient;
 import io.github.jwdeveloper.tiktok.http.TikTokHttpRequestFactory;
+import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
+import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketClient;
 
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -22,19 +26,26 @@ import java.util.logging.Logger;
 public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveClientBuilder> {
     private final ClientSettings clientSettings;
     private final Logger logger;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
+    private final List<TikTokEventListener> listeners;
 
     public TikTokLiveClientBuilder(String userName) {
-        this.tikTokEventHandler = new TikTokEventHandler();
+        this.tikTokEventHandler = new TikTokEventObserver();
         this.clientSettings = Constants.DefaultClientSettings();
         this.clientSettings.setHostName(userName);
         this.logger = Logger.getLogger(TikTokLive.class.getName());
+        this.listeners = new ArrayList<>();
     }
 
     public TikTokLiveClientBuilder configure(Consumer<ClientSettings> consumer) {
         consumer.accept(clientSettings);
         return this;
     }
+    public TikTokLiveClientBuilder addListener(TikTokEventListener listener)
+    {
+        listeners.add(listener);
+        return this;
+    }
 
     private void validate() {
 
@@ -70,9 +81,12 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
         var tiktokRoomInfo = new TikTokRoomInfo();
         tiktokRoomInfo.setUserName(clientSettings.getHostName());
 
+
+        var listenerManager = new TikTokListenersManager(listeners, tikTokEventHandler);
+
         var cookieJar = new TikTokCookieJar();
         var requestFactory = new TikTokHttpRequestFactory(cookieJar);
-        var apiClient = new TikTokHttpApiClient(cookieJar, requestFactory);
+        var apiClient = new TikTokHttpClient(cookieJar, requestFactory);
         var apiService = new TikTokApiService(apiClient, logger, clientSettings);
         var giftManager = new TikTokGiftManager();
         var webResponseHandler = new TikTokMessageHandlerRegistration(tikTokEventHandler, clientSettings, logger, giftManager, tiktokRoomInfo);
@@ -82,7 +96,14 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
                 webResponseHandler,
                 tikTokEventHandler);
 
-        return new TikTokLiveClient(tiktokRoomInfo, apiService, webSocketClient, giftManager, tikTokEventHandler, clientSettings, logger);
+        return new TikTokLiveClient(tiktokRoomInfo,
+                apiService,
+                webSocketClient,
+                giftManager,
+                tikTokEventHandler,
+                clientSettings,
+                listenerManager,
+                logger);
     }
 
     public LiveClient buildAndRun() {
@@ -258,8 +279,8 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
         return this;
     }
 
-    public TikTokLiveClientBuilder onUnhandled(TikTokEventConsumer<TikTokUnhandledEvent> event) {
-        tikTokEventHandler.subscribe(TikTokUnhandledEvent.class, event);
+    public TikTokLiveClientBuilder onUnhandled(TikTokEventConsumer<TikTokUnhandledWebsocketMessageEvent> event) {
+        tikTokEventHandler.subscribe(TikTokUnhandledWebsocketMessageEvent.class, event);
         return this;
     }
 
@@ -317,6 +338,19 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
         tikTokEventHandler.subscribe(TikTokEvent.class, event);
         return this;
     }
+
+    @Override
+    public TikTokLiveClientBuilder onWebsocketMessage(TikTokEventConsumer<TikTokWebsocketMessageEvent> event) {
+        tikTokEventHandler.subscribe(TikTokWebsocketMessageEvent.class, event);
+        return this;
+    }
+
+    @Override
+    public TikTokLiveClientBuilder onReconnecting(TikTokEventConsumer<TikTokReconnectingEvent> event)
+    {
+        tikTokEventHandler.subscribe(TikTokReconnectingEvent.class, event);
+        return this;
+    }
 }
 
 

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

@@ -11,7 +11,10 @@ public class TikTokRoomInfo implements LiveRoomInfo
 
     private String roomId;
 
+    private boolean ageRestricted;
+
     private String userName;
+
     private ConnectionState connectionState = ConnectionState.DISCONNECTED;
 
     public boolean hasConnectionState(ConnectionState state)

Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventHandler.java

@@ -1,38 +0,0 @@
-package io.github.jwdeveloper.tiktok.handlers;
-
-import io.github.jwdeveloper.tiktok.TikTokLiveClient;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class TikTokEventHandler {
-    private final Map<String, TikTokEventConsumer> events;
-
-    public TikTokEventHandler() {
-        events = new HashMap<>();
-    }
-
-    public void publish(TikTokLiveClient tikTokLiveClient, TikTokEvent tikTokEvent) {
-        if (events.containsKey(TikTokEvent.class.getSimpleName())) {
-            var handler = events.get(TikTokEvent.class.getSimpleName());
-            handler.onEvent(tikTokLiveClient, tikTokEvent);
-        }
-
-        var name = tikTokEvent.getClass().getSimpleName();
-        if (!events.containsKey(name)) {
-            return;
-        }
-        var handler = events.get(name);
-        handler.onEvent(tikTokLiveClient, tikTokEvent);
-    }
-
-    public <T extends TikTokEvent> void subscribe(Class<?> clazz, TikTokEventConsumer<T> event) {
-        events.put(clazz.getSimpleName(), event);
-    }
-
-    public <T extends TikTokEvent> void unsubscribe(Class<?> clazz) {
-        events.remove(clazz);
-    }
-}

Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java

@@ -0,0 +1,54 @@
+package io.github.jwdeveloper.tiktok.handlers;
+
+import io.github.jwdeveloper.tiktok.TikTokLiveClient;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class TikTokEventObserver {
+    private final Map<String, Set<TikTokEventConsumer>> events;
+
+    public TikTokEventObserver() {
+        events = new HashMap<>();
+    }
+
+    public void publish(TikTokLiveClient tikTokLiveClient, TikTokEvent tikTokEvent) {
+        if (events.containsKey(TikTokEvent.class.getSimpleName())) {
+            var handlers = events.get(TikTokEvent.class.getSimpleName());
+            for(var handle : handlers)
+            {
+                handle.onEvent(tikTokLiveClient, tikTokEvent);
+            }
+        }
+
+        var name = tikTokEvent.getClass().getSimpleName();
+        if (!events.containsKey(name)) {
+            return;
+        }
+        var handlers = events.get(name);
+        for(var handler : handlers)
+        {
+            handler.onEvent(tikTokLiveClient, tikTokEvent);
+        }
+    }
+
+    public <T extends TikTokEvent> void subscribe(Class<?> clazz, TikTokEventConsumer<T> event)
+    {
+        events.computeIfAbsent(clazz.getSimpleName(), e -> new HashSet<>()).add(event);
+    }
+
+    public <T extends TikTokEvent> void unsubscribeAll(Class<?> clazz) {
+        events.remove(clazz);
+    }
+
+    public <T extends TikTokEvent> void unsubscribe(TikTokEventConsumer<T> consumer) {
+        for(var entry : events.entrySet())
+        {
+            entry.getValue().remove(consumer);
+        }
+    }
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java

@@ -6,7 +6,8 @@ import io.github.jwdeveloper.tiktok.ClientSettings;
 import io.github.jwdeveloper.tiktok.TikTokLiveClient;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokUnhandledEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokWebsocketMessageEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokUnhandledWebsocketMessageEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
@@ -22,11 +23,11 @@ import java.util.logging.Logger;
 public abstract class TikTokMessageHandler {
 
     private final Map<String, io.github.jwdeveloper.tiktok.handler.TikTokMessageHandler> handlers;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
     private final ClientSettings clientSettings;
     protected final Logger logger;
 
-    public TikTokMessageHandler(TikTokEventHandler tikTokEventHandler,ClientSettings clientSettings, Logger logger) {
+    public TikTokMessageHandler(TikTokEventObserver tikTokEventHandler, ClientSettings clientSettings, Logger logger) {
         handlers = new HashMap<>();
         this.tikTokEventHandler = tikTokEventHandler;
         this.clientSettings = clientSettings;
@@ -64,11 +65,12 @@ public abstract class TikTokMessageHandler {
 
     private void handleSingleMessage(TikTokLiveClient client, WebcastResponse.Message message) throws Exception {
         if (!handlers.containsKey(message.getType())) {
-            tikTokEventHandler.publish(client, new TikTokUnhandledEvent(message));
+            tikTokEventHandler.publish(client, new TikTokUnhandledWebsocketMessageEvent(message));
             return;
         }
         var handler = handlers.get(message.getType());
         var tiktokEvent = handler.handle(message);
+        tikTokEventHandler.publish(client, new TikTokWebsocketMessageEvent(tiktokEvent, message));
         tikTokEventHandler.publish(client, tiktokEvent);
     }
 

Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java

@@ -5,21 +5,18 @@ import io.github.jwdeveloper.tiktok.TikTokGiftManager;
 import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.messages.*;
-import io.github.jwdeveloper.tiktok.events.objects.TikTokGift;
 import io.github.jwdeveloper.tiktok.messages.*;
-import io.github.jwdeveloper.tiktok.models.GiftId;
 import io.github.jwdeveloper.tiktok.models.SocialTypes;
 import lombok.SneakyThrows;
 
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
     private final TikTokGiftManager giftManager;
     private final TikTokRoomInfo roomInfo;
 
-    public TikTokMessageHandlerRegistration(TikTokEventHandler tikTokEventHandler,
+    public TikTokMessageHandlerRegistration(TikTokEventObserver tikTokEventHandler,
                                             ClientSettings clientSettings,
                                             Logger logger,
                                             TikTokGiftManager giftManager,
@@ -33,8 +30,8 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
     public void init() {
 
         //ConnectionEvents events
-        register(WebcastControlMessage.class, TikTokRoomMessageEvent.class);
-        register(SystemMessage.class, this::handleWebcastControlMessage);
+        register(WebcastControlMessage.class,  this::handleWebcastControlMessage);
+        register(SystemMessage.class,TikTokRoomMessageEvent.class);
 
 
         //Room status events
@@ -105,16 +102,17 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
     private TikTokEvent handleSocialMedia(WebcastResponse.Message msg) {
         var message = WebcastSocialMessage.parseFrom(msg.getBinary());
 
-        String type = message.getHeader().getSocialData().getType();
-        Pattern pattern = Pattern.compile("\\d+");
-        Matcher matcher = pattern.matcher(type);
-        if (matcher.find()) {
-            var value = matcher.group(0);
+        var socialType = message.getHeader().getSocialData().getType();
+        var pattern = Pattern.compile("pm_mt_guidance_viewer_([0-9]+)_share");
+        var matcher = pattern.matcher(socialType);
+
+        if (matcher.find())
+        {
+            var value = matcher.group(1);
             var number = Integer.parseInt(value);
             return new TikTokShareEvent(message, number);
         }
 
-        var socialType = message.getHeader().getSocialData().getType();
         return switch (socialType) {
             case SocialTypes.LikeType -> new TikTokLikeEvent(message);
             case SocialTypes.FollowType -> new TikTokFollowEvent(message);

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

@@ -2,11 +2,13 @@ package io.github.jwdeveloper.tiktok.http;
 
 import com.google.gson.Gson;
 import io.github.jwdeveloper.tiktok.ClientSettings;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 import io.github.jwdeveloper.tiktok.live.LiveRoomMeta;
-import io.github.jwdeveloper.tiktok.models.gifts.TikTokGiftInfo;
+import io.github.jwdeveloper.tiktok.mappers.LiveRoomMetaMapper;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+import io.github.jwdeveloper.tiktok.models.gifts.TikTokGiftInfo;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -15,34 +17,70 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class TikTokApiService {
-    private final TikTokHttpApiClient apiClient;
+    private final TikTokHttpClient tiktokHttpClient;
     private final Logger logger;
     private final ClientSettings clientSettings;
 
-    public TikTokApiService(TikTokHttpApiClient apiClient, Logger logger, ClientSettings clientSettings) {
-        this.apiClient = apiClient;
+    public TikTokApiService(TikTokHttpClient apiClient, Logger logger, ClientSettings clientSettings) {
+        this.tiktokHttpClient = apiClient;
         this.logger = logger;
         this.clientSettings = clientSettings;
     }
 
+
+    public void updateSessionId()
+    {
+        if(clientSettings.getSessionId() == null)
+        {
+            return;
+        }
+        if(clientSettings.getSessionId().isEmpty())
+        {
+          return;
+        }
+        tiktokHttpClient.setSessionId(clientSettings.getSessionId());
+    }
+
+    public boolean sendMessage(String message, String sessionId) {
+        if (sessionId.isEmpty()) {
+            throw new TikTokLiveException("Session ID must not be Empty");
+        }
+        var roomId = clientSettings.getClientParameters().get("room_id");
+        if (roomId == null) {
+            throw new TikTokLiveException("Room ID must not be Empty");
+        }
+        logger.info("Sending message to chat");
+        try {
+            var params = new HashMap<String, Object>(clientSettings.getClientParameters());
+            params.put("content", message);
+            params.put("channel", "tiktok_web");
+            params.remove("cursor");
+            tiktokHttpClient.setSessionId(sessionId);
+            tiktokHttpClient.postMessageToChat(params);
+            return true;
+        } catch (Exception e) {
+            throw new TikTokLiveRequestException("Failed to fetch room id from WebCast, see stacktrace for more info.", e);
+        }
+    }
+
     public String fetchRoomId(String userName) {
         logger.info("Fetching room ID");
         String html;
         try {
-            html = apiClient.GetLivestreamPage(userName);
+            html = tiktokHttpClient.getLivestreamPage(userName);
         } catch (Exception e) {
             throw new TikTokLiveRequestException("Failed to fetch room id from WebCast, see stacktrace for more info.", e);
         }
 
-        Pattern firstPattern = Pattern.compile("room_id=([0-9]*)");
-        Matcher firstMatcher = firstPattern.matcher(html);
-        String id = "";
+        var firstPattern = Pattern.compile("room_id=([0-9]*)");
+        var firstMatcher = firstPattern.matcher(html);
+        var id = "";
 
         if (firstMatcher.find()) {
             id = firstMatcher.group(1);
         } else {
-            Pattern secondPattern = Pattern.compile("\"roomId\":\"([0-9]*)\"");
-            Matcher secondMatcher = secondPattern.matcher(html);
+            var secondPattern = Pattern.compile("\"roomId\":\"([0-9]*)\"");
+            var secondMatcher = secondPattern.matcher(html);
 
             if (secondMatcher.find()) {
                 id = secondMatcher.group(1);
@@ -54,7 +92,7 @@ public class TikTokApiService {
         }
 
         clientSettings.getClientParameters().put("room_id", id);
-        logger.info("RoomID -> "+id);
+        logger.info("RoomID -> " + id);
         return id;
     }
 
@@ -62,63 +100,45 @@ public class TikTokApiService {
     public LiveRoomMeta fetchRoomInfo() {
         logger.info("Fetch RoomInfo");
         try {
-            var response = apiClient.GetJObjectFromWebcastAPI("room/info/", clientSettings.getClientParameters());
-            if (!response.has("data")) {
-                return new LiveRoomMeta();
-            }
-
-            var data = response.getAsJsonObject("data");
-            if (!data.has("status")) {
-                return new LiveRoomMeta();
-            }
-
-            var status = data.get("status");
-
-            var info = new LiveRoomMeta();
-            info.setStatus(status.getAsInt());
-
-            logger.info("RoomInfo status -> "+info.getStatus());
-            return info;
+            var response = tiktokHttpClient.getJObjectFromWebcastAPI("room/info/", clientSettings.getClientParameters());
+            var mapper = new LiveRoomMetaMapper();
+            var liveRoomMeta = mapper.mapFrom(response);
+            logger.info("RoomInfo status -> " + liveRoomMeta.getStatus());
+            return liveRoomMeta;
         } catch (Exception e) {
             throw new TikTokLiveRequestException("Failed to fetch room info from WebCast, see stacktrace for more info.", e);
         }
     }
 
-    public WebcastResponse  fetchClientData()
-    {
+    public WebcastResponse fetchClientData() {
         logger.info("Fetch ClientData");
         try {
-            var response = apiClient.GetDeserializedMessage("im/fetch/", clientSettings.getClientParameters());
-            clientSettings.getClientParameters().put("cursor",response.getCursor());
+            var response = tiktokHttpClient.getDeserializedMessage("im/fetch/", clientSettings.getClientParameters());
+            clientSettings.getClientParameters().put("cursor", response.getCursor());
             clientSettings.getClientParameters().put("internal_ext", response.getAckIds());
             return response;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             throw new TikTokLiveRequestException("Failed to fetch client data", e);
         }
     }
 
     public Map<Integer, TikTokGiftInfo> fetchAvailableGifts() {
         try {
-            var response = apiClient.GetJObjectFromWebcastAPI("gift/list/", clientSettings.getClientParameters());
-            if(!response.has("data"))
-            {
+            var response = tiktokHttpClient.getJObjectFromWebcastAPI("gift/list/", clientSettings.getClientParameters());
+            if (!response.has("data")) {
                 return new HashMap<>();
             }
             var dataJson = response.getAsJsonObject("data");
-            if(!dataJson.has("gifts"))
-            {
+            if (!dataJson.has("gifts")) {
                 return new HashMap<>();
             }
             var giftsJsonList = dataJson.get("gifts").getAsJsonArray();
             var gifts = new HashMap<Integer, TikTokGiftInfo>();
             var gson = new Gson();
-            for(var jsonGift : giftsJsonList)
-            {
+            for (var jsonGift : giftsJsonList) {
                 var gift = gson.fromJson(jsonGift, TikTokGiftInfo.class);
-                logger.info("Found Available Gift "+ gift.getName()+ " with ID "+gift.getId());
-                gifts.put(gift.getId(),gift);
+                logger.info("Found Available Gift " + gift.getName() + " with ID " + gift.getId());
+                gifts.put(gift.getId(), gift);
             }
             return gifts;
         } catch (Exception e) {

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

@@ -2,7 +2,6 @@ package io.github.jwdeveloper.tiktok.http;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.github.jwdeveloper.tiktok.ClientSettings;
 import io.github.jwdeveloper.tiktok.Constants;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
@@ -15,30 +14,44 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
-public class TikTokHttpApiClient {
+public class TikTokHttpClient {
     private final TikTokHttpRequestFactory requestFactory;
     private final TikTokCookieJar tikTokCookieJar;
 
-    public TikTokHttpApiClient(TikTokCookieJar tikTokCookieJar,  TikTokHttpRequestFactory requestFactory) {
+    public TikTokHttpClient(TikTokCookieJar tikTokCookieJar, TikTokHttpRequestFactory requestFactory) {
         this.requestFactory = requestFactory;
         this.tikTokCookieJar = tikTokCookieJar;
     }
 
-    public String GetLivestreamPage(String userName) {
+    public void setSessionId(String sessionId)
+    {
+        tikTokCookieJar.set("sessionid", sessionId);
+        tikTokCookieJar.set("sessionid_ss", sessionId);
+        tikTokCookieJar.set("sid_tt", sessionId);
+    }
+
+
+    public String getLivestreamPage(String userName) {
 
         var url = Constants.TIKTOK_URL_WEB + "@" + userName + "/live/";
         var get = getRequest(url, null);
         return get;
     }
 
-    public JsonObject GetJObjectFromWebcastAPI(String path, Map<String, Object> parameters) {
+    public String postMessageToChat(Map<String,Object> parameters)
+    {
+        var get = postRequest(Constants.TIKTOK_URL_WEBCAST + "room/chat/", parameters);
+        return get;
+    }
+
+    public JsonObject getJObjectFromWebcastAPI(String path, Map<String, Object> parameters) {
         var get = getRequest(Constants.TIKTOK_URL_WEBCAST + path, parameters);
         var json = JsonParser.parseString(get);
         var jsonObject = json.getAsJsonObject();
         return jsonObject;
     }
 
-    public WebcastResponse GetDeserializedMessage(String path, Map<String, Object> parameters) {
+    public WebcastResponse getDeserializedMessage(String path, Map<String, Object> parameters) {
         var bytes = getSignRequest(Constants.TIKTOK_URL_WEBCAST + path, parameters);
         try {
             return WebcastResponse.parseFrom(bytes);
@@ -49,16 +62,25 @@ public class TikTokHttpApiClient {
         }
     }
 
+    private String postRequest(String url, Map<String, Object> parameters) {
+        if (parameters == null) {
+            parameters = new HashMap<>();
+        }
+        System.out.println("RomMID: "+parameters.get("room_id"));
+        var request = requestFactory.setQueries(parameters);
+        return request.post(url);
+    }
+
     private String getRequest(String url, Map<String, Object> parameters) {
         if (parameters == null) {
             parameters = new HashMap<>();
         }
 
-        var request = requestFactory.SetQueries(parameters);
-        return request.Get(url);
+        var request = requestFactory.setQueries(parameters);
+        return request.get(url);
     }
     private byte[] getSignRequest(String url, Map<String, Object> parameters) {
-        url = GetSignedUrl(url, parameters);
+        url = getSignedUrl(url, parameters);
         try {
             var client = HttpClient.newHttpClient();
             var request = HttpRequest.newBuilder()
@@ -86,16 +108,16 @@ public class TikTokHttpApiClient {
     }
 
 
-    private String GetSignedUrl(String url, Map<String, Object> parameters) {
+    private String getSignedUrl(String url, Map<String, Object> parameters) {
 
         var fullUrl = HttpUtils.parseParameters(url,parameters);
         var singHeaders = new TreeMap<String,Object>();
-        singHeaders.put("client", "ttlive-net");
+        singHeaders.put("client", "ttlive-java");
         singHeaders.put("uuc", 1);
         singHeaders.put("url", fullUrl);
 
-        var request = requestFactory.SetQueries(singHeaders);
-        var content = request.Get(Constants.TIKTOK_SIGN_API);
+        var request = requestFactory.setQueries(singHeaders);
+        var content = request.get(Constants.TIKTOK_SIGN_API);
 
 
         try {

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

@@ -11,12 +11,12 @@ import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.net.http.WebSocket;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 public class TikTokHttpRequestFactory implements TikTokHttpRequest {
     private final CookieManager cookieManager;
@@ -34,29 +34,16 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
                 .connectTimeout(Duration.ofSeconds(2))
                 .build();
     }
-
-    public WebSocket.Builder openSocket() {
-        return client.newWebSocketBuilder();
-    }
-
     @SneakyThrows
-    public String Get(String url) {
+    public String get(String url) {
         var uri = URI.create(url);
         var request = HttpRequest.newBuilder().GET();
-        if (query != null) {
-            var baseUri = uri.toString();
-            var requestUri = URI.create(baseUri + "?" + query);
-            request.uri(requestUri);
-        }
-
-        return GetContent(request.build());
-    }
-
-    @SneakyThrows
-    public String Post(String url, HttpRequest.BodyPublisher data) {
-        var uri = URI.create(url);
-        var request = HttpRequest.newBuilder().POST(data);
-        for (var header : defaultHeaders.entrySet()) {
+        for (var header : defaultHeaders.entrySet())
+        {
+            if(header.getKey().equals("Connection") || header.getKey().equals("Accept-Encoding"))
+            {
+                continue;
+            }
             request.setHeader(header.getKey(), header.getValue());
         }
         if (query != null) {
@@ -64,7 +51,36 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
             var requestUri = URI.create(baseUri + "?" + query);
             request.uri(requestUri);
         }
-        return GetContent(request.build());
+
+        return getContent(request.build());
+    }
+
+    @SneakyThrows
+    public String post(String url) {
+        var uri = URI.create(url);
+        var request = HttpRequest.newBuilder().POST(HttpRequest.BodyPublishers.ofString(""));
+        for (var header : defaultHeaders.entrySet())
+        {
+            if(header.getKey().equals("Connection"))
+            {
+                continue;
+            }
+            request.setHeader(header.getKey(), header.getValue());
+        }
+        request.setHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8");
+        request.setHeader("Cookie", tikTokCookieJar.parseCookies());
+
+
+        if (query != null) {
+            var baseUri = uri.toString();
+            var requestUri = URI.create(baseUri + "?" + query);
+            request.uri(requestUri);
+            System.out.println(requestUri.toString());
+        }
+
+
+
+        return getContent(request.build());
     }
 
     public TikTokHttpRequest setHeader(String key, String value) {
@@ -77,10 +93,11 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
         return this;
     }
 
-    public TikTokHttpRequest SetQueries(Map<String, Object> queries) {
+    public TikTokHttpRequest setQueries(Map<String, Object> queries) {
         if (queries == null)
             return this;
-        query = String.join("&", queries.entrySet().stream().map(x ->
+        var testMap = new TreeMap<String,Object>(queries);
+        query = String.join("&", testMap.entrySet().stream().map(x ->
         {
             var key = x.getKey();
             var value = "";
@@ -95,7 +112,7 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
     }
 
 
-    private String GetContent(HttpRequest request) throws Exception {
+    private String getContent(HttpRequest request) throws Exception {
         var response = client.send(request, HttpResponse.BodyHandlers.ofString());
         if (response.statusCode() == 404) {
             throw new TikTokLiveRequestException("Request responded with 404 NOT_FOUND");

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

@@ -0,0 +1,17 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
+
+import lombok.Value;
+
+import java.util.List;
+
+
+@Value
+public class ListenerBindingModel
+{
+
+    TikTokEventListener listener;
+
+    List<TikTokEventConsumer<?>> events;
+}

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

@@ -0,0 +1,87 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+
+import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokEventListenerMethodException;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class TikTokListenersManager implements ListenersManager {
+    private final TikTokEventObserver eventObserver;
+    private final List<ListenerBindingModel> bindingModels;
+
+    public TikTokListenersManager(List<TikTokEventListener> listeners, TikTokEventObserver tikTokEventHandler) {
+        this.eventObserver = tikTokEventHandler;
+        this.bindingModels = new ArrayList<>(listeners.stream().map(this::bindToEvents).toList());
+    }
+
+    @Override
+    public List<TikTokEventListener> getListeners() {
+        return bindingModels.stream().map(ListenerBindingModel::getListener).toList();
+    }
+
+    @Override
+    public void addListener(TikTokEventListener listener) {
+        var alreadyExists = bindingModels.stream().filter(e -> e.getListener() == listener).findAny();
+        if (alreadyExists.isPresent()) {
+            throw new TikTokLiveException("Listener " + listener.getClass() + " has already been registered");
+        }
+        var bindingModel = bindToEvents(listener);
+        bindingModels.add(bindingModel);
+    }
+
+    @Override
+    public void removeListener(TikTokEventListener listener) {
+        var optional = bindingModels.stream().filter(e -> e.getListener() == listener).findAny();
+        if (optional.isEmpty()) {
+            return;
+        }
+
+        var bindingModel =optional.get();
+
+        for(var consumer : bindingModel.getEvents())
+        {
+            eventObserver.unsubscribe(consumer);
+        }
+        bindingModels.remove(optional.get());
+    }
+
+    private ListenerBindingModel bindToEvents(TikTokEventListener listener) {
+
+        var clazz = listener.getClass();
+        var methods = Arrays.stream(clazz.getDeclaredMethods()).filter(m ->
+                m.getParameterCount() == 2 &&
+                        m.isAnnotationPresent(TikTokEventHandler.class) &&
+                        m.getParameterTypes()[0].equals(LiveClient.class)).toList();
+        var eventConsumer = new ArrayList<TikTokEventConsumer<?>>();
+
+
+        for (var method : methods)
+        {
+            var eventClazz = method.getParameterTypes()[1];
+            if(eventClazz.isAssignableFrom(TikTokEvent.class) && !eventClazz.equals(TikTokEvent.class))
+            {
+                throw new TikTokEventListenerMethodException("Method "+method.getName()+"() 2nd parameter must instance of "+TikTokEvent.class.getName());
+            }
+            var tikTokEventConsumer = new TikTokEventConsumer() {
+                @Override
+                public void onEvent(LiveClient liveClient, TikTokEvent event) {
+                    try {
+                        method.invoke(listener, liveClient, event);
+                    } catch (Exception e) {
+                        throw new TikTokEventListenerMethodException(e);
+                    }
+                }
+            };
+            eventObserver.subscribe(eventClazz, tikTokEventConsumer);
+        }
+        return new ListenerBindingModel(listener, eventConsumer);
+    }
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveRoomMetaMapper.java

@@ -0,0 +1,30 @@
+package io.github.jwdeveloper.tiktok.mappers;
+
+import com.google.gson.JsonObject;
+import io.github.jwdeveloper.tiktok.live.LiveRoomMeta;
+
+public class LiveRoomMetaMapper implements Mapper<JsonObject, LiveRoomMeta> 
+{
+    @Override
+    public LiveRoomMeta mapFrom(JsonObject input) {
+        var liveRoomMeta = new LiveRoomMeta();
+
+        if (!input.has("data")) {
+            return liveRoomMeta;
+        }
+        var data = input.getAsJsonObject("data");
+        if (data.has("status")) {
+            var status = data.get("status");
+            liveRoomMeta.setStatus(status.getAsInt());
+        }
+
+
+        if(data.has("age_restricted"))
+        {
+            var element = data.getAsJsonObject("age_restricted");
+            var restricted= element.get("restricted").getAsBoolean();
+            liveRoomMeta.setAgeRestricted(restricted);
+        }
+        return liveRoomMeta;
+    }
+}

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

@@ -5,16 +5,14 @@ import io.github.jwdeveloper.tiktok.ClientSettings;
 import io.github.jwdeveloper.tiktok.Constants;
 import io.github.jwdeveloper.tiktok.TikTokLiveClient;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
 import io.github.jwdeveloper.tiktok.http.HttpUtils;
 import io.github.jwdeveloper.tiktok.http.TikTokCookieJar;
-import io.github.jwdeveloper.tiktok.http.TikTokHttpRequestFactory;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
 import org.java_websocket.client.WebSocketClient;
 
 import java.net.URI;
-import java.net.http.WebSocket;
 import java.util.HashMap;
 import java.util.TreeMap;
 import java.util.logging.Logger;
@@ -24,17 +22,17 @@ public class TikTokWebSocketClient {
     private final ClientSettings clientSettings;
     private final TikTokCookieJar tikTokCookieJar;
     private final TikTokMessageHandlerRegistration webResponseHandler;
-    private final TikTokEventHandler tikTokEventHandler;
-
+    private final TikTokEventObserver tikTokEventHandler;
     private WebSocketClient webSocketClient;
-    private boolean isConnected;
     private TikTokLiveClient tikTokLiveClient;
+    private TikTokWebSocketPingingTask pingingTask;
+    private boolean isConnected;
 
     public TikTokWebSocketClient(Logger logger,
                                  TikTokCookieJar tikTokCookieJar,
                                  ClientSettings clientSettings,
                                  TikTokMessageHandlerRegistration webResponseHandler,
-                                 TikTokEventHandler tikTokEventHandler) {
+                                 TikTokEventObserver tikTokEventHandler) {
         this.logger = logger;
         this.tikTokCookieJar = tikTokCookieJar;
         this.clientSettings = clientSettings;
@@ -59,7 +57,13 @@ public class TikTokWebSocketClient {
             }
             webSocketClient = startWebSocket(url);
             webSocketClient.connect();
-        } catch (Exception e) {
+
+            pingingTask = new TikTokWebSocketPingingTask();
+            pingingTask.run(webSocketClient);
+            isConnected = true;
+        } catch (Exception e)
+        {
+            isConnected =false;
             throw new TikTokLiveException("Failed to connect to the websocket", e);
         }
     }
@@ -83,15 +87,22 @@ public class TikTokWebSocketClient {
         var cookie = tikTokCookieJar.parseCookies();
         var map = new HashMap<String, String>();
         map.put("Cookie", cookie);
-
-        return new TikTokWebSocketListener(URI.create(url), map, 3000, webResponseHandler, tikTokEventHandler, tikTokLiveClient);
+        return new TikTokWebSocketListener(URI.create(url),
+                map,
+                3000,
+                webResponseHandler,
+                tikTokEventHandler,
+                tikTokLiveClient);
     }
 
-
-
-    public void stop() {
-        if (isConnected && webSocketClient != null) {
-            webSocketClient.close();
+    public void stop()
+    {
+        if (isConnected && webSocketClient != null)
+        {
+            webSocketClient.closeConnection(0,"");
         }
+        webSocketClient = null;
+        pingingTask = null;
+        isConnected = false;
     }
 }

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

@@ -6,7 +6,7 @@ import io.github.jwdeveloper.tiktok.events.messages.TikTokConnectedEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokProtocolBufferException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
 import io.github.jwdeveloper.tiktok.messages.WebcastWebsocketAck;
@@ -16,7 +16,6 @@ import org.java_websocket.drafts.Draft_6455;
 import org.java_websocket.handshake.ServerHandshake;
 
 import java.net.URI;
-import java.net.http.WebSocket;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Optional;
@@ -24,14 +23,14 @@ import java.util.Optional;
 public class TikTokWebSocketListener extends WebSocketClient {
 
     private final TikTokMessageHandlerRegistration webResponseHandler;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
     private final TikTokLiveClient tikTokLiveClient;
 
     public TikTokWebSocketListener(URI serverUri,
                                    Map<String, String> httpHeaders,
                                    int connectTimeout,
                                    TikTokMessageHandlerRegistration webResponseHandler,
-                                   TikTokEventHandler tikTokEventHandler,
+                                   TikTokEventObserver tikTokEventHandler,
                                    TikTokLiveClient tikTokLiveClient) {
         super(serverUri, new Draft_6455(), httpHeaders,connectTimeout);
         this.webResponseHandler = webResponseHandler;
@@ -43,7 +42,10 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
         tikTokEventHandler.publish(tikTokLiveClient,new TikTokConnectedEvent());
-        sendPing();
+        if(isNotClosing())
+        {
+            sendPing();
+        }
     }
 
 
@@ -55,7 +57,10 @@ public class TikTokWebSocketListener extends WebSocketClient {
         } catch (Exception e) {
             tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(e));
         }
-        sendPing();
+        if(isNotClosing())
+        {
+            sendPing();
+        }
     }
 
     @Override
@@ -66,7 +71,10 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onError(Exception error) {
         tikTokEventHandler.publish(tikTokLiveClient,new TikTokErrorEvent(error));
-        sendPing();
+        if(isNotClosing())
+        {
+            sendPing();
+        }
     }
 
     private void handleBinary(byte[] buffer) {
@@ -101,25 +109,23 @@ public class TikTokWebSocketListener extends WebSocketClient {
         }
     }
 
-    private void pingTask(WebSocket webSocket) throws InterruptedException {
-        while (true) {
-            byte[] message = new byte[]{58, 2, 104, 98};
-            ByteBuffer buffer = ByteBuffer.wrap(message);
-            while (buffer.hasRemaining()) {
-                webSocket.sendPing(buffer);
-            }
-            buffer.clear();
-            Thread.sleep(10);
-        }
+    private boolean isNotClosing()
+    {
+        return !isClosed() && !isClosing();
     }
 
+
+
     private void sendAckId(long id) {
         var serverInfo = WebcastWebsocketAck
                 .newBuilder()
                 .setType("ack")
                 .setId(id)
                 .build();
-        send(serverInfo.toByteString().asReadOnlyByteBuffer());
+        if(isNotClosing())
+        {
+            send(serverInfo.toByteString().asReadOnlyByteBuffer());
+        }
     }
 
 

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

@@ -0,0 +1,58 @@
+package io.github.jwdeveloper.tiktok.websocket;
+
+import org.java_websocket.WebSocket;
+import java.util.Random;
+
+public class TikTokWebSocketPingingTask
+{
+    private Thread thread;
+
+    private boolean isRunning = false;
+    private final int MIN_TIMEOUT = 5;
+    private final int MAX_TIMEOUT = 100;
+
+
+    public void run(WebSocket webSocket)
+    {
+        var thread = new Thread(() ->
+                {
+                    pingTask(webSocket);
+                });
+        isRunning =true;
+        thread.start();
+    }
+
+    public void stop()
+    {
+        if(thread != null)
+        {
+            thread.interrupt();
+        }
+        isRunning = false;
+    }
+
+
+    private void pingTask(WebSocket webSocket)
+    {
+        var random = new Random();
+        while (isRunning)
+        {
+            try
+            {
+                if(!webSocket.isOpen())
+                {
+                    Thread.sleep(100);
+                    continue;
+                }
+                webSocket.sendPing();
+                var timeout = random.nextInt(MAX_TIMEOUT)+MIN_TIMEOUT;
+                Thread.sleep(timeout);
+            }
+            catch (Exception e)
+            {
+                isRunning = false;
+            }
+        }
+
+    }
+}

Client/src/test/java/io/github/jwdeveloper/tiktok/ParseMessagesTests.java

@@ -40,4 +40,10 @@ public class ParseMessagesTests extends TikTokBaseTest
     }
 
 
+    @Test
+    public void ShouldParseMessageWebcastMemberMessage() throws InvalidProtocolBufferException {
+        var bytes = getFileBytesUtf("WebcastMemberMessage.bin");
+        var message = WebcastMemberMessage.parseFrom(bytes);
+    }
+
 }