Merge pull request #85 from jwdeveloper/develop-1.7.2

Develop 1.7.2

API/pom.xml

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

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

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

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

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

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

@@ -40,7 +40,7 @@ import java.util.List;
 public class TikTokCommentEvent extends TikTokHeaderEvent {
     private final User user;
     private final String text;
-    private final String getUserLanguage;
+    private final String userLanguage;
     private final User mentionedUser;
     private final List<Picture> pictures;
     private final boolean visibleToSender;
@@ -50,7 +50,7 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
         user = User.map(msg.getUser(), msg.getUserIdentity());
         text = msg.getContent();
         visibleToSender = msg.getVisibleToSender();
-        getUserLanguage = msg.getContentLanguage();
+        userLanguage = msg.getContentLanguage();
         mentionedUser = User.map(msg.getAtUser());
         pictures = msg.getEmotesListList().stream().map(e -> Picture.map(e.getEmote().getImage())).toList();
     }
@@ -66,4 +66,4 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
         builder.setContent(message);
         return new TikTokCommentEvent(builder.build());
     }
-}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -30,12 +30,13 @@ import lombok.*;
 /**
  * Triggered before the connection is established.
  */
+@Getter
 @EventMeta(eventType = EventType.Control)
 public class TikTokPreConnectionEvent extends TikTokLiveClientEvent
 {
-	@Getter private final LiveUserData.Response userData;
+	private final LiveUserData.Response userData;
-	@Getter private final LiveData.Response roomData;
+	private final LiveData.Response roomData;
-	@Getter @Setter boolean cancelConnection = false;
+	@Setter boolean cancelConnection = false;
 
 	public TikTokPreConnectionEvent(LiveUserData.Response userData, LiveData.Response liveData) {
 		this.userData = userData;

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

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

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

@@ -20,18 +20,17 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.data.models;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import lombok.Value;
+import io.github.jwdeveloper.tiktok.annotations.*;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
+import lombok.Getter;
 
-@Value
+@Getter
-public class EnumValue
+@EventMeta(eventType = EventType.Message)
-{
+public class TikTokLinkApplyEvent extends TikTokLinkEvent {
-    public int value;
-    public String name;
 
-    public static EnumValue Map(Enum<?> _enum)
+    public TikTokLinkApplyEvent(WebcastLinkMessage msg) {
-    {
+        super(msg);
-        return new EnumValue(_enum.ordinal() ,_enum.name());
     }
-}
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,46 @@
+/*
+ * 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

@@ -0,0 +1,55 @@
+/*
+ * 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

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

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

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

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

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

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

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

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

@@ -20,24 +20,20 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package io.github.jwdeveloper.tiktok.data.events;
+package io.github.jwdeveloper.tiktok.data.events.link;
 
-import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.*;
-import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMessage;
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
+import lombok.Getter;
 
-import io.github.jwdeveloper.tiktok.data.models.users.User;
+@Getter
-import lombok.Data;
-
-
-@Data
 @EventMeta(eventType = EventType.Message)
-public class CustomEvent extends TikTokHeaderEvent {
+public class TikTokLinkMicIdxUpdateEvent extends TikTokLinkEvent {
-    private final User user;
-    private final String title;
 
-    public CustomEvent(User user, String title) {
+    public TikTokLinkMicIdxUpdateEvent(WebcastLinkMessage msg) {
-        this.user = user;
+        super(msg);
-        this.title = title;
+        // 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -30,7 +30,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 
-/*
+/**
 Triggered when LiveRoomInfo got updated such as likes, viewers, ranking ....
  */
 @Getter
@@ -39,4 +39,4 @@ Triggered when LiveRoomInfo got updated such as likes, viewers, ranking ....
 public class TikTokRoomInfoEvent extends TikTokEvent
 {
     LiveRoomInfo roomInfo;
-}
+}

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

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

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

@@ -24,10 +24,8 @@ package io.github.jwdeveloper.tiktok.data.events.social;
 
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
-import io.github.jwdeveloper.tiktok.data.events.TikTokSubscribeEvent;
 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.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Value;
 
@@ -38,21 +36,21 @@ import lombok.Value;
 @EventMeta(eventType = EventType.Message)
 public class TikTokFollowEvent extends TikTokHeaderEvent
 {
-   User user;
+    User user;
-   int totalFollowers;
+    int totalFollowers;
 
-  public TikTokFollowEvent(WebcastSocialMessage msg) {
+    public TikTokFollowEvent(WebcastSocialMessage msg) {
-    super(msg.getCommon());
+        super(msg.getCommon());
-    user = User.map(msg.getUser());
+        user = User.map(msg.getUser());
-    totalFollowers = msg.getFollowCount();
+        totalFollowers = msg.getFollowCount();
-  }
+    }
 
     public static TikTokFollowEvent of(String userName)
     {
         return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
-                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setNickname(userName)
+                .setNickname(userName)
-                        .build())
+                .build())
-                .build());
+            .build());
     }
