- refactor of the Http client

Changes:

Http-client settings in configure method

```
    TikTokLive.newClient("X")
                .configure(liveClientSettings ->
                {
                   var httpSetting = liveClientSettings.getHttpSettings();
                    httpSetting.setTimeout(Duration.ofSeconds(12));
                });
```

`TikTokLive.requests()` Easy and quick way of making
http request to tiktok
```
    var giftsResponse =TikTokLive.request.fetchGiftsData();
 ```

 Removed:
     TikTokLive.isLiveOnline(String hostName);
     TikTokLive.isHostNameValidAsync(String hostName);

     instead you can use
     ```
     TikTokLive.requests().fetchLiveUserData("Mike").getUserStatus()
     ```

.gitignore

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

API/pom.xml

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

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

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.dto;
-
-import lombok.*;
-
-import java.net.*;
-
-@Data
-@AllArgsConstructor
-public class ProxyData
-{
-	private final String address;
-	private final int port;
-
-	public static ProxyData map(String string) {
-		if (string == null || string.isBlank())
-			throw new IllegalArgumentException("Provided address cannot be null or empty!");
-		int portIndex = string.lastIndexOf(':');
-		try {
-			String address = string.substring(0, portIndex);
-			int port = Integer.parseInt(string.substring(portIndex+1));
-
-			// Port validation
-			if (port < 0 || port > 65535)
-				throw new IndexOutOfBoundsException("Port out of range: "+port);
-
-			// IP Validation
-			InetAddress res = InetAddress.getByName(address);
-
-			return new ProxyData(address, port);
-		} catch (NumberFormatException e) {
-			throw new IllegalArgumentException("Port must be a valid integer!", e);
-		} catch (UnknownHostException e) {
-			throw new IllegalArgumentException("Address must be valid IPv4, IPv6, or domain name!", e);
-		}
-	}
-
-	public InetSocketAddress toSocketAddress() {
-		return new InetSocketAddress(address, port);
-	}
-}

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

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

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

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

@@ -32,13 +32,15 @@ import lombok.Getter;
 
 import java.util.List;
 
-
+/**
+ * Triggered every time a new chat comment arrives.
+ */
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokCommentEvent extends TikTokHeaderEvent {
     private final User user;
     private final String text;
-    private final String userLanguage;
+    private final String getUserLanguage;
     private final User mentionedUser;
     private final List<Picture> pictures;
     private final boolean visibleToSender;
@@ -48,20 +50,8 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
         user = User.map(msg.getUser(),msg.getUserIdentity());
         text = msg.getContent();
         visibleToSender = msg.getVisibleToSender();
-        userLanguage = msg.getContentLanguage();
+        getUserLanguage = msg.getContentLanguage();
         mentionedUser = User.map(msg.getAtUser());
         pictures = msg.getEmotesListList().stream().map(e -> Picture.map(e.getEmote().getImage())).toList();
     }
-
-
-    public static TikTokCommentEvent of(String userName, String message) {
-        var builder = WebcastChatMessage.newBuilder();
-        builder.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                .setNickname(userName)
-                .build());
-        builder.setContentLanguage("en");
-        builder.setVisibleToSender(true);
-        builder.setContent(message);
-        return new TikTokCommentEvent(builder.build());
-    }
 }

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

@@ -25,6 +25,9 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
 
+/**
+ * Triggered when the connection is successfully established.
+ */
 @EventMeta(eventType = EventType.Control)
 public class TikTokConnectedEvent extends TikTokLiveClientEvent
 {

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

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

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

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

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

@@ -28,6 +28,9 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * General error event. You should handle this.
+ */
 @Getter
 @AllArgsConstructor
 @EventMeta(eventType = EventType.Control)

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

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

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

@@ -20,24 +20,24 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.data.events.link;
+package io.github.jwdeveloper.tiktok.data.events;
 
-import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokLinkEvent extends TikTokHeaderEvent {
 
-    private final String extra, transferExtra;
-    private final long expireTimestamp;
 
     public TikTokLinkEvent(WebcastLinkMessage msg) {
         super(msg.getCommon());
-        this.extra = msg.getExtra();
+
-        this.expireTimestamp = msg.getExpireTimestamp();
-        this.transferExtra = msg.getTransferExtra();
     }
 }

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

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

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

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

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

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

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

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

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

@@ -26,7 +26,9 @@ import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 
 
-
+/**
+ * Triggered when the live stream gets terminated by the host. Will also trigger the TikTokDisconnectedEvent event.
+ */
 @EventMeta(eventType = EventType.Message)
 public class TikTokLiveEndedEvent extends TikTokEvent {
 }

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

@@ -29,7 +29,9 @@ import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastQuestionNewMessage;
 import lombok.Getter;
 
-
+/*
+Triggered every time someone asks a new question via the question feature.
+ */
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokQuestionEvent extends TikTokHeaderEvent {

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

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

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

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

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

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

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

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

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

@@ -26,6 +26,9 @@ package io.github.jwdeveloper.tiktok.data.events.common;
 import io.github.jwdeveloper.tiktok.utils.JsonUtil;
 import lombok.Getter;
 
+/**
+ * Base class for all events
+ */
 @Getter
 public abstract class TikTokEvent {
 

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

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

@@ -22,28 +22,35 @@
  */
 package io.github.jwdeveloper.tiktok.data.events.gift;
 
-import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
-import io.github.jwdeveloper.tiktok.data.models.Picture;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
-import io.github.jwdeveloper.tiktok.data.models.gifts.*;
+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;
 
+
+/**
+ * Triggered every time gift is sent
+ *
+ * @see GiftSendType it has 3 states
+ *
+ * <p>Example when user sends gift with combo</p>
+ * <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
+ * <p>Combo: 4 -> comboState = GiftSendType.Active</p>
+ * <p>Combo: 8 -> comboState = GiftSendType.Active</p>
+ * <p>Combo: 12 -> comboState = GiftSendType.Finsihed</p>
+ * <p>
+ * Remember if comboState is Finsihed both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
+ */
 @EventMeta(eventType = EventType.Message)
 @Getter
 public class TikTokGiftComboEvent extends TikTokGiftEvent {
-    private final GiftComboStateType comboState;
+    private final GiftSendType comboState;
 
-    public TikTokGiftComboEvent(Gift gift, User host, WebcastGiftMessage msg, GiftComboStateType comboState) {
+    public TikTokGiftComboEvent(Gift gift, User host, WebcastGiftMessage msg, GiftSendType comboState) {
         super(gift, host, msg);
         this.comboState = comboState;
     }
-
-    public static TikTokGiftComboEvent of(Gift gift, int combo, GiftComboStateType comboState) {
-        return new TikTokGiftComboEvent(
-            gift,
-            new User(0L, "Test", new Picture("")),
-            WebcastGiftMessage.newBuilder().setComboCount(combo).build(),
-            comboState);
-    }
 }

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

@@ -22,14 +22,25 @@
  */
 package io.github.jwdeveloper.tiktok.data.events.gift;
 
-import io.github.jwdeveloper.tiktok.annotations.*;
+
+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.*;
+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
+ */
 @EventMeta(eventType = EventType.Message)
 @Getter
 public class TikTokGiftEvent extends TikTokHeaderEvent {
@@ -49,20 +60,4 @@ public class TikTokGiftEvent extends TikTokHeaderEvent {
         }
         combo = msg.getComboCount();
     }
-
-    public TikTokGiftEvent(Gift gift) {
-        this.gift = gift;
-        user = new User(0L, "sender", new Picture(""));
-        toUser = new User(0L, "receiver", new Picture(""));
-        combo = 1;
-    }
-
-
-    public static TikTokGiftEvent of(Gift gift) {
-        return new TikTokGiftEvent(gift);
-    }
-
-    public static TikTokGiftEvent of(String name, int id, int diamonds) {
-        return TikTokGiftEvent.of(new Gift(id, name, diamonds, ""));
-    }
 }

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

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

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

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkAcceptNoticeEvent extends TikTokLinkEvent {
-
-    private final long fromUserId, fromRoomId, toUserId;
-
-    public TikTokLinkAcceptNoticeEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasAcceptNoticeContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Accept Notice Content!");
-
-        var content = msg.getAcceptNoticeContent();
-        this.fromUserId = content.getFromUserId();
-        this.fromRoomId = content.getFromRoomId();
-        this.toUserId = content.getToUserId();
-    }
-}

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

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkCancelEvent extends TikTokLinkEvent {
-
-    private final long fromUserId, toUserId, cancelType, actionId;
-
-    public TikTokLinkCancelEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasCancelContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Cancel Content!");
-
-        var content = msg.getCancelContent();
-        this.fromUserId = content.getFromUserId();
-        this.toUserId = content.getToUserId();
-        this.cancelType = content.getCancelType();
-        this.actionId = content.getActionId();
-    }
-}

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

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

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

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

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

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkCreateEvent extends TikTokLinkEvent {
-
-    private final long hostId, roomId, linkType;
-    public TikTokLinkCreateEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasCreateContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Create Content!");
-
-        var content = msg.getCreateContent();
-        this.hostId = content.getOwnerId();
-        this.roomId = content.getOwnerRoomId();
-        this.linkType = content.getLinkType();
-    }
-}

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

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.data.models.users.ListUser;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-import java.util.List;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkEnterEvent extends TikTokLinkEvent {
-
-    private final List<ListUser> listUsers;
-    private final int anchorMultiLiveEnum;
-
-    public TikTokLinkEnterEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasEnterContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Enter Content!");
-
-        var content = msg.getEnterContent();
-        this.listUsers = content.getLinkedUsersListList().stream().map(ListUser::map).toList();
-        this.anchorMultiLiveEnum = content.getAnchorMultiLiveEnum();
-    }
-}

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

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

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

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkKickOutEvent extends TikTokLinkEvent {
-
-    private final long fromUserId;
-    private final KickOutReason kickOutReason;
-
-    public TikTokLinkKickOutEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasKickOutContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Kick Out Content!");
-
-        var content = msg.getKickOutContent();
-        this.fromUserId = content.getFromUserId();
-        this.kickOutReason = KickOutReason.values()[content.getKickoutReasonValue()];
-    }
-
-    public enum KickOutReason {
-        KICKOUT_REASON_UNKNOWN,
-        KICKOUT_REASON_FIRST_FRAME_TIMEOUT,
-        KICKOUT_REASON_BY_HOST,
-        KICKOUT_REASON_RTC_LOST_CONNECTION,
-        KICKOUT_REASON_BY_PUNISH,
-        KICKOUT_REASON_BY_ADMIN,
-        KICKOUT_REASON_HOST_REMOVE_ALL_GUESTS
-    }
-}

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkLeaveEvent extends TikTokLinkEvent {
-
-    private final long userId, sendLeaveUid, leaveReason;
-    private final String linkmicIdStr;
-
-    public TikTokLinkLeaveEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasLeaveContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Leave Content!");
-
-        var content = msg.getLeaveContent();
-        this.userId = content.getUserId();
-        this.linkmicIdStr = content.getLinkmicIdStr();
-        this.sendLeaveUid = content.getSendLeaveUid();
-        this.leaveReason = content.getLeaveReason();
-    }
-}

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

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

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

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.data.models.users.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-import java.util.List;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkListChangeEvent extends TikTokLinkEvent {
-
-    private final List<ListUser> linkedUsers, appliedUsers, connectingUsers;
-
-    public TikTokLinkListChangeEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasListChangeContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with List Change Content!");
-
-        var content = msg.getListChangeContent();
-        this.linkedUsers = content.getLinkedUsersList().stream().map(ListUser::map).toList();
-        this.appliedUsers = content.getAppliedUsersList().stream().map(ListUser::map).toList();
-        this.connectingUsers = content.getConnectingUsersList().stream().map(ListUser::map).toList();
-    }
-}

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkMediaChangeEvent extends TikTokLinkEvent {
-
-    private final long op, toUserId, anchorId, roomId, changeScene;
-
-    public TikTokLinkMediaChangeEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasMediaChangeContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Media Change Content!");
-
-        var content = msg.getMediaChangeContent();
-        this.op = content.getOp();
-        this.toUserId = content.getToUserId();
-        this.anchorId = content.getAnchorId();
-        this.roomId = content.getRoomId();
-        this.changeScene = content.getChangeScene();
-    }
-}

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

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

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

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkMuteEvent extends TikTokLinkEvent {
-
-    private final long userId, status;
-
-    public TikTokLinkMuteEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasMuteContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Mute Content!");
-
-        var content = msg.getMuteContent();
-        this.userId = content.getUserId();
-        this.status = content.getStatus();
-    }
-}

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

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkRandomMatchEvent extends TikTokLinkEvent {
-
-    private final User user;
-    private final long roomId, inviteType, innerChannelId;
-    private final String matchId;
-
-    public TikTokLinkRandomMatchEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasRandomMatchContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Random Match Content!");
-
-        var content = msg.getRandomMatchContent();
-        this.user = User.map(content.getUser());
-        this.roomId = content.getRoomId();
-        this.inviteType = content.getInviteType();
-        this.matchId = content.getMatchId();
-        this.innerChannelId = content.getInnerChannelId();
-    }
-}

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkReplyEvent extends TikTokLinkEvent {
-
-    private final long roomId;
-    private final User fromUser, toUser;
-
-    public TikTokLinkReplyEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasReplyContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Reply Content!");
-
-        var content = msg.getReplyContent();
-        this.roomId = content.getFromRoomId();
-        this.fromUser = User.map(content.getFromUser());
-        this.toUser = User.map(content.getToUser());
-    }
-}

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

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkSysKickOutEvent extends TikTokLinkEvent {
-
-    private final long userId;
-    private final String linkmicIdStr;
-
-    public TikTokLinkSysKickOutEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasSysKickOutContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with Sys Kick Out Content!");
-
-        var content = msg.getSysKickOutContent();
-        this.userId = content.getUserId();
-        this.linkmicIdStr = content.getLinkmicIdStr();
-    }
-}

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

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

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

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

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

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.events.link;
-
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.data.models.Text;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
-
-@Getter
-@EventMeta(eventType = EventType.Message)
-public class TikTokLinkUserToastEvent extends TikTokLinkEvent {
-
-    private final long userId, roomId;
-    private final Text displayText;
-
-    public TikTokLinkUserToastEvent(WebcastLinkMessage msg) {
-        super(msg);
-        if (!msg.hasUserToastContent())
-            throw new IllegalArgumentException("Expected WebcastLinkMessage with User Toast Content!");
-
-        var content = msg.getUserToastContent();
-        this.userId = content.getUserId();
-        this.roomId = content.getRoomId();
-        this.displayText = Text.map(content.getDisplayText());
-    }
-}

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

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

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

