Breaking changes:

'Gift': changed from class to enum, so now you can handle
incoming gifts in switch

`Events`
- new:
     onGiftComboFinished
- Removed:
      onGiftBrodcast
- Rename:
     onGiftMessage -> onGift
     onRoomPinMessage -> onRoomPin
     onRoomMessage -> onRoom
     onLinkMessage -> onLink
     onBarrageMessage -> onBarrage
     onPollMessage -> onPoll
     onShopMessage -> onShop
     onDetectMessage -> onDetect

`GiftManager`
   added:
      registerGift
      findById
      findByName
      getGifts
   removed:
      getActiveGifts

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

@@ -23,18 +23,20 @@
 package io.github.jwdeveloper.tiktok.handlers;
 
 
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
+import io.github.jwdeveloper.tiktok.mappers.TikTokGenericEventMapper;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
+import io.github.jwdeveloper.tiktok.utils.Stopwatch;
 
-import java.util.Arrays;
+import java.time.Duration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -43,21 +45,24 @@ public abstract class TikTokMessageHandler {
 
     private final Map<String, io.github.jwdeveloper.tiktok.handler.TikTokMessageHandler> handlers;
     private final TikTokEventObserver tikTokEventHandler;
+    protected final TikTokGenericEventMapper mapper;
 
-    public TikTokMessageHandler(TikTokEventObserver tikTokEventHandler) {
+    public TikTokMessageHandler(TikTokEventObserver tikTokEventHandler, TikTokGenericEventMapper mapper) {
         handlers = new HashMap<>();
         this.tikTokEventHandler = tikTokEventHandler;
-        init();
+        this.mapper = mapper;
     }
 
-    public abstract void init();
-
     public void registerMapping(Class<?> clazz, Function<byte[], TikTokEvent> func) {
+        handlers.put(clazz.getSimpleName(), messagePayload -> List.of(func.apply(messagePayload)));
+    }
+
+    public void registerMappings(Class<?> clazz, Function<byte[], List<TikTokEvent>> func) {
         handlers.put(clazz.getSimpleName(), func::apply);
     }
 
     public void registerMapping(Class<?> input, Class<?> output) {
-        registerMapping(input, (e) -> mapMessageToEvent(input, output, e));
+        registerMapping(input, (e) -> mapper.mapToEvent(input, output, e));
     }
 
     public void handle(LiveClient client, WebcastResponse webcastResponse) {
@@ -71,18 +76,6 @@ public abstract class TikTokMessageHandler {
             }
         }
     }
-    public void handleSingleMessage(LiveClient client, String type, byte[] bytes) throws Exception {
-
-        if (!handlers.containsKey(type)) {
-            tikTokEventHandler.publish(client, new TikTokWebsocketUnhandledMessageEvent(WebcastResponse.Message.newBuilder().setMethod(type).build()));
-            return;
-        }
-        var handler = handlers.get(type);
-        var tiktokEvent = handler.handle(bytes);
-        tikTokEventHandler.publish(client, new TikTokWebsocketMessageEvent(tiktokEvent, WebcastResponse.Message.newBuilder().build()));
-        tikTokEventHandler.publish(client, tiktokEvent);
-    }
-
 
     public void handleSingleMessage(LiveClient client, WebcastResponse.Message message) throws Exception {
         var messageClassName = message.getMethod();
@@ -91,29 +84,16 @@ public abstract class TikTokMessageHandler {
             return;
         }
         var handler = handlers.get(messageClassName);
-        var tiktokEvent = handler.handle(message.getPayload().toByteArray());
-        tikTokEventHandler.publish(client, new TikTokWebsocketMessageEvent(tiktokEvent, message));
-        tikTokEventHandler.publish(client, tiktokEvent);
-    }
+        var stopwatch = new Stopwatch();
+        stopwatch.start();
+        var events = handler.handle(message.getPayload().toByteArray());
+        var handlingTimeInMs = stopwatch.stop();
+        var metadata = new TikTokWebsocketMessageEvent.MetaData(Duration.ofNanos(handlingTimeInMs));
 
-    protected TikTokEvent mapMessageToEvent(Class<?> inputClazz, Class<?> outputClass, byte[] payload) {
-        try {
-            var parseMethod = inputClazz.getDeclaredMethod("parseFrom",  byte[].class);
-            var deserialized = parseMethod.invoke(null,payload);
-            var constructors = Arrays.stream(outputClass.getConstructors())
-                    .filter(ea -> Arrays.stream(ea.getParameterTypes())
-                            .toList()
-                            .contains(inputClazz))
-                    .findFirst();
-
-            if (constructors.isEmpty()) {
-                throw new TikTokMessageMappingException(inputClazz, outputClass, "Unable to find constructor with input class type");
-            }
-
-            var tiktokEvent = constructors.get().newInstance(deserialized);
-            return (TikTokEvent) tiktokEvent;
-        } catch (Exception ex) {
-            throw new TikTokMessageMappingException(inputClazz, outputClass, ex);
+        for (var event : events) {
+            tikTokEventHandler.publish(client, new TikTokWebsocketMessageEvent(event, message, metadata));
+            tikTokEventHandler.publish(client, event);
         }
     }
+
 }

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

@@ -23,11 +23,8 @@
 package io.github.jwdeveloper.tiktok.handlers;
 
 import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
-import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.*;
-import io.github.jwdeveloper.tiktok.data.events.TikTokBarrageEvent;
-import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
-import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEndEvent;
 import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollEvent;
 import io.github.jwdeveloper.tiktok.data.events.poll.TikTokPollStartEvent;
@@ -39,10 +36,9 @@ import io.github.jwdeveloper.tiktok.data.events.social.TikTokFollowEvent;
 import io.github.jwdeveloper.tiktok.data.events.social.TikTokJoinEvent;
 import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent;
 import io.github.jwdeveloper.tiktok.data.events.social.TikTokShareEvent;
-import io.github.jwdeveloper.tiktok.data.models.Gift;
-import io.github.jwdeveloper.tiktok.data.models.Picture;
 import io.github.jwdeveloper.tiktok.data.models.Text;
-import io.github.jwdeveloper.tiktok.gifts.TikTokGiftManager;
+import io.github.jwdeveloper.tiktok.handlers.events.TikTokGiftEventHandler;
+import io.github.jwdeveloper.tiktok.mappers.TikTokGenericEventMapper;
 import io.github.jwdeveloper.tiktok.messages.webcast.*;
 import io.github.jwdeveloper.tiktok.models.SocialTypes;
 import lombok.SneakyThrows;
@@ -50,19 +46,21 @@ import lombok.SneakyThrows;
 import java.util.regex.Pattern;
 
 public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
-    private final TikTokGiftManager giftManager;
+
     private final TikTokRoomInfo roomInfo;
+    private final TikTokGiftEventHandler giftHandler;
     private final Pattern socialMediaPattern = Pattern.compile("pm_mt_guidance_viewer_([0-9]+)_share");
 
     public TikTokMessageHandlerRegistration(TikTokEventObserver tikTokEventHandler,
-                                            TikTokGiftManager giftManager,
-                                            TikTokRoomInfo roomInfo) {
-        super(tikTokEventHandler);
-        this.giftManager = giftManager;
+                                            TikTokRoomInfo roomInfo,
+                                            TikTokGenericEventMapper genericTikTokEventMapper,
+                                            TikTokGiftEventHandler tikTokGiftEventHandler) {
+        super(tikTokEventHandler, genericTikTokEventMapper);
+        this.giftHandler = tikTokGiftEventHandler;
         this.roomInfo = roomInfo;
+        init();
     }
 
-    @Override
     public void init() {
 
         //ConnectionEvents events
@@ -80,7 +78,7 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
         //User Interactions events
         registerMapping(WebcastChatMessage.class, TikTokCommentEvent.class);
         registerMapping(WebcastLikeMessage.class, this::handleLike);
-        registerMapping(WebcastGiftMessage.class, this::handleGift);
+        registerMappings(WebcastGiftMessage.class, giftHandler::handleGift);
         registerMapping(WebcastSocialMessage.class, this::handleSocialMedia);
         registerMapping(WebcastMemberMessage.class, this::handleMemberMessage);
 
@@ -124,29 +122,6 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
         };
     }
 
