Add Goody Bag proto for testing and update TikTokBarrageEvent for potential use in SuperFan events.

* Add .of methods for custom User objects

Adds an extra .of() function that accepts a User object, instead of a username string.

* Use username if profile name not set

* Add combo argument

* Replace WebcastGiftMessage from the new constructor

* Fix argument naming error

* Fix wrong argument order

API/pom.xml

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

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

@@ -39,9 +39,12 @@ public class TikTokBarrageEvent extends TikTokHeaderEvent {
     private final String eventName;
     private final int duration;
     private final BarrageParam barrageParam;
+    // Expose for now until we know what this is used for
+    private final WebcastBarrageMessage barrageMessage;
 
     public TikTokBarrageEvent(WebcastBarrageMessage msg) {
         super(msg.getCommon());
+        this.barrageMessage = msg;
         icon = Picture.map(msg.getIcon());
         eventName = msg.getEvent().getEventName();
         backGround = Picture.map(msg.getBackground());

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

@@ -39,11 +39,16 @@ public class TikTokGiftComboEvent extends TikTokGiftEvent {
         this.comboState = comboState;
     }
 
+    public TikTokGiftComboEvent(Gift gift, User host, User user, int combo, GiftComboStateType comboState) {
+        super(gift, user, host, combo);
+        this.comboState = comboState;
+    }
+
     public static TikTokGiftComboEvent of(Gift gift, int combo, GiftComboStateType comboState) {
-        return new TikTokGiftComboEvent(
-            gift,
-            new User(0L, "Test", new Picture("")),
-            WebcastGiftMessage.newBuilder().setComboCount(combo).build(),
-            comboState);
+        return new TikTokGiftComboEvent(gift, new User(0L, "Test", new Picture("")), WebcastGiftMessage.newBuilder().setComboCount(combo).build(), comboState);
+    }
+
+    public static TikTokGiftComboEvent of(Gift gift, User host, User user, int combo, GiftComboStateType comboState) {
+        return new TikTokGiftComboEvent(gift, host, user, combo, comboState);
     }
 }

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

@@ -50,16 +50,24 @@ public class TikTokGiftEvent extends TikTokHeaderEvent {
         combo = msg.getComboCount();
     }
     
-    public TikTokGiftEvent(Gift gift) {
+    public TikTokGiftEvent(Gift gift, User user, User toUser, int combo) {
         this.gift = gift;
-        user = new User(0L, "sender", new Picture(""));
-        toUser = new User(0L, "receiver", new Picture(""));
-        combo = 1;
+        this.user = user;
+        this.toUser = toUser;
+        this.combo = combo;
     }
 
-
     public static TikTokGiftEvent of(Gift gift) {
-        return new TikTokGiftEvent(gift);
+        return new TikTokGiftEvent(
+            gift,
+            new User(0L, "sender", new Picture("")),
+            new User(0L, "reviever", new Picture("")),
+            1
+            );
+    }
+
+    public static TikTokGiftEvent of(Gift gift, User user, User toUser) {
+        return new TikTokGiftEvent(gift, user, toUser, 1) ;
     }
 
     public static TikTokGiftEvent of(String name, int id, int diamonds) {

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

@@ -44,10 +44,20 @@ public class TikTokFollowEvent extends TikTokHeaderEvent {
 
     public static TikTokFollowEvent of(String userName) {
         return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
-                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setUsername(userName)
-                        .setNickname(userName)
-                        .build())
-                .build());
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(userName)
+                .setNickname(userName)
+                .build())
+            .build());
+    }
+
+    public static TikTokFollowEvent of(User user) {
+        return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName() != null ? user.getProfileName() : user.getName())
+                .setId(user.getId())
+                .build())
+            .build());
     }
 }

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

@@ -48,13 +48,22 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
         totalUsers = msg.getMemberCount();
     }
 
-    public static TikTokJoinEvent of(String userName)
-    {
+    public static TikTokJoinEvent of(String userName) {
         return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
-                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setUsername(userName)
-                        .setNickname(userName)
-                        .build())
-                .build());
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(userName)
+                .setNickname(userName)
+                .build())
+            .build());
+    }
+
+    public static TikTokJoinEvent of(User user) {
+        return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName())
+                .setId(user.getId())
+                .build())
+            .build());
     }
 }

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

@@ -56,15 +56,25 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
         totalLikes = msg.getTotal();
     }
 