@@ -30,7 +30,9 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 
-
+/*
+Triggered when LiveRoomInfo got updated such as likes, viewers, ranking ....
+ */
 @Getter
 @AllArgsConstructor
 @EventMeta(eventType = EventType.Message)

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

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

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

@@ -29,7 +29,9 @@ import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Value;
 
-
+/**
+ * Triggers when a user follows the streamer. Based on social event.
+ */
 @Value
 @EventMeta(eventType = EventType.Message)
 public class TikTokFollowEvent extends TikTokHeaderEvent
@@ -43,12 +45,4 @@ public class TikTokFollowEvent extends TikTokHeaderEvent
     totalFollowers = msg.getFollowCount();
   }
 
-    public static TikTokFollowEvent of(String userName)
-    {
-        return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
-            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                .setNickname(userName)
-                .build())
-            .build());
-    }
 }

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

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

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

@@ -31,7 +31,9 @@ import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
 
 
-
+/**
+ * Triggered when a viewer sends likes to the streamer. For streams with many viewers, this event is not always triggered by TikTok.
+ */
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokLikeEvent extends TikTokHeaderEvent
@@ -55,15 +57,4 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
         likes = msg.getCount();
         totalLikes = msg.getTotal();
     }
-
-    public static TikTokLikeEvent of(String userName, int likes)
-    {
-        return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
-                .setCount(likes)
-                .setTotal(likes)
-                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setNickname(userName)
-                        .build())
-                .build());
-    }
 }

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

@@ -29,7 +29,9 @@ import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
 
-
+/**
+ * Triggers when a user shares the stream. Based on social event.
+ */
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokShareEvent extends TikTokHeaderEvent {
@@ -47,4 +49,5 @@ public class TikTokShareEvent extends TikTokHeaderEvent {
     user = User.map(msg.getUser());
     totalShares = 1;
   }
+
 }

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

@@ -35,7 +35,10 @@ import lombok.Value;
 import java.time.Duration;
 
 
-
+/**
+ * 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)

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

@@ -29,7 +29,9 @@ import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import lombok.Getter;
 
 
-
+/**
+ * Triggered every time a protobuf encoded webcast message arrives. You can deserialize the binary object depending on the use case.
+ */
 @Getter
 @EventMeta(eventType = EventType.Debug)
 public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>

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

@@ -20,11 +20,18 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.exceptions;
+package io.github.jwdeveloper.tiktok.data.models;
 