-    @SneakyThrows
-    private TikTokEvent handleGift(byte[] msg) {
-        var giftMessage = WebcastGiftMessage.parseFrom(msg);
-
-
-        var gift = giftManager.findById((int) giftMessage.getGiftId());
-        if (gift == Gift.UNDEFINED) {
-            gift = giftManager.findByName(giftMessage.getGift().getName());
-        }
-        if (gift == Gift.UNDEFINED) {
-            gift = giftManager.registerGift(
-                    (int) giftMessage.getGift().getId(),
-                    giftMessage.getGift().getName(),
-                    giftMessage.getGift().getDiamondCount(),
-                    Picture.map(giftMessage.getGift().getImage()));
-        }
-
-        if (giftMessage.getRepeatEnd() > 0) {
-            return new TikTokGiftComboEvent(gift, giftMessage);
-        }
-
-        return new TikTokGiftEvent(gift, giftMessage);
-    }
 
     @SneakyThrows
     private TikTokEvent handleSocialMedia(byte[] msg) {
@@ -181,13 +156,13 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
     }
 
     private TikTokEvent handleRoomUserSeqMessage(byte[] msg) {
-        var event = (TikTokRoomUserInfoEvent) mapMessageToEvent(WebcastRoomUserSeqMessage.class, TikTokRoomUserInfoEvent.class, msg);
+        var event = (TikTokRoomUserInfoEvent) mapper.mapToEvent(WebcastRoomUserSeqMessage.class, TikTokRoomUserInfoEvent.class, msg);
         roomInfo.setViewersCount(event.getTotalUsers());
         return event;
     }
 
     private TikTokEvent handleLike(byte[] msg) {
-        var event = (TikTokLikeEvent) mapMessageToEvent(WebcastLikeMessage.class, TikTokLikeEvent.class, msg);
+        var event = (TikTokLikeEvent) mapper.mapToEvent(WebcastLikeMessage.class, TikTokLikeEvent.class, msg);
         roomInfo.setLikesCount(event.getTotalLikes());
         return event;
     }