-    public static TikTokLikeEvent of(String userName, int likes)
-    {
+    public static TikTokLikeEvent of(String userName, int likes) {
         return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
-                .setCount(likes)
-                .setTotal(likes)
-                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setUsername(userName)
-                        .setNickname(userName)
-                        .build())
-                .build());
+            .setCount(likes)
+            .setTotal(likes)
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(userName)
+                .setNickname(userName)
+                .build())
+            .build());
+    }
+
+    public static TikTokLikeEvent of(User user, int likes) {
+        return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
+            .setCount(likes)
+            .setTotal(likes)
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName())
+                .build())
+            .build());
     }
 }

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

@@ -49,10 +49,19 @@ public class TikTokShareEvent extends TikTokHeaderEvent {
 
     public static TikTokShareEvent of(String userName, int shaders) {
         return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
-                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                        .setUsername(userName)
-                        .setNickname(userName)
-                        .build())
-                .build(), shaders);
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(userName)
+                .setNickname(userName)
+                .build())
+            .build(), shaders);
+    }
+
+    public static TikTokShareEvent of(User user, int shaders) {
+        return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName())
+                .build())
+            .build(), shaders);
     }
 }

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

@@ -95,6 +95,9 @@ public class ProxyClientSettings implements Iterator<ProxyData>, Iterable<ProxyD
     public ProxyClientSettings clone() {
         ProxyClientSettings settings = new ProxyClientSettings();
         settings.setEnabled(enabled);
+        settings.setAutoDiscard(autoDiscard);
+        settings.setFallback(fallback);
+        settings.setAllowWebsocket(allowWebsocket);
         settings.setRotation(rotation);
         settings.setIndex(index);
         settings.setType(type);

API/src/main/proto/enums.proto

@@ -836,3 +836,33 @@ enum BattleCardMsgType {
   BATTLE_CARD_MSG_TYPE_USE_TOP_2_CARD = 10;
   BATTLE_CARD_MSG_TYPE_USE_TOP_3_CARD = 11;
 }
+
+enum GoodyBagMessageType {
+  GOODY_BAG_MESSAGE_TYPE_UNKNOWN = 0;
+  GOODY_BAG_MESSAGE_TYPES_END = 1;
+  GOODY_BAG_MESSAGE_TYPE_JOIN = 2;
+  GOODY_BAG_MESSAGE_TYPE_WINNERS_INFO = 3;
+}
+
+enum GoodyBagBiz {
+  GOODY_BAG_BIZ_UNKNOWN = 0;
+  GOODY_BAG_BIZ_NORMAL_COIN = 1;
+  GOODY_BAG_BIZ_FANS_CLUB = 2;
+  GOODY_BAG_BIZ_PLATFORM_NORMAL = 100;
+  GOODY_BAG_BIZ_PLATFORM_FANS_CLUB = 101;
+  GOODY_BAG_BIZ_LEVEL_UP_PARTY_REWARD_NORMAL = 110;
+  GOODY_BAG_BIZ_LEVEL_UP_PARTY_REWARD_FANS_CLUB = 111;
+}
+
+enum ParticipateMethod {
+  PARTICIPATE_METHOD_UNKNOWN = 0;
+  PARTICIPATE_METHOD_COMMENT = 1;
+  PARTICIPATE_METHOD_SHARE = 2;
+  PARTICIPATE_METHOD_NO_THRESHOLD = 3;
+}
+
+enum ParticipateThresholdType {
+  PARTICIPATE_THRESHOLD_TYPE_PARTICIPATE_THRESHOLD_UNKNOWN = 0;
+  PARTICIPATE_THRESHOLD_TYPE_PARTICIPATE_THRESHOLD_ALL_VIEWER = 1;
+  PARTICIPATE_THRESHOLD_TYPE_PARTICIPATE_THRESHOLD_FANS_CLUB = 2;
+}

API/src/main/proto/webcast.proto

@@ -1589,3 +1589,49 @@ message WebcastLinkMicBattleItemCard {
     }
   }
 }
+
+message WebcastGoodyBagMessage {
+  CommonMessageData base_message = 1;
+  GoodyBagBaseInfo base_info = 2;
+  repeated GoodyBagWinnerInfo winners = 3;
+  GoodyBagMessageType type = 4;
+
+  message GoodyBagBaseInfo {
+    string goody_bag_id = 1;
+    GoodyBagBiz biz = 2;
+    string room_id = 3;
+    GoodyBagCommonDetail common_detail = 4;
+    GoodyBagCoinDetail coin_detail = 5;
+
+    message GoodyBagCommonDetail {
+      int32 winner_headcount = 1;
+      int32 joined_headcount = 2;
+      ParticipateMethod participate_method = 3;
+      string participate_method_content = 4;
+      int32 open_at = 5;
+      int32 count_down_minutes = 6;
+      ParticipateThresholdSelected participate_threshold_selected = 7;
+
+      message ParticipateThresholdSelected {
+        ParticipateThresholdType type = 1;
+        int64 value = 2;
+      }
+    }
+
+    message GoodyBagCoinDetail {
+      int32 total_coin = 1;
+    }
+  }
+
+  message GoodyBagWinnerInfo {
+    GoodyBagUserInfo user_info = 1;
+    int32 coins = 2;
+  }
+
+  message GoodyBagUserInfo {
+    string user_id = 1;
+    string nickname = 2;
+    string display_id = 3;
+    Image avatar = 4;
+  }
+}

