Fix for maven versions

LiveRoomInfo
    + new method getConnectionState() getting current state of connection
   + ListenersManager
     getBindingModels() renamed to getListeners()

  + Introducing documentation, each public interface got small documentation

  + New property in config .setSessionId()

  + New event: onReconnecting()

Bugs:
   CommentEvent was throwing mapping exception

.github/workflows/maven-publish.yml

@@ -1,4 +1,4 @@
-name: Publish Artifacts
+name: Publish New Version
 
 on:
   workflow_dispatch:
@@ -32,7 +32,6 @@ jobs:
           change_path: "."
           short_tags: false
           bump_each_commit: false
-
        
    
     - name: 2.7 Update version in pom.xml (Release only)
@@ -73,7 +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 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>1.0.0</version>
+        <version>0.0.22-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>

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

@@ -3,69 +3,75 @@ package io.github.jwdeveloper.tiktok;
 import lombok.Data;
 
 import java.time.Duration;
+import java.util.Map;
 import java.util.logging.Level;
 
 @Data
 public class ClientSettings {
-    /// <summary>
-    /// Timeout for Connections
-    /// </summary>
-
-    private Duration Timeout;
-    /// <summary>
-    /// Polling-Interval for Socket-Connection
-    /// </summary
-
-    private Duration PollingInterval;
-    /// <summary>
-    /// Proxy for Connection
-    /// </summary>
+    /**
+     * Timeout for Connections
+     */
+    private Duration timeout;
 
     // public RotatingProxy Proxy;
-    /// <summary>
-    /// ISO-Language for Client
-    /// </summary>
+    /**
+     * ISO-Language for Client
+     */
 
-    private String ClientLanguage;
-    /// <summary>
-    /// Size for Buffer for Socket-Connection
-    /// </summary>
+    private String clientLanguage;
 
-    private int SocketBufferSize;
-
-    /// <summary>
-    /// Whether to Retry if Connection Fails
-    /// </summary>
-    private boolean RetryOnConnectionFailure;
+    /**
+     * Whether to Retry if Connection Fails
+     */
+    private boolean retryOnConnectionFailure;
 
 
-    /// <summary>
-    /// Whether to handle Messages received from Room when Connecting
-    /// </summary>
-    private boolean HandleExistingMessagesOnConnect;
-    /// <summary>
-    /// Whether to download List of Gifts for Room when Connecting
-    /// </summary>
-    private boolean DownloadGiftInfo;
+    /**
+     * Wait to connect again for selected amount of time
+     */
+    private Duration retryConnectionTimeout;
 
-    /// <summary>
-    /// Whether to print Logs to Console
-    /// </summary>
+    /**
+     * Whether to handle Messages received from Room when Connecting
+     */
+    private boolean handleExistingMessagesOnConnect;
+    /**
+     * Whether to download List of Gifts for Room when Connecting
+     */
+    private boolean downloadGiftInfo;
 
-    private boolean PrintToConsole;
-    /// <summary>
-    /// LoggingLevel for Logs
-    /// </summary>
-    private Level LogLevel;
+    /**
+     * Whether to print Logs to Console
+     */
 
-    /// <summary>
-    /// Whether to print Base64-Data for Messages to Console
-    /// </summary>
-    private boolean PrintMessageData;
+    private boolean printToConsole;
+    /**
+     * LoggingLevel for Logs
+     */
+    private Level logLevel;
+
+    /**
+     * Whether to print Base64-Data for Messages to Console
+     */
+    private boolean printMessageData;
+
+    /**
+     * Tiktok user name
+     */
+    private String hostName;
+
+
+    /**
+     * Parameters used in requests to Tiktok api
+     */
+    private Map<String, Object> clientParameters;
+
+
+    /*
+     * Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId
+     *  documentation how to obtain sessionId https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages
+     */
+    private String sessionId;
 
-    /// <summary>
-    /// Whether to check Messages for Unparsed Data
-    /// </summary>
-    private boolean CheckForUnparsedData;
 }
 

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