-}
+}

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

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

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

@@ -22,7 +22,6 @@
  */
 package io.github.jwdeveloper.tiktok.data.models.gifts;
 
-//TODO it should be called GiftComboStateType
 public enum GiftComboStateType {
     Finished,
     Begin,

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

@@ -0,0 +1,34 @@
+package io.github.jwdeveloper.tiktok.data.models.users;
+
+import lombok.Getter;
+
+@Getter
+public class ListUser
+{
+    private final User user;
+    private final LinkType linkType;
+    private final long linkMicId, linkStatus, modifyTime, linkerId;
+    private final int userPosition, silenceStatus, roleType;
+
+    public ListUser(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) {
+        this.user = User.map(listUser.getUser());
+        this.linkMicId = listUser.getLinkmicId();
+        this.linkStatus = listUser.getLinkStatus();
+        this.linkType = LinkType.values()[listUser.getLinkTypeValue()];
+        this.userPosition = listUser.getUserPosition();
+        this.silenceStatus = listUser.getSilenceStatus();
+        this.modifyTime = listUser.getModifyTime();
+        this.linkerId = listUser.getLinkerId();
+        this.roleType = listUser.getRoleType();
+    }
+
+    public static ListUser map(io.github.jwdeveloper.tiktok.messages.data.ListUser listUser) {
+        return new ListUser(listUser);
+    }
+
+    public enum LinkType {
+        UNKNOWN,
+        AUDIO,
+        VIDEO
+    }
+}

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

@@ -23,20 +23,12 @@
 package io.github.jwdeveloper.tiktok.data.requests;
 
 import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
-import lombok.AllArgsConstructor;
+import lombok.*;
-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
@@ -44,5 +36,4 @@ public class GiftsData
         private String json;
         private List<Gift> gifts;
     }
-
+}
-}

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

@@ -34,30 +34,24 @@ import java.util.TreeMap;
 import java.util.function.Consumer;
 
 