-public class TikTokLiveUnknownHostException extends TikTokLiveException
+import lombok.Value;
+
+@Value
+public class EnumValue
 {
-    public TikTokLiveUnknownHostException(String message) {
+    public int value;
-        super(message);
+    public String name;
+
+    public static EnumValue Map(Enum<?> _enum)
+    {
+        return new EnumValue(_enum.ordinal() ,_enum.name());
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/LinkMicBattleTeam.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.data.events.link;
+package io.github.jwdeveloper.tiktok.data.models;
 
-import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import lombok.Getter;
 
-@Getter
+import io.github.jwdeveloper.tiktok.data.models.users.User;
-@EventMeta(eventType = EventType.Message)
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-public class TikTokLinkApplyEvent extends TikTokLinkEvent {
+import lombok.Value;
 
-    public TikTokLinkApplyEvent(WebcastLinkMessage msg) {
+import java.util.List;
-        super(msg);
+
+@Value
+public class LinkMicBattleTeam {
+    Long teamId;
+    List<User> users;
+
+    public LinkMicBattleTeam(WebcastLinkMicBattle.LinkMicBattleTeam team) {
+        this.teamId = team.getId();
+        this.users = team.getUsersList().stream().map(User::new).toList();
     }
 }

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

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

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

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.models.battles;
-
-public abstract class Team {
-    /**
-     * Provides a check for verifying if this team represents a 1v1 Team.
-     * @return true if this team is of type {@link Team1v1}, false otherwise.
-     */
-    public boolean is1v1Team() {
-        return this instanceof Team1v1;
-    }
-
-    /**
-     * Provides a check for verifying if this team represents a 1v1 Team.
-     * @return true if this team is of type {@link Team1v1}, false otherwise.
-     */
-    public boolean is2v2Team() {
-        return this instanceof Team2v2;
-    }
-
-    /**
-     * Convenience method to get this team as a {@link Team1v1}. If this team is of some
-     * other type, an {@link IllegalStateException} will result. Hence it is best to use this method
-     * after ensuring that this element is of the desired type by calling {@link #is1v1Team()} first.
-     *
-     * @return this team as a {@link Team1v1}.
-     * @throws IllegalStateException if this team is of another type.
-     */
-    public Team1v1 getAs1v1Team() {
-        if (is1v1Team())
-            return (Team1v1) this;
-        throw new IllegalStateException("Not a 1v1Team: " + this);
-    }
-
-    /**
-     * Convenience method to get this team as a {@link Team2v2}. If this team is of some
-     * other type, an {@link IllegalStateException} will result. Hence it is best to use this method
-     * after ensuring that this element is of the desired type by calling {@link #is2v2Team()} first.
-     *
-     * @return this team as a {@link Team2v2}.
-     * @throws IllegalStateException if this team is of another type.
-     */
-    public Team2v2 getAs2v2Team() {
-        if (is2v2Team())
-            return (Team2v2) this;
-        throw new IllegalStateException("Not a 2v2Team: " + this);
-    }
-}

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

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.models.battles;
-
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.Getter;
-
-import java.util.*;
-
-@Getter
-public class Team1v1 extends Team
-{
-    /** Value >= 0 when finished otherwise -1 */
-    private final int totalPoints;
-    private final int winStreak;
-    private final User host;
-    private final List<Viewer> viewers;
-
-    public Team1v1(WebcastLinkMicBattle.LinkMicBattleHost hostTeam, WebcastLinkMicBattle msg) {
-        long hostId = hostTeam.getId();
-        this.winStreak = msg.getTeamDataList().stream().filter(data -> data.getTeamId() == hostId).map(data -> data.getData().getWinStreak()).findFirst().orElse(-1);
-        this.totalPoints = msg.getDetailsList().stream().filter(dets -> dets.getId() == hostId).map(dets -> dets.getSummary().getPoints()).findFirst().orElse(-1);
-        this.host = new User(hostTeam.getHostGroup(0).getHost(0));
-        this.viewers = msg.getViewerTeamList().stream().filter(team -> team.getId() == hostId).findFirst().map(topViewers ->
-            topViewers.getViewerGroup(0).getViewerList().stream().map(Viewer::new).toList()).orElseGet(ArrayList::new);
-    }
-}

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

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.models.battles;
-
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.Getter;
-
-import java.util.*;
-
-@Getter
-public class Team2v2 extends Team {
-    /** Value >= 0 when finished otherwise -1 */
-    private final int totalPoints;
-
-    private final List<User> hosts;
-    private final List<Viewer> viewers;
-
-    public Team2v2(WebcastLinkMicBattle.LinkMicBattleHost hostTeam1, WebcastLinkMicBattle.LinkMicBattleHost hostTeam2, WebcastLinkMicBattle msg) {
-        this.totalPoints = -1;
-        this.hosts = List.of(new User(hostTeam1.getHostGroup(0).getHost(0)), new User(hostTeam2.getHostGroup(0).getHost(0)));
-        this.viewers = new ArrayList<>();
-    }
-
-    public Team2v2(WebcastLinkMicBattle.Host2v2Data hd, WebcastLinkMicBattle msg) {
-        this.totalPoints = hd.getTotalPoints();
-        var host = new User(msg.getHostTeamList().stream().filter(data -> data.getId() == hd.getHostdata(0).getHostId()).findFirst().orElseThrow().getHostGroup(0).getHost(0));
-        var cohost = new User(msg.getHostTeamList().stream().filter(data -> data.getId() == hd.getHostdata(1).getHostId()).findFirst().orElseThrow().getHostGroup(0).getHost(0));
-        this.hosts = List.of(host, cohost);
-        this.viewers = msg.getViewerTeamList().stream().filter(team -> team.getId() == host.getId() || team.getId() == cohost.getId()).findFirst().map(topViewers ->
-            topViewers.getViewerGroup(0).getViewerList().stream().map(Viewer::new).toList()).orElseGet(ArrayList::new);
-    }
-}

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

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

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

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package io.github.jwdeveloper.tiktok.data.models.users;
-
-import lombok.Getter;
-
-@Getter
-public class ListUser
-{
-    private final User user;
-    private final LinkType linkType;
-    private final long linkMicId, linkStatus, modifyTime, linkerId;
-    private final int userPosition, silenceStatus, roleType;
-
-    public ListUser(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) {
-        this.user = User.map(listUser.getUser());
-        this.linkMicId = listUser.getLinkmicId();
-        this.linkStatus = listUser.getLinkStatus();
-        this.linkType = LinkType.values()[listUser.getLinkTypeValue()];
-        this.userPosition = listUser.getUserPosition();
-        this.silenceStatus = listUser.getSilenceStatus();
-        this.modifyTime = listUser.getModifyTime();
-        this.linkerId = listUser.getLinkerId();
-        this.roleType = listUser.getRoleType();
-    }
-
-    public static ListUser map(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) {
-        return new ListUser(listUser);
-    }
-
-    public enum LinkType {
-        UNKNOWN,
-        AUDIO,
-        VIDEO
-    }
-}

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

@@ -22,12 +22,16 @@
  */
 package io.github.jwdeveloper.tiktok.data.models.users;
 
-import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.data.models.badges.Badge;
-import io.github.jwdeveloper.tiktok.messages.webcast.*;
+import io.github.jwdeveloper.tiktok.data.models.Picture;
-import lombok.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage;
+import lombok.AccessLevel;
+import lombok.Getter;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Getter
 public class User {
@@ -45,12 +49,12 @@ public class User {
         return attributes.stream().toList();
     }
 
-    public boolean hasAttribute(UserAttribute attribute) {
+    public boolean hasAttribute(UserAttribute userFlag) {
-        return attributes.contains(attribute);
+        return attributes.contains(userFlag);
     }
 
-    public void addAttribute(UserAttribute... attributes) {
+    public void addAttribute(UserAttribute... flags) {
-        this.attributes.addAll(List.of(attributes));
+        this.attributes.addAll(Arrays.stream(flags).toList());
     }
 
     public boolean isGiftGiver() {
@@ -132,14 +136,6 @@ public class User {
         this.picture = picture;
     }
 
-    public User(long id, String name, String profileId, Picture picture) {
-        this(id, name, profileId, picture, 0, 0, List.of(Badge.empty()));
-    }
-
-    public User(WebcastLinkMicBattle.LinkMicBattleHost.HostGroup.Host host) {
-        this(host.getId(), host.getName(), host.getProfileId(), Picture.map(host.getImages(0)));
-    }
-
     public User(io.github.jwdeveloper.tiktok.messages.data.User user) {
         this(user.getId(), user.getDisplayId(), Picture.map(user.getAvatarThumb()));
         profileName = user.getNickname();
@@ -163,9 +159,10 @@ public class User {
         }
     }
 
+
     public static User EMPTY = new User(0L,
             "",
-        Picture.empty(),
+            Picture.Empty(),
             0,
             0,
             List.of(Badge.empty()));
@@ -212,18 +209,4 @@ public class User {
                 0,
                 List.of(Badge.empty()));
     }
-
-    @Override
-    public String toString() {
-        return "User{" +
-            "id=" + id +
-            ", name='" + name + "'" +
-            ", profileName='" + profileName + "'" +
-            ", picture=" + picture +
-            ", following=" + following +
-            ", followers=" + followers +
-            ", badges=" + badges +
-            ", attributes=" + attributes +
-			"}";
-    }
 }

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

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

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

@@ -35,7 +35,6 @@ public class LiveData {
     }
 
     @Data
-    @AllArgsConstructor
     public static class Response {
         private String json;
         private LiveStatus liveStatus;
@@ -45,12 +44,6 @@ public class LiveData {
         private int totalViewers;
         private boolean ageRestricted;
         private User host;
-        private LiveType liveType;
-        public Response() {
-
-        }
-
-
     }
 
     public enum LiveStatus {
@@ -58,11 +51,4 @@ public class LiveData {
         HostOnline,
         HostOffline,
     }
-
-    public enum LiveType {
-        SOLO,
-        BOX,
-        BATTLE,
-        CO_HOST
-    }
 }

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

@@ -22,36 +22,31 @@
  */
 package io.github.jwdeveloper.tiktok.data.requests;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 public class LiveUserData {
 
     @Getter
+    @AllArgsConstructor
     public static class Request {
-        private final String userName;
+        private String userName;
-
-        public Request(String userName) {
-            if (userName == null || userName.isBlank())
-                throw new IllegalArgumentException("Invalid empty username!");
-            this.userName = userName;
-        }
     }
 
     @Getter
     @AllArgsConstructor
     public static class Response {
-        private final String json;
-        private final UserStatus userStatus;
-        private final String roomId;
-        private final long startTime;
 
-        public boolean isLiveOnline() {
+        private String json;
-            return userStatus == LiveUserData.UserStatus.Live || userStatus == LiveUserData.UserStatus.LivePaused;
-        }
 
-        public boolean isHostNameValid() {
+        private UserStatus userStatus;
-            return userStatus != LiveUserData.UserStatus.NotFound;
+
-        }
+        private String roomId;
+
+
+        private long startedAtTimeStamp;
     }
 
     public enum UserStatus {
@@ -61,3 +56,5 @@ public class LiveUserData {
         Live,
     }
 }
+
+

API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/SignServerResponse.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.data.requests;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SignServerResponse
+{
+    private String signedUrl;
+
+    private String userAgent;
+}

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

@@ -34,24 +34,29 @@ import java.util.TreeMap;
 import java.util.function.Consumer;
 
 
-@Getter
 public class HttpClientSettings {
 
-    private final Map<String, Object> params;
+    @Getter
+    final Map<String, Object> params;
 
-    private final Map<String, String> headers;
+    @Getter
+    final Map<String, String> headers;
 
-    private final Map<String, String> cookies;
+    @Getter
+    final Map<String, String> cookies;
+
+    @Getter
+    ProxyClientSettings proxyClientSettings;
+
+    @Getter
+    Consumer<HttpClient.Builder> onClientCreating;
+
+    @Getter
+    Consumer<HttpRequest.Builder> onRequestCreating;
 
     @Setter
-    private ProxyClientSettings proxyClientSettings;
+    @Getter
-
+    Duration timeout;
-    private Consumer<HttpClient.Builder> onClientCreating;
-
-    private Consumer<HttpRequest.Builder> onRequestCreating;
-
-    @Setter
-    private Duration timeout;
 
     public HttpClientSettings() {
         this.params = new TreeMap<>();
@@ -59,15 +64,17 @@ public class HttpClientSettings {
         this.cookies = new HashMap<>();
         this.timeout = Duration.ofSeconds(2);
         this.proxyClientSettings = new ProxyClientSettings();
-        this.onClientCreating = (x) -> {};
+        this.onClientCreating = (x) -> {
-        this.onRequestCreating = (x) -> {};
+        };
+        this.onRequestCreating = (x) -> {
+        };
     }
 
     /**
      * @param consumer Use to configure proxy settings for http client
      */
     public void configureProxy(Consumer<ProxyClientSettings> consumer) {
-        proxyClientSettings.setEnabled(true);
+        proxyClientSettings.setUseProxy(true);
         consumer.accept(proxyClientSettings);
     }
 
@@ -97,7 +104,7 @@ public class HttpClientSettings {
         newSettings.getHeaders().putAll(new TreeMap<>(this.headers));
         newSettings.getCookies().putAll(new TreeMap<>(this.cookies));
         newSettings.getParams().putAll(new TreeMap<>(this.params));
-        newSettings.setProxyClientSettings(this.proxyClientSettings);
+        newSettings.proxyClientSettings = this.proxyClientSettings.clone();
 
         return newSettings;
     }

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

@@ -33,21 +33,10 @@ import java.util.logging.Level;
 @Data
 public class LiveClientSettings {
 
-    /**
-     *  Sets client to offline mode, prohibits connection to TikTok servers
-     *  @apiNote Useful when testing client with custom events
-     */
-    private boolean offline;
-
-    /**
-     * Fetch and download gifts data before TikTokLive starts
-     * @apiNote If `false`, client.giftManager() does not contain initial gifts
-     */
-    private boolean fetchGifts = true;
-
     /**
      * ISO-Language for Client
      */
+
     private String clientLanguage;
 
     /**
@@ -55,6 +44,7 @@ public class LiveClientSettings {
      */
     private boolean retryOnConnectionFailure;
 
+
     /**
      * Before retrying connect, wait for select amount of time
      */
@@ -63,49 +53,44 @@ public class LiveClientSettings {
     /**
      * Whether to print Logs to Console
      */
-    private boolean printToConsole = true;
 
+    private boolean printToConsole = true;
     /**
      * LoggingLevel for Logs
      */
     private Level logLevel;
 
+
     /**
      * Optional: Use it if you need to change TikTok live hostname in builder
      */
     private String hostName;
 
+
     /**
      * Parameters used in requests to TikTok api
      */
     private HttpClientSettings httpSettings;
 
-    /**
-     * Interval of time in milliseconds between pings to TikTok
-     * @apiNote Min: 250 (0.25 seconds), Default: 5000 (5 seconds)
-     */
-    private long pingInterval = 5000;
 
-    /** Throw an exception on 18+ Age Restriction */
+    /*
-    private boolean throwOnAgeRestriction;
-
-    /**
      *  Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId
-	 * @see <a href="https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages">Documentation: How to obtain sessionId</a>
+     *  documentation how to obtain sessionId https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages
      */
     private String sessionId;
 
-    /**
+    /*
      * Optional: By default roomID is fetched before connect to live, but you can set it manually
+     *
      */
     private String roomId;
 
-    /**
-     * Optional: API Key for increased limit to signing server
-     */
-    private String apiKey;
 
-    public static LiveClientSettings createDefault() {
+
+
+
+    public static LiveClientSettings createDefault()
+    {
         var httpSettings = new HttpClientSettings();
         httpSettings.getParams().putAll(DefaultClientParams());
         httpSettings.getHeaders().putAll(DefaultRequestHeaders());
@@ -118,10 +103,12 @@ public class LiveClientSettings {
         clientSettings.setPrintToConsole(false);
         clientSettings.setLogLevel(Level.ALL);
 
+
         clientSettings.setHttpSettings(httpSettings);
         return clientSettings;
     }
 
+
     /**
      * Default Parameters for HTTP-Request
      */
@@ -160,9 +147,11 @@ public class LiveClientSettings {
         clientParams.put("webcast_sdk_version", "1.3.0");
         clientParams.put("update_version_code", "1.3.0");
 
+
         return clientParams;
     }
 
+
     /**
      * Default Headers for HTTP-Request
      */
@@ -178,4 +167,6 @@ public class LiveClientSettings {
         headers.put("Accept-Language", "en-US,en; q=0.9");
         return headers;
     }
+
 }
+

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

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

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

@@ -23,7 +23,7 @@
 package io.github.jwdeveloper.tiktok.exceptions;
 
 
-/**
+/*
  * Happens while bad response from Http request to TikTok
  */
 public class TikTokLiveRequestException extends TikTokLiveException

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

@@ -0,0 +1,34 @@
+/*
+ * 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.handler;
+
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+
+import java.util.List;
+
+
+public interface TikTokMessageHandler
+{
+    List<TikTokEvent> handle(byte[] messagePayload) throws Exception;
+}

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

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

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

@@ -33,7 +33,6 @@ import java.util.List;
 public interface ListenersManager
 {
     List<TikTokEventListener> getListeners();
-
     void addListener(TikTokEventListener listener);
 
     void removeListener(TikTokEventListener listener);

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

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

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

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

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

@@ -20,20 +20,44 @@
  * 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.battles;
+package io.github.jwdeveloper.tiktok.live;
 
+import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
 import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.Getter;
 
-@Getter
+import java.util.List;
-public class Viewer {
-    private final User user;
-    private final int points;
 
-    public Viewer(WebcastLinkMicBattle.LinkMicBattleTopViewers.TopViewerGroup.TopViewer topViewer) {
+public interface GiftManager {
-        this.user = new User(topViewer.getId(), null, topViewer.getProfileId(), Picture.map(topViewer.getImages(0)));
+
-        this.points = topViewer.getPoints();
+    /**
-    }
+     * In case you can't find your gift in Gift enum. You can register gift
+     * manually here to make it detected while TikTokGiftEvent
+     *
+     * @param id gift's id
+     * @param name gift's name
+     * @param diamondCost diamond cost
+     * @return
+     */
+    Gift registerGift(int id, String name, int diamondCost, Picture picture);
+
+
+    /**
+     *
+     * @param giftId
+     * @return
+     */
+    Gift findById(int giftId);
+
+    /**
+     *
+     * @param giftName
+     * @return
+     */
+    Gift findByName(String giftName);
+
+    /**
+     *
+     * @return all gifts
+     */
+    List<Gift> getGifts();
 }

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

@@ -1,86 +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.live;
-
-import com.google.gson.JsonObject;
-import io.github.jwdeveloper.tiktok.data.models.Picture;
-import io.github.jwdeveloper.tiktok.data.models.gifts.*;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-
-public interface GiftsManager {
-
-    /**
-     * You can create and attach your own custom gift to manager
-     *
-     * @param gift
-     */
-    void attachGift(Gift gift);
-
-    /**
-     * You can create and attach your own custom gift to manager
-     *
-     * @param gifts
-     */
-    void attachGiftsList(List<Gift> gifts);
-
-    /**
-     * finds gift by name
-     * When gift not found return Gift.UNDEFINED;
-     *
-     * @param name gift name
-     */
-    Gift getByName(String name);
-
-    /**
-     * finds gift by id
-     * When gift not found return Gift.UNDEFINED;
-     *
-     * @param giftId giftId
-     */
-    Gift getById(int giftId);
-
-
-    /**
-     * finds gift by filter
-     * When gift not found return Gift.UNDEFINED;
-     */
-    Gift getByFilter(Predicate<Gift> filter);
-
-    List<Gift> getManyByFilter(Predicate<Gift> filter);
-
-    /**
-     * @return list of all gifts
-     */
-    List<Gift> toList();
-
-
-    /**
-     * @return list of all map of all gifts where Integer is gift Id
-     */
-    Map<Integer, Gift> toMap();
-}

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

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

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

@@ -1,19 +0,0 @@
-package io.github.jwdeveloper.tiktok.live;
-
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.live.builder.EventConsumer;
-
-import java.util.HashSet;
-import java.util.Optional;
-
-public interface LiveEventsHandler {
-    void publish(LiveClient tikTokLiveClient, TikTokEvent tikTokEvent);
-
-    <T extends TikTokEvent> void subscribe(Class<?> clazz, EventConsumer<T> event);
-
-    <T extends TikTokEvent> void unsubscribeAll(Class<?> clazz);
-
-    <T extends TikTokEvent> void unsubscribe(EventConsumer<T> consumer);
-
-    <T extends TikTokEvent> void unsubscribe(Class<?> clazz, EventConsumer<T> consumer);
-}

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

@@ -1,18 +0,0 @@
-package io.github.jwdeveloper.tiktok.live;
-
-import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData;
-import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
-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.messages.webcast.WebcastResponse;
-import io.github.jwdeveloper.tiktok.utils.Stopwatch;
-
-import java.time.Duration;
-
-public interface LiveMessagesHandler {
-    void handle(LiveClient client, WebcastResponse webcastResponse);
-
-    void handleSingleMessage(LiveClient client, WebcastResponse.Message message);
-}

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

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

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

@@ -25,13 +25,7 @@ package io.github.jwdeveloper.tiktok.live.builder;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 
-@FunctionalInterface
 public interface EventConsumer<T extends TikTokEvent>
 {
-     /**
-      *
-      * @param liveClient TikTok live client
-      * @param event event data object
-      */
      void onEvent(LiveClient liveClient, T event);
 }

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

@@ -22,9 +22,8 @@
  */
 package io.github.jwdeveloper.tiktok.live.builder;
 
-import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
+import io.github.jwdeveloper.tiktok.data.events.*;
 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;
@@ -36,7 +35,6 @@ import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent;
-import io.github.jwdeveloper.tiktok.data.models.gifts.GiftComboStateType;
 
 
 public interface EventsBuilder<T> {
@@ -53,257 +51,124 @@ public interface EventsBuilder<T> {
     /**
      * Invoked whenever any event is triggered
      *
-     * @param action consumable action
+     * @param action
-     * @return self instance
+     * @return
      */
-    default T onEvent(EventConsumer<TikTokEvent> action) {
+    T onEvent(EventConsumer<TikTokEvent> action);
-        return onEvent(TikTokEvent.class, action);
-    }
 
     /**
      * Invoked when information about room (live) got updated such as viewer count, etc..
      *
-     * @param action consumable action
+     * @param action
-     * @return self instance
+     * @return
      */
-    default T onRoomInfo(EventConsumer<TikTokRoomInfoEvent> action) {
+    T onRoomInfo(EventConsumer<TikTokRoomInfoEvent> action);
-        return onEvent(TikTokRoomInfoEvent.class, action);
-    }
 
     /**
      * Invoked when someone send message to chat
      *
-     * @param action consumable action
+     * @param action
-     * @return self instance
+     * @return
      */
-    default T onComment(EventConsumer<TikTokCommentEvent> action) {
+    T onComment(EventConsumer<TikTokCommentEvent> action);
-        return onEvent(TikTokCommentEvent.class, action);
+
-    }
 
     /**
      * Invoked when TikTokLiveJava makes http request and getting response
      *
-     * @param action consumable action
+     * @param action
-     * @return self instance
+     * @return
      */
-    default T onHttpResponse(EventConsumer<TikTokHttpResponseEvent> action) {
+    T onHttpResponse(EventConsumer<TikTokHttpResponseEvent> action);
-        return onEvent(TikTokHttpResponseEvent.class, action);
-    }
 
     /**
      * Invoked when TikTok protocolBuffer data "message" was successfully mapped to event
      * events contains protocol-buffer "Message"  and  TikTokLiveJava "Event"
      *
-     * @param action consumable action
+     * @param action
-     * @return self instance
+     * @return
      */
-    default T onWebsocketMessage(EventConsumer<TikTokWebsocketMessageEvent> action) {
+    T onWebsocketMessage(EventConsumer<TikTokWebsocketMessageEvent> action);
-        return onEvent(TikTokWebsocketMessageEvent.class, action);
-    }
 
     /**
-     * Triggered every time a protobuf encoded webcast message arrives. You can deserialize the binary object depending on the use case.
+     * Invoked when there was not found event mapper for TikTok protocolBuffer data "message"
      *
-     * @param action consumable action
+     * @param action
-     * @return self instance
+     * @return
      */
-    default T onWebsocketUnhandledMessage(EventConsumer<TikTokWebsocketUnhandledMessageEvent> action) {
+    T onWebsocketUnhandledMessage(EventConsumer<TikTokWebsocketUnhandledMessageEvent> action);
-        return onEvent(TikTokWebsocketUnhandledMessageEvent.class, action);
-    }
 
     /**
      * Invoked every time TikTok sends protocolBuffer data to websocket
      * Response contains list of messages that are later mapped to events
-     *
+     * @param action
-     * @param action consumable action
+     * @return
-     * @return self instance
      */
-    default T onWebsocketResponse(EventConsumer<TikTokWebsocketResponseEvent> action) {
+    T onWebsocketResponse(EventConsumer<TikTokWebsocketResponseEvent> action);
-        return onEvent(TikTokWebsocketResponseEvent.class, action);
+
-    }
 
     /**
-     * Triggers for these different reasons:
+     * Invoked for gifts that has no combo, or when combo finishes
-     * <ol>
+     * @param action
-     *     <li>User sends gifts that have no combo (most of expensive gifts)</li>
+     * @return
-     *     <li>{@link TikTokGiftComboEvent} has combaState = {@link GiftComboStateType#Finished}</li>
-     * </ol>
-     * @param action consumable action
-     * @return self instance
      */
-    default T onGift(EventConsumer<TikTokGiftEvent> action) {
+    T onGift(EventConsumer<TikTokGiftEvent> action);
-        return onEvent(TikTokGiftEvent.class, action);
-    }
 
     /**
-     * Triggered every time a gift is sent
+     * Invoked for gifts that has combo options such as roses
-     * <p>Example when user sends gift with combo</p>
+     * @param action
-     * <ul>
+     * @return
-     *     <li>Combo: 1  -> comboState = {@link GiftComboStateType#Begin}</li>
-     *     <li>Combo: 4 -> comboState = {@link GiftComboStateType#Active}</li>
-     *     <li>Combo: 8 -> comboState = {@link GiftComboStateType#Active}</li>
-     *     <li>Combo: 12 -> comboState = {@link GiftComboStateType#Finished}</li>
-     * </ul>
-     * Both {@link TikTokGiftComboEvent} and {@link TikTokGiftEvent} events are triggered when comboState is Finished
-     *
-     * @apiNote {@link GiftComboStateType} has 3 states: {@link GiftComboStateType#Begin Begin}, {@link GiftComboStateType#Active Active}, & {@link GiftComboStateType#Finished Finished}
-     * @param action consumable action
-     * @return self instance
      */
-    default T onGiftCombo(EventConsumer<TikTokGiftComboEvent> action) {
+    T onGiftCombo(EventConsumer<TikTokGiftComboEvent> action);
-        return onEvent(TikTokGiftComboEvent.class, action);
-    }
 
-    /**
-     * Triggered every time someone asks a new question via the question feature.
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onQuestion(EventConsumer<TikTokQuestionEvent> action) {
-        return onEvent(TikTokQuestionEvent.class, action);
-    }
 
-    /**
+    T onQuestion(EventConsumer<TikTokQuestionEvent> action);
-     * Triggers when a user subscribe the streamer.
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onSubscribe(EventConsumer<TikTokSubscribeEvent> action) {
-        return onEvent(TikTokSubscribeEvent.class, action);
-    }
 
-    /**
+    T onSubscribe(EventConsumer<TikTokSubscribeEvent> action);
-     * Triggers when a user follows the streamer. Based on social event.
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onFollow(EventConsumer<TikTokFollowEvent> action) {
-        return onEvent(TikTokFollowEvent.class, action);
-    }
 
-    /**
+    T onFollow(EventConsumer<TikTokFollowEvent> action);
-     * Triggered when a viewer sends likes to the streamer. For streams with many viewers, this event is not always triggered by TikTok.
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onLike(EventConsumer<TikTokLikeEvent> action) {
-        return onEvent(TikTokLikeEvent.class, action);
-    }
 
-    /**
+    T onLike(EventConsumer<TikTokLikeEvent> action);
-     * Triggers when a user sends emote
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onEmote(EventConsumer<TikTokEmoteEvent> action) {
-        return onEvent(TikTokEmoteEvent.class, action);
-    }
 
-    /**
+    T onEmote(EventConsumer<TikTokEmoteEvent> action);
-     * Triggers when a user joins to the live
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onJoin(EventConsumer<TikTokJoinEvent> action) {
-        return onEvent(TikTokJoinEvent.class, action);
-    }
 
-    /**
+    T onJoin(EventConsumer<TikTokJoinEvent> action);
-     * Triggers when a user shares the stream.
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onShare(EventConsumer<TikTokShareEvent> action) {
-        return onEvent(TikTokShareEvent.class, action);
-    }
 
-    /**
+    T onShare(EventConsumer<TikTokShareEvent> action);
-     * Triggered when the live stream gets paused
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onLivePaused(EventConsumer<TikTokLivePausedEvent> action) {
-        return onEvent(TikTokLivePausedEvent.class, action);
-    }
 
-    /**
+    T onLivePaused(EventConsumer<TikTokLivePausedEvent> action);
-     * Triggered when the live stream gets unpaused
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onLiveUnpaused(EventConsumer<TikTokLiveUnpausedEvent> action) {
-        return onEvent(TikTokLiveUnpausedEvent.class, action);
-    }
 
-    /**
+    T onLiveUnpaused(EventConsumer<TikTokLiveUnpausedEvent> action);
-     * Triggered when the live stream gets terminated by the host. Will also trigger the TikTokDisconnectedEvent event.
+
-     *
+    T onLiveEnded(EventConsumer<TikTokLiveEndedEvent> action);
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onLiveEnded(EventConsumer<TikTokLiveEndedEvent> action) {
-        return onEvent(TikTokLiveEndedEvent.class, action);
-    }
 
     /**
      * Invoked when client has been successfully connected to live
-     *
+     * @param action
-     * @param action consumable action
+     * @return
-     * @return self instance
      */
-    default T onConnected(EventConsumer<TikTokConnectedEvent> action) {
+    T onConnected(EventConsumer<TikTokConnectedEvent> action);
-        return onEvent(TikTokConnectedEvent.class, action);
-    }
-
-    /**
-     * Invoked before client has been successfully connected to live
-     *
-     * @param action consumable action
-     * @return self instance
-     */
-    default T onPreConnection(EventConsumer<TikTokPreConnectionEvent> action) {
-        return onEvent(TikTokPreConnectionEvent.class, action);
-    }
 
     /**
      * Invoked when client tries to reconnect
-     *
+     * @param action
-     * @param action consumable action
+     * @return
-     * @return self instance
      */
-    default T onReconnecting(EventConsumer<TikTokReconnectingEvent> action) {
+    T onReconnecting(EventConsumer<TikTokReconnectingEvent> action);
-        return onEvent(TikTokReconnectingEvent.class, action);
-    }
 
     /**
-     * Triggered when the connection gets disconnected. In that case you can call connect() again to have a reconnect logic.
+     * Invoked when client disconnected
-     * Note that you should wait a little bit before attempting a reconnect to avoid being rate-limited.
+     * @param action
-     *
+     * @return
-     * @param action consumable action
-     * @return self instance
      */
-    default T onDisconnected(EventConsumer<TikTokDisconnectedEvent> action) {
+    T onDisconnected(EventConsumer<TikTokDisconnectedEvent> action);
-        return onEvent(TikTokDisconnectedEvent.class, action);
-    }
 
     /**
      * Invoked when exception was throed inside client or event handler
-     *
+     * @param action
-     * @param action consumable action
+     * @return
-     * @return self instance
      */
-    default T onError(EventConsumer<TikTokErrorEvent> action) {
+    T onError(EventConsumer<TikTokErrorEvent> action);
-        return onEvent(TikTokErrorEvent.class, action);
-    }
 
 
     // TODO Figure out how those events works
@@ -350,10 +215,6 @@ public interface EventsBuilder<T> {
     //T onLinkMicBattle(TikTokEventConsumer<TikTokLinkMicBattleEvent> event);
 
     //T onUnhandledControl(TikTokEventConsumer<TikTokUnhandledControlEvent> event);
-
-    /**
-     * To do figure out how to use Annotation processor.
-     * Goal is to generates methods for all possible events, everytime library is compiled
-     */
-
 }
+
+

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

@@ -22,11 +22,10 @@
  */
 package io.github.jwdeveloper.tiktok.live.builder;
 
-import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder;
 import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
 import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.mappers.LiveMapper;
+import io.github.jwdeveloper.tiktok.mappers.TikTokMapper;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
@@ -42,7 +41,7 @@ public interface LiveClientBuilder extends EventsBuilder<LiveClientBuilder> {
      * @param onCustomMappings lambda method
      * @return
      */
-    LiveClientBuilder onMapping(Consumer<LiveMapper> onCustomMappings);
+    LiveClientBuilder onMapping(Consumer<TikTokMapper> onCustomMappings);
 
 
     /**
@@ -61,26 +60,15 @@ public interface LiveClientBuilder extends EventsBuilder<LiveClientBuilder> {
      */
     LiveClientBuilder addListener(TikTokEventListener listener);
 
-
     /**
-     * Allows you to use own implementation of internal TikTokLive dependencies,
-     * when the default implementation does not meet your needs
      *
-     *
-     * @param onCustomizeDependencies access to dependency container
-     * @return
-     */
-    LiveClientBuilder customize(Consumer<DependanceContainerBuilder> onCustomizeDependencies);
-
-    /**
-     * Builds new instance of the LiveClient
      * @return LiveClient object
      */
     LiveClient build();
 
     /**
-     * Builds new instance of the LiveClient and connects to live
+     *
-     * @return LiveClient object
+     * @return LiveClient object and connects to TikTok live
      */
     LiveClient buildAndConnect();
 

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

@@ -27,23 +27,18 @@ 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 LiveMapper {
+public interface TikTokMapper {
 
     /**
-     * when mapper is not found for messageName, TikTokLiveException is thrown
+     * * if mapper is not found for messageName, TikTokLiveException is thrown
      *
      * @param messageName
      * @return TikTokMapperModel
      */
     TikTokMapperModel forMessage(String messageName);
 
-    /**
-     * @param mapperName protocol buffer class type
-     * @return
-     */
     TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName);
 
     TikTokMapperModel forMessage(String mapperName, MappingAction<MappingResult> onMapping);
@@ -54,9 +49,10 @@ public interface LiveMapper {
 
     TikTokMapperModel forAnyMessage();
 
-    List<TikTokEvent> handleMapping(String messageName, byte[] bytes);
 
     boolean isRegistered(String mapperName);
 
     <T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName);
+
+
 }

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

@@ -26,7 +26,7 @@ import com.google.protobuf.GeneratedMessageV3;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
 import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
 
-public interface LiveMapperHelper {
+public interface TikTokMapperHelper {
 
     /**
      * @param bytes        protocol buffer data bytes

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

@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.mappers.data;
 
-import io.github.jwdeveloper.tiktok.mappers.LiveMapperHelper;
+import io.github.jwdeveloper.tiktok.mappers.TikTokMapperHelper;
 
 @FunctionalInterface
 public interface MappingAction<T> {
@@ -33,6 +33,6 @@ public interface MappingAction<T> {
      * @param mapperHelper utils and helper methods that can be use to debbug/display/deserialize protocol buffer data
      * @return
      */
-    T onMapping(byte[] inputBytes, String messageName, LiveMapperHelper mapperHelper);
+    T onMapping(byte[] inputBytes, String messageName, TikTokMapperHelper mapperHelper);
 
 }

API/src/main/proto/data.proto

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

API/src/main/proto/enums.proto

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

API/src/main/proto/webcast.proto

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

Client/pom.xml

@@ -5,14 +5,13 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.0-Release</version>
+        <version>1.0.14-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>Client</artifactId>
 
 
-
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -40,7 +39,7 @@
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.5</version>
+            <version>1.5.4</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>

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

@@ -23,75 +23,20 @@
 package io.github.jwdeveloper.tiktok;
 
 
-import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
-import io.github.jwdeveloper.tiktok.gifts.TikTokGiftsManager;
 import io.github.jwdeveloper.tiktok.http.LiveHttpClient;
-import io.github.jwdeveloper.tiktok.live.GiftsManager;
 import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
 public class TikTokLive {
 
     /**
-     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
+     * @param hostName profile name of Tiktok user could be found in profile link
-     *
+     *                 example: https://www.tiktok.com/@dostawcavideo  hostName would be dostawcavideo
-     * @param hostName profile name of TikTok user could be found in profile link
      * @return LiveClientBuilder
      */
     public static LiveClientBuilder newClient(String hostName) {
         return new TikTokLiveClientBuilder(hostName);
     }
 
-    /**
-     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
-     *
-     * @param hostName profile name of TikTok user could be found in profile link
-     * @return true if live is Online, false if is offline
-     */
-    public static boolean isLiveOnline(String hostName) {
-        return requests().fetchLiveUserData(hostName).isLiveOnline();
-    }
-
-    /**
-     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
-     *
-     * @param hostName profile name of TikTok user could be found in profile link
-     * @return true if live is Online, false if is offline
-     */
-    public static CompletableFuture<Boolean> isLiveOnlineAsync(String hostName) {
-        return CompletableFuture.supplyAsync(() -> isLiveOnline(hostName));
-    }
-
-    /**
-     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
-     *
-     * @param hostName profile name of TikTok user could be found in profile link
-     * @return true is hostName name is valid and exists, false if not
-     */
-    public static boolean isHostNameValid(String hostName) {
-        return requests().fetchLiveUserData(hostName).isHostNameValid();
-    }
-
-    /**
-     * Example: https://www.tiktok.com/@dostawcavideo - hostName would be 'dostawcavideo'
-     *
-     * @param hostName profile name of TikTok user could be found in profile link
-     * @return true is hostName name is valid and exists, false if not
-     */
-    public static CompletableFuture<Boolean> isHostNameValidAsync(String hostName) {
-        return CompletableFuture.supplyAsync(() -> isHostNameValid(hostName));
-    }
-
-    /**
-     * Use to get some data from TikTok about users are lives
-     *
-     * @return LiveHttpClient
-     */
-    public static LiveHttpClient requests(Consumer<LiveClientSettings> consumer) {
-        return new TikTokLiveHttpClient(consumer);
-    }
 
     /**
      * Use to get some data from TikTok about users are lives
@@ -99,22 +44,9 @@ public class TikTokLive {
      * @return LiveHttpClient
      */
     public static LiveHttpClient requests() {
-        return requests(liveClientSettings -> {});
+
+
+        return new TikTokLiveHttpClient();
     }
 
-    private static GiftsManager giftsManager;
-
-    /**
-     * Fetch gifts from endpoint and returns GiftManager
-     *
-     * @return GiftsManager
-     */
-    public static GiftsManager gifts() {
-        if (giftsManager == null) {
-            synchronized (GiftsManager.class) {
-                giftsManager = new TikTokGiftsManager(requests().fetchGiftsData().getGifts());
-            }
-        }
-        return giftsManager;
-    }
 }

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

@@ -22,54 +22,50 @@
  */
 package io.github.jwdeveloper.tiktok;
 
-import com.google.protobuf.ByteString;
+import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
-import io.github.jwdeveloper.tiktok.data.events.*;
+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.control.*;
-import io.github.jwdeveloper.tiktok.data.events.http.TikTokRoomDataResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
-import io.github.jwdeveloper.tiktok.data.requests.*;
+import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
-import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
+import io.github.jwdeveloper.tiktok.data.requests.LiveData;
-import io.github.jwdeveloper.tiktok.exceptions.*;
+import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
-import io.github.jwdeveloper.tiktok.http.LiveHttpClient;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.listener.*;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
-import io.github.jwdeveloper.tiktok.live.*;
+import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.listener.ListenersManager;
+import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
+import io.github.jwdeveloper.tiktok.live.GiftManager;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+import io.github.jwdeveloper.tiktok.live.LiveRoomInfo;
 import io.github.jwdeveloper.tiktok.models.ConnectionState;
+import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
 import io.github.jwdeveloper.tiktok.websocket.SocketClient;
-import lombok.Getter;
 
-import java.util.Base64;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 
-@Getter
+public class TikTokLiveClient implements LiveClient {
-public class TikTokLiveClient implements LiveClient
+    private final TikTokRoomInfo liveRoomInfo;
-{
+    private final TikTokGiftManager tikTokGiftManager;
-    private final TikTokRoomInfo roomInfo;
+    private final TikTokLiveHttpClient httpClient;
-    private final LiveHttpClient httpClient;
     private final SocketClient webSocketClient;
-    private final LiveEventsHandler tikTokEventHandler;
+    private final TikTokLiveEventHandler tikTokEventHandler;
     private final LiveClientSettings clientSettings;
-    private final ListenersManager listenersManager;
+    private final TikTokListenersManager listenersManager;
     private final Logger logger;
-    private final GiftsManager giftManager;
-    private final LiveMessagesHandler messageHandler;
 
-    public TikTokLiveClient(
+    public TikTokLiveClient(TikTokRoomInfo tikTokLiveMeta,
-            LiveMessagesHandler messageHandler,
+                            TikTokLiveHttpClient tiktokHttpClient,
-            GiftsManager giftsManager,
-            TikTokRoomInfo tikTokLiveMeta,
-            LiveHttpClient tiktokHttpClient,
                             SocketClient webSocketClient,
-            LiveEventsHandler tikTokEventHandler,
+                            TikTokGiftManager tikTokGiftManager,
+                            TikTokLiveEventHandler tikTokEventHandler,
                             LiveClientSettings clientSettings,
-            ListenersManager listenersManager,
+                            TikTokListenersManager listenersManager,
                             Logger logger) {
-        this.messageHandler = messageHandler;
+        this.liveRoomInfo = tikTokLiveMeta;
-        this.giftManager = giftsManager;
+        this.tikTokGiftManager = tikTokGiftManager;
-        this.roomInfo = tikTokLiveMeta;
         this.httpClient = tiktokHttpClient;
         this.webSocketClient = webSocketClient;
         this.tikTokEventHandler = tikTokEventHandler;
@@ -78,12 +74,21 @@ public class TikTokLiveClient implements LiveClient
         this.logger = logger;
     }
 
+
     public void connectAsync(Consumer<LiveClient> onConnection) {
-        connectAsync().thenAccept(onConnection);
+        CompletableFuture.supplyAsync(() ->
+        {
+            connect();
+            onConnection.accept(this);
+            return this;
+        });
+
     }
 
+
     public CompletableFuture<LiveClient> connectAsync() {
-        return CompletableFuture.supplyAsync(() -> {
+        return CompletableFuture.supplyAsync(() ->
+        {
             connect();
             return this;
         });
@@ -115,88 +120,86 @@ public class TikTokLiveClient implements LiveClient
     }
 
     public void tryConnect() {
-        if (!roomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) {
+        if (!liveRoomInfo.hasConnectionState(ConnectionState.DISCONNECTED))
+        {
             throw new TikTokLiveException("Already connected");
         }
 
         setState(ConnectionState.CONNECTING);
-        tikTokEventHandler.publish(this, new TikTokConnectingEvent());
+
-        var userDataRequest = new LiveUserData.Request(roomInfo.getHostName());
+
+        var userDataRequest = new LiveUserData.Request(liveRoomInfo.getHostName());
         var userData = httpClient.fetchLiveUserData(userDataRequest);
-        roomInfo.setStartTime(userData.getStartTime());
+        liveRoomInfo.setStartTime(userData.getStartedAtTimeStamp());
-        roomInfo.setRoomId(userData.getRoomId());
+        liveRoomInfo.setRoomId(userData.getRoomId());
+        if (userData.getUserStatus() == LiveUserData.UserStatus.Offline) {
+            throw new TikTokLiveOfflineHostException("User is offline: "+liveRoomInfo.getHostUser());
+        }
+        if (userData.getUserStatus() == LiveUserData.UserStatus.NotFound) {
+            throw new TikTokLiveOfflineHostException("User not found: "+liveRoomInfo.getHostUser());
+        }
 
-        if (userData.getUserStatus() == LiveUserData.UserStatus.Offline)
-            throw new TikTokLiveOfflineHostException("User is offline: " + roomInfo.getHostName());
-
-        if (userData.getUserStatus() == LiveUserData.UserStatus.NotFound)
-            throw new TikTokLiveUnknownHostException("User not found: " + roomInfo.getHostName());
 
         var liveDataRequest = new LiveData.Request(userData.getRoomId());
         var liveData = httpClient.fetchLiveData(liveDataRequest);
+        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostNotFound) {
+            throw new TikTokLiveOfflineHostException("LiveStream for Host name could not be found.");
+        }
+        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostOffline) {
+            throw new TikTokLiveOfflineHostException("LiveStream for not be found, is the Host offline?");
+        }
 
-        if (liveData.isAgeRestricted() && clientSettings.isThrowOnAgeRestriction())
+        liveRoomInfo.setTitle(liveData.getTitle());
-            throw new TikTokLiveException("Livestream for " + roomInfo.getHostName() + " is 18+ or age restricted!");
+        liveRoomInfo.setViewersCount(liveData.getViewers());
+        liveRoomInfo.setTotalViewersCount(liveData.getTotalViewers());
+        liveRoomInfo.setAgeRestricted(liveData.isAgeRestricted());
+        liveRoomInfo.setHost(liveData.getHost());
 
-        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostNotFound)
-            throw new TikTokLiveUnknownHostException("LiveStream for " + roomInfo.getHostName() + " could not be found.");
-
-        if (liveData.getLiveStatus() == LiveData.LiveStatus.HostOffline)
-            throw new TikTokLiveOfflineHostException("LiveStream for " + roomInfo.getHostName() + " not found, is the Host offline?");
-
-        tikTokEventHandler.publish(this, new TikTokRoomDataResponseEvent(liveData));
-
-        roomInfo.setTitle(liveData.getTitle());
-        roomInfo.setViewersCount(liveData.getViewers());
-        roomInfo.setTotalViewersCount(liveData.getTotalViewers());
-        roomInfo.setAgeRestricted(liveData.isAgeRestricted());
-        roomInfo.setHost(liveData.getHost());
-
-        var preconnectEvent = new TikTokPreConnectionEvent(userData, liveData);
-        tikTokEventHandler.publish(this, preconnectEvent);
-        if (preconnectEvent.isCancelConnection())
-            throw new TikTokLiveException("TikTokPreConnectionEvent cancelled connection!");
-
-        if (clientSettings.isFetchGifts())
-            giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
 
         var liveConnectionRequest =new LiveConnectionData.Request(userData.getRoomId());
         var liveConnectionData = httpClient.fetchLiveConnectionData(liveConnectionRequest);
         webSocketClient.start(liveConnectionData, this);
 
         setState(ConnectionState.CONNECTED);
-        tikTokEventHandler.publish(this, new TikTokRoomInfoEvent(roomInfo));
+        tikTokEventHandler.publish(this, new TikTokRoomInfoEvent(liveRoomInfo));
     }
 
     public void disconnect() {
-        if (roomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) {
+        if (liveRoomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) {
             return;
         }
-        setState(ConnectionState.DISCONNECTED);
         webSocketClient.stop();
+        setState(ConnectionState.DISCONNECTED);
     }
 
     private void setState(ConnectionState connectionState) {
         logger.info("TikTokLive client state: " + connectionState.name());
-        roomInfo.setConnectionState(connectionState);
+        liveRoomInfo.setConnectionState(connectionState);
     }
 
     public void publishEvent(TikTokEvent event) {
         tikTokEventHandler.publish(this, event);
     }
 
-    @Override
-    public void publishMessage(String webcastMessageName, String payloadBase64) {
-        this.publishMessage(webcastMessageName, Base64.getDecoder().decode(payloadBase64));
-    }
-    @Override
-    public void publishMessage(String webcastMessageName, byte[] payload) {
 
-        var builder = WebcastResponse.Message.newBuilder();
+    public LiveRoomInfo getRoomInfo() {
-        builder.setMethod(webcastMessageName);
+        return liveRoomInfo;
-        builder.setPayload(ByteString.copyFrom(payload));
-        var message = builder.build();
-        messageHandler.handleSingleMessage(this, message);
     }
 
+    @Override
+    public ListenersManager getListenersManager() {
+        return listenersManager;
+    }
+
+    @Override
+    public Logger getLogger() {
+        return logger;
+    }
+
+    @Override
+    public GiftManager getGiftManager() {
+        return tikTokGiftManager;
+    }
+
+
 }

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

@@ -22,165 +22,249 @@
  */
 package io.github.jwdeveloper.tiktok;
 
-import io.github.jwdeveloper.dependance.Dependance;
+import io.github.jwdeveloper.tiktok.data.events.*;
-import io.github.jwdeveloper.dependance.api.DependanceContainer;
-import io.github.jwdeveloper.dependance.implementation.DependanceContainerBuilder;
-import io.github.jwdeveloper.tiktok.mappers.MessagesMapperFactory;
-import io.github.jwdeveloper.tiktok.common.LoggerFactory;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
+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;
+import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent;
+import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent;
+import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent;
+import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent;
+import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
+import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
+import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.gifts.TikTokGiftsManager;
+import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
 import io.github.jwdeveloper.tiktok.http.HttpClientFactory;
-import io.github.jwdeveloper.tiktok.http.LiveHttpClient;
+import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
-import io.github.jwdeveloper.tiktok.listener.*;
+import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
-import io.github.jwdeveloper.tiktok.live.*;
+import io.github.jwdeveloper.tiktok.live.GiftManager;
-import io.github.jwdeveloper.tiktok.live.builder.*;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.mappers.*;
+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.websocket.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.*;
+import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
+import io.github.jwdeveloper.tiktok.utils.ConsoleColors;
+import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketClient;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
-import java.util.logging.Logger;
+import java.util.logging.*;
 
 public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
     protected final LiveClientSettings clientSettings;
-    protected final LiveEventsHandler eventHandler;
+    protected final Logger logger;
+    protected final TikTokLiveEventHandler tikTokEventHandler;
     protected final List<TikTokEventListener> listeners;
-    protected final List<Consumer<LiveMapper>> onCustomMappings;
+    protected Consumer<TikTokMapper> onCustomMappings;
-    protected final List<Consumer<DependanceContainerBuilder>> onCustomDependencies;
 
-    public TikTokLiveClientBuilder(String userName) {
+    public TikTokLiveClientBuilder(String userName)
+    {
         this.clientSettings = LiveClientSettings.createDefault();
         this.clientSettings.setHostName(userName);
-        this.eventHandler = new TikTokLiveEventHandler();
+        this.tikTokEventHandler = new TikTokLiveEventHandler();
+        this.logger = Logger.getLogger(TikTokLive.class.getSimpleName() + " " + userName);
         this.listeners = new ArrayList<>();
-        this.onCustomMappings = new ArrayList<>();
+        this.onCustomMappings = (e) -> {
-        this.onCustomDependencies = new ArrayList<>();
+        };
     }
 
-    public LiveClientBuilder onMapping(Consumer<LiveMapper> consumer) {
+    public LiveClientBuilder onMapping(Consumer<TikTokMapper> onCustomMappings) {
-        this.onCustomMappings.add(consumer);
+        this.onCustomMappings = onCustomMappings;
         return this;
     }
 
+
     public TikTokLiveClientBuilder configure(Consumer<LiveClientSettings> onConfigure) {
         onConfigure.accept(clientSettings);
         return this;
     }
 
     public TikTokLiveClientBuilder addListener(TikTokEventListener listener) {
-        if (listener != null)
         listeners.add(listener);
         return this;
     }
 
-    @Override
+    protected void validate() {
-    public LiveClientBuilder customize(Consumer<DependanceContainerBuilder> onCustomizeDependencies) {
+        if (clientSettings.getClientLanguage() == null || clientSettings.getClientLanguage().isEmpty()) {
-        this.onCustomDependencies.add(onCustomizeDependencies);
+            clientSettings.setClientLanguage("en");
-        return this;
         }
 
-    protected void validate() {
-        if (clientSettings.getClientLanguage() == null || clientSettings.getClientLanguage().isEmpty())
-            clientSettings.setClientLanguage("en");
 
-        if (clientSettings.getHostName() == null || clientSettings.getHostName().isEmpty())
+        if (clientSettings.getHostName() == null || clientSettings.getHostName().isEmpty()) {
             throw new TikTokLiveException("HostName can not be null");
+        }
 
-        if (clientSettings.getHostName().startsWith("@"))
+        if (clientSettings.getHostName().startsWith("@")) {
             clientSettings.setHostName(clientSettings.getHostName().substring(1));
+        }
 
-        if (clientSettings.getPingInterval() < 250)
-            throw new TikTokLiveException("Minimum allowed ping interval is 250 millseconds");
 
         var httpSettings = clientSettings.getHttpSettings();
         httpSettings.getParams().put("app_language", clientSettings.getClientLanguage());
         httpSettings.getParams().put("webcast_language", clientSettings.getClientLanguage());
+
+
+        var handler = new ConsoleHandler();
+        handler.setFormatter(new Formatter() {
+            @Override
+            public String format(LogRecord record) {
+                var sb = new StringBuilder();
+                sb.append(ConsoleColors.GREEN).append("[").append(record.getLoggerName()).append("] ");
+                sb.append(ConsoleColors.GREEN).append("[").append(record.getLevel()).append("]: ");
+                sb.append(ConsoleColors.WHITE_BRIGHT).append(record.getMessage());
+                sb.append(ConsoleColors.RESET).append("\n");
+                return sb.toString();
+            }
+        });
+        logger.setUseParentHandlers(false);
+        logger.addHandler(handler);
+        logger.setLevel(clientSettings.getLogLevel());
+        if (!clientSettings.isPrintToConsole()) {
+            logger.setLevel(Level.OFF);
+        }
     }
 
-    //TODO each class registered to container should implement own interface,
     public LiveClient build() {
         validate();
 
-        //Docs: https://github.com/jwdeveloper/DepenDance?tab=readme-ov-file#01-basic
+        var tiktokRoomInfo = new TikTokRoomInfo();
-        var dependance = Dependance.newContainer();
+        tiktokRoomInfo.setHostName(clientSettings.getHostName());
 
-        //config
+        var listenerManager = new TikTokListenersManager(listeners, tikTokEventHandler);
-        dependance.registerSingleton(LiveClientSettings.class, clientSettings);
-        dependance.registerSingleton(Logger.class, LoggerFactory.create(clientSettings.getHostName(), clientSettings));
-        dependance.registerSingleton(TikTokRoomInfo.class, container ->
-        {
-            var roomInfo = new TikTokRoomInfo();
-            roomInfo.setHostName(clientSettings.getHostName());
-            return roomInfo;
-        });
 
-        //messages
+        var giftManager = new TikTokGiftManager(logger);
-        dependance.registerSingleton(LiveEventsHandler.class, eventHandler);
+        var eventsMapper = createMapper(giftManager, tiktokRoomInfo);
-        dependance.registerSingleton(LiveMessagesHandler.class,TikTokLiveMessageHandler.class);
+        var messageHandler = new TikTokLiveMessageHandler(tikTokEventHandler, eventsMapper);
 
-        //listeners
-        dependance.registerSingletonList(TikTokEventListener.class, (e) -> listeners);
-        dependance.registerSingleton(ListenersManager.class, TikTokListenersManager.class);
 
-        //networking
+        var httpClientFactory = new HttpClientFactory(clientSettings);
-        dependance.registerSingleton(HttpClientFactory.class);
+        var tikTokLiveHttpClient = new TikTokLiveHttpClient(httpClientFactory);
-        dependance.registerSingleton(TikTokWebSocketPingingTask.class);
+
-        if (clientSettings.isOffline()) {
+        var webSocketClient = new TikTokWebSocketClient(
-            dependance.registerSingleton(SocketClient.class, TikTokWebSocketOfflineClient.class);
+                clientSettings,
-            dependance.registerSingleton(LiveHttpClient.class, TikTokLiveHttpOfflineClient.class);
+                messageHandler,
-        } else {
+                tikTokEventHandler);
-            dependance.registerSingleton(SocketClient.class, TikTokWebSocketClient.class);
+
-            dependance.registerSingleton(LiveHttpClient.class, TikTokLiveHttpClient.class);
+        return new TikTokLiveClient(tiktokRoomInfo,
+                tikTokLiveHttpClient,
+                webSocketClient,
+                giftManager,
+                tikTokEventHandler,
+                clientSettings,
+                listenerManager,
+                logger);
     }
 
-        /* TODO in future, custom proxy implementation that can be provided via builder
+    public TikTokLiveMapper createMapper(GiftManager giftManager, TikTokRoomInfo roomInfo) {
-         * if(customProxy != null)
+        /*
-         *    dependance.registerSingleton(TikTokProxyProvider.class,customProxy);
+          //
-         * else
-         *    dependance.registerSingleton(TikTokProxyProvider.class,DefaultProxyProvider.class);
          */
 
-        //gifts
-        if (clientSettings.isFetchGifts()) {
-            dependance.registerSingleton(GiftsManager.class, TikTokLive.gifts());
-        } else {
-            dependance.registerSingleton(GiftsManager.class, new TikTokGiftsManager(List.of()));
-        }
 
-        //mapper
+        var eventMapper = new TikTokGenericEventMapper();
-        dependance.registerSingleton(TikTokGenericEventMapper.class);
+        var mapper = new TikTokLiveMapper(new TikTokLiveMapperHelper(eventMapper));
-        dependance.registerSingleton(LiveMapperHelper.class, TikTokLiveMapperHelper.class);
+
-        dependance.registerSingleton(LiveMapper.class, (container) ->
+        //ConnectionEvents events
+        var commonHandler = new TikTokCommonEventHandler();
+        var giftHandler = new TikTokGiftEventHandler(giftManager, roomInfo);
+        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 dependace = (DependanceContainer) container.find(DependanceContainer.class);
+            var messageObject = mapperHelper.bytesToWebcastObject(inputBytes, WebcastCaptionMessage.class);
-            var mapper = MessagesMapperFactory.create(dependace);
+            return MappingResult.of(messageObject, new TikTokCaptionEvent(messageObject));
-            onCustomMappings.forEach(action -> action.accept(mapper));
-            return mapper;
         });
 
-        //mapper handlers
-        dependance.registerSingleton(TikTokCommonEventHandler.class);
-        dependance.registerSingleton(TikTokGiftEventHandler.class);
-        dependance.registerSingleton(TikTokRoomInfoEventHandler.class);
-        dependance.registerSingleton(TikTokSocialMediaEventHandler.class);
 
-        //client
+        //User Interactions events
-        dependance.registerSingleton(LiveClient.class, TikTokLiveClient.class);
+        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));
+        });
 
-        onCustomDependencies.forEach(action -> action.accept(dependance));
+        mapper.forMessage(WebcastLikeMessage.class, roomInfoHandler::handleLike);
+        mapper.forMessage(WebcastGiftMessage.class, giftHandler::handleGifts);
+        mapper.forMessage(WebcastSocialMessage.class, socialHandler::handle);
+        mapper.forMessage(WebcastMemberMessage.class, roomInfoHandler::handleMemberMessage);
 
-        var container = dependance.build();
+
-        return container.find(LiveClient.class);
+        //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,9 +275,273 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return build().connectAsync();
     }
 
+
+    public TikTokLiveClientBuilder onUnhandledSocial(
+            EventConsumer<TikTokUnhandledSocialEvent> event) {
+        tikTokEventHandler.subscribe(TikTokUnhandledSocialEvent.class, event);
+        return this;
+    }
+
+    //  @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);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onEnvelope(EventConsumer<TikTokEnvelopeEvent> event) {
+        tikTokEventHandler.subscribe(TikTokEnvelopeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onShop(EventConsumer<TikTokShopEvent> event) {
+        tikTokEventHandler.subscribe(TikTokShopEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onDetect(
+            EventConsumer<TikTokDetectEvent> event) {
+        tikTokEventHandler.subscribe(TikTokDetectEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkLayer(
+            EventConsumer<TikTokLinkLayerEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLinkLayerEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onConnected(EventConsumer<TikTokConnectedEvent> event) {
+        tikTokEventHandler.subscribe(TikTokConnectedEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onCaption(EventConsumer<TikTokCaptionEvent> event) {
+        tikTokEventHandler.subscribe(TikTokCaptionEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onQuestion(EventConsumer<TikTokQuestionEvent> event) {
+        tikTokEventHandler.subscribe(TikTokQuestionEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onRoomPin(
+            EventConsumer<TikTokRoomPinEvent> event) {
+        tikTokEventHandler.subscribe(TikTokRoomPinEvent.class, event);
+        return this;
+    }
+
     @Override
-    public <E extends TikTokEvent> LiveClientBuilder onEvent(Class<E> eventClass, EventConsumer<E> action) {
+    public <E extends TikTokEvent> LiveClientBuilder onEvent(Class<E> eventClass, EventConsumer<E> event) {
-        eventHandler.subscribe(eventClass, action);
+        tikTokEventHandler.subscribe(eventClass, event);
+        return this;
+    }
+
+
+    @Override
+    public LiveClientBuilder onRoomInfo(EventConsumer<TikTokRoomInfoEvent> event) {
+        tikTokEventHandler.subscribe(TikTokRoomInfoEvent.class, event);
+        return this;
+    }
+
+
+    public TikTokLiveClientBuilder onLivePaused(EventConsumer<TikTokLivePausedEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLivePausedEvent.class, event);
+        return this;
+    }
+
+    @Override
+    public LiveClientBuilder onLiveUnpaused(EventConsumer<TikTokLiveUnpausedEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLiveUnpausedEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLike(EventConsumer<TikTokLikeEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLikeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLink(EventConsumer<TikTokLinkEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLinkEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onBarrage(
+            EventConsumer<TikTokBarrageEvent> event) {
+        tikTokEventHandler.subscribe(TikTokBarrageEvent.class, event);
+        return this;
+    }
+
+
+    public TikTokLiveClientBuilder onGift(EventConsumer<TikTokGiftEvent> event) {
+        tikTokEventHandler.subscribe(TikTokGiftEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onGiftCombo(EventConsumer<TikTokGiftComboEvent> event) {
+        tikTokEventHandler.subscribe(TikTokGiftComboEvent.class, event);
+        return this;
+    }
+
+
+    public TikTokLiveClientBuilder onLinkMicArmies(
+            EventConsumer<TikTokLinkMicArmiesEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLinkMicArmiesEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onEmote(EventConsumer<TikTokEmoteEvent> event) {
+        tikTokEventHandler.subscribe(TikTokEmoteEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onUnauthorizedMember(
+            EventConsumer<TikTokUnauthorizedMemberEvent> event) {
+        tikTokEventHandler.subscribe(TikTokUnauthorizedMemberEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onInRoomBanner(
+            EventConsumer<TikTokInRoomBannerEvent> event) {
+        tikTokEventHandler.subscribe(TikTokInRoomBannerEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMicMethod(
+            EventConsumer<TikTokLinkMicMethodEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLinkMicMethodEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onSubscribe(EventConsumer<TikTokSubscribeEvent> event) {
+        tikTokEventHandler.subscribe(TikTokSubscribeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onPoll(EventConsumer<TikTokPollEvent> event) {
+        tikTokEventHandler.subscribe(TikTokPollEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onFollow(EventConsumer<TikTokFollowEvent> event) {
+        tikTokEventHandler.subscribe(TikTokFollowEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onComment(EventConsumer<TikTokCommentEvent> event) {
+        tikTokEventHandler.subscribe(TikTokCommentEvent.class, event);
+        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;
+    }
+
+    public TikTokLiveClientBuilder onRankUpdate(EventConsumer<TikTokRankUpdateEvent> event) {
+        tikTokEventHandler.subscribe(TikTokRankUpdateEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onIMDelete(EventConsumer<TikTokIMDeleteEvent> event) {
+        tikTokEventHandler.subscribe(TikTokIMDeleteEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLiveEnded(EventConsumer<TikTokLiveEndedEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLiveEndedEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onError(EventConsumer<TikTokErrorEvent> event) {
+        tikTokEventHandler.subscribe(TikTokErrorEvent.class, event);
+        return this;
+    }
+
+
+    public TikTokLiveClientBuilder onJoin(EventConsumer<TikTokJoinEvent> event) {
+        tikTokEventHandler.subscribe(TikTokJoinEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onRankText(EventConsumer<TikTokRankTextEvent> event) {
+        tikTokEventHandler.subscribe(TikTokRankTextEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onShare(EventConsumer<TikTokShareEvent> event) {
+        tikTokEventHandler.subscribe(TikTokShareEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onUnhandledMember(
+            EventConsumer<TikTokUnhandledMemberEvent> event) {
+        tikTokEventHandler.subscribe(TikTokUnhandledMemberEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onSubNotify(EventConsumer<TikTokSubNotifyEvent> event) {
+        tikTokEventHandler.subscribe(TikTokSubNotifyEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMicBattle(
+            EventConsumer<TikTokLinkMicBattleEvent> event) {
+        tikTokEventHandler.subscribe(TikTokLinkMicBattleEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onDisconnected(
+            EventConsumer<TikTokDisconnectedEvent> event) {
+        tikTokEventHandler.subscribe(TikTokDisconnectedEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onUnhandledControl(
+            EventConsumer<TikTokUnhandledControlEvent> event) {
+        tikTokEventHandler.subscribe(TikTokUnhandledControlEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onEvent(EventConsumer<TikTokEvent> event) {
+        tikTokEventHandler.subscribe(TikTokEvent.class, event);
+        return this;
+    }
+
+    @Override
+    public TikTokLiveClientBuilder onWebsocketResponse(EventConsumer<TikTokWebsocketResponseEvent> event) {
+        tikTokEventHandler.subscribe(TikTokWebsocketResponseEvent.class, event);
+        return this;
+    }
+
+    @Override
+    public TikTokLiveClientBuilder onWebsocketMessage(EventConsumer<TikTokWebsocketMessageEvent> event) {
+        tikTokEventHandler.subscribe(TikTokWebsocketMessageEvent.class, event);
+        return this;
+    }
+
+    @Override
+    public TikTokLiveClientBuilder onWebsocketUnhandledMessage(EventConsumer<TikTokWebsocketUnhandledMessageEvent> event) {
+        tikTokEventHandler.subscribe(TikTokWebsocketUnhandledMessageEvent.class, event);
+        return this;
+    }
+
+    @Override
+    public TikTokLiveClientBuilder onReconnecting(EventConsumer<TikTokReconnectingEvent> event) {
+        tikTokEventHandler.subscribe(TikTokReconnectingEvent.class, event);
         return this;
     }
 }

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

@@ -23,13 +23,15 @@
 package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
-import io.github.jwdeveloper.tiktok.live.LiveEventsHandler;
 import io.github.jwdeveloper.tiktok.live.builder.EventConsumer;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
-public class TikTokLiveEventHandler implements LiveEventsHandler {
+public class TikTokLiveEventHandler {
     private final Map<Class<?>, Set<EventConsumer>> events;
 
     public TikTokLiveEventHandler() {
@@ -37,8 +39,21 @@ public class TikTokLiveEventHandler implements LiveEventsHandler {
     }
 
     public void publish(LiveClient tikTokLiveClient, TikTokEvent tikTokEvent) {
-        Optional.ofNullable(events.get(TikTokEvent.class)).ifPresent(handlers -> handlers.forEach(handler -> handler.onEvent(tikTokLiveClient, tikTokEvent)));
+        if (events.containsKey(TikTokEvent.class)) {
-        Optional.ofNullable(events.get(tikTokEvent.getClass())).ifPresent(handlers -> handlers.forEach(handler -> handler.onEvent(tikTokLiveClient, tikTokEvent)));
+            var handlers = events.get(TikTokEvent.class);
+            for (var handle : handlers) {
+                handle.onEvent(tikTokLiveClient, tikTokEvent);
+            }
+        }
+
+
+        if (!events.containsKey(tikTokEvent.getClass())) {
+            return;
+        }
+        var handlers = events.get(tikTokEvent.getClass());
+        for (var handler : handlers) {
+            handler.onEvent(tikTokLiveClient, tikTokEvent);
+        }
     }
 
     public <T extends TikTokEvent> void subscribe(Class<?> clazz, EventConsumer<T> event) {
@@ -50,10 +65,22 @@ public class TikTokLiveEventHandler implements LiveEventsHandler {
     }
 
     public <T extends TikTokEvent> void unsubscribe(EventConsumer<T> consumer) {
-		events.forEach((key, value) -> value.remove(consumer));
+        for (var entry : events.entrySet()) {
+            entry.getValue().remove(consumer);
+        }
     }
 
     public <T extends TikTokEvent> void unsubscribe(Class<?> clazz, EventConsumer<T> consumer) {
-        Optional.ofNullable(clazz).map(events::get).ifPresent(consumers -> consumers.remove(consumer));
+        if (clazz == null) {
+            return;
+        }
+
+        if (!events.containsKey(clazz)) {
+            return;
+        }
+
+        var eventSet = events.get(clazz);
+        eventSet.remove(consumer);
+
     }
 }

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

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