Update README.md

Develop 1 0 10

API/pom.xml

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

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

@@ -56,7 +56,7 @@ public class ClientSettings {
      * Whether to print Logs to Console
      */
 
-    private boolean printToConsole;
+    private boolean printToConsole = true;
     /**
      * LoggingLevel for Logs
      */
@@ -64,7 +64,7 @@ public class ClientSettings {
 
 
     /**
-     *  Optional: Use it if you need to change TikTok live hostname in builder
+     * Optional: Use it if you need to change TikTok live hostname in builder
      */
     private String hostName;
 

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

@@ -26,7 +26,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
-public @interface TikTokEventHandler
+public @interface TikTokEventObserver
 {
 
 }

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

@@ -20,18 +20,17 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.tables;
+package io.github.jwdeveloper.tiktok.data.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Value;
+
+import java.time.Duration;
 
 @Data
-public class TikTokResponseModel
+@AllArgsConstructor
+public class MessageMetaData
 {
-    private Integer id;
-
-    private String hostName;
-
-    private String response;
-
-    private String createdAt;
+    private Duration handlingTime;
 }

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.data.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class TikTokUserInfo
+{
+    UserStatus userStatus;
+
+    String roomId;
+
+    public enum UserStatus
+    {
+        NotFound,
+        Offline,
+        LivePaused,
+        Live
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.data.events;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
+
+import io.github.jwdeveloper.tiktok.data.models.users.User;
+import lombok.Data;
+
+
+@Data
+@EventMeta(eventType = EventType.Message)
+public class CustomEvent extends TikTokHeaderEvent {
+    private final User user;
+    private final String title;
+
+    public CustomEvent(User user, String title) {
+        this.user = user;
+        this.title = title;
+    }
+}

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

@@ -47,11 +47,11 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
 
     public TikTokCommentEvent(WebcastChatMessage msg) {
         super(msg.getCommon());
-        user = User.map(msg.getUser());
+        user = User.map(msg.getUser(),msg.getUserIdentity());
         text = msg.getContent();
         visibleToSender = msg.getVisibleToSender();
         getUserLanguage = msg.getContentLanguage();
-        mentionedUser = User.map(msg.getAtUser(),msg.getUserIdentity());
+        mentionedUser = User.map(msg.getAtUser());
         pictures = msg.getEmotesListList().stream().map(e -> Picture.map(e.getEmote().getImage())).toList();
     }
 }

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

@@ -34,18 +34,10 @@ import java.util.List;
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkEvent extends TikTokHeaderEvent {
-    private final String token;
 
-    private User user;
-
-    private final List<User> otherUsers;
 
     public TikTokLinkEvent(WebcastLinkMessage msg) {
         super(msg.getCommon());
-        token = msg.getToken();
-        if (msg.getUser().getUser().hasUser()) {
-            user = new User(msg.getUser().getUser().getUser());
-        }
-        otherUsers = msg.getUser().getOtherUsersList().stream().map(e -> new User(e.getUser())).toList();
+
     }
 }

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

@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 package io.github.jwdeveloper.tiktok.data.events;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;

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

@@ -26,7 +26,9 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.data.models.users.UserAttribute;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSubNotifyMessage;
 import lombok.Getter;
 
 /**
@@ -34,16 +36,20 @@ import lombok.Getter;
  */
 @Getter
 @EventMeta(eventType = EventType.Message)
-public class TikTokSubscribeEvent extends TikTokHeaderEvent {
-  private User user;
+public class TikTokSubscribeEvent extends TikTokHeaderEvent
+{
+    private final User user;
 
-  public TikTokSubscribeEvent(WebcastMemberMessage msg) {
-    super(msg.getCommon());
-
-    if(msg.hasUser())
-    {
-      user = new User(msg.getUser());
+    public TikTokSubscribeEvent(WebcastMemberMessage msg) {
+        super(msg.getCommon());
+        user = User.map(msg.getUser());
+        user.addAttribute(UserAttribute.Subscriber);
+    }
+
+    public TikTokSubscribeEvent(WebcastSubNotifyMessage msg) {
+        super(msg.getCommon());
+        user = User.map(msg.getUser());
+        user.addAttribute(UserAttribute.Subscriber);
     }
-  }
 
 }

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

@@ -26,28 +26,34 @@ package io.github.jwdeveloper.tiktok.data.events.gift;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
+import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
 import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.Getter;
 
+import java.util.ArrayList;
 
-/*
+
+/**
  * Triggered when user sends gifts that has
- *  no combo (most of expensive gifts)
- *  or if combo has finished
+ * no combo (most of expensive gifts)
+ * or if combo has finished
  */
 @EventMeta(eventType = EventType.Message)
 @Getter
 public class TikTokGiftEvent extends TikTokHeaderEvent {
     private final Gift gift;
     private final User user;
+    private final User toUser;
     private final int combo;
+
     public TikTokGiftEvent(Gift gift, WebcastGiftMessage msg) {
         super(msg.getCommon());
         this.gift = gift;
         user = User.map(msg.getUser(), msg.getUserIdentity());
+        toUser = new User(msg.getUserGiftReciever().getUserId(), "", "", new Picture(""), 0, 0, new ArrayList<>());
         combo = msg.getComboCount();
     }
-}
+}

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

@@ -0,0 +1,20 @@
+package io.github.jwdeveloper.tiktok.data.events.http;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.models.http.HttpData;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@EventMeta(eventType = EventType.Debug)
+public class TikTokHttpResponseEvent extends TikTokEvent
+{
+    String url;
+
+    HttpData response;
+
+    HttpData request;
+}

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

@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 package io.github.jwdeveloper.tiktok.data.events.room;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;

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

@@ -24,7 +24,9 @@ package io.github.jwdeveloper.tiktok.data.events.websocket;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -34,22 +36,32 @@ import java.time.Duration;
 
 
 /**
- * Triggered every time a protobuf encoded webcast message arrives. You can deserialize the binary object depending on the use case.
+ * Triggered every time TikTok sends data. Data incoming as protobuf message.
+ * You can deserialize the binary object depending on the use case.
  */
 @Getter
 @AllArgsConstructor
 @EventMeta(eventType = EventType.Debug)
-public class TikTokWebsocketMessageEvent extends TikTokEvent
-{
-    private TikTokEvent event;
+public class TikTokWebsocketMessageEvent extends TikTokEvent {
 
+    /*
+     * Original message that is coming from TikTok
+     *  message.method - Name of message type, for example "WebcastGiftMessage"
+     *  message.payload - Bytes array that contains actual data of message.
+     *                    Example of parsing, WebcastGiftMessage giftMessage = WebcastGiftMessage.parseFrom(message.getPayload());
+     */
     private WebcastResponse.Message message;
 
-    private MetaData metaData;
+    /*
+     * TikTokLiveJava event that was created from TikTok message data
+     * Example: TikTokGiftEvent
+     */
+    private TikTokEvent event;
+
+    /*
+     * Metadata information about mapping message to event, such as time and stuff
+     */
+    private MessageMetaData metaData;
+
 
-    @Value
-    public static class MetaData
-    {
-        Duration handlingTime;
-    }
 }

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

@@ -39,4 +39,9 @@ public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<W
     public TikTokWebsocketUnhandledMessageEvent(WebcastResponse.Message data) {
         super(data);
     }
+
+    public WebcastResponse.Message getMessage()
+    {
+        return this.getData();
+    }
 }

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

@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 package io.github.jwdeveloper.tiktok.data.models.chest;
 
 

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

@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 // This enum is generated
 package io.github.jwdeveloper.tiktok.data.models.gifts;
 
@@ -33,6 +55,8 @@ public enum Gift {
 
   PANTHER_PAWS_8358(8358, "Panther Paws", 199, "https://storage.streamdps.com/iblock/a25/a25d2409e1d851566987913c9fb9860f/6aeb9164cf39e2602933d28dbd106119.webp"),
 
+  GOLDEN_PARTY(9499, "Golden Party", 3000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/a00450f3e3aa1f01b62774950e5729c3.png~tplv-obj.jpg"),
+
   SHOOTING_STARS(5753, "Shooting Stars", 1580, "https://storage.streamdps.com/iblock/b36/b36bb8c332ade25b2e591cd3ed164a99/a06c10f4dc562c24f4f5b6812b9fa01f.png"),
 
   LION(6369, "Lion", 29999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/4fb89af2082a290b37d704e20f4fe729~tplv-obj.jpg"),
@@ -47,6 +71,8 @@ public enum Gift {
 
   MAKE_UP_BOX(6033, "Make-up Box", 1999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/a29aa87203ec09c699e3dafa1944b23e~tplv-obj.jpg"),
 
+  PLAY_SAMBA(5793, "Play Samba", 99, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/fd3d6cc127464bacded6ed009074ae2f~tplv-obj.png"),
+
   LITTLE_CROWN(6097, "Little Crown", 99, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/cf3db11b94a975417043b53401d0afe1~tplv-obj.jpg"),
 
   RUBY_RED(8434, "Ruby red", 88, "https://storage.streamdps.com/iblock/405/405fcf52a1de3d14ab9834c1f30cc330/0deed9ee2c79ba6bf2005b0ce667bf60.webp"),
@@ -155,6 +181,8 @@ public enum Gift {
 
   COWBOY_HAT(8842, "Cowboy Hat", 199, "https://storage.streamdps.com/iblock/5f3/5f3df5eccbc82f458fdacd0f82d13e40/40980853c80e3da0e902a1db49ea9798.webp"),
 
+  FESTA_JUNINA_S_HAT(8638, "Festa Junina's Hat", 199, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/61b32ccce11b289b3c1db7438dfb4450~tplv-obj.png"),
+
   SPORTS_CAR(6089, "Sports Car", 7000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/e7ce188da898772f18aaffe49a7bd7db~tplv-obj.jpg"),
 
   ICE_TEA(5464, "Ice Tea", 1, "https://storage.streamdps.com/iblock/531/5313a4ca89a7c7588a88898c8f1e9053/dab85392562772099474a050c251d340.png"),
@@ -199,6 +227,8 @@ public enum Gift {
 
   GIFT_BOX_6835(6835, "Gift Box", 3999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/3646c259f8ce6f79c762ad00ce51dda0~tplv-obj.jpg"),
 
+  FISHING_GEAR(5956, "Fishing Gear", 199, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/1b2353958374f585e25b2f2344c6d0ad~tplv-obj.png"),
+
   ARCADE_GAME(5876, "Arcade Game", 1200, "https://storage.streamdps.com/iblock/d5a/d5aaa3c8ef3d271c2f93709c3ff51e67/721d870d5a5d9d82d726ff5a9ba3aa5e.png"),
 
   ARCADE_GAME_7041(7041, "Arcade Game", 1200, "https://storage.streamdps.com/iblock/fd0/fd0785612b024900444a0a69083400ff/3181d6af50b05dd65a7ba75902bb5b94.webp"),
@@ -217,6 +247,10 @@ public enum Gift {
 
   GAMEPAD(6052, "Gamepad", 10, "https://storage.streamdps.com/iblock/711/711b578c104edcf1639ff4e2e7779660/6cbb6613fbbd40dac6dfd8857b05545a.png"),
 
+  LIVE_FEST_CLAPPERS(9333, "LIVE Fest Clappers", 100, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/63e85e00169ec5be3bfa90bb004cda5e.png~tplv-obj.png"),
+
+  RAINBOW(8616, "Rainbow", 1, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/5fb7267489192fc77c4c8b647c124680~tplv-obj.png"),
+
   ORANGE_JUICE(5778, "Orange Juice", 1, "https://storage.streamdps.com/iblock/3d6/3d635024d8744f8648306d56a5c4f62f/be0f5f006bd2350e904b23b607e4f06b.png"),
 
   GERRY_THE_GIRAFFE(6842, "Gerry the Giraffe", 1000, "https://storage.streamdps.com/iblock/792/792ef3f53d86b5cb066d5c0bb5b00a87/91aa5cf7f51a533841bea8617419c54d.webp"),
@@ -289,7 +323,9 @@ public enum Gift {
 
   SAKURA_TRAIN(6244, "Sakura Train", 3999, "https://storage.streamdps.com/iblock/a8e/a8e50d5c5d0eaa42bd71dbeca3b1b95a/204910c857958e7e9efd0178d30a2fbe.png"),
 
-  AUTUMN_LEAVES(6967, "Autumn Leaves", 500, "https://storage.streamdps.com/iblock/f04/f042339687e8abaa2fc0e1976d9b11f4/251a0624bc3a23ba39d75467868dcbf8.webp"),
+  AUTUMN_LEAVES(5890, "Autumn leaves", 500, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/30adcaf443df63e3bfd2751ad251f87d~tplv-obj.png"),
+
+  FRANGIPANI(5992, "Frangipani", 1, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/7464fad59650123fe0989e426618847d~tplv-obj.png"),
 
   SKI_GOGGLES(7781, "Ski Goggles", 199, "https://storage.streamdps.com/iblock/f42/f42cbce436db4e60adbf85641a768a12/fa9a4cea3c23829cf6f0725fea8d3c1a.webp"),
 
@@ -329,6 +365,8 @@ public enum Gift {
 
   RABBIT(6348, "Rabbit", 1999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/61b42d630091b661e82fc8ed400b1de2~tplv-obj.jpg"),
 
+  ASMR(6240, "ASMR", 10, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/748e74c8309e08dbc5b03e03f28a0ea0~tplv-obj.png"),
+
   ROSE(5655, "Rose", 1, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/eba3a9bb85c33e017f3648eaf88d7189~tplv-obj.jpg"),
 
   TRENDING_FIGURE(9138, "Trending Figure", 999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/df7b556ccf369bf9a42fe83ec8a77acf.png~tplv-obj.jpg"),
@@ -349,6 +387,8 @@ public enum Gift {
 
   FLAME_HEART(9087, "Flame heart", 1, "https://storage.streamdps.com/iblock/10d/10df10624cdeebe8ff5e0e89e8c8e960/28b8da2878a420f8465cbbc1ec1e6b58.webp"),
 
+  FAIRY_BREAD(5823, "Fairy Bread", 1, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/a42f9ac9cd6b26da03818ff65ac919f1~tplv-obj.png"),
+
   TIKTOK_SHUTTLE(6751, "TikTok Shuttle", 20000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/8ef48feba8dd293a75ae9d4376fb17c9~tplv-obj.jpg"),
 
   MAGGIE(7911, "Maggie", 15000, "https://storage.streamdps.com/iblock/a12/a12a1b23f1f6a19d728de84e1f43e21d/ff288346e9855a9bb6deb4450491028f.webp"),
@@ -361,10 +401,14 @@ public enum Gift {
 
   GAMER_CYBER_MASK(7895, "Gamer Cyber Mask", 399, "https://storage.streamdps.com/iblock/383/383652cc1fd3cae9402eeae3a8f5ee1e/df8a16397bb0ed28c0e522b4cfb26500.webp"),
 
+  HAPPY_FATHER_S_DAY(8712, "Happy Father's Day", 1, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/193eba78ded4d388a0b5a7ae95943796~tplv-obj.png"),
+
   KO(7542, "KO", 20, "https://storage.streamdps.com/iblock/e5e/e5efb63a21695a08d9647508aca3c95e/cffda8af4cc1a9f4a66eb01b11f4db85.webp"),
 
   KO_7655(7655, "KO", 20, "https://storage.streamdps.com/iblock/aa6/aa613e765fe5c42519bd83d2d4705118/7db90e1f83b8c87c74dfdc8ee88440cb.webp"),
 
+  MAGIC_FOREST(9135, "Magic Forest", 6000, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/63a758dbef9788f690e97cd65dbbb8d2~tplv-obj.png"),
+
   LEON_AND_LILI(8916, "Leon and Lili", 9699, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/6958244f3eeb69ce754f735b5833a4aa.png~tplv-obj.jpg"),
 
   MAGIC_STAGE(6263, "Magic Stage", 2599, "https://storage.streamdps.com/iblock/399/399df717aefef9de9259e8256221076f/dfa2835c35b2177701ee65139bdfc59a.png"),
@@ -383,6 +427,8 @@ public enum Gift {
 
   PAIMON_SURPRISE(8299, "Paimon Surprise", 1299, "https://storage.streamdps.com/iblock/ffc/ffc784ca54363f5d1d0c195419a3c19b/27096967caade6f066ce748bf5327244.webp"),
 
+  GOOD_EVENING(8267, "Good Evening", 399, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/0015a756ff783f37a2cf3b5d634b3cd6~tplv-obj.png"),
+
   HI_MAY(6471, "Hi May", 88, "https://storage.streamdps.com/iblock/970/970b0a868ce24c4b7b7059a904fa7b00/622d597d3cec282d6d2c8129fedd5075.png"),
 
   WEDDING(6286, "Wedding", 1400, "https://storage.streamdps.com/iblock/7be/7beeb7f1098cf5f784739a0be38a06f8/0678483823c912e4dea96fa19a2f0d86.png"),
@@ -405,6 +451,8 @@ public enum Gift {
 
   MUSIC_NOTE(5915, "Music Note", 169, "https://storage.streamdps.com/iblock/cc1/cc17f136f458a86943d7fd503c0a34b4/c56797b8b830d159f31fe5ca5527f586.png"),
 
+  FLOWER_SHOW(5831, "Flower Show", 500, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/b6266323ef3ea0d313cbab6911ff8c46~tplv-obj.png"),
+
   MAXWELL(8189, "Maxwell", 10, "https://storage.streamdps.com/iblock/82b/82b7041dcdd8fcc1842c0dd7b5a63099/73736d5ec979ad00f4b771397d9b998b.webp"),
 
   LOVE_DROP(8277, "Love Drop", 1800, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/1ea684b3104abb725491a509022f7c02~tplv-obj.jpg"),
@@ -413,6 +461,8 @@ public enum Gift {
 
   YACHT(6103, "Yacht", 9888, "https://storage.streamdps.com/iblock/b6c/b6c9d3c6df6733cc85149897764d2c6b/023d358a3d7a7a330ed006eb07117582.png"),
 
+  YACHT_9501(9501, "Yacht", 20000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/e69e2626f6ff43d1c1f2b8ae5ea42514.png~tplv-obj.jpg"),
+
   WINDOW_BASKET(8648, "Window basket", 500, "https://storage.streamdps.com/iblock/a8d/a8d0c44c86385d4cd02ad2d840dcb148/8bbdca8666946a2e7172b3eaeed02303.webp"),
 
   SWAN(5897, "Swan", 699, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/97a26919dbf6afe262c97e22a83f4bf1~tplv-obj.jpg"),
@@ -427,6 +477,8 @@ public enum Gift {
 
   SCORPIO_STAR_SIGN(7159, "Scorpio Star Sign", 9999, "https://storage.streamdps.com/iblock/c91/c91f3a3685b5c54d9e96d5f9443c4fda/50c48574ff60f328b7a50b80cd9aa4b8.webp"),
 
+  SOCCER_BALL(5852, "Soccer Ball", 39, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/e1932db6aea81bbddc4e7dc0229ac155~tplv-obj.png"),
+
   GAME_CONTROLLER(6467, "Game Controller", 100, "https://storage.streamdps.com/iblock/603/6032c1b0d5c2c07abe04956b3cdd45cd/d75d75a7e81f96f39d2ffd574063924f.png"),
 
   GAME_CONTROLLER_6960(6960, "Game Controller", 100, "https://storage.streamdps.com/iblock/030/030f63329d68d21c5faacab88006a17f/fbb8dd78b47184321d93e3ae5a1f2cca.webp"),
@@ -435,6 +487,8 @@ public enum Gift {
 
   HANGING_LIGHTS(5937, "Hanging Lights", 199, "https://storage.streamdps.com/iblock/e03/e03da22fa8c302dbf1d9439c65380549/6d9f912b5a9253f91c01ed58e3ccbe47.png"),
 
+  FOOTY(5893, "Footy", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/94f8ac5c7b6f90aba713b44ddac40bf1~tplv-obj.png"),
+
   BATIK_CLOTHES(5461, "Batik Clothes", 1000, "https://storage.streamdps.com/iblock/46d/46d0f497391a934d27d9b993f444d8b2/121af719b172eed61d8a75c1b1341c9d.png"),
 
   DANCING_QUEENS(9240, "Dancing queens", 20000, "https://storage.streamdps.com/iblock/c79/c793af446369ecef5238e73312c84ccd/464a76f3e6eaee9afc771f45a4bba9df.webp"),
@@ -481,20 +535,30 @@ public enum Gift {
 
   FOUNTAIN(8887, "Fountain", 1200, "https://storage.streamdps.com/iblock/07d/07d678346c7eb588bc3cbddf343ab791/8f8f50f5350e4b1c0b151aff333e43a4.webp"),
 
+  KOALA(5822, "Koala", 10, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/22c8fa54da366c111f7bb915d4429e2d~tplv-obj.png"),
+
   GARLAND_HEADPIECE(6437, "Garland Headpiece", 199, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/bdbdd8aeb2b69c173a3ef666e63310f3~tplv-obj.jpg"),
 
   AEROBIC_HEADBAND(9255, "Aerobic headband", 99, "https://storage.streamdps.com/iblock/3d9/3d98c2fbc96922da37a9d22881bb06b9/0a99af132ab8e3fe9806d2412abc6bf0.webp"),
 
+  MOUNTAINS(9516, "Mountains", 12000, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/51a7d74bcb4a6417be59f0ffc0b77e96.png~tplv-obj.png"),
+
   FULL_MOON(7222, "Full moon", 299, "https://storage.streamdps.com/iblock/e64/e64dd135280596ce7f1aebbdc3e33a80/494b818b6a4217f1807255ca148c7b2d.webp"),
 
+  CHEEMS_DOG(6486, "Cheems Dog", 199, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/d2c9e50efa3b9ff1ed31c96440a9d3a1~tplv-obj.png"),
+
   CAT_PAWS(6046, "Cat Paws", 1, "https://storage.streamdps.com/iblock/c04/c04061e18b637df6759417bfe5418c9c/89bc2c5278f4a3c28acebdd10f6bc089.webp"),
 
   WAVING_HAND(5959, "Waving Hand", 7, "https://storage.streamdps.com/iblock/6da/6da44060164719c3bcb171fb06d6d0d4/a80d1fa6879b0970246f41c444dca47c.webp"),
 
+  FRUITS_HAT_(6744, "Fruits Hat ", 199, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/2316b31fc5259cc29f281d88fbca0568~tplv-obj.png"),
+
   BUBBLES(5850, "Bubbles", 500, "https://storage.streamdps.com/iblock/4b1/4b1a012395fd18f6ed835539089dd3c3/98688050698f0180bdd46018a4e98ec1.png"),
 
   SILVER_SPORTS_CAR(8433, "Silver sports car", 5000, "https://storage.streamdps.com/iblock/132/132eb0981780e3e268f844106037b277/a1afff85fc6c53482fccbea21709d36b.webp"),
 
+  LIGHTNING_STORM(9515, "Lightning Storm", 6000, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/6f673fbb0ae6860e2b1e254538c958ba.png~tplv-obj.png"),
+
   RACCOON(8448, "Raccoon", 15, "https://storage.streamdps.com/iblock/539/5396582d174489f32525f871cb3087f8/041896a3554f3d4b8c86f486bc81b125.webp"),
 
   HEART_ME(7934, "Heart Me", 1, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/d56945782445b0b8c8658ed44f894c7b~tplv-obj.jpg"),
@@ -503,6 +567,8 @@ public enum Gift {
 
   TIKTOK_TROPHY(7357, "TikTok Trophy", 699, "https://storage.streamdps.com/iblock/7f6/7f6d5df92bf4b5b559567b9a870d485f/1811197db0860ff395435d51d35598ef.webp"),
 
+  LOVE_BOMB(6050, "Love Bomb", 299, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/2a1c1b14f5e9f7be5d76fa4928f574f1~tplv-obj.png"),
+
   TENNIS(6169, "Tennis", 1, "https://storage.streamdps.com/iblock/f20/f20121609887f7ff35952c1bc52529e2/9ff66229b1f81d21b15444ba2b53db98.png"),
 
   NECKLACE(5662, "Necklace", 400, "https://storage.streamdps.com/iblock/a40/a40013bbd1e38e11c0772f8b605c6c25/567d58bd02385de4af1523980cb03a85.png"),
@@ -515,6 +581,8 @@ public enum Gift {
 
   BIRTHDAY_CAKE_9097(9097, "Birthday Cake", 1, "https://storage.streamdps.com/iblock/5b9/5b9eca4a99e965cb25183681a07a5276/c28f7e9c4a8e42460225ff2d12300ae7.webp"),
 
+  BANANA_LEAF_VESSEL(5991, "Banana leaf vessel", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/8e635863e20cfa3651bd8a5b762ae72d~tplv-obj.png"),
+
   ICE_LOLLY(6545, "Ice Lolly", 10, "https://storage.streamdps.com/iblock/93d/93dda2498d64aa0a29d444103a7804dd/92fd7397fffbaa8755cb233815964bbf.png"),
 
   CONFETTI(5585, "Confetti", 100, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/cb4e11b3834e149f08e1cdcc93870b26~tplv-obj.jpg"),
@@ -547,6 +615,8 @@ public enum Gift {
 
   CELEBRATION_TIME(6790, "Celebration Time", 6999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/e73e786041d8218d8e9dbbc150855f1b~tplv-obj.jpg"),
 
+  EXCLUSIVE_YACHT(9524, "Exclusive Yacht", 20000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/da8c85d5ae09ebf320216202e8fa015d.png~tplv-obj.jpg"),
+
   MONTY(7742, "Monty", 1, "https://storage.streamdps.com/iblock/c70/c70e3a9404b18068056d04d5394d739a/4e0e55d9d10a7747b7caf462cd87b4b3.webp"),
 
   PYRAMIDS(8416, "Pyramids", 15000, "https://storage.streamdps.com/iblock/988/988ffe82e8f3b235bd91dac1e31e708d/ad0365d14ba0480e5d6d60f6eb798608.webp"),
@@ -585,16 +655,22 @@ public enum Gift {
 
   SWING(5899, "Swing", 399, "https://storage.streamdps.com/iblock/8a1/8a16a7c5d463793c8c3ab5aa407a87d8/dee86ec9c8e98ebcc58e2e3c09b93d10.png"),
 
+  STORMS_AT_SEA(9514, "Storms at sea", 2200, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/4918fbbdf220873dd8cae4c94d1ae037.png~tplv-obj.png"),
+
   SUPERHERO_FIGHT(8814, "Superhero fight", 30000, "https://storage.streamdps.com/iblock/d6b/d6b1c955153c8f8c5048d6c8f0d1b418/97d04b889e64328e9ab07224f6072b5f.webp"),
 
   COOKIE(6883, "Cookie", 5, "https://storage.streamdps.com/iblock/fd2/fd20c8c619b1d43efb9f2fe1923c48a7/45c056f74c9f214dc55d464eab43b224.webp"),
 
   DOG_BONE(8108, "Dog Bone", 10, "https://storage.streamdps.com/iblock/8ba/8badf8e0a5bcbf8d98ed6c4fc0e16c69/b0a8a8020986eb564713c042d23f83b2.webp"),
 
+  RUSSIAN_CREPES(5547, "Russian Crepes", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/8525a07c6bf16a74eee66e9ad119b3b8.png~tplv-obj.png"),
+
   FLYING_JETS(7482, "Flying Jets", 5000, "https://storage.streamdps.com/iblock/5a4/5a4f3c7adc31f60326e3adf1a3a20bf9/bc96de02ceba4b91c1f9c996293974b4.webp"),
 
   FLYING_JETS_7720(7720, "Flying Jets", 5000, "https://storage.streamdps.com/iblock/738/73887ee5dc4a63709a10a2e3eff67b7c/1588215b603e2495582288471573cd57.webp"),
 
+  FLYING_JETS_9500(9500, "Flying Jets", 5000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/1d067d13988e8754ed6adbebd89b9ee8.png~tplv-obj.jpg"),
+
   INDOOR_FAN(6565, "Indoor Fan", 199, "https://storage.streamdps.com/iblock/499/499dc6bf36be95e90398a56d18bfeebe/231f634c0c86d034f193477f208f66ca.webp"),
 
   MIC(5650, "Mic", 5, "https://storage.streamdps.com/iblock/1db/1dbec91a90cdeca9f7fb1ea7280ad5cd/cae0a287f4d2e8d0e1558dcbb4aa3b2f.png"),
@@ -621,12 +697,16 @@ public enum Gift {
 
   ROMANTIC_CARRIAGE(5627, "Romantic Carriage", 6000, "https://storage.streamdps.com/iblock/681/68132980826d9ddb208928c54a798f7f/e4f143cb38a0687729539972b2132ac1.png"),
 
+  AMAZING(5983, "Amazing", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/18256fd3f4402601dd07c83adae3e9a2~tplv-obj.png"),
+
   BRIDAL_VEIL(5902, "Bridal Veil", 299, "https://storage.streamdps.com/iblock/ac0/ac0cbd1870dd92251f6ef620acb652e5/fe8eca664be736231b8e8e2cc2237a15.png"),
 
   TULIP_BOX(5325, "Tulip Box", 200, "https://storage.streamdps.com/iblock/d44/d4471e5deb9cb5831f846ca4c9df9c5d/7d1236ecd67b3e655c3dfd72673a423d.png"),
 
   SQUIRREL(7213, "Squirrel", 1, "https://storage.streamdps.com/iblock/5c3/5c37dce1eab0d67386329f3a2920a874/38104bd52d316ea76464433b3b07dea7.webp"),
 
+  CHOC_CHIP_COOKIE(6416, "Choc Chip Cookie", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/7dd2731de2e644301a329d3eb437b427~tplv-obj.png"),
+
   METEOR_SHOWER(6563, "Meteor Shower", 3000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/71883933511237f7eaa1bf8cd12ed575~tplv-obj.jpg"),
 
   CAKE(5720, "Cake", 20, "https://storage.streamdps.com/iblock/edb/edbe349c5a4be01ec1fbf2225d0f48dc/4169ef7f0263177384205df6663451c8.png"),
@@ -669,6 +749,10 @@ public enum Gift {
 
   CHOCOLATE(5860, "Chocolate", 1, "https://storage.streamdps.com/iblock/522/52287f41673e2fd836c83ec78e95f08a/77307666e41e09e54052fd321c2906c4.png"),
 
+  RIO_DE_JANEIRO(7218, "Rio de Janeiro", 9999, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/34c0eb43c3d50e8ab64408171ebbe733~tplv-obj.png"),
+
+  BLOOMING_RIBBONS(9498, "Blooming Ribbons", 1000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/f76750ab58ee30fc022c9e4e11d25c9d.png~tplv-obj.jpg"),
+
   CORNFLOWER(8186, "Cornflower", 5, "https://storage.streamdps.com/iblock/025/025c50c390f6a12148a69728284c7298/36b50fe529db9d7db028b0774842e103.webp"),
 
   ASMR_TIME_(6990, "ASMR Time ", 10, "https://storage.streamdps.com/iblock/49d/49dccba4525df92ed17678cc6ea47e95/b2c8c52d5294bb531d7d87a4c3ff97fe.webp"),
@@ -747,8 +831,12 @@ public enum Gift {
 
   HI_MARCH(7977, "Hi March", 88, "https://storage.streamdps.com/iblock/e22/e2266686271c7a90ff04517f248c6f73/0459d679c01a5bfa5a4be1d61ec81ec8.webp"),
 
+  FANTASTIC(6813, "Fantastic", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/a1b2204b06aa19d45a0338e9f0099ea7~tplv-obj.png"),
+
   HEDGEHOG(6868, "Hedgehog", 299, "https://storage.streamdps.com/iblock/841/841e924150793d6961df0a1c89cc67ca/5886839b7de0b1289303081f9af380f8.webp"),
 
+  LIVE_FEST(9334, "LIVE Fest", 1, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/1e98afffef90ed4b2cc9c9ebb88e3608.png~tplv-obj.png"),
+
   I_LOVE_TR(7139, "I LOVE TR", 1, "https://storage.streamdps.com/iblock/84d/84d68e92c471e7da792aa98d856c824c/7728ac60043efb9c96e2ce0f77dbef31.webp"),
 
   SHIBA_INU(5482, "Shiba Inu", 222, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/ddbcee02f5b86b803b0ec34357cd82ec.png~tplv-obj.jpg"),
@@ -779,6 +867,8 @@ public enum Gift {
 
   RHYTHMIC_BEAR(9468, "Rhythmic Bear", 2999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/16eacf541e4bd6816e88139d079519f5.png~tplv-obj.jpg"),
 
+  CRYSTAL_BALL(6428, "Crystal Ball", 1700, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/7e4f9a99b7003ae05186f5324aae9fbf~tplv-obj.png"),
+
   PHOENIX(7319, "Phoenix", 25999, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/ef248375c4167d70c1642731c732c982~tplv-obj.jpg"),
 
   BOUQUET_FLOWER(5780, "Bouquet Flower", 30, "https://storage.streamdps.com/iblock/ceb/cebb5d5f7004d6ccf9336ae20281be88/5061b1767c2325fe6704eb08d97c5cb8.png"),
@@ -799,6 +889,8 @@ public enum Gift {
 
   FRUITS_HAT(7091, "Fruits Hat", 199, "https://storage.streamdps.com/iblock/404/404cc4794702cc6feb93bf4517bc0762/05846cb2d9548cf2f0573159110ecb64.webp"),
 
+  SPINNING_TOP(6483, "Spinning Top", 10, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/6cde70e04a6b40a9879f7b99ff191808~tplv-obj.png"),
+
   MISHKA_BEAR(5486, "Mishka Bear", 100, "https://storage.streamdps.com/iblock/880/8809f52dbf40e0d670067f8c223d7c04/c603798bc6cd2bdc5a032ddbeb55e258.png"),
 
   MISHKA_BEAR_5566(5566, "Mishka Bear", 100, "https://storage.streamdps.com/iblock/010/010ccc7a5d5e21231b46cea3223d5b1f/aa9c15ca87e4df8dad9be22164978fc2.png"),
@@ -827,8 +919,12 @@ public enum Gift {
 
   BIG_LOVE(7224, "Big Love", 5, "https://storage.streamdps.com/iblock/9d7/9d791fea266e119ffd938095526a1b55/1923108683e8c0aba3b78e1d0e8137cf.webp"),
 
+  TGIF(6592, "TGIF", 1, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/2734231d880b5cd20149f4cc8c760279~tplv-obj.png"),
+
   GOLDEN_GAMEPAD(6582, "Golden Gamepad", 30, "https://storage.streamdps.com/iblock/e85/e85940610dd45adc8733b51106c60712/ca839e1139ca0b94070c1e38093e95ec.png"),
 
+  COCONUT_TREE(5794, "Coconut Tree", 199, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/eb0923dbab5251f4c2e0496b11b55c4f~tplv-obj.png"),
+
   SUMMER_BAND(6555, "Summer Band", 3999, "https://storage.streamdps.com/iblock/43b/43b88814d979720d80a6e17258ab3bd8/b1abf3d90ae212317d6ae339ed5f5be7.png"),
 
   GORILLA(8602, "Gorilla", 30000, "https://storage.streamdps.com/iblock/1e2/1e29b9d1a0263f1487498dc556cdcbc1/bec227242f8c9b258855071aa050ac17.webp"),
@@ -845,12 +941,16 @@ public enum Gift {
 
   COOPER_SKATES_HOME(6865, "Cooper Skates Home", 599, "https://storage.streamdps.com/iblock/041/04184b09ec8e7bf137d33cf57ce4eec9/3c2e360b023b9980e54e9d9a394883b9.webp"),
 
+  EXCLUSIVE_JET(9523, "Exclusive Jet", 5000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/1cc167a00aa4d5dfe48018afb38c3daa.png~tplv-obj.jpg"),
+
   BIRTHDAY_PARTY(6787, "Birthday Party", 6999, "https://storage.streamdps.com/iblock/135/135b2ac0877de059f56e510b0ac70d08/07285ba7471fb98743bfe308d0b58ce2.webp"),
 
   BIRTHDAY_PARTY_9095(9095, "Birthday Party", 6999, "https://storage.streamdps.com/iblock/d0d/d0d1164a9ed81239b70cb25b93927023/d0dba293643c67dc33c1f4dda04e5b50.webp"),
 
   TEASING(6390, "Teasing", 401, "https://storage.streamdps.com/iblock/e14/e14c9b35975f1da5b8a5e3f116dae2bb/9f8cea9b65620e8376e44802c25ddf27.png"),
 
+  CRICKET(6006, "Cricket", 99, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/408d55c0526ada808be7db3e22c02a56~tplv-obj.png"),
+
   FOAMY_DRINK(6740, "Foamy Drink", 100, "https://storage.streamdps.com/iblock/cc8/cc8133c73d5ca2cb5fde306f5b4e2a11/fb273956755fe6fbf7263023a9c36ebe.webp"),
 
   CAPYBARA(8217, "Capybara", 30, "https://storage.streamdps.com/iblock/e94/e944534be54186446d7c38563c772029/553d899c4bd4be31e7b051bb36e842f8.webp"),
@@ -897,6 +997,8 @@ public enum Gift {
 
   GRAPES(7234, "Grapes", 1, "https://storage.streamdps.com/iblock/442/442580106ac8748b79ef450eb25b5981/df624c619c48b583adee184bca134c80.webp"),
 
+  LLAMA_GREETINGS(6531, "Llama Greetings", 299, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/a6b95ce6350f5f4bdff6880ac6993789~tplv-obj.png"),
+
   SAM_THE_WHALE(8391, "Sam the Whale", 30000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/f48a1887eb88238738996bb997b31c0f.png~tplv-obj.jpg"),
 
   DIAMOND_TREE(7963, "Diamond Tree", 1088, "https://storage.streamdps.com/iblock/47a/47afc3c8563cacbff2ce13f2310a2fc4/84761a2a3e0431bda3bf3d2cc9d02b3f.webp"),
@@ -913,10 +1015,14 @@ public enum Gift {
 
   BIRD_WHISPERER(8344, "Bird Whisperer", 5000, "https://storage.streamdps.com/iblock/079/079bf5895816fb04293d01375eaf23a5/672128ca0f65deb0e75e2a9a690a79f0.webp"),
 
+  GOOD_NIGHT(8268, "Good Night", 399, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/b7b55087141bd5f965eb31a99a5f157b~tplv-obj.png"),
+
   ALIEN_PEACE_SIGN(7831, "Alien Peace Sign", 1, "https://storage.streamdps.com/iblock/5f7/5f7b29f5c7a4ca3a4dbbe8dc0e195459/cd83433a0f1697a0b66a891cbd7cf1af.webp"),
 
   THE_MAGIC_LAMP(7161, "The Magic Lamp", 1000, "https://storage.streamdps.com/iblock/e0d/e0d45fccd69220f321531383d97f51fc/4296cc4b886f31bb5b2cf106ebf640ab.webp"),
 
+  TACO_(6113, "Taco ", 9, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/43d06db8c962623dbed6ecf70fb89ca8~tplv-obj.png"),
+
   TIARA(8496, "Tiara", 299, "https://storage.streamdps.com/iblock/1b1/1b1ee7b697bae41ee2cbf834d1f1099e/303eec791a710c2417bb5075529681d9.webp"),
 
   COFFEE(5333, "Coffee", 1, "https://storage.streamdps.com/iblock/920/920b64634d946a2238950c353c16df81/0fe22d9bdee1bd6d9d77f66bcd8cf45a.png"),
@@ -953,8 +1059,12 @@ public enum Gift {
 
   OWL(5885, "Owl", 500, "https://storage.streamdps.com/iblock/e87/e87fc92de64aa711c6ce23ed3b2214c2/338e115665b1c9f75108b50a43adb95b.png"),
 
+  TOP_HOST(6194, "Top Host", 199, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/5947dc37282c417b411c61f20ee7d6d4~tplv-obj.png"),
+
   TIKTOK_CROWN(8873, "TikTok Crown", 299, "https://storage.streamdps.com/iblock/a79/a790613bdf2e83725d0519bbf289529d/83bb670c15ab91b9192c50300f4c8054.webp"),
 
+  LOVED(6705, "Loved", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/2a41781b0a29ba3c409c5dd83eed07f8~tplv-obj.png"),
+
   ON_FIRE(6840, "On Fire", 200, "https://storage.streamdps.com/iblock/cba/cba95075d6b63b84fbc52abb9d1d8208/d93ecc0b966bf972f01e77339a68e124.webp"),
 
   ON_FIRE_6958(6958, "On Fire", 200, "https://storage.streamdps.com/iblock/4ec/4ec314b4ee7dff4e92a8e1e75100dddf/19c9b5d8b5f24b1465632a31e55edca1.webp"),
@@ -1037,6 +1147,8 @@ public enum Gift {
 
   NACHOS(7088, "Nachos", 9, "https://storage.streamdps.com/iblock/ff1/ff16cd1c796189ed8fcfdb019eb224ef/1ae8b0b05294c56b99197256fcaa3fd4.webp"),
 
+  SNAG(6411, "Snag", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/aa2d9b162c766a7fdf71fcead6d7bbcd~tplv-obj.png"),
+
   APPETIZERS(6106, "Appetizers", 19, "https://storage.streamdps.com/iblock/76b/76b94aaced493a2448cf655b5468feaf/8c1bea41ec9fb547f0a0eb46d658a1c8.png"),
 
   LOVE_LETTER(7932, "Love Letter", 1, "https://storage.streamdps.com/iblock/a40/a40cb58d5e8c07fa3e46a9acb4e34f6f/477507a1b14df0a22ef895c6214f3789.webp"),
@@ -1047,8 +1159,12 @@ public enum Gift {
 
   BUMPER_CARS(5996, "Bumper Cars", 1288, "https://storage.streamdps.com/iblock/53b/53b569311552b729d1b347268370e576/8f236deca90a65e7046f7576d69976af.png"),
 
+  CAMPFIRE(5843, "Campfire", 388, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/e280eb1b7fe92b4efe612d98064d5a2d~tplv-obj.png"),
+
   CAKE_SLICE(6784, "Cake Slice", 1, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/f681afb4be36d8a321eac741d387f1e2~tplv-obj.jpg"),
 
+  EXCLUSIVE_SPARK(9522, "Exclusive Spark", 1000, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/resource/f0bda1eb6856e2feea9cfcb6c575c8a0.png~tplv-obj.jpg"),
+
   CROCODILE(8740, "Crocodile", 10, "https://storage.streamdps.com/iblock/4e2/4e2d9df24c472158b8ed93546fc73b16/75722a173b75d601e0a80a679902529f.webp"),
 
   LOVE_YOU_6671(6671, "Love You", 199, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/134e51c00f46e01976399883ca4e4798~tplv-obj.jpg"),
@@ -1063,8 +1179,12 @@ public enum Gift {
 
   DIAMOND_CROWN_5604(5604, "Diamond Crown", 1499, "https://storage.streamdps.com/iblock/3b5/3b56c2352a02829ac4445094a3f76b51/738ad17c91919a940ee2001f9f262a95.png"),
 
+  COCONUT_DRINK(8225, "Coconut Drink", 5, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/ce27ad017f987240dc447e65ae866f4f~tplv-obj.png"),
+
   M4_TROPHY(7544, "M4 Trophy", 450, "https://storage.streamdps.com/iblock/f40/f40a34a8e59806907deaa4f74df3462d/8deac28cb21517228bcd354645a987ea.webp"),
 
+  FLOWER(6034, "Flower", 299, "https://p19-webcast.tiktokcdn.com/img/maliva/webcast-va/9c20971eeb28b6b4ba37e57df3983da0~tplv-obj.png"),
+
   PERFUME(5658, "Perfume", 20, "https://p16-webcast.tiktokcdn.com/img/maliva/webcast-va/20b8f61246c7b6032777bb81bf4ee055~tplv-obj.jpg"),
 
   KISS_YOUR_HEART(6661, "Kiss your Heart", 99, "https://storage.streamdps.com/iblock/13d/13d940df83e04a30523ca88c080ee8d8/213f06af314da4637a9ae8fc25bfaea3.webp"),

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

@@ -0,0 +1,60 @@
+package io.github.jwdeveloper.tiktok.data.models.http;
+
+import lombok.Data;
+
+import java.net.URI;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.*;
+
+@Data
+public class HttpData {
+    String url;
+    String method;
+    Map<String, List<String>> headers = new TreeMap<>();
+    Map<String, String> parameters = new TreeMap<>();
+    int status;
+    String body = "";
+
+
+    public static HttpData map(HttpRequest request) {
+        var data = new HttpData();
+        data.setUrl(request.uri().getPath());
+        data.setMethod(request.method());
+        data.setParameters(extractQueryParams(request.uri()));
+        data.setStatus(200);
+        if (request.bodyPublisher().isPresent()) {
+            data.setBody(request.bodyPublisher().get().toString());
+        }
+        data.setHeaders(Collections.unmodifiableMap(request.headers().map()));
+        return data;
+    }
+
+    public static HttpData map(HttpResponse<String> response) {
+        var data = new HttpData();
+        data.setUrl(response.uri().getPath());
+        data.setMethod(response.request().method());
+        data.setParameters(extractQueryParams(response.uri()));
+        data.setStatus(200);
+        data.setBody(response.body());
+        data.setHeaders(Collections.unmodifiableMap(response.headers().map()));
+        return data;
+    }
+
+
+    private static Map<String, String> extractQueryParams(URI uri) {
+        Map<String, String> params = new HashMap<>();
+        String query = uri.getQuery();
+        if (query != null && !query.isEmpty()) {
+            for (String param : query.split("&")) {
+                String[] keyValue = param.split("=");
+                if (keyValue.length > 1) {
+                    params.put(keyValue[0], keyValue[1]);
+                } else {
+                    params.put(keyValue[0], ""); // Empty value for parameter without explicit value
+                }
+            }
+        }
+        return params;
+    }
+}

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

@@ -26,15 +26,20 @@ package io.github.jwdeveloper.tiktok.exceptions;
 /**
  * Happens when incoming data from TikTok can not be mapped to TikTokEvent's
  */
-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 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);
+    public TikTokMessageMappingException(Class<?> inputClazz, Class<?> outputClass, String message) {
+        super("Unable to handle mapping from class: " + inputClazz.getSimpleName() + " to class " + outputClass.getSimpleName() + ": " + message);
+    }
+
+    public TikTokMessageMappingException(Class<?> inputClazz, String message, Throwable throwable) {
+        super("Unable to handle mapping from class: " + inputClazz.getSimpleName() + ": " + message, throwable);
+    }
+
+    public TikTokMessageMappingException(String message, Throwable throwable) {
+        super( message, throwable);
     }
 }

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

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.live;
 
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.listener.ListenersManager;
 import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
 
@@ -55,6 +56,11 @@ public interface LiveClient {
     void disconnect();
 
 
+    /**
+     * You to manually trigger event
+     */
+     void publishEvent(TikTokEvent event);
+
     /**
      * Get information about gifts
      */

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

@@ -26,6 +26,7 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
+import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
 import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent;
 import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent;
@@ -38,55 +39,141 @@ import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandl
 
 public interface EventsBuilder<T> {
 
-    T onRoomInfo(EventConsumer<TikTokRoomInfoEvent> event);
-
-    T onComment(EventConsumer<TikTokCommentEvent> event);
-
-    T onWebsocketMessage(EventConsumer<TikTokWebsocketMessageEvent> event);
-
-    T onWebsocketResponse(EventConsumer<TikTokWebsocketResponseEvent> event);
-
-    T onWebsocketUnhandledMessage(EventConsumer<TikTokWebsocketUnhandledMessageEvent> event);
+    /**
+     * Invoked whenever specified event is triggered
+     *
+     * @param eventClass event class
+     * @param action     action
+     */
+    <E extends TikTokEvent> T onEvent(Class<E> eventClass, EventConsumer<E> action);
 
 
-    T onGiftCombo(EventConsumer<TikTokGiftComboEvent> event);
-    T onGift(EventConsumer<TikTokGiftEvent> event);
+    /**
+     * Invoked whenever any event is triggered
+     *
+     * @param action
+     * @return
+     */
+    T onEvent(EventConsumer<TikTokEvent> action);
 
-    T onQuestion(EventConsumer<TikTokQuestionEvent> event);
+    /**
+     * Invoked when information about room (live) got updated such as viewer count, etc..
+     *
+     * @param action
+     * @return
+     */
+    T onRoomInfo(EventConsumer<TikTokRoomInfoEvent> action);
 
-    T onSubscribe(EventConsumer<TikTokSubscribeEvent> event);
-
-    T onFollow(EventConsumer<TikTokFollowEvent> event);
-
-    T onLike(EventConsumer<TikTokLikeEvent> event);
-
-    T onEmote(EventConsumer<TikTokEmoteEvent> event);
-
-    T onJoin(EventConsumer<TikTokJoinEvent> event);
-
-    T onShare(EventConsumer<TikTokShareEvent> event);
-
-  //  T onChest(EventConsumer<TikTokChestEvent> event);
-
-    T onLivePaused(EventConsumer<TikTokLivePausedEvent> event);
-
-    T onLiveUnpaused(EventConsumer<TikTokLiveUnpausedEvent> event);
-
-    T onLiveEnded(EventConsumer<TikTokLiveEndedEvent> event);
-
-    T onConnected(EventConsumer<TikTokConnectedEvent> event);
-
-    T onReconnecting(EventConsumer<TikTokReconnectingEvent> event);
-
-    T onDisconnected(EventConsumer<TikTokDisconnectedEvent> event);
-
-    T onError(EventConsumer<TikTokErrorEvent> event);
-    T onEvent(EventConsumer<TikTokEvent> event);
+    /**
+     * Invoked when someone send message to chat
+     *
+     * @param action
+     * @return
+     */
+    T onComment(EventConsumer<TikTokCommentEvent> action);
 
 
+    /**
+     * Invoked when TikTokLiveJava makes http request and getting response
+     *
+     * @param action
+     * @return
+     */
+    T onHttpResponse(EventConsumer<TikTokHttpResponseEvent> action);
+
+    /**
+     * Invoked when TikTok protocolBuffer data "message" was successfully mapped to event
+     * events contains protocol-buffer "Message"  and  TikTokLiveJava "Event"
+     *
+     * @param action
+     * @return
+     */
+    T onWebsocketMessage(EventConsumer<TikTokWebsocketMessageEvent> action);
+
+    /**
+     * Invoked when there was not found event mapper for TikTok protocolBuffer data "message"
+     *
+     * @param action
+     * @return
+     */
+    T onWebsocketUnhandledMessage(EventConsumer<TikTokWebsocketUnhandledMessageEvent> action);
+
+    /**
+     * Invoked every time TikTok sends protocolBuffer data to websocket
+     * Response contains list of messages that are later mapped to events
+     * @param action
+     * @return
+     */
+    T onWebsocketResponse(EventConsumer<TikTokWebsocketResponseEvent> action);
+
+
+    /**
+     * Invoked for gifts that has no combo, or when combo finishes
+     * @param action
+     * @return
+     */
+    T onGift(EventConsumer<TikTokGiftEvent> action);
+
+    /**
+     * Invoked for gifts that has combo options such as roses
+     * @param action
+     * @return
+     */
+    T onGiftCombo(EventConsumer<TikTokGiftComboEvent> action);
+
+
+    T onQuestion(EventConsumer<TikTokQuestionEvent> action);
+
+    T onSubscribe(EventConsumer<TikTokSubscribeEvent> action);
+
+    T onFollow(EventConsumer<TikTokFollowEvent> action);
+
+    T onLike(EventConsumer<TikTokLikeEvent> action);
+
+    T onEmote(EventConsumer<TikTokEmoteEvent> action);
+
+    T onJoin(EventConsumer<TikTokJoinEvent> action);
+
+    T onShare(EventConsumer<TikTokShareEvent> action);
+
+    T onLivePaused(EventConsumer<TikTokLivePausedEvent> action);
+
+    T onLiveUnpaused(EventConsumer<TikTokLiveUnpausedEvent> action);
+
+    T onLiveEnded(EventConsumer<TikTokLiveEndedEvent> action);
+
+    /**
+     * Invoked when client has been successfully connected to live
+     * @param action
+     * @return
+     */
+    T onConnected(EventConsumer<TikTokConnectedEvent> action);
+
+    /**
+     * Invoked when client tries to reconnect
+     * @param action
+     * @return
+     */
+    T onReconnecting(EventConsumer<TikTokReconnectingEvent> action);
+
+    /**
+     * Invoked when client disconnected
+     * @param action
+     * @return
+     */
+    T onDisconnected(EventConsumer<TikTokDisconnectedEvent> action);
+
+    /**
+     * Invoked when exception was throed inside client or event handler
+     * @param action
+     * @return
+     */
+    T onError(EventConsumer<TikTokErrorEvent> action);
 
 
     // TODO Figure out how those events works
+    //  T onChest(EventConsumer<TikTokChestEvent> event);
+
     //T onLinkMicFanTicket(TikTokEventConsumer<TikTokLinkMicFanTicketEvent> event);
 
     //T onEnvelope(TikTokEventConsumer<TikTokEnvelopeEvent> event);

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

@@ -23,20 +23,60 @@
 package io.github.jwdeveloper.tiktok.live.builder;
 
 import io.github.jwdeveloper.tiktok.ClientSettings;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
+import io.github.jwdeveloper.tiktok.mappers.TikTokMapper;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 public interface LiveClientBuilder extends EventsBuilder<LiveClientBuilder> {
-    LiveClientBuilder configure(Consumer<ClientSettings> consumer);
 
+    /**
+     * This method is triggered after default mappings are registered
+     * It could be used to OVERRIDE behaviour of mappings and implement custom behaviour
+     *
+     * Be aware if for example you override WebcastGiftEvent, onGiftEvent() will not be working
+     *
+     * @param onCustomMappings lambda method
+     * @return
+     */
+    LiveClientBuilder onMapping(Consumer<TikTokMapper> onCustomMappings);
+
+
+    /**
+     * Configuration of client settings
+     * @see ClientSettings
+     * @param onConfigure
+     * @return
+     */
+    LiveClientBuilder configure(Consumer<ClientSettings> onConfigure);
+
+    /**
+     * @see TikTokEventListener
+     * Adding events listener class, its fancy way to register events without using lamda method
+     * but actual method in class that implements TikTokEventListener
+     * @return
+     */
     LiveClientBuilder addListener(TikTokEventListener listener);
 
+    /**
+     *
+     * @return LiveClient object
+     */
     LiveClient build();
 
+    /**
+     *
+     * @return LiveClient object and connects to TikTok live
+     */
     LiveClient buildAndConnect();
 
+    /**
+     *
+     * @return LiveClient object and connects to TikTok live asynchronously
+     */
     CompletableFuture<LiveClient> buildAndConnectAsync();
 }

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

@@ -20,24 +20,36 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.db;
+package io.github.jwdeveloper.tiktok.mappers;
 
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokMessageModel;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokResponseModel;
-import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
-import org.jdbi.v3.sqlobject.customizer.BindBean;
-import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.jdbi.v3.sqlobject.statement.SqlUpdate;
+import com.google.protobuf.GeneratedMessageV3;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 
-import java.util.List;
+import java.util.function.Function;
+
+public interface TikTokMapper {
+
+    /**
+     * * if mapper is not found for messageName, TikTokLiveException is thrown
+     *
+     * @param messageName
+     * @return TikTokMapperModel
+     */
+    TikTokMapperModel forMessage(String messageName);
+
+    TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName);
+
+    TikTokMapperModel forMessage(String mapperName, MappingAction<MappingResult> onMapping);
+
+    TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, MappingAction<MappingResult> onMapping);
+
+    TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, Function<byte[], TikTokEvent> onMapping);
+
+    boolean isRegistered(String mapperName);
+
+    <T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName);
 
-@RegisterBeanMapper(TikTokResponseModel.class)
-public interface TikTokResponseModelDAO
-{
-    @SqlUpdate("INSERT INTO TikTokResponseModel (hostName, response, createdAt) " +
-            "VALUES (:hostName, :response, :createdAt)")
-    void insert(@BindBean TikTokResponseModel message);
 
-    @SqlQuery("SELECT * FROM TikTokResponseModel")
-    List<TikTokResponseModel> select();
 }

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

@@ -0,0 +1,46 @@
+package io.github.jwdeveloper.tiktok.mappers;
+
+import com.google.protobuf.GeneratedMessageV3;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
+import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
+
+public interface TikTokMapperHelper {
+
+    /**
+     * @param bytes        protocol buffer data bytes
+     * @param messageClass class that we want to serialize bytes to
+     * @param <T>          @messageClass must be class that is made by protocol buffer
+     * @return object of type @messageClass
+     */
+    <T extends GeneratedMessageV3> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass);
+
+    /**
+     * @param bytes       protocol buffer data bytes
+     * @param messageName class that we want to serialize bytes to
+     * @return protocol buffer objects if class for @messageName has been found
+     * @throws TikTokMessageMappingException if there is no suitable class for messageName
+     */
+    Object bytesToWebcastObject(byte[] bytes, String messageName);
+
+
+    /**
+     * @param messageName checks wheaten TikTokLiveJava has class representation for certain protocol-buffer message name
+     * @return false if class is not found
+     */
+    boolean isMessageHasProtoClass(String messageName);
+
+    /**
+     * @param bytes protocol buffer data bytes
+     * @return tree structure of protocol buffer object
+     * @see ProtoBufferObject
+     */
+    ProtoBufferObject bytesToProtoBufferStructure(byte[] bytes);
+
+    /**
+     * Converts object to json
+     *
+     * @param obj any object
+     * @return pretty formatted json
+     */
+    String toJson(Object obj);
+}

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

@@ -0,0 +1,36 @@
+package io.github.jwdeveloper.tiktok.mappers;
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.mappers.data.AfterMappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
+
+import java.util.List;
+import java.util.function.Function;
+
+public interface TikTokMapperModel {
+
+    /**
+     * @return name of websocket message that this mapper is mapping from
+     */
+
+    String getSourceMessageName();
+
+    /**
+     * @param action Input bytes from websocket, you can modify it and returns different bytes
+     */
+    TikTokMapperModel onBeforeMapping(MappingAction<byte[]> action);
+
+    /**
+     * @param action Input bytes from websocket. As output returns list of tiktok live events
+     */
+    TikTokMapperModel onMapping(MappingAction<MappingResult> action);
+
+
+
+    /**
+     * @param action You can modify output list of TikTokLive events
+     * @see AfterMappingAction
+     */
+    TikTokMapperModel onAfterMapping(Function<MappingResult, List<TikTokEvent>> action);
+}

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

@@ -0,0 +1,15 @@
+package io.github.jwdeveloper.tiktok.mappers.data;
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface AfterMappingAction {
+    /**
+     * @param source object that was used as source to create events
+     * @param events list of events prepared before, could be modified or changed
+     * @return list of events that will be invoked
+     */
+    List<TikTokEvent> onAfterMapping(Object source, List<TikTokEvent> events);
+}

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

@@ -0,0 +1,16 @@
+package io.github.jwdeveloper.tiktok.mappers.data;
+
+import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
+
+@FunctionalInterface
+public interface MappingAction<T> {
+
+    /**
+     * @param inputBytes   incoming bytes from TikTok server. The represents protocol buffer message that was send to client
+     * @param messageName  name of protocol buffer message
+     * @param mapperHelper utils and helper methods that can be use to debbug/display/deserialize protocol buffer data
+     * @return
+     */
+    T onMapping(byte[] inputBytes, String messageName, TikTokMapperHelper mapperHelper);
+
+}

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

@@ -0,0 +1,31 @@
+package io.github.jwdeveloper.tiktok.mappers.data;
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Getter
+public class MappingResult
+{
+
+    Object source;
+
+    List<TikTokEvent> events;
+
+    String message;
+
+    public static MappingResult of(Object source) {
+        return new MappingResult(source, List.of(),"");
+    }
+
+    public static MappingResult of(Object source, List<TikTokEvent> events) {
+        return new MappingResult(source, events,"");
+    }
+
+    public static MappingResult of(Object source,TikTokEvent events) {
+        return new MappingResult(source, List.of(events),"");
+    }
+}

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

@@ -25,8 +25,10 @@ package io.github.jwdeveloper.tiktok.utils;
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
 import com.google.gson.GsonBuilder;
+import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData;
 
 import java.awt.*;
+import java.time.Duration;
 import java.util.ArrayList;
 
 public class JsonUtil {
@@ -34,13 +36,25 @@ public class JsonUtil {
         return new GsonBuilder()
                 .addSerializationExclusionStrategy(new ExclusionStrategy() {
                     @Override
-                    public boolean shouldSkipField(FieldAttributes fieldAttributes) {
+                    public boolean shouldSkipField(FieldAttributes fieldAttributes)
+                    {
+
                         return false;
                     }
 
                     @Override
-                    public boolean shouldSkipClass(Class<?> aClass) {
-                        return aClass.equals(Image.class);
+                    public boolean shouldSkipClass(Class<?> aClass)
+                    {
+                        if(aClass.equals(Image.class))
+                        {
+                            return true;
+                        }
+                        if(aClass.equals(MessageMetaData.class))
+                        {
+                            return true;
+                        }
+
+                        return false;
                     }
                 })
                 .disableHtmlEscaping()

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.utils;
+
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class ProtoBufferFileGenerator {
+
+
+    public static String generate(ProtoBufferObject protoBuffObj, String name) {
+
+        var sb = new StringBuilder();
+        var offset = 2;
+        sb.append("message ").append(name).append(" { \n");
+
+        var objects = new TreeMap<String, ProtoBufferObject>();
+        var objectCounter = 0;
+        for (var entry : protoBuffObj.getFields().entrySet()) {
+            var index = entry.getKey();
+            var field = entry.getValue();
+            var fieldName = field.type.toLowerCase() + "Value";
+            var value = field.value;
+            if (field.value instanceof ProtoBufferObject object) {
+                fieldName += objectCounter;
+                value = "";
+                objects.put(fieldName,object);
+                objectCounter++;
+
+            }
+            for (var i = 0; i < offset; i++) {
+                sb.append(" ");
+            }
+            sb.append(field.type).append(" ").append(fieldName)
+                    .append(" ")
+                    .append("=")
+                    .append(" ")
+                    .append(index)
+                    .append(";")
+                    .append(" //")
+                    .append(value)
+                    .append("\n");
+        }
+        sb.append(" \n");
+        for(var object : objects.entrySet())
+        {
+            var structure = generate(object.getValue(),object.getKey());
+            sb.append(structure);
+        }
+
+
+        sb.append(" \n");
+        sb.append("} \n");
+        return sb.toString();
+    }
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.utils;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+
+public class ProtoBufferJsonGenerator {
+    public static JsonObject genratejson(ProtoBufferObject protoBuffObj) {
+
+        JsonObject jsonObject = new JsonObject();
+        for (var entry : protoBuffObj.getFields().entrySet()) {
+            var fieldName = entry.getKey() + "_" + entry.getValue().type;
+            if (entry.getValue().value instanceof ProtoBufferObject protoObj)
+            {
+                JsonObject childJson = genratejson(protoObj);
+                jsonObject.add(fieldName, childJson);
+                continue;
+            }
+
+            var value = entry.getValue().value.toString();
+            jsonObject.addProperty(fieldName, value);
+        }
+
+        return jsonObject;
+    }
+
+    public static String generate(ProtoBufferObject protoBufferObject) {
+        var json = genratejson(protoBufferObject);
+        var gson = new GsonBuilder().setPrettyPrinting().create();
+        return gson.toJson(json);
+    }
+}

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

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.utils;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+public class ProtoBufferObject {
+    @Getter
+    private final Map<Integer, ProtoBufferField> fields;
+
+    public ProtoBufferObject() {
+        this.fields = new TreeMap<>();
+    }
+
+    public void addField(int index, String type, Object value) {
+        fields.put(index, new ProtoBufferField(type, value));
+    }
+
+    public void addField(int index, ProtoBufferField value) {
+        fields.put(index, value);
+    }
+
+
+    public String toProtoFile()
+    {
+        return ProtoBufferFileGenerator.generate(this,"UnknownMessage");
+    }
+
+    public String toJson()
+    {
+        return ProtoBufferJsonGenerator.generate(this);
+    }
+    @Override
+    public String toString() {
+        return toString(0, true);
+    }
+
+    public String toString(int offset ,boolean nested) {
+
+        var sb = new StringBuilder();
+        sb.append("\n");
+        for (var entry : fields.entrySet()) {
+            var index = entry.getKey();
+            var field = entry.getValue();
+
+            for(var i =0;i<offset;i++)
+            {
+                sb.append(" ");
+            }
+            sb.append(index).append(" ")
+                    .append(field.type).append(" ");
+
+            var value = field.value;
+            if (value instanceof ProtoBufferObject child) {
+                sb.append(child.toString(offset+2,nested));
+            } else {
+                sb.append(entry.getValue().value);
+            }
+
+            sb.append("\n");
+        }
+        return sb.toString();
+    }
+
+
+
+
+    @AllArgsConstructor
+    public class ProtoBufferField {
+        public String type;
+
+        public Object value;
+    }
+}

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

@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.utils;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.UnknownFieldSet;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+
+import java.util.Base64;
+
+public class ProtocolUtils {
+    public static String toBase64(byte[] bytes) {
+
+        return Base64.getEncoder().encodeToString(bytes);
+    }
+
+    public static String toBase64(WebcastResponse.Message bytes) {
+        return Base64.getEncoder().encodeToString(bytes.toByteArray());
+    }
+
+
+    public static byte[] fromBase64(String base64) {
+
+        return Base64.getDecoder().decode(base64);
+    }
+
+    public static ProtoBufferObject getProtocolBufferStructure(byte[] bytes) {
+
+        try {
+            var files = UnknownFieldSet.parseFrom(bytes);
+            var protoBufferObject = new ProtoBufferObject();
+            createStructure(files, protoBufferObject);
+            return protoBufferObject;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void createStructure(UnknownFieldSet unknownFieldSet, ProtoBufferObject root) throws InvalidProtocolBufferException {
+        for (var entry : unknownFieldSet.asMap().entrySet()) {
+            var objectValue = entry.getValue();
+            var type = "undefind";
+            Object value = null;
+            var index = entry.getKey();
+            if (!objectValue.getLengthDelimitedList().isEmpty()) {
+                var nestedObject = new ProtoBufferObject();
+                for (var str : objectValue.getLengthDelimitedList()) {
+                    try {
+                        var nestedFieldsSet = UnknownFieldSet.parseFrom(str);
+                        createStructure(nestedFieldsSet, nestedObject);
+                    } catch (Exception e)
+                    {
+                        type = "string";
+                        value = str.toStringUtf8();
+                    }
+                }
+                if (value != null) {
+                    root.addField(index, "string", value);
+                } else {
+                    root.addField(index, "object", nestedObject);
+                }
+                continue;
+            }
+
+            if (!objectValue.getFixed32List().isEmpty()) {
+                type = "Fixed32List";
+                value = objectValue.getFixed32List();
+            }
+
+            if (!objectValue.getFixed64List().isEmpty()) {
+                type = "Fixed64List";
+                value = objectValue.getFixed64List();
+            }
+
+            if (!objectValue.getGroupList().isEmpty()) {
+                type = "getGroupList";
+                value = objectValue.getGroupList();
+            }
+
+            if (!objectValue.getVarintList().isEmpty()) {
+                type = "int";
+                value = objectValue.getVarintList().get(0);
+            }
+
+            root.addField(index, type, value);
+        }
+    }
+
+    public static WebcastResponse.Message fromBase64ToMessage(String base64) throws InvalidProtocolBufferException {
+        var bytes = fromBase64(base64);
+        return WebcastResponse.Message.parseFrom(bytes);
+    }
+
+
+}

API/src/main/proto/data.proto

@@ -64,8 +64,8 @@ message Text {
     string stringValue = 11;
     oneof textPieceType
     {
-        TextPieceUser userValue = 21;
-        TextPieceGift giftValue = 22;
+      TextPieceUser userValue = 21;
+      TextPieceGift giftValue = 22;
     }
     TextPiecePatternRef patternRefValue = 24;
   }
@@ -155,7 +155,7 @@ message BadgeStruct {
 
   message ProfileCardPanel {
     bool useNewProfileCardStyle = 1;
-  //  BadgeTextPosition badgeTextPosition = 2; // Enum
+    //  BadgeTextPosition badgeTextPosition = 2; // Enum
     ProjectionConfig projectionConfig = 3;
     ProfileContent profileContent = 4;
   }
@@ -973,4 +973,545 @@ message FanTicketRoomNoticeContent {
   int64 MatchId = 3;
   int64 EventTime = 4;
   string FanTicketIconUrl = 5;
+}
+
+message LinkerAcceptNoticeContent {
+  int64 FromUserId = 1;
+  int64 FromRoomId = 2;
+  int64 ToUserId = 3;
+}
+
+message LinkerCancelContent {
+  int64 FromUserId = 1;
+  int64 ToUserId = 2;
+  int64 CancelType = 3;
+  int64 ActionId = 4;
+}
+
+message LinkerCloseContent {
+
+}
+
+message LinkerCreateContent {
+  int64 OwnerId = 1;
+  int64 OwnerRoomId = 2;
+  int64 LinkType = 3;
+}
+
+message LinkerEnterContent {
+  repeated User LinkedUsersList = 1;
+  // LinkmicMultiLiveEnum AnchorMultiLiveEnum = 2;
+  // Data.LinkmicUserSettingInfo AnchorSettingInfo = 3;
+}
+
+message LinkerInviteContent {
+  int64 FromUserId = 1;
+  int64 FromRoomId = 2;
+  string ToRtcExtInfo = 3;
+  bool RtcJoinChannel = 4;
+  int64 Vendor = 5;
+  string SecFromUserId = 6;
+  string ToLinkmicIdStr = 7;
+  User FromUser = 8;
+  int64 RequiredMicIdx = 9;
+  map<int64, string> RtcExtInfoMap = 10;
+  //Data.LinkmicMultiLiveEnum AnchorMultiLiveEnum = 11;
+  //Data.LinkmicUserSettingInfo AnchorSettingInfo = 12;
+  string InviterLinkmicIdStr = 13;
+  //  InviteTopHostInfo FromTopHostInfo = 16;
+  int64 ActionId = 17;
+  // repeated LinkmicUserInfo LinkedUsersList = 18;
+  // Data.PerceptionDialogInfo Dialog = 19;
+  // Data.PunishEventInfo PunishInfo = 20;
+  int32 FromRoomAgeRestricted = 21;
+  // Data.Tag FromTag = 22;
+  // repeated Data.CohostABTestSetting AbTestSettingList = 23;
+  // Data.LinkerInviteMessageExtra LinkerInviteMsgExtra = 101;
+}
+
+message LinkerKickOutContent {
+  int64 FromUserId = 1;
+  //LinkMic.KickoutReason KickoutReason = 2;
+}
+
+message LinkerLeaveContent {
+  int64 UserId = 1;
+  string LinkmicIdStr = 2;
+  int64 SendLeaveUid = 3;
+  int64 LeaveReason = 4;
+}
+
+message LinkerLinkedListChangeContent {
+  repeated User LinkedUsersList = 1;
+}
+
+message LinkerListChangeContent {
+  repeated LinkLayerListUser LinkedUsersList = 1;
+  repeated LinkLayerListUser AppliedUsersList = 2;
+  repeated LinkLayerListUser ConnectingUsersList = 3;
+}
+
+message LinkerMediaChangeContent {
+  // MicIdxOperation Op = 1;
+  int64 ToUserId = 2;
+  int64 AnchorId = 3;
+  int64 RoomId = 4;
+  // LinkerSceneType ChangeScene = 5;
+}
+
+message LinkerMicIdxUpdateContent {
+  LinkerMicIdxUpdateInfo MicIdxUpdateInfo = 1;
+}
+
+message LinkerMicIdxUpdateInfo {
+  // MicIdxOperation Op = 1;
+  int64 UserId = 2;
+  int64 MicIdx = 3;
+}
+
+message LinkerMuteContent {
+  int64 UserId = 1;
+  // Data.MuteStatus Status = 2;
+}
+
+message LinkerRandomMatchContent {
+  User User = 1;
+  int64 RoomId = 2;
+  int64 InviteType = 3;
+  string MatchId = 4;
+  int64 InnerChannelId = 5;
+}
+
+message LinkerReplyContent {
+  int64 FromUserId = 1;
+  int64 FromRoomId = 2;
+  // LinkmicInfo FromUserLinkmicInfo = 3;
+  int64 ToUserId = 4;
+  //  LinkmicInfo ToUserLinkmicInfo = 5;
+  int64 LinkType = 6;
+  int64 ReplyStatus = 7;
+  LinkerSetting LinkerSetting = 8;
+  User FromUser = 9;
+  User ToUser = 10;
+  map<int64, string> RtcExtInfoMap = 11;
+  LinkerMicIdxUpdateInfo InviteeMicIdxUpdateInfo = 12;
+  map<int64, int64> ApplierMicIdxInfoMap = 13;
+  //  Data.LinkmicMultiLiveEnum AnchorMultiLiveEnum = 14;
+  //  Data.LinkmicUserSettingInfo AnchorSettingInfo = 15;
+  int64 ActionId = 16;
+  // repeated LinkmicUserInfo LinkedUsersList = 17;
+  int64 SourceType = 18;
+}
+
+message LinkerSetting {
+  int64 MaxMemberLimit = 1;
+  int64 LinkType = 2;
+  int64 Scene = 3;
+  int64 OwnerUserId = 4;
+  int64 OwnerRoomId = 5;
+  int64 Vendor = 6;
+}
+
+message LinkerSysKickOutContent {
+  int64 UserId = 1;
+  string LinkmicIdStr = 2;
+}
+
+message LinkerUpdateUserContent {
+  int64 FromUserId = 1;
+  int64 ToUserId = 2;
+  map<string, string> UpdateInfoMap = 3;
+}
+
+message LinkerUpdateUserSettingContent {
+  // Data.LinkmicUserSettingInfo UpdateUserSettingInfo = 1;
+}
+
+message LinkerWaitingListChangeContent {
+
+}
+
+
+message LinkmicUserSettingInfo {
+  int64 userId = 1;
+  int64 layout = 2; // @warning Enum not found, should be Layout
+  int64 fixMicNum = 3; // @warning Enum not found, should be FixMicNum
+  int64 allowRequestFromUser = 4; // @warning Enum not found, should be AllowRequestFromUser
+  int64 allowRequestFromFollowerOnly = 5; // @warning Enum not found, should be AllowRequestFromFollowerOnly
+  LinkmicApplierSortSetting applierSortSetting = 7; // Enum
+}
+
+
+message Player {
+  int64 roomId = 1;
+  int64 userId = 2;
+}
+
+message AllListUser {
+  repeated LinkLayerListUser linkedList = 2;
+  repeated LinkLayerListUser appliedList = 3;
+  repeated LinkLayerListUser invitedList = 4;
+  repeated LinkLayerListUser readyList = 5;
+}
+
+message LinkLayerListUser {
+  User user = 1;
+  int64 linkmicId = 2;
+  Position pos = 3;
+  int64 linkedTimeNano = 4;
+  string appVersion = 5;
+  int64 magicNumber1 = 7;
+}
+
+message Position {
+  int32 type = 1;
+  LinkPosition link = 2;
+}
+
+message LinkPosition {
+  int32 position = 1;
+  int32 opt = 2;
+}
+
+message GroupPlayer {
+  int64 channelId = 1;
+  User user = 2;
+}
+
+message DSLConfig {
+  int32 sceneVersion = 1;
+  string layoutId = 2;
+}
+
+message GroupChannelAllUser {
+  int64 groupChannelId = 1;
+  repeated GroupChannelUser userList = 2;
+}
+
+message GroupChannelUser {
+  int64 channelId = 1;
+  GroupStatus status = 2; // Enum
+  TextType type = 3; // Enum
+  AllListUser allUser = 4;
+  int64 joinTime = 5;
+  int64 linkedTime = 6;
+  GroupPlayer ownerUser = 7;
+}
+
+message RTCExtraInfo {
+  RTCEngineConfig liveRtcEngineConfig = 1;
+  repeated RTCLiveVideoParam liveRtcVideoParamList = 2;
+  RTCBitrateMap rtcBitrateMap = 3;
+  int32 rtcFps = 4;
+  string rtcBusinessId = 8;
+  int32 interactClientType = 10;
+
+  message RTCEngineConfig {
+    string rtcAppId = 1;
+    string rtcUserId = 2;
+    string rtcToken = 3;
+    int64 rtcChannelId = 4;
+  }
+
+  message RTCLiveVideoParam {
+    int32 strategyId = 1;
+    RTCVideoParam params = 2;
+  }
+
+  message RTCVideoParam {
+    int32 width = 1;
+    int32 height = 2;
+    int32 fps = 3;
+    int32 bitrateKbps = 4;
+  }
+
+  message RTCBitrateMap {
+    int32 xx1 = 1;
+    int32 xx2 = 2;
+    int32 xx3 = 3;
+    int32 xx4 = 4;
+  }
+}
+
+message CreateChannelContent {
+  Player  owner = 1;
+  string ownerLinkMicId = 2;
+}
+
+message ListChangeContent {
+  TextType type = 1; // Enum
+  AllListUser list = 2;
+}
+
+message MultiLiveContent {
+  InviteBizContent inviteBizContent = 2;
+  ReplyBizContent replyBizContent = 3;
+  PermitBizContent permitBizContent = 4;
+  KickOutBizContent kickOutBizContent = 6;
+
+
+  message InviteBizContent {
+    LinkmicUserSettingInfo anchorSettingInfo = 1;
+    int64 inviteSource = 2; // @warning Enum not found, should be InviteSource
+    User operatorUserInfo = 3;
+    int64 operatorLinkAdminType = 4; // @warning Enum not found, should be OperatorLinkAdminType
+    User inviteeUserInfo = 5;
+  }
+
+
+  message ReplyBizContent {
+    int32 linkType = 1;
+    int32 isTurnOffInvitation = 2;
+    User replyUserInfo = 3;
+  }
+
+  message PermitBizContent {
+    LinkmicUserSettingInfo anchorSettingInfo = 1;
+    int64 expireTimestamp = 2;
+    User operatorUserInfo = 3;
+    int64 operatorLinkAdminType = 4; // @warning Enum not found, should be OperatorLinkAdminType
+  }
+
+  message KickOutBizContent {
+    User operatorUserInfo = 1;
+    int64 operatorLinkAdminType = 2; // @warning Enum not found, should be OperatorLinkAdminType
+    User kickPlayerUserInfo = 3;
+  }
+
+}
+
+
+message InviteContent {
+  Player  invitor = 1;
+  RTCExtraInfo inviteeRtcExtInfo = 2;
+  string invitorLinkMicId = 3;
+  string inviteeLinkMicId = 4;
+  bool isOwner = 5;
+  Position pos = 6;
+  DSLConfig dsl = 7;
+  User invitee = 8;
+  User operator = 9;
+}
+
+
+// @ApplyContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message ApplyContent {
+  Player  applier = 1;
+  string applierLinkMicId = 2;
+}
+
+
+// @PermitApplyContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message PermitApplyContent {
+  Player  permiter = 1;
+  string permiterLinkMicId = 2;
+  Position applierPos = 3;
+  ReplyStatus replyStatus = 4; // Enum
+  DSLConfig dsl = 5;
+  User applier = 6;
+  User operator = 7;
+  string applierLinkMicId = 8;
+}
+
+
+// @ReplyInviteContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message ReplyInviteContent {
+  Player  invitee = 1;
+  ReplyStatus replyStatus = 2; // Enum
+  string inviteeLinkMicId = 3;
+  Position inviteePos = 4;
+  Player  inviteOperatorUser = 5;
+}
+
+
+// @KickOutContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message KickOutContent {
+  Player  offliner = 1;
+  KickoutReason kickoutReason = 2; // Enum
+}
+
+
+// @CancelApplyContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message CancelApplyContent {
+  Player  applier = 1;
+  string applierLinkMicId = 2;
+}
+
+
+// @CancelInviteContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message CancelInviteContent {
+  Player  invitor = 1;
+  string invitorLinkMicId = 2;
+  string inviteeLinkMicId = 3;
+  int64 inviteSeqId = 4;
+  Player  invitee = 5;
+}
+
+
+// @LeaveContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message LeaveContent {
+  Player  leaver = 1;
+  int64 leaveReason = 2;
+}
+
+
+// @FinishChannelContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message FinishChannelContent {
+  Player  owner = 1;
+  int64 finishReason = 2;
+}
+
+
+// @JoinDirectContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message JoinDirectContent {
+  LinkLayerListUser joiner = 1;
+  AllListUser allUsers = 2;
+}
+
+
+// @LeaveJoinGroupContent
+// proto.webcast.im
+// C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+message LeaveJoinGroupContent {
+  GroupPlayer operator = 1;
+  int64 groupChannelId = 2;
+  string leaveSource = 3;
+}
+
+
+// @PermitJoinGroupContent
+// proto.webcast.im
+message PermitJoinGroupContent {
+  GroupPlayer approver = 1;
+  AgreeStatus agreeStatus = 2; // Enum
+  TextType type = 3; // Enum
+  repeated RTCExtraInfo groupExtInfoList = 4;
+  GroupChannelAllUser groupUser = 5;
+}
+
+
+// @CancelJoinGroupContent
+// proto.webcast.im
+message CancelJoinGroupContent {
+  repeated GroupPlayer leaverList = 1;
+  GroupPlayer operator = 2;
+  TextType type = 3; // Enum
+}
+
+
+
+message P2PGroupChangeContent {
+  repeated RTCExtraInfo groupExtInfoList = 1;
+  GroupChannelAllUser groupUser = 2;
+}
+
+
+message BusinessContent {
+  int64 overLength = 1;
+  MultiLiveContent multiLiveContent = 100;
+  CohostContent cohostContent = 200;
+
+  message CohostContent {
+    JoinGroupBizContent joinGroupBizContent = 1;
+
+  }
+
+  message JoinGroupBizContent {
+    int32 fromRoomAgeRestricted = 1;
+    Tag fromTag = 2;
+    PerceptionDialogInfo dialog = 3;
+    PunishEventInfo punishInfo = 4;
+    JoinGroupMessageExtra joinGroupMsgExtra = 101;
+  }
+
+  message Tag {
+    int32 tagType = 1;
+    string tagValue = 2;
+    string tagText = 3;
+  }
+
+  message PerceptionDialogInfo {
+    int64 iconType = 1; // @warning Enum not found, should be IconType
+    Text title = 2;
+    Text subTitle = 3;
+    Text adviceActionText = 4;
+    Text defaultActionText = 5;
+    string violationDetailUrl = 6;
+    int32 scene = 7;
+    int64 targetUserId = 8;
+    int64 targetRoomId = 9;
+    int64 countDownTime = 10;
+    bool showFeedback = 11;
+    repeated PerceptionFeedbackOption feedbackOptionsList = 12;
+    int64 policyTip = 13;
+  }
+
+  message PerceptionFeedbackOption {
+    int64 id = 1;
+    string contentKey = 2;
+  }
+
+  message JoinGroupMessageExtra {
+    int64 sourceType = 1;
+    RivalExtra extra = 2;
+    repeated RivalExtra otherUsersList = 3;
+
+
+    // @RivalExtra
+    // proto.webcast.im.JoinGroupMessageExtra
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+    message RivalExtra {
+      int64 userCount = 4;
+      Image avatarThumb = 5;
+      string displayId = 6;
+      AuthenticationInfo authenticationInfo = 7;
+      string nickname = 8;
+      int64 followStatus = 9;
+      Hashtag hashtag = 10;
+      TopHostInfo topHostInfo = 11;
+      int64 userId = 12;
+      bool isBestTeammate = 13;
+
+      message AuthenticationInfo {
+        string customVerify = 1;
+        string enterpriseVerifyReason = 2;
+        Image authenticationBadge = 3;
+      }
+    }
+  }
+  message Hashtag {
+    int64 id = 1;
+    string title = 2;
+    Image image = 3;
+    HashtagNamespace namespace = 4; // Enum
+  }
+
+  message TopHostInfo {
+    string rankType = 1;
+    int64 topIndex = 2;
+  }
+}
+
+message JoinGroupContent {
+  GroupChannelAllUser groupUser = 1;
+  GroupPlayer joinUser = 2;
+  TextType type = 3; // Enum
 }

API/src/main/proto/enums.proto

@@ -25,6 +25,85 @@ enum EmotePrivateType {
   EMOTE_PRIVATE_TYPE_SUB_WAVE = 1;
 }
 
+enum TextType {
+  DISPLAY_TEXT = 0;
+  CONTENT = 1;
+}
+
+enum LinkmicApplierSortSetting {
+  LINKMIC_APPLIER_SORT_SETTING_NONE = 0;
+  LINKMIC_APPLIER_SORT_SETTING_BY_GIFT_SCORE = 1;
+}
+
+enum HashtagNamespace {
+  GLOBAL = 0;
+  GAMING = 1;
+}
+
+enum AgreeStatus {
+  AGREE_UNKNOWN = 0;
+  AGREE = 1;
+  REJECT = 2;
+}
+
+enum KickoutReason {
+  KICKOUT_REASON_UNKNOWN = 0;
+  KICKOUT_REASON_FIRST_FRAME_TIMEOUT = 1;
+  KICKOUT_REASON_BY_HOST = 2;
+  KICKOUT_REASON_RTC_LOST_CONNECTION = 3;
+  KICKOUT_REASON_BY_PUNISH = 4;
+  KICKOUT_REASON_BY_ADMIN = 5;
+  KICKOUT_REASON_HOST_REMOVE_ALL_GUESTS = 6;
+}
+
+
+enum GroupStatus {
+  GROUP_STATUS_UNKNOWN = 0;
+  GROUP_STATUS_WAITING = 1;
+  GROUP_STATUS_LINKED = 3;
+}
+
+enum BusinessCase {
+  BUSINESS_NOT_SET = 0;
+  APPLY_BIZ_CONTENT = 1;
+  INVITE_BIZ_CONTENT = 2;
+  REPLY_BIZ_CONTENT = 3;
+  PERMIT_BIZ_CONTENT = 4;
+  JOIN_DIRECT_BIZ_CONTENT = 5;
+  KICK_OUT_BIZ_CONTENT = 6;
+  LIST_CHANGE_BIZ_CONTENT = 11;
+  MULTI_LIVE_CONTENT = 100;
+  COHOST_CONTENT = 200;
+}
+
+enum ReplyStatus {
+  REPLY_STATUS_UNKNOWN = 0;
+  REPLY_STATUS_AGREE = 1;
+  REPLY_STATUS_REFUSE_PERSONALLY = 2;
+  REPLY_STATUS_REFUSE_TYPE_NOT_SUPPORT = 3;
+  REPLY_STATUS_REFUSE_PROCESSING_INVITATION = 4;
+  REPLY_STATUS_REFUSE_BY_TIMEOUT = 5;
+  REPLY_STATUS_REFUSE_EXCEPTION = 6;
+  REPLY_STATUS_REFUSE_SYSTEM_NOT_SUPPORTED = 7;
+  REPLY_STATUS_REFUSE_SUBTYPE_DIFFERENCE = 8;
+  REPLY_STATUS_REFUSE_IN_MICROOM = 9;
+  REPLY_STATUS_REFUSE_NOT_LOAD_PLUGIN = 10;
+  REPLY_STATUS_REFUSE_IN_MULTI_GUEST = 11;
+  REPLY_STATUS_REFUSE_PAUSE_LIVE = 12;
+  REPLY_STATUS_REFUSE_OPEN_CAMERA_DIALOG_SHOWING = 13;
+  REPLY_STATUS_REFUSE_DRAW_GUESSING = 14;
+  REPLY_STATUS_REFUSE_RANDOM_MATCHING = 15;
+  REPLY_STATUS_REFUSE_IN_MATCH_PROCESSING = 16;
+  REPLY_STATUS_REFUSE_IN_MICROOM_FOR_MULTI_COHOST = 17;
+  REPLY_STATUS_REFUSE_COHOST_FINISHED = 18;
+  REPLY_STATUS_REFUSE_NOT_CONNECTED = 19;
+  REPLY_STATUS_REFUSE_LINKMIC_FULL = 20;
+  REPLY_STATUS_REFUSE_ARC_INCOMPATIBLE = 21;
+  REPLY_STATUS_REFUSE_PROCESSING_OTHER_INVITE = 22;
+  REPLY_STATUS_REFUSE_PROCESSING_OTHER_APPLY = 23;
+  REPLY_STATUS_REFUSE_IN_ANCHOR_COHOST = 24;
+  REPLY_STATUS_REFUSE_TOPIC_PAIRING = 25;
+}
 
 enum SubscribeType {
   SUBSCRIBETYPE_ONCE = 0;
@@ -136,4 +215,51 @@ enum EnvelopeDisplay
   EnvelopeDisplayUnknown = 0;
   EnvelopeDisplayNew = 1;
   EnvelopeDisplayHide = 2;
+}
+
+
+enum CommonContentCase {
+  COMMON_CONTENT_NOT_SET = 0;
+  CREATE_CHANNEL_CONTENT = 100;
+  LIST_CHANGE_CONTENT = 102;
+  INVITE_CONTENT = 103;
+  APPLY_CONTENT = 104;
+  PERMIT_APPLY_CONTENT = 105;
+  REPLY_INVITE_CONTENT = 106;
+  KICK_OUT_CONTENT = 107;
+  CANCEL_APPLY_CONTENT = 108;
+  CANCEL_INVITE_CONTENT = 109;
+  LEAVE_CONTENT = 110;
+  FINISH_CONTENT = 111;
+  JOIN_DIRECT_CONTENT = 112;
+  JOIN_GROUP_CONTENT = 113;
+  PERMIT_GROUP_CONTENT = 114;
+  CANCEL_GROUP_CONTENT = 115;
+  LEAVE_GROUP_CONTENT = 116;
+  P2P_GROUP_CHANGE_CONTENT = 117;
+  GROUP_CHANGE_CONTENT = 118;
+}
+
+
+
+enum MessageType {
+  MESSAGETYPE_SUBSUCCESS = 0;
+  MESSAGETYPE_ANCHORREMINDER = 1;
+  MESSAGETYPE_ENTERROOMEXPIRESOON = 2;
+  MESSAGETYPE_SUBGOALCREATETOANCHOR = 3;
+  MESSAGETYPE_SUBGOALCOMPLETETOAUDIENCE = 4;
+  MESSAGETYPE_SUBGOALCOMPLETETOANCHOR = 5;
+  MESSAGETYPE_SUBGIFTTIKTOK2USERNOTICE = 6;
+  MESSAGETYPE_SUBGIFTTIKTOK2ANCHORNOTICE = 7;
+  MESSAGETYPE_SUBGIFTTRECEIVESENDNOTICE = 8;
+  MESSAGETYPE_SUBGIFTSENDSUCCEEDROOMMESSAGE = 9;
+  MESSAGETYPE_SUBGIFTSENDSUCCEEDANCHORNOTICE = 10;
+  MESSAGETYPE_SUBGIFTLOWVERSIONUPGRADENOTICE = 11;
+  MESSAGETYPE_SUBGIFTUSERBUYAUTHNOTICE = 12;
+}
+
+enum Scene {
+  SCENE_UNKNOWN = 0;
+  SCENE_CO_HOST = 2;
+  SCENE_MULTI_LIVE = 4;
 }

API/src/main/proto/webcast.proto

@@ -68,7 +68,6 @@ message WebcastGiftMessage {
   int32 repeatCount = 5;
   int32 comboCount = 6;
   User user = 7;
-  User toUser = 8;
   int32 repeatEnd = 9;
   int64 groupId = 11;
   int64 incomeTaskgifts = 12;
@@ -81,6 +80,13 @@ message WebcastGiftMessage {
   bool isFirstSent = 25;
   string orderId = 28;
   UserIdentity userIdentity = 32;
+  UserGiftReciever userGiftReciever = 23;
+
+  message UserGiftReciever
+  {
+      int64 userId =1;
+      string deviceName = 10;
+  }
 
   message GiftIMPriority {
     repeated int64 queueSizesList = 1;
@@ -177,6 +183,8 @@ message WebcastCaptionMessage {
   }
 }
 
+
+
 // Comment sent by User
 //@WebcastChatMessage
 message WebcastChatMessage {
@@ -440,7 +448,7 @@ message WebcastMemberMessage {
 //@WebcastPollMessage
 message WebcastPollMessage {
   Common common = 1;
-  int32 messageType = 2;
+  MessageType messageType = 2;
   int64 pollId = 3;
   PollStartContent startContent = 4;
   PollEndContent endContent = 5;
@@ -505,6 +513,9 @@ message WebcastHourlyRankMessage {
   }
 }
 
+
+//<Battles>
+
 //@WebcastLinkMicArmies
 message WebcastLinkMicArmies {
   Common common = 1;
@@ -521,6 +532,45 @@ message WebcastLinkMicArmies {
   uint32 data4 = 12;
   uint32 data5 = 13;
 }
+//@WebcastLinkMicBattlePunishFinish
+message WebcastLinkMicBattlePunishFinish {
+  Common Header = 1;
+  uint64 Id1 = 2;
+  uint64 Timestamp = 3;
+  uint32 Data4 = 4;
+  uint64 Id2 = 5;
+  LinkMicBattlePunishFinishData Data6 = 6;
+
+  message LinkMicBattlePunishFinishData {
+    uint64 Id2 = 1; // Same as Id2 in outer object (loser?)
+    uint64 Timestamp = 2;
+    uint32 Data3 = 3;
+    uint64 Id1 = 4; // Same as Id1 in outer object (winner?)
+    uint32 Data5 = 5;
+    uint32 Data6 = 6;
+    uint32 Data8 = 8;
+  }
+}
+
+//@WebcastLinkmicBattleTaskMessage
+message WebcastLinkmicBattleTaskMessage {
+  Common Header = 1;
+  uint32 Data2 = 2;
+  LinkmicBattleTaskData Data3 = 3;
+  LinkmicBattleTaskData2 Data5 = 5;
+
+  message LinkmicBattleTaskData {
+    BattleTaskData Data1 = 1;
+  }
+  message BattleTaskData {
+    uint32 Data1 = 1;
+  }
+
+  message LinkmicBattleTaskData2 {
+    uint32 Data1 = 1;
+    uint32 Data2 = 2;
+  }
+}
 
 //@WebcastLinkMicBattle
 message WebcastLinkMicBattle {
@@ -570,11 +620,10 @@ message WebcastLinkMicFanTicketMethod {
   Common common = 1;
   FanTicketRoomNoticeContent FanTicketRoomNotice = 2;
 }
-
 //@WebcastLinkMicMethod
 message WebcastLinkMicMethod {
   Common common = 1;
-  int64 messageType = 2;
+  MessageType messageType = 2;
   string accessKey = 3;
   int64 anchorLinkmicId = 4;
   int64 userId = 5;
@@ -588,6 +637,8 @@ message WebcastLinkMicMethod {
   int64 inviteUid = 13;
 }
 
+//<Battles>
+
 //@WebcastLiveIntroMessage
 message WebcastLiveIntroMessage {
   Common common = 1;
@@ -681,39 +732,63 @@ message WebcastSystemMessage {
 //@WebcastLinkMessage
 message WebcastLinkMessage {
   Common common = 1;
-  uint32 data1 = 2;
-  uint64 data2 = 3;
-  uint32 data3 = 4;
-  LinkMessageData data = 18;
-  LinkMessageUserContainer user = 20;
-  string token = 200;
-
-  message LinkMessageData {
-    DataContainer data = 1; // index 1 is an Id
-  }
-
-  message LinkMessageUserContainer {
-    LinkMessageUser user = 1;
-    repeated LinkMessageUser otherUsers = 2;
-
-    message LinkMessageUser {
-      User user = 1;
-      uint64 timeStamp = 2;
-      uint32 data1 = 4;
-      string idString = 5;
-      uint32 data2 = 7;
-    }
-  }
+  MessageType MessageType = 2;
+  int64 LinkerId = 3;
+  Scene Scene = 4;
+  LinkerInviteContent InviteContent = 5;
+  LinkerReplyContent ReplyContent = 6;
+  LinkerCreateContent CreateContent = 7;
+  LinkerCloseContent CloseContent = 8;
+  LinkerEnterContent EnterContent = 9;
+  LinkerLeaveContent LeaveContent = 10;
+  LinkerCancelContent CancelContent = 11;
+  LinkerKickOutContent KickOutContent = 12;
+  LinkerLinkedListChangeContent LinkedListChangeContent = 13;
+  LinkerUpdateUserContent UpdateUserContent = 14;
+  LinkerWaitingListChangeContent WaitingListChangeContent = 15;
+  LinkerMuteContent MuteContent = 16;
+  LinkerRandomMatchContent RandomMatchContent = 17;
+  LinkerUpdateUserSettingContent UpdateUserSettingContent = 18;
+  LinkerMicIdxUpdateContent MicIdxUpdateContent = 19;
+  LinkerListChangeContent ListChangeContent = 20;
+ // CohostListChangeContent CohostListChangeContent = 21;
+  LinkerMediaChangeContent MediaChangeContent = 22;
+  LinkerAcceptNoticeContent ReplyAcceptNoticeContent = 23;
+  LinkerSysKickOutContent SysKickOutContent = 101;
+ // LinkmicUserToastContent UserToastContent = 102;
+  string Extra = 200;
+  int64 ExpireTimestamp = 201;
+  string TransferExtra = 202;
 }
 
-//@WebcastLinkLayerMessage
+
+// @WebcastLinkLayerMessage
 message WebcastLinkLayerMessage {
   Common common = 1;
-  LinkLayerMessageType messageType = 2;
+  MessageType messageType = 2; // Enum
   int64 channelId = 3;
+  Scene scene = 4; // Enum
+  CreateChannelContent createChannelContent = 100;
+  ListChangeContent listChangeContent = 102;
+  InviteContent inviteContent = 103;
+  ApplyContent applyContent = 104;
+  PermitApplyContent permitApplyContent = 105;
+  ReplyInviteContent replyInviteContent = 106;
+  KickOutContent kickOutContent = 107;
+  CancelApplyContent cancelApplyContent = 108;
+  CancelInviteContent cancelInviteContent = 109;
+  LeaveContent leaveContent = 110;
+  FinishChannelContent finishContent = 111;
+  JoinDirectContent joinDirectContent = 112;
+  JoinGroupContent joinGroupContent = 113;
+  PermitJoinGroupContent permitGroupContent = 114;
+  CancelJoinGroupContent cancelGroupContent = 115;
+  LeaveJoinGroupContent leaveGroupContent = 116;
+  P2PGroupChangeContent p2pGroupChangeContent = 117;
+  BusinessContent businessContent = 200;
 }
 
-
+// @RoomVerifyMessage
 message RoomVerifyMessage {
   Common common = 1;
   int32 action = 2;

Client/pom.xml

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

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

@@ -87,4 +87,5 @@ public class TikTokLive
     {
         return new TikTokDataChecker().isHostNameValidAsync(hostName);
     }
+
 }

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

@@ -25,6 +25,7 @@ package io.github.jwdeveloper.tiktok;
 import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokReconnectingEvent;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
@@ -93,8 +94,7 @@ public class TikTokLiveClient implements LiveClient {
     public void connect() {
         try {
             tryConnect();
-        } catch (TikTokLiveException e)
-        {
+        } catch (TikTokLiveException e) {
             setState(ConnectionState.DISCONNECTED);
             tikTokEventHandler.publish(this, new TikTokErrorEvent(e));
             tikTokEventHandler.publish(this, new TikTokDisconnectedEvent());
@@ -109,6 +109,10 @@ public class TikTokLiveClient implements LiveClient {
                 this.connect();
             }
             throw e;
+        } catch (Exception e) {
+            logger.info("Unhandled exception report this bug to github https://github.com/jwdeveloper/TikTokLiveJava/issues");
+            this.disconnect();
+            e.printStackTrace();
         }
     }
 
@@ -128,6 +132,7 @@ public class TikTokLiveClient implements LiveClient {
 
         setState(ConnectionState.CONNECTING);
 
+
         apiService.updateSessionId();
 
         if (clientSettings.getRoomId() != null) {
@@ -140,10 +145,10 @@ public class TikTokLiveClient implements LiveClient {
 
 
         var liveRoomMeta = apiService.fetchRoomInfo();
-        if (liveRoomMeta.getStatus() == LiveRoomMeta.LiveRoomStatus.HostNotFound)  {
+        if (liveRoomMeta.getStatus() == LiveRoomMeta.LiveRoomStatus.HostNotFound) {
             throw new TikTokLiveOfflineHostException("LiveStream for Host name could not be found.");
         }
-        if (liveRoomMeta.getStatus() == LiveRoomMeta.LiveRoomStatus.HostOffline)  {
+        if (liveRoomMeta.getStatus() == LiveRoomMeta.LiveRoomStatus.HostOffline) {
             throw new TikTokLiveOfflineHostException("LiveStream for not be found, is the Host offline?");
         }
 
@@ -156,7 +161,7 @@ public class TikTokLiveClient implements LiveClient {
         var clientData = apiService.fetchClientData();
         webSocketClient.start(clientData, this);
         setState(ConnectionState.CONNECTED);
-        tikTokEventHandler.publish(this,new TikTokRoomInfoEvent(liveRoomInfo));
+        tikTokEventHandler.publish(this, new TikTokRoomInfoEvent(liveRoomInfo));
     }
 
 
@@ -185,4 +190,8 @@ public class TikTokLiveClient implements LiveClient {
         liveRoomInfo.setConnectionState(connectionState);
     }
 
+    public void publishEvent(TikTokEvent event)
+    {
+        tikTokEventHandler.publish(this, event);
+    }
 }

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

@@ -27,6 +27,7 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
+import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent;
@@ -40,20 +41,27 @@ import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandl
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
 import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
-import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
-import io.github.jwdeveloper.tiktok.handlers.events.TikTokGiftEventHandler;
-import io.github.jwdeveloper.tiktok.handlers.events.TikTokRoomInfoEventHandler;
-import io.github.jwdeveloper.tiktok.handlers.events.TikTokSocialMediaEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandler;
 import io.github.jwdeveloper.tiktok.http.TikTokApiService;
 import io.github.jwdeveloper.tiktok.http.TikTokCookieJar;
 import io.github.jwdeveloper.tiktok.http.TikTokHttpClient;
 import io.github.jwdeveloper.tiktok.http.TikTokHttpRequestFactory;
 import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
 import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
+import io.github.jwdeveloper.tiktok.live.GiftManager;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.live.builder.EventConsumer;
 import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
 import io.github.jwdeveloper.tiktok.mappers.TikTokGenericEventMapper;
+import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapper;
+import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapperHelper;
+import io.github.jwdeveloper.tiktok.mappers.TikTokMapper;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
+import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokCommonEventHandler;
+import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler;
+import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokRoomInfoEventHandler;
+import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokSocialMediaEventHandler;
+import io.github.jwdeveloper.tiktok.messages.webcast.*;
 import io.github.jwdeveloper.tiktok.utils.ConsoleColors;
 import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketClient;
 
@@ -67,9 +75,11 @@ import java.util.logging.*;
 public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
     protected final ClientSettings clientSettings;
+
     protected final Logger logger;
     protected final TikTokEventObserver tikTokEventHandler;
     protected final List<TikTokEventListener> listeners;
+    protected Consumer<TikTokMapper> onCustomMappings;
 
     public TikTokLiveClientBuilder(String userName) {
         this.tikTokEventHandler = new TikTokEventObserver();
@@ -77,10 +87,18 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         this.clientSettings.setHostName(userName);
         this.logger = Logger.getLogger(TikTokLive.class.getSimpleName() + " " + userName);
         this.listeners = new ArrayList<>();
+        this.onCustomMappings = (e) -> {
+        };
     }
 
-    public TikTokLiveClientBuilder configure(Consumer<ClientSettings> consumer) {
-        consumer.accept(clientSettings);
+    public LiveClientBuilder onMapping(Consumer<TikTokMapper> onCustomMappings) {
+        this.onCustomMappings = onCustomMappings;
+        return this;
+    }
+
+
+    public TikTokLiveClientBuilder configure(Consumer<ClientSettings> onConfigure) {
+        onConfigure.accept(clientSettings);
         return this;
     }
 
@@ -104,8 +122,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
             throw new TikTokLiveException("HostName can not be null");
         }
 
-        if (clientSettings.getHostName().startsWith("@"))
-        {
+        if (clientSettings.getHostName().startsWith("@")) {
             clientSettings.setHostName(clientSettings.getHostName().substring(1));
         }
 
@@ -135,9 +152,6 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         if (!clientSettings.isPrintToConsole()) {
             logger.setLevel(Level.OFF);
         }
-
-
-
     }
 
     public LiveClient build() {
@@ -148,27 +162,18 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
         var listenerManager = new TikTokListenersManager(listeners, tikTokEventHandler);
         var cookieJar = new TikTokCookieJar();
-        var requestFactory = new TikTokHttpRequestFactory(cookieJar);
+        var requestFactory = new TikTokHttpRequestFactory(cookieJar, tikTokEventHandler);
         var apiClient = new TikTokHttpClient(cookieJar, requestFactory);
         var apiService = new TikTokApiService(apiClient, logger, clientSettings);
         var giftManager = new TikTokGiftManager(logger);
-        var eventMapper = new TikTokGenericEventMapper();
+        var eventsMapper = createMapper(giftManager, tiktokRoomInfo);
+        var messageHandler = new TikTokMessageHandler(tikTokEventHandler, eventsMapper);
 
-        var giftHandler = new TikTokGiftEventHandler(giftManager);
-        var roomInfoHandler = new TikTokRoomInfoEventHandler(tiktokRoomInfo);
-        var socialHandler = new TikTokSocialMediaEventHandler(tiktokRoomInfo);
 
-        var webResponseHandler = new TikTokMessageHandlerRegistration(tikTokEventHandler,
-                roomInfoHandler,
-                eventMapper,
-                giftHandler,
-                socialHandler
-                );
-
-        var webSocketClient = new TikTokWebSocketClient(logger,
+        var webSocketClient = new TikTokWebSocketClient(
                 cookieJar,
                 clientSettings,
-                webResponseHandler,
+                messageHandler,
                 tikTokEventHandler);
 
         return new TikTokLiveClient(tiktokRoomInfo,
@@ -181,6 +186,93 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
                 logger);
     }
 
+    public TikTokLiveMapper createMapper(GiftManager giftManager, TikTokRoomInfo roomInfo) {
+        var eventMapper = new TikTokGenericEventMapper();
+        var mapper = new TikTokLiveMapper(new TikTokLiveMapperHelper(eventMapper));
+
+        //ConnectionEvents events
+        var commonHandler = new TikTokCommonEventHandler();
+        var giftHandler = new TikTokGiftEventHandler(giftManager);
+        var roomInfoHandler = new TikTokRoomInfoEventHandler(roomInfo);
+        var socialHandler = new TikTokSocialMediaEventHandler(roomInfo);
+
+
+        mapper.forMessage(WebcastControlMessage.class, commonHandler::handleWebcastControlMessage);
+
+        //Room status events
+        mapper.forMessage(WebcastLiveIntroMessage.class, roomInfoHandler::handleIntro);
+        mapper.forMessage(WebcastRoomUserSeqMessage.class, roomInfoHandler::handleUserRanking);
+        mapper.forMessage(WebcastCaptionMessage.class, (inputBytes, messageName, mapperHelper) ->
+        {
+            var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, WebcastCaptionMessage.class);
+            return MappingResult.of(messageObject, new TikTokCaptionEvent(messageObject));
+        });
+
+
+        //User Interactions events
+        mapper.forMessage(WebcastChatMessage.class, (inputBytes, messageName, mapperHelper) ->
+        {
+            var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, WebcastChatMessage.class);
+            return MappingResult.of(messageObject, new TikTokCommentEvent(messageObject));
+        });
+        mapper.forMessage(WebcastSubNotifyMessage.class, (inputBytes, messageName, mapperHelper) ->
+        {
+            var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, WebcastSubNotifyMessage.class);
+            return MappingResult.of(messageObject, new TikTokSubscribeEvent(messageObject));
+        });
+        mapper.forMessage(WebcastEmoteChatMessage.class, (inputBytes, messageName, mapperHelper) ->
+        {
+            var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, WebcastEmoteChatMessage.class);
+            return MappingResult.of(messageObject, new TikTokEmoteEvent(messageObject));
+        });
+        mapper.forMessage(WebcastQuestionNewMessage.class, (inputBytes, messageName, mapperHelper) ->
+        {
+            var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, WebcastQuestionNewMessage.class);
+            return MappingResult.of(messageObject, new TikTokQuestionEvent(messageObject));
+        });
+
+        mapper.forMessage(WebcastLikeMessage.class, roomInfoHandler::handleLike);
+        mapper.forMessage(WebcastGiftMessage.class, giftHandler::handleGifts);
+        mapper.forMessage(WebcastSocialMessage.class, socialHandler::handle);
+        mapper.forMessage(WebcastMemberMessage.class, roomInfoHandler::handleMemberMessage);
+
+
+        //Host Interaction events
+        mapper.forMessage(WebcastPollMessage.class, commonHandler::handlePollEvent);
+        mapper.forMessage(WebcastRoomPinMessage.class, commonHandler::handlePinMessage);
+        mapper.forMessage(WebcastChatMessage.class, (inputBytes, messageName, mapperHelper) ->
+        {
+            var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, WebcastChatMessage.class);
+            return MappingResult.of(messageObject, new TikTokCommentEvent(messageObject));
+        });
+
+
+        //LinkMic events
+        // mapper.webcastObjectToConstructor(WebcastLinkMicBattle.class, TikTokLinkMicBattleEvent.class);
+        //  mapper.webcastObjectToConstructor(WebcastLinkMicArmies.class, TikTokLinkMicArmiesEvent.class);
+        //  mapper.webcastObjectToConstructor(WebcastLinkMicMethod.class, TikTokLinkMicMethodEvent.class);
+        //   mapper.webcastObjectToConstructor(WebcastLinkMicFanTicketMethod.class, TikTokLinkMicFanTicketEvent.class);
+
+        //Rank events
+        //   mapper.webcastObjectToConstructor(WebcastRankTextMessage.class, TikTokRankTextEvent.class);
+        //  mapper.webcastObjectToConstructor(WebcastRankUpdateMessage.class, TikTokRankUpdateEvent.class);
+        //   mapper.webcastObjectToConstructor(WebcastHourlyRankMessage.class, TikTokRankUpdateEvent.class);
+
+        //Others events
+        //  mapper.webcastObjectToConstructor(WebcastInRoomBannerMessage.class, TikTokInRoomBannerEvent.class);
+        //   mapper.webcastObjectToConstructor(WebcastMsgDetectMessage.class, TikTokDetectEvent.class);
+        //   mapper.webcastObjectToConstructor(WebcastBarrageMessage.class, TikTokBarrageEvent.class);
+        //   mapper.webcastObjectToConstructor(WebcastUnauthorizedMemberMessage.class, TikTokUnauthorizedMemberEvent.class);
+        //  mapper.webcastObjectToConstructor(WebcastOecLiveShoppingMessage.class, TikTokShopEvent.class);
+        //   mapper.webcastObjectToConstructor(WebcastImDeleteMessage.class, TikTokIMDeleteEvent.class);
+        //  mapper.bytesToEvents(WebcastEnvelopeMessage.class, commonHandler::handleEnvelop);
+
+
+        onCustomMappings.accept(mapper);
+        return mapper;
+    }
+
+
     public LiveClient buildAndConnect() {
         var client = build();
         client.connect();
@@ -191,18 +283,20 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return build().connectAsync();
     }
 
+
     public TikTokLiveClientBuilder onUnhandledSocial(
             EventConsumer<TikTokUnhandledSocialEvent> event) {
         tikTokEventHandler.subscribe(TikTokUnhandledSocialEvent.class, event);
         return this;
     }
 
-  //  @Override
+    //  @Override
     public LiveClientBuilder onChest(EventConsumer<TikTokChestEvent> event) {
         tikTokEventHandler.subscribe(TikTokChestEvent.class, event);
         return this;
     }
 
+
     public TikTokLiveClientBuilder onLinkMicFanTicket(
             EventConsumer<TikTokLinkMicFanTicketEvent> event) {
         tikTokEventHandler.subscribe(TikTokLinkMicFanTicketEvent.class, event);
@@ -252,6 +346,13 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
+    @Override
+    public <E extends TikTokEvent> LiveClientBuilder onEvent(Class<E> eventClass, EventConsumer<E> event) {
+        tikTokEventHandler.subscribe(eventClass, event);
+        return this;
+    }
+
+
     @Override
     public LiveClientBuilder onRoomInfo(EventConsumer<TikTokRoomInfoEvent> event) {
         tikTokEventHandler.subscribe(TikTokRoomInfoEvent.class, event);
@@ -259,7 +360,6 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
     }
 
 
-
     public TikTokLiveClientBuilder onLivePaused(EventConsumer<TikTokLivePausedEvent> event) {
         tikTokEventHandler.subscribe(TikTokLivePausedEvent.class, event);
         return this;
@@ -348,6 +448,12 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
+    @Override
+    public LiveClientBuilder onHttpResponse(EventConsumer<TikTokHttpResponseEvent> action) {
+        tikTokEventHandler.subscribe(TikTokHttpResponseEvent.class, action);
+        return this;
+    }
+
     public TikTokLiveClientBuilder onGoalUpdate(EventConsumer<TikTokGoalUpdateEvent> event) {
         tikTokEventHandler.subscribe(TikTokGoalUpdateEvent.class, event);
         return this;

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

@@ -62,7 +62,7 @@ public class TikTokRoomInfo implements LiveRoomInfo {
 
     @Override
     public User getHostUser() {
-        return null;
+        return host;
     }
 
     public void updateRanking(List<RankingUser> rankingUsers) {

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

@@ -23,47 +23,30 @@
 package io.github.jwdeveloper.tiktok.handlers;
 
 
+import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.mappers.TikTokGenericEventMapper;
+import io.github.jwdeveloper.tiktok.mappers.TikTokLiveMapper;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import io.github.jwdeveloper.tiktok.utils.Stopwatch;
 
 import java.time.Duration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
 
-public abstract class TikTokMessageHandler {
+public class TikTokMessageHandler {
 
-    private final Map<String, io.github.jwdeveloper.tiktok.handler.TikTokMessageHandler> handlers;
     private final TikTokEventObserver tikTokEventHandler;
-    protected final TikTokGenericEventMapper mapper;
+    private final TikTokLiveMapper mapper;
 
-    public TikTokMessageHandler(TikTokEventObserver tikTokEventHandler, TikTokGenericEventMapper mapper) {
-        handlers = new HashMap<>();
+    public TikTokMessageHandler(TikTokEventObserver tikTokEventHandler, TikTokLiveMapper mapper) {
         this.tikTokEventHandler = tikTokEventHandler;
         this.mapper = mapper;
     }
 
-    public void registerMapping(Class<?> clazz, Function<byte[], TikTokEvent> func) {
-        handlers.put(clazz.getSimpleName(), messagePayload -> List.of(func.apply(messagePayload)));
-    }
-
-    public void registerMappings(Class<?> clazz, Function<byte[], List<TikTokEvent>> func) {
-        handlers.put(clazz.getSimpleName(), func::apply);
-    }
-
-    public void registerMapping(Class<?> input, Class<?> output) {
-        registerMapping(input, (e) -> mapper.mapToEvent(input, output, e));
-    }
 
     public void handle(LiveClient client, WebcastResponse webcastResponse) {
         tikTokEventHandler.publish(client, new TikTokWebsocketResponseEvent(webcastResponse));
@@ -79,19 +62,18 @@ public abstract class TikTokMessageHandler {
 
     public void handleSingleMessage(LiveClient client, WebcastResponse.Message message) throws Exception {
         var messageClassName = message.getMethod();
-        if (!handlers.containsKey(messageClassName)) {
+        if (!mapper.isRegistered(messageClassName)) {
             tikTokEventHandler.publish(client, new TikTokWebsocketUnhandledMessageEvent(message));
             return;
         }
-        var handler = handlers.get(messageClassName);
         var stopwatch = new Stopwatch();
         stopwatch.start();
-        var events = handler.handle(message.getPayload().toByteArray());
+        var events = mapper.handleMapping(messageClassName, message.getPayload().toByteArray());
         var handlingTimeInMs = stopwatch.stop();
-        var metadata = new TikTokWebsocketMessageEvent.MetaData(Duration.ofNanos(handlingTimeInMs));
+        var metadata = new MessageMetaData(Duration.ofNanos(handlingTimeInMs));
 
         for (var event : events) {
-            tikTokEventHandler.publish(client, new TikTokWebsocketMessageEvent(event, message, metadata));
+            tikTokEventHandler.publish(client, new TikTokWebsocketMessageEvent(message, event, metadata));
             tikTokEventHandler.publish(client, event);
         }
     }

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

@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.handlers;
-
-import io.github.jwdeveloper.tiktok.data.events.*;
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEndEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollStartEvent;
-import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollUpdateEvent;
-import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent;
-import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent;
-import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent;
-import io.github.jwdeveloper.tiktok.data.models.chest.Chest;
-import io.github.jwdeveloper.tiktok.handlers.events.TikTokGiftEventHandler;
-import io.github.jwdeveloper.tiktok.handlers.events.TikTokRoomInfoEventHandler;
-import io.github.jwdeveloper.tiktok.handlers.events.TikTokSocialMediaEventHandler;
-import io.github.jwdeveloper.tiktok.mappers.TikTokGenericEventMapper;
-import io.github.jwdeveloper.tiktok.messages.enums.EnvelopeDisplay;
-import io.github.jwdeveloper.tiktok.messages.webcast.*;
-import lombok.SneakyThrows;
-
-import java.util.Collections;
-import java.util.List;
-
-public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
-
-    private final TikTokGiftEventHandler giftHandler;
-    private final TikTokRoomInfoEventHandler roomInfoHandler;
-    private final TikTokSocialMediaEventHandler socialHandler;
-
-    public TikTokMessageHandlerRegistration(TikTokEventObserver tikTokEventHandler,
-                                            TikTokRoomInfoEventHandler roomInfoHandler,
-                                            TikTokGenericEventMapper genericTikTokEventMapper,
-                                            TikTokGiftEventHandler tikTokGiftEventHandler,
-                                            TikTokSocialMediaEventHandler tikTokSocialMediaEventHandler) {
-        super(tikTokEventHandler, genericTikTokEventMapper);
-        this.giftHandler = tikTokGiftEventHandler;
-        this.roomInfoHandler = roomInfoHandler;
-        this.socialHandler = tikTokSocialMediaEventHandler;
-        init();
-    }
-
-    public void init() {
-
-        //ConnectionEvents events
-        registerMapping(WebcastControlMessage.class, this::handleWebcastControlMessage);
-
-        //Room status events
-        registerMapping(WebcastLiveIntroMessage.class, roomInfoHandler::handleIntro);
-        registerMapping(WebcastRoomUserSeqMessage.class, roomInfoHandler::handleUserRanking);
-
-        registerMapping(WebcastCaptionMessage.class, TikTokCaptionEvent.class);
-
-        //User Interactions events
-        registerMapping(WebcastChatMessage.class, TikTokCommentEvent.class);
-        registerMappings(WebcastLikeMessage.class, this::handleLike);
-        registerMappings(WebcastGiftMessage.class, giftHandler::handleGift);
-        registerMapping(WebcastSocialMessage.class, socialHandler::handle);
-        registerMappings(WebcastMemberMessage.class, this::handleMemberMessage);
-
-        //Host Interaction events
-        registerMapping(WebcastPollMessage.class, this::handlePollEvent);
-        registerMapping(WebcastRoomPinMessage.class, this::handlePinMessage);
-        registerMapping(WebcastGoalUpdateMessage.class, TikTokGoalUpdateEvent.class);
-
-        //LinkMic events
-        registerMapping(WebcastLinkMicBattle.class, TikTokLinkMicBattleEvent.class);
-        registerMapping(WebcastLinkMicArmies.class, TikTokLinkMicArmiesEvent.class);
-        registerMapping(WebcastLinkMicMethod.class, TikTokLinkMicMethodEvent.class);
-        registerMapping(WebcastLinkMicFanTicketMethod.class, TikTokLinkMicFanTicketEvent.class);
-
-        //Rank events
-        registerMapping(WebcastRankTextMessage.class, TikTokRankTextEvent.class);
-        registerMapping(WebcastRankUpdateMessage.class, TikTokRankUpdateEvent.class);
-        registerMapping(WebcastHourlyRankMessage.class, TikTokRankUpdateEvent.class);
-
-        //Others events
-        registerMapping(WebcastInRoomBannerMessage.class, TikTokInRoomBannerEvent.class);
-        registerMapping(WebcastMsgDetectMessage.class, TikTokDetectEvent.class);
-        registerMapping(WebcastBarrageMessage.class, TikTokBarrageEvent.class);
-        registerMapping(WebcastUnauthorizedMemberMessage.class, TikTokUnauthorizedMemberEvent.class);
-        registerMapping(WebcastOecLiveShoppingMessage.class, TikTokShopEvent.class);
-        registerMapping(WebcastImDeleteMessage.class, TikTokIMDeleteEvent.class);
-        registerMapping(WebcastQuestionNewMessage.class, TikTokQuestionEvent.class);
-        registerMappings(WebcastEnvelopeMessage.class, this::handleEnvelop);
-        registerMapping(WebcastSubNotifyMessage.class, TikTokSubNotifyEvent.class);
-        registerMapping(WebcastEmoteChatMessage.class, TikTokEmoteEvent.class);
-    }
-
-
-    @SneakyThrows
-    private TikTokEvent handleWebcastControlMessage(byte[] msg) {
-        var message = WebcastControlMessage.parseFrom(msg);
-        return switch (message.getAction()) {
-            case STREAM_PAUSED -> new TikTokLivePausedEvent();
-            case STREAM_ENDED -> new TikTokLiveEndedEvent();
-            case STREAM_UNPAUSED -> new TikTokLiveUnpausedEvent();
-            default -> new TikTokUnhandledControlEvent(message);
-        };
-    }
-
-
-    @SneakyThrows
-    private List<TikTokEvent> handleMemberMessage(byte[] msg) {
-        var message = WebcastMemberMessage.parseFrom(msg);
-
-        var event = switch (message.getAction()) {
-            case JOINED -> new TikTokJoinEvent(message);
-            case SUBSCRIBED -> new TikTokSubscribeEvent(message);
-            default -> new TikTokUnhandledMemberEvent(message);
-        };
-
-        var roomInfoEvent = roomInfoHandler.handleRoomInfo(tikTokRoomInfo ->
-        {
-            tikTokRoomInfo.setViewersCount(message.getMemberCount());
-        });
-
-        return List.of(event, roomInfoEvent);
-    }
-
-    private List<TikTokEvent> handleLike(byte[] msg) {
-        var event = (TikTokLikeEvent) mapper.mapToEvent(WebcastLikeMessage.class, TikTokLikeEvent.class, msg);
-        var roomInfoEvent = roomInfoHandler.handleRoomInfo(tikTokRoomInfo ->
-        {
-            tikTokRoomInfo.setLikesCount(event.getTotalLikes());
-        });
-        return List.of(event, roomInfoEvent);
-    }
-
-    @SneakyThrows
-    private TikTokEvent handlePinMessage(byte[] msg) {
-        var pinMessage = WebcastRoomPinMessage.parseFrom(msg);
-        var chatMessage = WebcastChatMessage.parseFrom(pinMessage.getPinnedMessage());
-        var chatEvent = new TikTokCommentEvent(chatMessage);
-        return new TikTokRoomPinEvent(pinMessage, chatEvent);
-    }
-
-    //TODO Probably not working
-    @SneakyThrows
-    private TikTokEvent handlePollEvent(byte[] msg) {
-        var poolMessage = WebcastPollMessage.parseFrom(msg);
-        return switch (poolMessage.getMessageType()) {
-            case 0 -> new TikTokPollStartEvent(poolMessage);
-            case 1 -> new TikTokPollEndEvent(poolMessage);
-            case 2 -> new TikTokPollUpdateEvent(poolMessage);
-            default -> new TikTokPollEvent(poolMessage);
-        };
-    }
-
-    @SneakyThrows
-    private List<TikTokEvent> handleEnvelop(byte[] data) {
-        var msg = WebcastEnvelopeMessage.parseFrom(data);
-        if (msg.getDisplay() != EnvelopeDisplay.EnvelopeDisplayNew) {
-            return Collections.emptyList();
-        }
-        var totalDiamonds = msg.getEnvelopeInfo().getDiamondCount();
-        var totalUsers = msg.getEnvelopeInfo().getPeopleCount();
-        var chest = new Chest(totalDiamonds, totalUsers);
-
-        return List.of(new TikTokChestEvent(chest, msg));
-    }
-
-
-}

Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/events/TikTokChestEventHandler.java

@@ -1,4 +0,0 @@
-package io.github.jwdeveloper.tiktok.handlers.events;
-
-public class TikTokChestEventHandler {
-}

Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/events/TikTokRoomInfoEventHandler.java

@@ -1,57 +0,0 @@
-package io.github.jwdeveloper.tiktok.handlers.events;
-
-import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
-import io.github.jwdeveloper.tiktok.data.models.RankingUser;
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLiveIntroMessage;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage;
-import lombok.SneakyThrows;
-
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-public class TikTokRoomInfoEventHandler {
-    private final TikTokRoomInfo roomInfo;
-
-    public TikTokRoomInfoEventHandler(TikTokRoomInfo roomInfo) {
-        this.roomInfo = roomInfo;
-    }
-
-    public TikTokEvent handleRoomInfo(Consumer<TikTokRoomInfo> consumer) {
-        consumer.accept(roomInfo);
-        return new TikTokRoomInfoEvent(roomInfo);
-    }
-
-    @SneakyThrows
-    public TikTokEvent handleUserRanking(byte[] msg) {
-        var message = WebcastRoomUserSeqMessage.parseFrom(msg);
-        var totalUsers = message.getTotalUser();
-        var userRanking = message.getRanksListList().stream().map(RankingUser::new)
-                .sorted((ru1, ru2) -> Integer.compare(ru2.getScore(), ru1.getScore()))
-                .collect(Collectors.toList());
-
-        return handleRoomInfo(tikTokRoomInfo ->
-        {
-            tikTokRoomInfo.setTotalViewersCount(totalUsers);
-            tikTokRoomInfo.updateRanking(userRanking);
-        });
-    }
-
-    @SneakyThrows
-    public TikTokEvent handleIntro(byte[] msg) {
-        var message = WebcastLiveIntroMessage.parseFrom(msg);
-        var hostUser = User.map(message.getHost());
-        var language = message.getLanguage();
-
-        return handleRoomInfo(tikTokRoomInfo ->
-        {
-            if(tikTokRoomInfo.getHost() == null)
-            {
-                tikTokRoomInfo.setHost(hostUser);
-            }
-            tikTokRoomInfo.setLanguage(language);
-        });
-    }
-}

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

@@ -22,8 +22,11 @@
  */
 package io.github.jwdeveloper.tiktok.http;
 
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import io.github.jwdeveloper.tiktok.ClientSettings;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+import io.github.jwdeveloper.tiktok.data.dto.TikTokUserInfo;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 import io.github.jwdeveloper.tiktok.live.LiveRoomMeta;
@@ -57,62 +60,50 @@ public class TikTokApiService {
     }
 
     public String fetchRoomId(String userName) {
-        var roomId = fetchRoomIdFromTiktokApi(userName);
-        clientSettings.getClientParameters().put("room_id", roomId);
-        logger.info("RoomID -> " + roomId);
-        return roomId;
+        var userInfo = fetchUserInfoFromTikTokApi(userName);
+        clientSettings.getClientParameters().put("room_id", userInfo.getRoomId());
+        logger.info("RoomID -> " + userInfo.getRoomId());
+        return userInfo.getRoomId();
     }
 
-    private String fetchRoomIdFromTikTokPage(String userName)
-    {
-           /*  var roomId = RequestChain.<String>create()
-                .then(() -> fetchRoomIdFromTikTokPage(userName))
-                .then(() -> fetchRoomIdFromTiktokApi(userName))
-                .run();*/
-        logger.info("Fetching room ID");
-        String html;
-        try {
-            html = tiktokHttpClient.getLivestreamPage(userName);
-        } catch (Exception e) {
-            throw new TikTokLiveRequestException("Failed to fetch room id from WebCast, see stacktrace for more info.", e);
-        }
-
-        var firstPattern = Pattern.compile("room_id=([0-9]*)");
-        var firstMatcher = firstPattern.matcher(html);
-        var id = "";
-
-        if (firstMatcher.find()) {
-            id = firstMatcher.group(1);
-        } else {
-            var secondPattern = Pattern.compile("\"roomId\":\"([0-9]*)\"");
-            var secondMatcher = secondPattern.matcher(html);
-
-            if (secondMatcher.find()) {
-                id = secondMatcher.group(1);
-            }
-        }
-
-        if (id.isEmpty()) {
-            throw new TikTokLiveOfflineHostException("Unable to fetch room ID, live host could be offline or name is misspelled");
-        }
-
-
-        return id;
-    }
-
-    private String fetchRoomIdFromTiktokApi(String userName) {
+    public TikTokUserInfo fetchUserInfoFromTikTokApi(String userName) {
 
         var params = new HashMap<>(clientSettings.getClientParameters());
         params.put("uniqueId", userName);
         params.put("sourceType", 54);
-        var roomData = tiktokHttpClient.getJsonFromTikTokApi("api-live/user/room/", params);
+        JsonObject roomData = null;
+        try {
+            roomData = tiktokHttpClient.getJsonFromTikTokApi("api-live/user/room/", params);
+        } catch (Exception e) {
 
+
+            throw new TikTokLiveRequestException("Failed to fetch  pre connection room information, it happens when TikTok temporary blocks you. Try to connect again in few minutes");
+        }
+
+        var message = roomData.get("message").getAsString();
+
+        if (message.equals("params_error")) {
+            throw new TikTokLiveRequestException("fetchRoomIdFromTiktokApi -> Unable to fetch roomID, contact with developer");
+        }
+        if (message.equals("user_not_found")) {
+            return new TikTokUserInfo(TikTokUserInfo.UserStatus.NotFound, "");
+        }
+        //live -> status 2
+        //live paused -> 3
+        //not live -> status 4
         var data = roomData.getAsJsonObject("data");
-        var user =data.getAsJsonObject("user");
+        var user = data.getAsJsonObject("user");
         var roomId = user.get("roomId").getAsString();
+        var status = user.get("status").getAsInt();
 
+        var statusEnum = switch (status) {
+            case 2 -> TikTokUserInfo.UserStatus.Live;
+            case 3 -> TikTokUserInfo.UserStatus.LivePaused;
+            case 4 -> TikTokUserInfo.UserStatus.Offline;
+            default -> TikTokUserInfo.UserStatus.NotFound;
+        };
 
-        return roomId;
+        return new TikTokUserInfo(statusEnum, roomId);
     }
 
 
@@ -120,12 +111,18 @@ public class TikTokApiService {
         logger.info("Fetching RoomInfo");
         try {
             var response = tiktokHttpClient.getJsonFromWebcastApi("room/info/", clientSettings.getClientParameters());
+            if (!response.has("data")) {
+                var gson = new GsonBuilder().setPrettyPrinting().create();
+                var json = gson.toJson(response);
+                throw new TikTokLiveRequestException("room info response does not contains data field: \n"+ json);
+            }
+
             var mapper = new LiveRoomMetaMapper();
             var liveRoomMeta = mapper.map(response);
             logger.info("RoomInfo status -> " + liveRoomMeta.getStatus());
             return liveRoomMeta;
         } catch (Exception e) {
-            throw new TikTokLiveRequestException("Failed to fetch room info from WebCast, see stacktrace for more info.", e);
+            throw new TikTokLiveRequestException("Failed to fetch room info from WebCast server, see stacktrace for more info.", e);
         }
     }
 
@@ -138,7 +135,7 @@ public class TikTokApiService {
             clientSettings.getClientParameters().put("internal_ext", response.getInternalExt());
             return response;
         } catch (Exception e) {
-            throw new TikTokLiveRequestException("Failed to fetch client data", e);
+            throw new TikTokLiveRequestException("Failed to fetch live websocket connection data", e);
         }
     }
 }

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

@@ -1,12 +1,38 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 package io.github.jwdeveloper.tiktok.http;
 
+import io.github.jwdeveloper.tiktok.ClientSettings;
+import io.github.jwdeveloper.tiktok.Constants;
+import io.github.jwdeveloper.tiktok.data.dto.TikTokUserInfo;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-public class TikTokDataChecker
-{
+public class TikTokDataChecker {
 
     public CompletableFuture<Boolean> isOnlineAsync(String hostName) {
         return CompletableFuture.supplyAsync(() -> isOnline(hostName));
@@ -17,63 +43,24 @@ public class TikTokDataChecker
     }
 
     public boolean isOnline(String hostName) {
-        var factory = new TikTokHttpRequestFactory(new TikTokCookieJar());
-        var url = getLiveUrl(hostName);
-        try {
-            var response = factory.get(url);
-            var titleContent = extractTitleContent(response);
-            return isTitleLiveOnline(titleContent);
-        } catch (Exception e)
-        {
-            throw new TikTokLiveRequestException("Unable to make check live online request",e);
-        }
+        var data = getApiService().fetchUserInfoFromTikTokApi(hostName);
+        return data.getUserStatus() == TikTokUserInfo.UserStatus.Live ||
+                data.getUserStatus() == TikTokUserInfo.UserStatus.LivePaused;
     }
 
     public boolean isHostNameValid(String hostName) {
-        var factory = new TikTokHttpRequestFactory(new TikTokCookieJar());
-        var url = getProfileUrl(hostName);
-        try {
-            var response = factory.get(url);
-            var titleContent = extractTitleContent(response);
-            return isTitleHostNameValid(titleContent, hostName);
-        } catch (Exception e)
-        {
-            throw new TikTokLiveRequestException("Unable to make check host name valid request",e);
-        }
+        var data = getApiService().fetchUserInfoFromTikTokApi(hostName);
+        return data.getUserStatus() != TikTokUserInfo.UserStatus.NotFound;
     }
 
-    private boolean isTitleLiveOnline(String title) {
-        return title.contains("is LIVE");
+    public TikTokApiService getApiService() {
+        var jar = new TikTokCookieJar();
+        var factory = new TikTokHttpRequestFactory(jar,new TikTokEventObserver());
+        var client = new TikTokHttpClient(jar, factory);
+        var settings = new ClientSettings();
+        settings.setClientParameters(Constants.DefaultClientParams());
+        var apiService = new TikTokApiService(client, Logger.getGlobal(), settings);
+        return apiService;
     }
 
-    private boolean isTitleHostNameValid(String title, String hostName)
-    {
-        return title.contains(hostName);
-    }
-
-    private String extractTitleContent(String html) {
-        var regex = "<title\\b[^>]*>(.*?)<\\/title>";
-        var pattern = Pattern.compile(regex);
-        var matcher = pattern.matcher(html);
-        if (matcher.find()) {
-            return matcher.group(1);
-        } else {
-            return "";
-        }
-    }
-
-    private String getLiveUrl(String hostName) {
-        var sb = new StringBuilder();
-        sb.append("https://www.tiktok.com/@");
-        sb.append(hostName);
-        sb.append("/live");
-        return sb.toString();
-    }
-
-    private String getProfileUrl(String hostName) {
-        var sb = new StringBuilder();
-        sb.append("https://www.tiktok.com/@");
-        sb.append(hostName);
-        return sb.toString();
-    }
 }

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

@@ -91,7 +91,6 @@ public class TikTokHttpClient {
         if (parameters == null) {
             parameters = new HashMap<>();
         }
-        System.out.println("RomMID: "+parameters.get("room_id"));
         var request = requestFactory.setQueries(parameters);
         return request.post(url);
     }

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

@@ -24,7 +24,10 @@ package io.github.jwdeveloper.tiktok.http;
 
 
 import io.github.jwdeveloper.tiktok.Constants;
+import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
+import io.github.jwdeveloper.tiktok.data.models.http.HttpData;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import lombok.SneakyThrows;
 
 import java.net.CookieManager;
@@ -45,26 +48,27 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
     private final Map<String, String> defaultHeaders;
     private final TikTokCookieJar tikTokCookieJar;
     private final HttpClient client;
+    private final TikTokEventObserver eventHandler;
     private String query;
 
-    public TikTokHttpRequestFactory(TikTokCookieJar tikTokCookieJar) {
+    public TikTokHttpRequestFactory(TikTokCookieJar tikTokCookieJar, TikTokEventObserver eventHandler) {
         this.tikTokCookieJar = tikTokCookieJar;
         this.cookieManager = new CookieManager();
+        this.eventHandler = eventHandler;
         defaultHeaders = Constants.DefaultRequestHeaders();
         client = HttpClient.newBuilder()
                 .cookieHandler(cookieManager)
                 .connectTimeout(Duration.ofSeconds(2))
                 .build();
     }
+
     @SneakyThrows
     public String get(String url) {
         var uri = URI.create(url);
         var requestBuilder = HttpRequest.newBuilder().GET();
 
-        for (var header : defaultHeaders.entrySet())
-        {
-            if(header.getKey().equals("Connection") || header.getKey().equals("Accept-Encoding"))
-            {
+        for (var header : defaultHeaders.entrySet()) {
+            if (header.getKey().equals("Connection") || header.getKey().equals("Accept-Encoding")) {
                 continue;
             }
             requestBuilder.setHeader(header.getKey(), header.getValue());
@@ -73,9 +77,7 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
             var baseUri = uri.toString();
             var requestUri = URI.create(baseUri + "?" + query);
             requestBuilder.uri(requestUri);
-        }
-        else
-        {
+        } else {
             requestBuilder.uri(uri);
         }
 
@@ -88,15 +90,13 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
     public String post(String url) {
         var uri = URI.create(url);
         var request = HttpRequest.newBuilder().POST(HttpRequest.BodyPublishers.ofString(""));
-        for (var header : defaultHeaders.entrySet())
-        {
-            if(header.getKey().equals("Connection"))
-            {
+        for (var header : defaultHeaders.entrySet()) {
+            if (header.getKey().equals("Connection")) {
                 continue;
             }
             request.setHeader(header.getKey(), header.getValue());
         }
-        request.setHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8");
+        request.setHeader("Content-type", "application/x-www-form-urlencoded; charset=UTF-8");
         request.setHeader("Cookie", tikTokCookieJar.parseCookies());
 
 
@@ -104,11 +104,8 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
             var baseUri = uri.toString();
             var requestUri = URI.create(baseUri + "?" + query);
             request.uri(requestUri);
-            System.out.println(requestUri.toString());
         }
 
-
-
         return getContent(request.build());
     }
 
@@ -125,7 +122,7 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
     public TikTokHttpRequest setQueries(Map<String, Object> queries) {
         if (queries == null)
             return this;
-        var testMap = new TreeMap<String,Object>(queries);
+        var testMap = new TreeMap<String, Object>(queries);
         query = String.join("&", testMap.entrySet().stream().map(x ->
         {
             var key = x.getKey();
@@ -143,6 +140,9 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
 
     private String getContent(HttpRequest request) throws Exception {
         var response = client.send(request, HttpResponse.BodyHandlers.ofString());
+
+        var event = new TikTokHttpResponseEvent(response.uri().toString(), HttpData.map(request), HttpData.map(response));
+        eventHandler.publish(null, event);
         if (response.statusCode() == 404) {
             throw new TikTokLiveRequestException("Request responded with 404 NOT_FOUND");
         }
@@ -155,8 +155,6 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
         for (var cookie : cookies) {
             var split = cookie.split(";")[0].split("=");
             var uri = request.uri();
-
-
             var key = split[0];
             var value = split[1];
             tikTokCookieJar.set(key, value);

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

@@ -23,11 +23,10 @@
 package io.github.jwdeveloper.tiktok.listener;
 
 
-import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokEventListenerMethodException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.live.builder.EventConsumer;
 
@@ -37,10 +36,10 @@ import java.util.HashMap;
 import java.util.List;
 
 public class TikTokListenersManager implements ListenersManager {
-    private final TikTokEventObserver eventObserver;
+    private final io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver eventObserver;
     private final List<ListenerBindingModel> bindingModels;
 
-    public TikTokListenersManager(List<TikTokEventListener> listeners, TikTokEventObserver tikTokEventHandler) {
+    public TikTokListenersManager(List<TikTokEventListener> listeners, io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver tikTokEventHandler) {
         this.eventObserver = tikTokEventHandler;
         this.bindingModels = new ArrayList<>(listeners.size());
         for (var listener : listeners) {
@@ -93,7 +92,7 @@ public class TikTokListenersManager implements ListenersManager {
         var clazz = listener.getClass();
         var methods = Arrays.stream(clazz.getDeclaredMethods()).filter(m ->
                 m.getParameterCount() == 2 &&
-                        m.isAnnotationPresent(TikTokEventHandler.class)).toList();
+                        m.isAnnotationPresent(TikTokEventObserver.class)).toList();
         var eventsMap = new HashMap<Class<?>, List<EventConsumer<?>>>();
         for (var method : methods) {
             var eventClazz = method.getParameterTypes()[1];

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

@@ -74,7 +74,7 @@ public class TikTokGenericEventMapper {
         }
     }
 
-    private Method getParsingMethod(Class<?> input) throws NoSuchMethodException {
+    public Method getParsingMethod(Class<?> input) throws NoSuchMethodException {
         if (methodCache.containsKey(input)) {
             return methodCache.get(input);
         }

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

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.mappers;
+
+import com.google.protobuf.GeneratedMessageV3;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class TikTokLiveMapper implements TikTokMapper {
+
+    private final Map<String, TikTokLiveMapperModel> mappers;
+    private final TikTokMapperHelper mapperUtils;
+
+    public TikTokLiveMapper(TikTokMapperHelper mapperUtils) {
+        this.mappers = new HashMap<>();
+        this.mapperUtils = mapperUtils;
+    }
+
+    @Override
+    public TikTokMapperModel forMessage(String messageName) {
+        if (!isRegistered(messageName)) {
+            var model = new TikTokLiveMapperModel(messageName);
+            mappers.put(messageName, model);
+        }
+        return mappers.get(messageName);
+    }
+
+    @Override
+    public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName) {
+        return forMessage(mapperName.getSimpleName());
+    }
+
+    @Override
+    public TikTokMapperModel forMessage(String mapperName, MappingAction<MappingResult> onMapping) {
+        var model = forMessage(mapperName);
+        model.onMapping(onMapping);
+        return model;
+    }
+
+
+    @Override
+    public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, MappingAction<MappingResult> onMapping) {
+        var model = forMessage(mapperName);
+        model.onMapping(onMapping);
+        return model;
+    }
+
+    @Override
+    public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, Function<byte[], TikTokEvent> onMapping) {
+        return forMessage(mapperName, (inputBytes, messageName, mapperHelper) -> MappingResult.of(inputBytes, onMapping.apply(inputBytes)));
+    }
+
+
+    public boolean isRegistered(String mapperName) {
+        return mappers.containsKey(mapperName);
+    }
+
+    public <T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName) {
+        return mappers.containsKey(mapperName.getSimpleName());
+    }
+    public List<TikTokEvent> handleMapping(String messageName, byte[] bytes) {
+        if (!isRegistered(messageName)) {
+            return List.of();
+        }
+        var mapperModel = mappers.get(messageName);
+
+        var inputBytes = mapperModel.getOnBeforeMapping().onMapping(bytes, messageName, mapperUtils);
+
+        var mappingResult = mapperModel.getOnMapping().onMapping(inputBytes, messageName, mapperUtils);
+
+        var afterMappingResult = mapperModel.getOnAfterMapping().apply(mappingResult);
+        return afterMappingResult;
+    }
+}

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

@@ -0,0 +1,60 @@
+package io.github.jwdeveloper.tiktok.mappers;
+
+import com.google.protobuf.GeneratedMessageV3;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
+import io.github.jwdeveloper.tiktok.utils.JsonUtil;
+import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
+import io.github.jwdeveloper.tiktok.utils.ProtocolUtils;
+
+public class TikTokLiveMapperHelper implements TikTokMapperHelper {
+    private final TikTokGenericEventMapper genericMapper;
+
+    public TikTokLiveMapperHelper(TikTokGenericEventMapper genericMapper) {
+        this.genericMapper = genericMapper;
+    }
+
+    @Override
+    public <T extends GeneratedMessageV3> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass) {
+        try {
+            var parsingMethod = genericMapper.getParsingMethod(messageClass);
+            var sourceObject = parsingMethod.invoke(null, bytes);
+            return (T) sourceObject;
+        } catch (Exception e) {
+            throw new TikTokMessageMappingException(messageClass, "can't find parsing method", e);
+        }
+    }
+
+    @Override
+    public Object bytesToWebcastObject(byte[] bytes, String messageName) {
+        try {
+            var packageName = "io.github.jwdeveloper.tiktok.messages.webcast." + messageName;
+            var clazz = Class.forName(packageName);
+            return bytesToWebcastObject(bytes, (Class<? extends GeneratedMessageV3>) clazz);
+        } catch (Exception e) {
+            throw new TikTokMessageMappingException(messageName, e);
+        }
+    }
+
+    @Override
+    public boolean isMessageHasProtoClass(String messageName) {
+        try {
+            var packageName = "io.github.jwdeveloper.tiktok.messages.webcast." + messageName;
+            Class.forName(packageName);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    @Override
+    public ProtoBufferObject bytesToProtoBufferStructure(byte[] bytes) {
+        return ProtocolUtils.getProtocolBufferStructure(bytes);
+    }
+
+    @Override
+    public String toJson(Object obj) {
+        return JsonUtil.toJson(obj);
+    }
+
+
+}

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

@@ -0,0 +1,57 @@
+package io.github.jwdeveloper.tiktok.mappers;
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.function.Function;
+
+@Getter
+@Setter
+public class TikTokLiveMapperModel implements TikTokMapperModel {
+    @Getter
+    private String sourceMessageName;
+
+    private MappingAction<byte[]> onBeforeMapping;
+
+    private MappingAction<MappingResult> onMapping;
+
+    private Function<MappingResult, List<TikTokEvent>> onAfterMapping;
+
+    public TikTokLiveMapperModel(String sourceMessageName, MappingAction onMapping) {
+        this.sourceMessageName = sourceMessageName;
+        this.onBeforeMapping = (inputBytes, mesasgeName, mapperHelper) -> inputBytes;
+        this.onMapping = onMapping;
+        this.onAfterMapping = MappingResult::getEvents;
+    }
+
+    public TikTokLiveMapperModel(String sourceMessageName) {
+        this.sourceMessageName = sourceMessageName;
+        this.onBeforeMapping = (inputBytes, mesasgeName, mapperHelper) -> inputBytes;
+        this.onMapping = (inputBytes, mesasgeName, mapperHelper) -> MappingResult.of(inputBytes, List.of());
+        this.onAfterMapping = MappingResult::getEvents;
+    }
+
+    @Override
+    public TikTokMapperModel onBeforeMapping(MappingAction<byte[]> action) {
+        this.onBeforeMapping = action;
+        return this;
+    }
+
+    @Override
+    public TikTokMapperModel onMapping(MappingAction<MappingResult> action) {
+        this.onMapping = action;
+        return this;
+    }
+
+    @Override
+    public TikTokMapperModel onAfterMapping(Function<MappingResult, List<TikTokEvent>> action) {
+        this.onAfterMapping = action;
+        return this;
+    }
+
+
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.mappers.handlers;
+
+public class TikTokChestEventHandler {
+}

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.mappers.handlers;
+
+import io.github.jwdeveloper.tiktok.data.events.*;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent;
+import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEndEvent;
+import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent;
+import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollStartEvent;
+import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollUpdateEvent;
+import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomPinEvent;
+import io.github.jwdeveloper.tiktok.data.models.chest.Chest;
+import io.github.jwdeveloper.tiktok.messages.enums.EnvelopeDisplay;
+import io.github.jwdeveloper.tiktok.messages.webcast.*;
+import lombok.SneakyThrows;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TikTokCommonEventHandler
+{
+
+    @SneakyThrows
+    public TikTokEvent handleWebcastControlMessage(byte[] msg) {
+        var message = WebcastControlMessage.parseFrom(msg);
+        return switch (message.getAction()) {
+            case STREAM_PAUSED -> new TikTokLivePausedEvent();
+            case STREAM_ENDED -> new TikTokLiveEndedEvent();
+            case STREAM_UNPAUSED -> new TikTokLiveUnpausedEvent();
+            default -> new TikTokUnhandledControlEvent(message);
+        };
+    }
+
+    @SneakyThrows
+    public TikTokEvent handlePinMessage(byte[] msg) {
+        var pinMessage = WebcastRoomPinMessage.parseFrom(msg);
+        var chatMessage = WebcastChatMessage.parseFrom(pinMessage.getPinnedMessage());
+        var chatEvent = new TikTokCommentEvent(chatMessage);
+        return new TikTokRoomPinEvent(pinMessage, chatEvent);
+    }
+
+    //TODO Probably not working
+    @SneakyThrows
+    public TikTokEvent handlePollEvent(byte[] msg) {
+        var poolMessage = WebcastPollMessage.parseFrom(msg);
+        return switch (poolMessage.getMessageType()) {
+            case MESSAGETYPE_SUBSUCCESS -> new TikTokPollStartEvent(poolMessage);
+            case MESSAGETYPE_ANCHORREMINDER -> new TikTokPollEndEvent(poolMessage);
+            case MESSAGETYPE_ENTERROOMEXPIRESOON -> new TikTokPollUpdateEvent(poolMessage);
+            default -> new TikTokPollEvent(poolMessage);
+        };
+    }
+
+    @SneakyThrows
+    public List<TikTokEvent> handleEnvelop(byte[] data) {
+        var msg = WebcastEnvelopeMessage.parseFrom(data);
+        if (msg.getDisplay() != EnvelopeDisplay.EnvelopeDisplayNew) {
+            return Collections.emptyList();
+        }
+        var totalDiamonds = msg.getEnvelopeInfo().getDiamondCount();
+        var totalUsers = msg.getEnvelopeInfo().getPeopleCount();
+        var chest = new Chest(totalDiamonds, totalUsers);
+
+        return List.of(new TikTokChestEvent(chest, msg));
+    }
+
+}

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

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.handlers.events;
+package io.github.jwdeveloper.tiktok.mappers.handlers;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
@@ -30,6 +30,8 @@ import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
 import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.live.GiftManager;
+import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import lombok.SneakyThrows;
 import sun.misc.Unsafe;
@@ -48,9 +50,10 @@ public class TikTokGiftEventHandler {
     }
 
     @SneakyThrows
-    public List<TikTokEvent> handleGift(byte[] msg) {
+    public MappingResult handleGifts(byte[] msg, String name, TikTokMapperHelper helper) {
         var currentMessage = WebcastGiftMessage.parseFrom(msg);
-        return handleGift(currentMessage);
+        var gifts = handleGift(currentMessage);
+        return MappingResult.of(currentMessage,gifts);
     }
 
     public List<TikTokEvent> handleGift(WebcastGiftMessage currentMessage) {

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

@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.mappers.handlers;
+
+import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
+import io.github.jwdeveloper.tiktok.data.events.TikTokSubscribeEvent;
+import io.github.jwdeveloper.tiktok.data.events.TikTokUnhandledMemberEvent;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
+import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent;
+import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent;
+import io.github.jwdeveloper.tiktok.data.models.RankingUser;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLiveIntroMessage;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastRoomUserSeqMessage;
+import lombok.SneakyThrows;
+
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+public class TikTokRoomInfoEventHandler {
+    private final TikTokRoomInfo roomInfo;
+
+    public TikTokRoomInfoEventHandler(TikTokRoomInfo roomInfo) {
+        this.roomInfo = roomInfo;
+    }
+
+    public TikTokEvent handleRoomInfo(Consumer<TikTokRoomInfo> consumer) {
+        consumer.accept(roomInfo);
+        return new TikTokRoomInfoEvent(roomInfo);
+    }
+
+    @SneakyThrows
+    public TikTokEvent handleUserRanking(byte[] msg) {
+        var message = WebcastRoomUserSeqMessage.parseFrom(msg);
+        var totalUsers = message.getTotalUser();
+        var userRanking = message.getRanksListList().stream().map(RankingUser::new)
+                .sorted((ru1, ru2) -> Integer.compare(ru2.getScore(), ru1.getScore()))
+                .collect(Collectors.toList());
+
+        return handleRoomInfo(tikTokRoomInfo ->
+        {
+            tikTokRoomInfo.setTotalViewersCount(totalUsers);
+            tikTokRoomInfo.updateRanking(userRanking);
+        });
+    }
+
+    @SneakyThrows
+    public TikTokEvent handleIntro(byte[] msg) {
+        var message = WebcastLiveIntroMessage.parseFrom(msg);
+        var hostUser = User.map(message.getHost());
+        var language = message.getLanguage();
+
+        return handleRoomInfo(tikTokRoomInfo ->
+        {
+            if (tikTokRoomInfo.getHost() == null) {
+                tikTokRoomInfo.setHost(hostUser);
+            }
+            tikTokRoomInfo.setLanguage(language);
+        });
+    }
+
+    @SneakyThrows
+    public MappingResult handleMemberMessage(byte[] msg, String name, TikTokMapperHelper helper) {
+        var message = WebcastMemberMessage.parseFrom(msg);
+
+        var event = switch (message.getAction()) {
+            case JOINED -> new TikTokJoinEvent(message);
+            case SUBSCRIBED -> new TikTokSubscribeEvent(message);
+            default -> new TikTokUnhandledMemberEvent(message);
+        };
+
+        var roomInfoEvent = this.handleRoomInfo(tikTokRoomInfo ->
+        {
+            tikTokRoomInfo.setViewersCount(message.getMemberCount());
+        });
+        return MappingResult.of(message, List.of(event, roomInfoEvent));
+    }
+
+    @SneakyThrows
+    public MappingResult handleLike(byte[] msg, String name, TikTokMapperHelper helper) {
+        var message = WebcastLikeMessage.parseFrom(msg);
+        var event = new TikTokLikeEvent(message);
+        var roomInfoEvent = this.handleRoomInfo(tikTokRoomInfo ->
+        {
+            tikTokRoomInfo.setLikesCount(event.getTotalLikes());
+        });
+        return MappingResult.of(message, List.of(event, roomInfoEvent));
+    }
+}

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

@@ -1,4 +1,26 @@
-package io.github.jwdeveloper.tiktok.handlers.events;
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.mappers.handlers;
 
 import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
 import io.github.jwdeveloper.tiktok.data.events.TikTokUnhandledSocialEvent;

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

@@ -24,11 +24,9 @@ package io.github.jwdeveloper.tiktok.websocket;
 
 
 import io.github.jwdeveloper.tiktok.ClientSettings;
-import io.github.jwdeveloper.tiktok.Constants;
-import io.github.jwdeveloper.tiktok.TikTokLiveClient;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
-import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
+import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandler;
 import io.github.jwdeveloper.tiktok.http.HttpUtils;
 import io.github.jwdeveloper.tiktok.http.TikTokCookieJar;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
@@ -41,24 +39,22 @@ import java.util.TreeMap;
 import java.util.logging.Logger;
 
 public class TikTokWebSocketClient implements SocketClient {
-    private final Logger logger;
     private final ClientSettings clientSettings;
     private final TikTokCookieJar tikTokCookieJar;
-    private final TikTokMessageHandlerRegistration webResponseHandler;
+    private final TikTokMessageHandler messageHandler;
     private final TikTokEventObserver tikTokEventHandler;
     private WebSocketClient webSocketClient;
     private TikTokWebSocketPingingTask pingingTask;
     private boolean isConnected;
 
-    public TikTokWebSocketClient(Logger logger,
+    public TikTokWebSocketClient(
                                  TikTokCookieJar tikTokCookieJar,
                                  ClientSettings clientSettings,
-                                 TikTokMessageHandlerRegistration webResponseHandler,
+                                 TikTokMessageHandler messageHandler,
                                  TikTokEventObserver tikTokEventHandler) {
-        this.logger = logger;
         this.tikTokCookieJar = tikTokCookieJar;
         this.clientSettings = clientSettings;
-        this.webResponseHandler = webResponseHandler;
+        this.messageHandler = messageHandler;
         this.tikTokEventHandler = tikTokEventHandler;
         isConnected = false;
     }
@@ -74,7 +70,7 @@ public class TikTokWebSocketClient implements SocketClient {
         }
 
         try {
-            webResponseHandler.handle(tikTokLiveClient, webcastResponse);
+            messageHandler.handle(tikTokLiveClient, webcastResponse);
             var url = getWebSocketUrl(webcastResponse);
             webSocketClient = startWebSocket(url, tikTokLiveClient);
             webSocketClient.connect();
@@ -107,7 +103,7 @@ public class TikTokWebSocketClient implements SocketClient {
         return new TikTokWebSocketListener(url,
                 headers,
                 3000,
-                webResponseHandler,
+                messageHandler,
                 tikTokEventHandler,
                 liveClient);
     }

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

@@ -28,7 +28,7 @@ import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokProtocolBufferException;
 import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
-import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
+import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandler;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastPushFrame;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
@@ -44,33 +44,22 @@ import java.util.Optional;
 
 public class TikTokWebSocketListener extends WebSocketClient {
 
-    private final TikTokMessageHandlerRegistration webResponseHandler;
+    private final TikTokMessageHandler messageHandler;
     private final TikTokEventObserver tikTokEventHandler;
     private final LiveClient tikTokLiveClient;
 
     public TikTokWebSocketListener(URI serverUri,
                                    Map<String, String> httpHeaders,
                                    int connectTimeout,
-                                   TikTokMessageHandlerRegistration webResponseHandler,
+                                   TikTokMessageHandler messageHandler,
                                    TikTokEventObserver tikTokEventHandler,
                                    LiveClient tikTokLiveClient) {
         super(serverUri, new Draft_6455(), httpHeaders,connectTimeout);
-        this.webResponseHandler = webResponseHandler;
+        this.messageHandler = messageHandler;
         this.tikTokEventHandler = tikTokEventHandler;
         this.tikTokLiveClient = tikTokLiveClient;
     }
 
-
-    @Override
-    public void onOpen(ServerHandshake serverHandshake) {
-        tikTokEventHandler.publish(tikTokLiveClient,new TikTokConnectedEvent());
-        if(isNotClosing())
-        {
-            sendPing();
-        }
-    }
-
-
     @Override
     public void onMessage(ByteBuffer bytes)
     {
@@ -85,6 +74,19 @@ public class TikTokWebSocketListener extends WebSocketClient {
         }
     }
 
+
+    @Override
+    public void onOpen(ServerHandshake serverHandshake) {
+        tikTokEventHandler.publish(tikTokLiveClient,new TikTokConnectedEvent());
+        if(isNotClosing())
+        {
+            sendPing();
+        }
+    }
+
+
+
+
     @Override
     public void onClose(int i, String s, boolean b) {
         tikTokEventHandler.publish(tikTokLiveClient,new TikTokDisconnectedEvent());
@@ -114,7 +116,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
            // sendAckId(webResponse.getFetchInterval());
         }
 
-        webResponseHandler.handle(tikTokLiveClient, webResponse);
+        messageHandler.handle(tikTokLiveClient, webResponse);
     }
 
     private Optional<WebcastPushFrame> getWebcastWebsocketMessage(byte[] buffer) {

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

@@ -69,4 +69,7 @@ public class TikTokGiftManagerTest {
     }
 
 
+
+
+
 }

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

@@ -27,6 +27,7 @@ import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
 import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
+import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler;
 import io.github.jwdeveloper.tiktok.messages.data.GiftStruct;
 import io.github.jwdeveloper.tiktok.messages.data.Image;
 import io.github.jwdeveloper.tiktok.messages.data.User;
@@ -125,4 +126,6 @@ class TikTokGiftEventHandlerTest {
         return builder.build();
     }
 
+
+
 }

Client/src/test/java/io/github/jwdeveloper/tiktok/http/TikTokLiveOnlineCheckerTest.java

@@ -1,18 +1,103 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 package io.github.jwdeveloper.tiktok.http;
 
+import io.github.jwdeveloper.tiktok.TikTokLive;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.util.Random;
+
 public class TikTokLiveOnlineCheckerTest {
 
-    private final String TARGET_USER = "bangbetmenygy";
+    public boolean enableTests = false;
 
     @Test
     public void shouldTestOnline() {
+
+        if(!enableTests)
+        {
+            return;
+        }
+
+        var TARGET_USER = "bangbetmenygy";
         var sut = new TikTokDataChecker();
         var result = sut.isOnline(TARGET_USER);
 
         Assertions.assertTrue(result);
     }
 
+    @Test
+    public void shouldBeOffline() {
+
+        var TARGET_USER = "karacomparetto";
+        var sut = new TikTokDataChecker();
+        var result = sut.isOnline(TARGET_USER);
+
+        Assertions.assertFalse(result);
+    }
+
+    @Test
+    public void shouldBeValid() throws InterruptedException {
+
+        var TARGET_USER = "dostawcavideo";
+        var sut = new TikTokDataChecker();
+        var result = sut.isHostNameValid(TARGET_USER);
+
+
+        TikTokLive.newClient("asdasd")
+                        .onWebsocketResponse((liveClient, event) ->
+                        {
+                            for(var message : event.getResponse().getMessagesList())
+                            {
+                                if(message.getMethod().equals("WebcastGiftMessage"))
+                                {
+                                    try
+                                    {
+                                        var bytes = message.getMethodBytes();
+                                        var rawMessage = WebcastGiftMessage.parseFrom(bytes);
+                                        var giftName =rawMessage.getGift().getName();
+                                    }
+                                    catch (Exception e)
+                                    {
+                                        e.printStackTrace();
+                                    }
+
+                                }
+                            }
+                        });
+
+        Assertions.assertTrue(result);
+    }
+
+    @Test
+    public void shouldNotBeValid() {
+        var TARGET_USER = "dqagdagda , asdaaasd";
+        var sut = new TikTokDataChecker();
+        var result = sut.isHostNameValid(TARGET_USER);
+
+        Assertions.assertFalse(result);
+    }
+
 }

Client/src/test/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManagerTest.java

@@ -22,12 +22,11 @@
  */
 package io.github.jwdeveloper.tiktok.listener;
 
-import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -42,12 +41,12 @@ import static org.mockito.Mockito.verify;
 
 class TikTokListenersManagerTest {
 
-    private TikTokEventObserver eventObserver;
+    private io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver eventObserver;
     private TikTokListenersManager tikTokListenersManager;
 
     @BeforeEach
     void setUp() {
-        eventObserver = Mockito.mock(TikTokEventObserver.class);
+        eventObserver = Mockito.mock(io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver.class);
         List<TikTokEventListener> listeners = new ArrayList<>();
         tikTokListenersManager = new TikTokListenersManager(listeners, eventObserver);
     }
@@ -93,19 +92,19 @@ class TikTokListenersManagerTest {
 
     public static class TikTokEventListenerTest implements TikTokEventListener
     {
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onJoin(LiveClient client, TikTokJoinEvent joinEvent)
         {
 
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onGift(LiveClient client, TikTokGiftEvent giftMessageEvent)
         {
 
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onEvent(LiveClient client, TikTokEvent event)
         {
 

Examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.0.4-Release</version>
+        <version>1.0.10-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Examples/src/main/java/io/github/jwdeveloper/tiktok/CustomGiftExample.java

@@ -25,6 +25,7 @@ package io.github.jwdeveloper.tiktok;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.live.GiftManager;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 
 public class CustomGiftExample {
     /**
@@ -38,7 +39,20 @@ public class CustomGiftExample {
                 {
                     liveClient.disconnect();
                 })
+                .onWebsocketResponse((liveClient, event) ->
+                {
+                    var packets =event.getResponse().getMessagesList();
+                    for(var packet : packets)
+                    {
+                        var name = packet.getMethod();
+                        var data = packet.getPayload();
+                        if(name.equals("WebcastGiftMessage"))
+                        {
+                         //   var message = WebcastGiftMessage.parseFrom(data);
 
+                        }
+                    }
+                })
                 .onGift((liveClient, event) ->
                 {
                     liveClient.getLogger().info(event.getGift().getName());

Examples/src/main/java/io/github/jwdeveloper/tiktok/CustomMappingExample.java

@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok;
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastChatMessage;
+
+public class CustomMappingExample {
+
+    public static void main(String[] args) {
+        TikTokLive.newClient("saszareznikow")
+                .onMapping(mapper ->
+                {
+                    mapper.forMessage(WebcastChatMessage.class)
+                            .onBeforeMapping((inputBytes, messageName, mapperHelper) ->
+                            {
+                                System.out.println("===============================");
+                                System.out.println("OnBefore mapping: " + messageName);
+                                return inputBytes;
+                            })
+                            .onMapping((inputBytes, messageName, mapperHelper) ->
+                            {
+                                System.out.println("onMapping mapping: " + messageName);
+                                var message = mapperHelper.bytesToWebcastObject(inputBytes, WebcastChatMessage.class);
+                                var language = message.getContentLanguage();
+                                var userName = message.getUser().getNickname();
+                                var content = message.getContent();
+                                var event = new CustomChatEvent(language, userName, content);
+                                return MappingResult.of(message, event);
+                            })
+                            .onAfterMapping(mappingResult ->
+                            {
+                                var source = mappingResult.getSource();
+                                var events = mappingResult.getEvents();
+                                System.out.println("onAfter mapping, " + source.getClass().getSimpleName() + " was mapped to " + events.size() + " events");
+                                return events;
+                            });
+
+                    /*
+                      There might be cast that we don't have Webcast class for incoming message from TikTok
+                      `mapperHelper.bytesToProtoBufferStructure` but you can still investigate message structure
+                       by using helper methods
+                     */
+                    mapper.forMessage("WebcastMemberMessage")
+                            .onBeforeMapping((inputBytes, messageName, mapperHelper) ->
+                            {
+                                if (mapperHelper.isMessageHasProtoClass(messageName)) {
+                                    var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, messageName);
+                                    //    System.out.println(mapperHelper.toJson(messageObject));
+                                } else {
+                                    var structure = mapperHelper.bytesToProtoBufferStructure(inputBytes);
+                                    //     System.out.println(structure.toJson());
+                                }
+                                return inputBytes;
+                            });
+                })
+                .onError((liveClient, event) ->
+                {
+                    event.getException().printStackTrace();
+                })
+                .buildAndConnect();
+
+    }
+
+    public static class CustomChatEvent extends TikTokEvent {
+        private final String langauge;
+        private final String userName;
+        private final String message;
+
+        public CustomChatEvent(String language, String userName, String message) {
+            this.langauge = language;
+            this.userName = userName;
+            this.message = message;
+        }
+
+        public String getLangauge() {
+            return langauge;
+        }
+
+        public String getUserName() {
+            return userName;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        @Override
+        public String toString() {
+            return "CustomChatEvent{" +
+                    "language='" + langauge + '\'' +
+                    ", userName='" + userName + '\'' +
+                    ", message='" + message + '\'' +
+                    '}';
+        }
+
+    }
+}

Examples/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java

@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok;
 
-import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
@@ -65,24 +65,24 @@ public class ListenerExample
 
     public static class CustomListener implements TikTokEventListener {
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onLike(LiveClient liveClient, TikTokLikeEvent event) {
             System.out.println(event.toString());
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onError(LiveClient liveClient, TikTokErrorEvent event) {
           //  event.getException().printStackTrace();
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onComment(LiveClient liveClient, TikTokCommentEvent event) {
             var userName = event.getUser().getName();
             var text = event.getText();
             liveClient.getLogger().info(userName + ": " + text);
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onGift(LiveClient liveClient, TikTokGiftEvent event) {
             var message = switch (event.getGift()) {
                 case ROSE -> "Thanks :)";
@@ -95,7 +95,7 @@ public class ListenerExample
             liveClient.getLogger().info(message);
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onAnyEvent(LiveClient liveClient, TikTokEvent event) {
             liveClient.getLogger().info(event.getClass().getSimpleName());
         }

Examples/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java

@@ -22,34 +22,66 @@
  */
 package io.github.jwdeveloper.tiktok;
 
+import io.github.jwdeveloper.tiktok.data.events.TikTokSubNotifyEvent;
+import io.github.jwdeveloper.tiktok.data.events.TikTokSubscribeEvent;
+import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
 import io.github.jwdeveloper.tiktok.utils.ConsoleColors;
+import io.github.jwdeveloper.tiktok.utils.JsonUtil;
 
 import java.io.IOException;
 import java.time.Duration;
+import java.util.HashMap;
 import java.util.logging.Level;
 
-public class SimpleExample
-{
+public class SimpleExample {
     public static String TIKTOK_HOSTNAME = "bangbetmenygy";
+
     public static void main(String[] args) throws IOException {
 
         showLogo();
         // set tiktok username
 
+
+
+
         /*
-        Optional checking if host name is correct
+        //Optional checking if host name is correct
         if(TikTokLive.isHostNameValid(TIKTOK_HOSTNAME))
         {
+            System.out.println("user name exists!");
+        }
+         */
+
+        // Optional checking if live is online
+        if (TikTokLive.isLiveOnline(TIKTOK_HOSTNAME)) {
             System.out.println("Live is online!");
         }
 
-        Optional checking if live is online
-        if(TikTokLive.isLiveOnline(TIKTOK_HOSTNAME))
-        {
-            System.out.println("Live is online!");
-        }
-        */
+
+        TikTokLive.newClient("test")
+                .onWebsocketResponse((liveClient, event) ->
+                {
+                    var response = event.getResponse();
+                    for (var message : response.getMessagesList()) {
+                        var name = message.getMethod();
+                        var binaryData = message.getPayload();
+                        System.out.println("Event name: " + name);
+                        if (name.equals("WebcastGiftEvent")) {
+                            try {
+                                WebcastGiftMessage giftMessage = WebcastGiftMessage.parseFrom(binaryData);
+                                var giftName = giftMessage.getGift().getName();
+                                var giftId = giftMessage.getGiftId();
+                                var userName = giftMessage.getUser().getNickname();
+                                System.out.println("Gift: "+giftName+" id: "+giftId+" from user: "+userName);
+                            } catch (Exception e) {
+                                throw new RuntimeException("Mapping error", e);
+                            }
+                        }
+                    }
+                }).buildAndConnect();
+
 
         TikTokLive.newClient(SimpleExample.TIKTOK_HOSTNAME)
                 .configure(clientSettings ->
@@ -73,18 +105,42 @@ public class SimpleExample
 
                     //clientSettings.setRoomId("XXXXXXXXXXXXXXXXX");
                 })
+                .onConnected((liveClient, event) ->
+                {
+                    for (var gift : liveClient.getGiftManager().getGifts()) {
+                        gift.getPicture().downloadImageAsync().thenAccept(image ->
+                        {
+
+                        });
+                    }
+                })
+                .onWebsocketMessage((liveClient, event) ->
+                {
+
+
+                    var tiktokLiveEvent = event.getEvent();
+                    if (tiktokLiveEvent instanceof TikTokSubNotifyEvent e) {
+                        System.out.println("it was subscrible event");
+                    }
+
+                })
+                .onWebsocketResponse((liveClient, event) ->
+                {
+                    event.getResponse();
+                })
                 .onGift((liveClient, event) ->
                 {
                     switch (event.getGift()) {
                         case ROSE -> print(ConsoleColors.RED, "Rose!");
                         case GG -> print(ConsoleColors.YELLOW, " GOOD GAME!");
-                        case TIKTOK -> print(ConsoleColors.CYAN,"Thanks for TikTok");
-                        default -> print(ConsoleColors.GREEN, "[Thanks for gift] ", ConsoleColors.YELLOW, event.getGift().getName(), "x", event.getCombo());
+                        case TIKTOK -> print(ConsoleColors.CYAN, "Thanks for TikTok");
+                        default ->
+                                print(ConsoleColors.GREEN, "[Thanks for gift] ", ConsoleColors.YELLOW, event.getGift().getName(), "x", event.getCombo());
                     }
                 })
                 .onGiftCombo((liveClient, event) ->
                 {
-                    print(ConsoleColors.RED,"GIFT COMBO",event.getGift().getName(),event.getCombo());
+                    print(ConsoleColors.RED, "GIFT COMBO", event.getGift().getName(), event.getCombo());
                 })
                 .onConnected((client, event) ->
                 {
@@ -92,7 +148,7 @@ public class SimpleExample
                 })
                 .onDisconnected((liveClient, event) ->
                 {
-                    print(ConsoleColors.RED,"[Disconnected]");
+                    print(ConsoleColors.RED, "[Disconnected]");
                 })
                 .onRoomInfo((liveClient, event) ->
                 {
@@ -130,9 +186,8 @@ public class SimpleExample
         System.out.println(sb);
     }
 
-    private static void showLogo()
-    {
-        System.out.println(ConsoleColors.GREEN+"""
+    private static void showLogo() {
+        System.out.println(ConsoleColors.GREEN + """
                                 
                  _____ _ _    _____     _    _     _          \s
                 |_   _(_) | _|_   _|__ | | _| |   (_)_   _____\s

README.md

@@ -1,7 +1,6 @@
 <div align="center" >
 <a target="blank" >
 <img src="https://raw.githubusercontent.com/jwdeveloper/TikTokLiveJava/develop-1_0_0/Tools-ReadmeGenerator/src/main/resources/logo.svg" width="15%" >
-</img>
 </a>
 </div>
 <div align="center" >
@@ -12,18 +11,15 @@
 <div align="center" >
 <a href="https://jitpack.io/#jwdeveloper/TikTok-Live-Java" target="blank" >
 <img src="https://jitpack.io/v/jwdeveloper/TikTok-Live-Java.svg" width="20%" >
-</img>
 </a>
 
 
 <a href="https://discord.gg/e2XwPNTBBr" target="blank" >
 <img src="https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white" >
-</img>
 </a>
 
 <a target="blank" >
 <img src="https://img.shields.io/badge/java-%23ED8B00.svg?style=for-the-badge&logo=openjdk&logoColor=white" >
-</img>
 </a>
 </div>
 </div>
@@ -33,6 +29,9 @@ A Java library inspired by [TikTokLive](https://github.com/isaackogan/TikTokLive
 The library includes a wrapper that connects to the WebCast service using just the username (`uniqueId`). This allows you to connect to your own live chat as well as the live chat of other streamers.
 No credentials are required. Events such as [Members Joining](#member), [Gifts](#gift), [Subscriptions](#subscribe), [Viewers](#roomuser), [Follows](#social), [Shares](#social), [Questions](#questionnew), [Likes](#like) and [Battles](#linkmicbattle) can be tracked.
 
+# Contributors
+[Library documentation for contributors](https://github.com/jwdeveloper/TikTokLiveJava/wiki)
+
 <div align="center">
   <a href="https://www.youtube.com/watch?v=eerWGgUKc6c" align="right" target="blank"><img src="https://img.youtube.com/vi/eerWGgUKc6c/hqdefault.jpg" alt="IMAGE ALT TEXT" width="38%" align="right"></a>
 </div>
@@ -55,8 +54,9 @@ Do you prefer other programming languages?
 
 ## Getting started
 
-1. Install the package via Maven
+1. Install the package
 
+Maven
 ```xml
    <repositories>
         <repository>
@@ -69,12 +69,27 @@ Do you prefer other programming languages?
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.0.5-Release</version>
+             <version>1.0.10-Release</version>
             <scope>compile</scope>
         </dependency>
    </dependencies>
 ```
 
+Gradle
+```gradle
+dependencyResolutionManagement {
+		repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+		repositories {
+			mavenCentral()
+			maven { url 'https://jitpack.io' }
+		}
+	}
+
+dependencies {
+	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.0.10-Release'
+	}
+```
+
 2. Create your first chat connection
 
 ```java
@@ -419,9 +434,9 @@ Triggered every time gift is sent
   <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
   <p>Combo: 4 -> comboState = GiftSendType.Active</p>
   <p>Combo: 8 -> comboState = GiftSendType.Active</p>
-  <p>Combo: 12 -> comboState = GiftSendType.Finsihed</p>
+  <p>Combo: 12 -> comboState = GiftSendType.Finished</p>
 
-Remember if comboState is Finsihed both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
+Remember if comboState is Finished both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
 
 
 ```java

Tools-EventsCollector/pom.xml

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

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/TikTokLiveTools.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools;
+
+import io.github.jwdeveloper.tiktok.tools.collector.client.TikTokDataCollectorBuilder;
+import io.github.jwdeveloper.tiktok.tools.collector.api.DataCollectorBuilder;
+import io.github.jwdeveloper.tiktok.tools.tester.TikTokDataTesterBuilder;
+import io.github.jwdeveloper.tiktok.tools.tester.api.DataTesterBuilder;
+
+public class TikTokLiveTools
+{
+    /**
+     *
+     * @param databaseName dataCollector use sql-lite database to store message
+     * if database not exits it creates new one
+     * @return
+     */
+    public static DataCollectorBuilder createCollector(String databaseName)
+    {
+        return new TikTokDataCollectorBuilder(databaseName);
+    }
+
+    /**
+     *
+     * @param databaseName dataTester will read messages for database
+     * before using dataTester, use dataCollector to create database
+     * if database not exits exception will be thrown
+     * @return
+     */
+    public static DataTesterBuilder createTester(String databaseName)
+    {
+        return new TikTokDataTesterBuilder(databaseName);
+    }
+
+    /**
+     *
+     *  Returns browser application that collects and display Events, Messages, WebcastResponses
+     *  in online web editor so it's easier to read and analyze data structures
+     * @return
+     */
+    public static void createWebViewer()
+    {
+
+    }
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/RunCollector.java

@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.tools.collector;
-
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
-import io.github.jwdeveloper.tiktok.tools.collector.client.TikTokMessageCollectorClient;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.logging.Level;
-
-public class RunCollector {
-
-    //https://protobuf-decoder.netlify.app/
-    //https://streamdps.com/tiktok-widgets/gifts/
-
-    //WebcastLinkMicBattleItemCard does streamer win battle?
-
-    public static void main(String[] args) throws SQLException, IOException {
-
-        TikTokMessageCollectorClient.create("giftsCollector")
-                //.addUser("crece.sara")
-                //.addUser("moniczkka")
-                .addUser("valeria.viral")
-               // .addUser("cbcgod")
-                //   .addUser("psychotropnazywo")
-                //  .addUser("accordionistka")
-                //.addEventFilter(WebcastGiftMessage.class)
-                .addOnBuilder(liveClientBuilder ->
-                {
-                    liveClientBuilder.onGiftCombo((liveClient, event) ->
-                    {
-                        liveClient.getLogger().setLevel(Level.OFF);
-                        var gifts  = liveClient.getGiftManager().getGifts();
-
-                        var sb = new StringBuilder();
-                        sb.append("GIFT COMBO User: " + event.getUser().getProfileName()+" ");
-                        sb.append("Name: " + event.getGift().getName() + " ");
-                        sb.append("Combo: " + event.getCombo() + " ");
-                        sb.append("COST: " + event.getGift().getDiamondCost() + " ");
-                        sb.append("STATE: " + event.getComboState() + " ");
-                        System.out.println(sb.toString());
-                    });
-
-                    liveClientBuilder.onGift((liveClient, event) ->
-                    {
-                        liveClient.getLogger().setLevel(Level.OFF);
-                        var gifts  = liveClient.getGiftManager().getGifts();
-
-                        var sb = new StringBuilder();
-                        sb.append("GIFT User: " + event.getUser().getProfileName()+" ");
-                        sb.append("Name: " + event.getGift().getName() + " ");
-                        sb.append("COST: " + event.getGift().getDiamondCost() + " ");
-                        sb.append("Combo: " + event.getCombo() + " ");
-                        System.out.println(sb.toString());
-                    });
-                })
-                .buildAndRun();
-
-        System.in.read();
-    }
-}
-
-
-

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/api/DataCollector.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.collector.api;
+
+public interface DataCollector {
+
+    void connect();
+
+
+    void disconnect();
+
+    void disconnect(boolean keepDatabase);
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/api/DataCollectorBuilder.java

@@ -20,41 +20,25 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.utils;
+package io.github.jwdeveloper.tiktok.tools.collector.api;
 
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
+import io.github.jwdeveloper.tiktok.tools.db.TikTokDatabase;
 
-public class CancelationToken
-{
-    private boolean isCanceled =false;
+import java.util.function.Consumer;
 
-    public void cancel()
-    {
-        isCanceled =true;
-    }
+public interface DataCollectorBuilder extends DataFilters<DataCollectorBuilder> {
+    DataCollectorBuilder setOutputPath(String path);
+    DataCollectorBuilder setSessionTag(String sessionTimestamp);
 
-    public boolean isCancel()
-    {
+    DataCollectorBuilder setDatabase(TikTokDatabase database);
 
-        return isCanceled;
-    }
+    DataCollectorBuilder configureLiveClient(Consumer<LiveClientBuilder> consumer);
 
-    public void throwIfCancel()
-    {
-        if(!isCanceled)
-        {
-            return;
-        }
-        throw new TikTokLiveException("Token requested cancelation");
-    }
+    DataCollectorBuilder addUser(String user);
 
-    public boolean isNotCancel()
-    {
-        return !isCancel();
-    }
+    DataCollector buildAndRun();
+
+    DataCollector build();
 
-    public static CancelationToken create()
-    {
-        return new CancelationToken();
-    }
 }

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/api/DataFilters.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.collector.api;
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+
+public interface DataFilters<T> {
+     T addMessageFilter(Class<? extends com.google.protobuf.GeneratedMessageV3> message);
+
+     T addMessageFilter(String message);
+
+     T addEventFilter(Class<? extends TikTokEvent> event);
+
+     T addEventFilter(String event);
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/api/TikTokDataCollectorModel.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.collector.api;
+
+import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+
+@Data
+public class TikTokDataCollectorModel {
+    private List<String> users;
+    private String outputPath;
+    private String outputName;
+    private Set<String> eventsFilter;
+    private Set<String> messagesFilter;
+    private String sessionTag ="";
+    private Consumer<LiveClientBuilder> onConfigureLiveClient;
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/MessagesManager.java

@@ -37,14 +37,14 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.logging.Logger;
 
-public class MessageCollector {
+public class MessagesManager {
 
     @Getter
     Map<String, Queue<MessageData>> messages;
     String outputName;
 
     int limit = 20;
-    public MessageCollector(String outputName) {
+    public MessagesManager(String outputName) {
         this.messages = new TreeMap<>();
         this.outputName = outputName;
         load();

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokClientFactory.java

@@ -22,104 +22,16 @@
  */
 package io.github.jwdeveloper.tiktok.tools.collector.client;
 
-import io.github.jwdeveloper.tiktok.TikTokLive;
-import io.github.jwdeveloper.tiktok.TikTokLiveClientBuilder;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
-import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
-import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.ExceptionInfoModel;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokErrorModel;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokMessageModel;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokResponseModel;
-
-import java.util.Base64;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
+import io.github.jwdeveloper.tiktok.tools.db.TikTokDatabase;
 
 public class TikTokClientFactory {
-    private final MessageCollector messageCollector;
+    private final MessagesManager messageCollector;
     private final TikTokDatabase tikTokDatabase;
 
-    public TikTokClientFactory(MessageCollector messageCollector, TikTokDatabase tikTokDatabase) {
+    public TikTokClientFactory(MessagesManager messageCollector, TikTokDatabase tikTokDatabase) {
         this.messageCollector = messageCollector;
         this.tikTokDatabase = tikTokDatabase;
     }
 
-    public CompletableFuture<LiveClient> runClientAsync(String tiktokUser, List<Class<?>> filters, Consumer<LiveClientBuilder> onBuilder) {
-        var builder = TikTokLive.newClient(tiktokUser);
-        var msgFilter = filters.stream().map(Class::getSimpleName).toList();
-        onBuilder.accept(builder);
-        return builder.onConnected((liveClient, event) ->
-                {
-                    liveClient.getLogger().info("CONNECTED TO " + liveClient.getRoomInfo().getHostName());
-                })
-                .onWebsocketResponse((liveClient, event) ->
-                {
-                    var response = Base64.getEncoder().encodeToString(event.getResponse().toByteArray());
 
-                    var responseModel = new TikTokResponseModel();
-                    responseModel.setResponse(response);
-                    responseModel.setHostName(liveClient.getRoomInfo().getHostName());
-                    tikTokDatabase.insertResponse(responseModel);
-                    liveClient.getLogger().info("Response");
-                    for (var message : event.getResponse().getMessagesList())
-                    {
-                        if(msgFilter.size() > 0 && !msgFilter.contains(message.getMethod()))
-                        {
-                            continue;
-                        }
-                        messageCollector.addMessage(liveClient.getLogger(), liveClient.getRoomInfo().getHostName(), message);
-                    }
-                })
-                .onWebsocketMessage((liveClient, event) ->
-                {
-                    var eventName = event.getEvent().getClass().getSimpleName();
-
-                    /*
-                    if (msgFilter.size() != 0 && !msgFilter.contains(event.getEvent().getClass())) {
-                        return;
-                    }*/
-
-                    var messageBinary = Base64.getEncoder().encodeToString(event.getMessage().toByteArray());
-                    var model = new TikTokMessageModel();
-                    model.setType("messsage");
-                    model.setHostName(tiktokUser);
-                    model.setEventName(eventName);
-                    model.setMessage(messageBinary);
-
-                    //   tikTokDatabase.insertMessage(model);
-                   // liveClient.getLogger().info("EVENT: [" + tiktokUser + "] " + eventName);
-                })
-                .onError((liveClient, event) ->
-                {
-                    event.getException().printStackTrace();
-                    var exception = event.getException();
-                    var exceptionContent = ExceptionInfoModel.getStackTraceAsString(exception);
-                    var errorModel = new TikTokErrorModel();
-                    if (exception instanceof TikTokLiveMessageException ex) {
-                        errorModel.setHostName(tiktokUser);
-                        errorModel.setErrorName(ex.messageMethod());
-                        errorModel.setErrorType("error-message");
-                        errorModel.setExceptionContent(exceptionContent);
-                        errorModel.setMessage(ex.messageToBase64());
-                        errorModel.setResponse(ex.webcastResponseToBase64());
-                    } else {
-                        errorModel.setHostName(tiktokUser);
-                        errorModel.setErrorName(exception.getClass().getSimpleName());
-                        errorModel.setErrorType("error-system");
-                        errorModel.setExceptionContent(exceptionContent);
-                        errorModel.setMessage("");
-                        errorModel.setResponse("");
-                    }
-
-
-                    tikTokDatabase.insertError(errorModel);
-                    liveClient.getLogger().info("ERROR: " + errorModel.getErrorName());
-                    exception.printStackTrace();
-
-                })
-                .buildAndConnectAsync();
-    }
 }

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokDataCollector.java

@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.collector.client;
+
+import io.github.jwdeveloper.tiktok.TikTokLive;
+import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
+import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
+import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.tools.collector.api.DataCollector;
+import io.github.jwdeveloper.tiktok.tools.collector.api.TikTokDataCollectorModel;
+import io.github.jwdeveloper.tiktok.tools.db.TikTokDatabase;
+import io.github.jwdeveloper.tiktok.tools.db.tables.ExceptionInfoModel;
+import io.github.jwdeveloper.tiktok.tools.db.tables.TikTokDataTable;
+import io.github.jwdeveloper.tiktok.tools.db.tables.TikTokErrorModel;
+import io.github.jwdeveloper.tiktok.utils.JsonUtil;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+public class TikTokDataCollector implements DataCollector {
+    private final TikTokDataCollectorModel dataCollectorModel;
+    private final TikTokDatabase tikTokDatabase;
+    private final List<LiveClient> tiktokClients;
+
+    public TikTokDataCollector(TikTokDataCollectorModel dataCollectorModel, TikTokDatabase tikTokDatabase) {
+        this.dataCollectorModel = dataCollectorModel;
+        this.tikTokDatabase = tikTokDatabase;
+        this.tiktokClients = new ArrayList<>();
+    }
+
+    public void connect() {
+        try {
+            if (!tikTokDatabase.isConnected()) {
+                tikTokDatabase.connect();
+            }
+            for (var user : dataCollectorModel.getUsers()) {
+                var client = createLiveClient(user);
+                tiktokClients.add(client);
+                client.connectAsync();
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to start tiktok connector", e);
+        }
+    }
+
+
+    public void disconnect() {
+        disconnect(false);
+    }
+
+    @Override
+    public void disconnect(boolean keepDatabase) {
+        try {
+            for (var client : tiktokClients) {
+                client.disconnect();
+            }
+            if (!keepDatabase) {
+                tikTokDatabase.close();
+            }
+
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to stop tiktok connector", e);
+        }
+    }
+
+    public LiveClient createLiveClient(String tiktokUser) {
+        var builder = TikTokLive.newClient(tiktokUser);
+        builder.onConnected((liveClient, event) ->
+                {
+                    liveClient.getLogger().info("Connected to " + liveClient.getRoomInfo().getHostName());
+                })
+                .onDisconnected((liveClient, event) ->
+                {
+                    liveClient.getLogger().info("Disconnected " + liveClient.getRoomInfo().getHostName());
+                })
+                .onWebsocketResponse(this::handleResponseAndMessages)
+                .onWebsocketMessage(this::handleMappedEvent)
+                .onHttpResponse((liveClient, event) ->
+                {
+                    var data = createHttpResponseData(event, tiktokUser);
+                    tikTokDatabase.insertData(data);
+                })
+                .onError(this::handleError);
+        dataCollectorModel.getOnConfigureLiveClient().accept(builder);
+        return builder.build();
+    }
+
+    private void handleResponseAndMessages(LiveClient client, TikTokWebsocketResponseEvent event) {
+        var responseData = createResponseData(event.getResponse(), client.getRoomInfo().getHostName());
+        tikTokDatabase.insertData(responseData);
+
+        var filter = dataCollectorModel.getMessagesFilter();
+        for (var message : event.getResponse().getMessagesList()) {
+            if (filter.isEmpty()) {
+                var data = createMessageData(message, client.getRoomInfo().getHostName());
+                tikTokDatabase.insertData(data);
+                continue;
+            }
+            if (!filter.contains(message.getMethod())) {
+                continue;
+            }
+            var data = createMessageData(message, client.getRoomInfo().getHostName());
+            tikTokDatabase.insertData(data);
+        }
+    }
+
+    private void handleMappedEvent(LiveClient client, TikTokWebsocketMessageEvent messageEvent) {
+        var event = messageEvent.getEvent();
+        var eventName = event.getClass().getSimpleName();
+
+        var filter = dataCollectorModel.getEventsFilter();
+
+        if (filter.isEmpty()) {
+            var data = createEventData(event, client.getRoomInfo().getHostName());
+            tikTokDatabase.insertData(data);
+            return;
+        }
+
+        if (!filter.contains(eventName)) {
+            return;
+        }
+        var data = createEventData(event, client.getRoomInfo().getHostName());
+        tikTokDatabase.insertData(data);
+    }
+
+    private void handleError(LiveClient client, TikTokErrorEvent event) {
+        var exception = event.getException();
+        var userName = client.getRoomInfo().getHostName();
+        var exceptionContent = ExceptionInfoModel.getStackTraceAsString(exception);
+        var errorModel = new TikTokErrorModel();
+        if (exception instanceof TikTokLiveMessageException ex) {
+            errorModel.setHostName(userName);
+            errorModel.setErrorName(ex.messageMethod());
+            errorModel.setErrorType("error-message");
+            errorModel.setExceptionContent(exceptionContent);
+            errorModel.setMessage(ex.messageToBase64());
+            errorModel.setResponse(ex.webcastResponseToBase64());
+        } else {
+            errorModel.setHostName(userName);
+            errorModel.setErrorName(exception.getClass().getSimpleName());
+            errorModel.setErrorType("error-system");
+            errorModel.setExceptionContent(exceptionContent);
+            errorModel.setMessage("");
+            errorModel.setResponse("");
+        }
+
+
+        tikTokDatabase.insertError(errorModel);
+        client.getLogger().info("ERROR: " + errorModel.getErrorName());
+        exception.printStackTrace();
+    }
+
+    private TikTokDataTable createHttpResponseData(TikTokHttpResponseEvent response, String tiktokUser) {
+        var base64 = JsonUtil.toJson(response);
+        var data = new TikTokDataTable();
+        data.setSessionTag(dataCollectorModel.getSessionTag());
+        data.setTiktokUser(tiktokUser);
+        data.setDataType("response");
+        data.setDataTypeName("Http");
+        data.setContent(base64);
+        return data;
+    }
+
+
+    private TikTokDataTable createResponseData(WebcastResponse response, String tiktokUser) {
+        var base64 = Base64.getEncoder().encodeToString(response.toByteArray());
+        var data = new TikTokDataTable();
+        data.setSessionTag(dataCollectorModel.getSessionTag());
+        data.setTiktokUser(tiktokUser);
+        data.setDataType("response");
+        data.setDataTypeName("WebcastResponse");
+        data.setContent(base64);
+        return data;
+    }
+
+    private TikTokDataTable createMessageData(WebcastResponse.Message message, String tiktokUser) {
+        var base64 = Base64.getEncoder().encodeToString(message.getPayload().toByteArray());
+        var data = new TikTokDataTable();
+        data.setSessionTag(dataCollectorModel.getSessionTag());
+        data.setTiktokUser(tiktokUser);
+        data.setDataType("message");
+        data.setDataTypeName(message.getMethod());
+        data.setContent(base64);
+        return data;
+    }
+
+    private TikTokDataTable createEventData(TikTokEvent event, String tiktokUser) {
+        var base64 = JsonUtil.toJson(event);
+        var data = new TikTokDataTable();
+        data.setSessionTag(dataCollectorModel.getSessionTag());
+        data.setTiktokUser(tiktokUser);
+        data.setDataType("event");
+        data.setDataTypeName(event.getClass().getSimpleName());
+        data.setContent(base64);
+        return data;
+    }
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokDataCollectorBuilder.java

@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.collector.client;
+
+import com.google.protobuf.GeneratedMessageV3;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
+import io.github.jwdeveloper.tiktok.tools.collector.api.DataCollectorBuilder;
+import io.github.jwdeveloper.tiktok.tools.collector.api.DataCollector;
+import io.github.jwdeveloper.tiktok.tools.collector.api.TikTokDataCollectorModel;
+import io.github.jwdeveloper.tiktok.tools.db.TikTokDatabase;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.UUID;
+import java.util.function.Consumer;
+
+public class TikTokDataCollectorBuilder implements DataCollectorBuilder {
+
+
+    TikTokDataCollectorModel dataModel;
+
+    TikTokDatabase database;
+
+    public TikTokDataCollectorBuilder(String outputName) {
+
+        dataModel = new TikTokDataCollectorModel();
+        dataModel.setOutputName(outputName);
+        dataModel.setUsers(new ArrayList<>());
+        dataModel.setEventsFilter(new HashSet<>());
+        dataModel.setMessagesFilter(new HashSet<>());
+        dataModel.setOutputPath("...");
+        dataModel.setOnConfigureLiveClient((e) -> {
+        });
+    }
+
+    @Override
+    public DataCollectorBuilder addUser(String user) {
+        dataModel.getUsers().add(user);
+        return this;
+    }
+
+    @Override
+    public TikTokDataCollectorBuilder addMessageFilter(Class<? extends GeneratedMessageV3> message) {
+        dataModel.getMessagesFilter().add(message.getSimpleName());
+        return this;
+    }
+
+    @Override
+    public TikTokDataCollectorBuilder addMessageFilter(String message) {
+        dataModel.getMessagesFilter().add(message);
+        return this;
+    }
+
+    @Override
+    public TikTokDataCollectorBuilder addEventFilter(Class<? extends TikTokEvent> event) {
+        dataModel.getEventsFilter().add(event.getSimpleName());
+        return this;
+    }
+
+    @Override
+    public TikTokDataCollectorBuilder addEventFilter(String event) {
+        dataModel.getEventsFilter().add(event);
+        return this;
+    }
+
+
+    @Override
+    public DataCollectorBuilder setOutputPath(String path) {
+        dataModel.setOutputPath(path);
+        return this;
+    }
+
+    @Override
+    public DataCollectorBuilder setSessionTag(String sessionTimestamp) {
+        dataModel.setSessionTag(sessionTimestamp);
+        return this;
+    }
+
+    @Override
+    public DataCollectorBuilder setDatabase(TikTokDatabase database)
+    {
+        this.database =database;
+        return this;
+    }
+
+    @Override
+    public DataCollectorBuilder configureLiveClient(Consumer<LiveClientBuilder> consumer) {
+        dataModel.setOnConfigureLiveClient(consumer);
+        return this;
+    }
+
+
+    @Override
+    public DataCollector buildAndRun() {
+
+        var collector = build();
+        collector.connect();
+        return collector;
+    }
+
+    @Override
+    public DataCollector build() {
+
+        if (dataModel.getSessionTag().isEmpty()) {
+            dataModel.setSessionTag(UUID.randomUUID().toString());
+        }
+
+        if(database == null)
+        {
+            database =  new TikTokDatabase(dataModel.getOutputName());
+        }
+        var dataCollector = new TikTokDataCollector(dataModel, database);
+        return dataCollector;
+    }
+
+
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/client/TikTokMessagessCollectorBuilder.java

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.tools.collector.client;
-
-import io.github.jwdeveloper.tiktok.TikTokLiveClientBuilder;
-import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
-import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-public class TikTokMessagessCollectorBuilder {
-    List<String> users;
-    String outputFileName;
-    List<Class<?>> filters;
-    Consumer<LiveClientBuilder> onBuilder;
-    List<LiveClient> tiktokclients;
-
-    MessageCollector messageCollector;
-
-    public TikTokMessagessCollectorBuilder(String outputName) {
-        users = new ArrayList<>();
-        outputFileName = outputName;
-        filters = new ArrayList<>();
-        onBuilder = (e) -> {
-        };
-        tiktokclients = new ArrayList<>();
-        messageCollector = new MessageCollector(outputName);
-    }
-
-    public TikTokMessagessCollectorBuilder(MessageCollector messageCollector, String outputFileName) {
-        this(outputFileName);
-        this.messageCollector = messageCollector;
-    }
-
-    public TikTokMessagessCollectorBuilder setOutputName(String name) {
-        outputFileName = name;
-        return this;
-    }
-
-
-    public TikTokMessagessCollectorBuilder addOnBuilder(Consumer<LiveClientBuilder> consumer) {
-        onBuilder = consumer;
-        return this;
-    }
-
-    public TikTokMessagessCollectorBuilder addUser(String user) {
-        users.add(user);
-        return this;
-    }
-
-    public TikTokMessagessCollectorBuilder addEventFilter(Class<?> event) {
-        filters.add(event);
-        return this;
-    }
-
-    public MessageCollector buildAndRun() throws SQLException {
-        var db = new TikTokDatabase(outputFileName);
-        db.init();
-        var factory = new TikTokClientFactory(messageCollector, db);
-        for (var user : users) {
-            var client = factory.runClientAsync(user,filters, onBuilder);
-            client.thenAccept(liveClient ->
-            {
-                tiktokclients.add(liveClient);
-            });
-        }
-        return messageCollector;
-    }
-
-    public void stop() {
-        for (var client : tiktokclients) {
-            client.disconnect();
-        }
-    }
-}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/db/TikTokDatabase.java

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.tools.collector.db;
-
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokErrorModel;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokMessageModel;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokResponseModel;
-import org.jdbi.v3.core.Jdbi;
-import org.jdbi.v3.sqlobject.SqlObjectPlugin;
-
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-public class TikTokDatabase {
-    private final String database;
-    private TikTokMessageModelDAO messagesTable;
-    private TikTokErrorModelDAO errorTable;
-    private TikTokResponseModelDAO responseTable;
-
-    public TikTokDatabase(String database) {
-        this.database = database;
-    }
-
-    public void init() throws SQLException {
-        var jdbcUrl = "jdbc:sqlite:" + database + ".db";
-        DriverManager.getConnection(jdbcUrl);
-        var jdbi = Jdbi.create(jdbcUrl)
-                .installPlugin(new SqlObjectPlugin());
-        jdbi.useHandle(handle -> {
-            handle.execute(SqlConsts.CREATE_MESSAGES_TABLE);
-            handle.execute(SqlConsts.CREATE_ERROR_TABLE);
-            handle.execute(SqlConsts.CREATE_RESPONSE_MODEL);
-        });
-        messagesTable = jdbi.onDemand(TikTokMessageModelDAO.class);
-        errorTable = jdbi.onDemand(TikTokErrorModelDAO.class);
-        responseTable = jdbi.onDemand(TikTokResponseModelDAO.class);
-    }
-
-    public void insertMessage(TikTokMessageModel message) {
-        message.setCreatedAt(getTime());
-        messagesTable.insertTikTokMessage(message);
-    }
-
-    public void insertError(TikTokErrorModel message) {
-        message.setCreatedAt(getTime());
-        errorTable.insertTikTokMessage(message);
-    }
-
-    public void insertResponse(TikTokResponseModel message) {
-        message.setCreatedAt(getTime());
-        responseTable.insert(message);
-    }
-
-    public List<TikTokErrorModel> selectErrors() {
-        return errorTable.selectErrors();
-    }
-
-    public List<TikTokMessageModel> selectMessages() {
-        return messagesTable.select();
-    }
-
-    public List<TikTokResponseModel> selectResponces() {
-        return responseTable.select();
-    }
-
-    private String getTime() {
-        return new SimpleDateFormat("dd:MM:yyyy HH:mm:ss.SSS").format(new Date());
-    }
-}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/db/TikTokMessageModelDAO.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.tools.collector.db;
-
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokErrorModel;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokMessageModel;
-import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
-import org.jdbi.v3.sqlobject.customizer.BindBean;
-import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.jdbi.v3.sqlobject.statement.SqlUpdate;
-
-import java.util.List;
-
-@RegisterBeanMapper(TikTokMessageModel.class)
-public interface TikTokMessageModelDAO
-{
-    @SqlUpdate("INSERT INTO TikTokMessageModel (hostName, eventName,type, eventContent, createdAt) " +
-            "VALUES (:hostName, :eventName, :type, :eventContent, :createdAt)")
-    void insertTikTokMessage(@BindBean TikTokMessageModel message);
-
-    @SqlQuery("SELECT * FROM TikTokMessageModel")
-    List<TikTokMessageModel> select();
-}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/db/SqlConsts.java

@@ -20,17 +20,19 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.db;
+package io.github.jwdeveloper.tiktok.tools.db;
 
 public class SqlConsts
 {
-    public static String CREATE_MESSAGES_TABLE = """
-               CREATE TABLE IF NOT EXISTS TikTokMessageModel (
+
+    public static String CREATE_DATA_TABLE = """
+               CREATE TABLE IF NOT EXISTS TikTokData (
                     id INTEGER PRIMARY KEY AUTOINCREMENT,
-                    hostName TEXT,
-                    type TEXT,
-                    eventName TEXT,
-                    eventContent TEXT,
+                    sessionTag TEXT,
+                    tiktokUser TEXT,
+                    dataType TEXT,
+                    dataTypeName TEXT,
+                    content TEXT,
                     createdAt TEXT
                 );
             """;

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/db/TikTokDataTableDAO.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.db;
+
+import io.github.jwdeveloper.tiktok.tools.db.tables.TikTokDataTable;
+import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
+import org.jdbi.v3.sqlobject.customizer.Bind;
+import org.jdbi.v3.sqlobject.customizer.BindBean;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
+import org.jdbi.v3.sqlobject.statement.SqlUpdate;
+
+import java.util.List;
+import java.util.Map;
+
+@RegisterBeanMapper(TikTokDataTable.class)
+public interface TikTokDataTableDAO {
+    String query = """
+            INSERT INTO TikTokData (sessionTag, tiktokUser, dataType, dataTypeName, content, createdAt)  VALUES (:sessionTag, :tiktokUser, :dataType, :dataTypeName, :content, :createdAt)  
+            """;
+
+    @SqlUpdate(query)
+    void insertData(@BindBean TikTokDataTable data);
+
+    @SqlQuery("SELECT * FROM TikTokData WHERE sessionTag = :sessionTag")
+    List<TikTokDataTable> selectBySession(@Bind("sessionTag") String sessionTag);
+
+    @SqlQuery("SELECT * FROM TikTokData WHERE dataType = :dataType AND sessionTag = :sessionTag AND  tiktokUser = :tiktokUser")
+    List<TikTokDataTable> selectSessionData(@Bind("dataType") String dataType,
+                                            @Bind("sessionTag") String sessionTag,
+                                            @Bind("tiktokUser") String user);
+
+    @SqlQuery("SELECT * FROM TikTokData WHERE sessionTag = :sessionTag AND  tiktokUser = :tiktokUser AND dataType = \"response\"")
+    List<TikTokDataTable> selectResponces(@Bind("sessionTag") String sessionTag, @Bind("tiktokUser") String user);
+
+    @SqlQuery("SELECT * FROM TikTokData WHERE sessionTag = :sessionTag AND  tiktokUser = :tiktokUser AND dataType = \"event\"")
+    List<TikTokDataTable> selectBySessionEvents(@Bind("sessionTag") String sessionTag, @Bind("tiktokUser") String userName);
+
+    @SqlQuery("SELECT * FROM TikTokData WHERE sessionTag = :sessionTag AND  tiktokUser = :tiktokUser AND dataType = \"message\"")
+    List<TikTokDataTable> selectBySessionMessages(@Bind("sessionTag") String sessionTag, @Bind("tiktokUser") String userName);
+
+
+    @SqlQuery("SELECT tiktokUser FROM TikTokData GROUP BY tiktokUser")
+    List<String> getUsers();
+
+
+    @SqlQuery("SELECT sessionTag FROM TikTokData WHERE tiktokUser = :tiktokUser  GROUP BY sessionTag")
+    List<String> getSessionTagByUser(@Bind("tiktokUser") String tiktokUser);
+
+    String groupByDataTypeNameQuery = """
+            SELECT dataTypeName, COUNT(*) as count
+            FROM TikTokData
+            WHERE dataType = 'message' AND sessionTag = :sessionTag AND tiktokUser = :userName
+            GROUP BY dataTypeName
+            """;
+
+
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/db/TikTokDatabase.java

@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.db;
+
+import io.github.jwdeveloper.tiktok.tools.db.tables.TikTokDataTable;
+import io.github.jwdeveloper.tiktok.tools.db.tables.TikTokErrorModel;
+import lombok.Getter;
+import org.jdbi.v3.core.Jdbi;
+import org.jdbi.v3.sqlobject.SqlObjectPlugin;
+import org.sqlite.SQLiteConfig;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TikTokDatabase {
+    private final String database;
+
+    private TikTokErrorModelDAO errorTable;
+
+    @Getter
+    private TikTokDataTableDAO dataTableDAO;
+
+    private Connection connection;
+
+
+    public TikTokDatabase(String database) {
+        this.database = database;
+    }
+
+    public boolean isConnected()
+    {
+        return connection != null;
+    }
+
+    public void connect() throws SQLException {
+        var jdbcUrl = "jdbc:sqlite:" + database + ".db";
+        var config = new SQLiteConfig();
+        config.setEncoding(SQLiteConfig.Encoding.UTF8);
+        connection = DriverManager.getConnection(jdbcUrl, config.toProperties());
+        var jdbi = Jdbi.create(jdbcUrl).installPlugin(new SqlObjectPlugin());
+        jdbi.useHandle(handle -> {
+            handle.execute(SqlConsts.CREATE_DATA_TABLE);
+            handle.execute(SqlConsts.CREATE_ERROR_TABLE);
+        });
+        dataTableDAO = jdbi.onDemand(TikTokDataTableDAO.class);
+        errorTable = jdbi.onDemand(TikTokErrorModelDAO.class);
+    }
+
+    public void close() throws SQLException {
+        connection.close();
+    }
+
+    public void insertData(TikTokDataTable tikTokDataTable) {
+        tikTokDataTable.setCreatedAt(getTime());
+        dataTableDAO.insertData(tikTokDataTable);
+    }
+
+    public List<TikTokDataTable> getSessionResponces(String sessionTag, String userName) {
+        return dataTableDAO.selectResponces(sessionTag, userName);
+    }
+
+    public List<String> getDataNames(String dataType, String sessionTag, String userName) {
+
+        try {
+            var sb = new StringBuilder();
+            sb.append("""
+                        SELECT dataTypeName, COUNT(*) as count
+                        FROM TikTokData
+                    """);
+            sb.append(" WHERE dataType = \""+dataType+"\" ");
+            sb.append(" AND tiktokUser = \"" + userName + "\" ");
+            sb.append(" AND sessionTag = \"" + sessionTag + "\" ");
+            sb.append("GROUP BY dataTypeName");
+            var statement = connection.prepareStatement(sb.toString());
+            var resultSet = statement.executeQuery();
+            List<String> dataTypeCounts = new ArrayList<>();
+            while (resultSet.next()) {
+                var dataTypeName = resultSet.getString("dataTypeName");
+                dataTypeCounts.add(dataTypeName);
+            }
+
+            resultSet.close();
+            statement.close();
+
+            return dataTypeCounts;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return List.of("error");
+        }
+
+
+    }
+
+
+
+    public List<TikTokDataTable> getSessionMessages(String sessionTag, String userName, int count) {
+        return dataTableDAO.selectBySessionMessages(sessionTag, userName);
+    }
+
+    public void insertError(TikTokErrorModel message) {
+        message.setCreatedAt(getTime());
+        errorTable.insertTikTokMessage(message);
+    }
+
+
+    public List<TikTokErrorModel> selectErrors() {
+        return errorTable.selectErrors();
+    }
+
+    private String getTime() {
+        return new SimpleDateFormat("dd:MM:yyyy HH:mm:ss.SSS").format(new Date());
+    }
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/db/TikTokErrorModelDAO.java

@@ -20,9 +20,9 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.db;
+package io.github.jwdeveloper.tiktok.tools.db;
 
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokErrorModel;
+import io.github.jwdeveloper.tiktok.tools.db.tables.TikTokErrorModel;
 
 import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
 import org.jdbi.v3.sqlobject.customizer.BindBean;

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/db/tables/ExceptionInfoModel.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.tables;
+package io.github.jwdeveloper.tiktok.tools.db.tables;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/db/tables/TikTokDataTable.java

@@ -20,23 +20,24 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.tables;
+package io.github.jwdeveloper.tiktok.tools.db.tables;
 
 import lombok.Data;
 
-
 @Data
-public class TikTokMessageModel
+public class TikTokDataTable
 {
     private Integer id;
 
-    private String hostName;
+    private String sessionTag;
 
-    private String eventName;
+    private String tiktokUser;
 
-    private String type;
+    private String dataType;
 
-    private String message;
+    private String dataTypeName;
+
+    private String content;
 
     private String createdAt;
 }

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/db/tables/TikTokErrorModel.java

@@ -20,7 +20,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.tables;
+package io.github.jwdeveloper.tiktok.tools.db.tables;
 
 import lombok.Data;
 

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunDbTester.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.tools.tester;
-
-import com.google.protobuf.ByteString;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
-import io.github.jwdeveloper.tiktok.mockClient.TikTokClientMock;
-import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase;
-import io.github.jwdeveloper.tiktok.tools.collector.tables.TikTokResponseModel;
-import io.github.jwdeveloper.tiktok.tools.util.MessageUtil;
-import io.github.jwdeveloper.tiktok.utils.ConsoleColors;
-import io.github.jwdeveloper.tiktok.utils.JsonUtil;
-
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-
-public class RunDbTester {
-
-
-    public static void main(String[] args) throws Exception {
-        var db = new TikTokDatabase("test");
-        db.init();
-
-        var responses = db.selectResponces().stream().map(TikTokResponseModel::getResponse).toList();
-        var client = TikTokClientMock
-                .create()
-                .addResponses(responses)
-                .onWebsocketUnhandledMessage((liveClient, event) ->
-                {
-                    var sb = new StringBuilder();
-                    sb.append("Unhandled Message! " );
-                    sb.append(event.getData().getMethod());
-                    sb.append(MessageUtil.getContent(event.getData()));
-
-                    liveClient.getLogger().info(sb.toString());
-                })
-                .onWebsocketMessage((liveClient, event) ->
-                {
-                    var sb = new StringBuilder();
-                    sb.append(event.getEvent().getClass().getSimpleName());
-                    sb.append(event.getEvent().toJson());
-                    liveClient.getLogger().fine(sb.toString());
-                })
-                .build();
-
-
-        client.connect();
-    }
-
-
-
-
-
-}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/RunJsonTester.java

@@ -23,8 +23,8 @@
 package io.github.jwdeveloper.tiktok.tools.tester;
 
 import com.google.gson.JsonParser;
-import io.github.jwdeveloper.tiktok.mockClient.TikTokClientMock;
-import io.github.jwdeveloper.tiktok.mockClient.mocks.LiveClientMock;
+import io.github.jwdeveloper.tiktok.tools.tester.mockClient.TikTokLiveMock;
+import io.github.jwdeveloper.tiktok.tools.tester.mockClient.mocks.LiveClientMock;
 import io.github.jwdeveloper.tiktok.tools.util.MessageUtil;
 
 import java.io.FileReader;
@@ -37,7 +37,7 @@ public class RunJsonTester {
 
     public static void main(String[] args) throws IOException {
         var messages = getMessages();
-        var client =(LiveClientMock) TikTokClientMock.create()
+        var client =(LiveClientMock) TikTokLiveMock.create()
                 .onWebsocketUnhandledMessage((liveClient, event) ->
                 {
                     var sb = new StringBuilder();

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/TikTokDataTester.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.tester;
+
+import io.github.jwdeveloper.tiktok.tools.db.TikTokDatabase;
+import io.github.jwdeveloper.tiktok.tools.db.tables.TikTokDataTable;
+import io.github.jwdeveloper.tiktok.tools.tester.api.DataTester;
+import io.github.jwdeveloper.tiktok.tools.tester.api.DataTesterModel;
+import io.github.jwdeveloper.tiktok.tools.tester.mockClient.TikTokLiveMock;
+import io.github.jwdeveloper.tiktok.tools.tester.mockClient.mocks.LiveClientMock;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+public class TikTokDataTester implements DataTester {
+    private DataTesterModel model;
+
+    private LiveClientMock client;
+
+    private Queue<TikTokDataTable> data;
+
+    private TikTokDatabase database;
+
+    public TikTokDataTester(DataTesterModel model) {
+        this.model = model;
+    }
+
+    @Override
+    public void connect() {
+
+        try {
+            database = new TikTokDatabase(model.getDatabaseName());
+            database.connect();
+            var mockBuilder = TikTokLiveMock.create();
+            model.getBuilderConsumer().accept(mockBuilder);
+            client = mockBuilder.build();
+            var respocnes = database.getSessionResponces(model.getSessionTag(), model.getUser());
+            data = new LinkedList<>(respocnes);
+            client.connect();
+            while (!data.isEmpty()) {
+                nextResponse();
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Error while running tester", e);
+        }
+    }
+
+    @Override
+    public void nextResponse() {
+        try {
+            var responce = data.poll();
+            client.publishResponse(responce.getContent());
+            Thread.sleep(1);
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to run response!");
+        }
+    }
+
+    @Override
+    public void disconnect() {
+
+        try {
+            client.disconnect();
+            database.close();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/TikTokDataTesterBuilder.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.tester;
+
+import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
+import io.github.jwdeveloper.tiktok.tools.tester.api.DataTester;
+import io.github.jwdeveloper.tiktok.tools.tester.api.DataTesterBuilder;
+import io.github.jwdeveloper.tiktok.tools.tester.api.DataTesterModel;
+
+import java.util.function.Consumer;
+
+public class TikTokDataTesterBuilder implements DataTesterBuilder {
+    private final DataTesterModel model;
+
+    public TikTokDataTesterBuilder(String databaseName) {
+        this.model = new DataTesterModel();
+        this.model.setDatabaseName(databaseName);
+    }
+
+    @Override
+    public DataTesterBuilder setSessionTag(String sessionTag) {
+        model.setSessionTag(sessionTag);
+        return this;
+    }
+
+    @Override
+    public DataTesterBuilder setUser(String user) {
+        model.setUser(user);
+        return this;
+    }
+
+    @Override
+    public DataTesterBuilder configureLiveClient(Consumer<LiveClientBuilder> builderConsumer) {
+        model.setBuilderConsumer(builderConsumer);
+        return this;
+    }
+
+    @Override
+    public DataTester build() {
+        return new TikTokDataTester(model);
+    }
+
+    @Override
+    public DataTester buildAndRun()
+    {
+        var tester = build();
+        tester.connect();
+        return tester;
+    }
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/api/DataTester.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.tester.api;
+
+public interface DataTester
+{
+     void connect();
+
+     void nextResponse();
+
+     void disconnect();
+}

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/api/DataTesterBuilder.java

@@ -20,17 +20,22 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.tools.collector.client;
+package io.github.jwdeveloper.tiktok.tools.tester.api;
 
-public class TikTokMessageCollectorClient
-{
-    public static TikTokMessagessCollectorBuilder create(String outputName)
-    {
-        return new TikTokMessagessCollectorBuilder(outputName);
-    }
+import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
 
-    public static TikTokMessagessCollectorBuilder create(MessageCollector messageCollector, String outputName)
-    {
-        return new TikTokMessagessCollectorBuilder(outputName);
-    }
+
+import java.util.function.Consumer;
+
+public interface DataTesterBuilder {
+
+    DataTesterBuilder setSessionTag(String sessionTag);
+
+    DataTesterBuilder setUser(String user);
+
+    DataTesterBuilder configureLiveClient(Consumer<LiveClientBuilder> builderConsumer);
+
+    DataTester build();
+
+    DataTester buildAndRun();
 }

Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/tester/api/DataTesterModel.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.tools.tester.api;
+
+import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
+import lombok.Data;
+
+import java.util.function.Consumer;
+
+@Data
+public class DataTesterModel {
+
+
+    String databaseName;
+    String sessionTag;
+    String user;
+    Consumer<LiveClientBuilder> builderConsumer = (a) -> {
+    };
+}