Client/pom.xml

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

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

@@ -69,7 +69,7 @@ public class HttpClient {
         }
     }
 
-    public <T> ActionResult<T> toResponse(HttpResponse.BodyHandler<T> handler) {
+    protected <T> ActionResult<T> toResponse(HttpResponse.BodyHandler<T> handler) {
         return toHttpResponse(handler).map(HttpResponse::body);
     }
 

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

@@ -31,9 +31,11 @@ import java.io.IOException;
 import java.net.*;
 import java.net.http.*;
 import java.net.http.HttpResponse.ResponseInfo;
+import java.nio.ByteBuffer;
 import java.security.*;
 import java.security.cert.X509Certificate;
 import java.util.*;
+import java.util.concurrent.Flow;
 import java.util.stream.Collectors;
 
 public class HttpProxyClient extends HttpClient {
@@ -45,14 +47,14 @@ public class HttpProxyClient extends HttpClient {
 		this.proxySettings = httpClientSettings.getProxyClientSettings();
 	}
 
-	public ActionResult<HttpResponse<byte[]>> toResponse() {
+	public <T> ActionResult<HttpResponse<T>> toHttpResponse(HttpResponse.BodyHandler<T> handler) {
 		return switch (proxySettings.getType()) {
-			case HTTP, DIRECT -> handleHttpProxyRequest();
-			default -> handleSocksProxyRequest();
+			case HTTP, DIRECT -> handleHttpProxyRequest(handler);
+			default -> handleSocksProxyRequest(handler);
 		};
 	}
 
-	public ActionResult<HttpResponse<byte[]>> handleHttpProxyRequest() {
+	public <T> ActionResult<HttpResponse<T>> handleHttpProxyRequest(HttpResponse.BodyHandler<T> handler) {
 		var builder = java.net.http.HttpClient.newBuilder()
 			.followRedirects(java.net.http.HttpClient.Redirect.NORMAL)
 			.cookieHandler(new CookieManager())
@@ -67,7 +69,7 @@ public class HttpProxyClient extends HttpClient {
 				var client = builder.build();
 				var request = prepareRequest();
 
-				var response = client.send(request, HttpResponse.BodyHandlers.ofByteArray());
+				var response = client.send(request, handler);
 				if (response.statusCode() != 200)
 					continue;
 				return ActionResult.success(response);
@@ -77,7 +79,7 @@ public class HttpProxyClient extends HttpClient {
 				throw new TikTokProxyRequestException(e);
 			} catch (IOException e) {
 				if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
-					return super.toHttpResponse(HttpResponse.BodyHandlers.ofByteArray());
+					return super.toHttpResponse(handler);
 				throw new TikTokProxyRequestException(e);
 			} catch (Exception e) {
 				throw new TikTokLiveRequestException(e);
@@ -86,7 +88,7 @@ public class HttpProxyClient extends HttpClient {
 		throw new TikTokLiveRequestException("No more proxies available!");
 	}
 
-	private ActionResult<HttpResponse<byte[]>> handleSocksProxyRequest() {
+	private <T> ActionResult<HttpResponse<T>> handleSocksProxyRequest(HttpResponse.BodyHandler<T> handler) {
 		try {
 			SSLContext sc = SSLContext.getInstance("SSL");
 			sc.init(null, new TrustManager[]{ new X509TrustManager() {
@@ -95,7 +97,8 @@ public class HttpProxyClient extends HttpClient {
 				public X509Certificate[] getAcceptedIssuers() { return null; }
 			}}, null);
 
-			URL url = toUri().toURL();
+			URI uri = toUri();
+			URL url = uri.toURL();
 
 			if (proxySettings.hasNext()) {
 				try {
@@ -117,12 +120,22 @@ public class HttpProxyClient extends HttpClient {
 
 					var responseInfo = createResponseInfo(socksConnection.getResponseCode(), headers);
 
-					var response = createHttpResponse(body, toUri(), responseInfo);
+					HttpResponse.BodySubscriber<T> subscriber = handler.apply(responseInfo);
+
+					subscriber.onSubscribe(new Flow.Subscription() {
+						@Override public void request(long n) {}
+						@Override public void cancel() {}
+					});
+
+					subscriber.onNext(List.of(ByteBuffer.wrap(body)));
+					subscriber.onComplete();
+
+					var response = createHttpResponse(subscriber.getBody().toCompletableFuture().join(), uri, responseInfo);
 
 					return ActionResult.success(response);
 				} catch (IOException e) {
 					if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
-						return super.toHttpResponse(HttpResponse.BodyHandlers.ofByteArray());
+						return super.toHttpResponse(handler);
 					if (proxySettings.isAutoDiscard())
 						proxySettings.remove();
 					throw new TikTokProxyRequestException(e);
@@ -160,7 +173,7 @@ public class HttpProxyClient extends HttpClient {
 		};
 	}
 
-	private HttpResponse<byte[]> createHttpResponse(byte[] body,
+	private <T> HttpResponse<T> createHttpResponse(T body,
 												   URI uri,
 												   ResponseInfo info) {
 		return new HttpResponse<>()
@@ -176,7 +189,7 @@ public class HttpProxyClient extends HttpClient {
 			}
 
 			@Override
-			public Optional<HttpResponse<byte[]>> previousResponse() {
+			public Optional<HttpResponse<T>> previousResponse() {
 				return Optional.empty();
 			}
 
@@ -186,7 +199,7 @@ public class HttpProxyClient extends HttpClient {
 			}
 
 			@Override
-			public byte[] body() {
+			public T body() {
 				return body;
 			}
 

Client/src/main/java/io/github/jwdeveloper/tiktok/http/mappers/LiveUserDataMapper.java

@@ -29,7 +29,7 @@ import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 
-import java.util.List;
+import java.util.*;
 import java.util.logging.Logger;
 
 public class LiveUserDataMapper
@@ -109,7 +109,7 @@ public class LiveUserDataMapper
             roomInfo.setRoomId(roomId);
             roomInfo.setTitle(roomInfoJson.get("title").getAsString());
             roomInfo.setStartTime(roomInfoJson.get("startTime").getAsLong());
-            roomInfo.setViewersCount(roomInfoJson.get("currentViewers").getAsInt());
+            roomInfo.setViewersCount(Optional.ofNullable(roomInfoJson.get("currentViewers")).filter(JsonElement::isJsonPrimitive).map(JsonElement::getAsInt).orElse(0));
             roomInfo.setTotalViewersCount(roomInfoJson.get("totalViewers").getAsInt());
 
             var statusEnum = switch (status) {

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

@@ -26,10 +26,7 @@ import io.github.jwdeveloper.dependance.api.DependanceContainer;
 import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.link.*;
 import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokCommonEventHandler;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokRoomInfoEventHandler;
-import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokSocialMediaEventHandler;
+import io.github.jwdeveloper.tiktok.mappers.handlers.*;
 import io.github.jwdeveloper.tiktok.messages.webcast.*;
 
 import static io.github.jwdeveloper.tiktok.messages.enums.LinkMessageType.*;
@@ -58,7 +55,6 @@ public class MessagesMapperFactory {
             return MappingResult.of(messageObject, new TikTokCaptionEvent(messageObject));
         });
 
-
         //User Interactions events
         mapper.forMessage(WebcastChatMessage.class, (inputBytes, messageName, mapperHelper) ->
         {
@@ -145,7 +141,10 @@ public class MessagesMapperFactory {
         //Others events
         //  mapper.webcastObjectToConstructor(WebcastInRoomBannerMessage.class, TikTokInRoomBannerEvent.class);
         //   mapper.webcastObjectToConstructor(WebcastMsgDetectMessage.class, TikTokDetectEvent.class);
-        //   mapper.webcastObjectToConstructor(WebcastBarrageMessage.class, TikTokBarrageEvent.class);
+        mapper.forMessage(WebcastBarrageMessage.class, (inputBytes, messageName, mapperHelper) -> {
+            var message = mapperHelper.bytesToWebcastObject(inputBytes, WebcastBarrageMessage.class);
+            return MappingResult.of(message, new TikTokBarrageEvent(message));
+        });
         //   mapper.webcastObjectToConstructor(WebcastUnauthorizedMemberMessage.class, TikTokUnauthorizedMemberEvent.class);
         //   mapper.webcastObjectToConstructor(WebcastOecLiveShoppingMessage.class, TikTokShopEvent.class);
         //   mapper.webcastObjectToConstructor(WebcastImDeleteMessage.class, TikTokIMDeleteEvent.class);

examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.5-Release</version>
+        <version>1.11.9-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.11.5-Release</version>
+        <version>1.11.9-Release</version>
     </parent>
 
 

extension-recorder/pom.xml

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

pom.xml

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

tools-readme/pom.xml

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