@@ -200,7 +175,7 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
         return new TikTokRoomPinEvent(pinMessage, chatEvent);
     }
 
-    //TODO check
+    //TODO Probably not working
     @SneakyThrows
     private TikTokEvent handlePollEvent(byte[] msg) {
         var poolMessage = WebcastPollMessage.parseFrom(msg);

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

@@ -0,0 +1,86 @@
+package io.github.jwdeveloper.tiktok.handlers.events;
+
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
+import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
+import io.github.jwdeveloper.tiktok.data.models.Picture;
+import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
+import io.github.jwdeveloper.tiktok.data.models.gifts.GiftSendType;
+import io.github.jwdeveloper.tiktok.live.GiftManager;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGiftMessage;
+import lombok.SneakyThrows;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TikTokGiftEventHandler {
+    private final GiftManager giftManager;
+    private final Map<Long, WebcastGiftMessage> giftsMessages;
+
+    public TikTokGiftEventHandler(GiftManager giftManager) {
+        this.giftManager = giftManager;
+        giftsMessages = new HashMap<>();
+    }
+
+    @SneakyThrows
+    public List<TikTokEvent> handleGift(byte[] msg) {
+        var currentMessage = WebcastGiftMessage.parseFrom(msg);
+        var userId = currentMessage.getUser().getId();
+        var currentType = GiftSendType.fromNumber(currentMessage.getSendType());
+        var containsPreviousMessage = giftsMessages.containsKey(userId);
+
+        if (!containsPreviousMessage) {
+            if (currentType == GiftSendType.Finished) {
+                return List.of(getGiftEvent(currentMessage));
+            } else {
+                giftsMessages.put(userId, currentMessage);
+                return List.of(getGiftComboEvent(currentMessage, GiftSendType.Begin));
+            }
+        }
+
+        var previousMessage = giftsMessages.get(userId);
+        var previousType = GiftSendType.fromNumber(previousMessage.getSendType());
+        if (currentType == GiftSendType.Active &&
+                previousType == GiftSendType.Active) {
+            giftsMessages.put(userId, currentMessage);
+            return List.of(getGiftComboEvent(currentMessage, GiftSendType.Active));
+        }
+
+
+        if (currentType == GiftSendType.Finished &&
+                previousType == GiftSendType.Active) {
+            giftsMessages.clear();
+            return List.of(
+                    getGiftComboEvent(currentMessage, GiftSendType.Finished),
+                    getGiftEvent(currentMessage));
+        }
+
+        return List.of();
+    }
+
+    private TikTokGiftEvent getGiftEvent(WebcastGiftMessage message) {
+        var gift = getGiftObject(message);
+        return new TikTokGiftEvent(gift, message);
+    }
+
+    private TikTokGiftEvent getGiftComboEvent(WebcastGiftMessage message, GiftSendType state) {
+        var gift = getGiftObject(message);
+        return new TikTokGiftComboEvent(gift, message, state);
+    }
+
+    private Gift getGiftObject(WebcastGiftMessage giftMessage) {
+        var gift = giftManager.findById((int) giftMessage.getGiftId());
+        if (gift == Gift.UNDEFINED) {
+            gift = giftManager.findByName(giftMessage.getGift().getName());
+        }
+        if (gift == Gift.UNDEFINED) {
+            gift = giftManager.registerGift(
+                    (int) giftMessage.getGift().getId(),
+                    giftMessage.getGift().getName(),
+                    giftMessage.getGift().getDiamondCount(),
+                    Picture.map(giftMessage.getGift().getImage()));
+        }
+        return gift;
+    }
+}