+@Getter
 public class HttpClientSettings {
 
-    @Getter
+    private final Map<String, Object> params;
-    final Map<String, Object> params;
 
-    @Getter
+    private final Map<String, String> headers;
-    final Map<String, String> headers;
 
-    @Getter
+    private final Map<String, String> cookies;
-    final Map<String, String> cookies;
-
-    @Getter
-    @Setter
-    ProxyClientSettings proxyClientSettings;
-
-    @Getter
-    Consumer<HttpClient.Builder> onClientCreating;
-
-    @Getter
-    Consumer<HttpRequest.Builder> onRequestCreating;
 
     @Setter
-    @Getter
+    private ProxyClientSettings proxyClientSettings;
-    Duration timeout;
+
+    private Consumer<HttpClient.Builder> onClientCreating;
+
+    private Consumer<HttpRequest.Builder> onRequestCreating;
+
+    @Setter
+    private Duration timeout;
 
     public HttpClientSettings() {
         this.params = new TreeMap<>();
@@ -65,10 +59,8 @@ 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) -> {
-        };
     }
 
     /**

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

@@ -178,6 +178,4 @@ public class LiveClientSettings {
         headers.put("Accept-Language", "en-US,en; q=0.9");
         return headers;
     }
-
-
 }

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

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

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

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

API/src/main/proto/data.proto

@@ -1062,9 +1062,9 @@ message CohostListChangeContent {
 
 
 message LinkerListChangeContent {
-  repeated ListUser linkedUsersList = 1;
+  repeated ListUser linkedUsers = 1;
-  repeated ListUser appliedUsersList = 2;
+  repeated ListUser appliedUsers = 2;
-  repeated ListUser connectingUsersList = 3;
+  repeated ListUser connectingUsers = 3;
 }
 
 message LinkerMediaChangeContent {

API/src/main/proto/enums.proto

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

API/src/main/proto/webcast.proto

@@ -805,7 +805,7 @@ message WebcastLinkMessage {
   LinkerListChangeContent ListChangeContent = 20;
   CohostListChangeContent CohostListChangeContent = 21;
   LinkerMediaChangeContent MediaChangeContent = 22;
-  LinkerAcceptNoticeContent ReplyAcceptNoticeContent = 23;
+  LinkerAcceptNoticeContent AcceptNoticeContent = 23;
   LinkerSysKickOutContent SysKickOutContent = 101;
   LinkmicUserToastContent UserToastContent = 102;
   string extra = 200;

Client/pom.xml

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

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

@@ -91,7 +91,6 @@ public class TikTokLive {
         return new TikTokLiveHttpClient();
     }
 
-    //I don't like it, but it is reasonable for now
     private static GiftsManager giftsManager;
 
     /**

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

@@ -29,6 +29,7 @@ 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.*;
@@ -44,14 +45,15 @@ import io.github.jwdeveloper.tiktok.mappers.*;
 import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
 import io.github.jwdeveloper.tiktok.mappers.handlers.*;
 import io.github.jwdeveloper.tiktok.messages.webcast.*;
-import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketClient;
+import io.github.jwdeveloper.tiktok.websocket.*;
-import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketOfflineClient;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 
+import static io.github.jwdeveloper.tiktok.messages.enums.LinkMessageType.*;
+
 public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
     protected final LiveClientSettings clientSettings;
@@ -215,6 +217,33 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
             var message = mapperHelper.bytesToWebcastObject(inputBytes, WebcastLinkMicArmies.class);
             return MappingResult.of(message, new TikTokLinkMicArmiesEvent(message));
         });
+        mapper.forMessage(WebcastLinkMessage.class, ((inputBytes, messageName, mapperHelper) -> {
+            var message = mapperHelper.bytesToWebcastObject(inputBytes, WebcastLinkMessage.class);
+            return MappingResult.of(message, switch (message.getMessageType()) {
+                case TYPE_LINKER_INVITE -> new TikTokLinkInviteEvent(message);
+                case TYPE_LINKER_REPLY -> new TikTokLinkReplyEvent(message);
+                case TYPE_LINKER_CREATE -> new TikTokLinkCreateEvent(message);
+                case TYPE_LINKER_CLOSE -> new TikTokLinkCloseEvent(message);
+                case TYPE_LINKER_ENTER -> new TikTokLinkEnterEvent(message);
+                case TYPE_LINKER_LEAVE -> new TikTokLinkLeaveEvent(message);
+                case TYPE_LINKER_CANCEL_INVITE, TYPE_LINKER_CANCEL_APPLY -> new TikTokLinkCancelEvent(message);
+                case TYPE_LINKER_KICK_OUT -> new TikTokLinkKickOutEvent(message);
+                case TYPE_LINKER_LINKED_LIST_CHANGE -> new TikTokLinkLinkedListChangeEvent(message);
+                case TYPE_LINKER_UPDATE_USER -> new TikTokLinkUpdateUserEvent(message);
+                case TYPE_LINKER_WAITING_LIST_CHANGE, TYPE_LINKER_WAITING_LIST_CHANGE_V2 -> new TikTokLinkWaitListChangeEvent(message);
+                case TYPE_LINKER_MUTE -> new TikTokLinkMuteEvent(message);
+                case TYPE_LINKER_MATCH -> new TikTokLinkRandomMatchEvent(message);
+                case TYPE_LINKER_UPDATE_USER_SETTING -> new TikTokLinkUpdateUserSettingEvent(message);
+                case TYPE_LINKER_MIC_IDX_UPDATE -> new TikTokLinkMicIdxUpdateEvent(message);
+                case TYPE_LINKER_LINKED_LIST_CHANGE_V2 -> new TikTokLinkListChangeEvent(message);
+                case TYPE_LINKER_COHOST_LIST_CHANGE -> new TikTokLinkCohostListChangeEvent(message);
+                case TYPE_LINKER_MEDIA_CHANGE -> new TikTokLinkMediaChangeEvent(message);
+                case TYPE_LINKER_ACCEPT_NOTICE -> new TikTokLinkAcceptNoticeEvent(message);
+                case TYPE_LINKER_SYS_KICK_OUT -> new TikTokLinkSysKickOutEvent(message);
+                case TYPE_LINKMIC_USER_TOAST -> new TikTokLinkUserToastEvent(message);
+                default -> new TikTokLinkEvent(message);
+            });
+        }));
         // mapper.webcastObjectToConstructor(WebcastLinkMicMethod.class, TikTokLinkMicMethodEvent.class);
         //  mapper.webcastObjectToConstructor(WebcastLinkMicFanTicketMethod.class, TikTokLinkMicFanTicketEvent.class);
 
@@ -341,6 +370,111 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
+    public TikTokLiveClientBuilder onLinkInvite(EventConsumer<TikTokLinkInviteEvent> event) {
+        eventHandler.subscribe(TikTokLinkInviteEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkReply(EventConsumer<TikTokLinkReplyEvent> event) {
+        eventHandler.subscribe(TikTokLinkReplyEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkCreate(EventConsumer<TikTokLinkCreateEvent> event) {
+        eventHandler.subscribe(TikTokLinkCreateEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkClose(EventConsumer<TikTokLinkCloseEvent> event) {
+        eventHandler.subscribe(TikTokLinkCloseEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkEnter(EventConsumer<TikTokLinkEnterEvent> event) {
+        eventHandler.subscribe(TikTokLinkEnterEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkLeave(EventConsumer<TikTokLinkLeaveEvent> event) {
+        eventHandler.subscribe(TikTokLinkLeaveEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkCancel(EventConsumer<TikTokLinkCancelEvent> event) {
+        eventHandler.subscribe(TikTokLinkCancelEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkKickOut(EventConsumer<TikTokLinkKickOutEvent> event) {
+        eventHandler.subscribe(TikTokLinkKickOutEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkLinkedListChange(EventConsumer<TikTokLinkLinkedListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkLinkedListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkUpdateUser(EventConsumer<TikTokLinkUpdateUserEvent> event) {
+        eventHandler.subscribe(TikTokLinkUpdateUserEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkWaitListChange(EventConsumer<TikTokLinkWaitListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkWaitListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMute(EventConsumer<TikTokLinkMuteEvent> event) {
+        eventHandler.subscribe(TikTokLinkMuteEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkRandomMatch(EventConsumer<TikTokLinkRandomMatchEvent> event) {
+        eventHandler.subscribe(TikTokLinkRandomMatchEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkUpdateUserSettings(EventConsumer<TikTokLinkUpdateUserSettingEvent> event) {
+        eventHandler.subscribe(TikTokLinkUpdateUserSettingEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMicIdxUpdate(EventConsumer<TikTokLinkMicIdxUpdateEvent> event) {
+        eventHandler.subscribe(TikTokLinkMicIdxUpdateEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkListChange(EventConsumer<TikTokLinkListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkCohostListChange(EventConsumer<TikTokLinkCohostListChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkCohostListChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkMediaChange(EventConsumer<TikTokLinkMediaChangeEvent> event) {
+        eventHandler.subscribe(TikTokLinkMediaChangeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkAcceptNotice(EventConsumer<TikTokLinkAcceptNoticeEvent> event) {
+        eventHandler.subscribe(TikTokLinkAcceptNoticeEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkSysKickOut(EventConsumer<TikTokLinkSysKickOutEvent> event) {
+        eventHandler.subscribe(TikTokLinkSysKickOutEvent.class, event);
+        return this;
+    }
+
+    public TikTokLiveClientBuilder onLinkUserToast(EventConsumer<TikTokLinkUserToastEvent> event) {
+        eventHandler.subscribe(TikTokLinkUserToastEvent.class, event);
+        return this;
+    }
+
     public TikTokLiveClientBuilder onBarrage(EventConsumer<TikTokBarrageEvent> event) {
         eventHandler.subscribe(TikTokBarrageEvent.class, event);
         return this;

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

@@ -56,7 +56,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
     public TikTokLiveHttpClient(HttpClientFactory factory, LiveClientSettings settings) {
         this.httpFactory = factory;
         this.clientSettings = settings;
-        this.logger = LoggerFactory.create("HttpClient", clientSettings);
+        this.logger = LoggerFactory.create("HttpClient-"+hashCode(), clientSettings);
         liveUserDataMapper = new LiveUserDataMapper();
         liveDataMapper = new LiveDataMapper();
         giftsDataMapper = new GiftsDataMapper();
@@ -178,7 +178,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
         try {
             var resultHeader = ActionResult.of(credentialsResponse.headers().firstValue("x-set-tt-cookie"));
             if (resultHeader.isFailure()) {
-                logger.warning("SignServer Headers: "+request.getRoomId()+" - "+credentialsResponse.headers().map());
+                logger.warning("Sign Server Headers: "+request.getRoomId()+" - "+credentialsResponse.headers().map());
                 throw new TikTokSignServerException("Sign server did not return the x-set-tt-cookie header - "+result);
             }
             var websocketCookie = resultHeader.getContent();

Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java

@@ -18,8 +18,8 @@ public class ActionResult<T> {
 		.setPrettyPrinting().create();
 
 	private boolean success = true;
-	private T content;
 	private String message;
+	private T content;
 	@Accessors(chain = true, fluent = true)
 	private ActionResult<?> previous;
 
@@ -100,8 +100,8 @@ public class ActionResult<T> {
 	public JsonObject toJson() {
 		JsonObject map = new JsonObject();
 		map.addProperty("success", success);
-		map.add("content", gson.toJsonTree(content));
 		map.addProperty("message", message);
+		map.add("content", gson.toJsonTree(content));
 		map.add("previous", hasPrevious() ? previous.toJson() : null);
 		return map;
 	}

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

@@ -30,6 +30,7 @@ import lombok.AllArgsConstructor;
 import java.net.*;
 import java.net.http.*;
 import java.nio.charset.*;
+import java.time.*;
 import java.util.*;
 import java.util.regex.*;
 import java.util.stream.Collectors;
@@ -47,7 +48,21 @@ public class HttpClient {
         try {
             var response = client.send(request, HttpResponse.BodyHandlers.ofByteArray());
             var result = ActionResult.of(response);
-			return response.statusCode() != 200 ? result.message("HttpResponse Code: ", response.statusCode()).failure() : result.success();
+            return switch (response.statusCode()) {
+                case 420 -> result.message("HttpResponse Code:", response.statusCode(), "| IP Cloudflare Blocked.").failure();
+                case 429 -> {
+                    var wait = response.headers().firstValue("ratelimit-reset");
+					if (wait.isEmpty())
+                        yield result.message("HttpResponse Code:", response.statusCode(), "| Sign server rate limit reached. Try again later.").failure();
+                    Duration duration = Duration.ofSeconds(Long.parseLong(wait.get()));
+                    yield result.message("HttpResponse Code:", response.statusCode(),
+                        String.format("| Sign server rate limit reached. Try again in %02d:%02d.", duration.toMinutesPart(), duration.toSecondsPart())).failure();
+				}
+                case 500, 501, 502, 503 -> result.message("HttpResponse Code:", response.statusCode(), "| Sign server Error. Try again later.").failure();
+                case 504 -> result.message("HttpResponse Code:", response.statusCode(), "| Sign server Timeout. Try again later.").failure();
+                case 200 -> result.success();
+                default -> result.message("HttpResponse Code:", response.statusCode()).failure();
+            };
 		} catch (Exception e) {
             throw new TikTokLiveRequestException(e);
         }

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

@@ -105,6 +105,7 @@ public class HttpProxyClient extends HttpClient {
 					socksConnection.setSSLSocketFactory(sc.getSocketFactory());
 					socksConnection.setConnectTimeout(httpClientSettings.getTimeout().toMillisPart());
 					socksConnection.setReadTimeout(httpClientSettings.getTimeout().toMillisPart());
+					httpClientSettings.getHeaders().forEach(socksConnection::setRequestProperty);
 
 					byte[] body = socksConnection.getInputStream().readAllBytes();
 

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

@@ -96,16 +96,17 @@ public class TikTokListenersManager implements ListenersManager {
                         m.isAnnotationPresent(TikTokEventObserver.class)).toList();
         var eventsMap = new HashMap<Class<?>, List<EventConsumer<?>>>();
         for (var method : methods) {
-            var eventClazz = method.getParameterTypes()[1];
+            var liveclientClass = method.getParameterTypes()[0];
+            var eventClass = method.getParameterTypes()[1];
 
-            if (eventClazz.isAssignableFrom(LiveClient.class) &&
+            if (!LiveClient.class.isAssignableFrom(liveclientClass) && !liveclientClass.equals(LiveClient.class)) {
-                    !eventClazz.equals(LiveClient.class)) {
+                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 1st parameter must be instance of " + LiveClient.class.getName()
-                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 1nd parameter must instance of " + LiveClient.class.getName());
+                    + " | Invalid parameter class: "+liveclientClass.getName());
             }
 
-            if (eventClazz.isAssignableFrom(TikTokEvent.class) &&
+            if (!TikTokEvent.class.isAssignableFrom(eventClass) && !eventClass.equals(TikTokEvent.class)) {
-                    !eventClazz.equals(TikTokEvent.class)) {
+                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 2nd parameter must be instance of " + TikTokEvent.class.getName()
-                throw new TikTokEventListenerMethodException("Method " + method.getName() + "() 2nd parameter must instance of " + TikTokEvent.class.getName());
+                    + " | Invalid parameter class: "+eventClass.getName());
             }
 
             EventConsumer eventMethodRef = (liveClient, event) ->
@@ -117,7 +118,7 @@ public class TikTokListenersManager implements ListenersManager {
                     throw new TikTokEventListenerMethodException(e);
                 }
             };
-            eventsMap.computeIfAbsent(eventClazz, (a) -> new ArrayList<>()).add(eventMethodRef);
+            eventsMap.computeIfAbsent(eventClass, (a) -> new ArrayList<>()).add(eventMethodRef);
         }
         return new ListenerBindingModel(listener, eventsMap);
     }

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

@@ -33,6 +33,7 @@ import org.java_websocket.client.WebSocketClient;
 import javax.net.ssl.*;
 import java.net.Proxy;
 import java.security.cert.X509Certificate;
+import java.util.HashMap;
 
 public class TikTokWebSocketClient implements SocketClient {
     private final LiveClientSettings clientSettings;
@@ -62,7 +63,7 @@ public class TikTokWebSocketClient implements SocketClient {
 
         messageHandler.handle(liveClient, connectionData.getWebcastResponse());
 
-        var headers = clientSettings.getHttpSettings().getHeaders();
+		var headers = new HashMap<>(clientSettings.getHttpSettings().getHeaders());
         headers.put("Cookie", connectionData.getWebsocketCookies());
         webSocketClient = new TikTokWebSocketListener(connectionData.getWebsocketUrl(),
                 headers,

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

@@ -22,12 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.gifts;
 
-import io.github.jwdeveloper.tiktok.data.models.gifts.GiftOld;
-import io.github.jwdeveloper.tiktok.data.models.Picture;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 

Examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.6.1-Release</version>
+        <version>1.7.1-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>extension-collector</artifactId>
-            <version>1.6.1-Release</version>
+            <version>1.7.1-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

@@ -26,6 +26,8 @@ package io.github.jwdeveloper.tiktok;
 import io.github.jwdeveloper.tiktok.extension.recorder.TikTokLiveRecorder;
 import io.github.jwdeveloper.tiktok.extension.recorder.impl.event.TikTokLiveRecorderStartedEvent;
 
+import java.io.File;
+
 public class RecorderExample {
 
     public static void main(String[] args) {
@@ -39,11 +41,10 @@ public class RecorderExample {
                 {
                     event.getException().printStackTrace();
                 })
-                .addListener(TikTokLiveRecorder.use(recorderSettings ->
+                .addListener(TikTokLiveRecorder.use((recorderSettings, liveClient) ->
                 {
                     recorderSettings.setFfmpegPath("C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\extension-recorder\\libs\\ffmpeg.exe");
-                    recorderSettings.setOutputPath("C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\extension-recorder\\out");
+                    recorderSettings.setOutputFile(new File("C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\extension-recorder\\out", "test.flv"));
-                    recorderSettings.setOutputFileName("test.flv");
                 }))
                 .onEvent(TikTokLiveRecorderStartedEvent.class, (liveClient, event) ->
                 {
@@ -52,4 +53,4 @@ public class RecorderExample {
                 .buildAndConnect();
 
     }
-}
+}

README.md

@@ -70,7 +70,7 @@ Maven
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.6.0-Release</version>
+             <version>1.7.0-Release</version>
             <scope>compile</scope>
         </dependency>
    </dependencies>

Tools-ReadmeGenerator/pom.xml

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

extension-collector/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
         <artifactId>TikTokLiveJava</artifactId>
-        <version>1.6.1-Release</version>
+        <version>1.7.1-Release</version>
     </parent>
 
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.6.1-Release</version>
+            <version>1.7.1-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/impl/DataCollectorListener.java

@@ -4,6 +4,7 @@ import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent;
+import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
 import io.github.jwdeveloper.tiktok.extension.collector.api.LiveDataCollector;
@@ -16,22 +17,20 @@ import org.bson.Document;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.time.LocalDateTime;
 import java.util.Base64;
-import java.util.Date;
 
 public class DataCollectorListener implements LiveDataCollector {
 
     private final Storage storage;
     private final CollectorListenerSettings settings;
-    private String roomId;
+    private String roomId, userName;
-    private String userName;
 
     public DataCollectorListener(Storage collection, CollectorListenerSettings settings) {
         this.storage = collection;
         this.settings = settings;
     }
 
-
     @TikTokEventObserver
     private void onResponse(LiveClient liveClient, TikTokWebsocketResponseEvent event) {
         includeResponse(liveClient, event.getResponse());
@@ -40,13 +39,12 @@ public class DataCollectorListener implements LiveDataCollector {
 
     @TikTokEventObserver
     private void onEvent(LiveClient liveClient, TikTokEvent event) {
-        if (event instanceof TikTokConnectingEvent) {
+        if (event instanceof TikTokConnectingEvent)
             userName = liveClient.getRoomInfo().getHostName();
+		else if (event instanceof TikTokRoomInfoEvent && roomId == null)
             roomId = liveClient.getRoomInfo().getRoomId();
-        }
+		else if (event instanceof TikTokErrorEvent)
-        if (event instanceof TikTokErrorEvent) {
             return;
-        }
 
         includeEvent(liveClient, event);
     }
@@ -57,7 +55,6 @@ public class DataCollectorListener implements LiveDataCollector {
         includeError(liveClient, event);
     }
 
-
     private void includeResponse(LiveClient liveClient, WebcastResponse message) {
         var messageContent = Base64.getEncoder().encodeToString(message.toByteArray());
         insertDocument(liveClient, createDocument("response", "webcast", messageContent));
@@ -86,33 +83,26 @@ public class DataCollectorListener implements LiveDataCollector {
         var content = sw.toString();
         var contentBase64 = Base64.getEncoder().encodeToString(content.getBytes());
         var doc = createDocument("error", exceptionName, contentBase64);
-        if (exception instanceof TikTokLiveMessageException ex) {
+        if (exception instanceof TikTokLiveMessageException ex)
-            doc.append("message", ex.messageToBase64())
+            doc.append("message", ex.messageToBase64()).append("response", ex.webcastResponseToBase64());
-                    .append("response", ex.webcastResponseToBase64());
-        }
         insertDocument(client, doc);
     }
 
-
     private void insertDocument(LiveClient client, Document document) {
-        if (!settings.getFilter().execute(client, document)) {
+		if (settings.getFilter().execute(client, document))
-            return;
+            storage.insert(document);
-        }
+	}
-        storage.insert(document);
-    }
-
 
     private Document createDocument(String dataType, String dataTypeName, String content) {
         var doc = new Document();
         doc.append("roomId", roomId);
-        for (var entry : settings.getExtraFields().entrySet()) {
+        for (var entry : settings.getExtraFields().entrySet())
             doc.append(entry.getKey(), entry.getValue());
-        }
         doc.append("tiktokUser", userName);
         doc.append("dataType", dataType);
         doc.append("dataTypeName", dataTypeName);
         doc.append("content", content);
-        doc.append("createdAt", new Date());
+        doc.append("createdAt", LocalDateTime.now().toString());
         return doc;
     }
 }

extension-recorder/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.6.1-Release</version>
+        <version>1.7.1-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extension-recorder</artifactId>

extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/TikTokLiveRecorder.java

@@ -25,18 +25,19 @@ package io.github.jwdeveloper.tiktok.extension.recorder;
 import io.github.jwdeveloper.tiktok.extension.recorder.api.LiveRecorder;
 import io.github.jwdeveloper.tiktok.extension.recorder.impl.RecorderListener;
 import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.RecorderSettings;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
 
-import java.util.function.Consumer;
+import java.util.function.*;
 
 public class TikTokLiveRecorder
 {
-    public static LiveRecorder use(Consumer<RecorderSettings> consumer)
+    public static LiveRecorder use(BiConsumer<RecorderSettings, LiveClient> consumer)
     {
         return new RecorderListener(consumer);
     }
 
     public static LiveRecorder use()
     {
-        return use(x ->{});
+        return use((x,y) ->{});
     }
 }

extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java

@@ -37,26 +37,23 @@ import io.github.jwdeveloper.tiktok.models.ConnectionState;
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
 import java.net.URL;
-import java.util.concurrent.TimeUnit;
+import java.util.function.*;
-import java.util.function.Consumer;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class RecorderListener implements LiveRecorder {
 
-    private final Consumer<RecorderSettings> consumer;
+    private final BiConsumer<RecorderSettings, LiveClient> consumer;
     private RecorderSettings settings;
     private DownloadData downloadData;
     private Thread liveDownloadThread;
 
-    public RecorderListener(Consumer<RecorderSettings> consumer) {
+    public RecorderListener(BiConsumer<RecorderSettings, LiveClient> consumer) {
         this.consumer = consumer;
     }
 
     @TikTokEventObserver
     private void onResponse(LiveClient liveClient, TikTokRoomDataResponseEvent event) {
         settings = RecorderSettings.DEFAULT();
-        consumer.accept(settings);
+        consumer.accept(settings, liveClient);
 
         var json = event.getLiveData().getJson();
 
@@ -76,10 +73,9 @@ public class RecorderListener implements LiveRecorder {
         if (isConnected())
             return;
 
-
         liveDownloadThread = new Thread(() -> {
             try {
-                liveClient.getLogger().info("Recording started");
+                liveClient.getLogger().info("Recording started "+liveClient.getRoomInfo().getHostName());
                 var url = new URL(downloadData.getFullUrl());
                 HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
                 var headers = LiveClientSettings.DefaultRequestHeaders();
@@ -87,18 +83,17 @@ public class RecorderListener implements LiveRecorder {
                     connection.setRequestProperty(entry.getKey(), entry.getValue());
                 }
 
-                var path = settings.getOutputPath() + File.separator + settings.getOutputFileName();
+                var file = settings.getOutputFile();
-                var file = new File(path);
                 file.getParentFile().mkdirs();
                 file.createNewFile();
 
                 try (
-                        var in = connection.getInputStream();
+                    var in = connection.getInputStream();
-                        var fos = new FileOutputStream(file)
+                    var fos = new FileOutputStream(file)
                 ) {
                     byte[] dataBuffer = new byte[1024];
                     int bytesRead;
-                    while (liveClient.getRoomInfo().getConnectionState() == ConnectionState.CONNECTED && (bytesRead = in.read(dataBuffer)) != -1) {
+                    while ((!settings.isStopOnDisconnect() || liveClient.getRoomInfo().getConnectionState() == ConnectionState.CONNECTED) && (bytesRead = in.read(dataBuffer)) != -1) {
                         fos.write(dataBuffer, 0, bytesRead);
                         fos.flush();
                     }
@@ -113,11 +108,10 @@ public class RecorderListener implements LiveRecorder {
 
         var recordingStartedEvent = new TikTokLiveRecorderStartedEvent(downloadData);
         liveClient.publishEvent(recordingStartedEvent);
-        if (recordingStartedEvent.isCanceled()) {
+        if (recordingStartedEvent.isCanceled())
-            liveClient.getLogger().info("Recording cancelled");
+			liveClient.getLogger().info("Recording cancelled");
-            return;
+		else
-        }
+            liveDownloadThread.start();
-        liveDownloadThread.start();
     }
 
     @TikTokEventObserver

extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/RecorderSettings.java

@@ -27,6 +27,7 @@ import io.github.jwdeveloper.tiktok.extension.recorder.impl.enums.LiveFormat;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.File;
 import java.util.function.Function;
 
 @Getter
@@ -36,10 +37,8 @@ public class RecorderSettings {
     private String ffmpegPath;
     private String quality;
     private String format;
-    private String outputPath;
+    private File outputFile;
-    private String outputFileName;
     private Function<String,DownloadData> prepareDownloadData;
-    private boolean startOnConnected;
     private boolean stopOnDisconnect = true;
 
     public static RecorderSettings DEFAULT() {

pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.github.jwdeveloper.tiktok</groupId>
     <artifactId>TikTokLiveJava</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.1-Release</version>
+    <version>1.7.1-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>