@@ -8,62 +8,57 @@ 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() {
         var clientSettings = new ClientSettings();
-
         clientSettings.setTimeout(Duration.ofSeconds(DEFAULT_TIMEOUT));
-        clientSettings.setPollingInterval(Duration.ofSeconds(DEFAULT_POLLTIME));
         clientSettings.setClientLanguage("en-US");
         clientSettings.setHandleExistingMessagesOnConnect(true);
         clientSettings.setDownloadGiftInfo(true);
-        clientSettings.setRetryOnConnectionFailure(true);
-        clientSettings.setSocketBufferSize(500_000);
-        clientSettings.setPrintToConsole(true);
+        clientSettings.setRetryOnConnectionFailure(false);
+        clientSettings.setRetryConnectionTimeout(Duration.ofSeconds(1));
+        clientSettings.setPrintToConsole(false);
         clientSettings.setLogLevel(Level.ALL);
-        clientSettings.setCheckForUnparsedData(false);
         clientSettings.setPrintMessageData(false);
+        clientSettings.setClientParameters(Constants.DefaultClientParams());
         return clientSettings;
     }
 
 
+    /**
+     * 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");
@@ -102,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

@@ -2,94 +2,96 @@ package io.github.jwdeveloper.tiktok.events;
 
 import io.github.jwdeveloper.tiktok.events.messages.*;
 
-import java.util.function.Consumer;
-
-
 
 public interface TikTokEventBuilder<T> {
-    T onUnhandledSocial(Consumer<TikTokUnhandledSocialEvent> event);
+    T onUnhandledSocial(TikTokEventConsumer<TikTokUnhandledSocialEvent> event);
 
-    T onLinkMicFanTicket(Consumer<TikTokLinkMicFanTicketEvent> event);
+    T onLinkMicFanTicket(TikTokEventConsumer<TikTokLinkMicFanTicketEvent> event);
 
-    T onEnvelope(Consumer<TikTokEnvelopeEvent> event);
+    T onEnvelope(TikTokEventConsumer<TikTokEnvelopeEvent> event);
 
-    T onShopMessage(Consumer<TikTokShopMessageEvent> event);
+    T onShopMessage(TikTokEventConsumer<TikTokShopMessageEvent> event);
 
-    T onDetectMessage(Consumer<TikTokDetectMessageEvent> event);
+    T onDetectMessage(TikTokEventConsumer<TikTokDetectMessageEvent> event);
 
-    T onLinkLayerMessage(Consumer<TikTokLinkLayerMessageEvent> event);
+    T onLinkLayerMessage(TikTokEventConsumer<TikTokLinkLayerMessageEvent> event);
 
-    T onConnected(Consumer<TikTokConnectedEvent> event);
+    T onConnected(TikTokEventConsumer<TikTokConnectedEvent> event);
 
-    T onCaption(Consumer<TikTokCaptionEvent> event);
+    T onCaption(TikTokEventConsumer<TikTokCaptionEvent> event);
 
-    T onQuestion(Consumer<TikTokQuestionEvent> event);
+    T onQuestion(TikTokEventConsumer<TikTokQuestionEvent> event);
 
-    T onRoomPinMessage(Consumer<TikTokRoomPinMessageEvent> event);
+    T onRoomPinMessage(TikTokEventConsumer<TikTokRoomPinMessageEvent> event);
 
-    T onRoomMessage(Consumer<TikTokRoomMessageEvent> event);
+    T onRoomMessage(TikTokEventConsumer<TikTokRoomMessageEvent> event);
 
-    T onLivePaused(Consumer<TikTokLivePausedEvent> event);
+    T onLivePaused(TikTokEventConsumer<TikTokLivePausedEvent> event);
 
-    T onLike(Consumer<TikTokLikeEvent> event);
+    T onLike(TikTokEventConsumer<TikTokLikeEvent> event);
 
-    T onLinkMessage(Consumer<TikTokLinkMessageEvent> event);
+    T onLinkMessage(TikTokEventConsumer<TikTokLinkMessageEvent> event);
 
-    T onBarrageMessage(Consumer<TikTokBarrageMessageEvent> event);
+    T onBarrageMessage(TikTokEventConsumer<TikTokBarrageMessageEvent> event);
 
-    T onGiftMessage(Consumer<TikTokGiftMessageEvent> event);
+    T onGiftMessage(TikTokEventConsumer<TikTokGiftMessageEvent> event);
 
-    T onLinkMicArmies(Consumer<TikTokLinkMicArmiesEvent> event);
+    T onLinkMicArmies(TikTokEventConsumer<TikTokLinkMicArmiesEvent> event);
 
-    T onEmote(Consumer<TikTokEmoteEvent> event);
+    T onEmote(TikTokEventConsumer<TikTokEmoteEvent> event);
 
-    T onUnauthorizedMember(Consumer<TikTokUnauthorizedMemberEvent> event);
+    T onUnauthorizedMember(TikTokEventConsumer<TikTokUnauthorizedMemberEvent> event);
 
-    T onInRoomBanner(Consumer<TikTokInRoomBannerEvent> event);
+    T onInRoomBanner(TikTokEventConsumer<TikTokInRoomBannerEvent> event);
 
-    T onLinkMicMethod(Consumer<TikTokLinkMicMethodEvent> event);
+    T onLinkMicMethod(TikTokEventConsumer<TikTokLinkMicMethodEvent> event);
 
-    T onSubscribe(Consumer<TikTokSubscribeEvent> event);
+    T onSubscribe(TikTokEventConsumer<TikTokSubscribeEvent> event);
 
-    T onPollMessage(Consumer<TikTokPollMessageEvent> event);
+    T onPollMessage(TikTokEventConsumer<TikTokPollMessageEvent> event);
 
-    T onFollow(Consumer<TikTokFollowEvent> event);
+    T onFollow(TikTokEventConsumer<TikTokFollowEvent> event);
 
-    T onRoomViewerData(Consumer<TikTokRoomViewerDataEvent> event);
+    T onRoomViewerData(TikTokEventConsumer<TikTokRoomViewerDataEvent> event);
 
-    T onGoalUpdate(Consumer<TikTokGoalUpdateEvent> event);
+    T onGoalUpdate(TikTokEventConsumer<TikTokGoalUpdateEvent> event);
 
-    T onComment(Consumer<TikTokCommentEvent> event);
+    T onComment(TikTokEventConsumer<TikTokCommentEvent> event);
 
-    T onRankUpdate(Consumer<TikTokRankUpdateEvent> event);
+    T onRankUpdate(TikTokEventConsumer<TikTokRankUpdateEvent> event);
 
-    T onIMDelete(Consumer<TikTokIMDeleteEvent> event);
+    T onIMDelete(TikTokEventConsumer<TikTokIMDeleteEvent> event);
 
-    T onLiveEnded(Consumer<TikTokLiveEndedEvent> event);
+    T onLiveEnded(TikTokEventConsumer<TikTokLiveEndedEvent> event);
 
-    T onError(Consumer<TikTokErrorEvent> event);
+    T onError(TikTokEventConsumer<TikTokErrorEvent> event);
 
-    T onUnhandled(Consumer<TikTokUnhandledEvent> event);
+    T onUnhandled(TikTokEventConsumer<TikTokUnhandledWebsocketMessageEvent> event);
 
-    T onJoin(Consumer<TikTokJoinEvent> event);
+    T onJoin(TikTokEventConsumer<TikTokJoinEvent> event);
 
-    T onRankText(Consumer<TikTokRankTextEvent> event);
+    T onRankText(TikTokEventConsumer<TikTokRankTextEvent> event);
 
-    T onShare(Consumer<TikTokShareEvent> event);
+    T onShare(TikTokEventConsumer<TikTokShareEvent> event);
 
-    T onUnhandledMember(Consumer<TikTokUnhandledMemberEvent> event);
+    T onUnhandledMember(TikTokEventConsumer<TikTokUnhandledMemberEvent> event);
 
-    T onSubNotify(Consumer<TikTokSubNotifyEvent> event);
+    T onSubNotify(TikTokEventConsumer<TikTokSubNotifyEvent> event);
 
-    T onLinkMicBattle(Consumer<TikTokLinkMicBattleEvent> event);
+    T onLinkMicBattle(TikTokEventConsumer<TikTokLinkMicBattleEvent> event);
 
-    T onDisconnected(Consumer<TikTokDisconnectedEvent> event);
+    T onDisconnected(TikTokEventConsumer<TikTokDisconnectedEvent> event);
 
-    T onGiftBroadcast(Consumer<TikTokGiftBroadcastEvent> event);
+    T onGiftBroadcast(TikTokEventConsumer<TikTokGiftBroadcastEvent> event);
 
-    T onUnhandledControl(Consumer<TikTokUnhandledControlEvent> event);
+    T onUnhandledControl(TikTokEventConsumer<TikTokUnhandledControlEvent> event);
+
+    T onEvent(TikTokEventConsumer<TikTokEvent> event);
+
+    T onWebsocketMessage(TikTokEventConsumer<TikTokWebsocketMessageEvent> event);
+
+    T onReconnecting(TikTokEventConsumer<TikTokReconnectingEvent> event);
 
-    T onEvent(Consumer<TikTokEvent> event);
 }
 
 

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

@@ -2,7 +2,7 @@ package io.github.jwdeveloper.tiktok.events;
 
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 
-public interface TikTokLiveEvent<T extends TikTokEvent>
+public interface TikTokEventConsumer<T extends TikTokEvent>
 {
      void onEvent(LiveClient liveClient, T 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,40 +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.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastGiftMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokGiftMessageEvent extends TikTokEvent {
-  private final Gift gift;
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokGiftMessageEvent extends TikTokHeaderEvent {
 
-  @Nullable
-  private User sender;
+      Gift gift;
+      User sender;
+      String purchaseId;
+      String receipt;
+      Long comboCount;
+      Boolean streakFinished;
+      Long streakIndex;
 
-  private final String purchaseId;
-
-  private final String receipt;
-
-  private final Integer amount;
-
-  private final  Boolean streakFinished;
-
-  private final Integer streakIndex;
-
-  public TikTokGiftMessageEvent(WebcastGiftMessage msg) {
-    super(msg.getHeader());;
-    gift = new Gift(msg.getGiftDetails());
-    if(msg.hasSender())
-    {
-      sender = new User(msg.getSender());
+    public TikTokGiftMessageEvent(WebcastGiftMessage msg) {
+        super(msg.getCommon());
+        gift = new Gift(msg.getGift());
+        sender = User.MapOrEmpty(msg.getUser());
+        purchaseId = msg.getLogId();
+        receipt = msg.getMonitorExtra();
+        comboCount = msg.getComboCount();
+        streakFinished = msg.getRepeatEnd() > 0; //todo check values
+        streakIndex = msg.getRepeatCount();
     }
-    purchaseId = msg.getLogId();
-    receipt = msg.getReceiptJson();
-    amount = msg.getAmount();
-    streakFinished = msg.getRepeatEnd();
-    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,17 +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.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastImDeleteMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokIMDeleteEvent extends TikTokEvent {
-  private final String data1;
-  private final String data2;
+@EventMeta(eventType = EventType.Message)
+public class TikTokIMDeleteEvent extends TikTokHeaderEvent {
+    private final byte[] data;
 
-  public TikTokIMDeleteEvent(WebcastImDeleteMessage msg) {
-    super(msg.getHeader());;
-    data1 = msg.getData1();
-    data2 = msg.getData2();
-  }
+    public TikTokIMDeleteEvent(WebcastImDeleteMessage msg) {
+        super(msg.getHeader());
+        data = msg.getData().toByteArray();
+    }
 }

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;
@@ -20,10 +24,15 @@ public class TikTokRankUpdateEvent extends TikTokEvent {
     var rankData = msg.getData().getRankings();
     eventType = rankData.getType();
     label = rankData.getLabel();
-    rank = rankData.getDetails(0).getLabel();
+    if(rankData.getDetailsList().isEmpty())
+    {
+      rank = "";
+    }
+    else
+    {
+      rank = rankData.getDetails(0).getLabel();
+    }
     color = rankData.getColor().getColor();
-
-
   }
 
   public TikTokRankUpdateEvent(WebcastRankUpdateMessage msg) {
@@ -31,7 +40,14 @@ public class TikTokRankUpdateEvent extends TikTokEvent {
     var rankData = msg.getData().getRankData();
     eventType = rankData.getType();
     label = rankData.getLabel();
-    rank = rankData.getDetails(0).getLabel();
+    if(rankData.getDetailsList().isEmpty())
+    {
+      rank = "";
+    }
+    else
+    {
+      rank = rankData.getDetails(0).getLabel();
+    }
     color = rankData.getColor().getColor();
   }
 

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 final 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

@@ -0,0 +1,38 @@
+package io.github.jwdeveloper.tiktok.exceptions;
+
+import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+import lombok.Getter;
+
+import java.util.Base64;
+
+public class TikTokLiveMessageException extends TikTokLiveException {
+
+    @Getter
+    private final WebcastResponse.Message webcastMessage;
+    @Getter
+    private final WebcastResponse webcastResponse;
+
+
+    public TikTokLiveMessageException(WebcastResponse.Message message,
+                                      WebcastResponse webcastResponse,
+                                      Throwable cause) {
+        super("Error while handling Message: " + message.getType() + ": \n", cause);
+        this.webcastMessage = message;
+        this.webcastResponse = webcastResponse;
+    }
+
+    public String messageName()
+    {
+        return webcastMessage.getType();
+    }
+
+    public String messageToBase64()
+    {
+        return Base64.getEncoder().encodeToString(webcastMessage.getBinary().toByteArray());
+    }
+
+    public String webcastResponseToBase64()
+    {
+        return  Base64.getEncoder().encodeToString(webcastResponse.toByteArray());
+    }
+}

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

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

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

@@ -0,0 +1,8 @@
+package io.github.jwdeveloper.tiktok.exceptions;
+
+public class TikTokLiveOfflineHostException extends TikTokLiveException
+{
+    public TikTokLiveOfflineHostException(String message) {
+        super(message);
+    }
+}

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

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

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

@@ -0,0 +1,15 @@
+package io.github.jwdeveloper.tiktok.exceptions;
+
+
+public class TikTokMessageMappingException extends TikTokLiveException
+{
+    public TikTokMessageMappingException(Class<?> inputClazz, Class<?> outputClass, Throwable throwable)
+    {
+        super("Unable to handle mapping from class: " + inputClazz.getSimpleName() + " to class " + outputClass.getSimpleName(),throwable);
+    }
+
+    public TikTokMessageMappingException(Class<?> inputClazz, Class<?> outputClass, String message)
+    {
+        super("Unable to handle mapping from class: " + inputClazz.getSimpleName() + " to class " + outputClass.getSimpleName()+": "+message);
+    }
+}

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

@@ -0,0 +1,15 @@
+package io.github.jwdeveloper.tiktok.exceptions;
+
+import lombok.Getter;
+
+public class TikTokProtocolBufferException extends TikTokLiveException
+{
+    @Getter
+    private final byte[] bytes;
+
+    public TikTokProtocolBufferException(String message, byte[] bytes, Throwable cause)
+    {
+        super(message, cause);
+        this.bytes = bytes;
+    }
+}

API/src/main/java/io/github/jwdeveloper/tiktok/handler/TikTokMessageHandler.java

@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok.handler;
+
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+
+public interface TikTokMessageHandler
+{
+    TikTokEvent handle(WebcastResponse.Message message) throws Exception;
+}

API/src/main/java/io/github/jwdeveloper/tiktok/http/Resource/ClientFetchDataResponse.java

@@ -1,7 +0,0 @@
-package io.github.jwdeveloper.tiktok.http.Resource;
-
-import lombok.Data;
-
-@Data
-public class ClientFetchDataResponse {
-}

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

@@ -0,0 +1,30 @@
+package io.github.jwdeveloper.tiktok.live;
+
+import io.github.jwdeveloper.tiktok.events.objects.TikTokGift;
+import io.github.jwdeveloper.tiktok.models.GiftId;
+import io.github.jwdeveloper.tiktok.models.gifts.TikTokGiftInfo;
+
+import java.util.Map;
+
+public interface GiftManager {
+
+     /**
+      *  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,10 +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,7 @@ package io.github.jwdeveloper.tiktok.live;
 public interface LiveRoomInfo
 {
      int getViewersCount();
-
      String getRoomId();
      String getUserName();
+     ConnectionState getConnectionState();
 }

API/src/main/java/io/github/jwdeveloper/tiktok/models/GiftId.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @AllArgsConstructor
 public class GiftId
 {
-    public long Gift;
+    private long giftId;
 
-    public String UserName;
+    private String userName;
 }

API/src/main/java/io/github/jwdeveloper/tiktok/models/GiftStrike.java

@@ -0,0 +1,6 @@
+package io.github.jwdeveloper.tiktok.models;
+
+public enum GiftStrike
+{
+    BEGIN, UPDATE, ENDED
+}

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

@@ -3,14 +3,13 @@ package io.github.jwdeveloper.tiktok.models.gifts;
 import lombok.Data;
 
 @Data
-public class DefaultFormat
-{
-    private boolean bold ;
-    private String color ;
-    private int font_size ;
-    private boolean italic ;
-    private int italic_angle ;
-    private boolean use_highlight_color ;
-    private boolean use_remote_color ;
-    private int weight ;
+public class DefaultFormat {
+    private boolean bold;
+    private String color;
+    private int font_size;
+    private boolean italic;
+    private int italic_angle;
+    private boolean use_highlight_color;
+    private boolean use_remote_color;
+    private int weight;
 }

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

@@ -5,10 +5,9 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class DisplayText
-{
-    private DefaultFormat default_format ;
-    private String default_pattern ;
-    private String key ;
-    private List<Object> pieces ;
+public class DisplayText {
+    private DefaultFormat default_format;
+    private String default_pattern;
+    private String key;
+    private List<Object> pieces;
 }

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

@@ -5,14 +5,13 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class GiftLabelIcon
-{
-    private String avg_color ;
-    private int height ;
-    private int image_type ;
-    private boolean is_animated ;
-    private String open_web_url ;
-    private String uri ;
-    private List<String> url_list ;
-    private int width ;
+public class GiftLabelIcon {
+    private String avg_color;
+    private int height;
+    private int image_type;
+    private boolean is_animated;
+    private String open_web_url;
+    private String uri;
+    private List<String> url_list;
+    private int width;
 }

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

@@ -6,10 +6,9 @@ import java.util.List;
 
 
 @Data
-public class GiftPanelBanner
-{
-    private List<Object> bg_color_values ;
-    private DisplayText display_text ;
-    private LeftIcon left_icon ;
-    private String schema_url ;
+public class GiftPanelBanner {
+    private List<Object> bg_color_values;
+    private DisplayText display_text;
+    private LeftIcon left_icon;
+    private String schema_url;
 }

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

@@ -5,14 +5,13 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class Image
-{
-    private String avg_color ;
-    private int height ;
-    private int image_type ;
-    private boolean is_animated ;
-    private String open_web_url ;
-    private String uri ;
-    private List<String> url_list ;
-    private int width ;
+public class Image {
+    private String avg_color;
+    private int height;
+    private int image_type;
+    private boolean is_animated;
+    private String open_web_url;
+    private String uri;
+    private List<String> url_list;
+    private int width;
 }

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

@@ -5,16 +5,15 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class LeftIcon
-{
-    private String avg_color ;
-    private int height ;
-    private int image_type ;
-    private boolean is_animated ;
-    private String open_web_url ;
-    private String uri ;
-    private List<String> url_list ;
-    private int width ;
+public class LeftIcon {
+    private String avg_color;
+    private int height;
+    private int image_type;
+    private boolean is_animated;
+    private String open_web_url;
+    private String uri;
+    private List<String> url_list;
+    private int width;
 }
 
 

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

@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.models.gifts;
 
+import lombok.Data;
+
+@Data
 public class LockInfo
 {
-    public int lock_type;
+    private int lock_type;
 }

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

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class TikTokGift
+public class TikTokGiftInfo
 {
     private int action_type;
     private int app_id;

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>1.0.0</version>
+        <version>0.0.22-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,6 +29,23 @@
             <artifactId>protobuf-java</artifactId>
             <version>3.24.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.java-websocket</groupId>
+            <artifactId>Java-WebSocket</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.7</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
 

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

@@ -1,45 +1,49 @@
 package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.events.objects.TikTokGift;
-import io.github.jwdeveloper.tiktok.http.TikTokApiService;
+import io.github.jwdeveloper.tiktok.live.GiftManager;
+import io.github.jwdeveloper.tiktok.messages.WebcastGiftMessage;
 import io.github.jwdeveloper.tiktok.models.GiftId;
-
+import io.github.jwdeveloper.tiktok.models.gifts.TikTokGiftInfo;
 import lombok.Getter;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 
-public class TikTokGiftManager {
-    private Logger logger;
-    private ClientSettings clientSettings;
-    private TikTokApiService apiService;
-    private Map<Integer, TikTokGift> gifts;
+public class TikTokGiftManager implements GiftManager {
 
     @Getter
-    private Map<GiftId, TikTokGift> activeGifts;
+    private final Map<Integer, TikTokGiftInfo> giftsInfo;
 
-    public TikTokGiftManager(Logger logger, TikTokApiService apiService, ClientSettings clientSettings) {
-        this.logger = logger;
-        this.clientSettings = clientSettings;
-        this.apiService = apiService;
-        this.gifts = new HashMap<>();
+    @Getter
+    private final Map<GiftId, TikTokGift> activeGifts;
+
+    public TikTokGiftManager() {
+        giftsInfo = new HashMap<>();
         activeGifts = new HashMap<>();
     }
 
-    public void loadGifts() {
-        if (!clientSettings.isDownloadGiftInfo()) {
-            return;
+    public TikTokGift updateActiveGift(WebcastGiftMessage giftMessage) {
+        var giftId = new GiftId(giftMessage.getGiftId(), giftMessage.getUser().getIdStr());
+        if (activeGifts.containsKey(giftId)) {
+            var gift = activeGifts.get(giftId);
+            gift.setAmount(giftMessage.getComboCount());
+        } else {
+            var newGift = new TikTokGift(giftMessage);
+            activeGifts.put(giftId, newGift);
         }
-        logger.info("Fetching gifts");
-        //TODO gifts =apiService.fetchAvailableGifts();
+
+        var gift = activeGifts.get(giftId);
+
+        if (giftMessage.getRepeatEnd() > 0)
+        {
+            gift.setStreakFinished(true);
+            activeGifts.remove(giftId);
+        }
+        return gift;
     }
 
-    public List<TikTokGift> getGifts()
-    {
-        return gifts.values().stream().toList();
+    public void loadGifsInfo(Map<Integer, TikTokGiftInfo> gifts) {
+        this.giftsInfo.putAll(gifts);
     }
-
-
 }

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

@@ -8,6 +8,4 @@ public class TikTokLive
     {
         return new TikTokLiveClientBuilder(userName);
     }
-
-
 }