Merge pull request #67 from jwdeveloper/develop-1.5.1

Fix for mapping of HttpResponse & HttpRequest and more!

API/pom.xml

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

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

@@ -86,9 +86,15 @@ public class LiveClientSettings {
     private HttpClientSettings httpSettings;
 
     /**
-     * Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId
-     * documentation how to obtain sessionId https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages
+     * Interval of time in milliseconds between pings to TikTok
+     * @apiNote Min: 250 (0.25 seconds), Default: 5000 (5 seconds)
      */
+    private long pingInterval = 5000;
+
+    /**
+	 * Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId
+	 * @see <a href="https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages">Documentation: How to obtain sessionId</a>
+	 */
     private String sessionId;
 
     /**

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

@@ -59,9 +59,16 @@ public interface LiveClient {
     /**
      * Use to manually invoke event
      */
-     void publishEvent(TikTokEvent event);
+    void publishEvent(TikTokEvent event);
 
-     void publishMessage(String base64);
+
+    /**
+     * @param webcastMessageName name of TikTok protocol-buffer message
+     * @param payloadBase64      protocol-buffer message bytes payload
+     */
+    void publishMessage(String webcastMessageName, String payloadBase64);
+
+    void publishMessage(String webcastMessageName, byte[] payload);
 
     /**
      * Get information about gifts

Client/pom.xml

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

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

@@ -28,7 +28,6 @@ import io.github.jwdeveloper.tiktok.http.LiveHttpClient;
 import io.github.jwdeveloper.tiktok.live.GiftsManager;
 import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public class TikTokLive {
@@ -102,14 +101,9 @@ public class TikTokLive {
      * @return GiftsManager
      */
     public static GiftsManager gifts() {
-        if (giftsManager != null) {
-            return giftsManager;
-        }
-        synchronized (GiftsManager.class)
-        {
-            if (giftsManager == null)
-            {
-                return new TikTokGiftsManager(requests().fetchGiftsData().getGifts());
+        if (giftsManager == null) {
+            synchronized (GiftsManager.class) {
+                giftsManager = new TikTokGiftsManager(requests().fetchGiftsData().getGifts());
             }
         }
         return giftsManager;

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

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok;
 
+import com.google.protobuf.ByteString;
 import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokReconnectingEvent;
@@ -39,10 +40,12 @@ import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
 import io.github.jwdeveloper.tiktok.live.GiftsManager;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.live.LiveRoomInfo;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
 import io.github.jwdeveloper.tiktok.models.ConnectionState;
 import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
 import io.github.jwdeveloper.tiktok.websocket.SocketClient;
 
+import java.util.Base64;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
@@ -56,15 +59,19 @@ public class TikTokLiveClient implements LiveClient {
     private final TikTokListenersManager listenersManager;
     private final Logger logger;
     private final GiftsManager giftsManager;
+    private final TikTokLiveMessageHandler messageHandler;
 
-    public TikTokLiveClient(GiftsManager giftsManager,
-                            TikTokRoomInfo tikTokLiveMeta,
-                            LiveHttpClient tiktokHttpClient,
-                            SocketClient webSocketClient,
-                            TikTokLiveEventHandler tikTokEventHandler,
-                            LiveClientSettings clientSettings,
-                            TikTokListenersManager listenersManager,
-                            Logger logger) {
+    public TikTokLiveClient(
+            TikTokLiveMessageHandler messageHandler,
+            GiftsManager giftsManager,
+            TikTokRoomInfo tikTokLiveMeta,
+            LiveHttpClient tiktokHttpClient,
+            SocketClient webSocketClient,
+            TikTokLiveEventHandler tikTokEventHandler,
+            LiveClientSettings clientSettings,
+            TikTokListenersManager listenersManager,
+            Logger logger) {
+        this.messageHandler = messageHandler;
         this.giftsManager = giftsManager;
         this.liveRoomInfo = tikTokLiveMeta;
         this.httpClient = tiktokHttpClient;
@@ -184,6 +191,20 @@ public class TikTokLiveClient implements LiveClient {
         tikTokEventHandler.publish(this, event);
     }
 
+    @Override
+    public void publishMessage(String webcastMessageName, String payloadBase64) {
+        this.publishMessage(webcastMessageName, Base64.getDecoder().decode(payloadBase64));
+    }
+    @Override
+    public void publishMessage(String webcastMessageName, byte[] payload) {
+
+        var builder = WebcastResponse.Message.newBuilder();
+        builder.setMethod(webcastMessageName);
+        builder.setPayload(ByteString.copyFrom(payload));
+        var message = builder.build();
+        messageHandler.handleSingleMessage(this, message);
+    }
+
     @Override
     public GiftsManager getGiftManager() {
         return giftsManager;

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

@@ -96,6 +96,9 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         if (clientSettings.getHostName().startsWith("@"))
             clientSettings.setHostName(clientSettings.getHostName().substring(1));
 
+        if (clientSettings.getPingInterval() < 250)
+            throw new TikTokLiveException("Minimum allowed ping interval is 250 millseconds");
+
         var httpSettings = clientSettings.getHttpSettings();
         httpSettings.getParams().put("app_language", clientSettings.getClientLanguage());
         httpSettings.getParams().put("webcast_language", clientSettings.getClientLanguage());
@@ -129,6 +132,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
                         eventHandler);
 
         return new TikTokLiveClient(
+                messageHandler,
                 giftsManager,
                 tiktokRoomInfo,
                 liveHttpClient,

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

@@ -83,7 +83,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             .toJsonResponse();
 
         if (result.isFailure())
-            throw new TikTokLiveRequestException("Unable to fetch gifts information's"+result.toStack());
+            throw new TikTokLiveRequestException("Unable to fetch gifts information's - "+result);
 
         var json = result.getContent();
         return giftsDataMapper.map(json);
@@ -111,10 +111,10 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             .toJsonResponse();
 
         if (result.isFailure())
-            throw new TikTokLiveRequestException("Unable to get information's about user"+result.toStack());
+            throw new TikTokLiveRequestException("Unable to get information's about user - "+result);
 
         var json = result.getContent();
-        return liveUserDataMapper.map(json);
+        return liveUserDataMapper.map(json, logger);
     }
 
     @Override
@@ -138,7 +138,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             .toJsonResponse();
 
         if (result.isFailure())
-            throw new TikTokLiveRequestException("Unable to get info about live room"+result.toStack());
+            throw new TikTokLiveRequestException("Unable to get info about live room - "+result);
 
         var json = result.getContent();
         return liveDataMapper.map(json);
@@ -153,7 +153,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             var resultHeader = ActionResult.of(credentialsResponse.headers().firstValue("x-set-tt-cookie"));
             if (resultHeader.isFailure()) {
                 logger.warning("SignServer Headers: "+request.getRoomId()+" - "+credentialsResponse.headers().map());
-                throw new TikTokSignServerException("Sign server did not return the x-set-tt-cookie header"+result.toStack());
+                throw new TikTokSignServerException("Sign server did not return the x-set-tt-cookie header - "+result);
             }
             var websocketCookie = resultHeader.getContent();
             var webcastResponse = WebcastResponse.parseFrom(credentialsResponse.body());
@@ -169,7 +169,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
 
             return new LiveConnectionData.Response(websocketCookie, webSocketUrl, webcastResponse);
         } catch (InvalidProtocolBufferException e) {
-            throw new TikTokSignServerException("Unable to parse websocket credentials response to WebcastResponse"+result.toStack());
+            throw new TikTokSignServerException("Unable to parse websocket credentials response to WebcastResponse - "+result);
         }
     }
 
@@ -197,7 +197,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
         var result = builder.build().toResponse();
 
         if (result.isFailure())
-            throw new TikTokSignServerException("Unable to get websocket connection credentials"+result.toStack());
+            throw new TikTokSignServerException("Unable to get websocket connection credentials - "+result);
 
         return result;
     }

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

@@ -1,16 +1,27 @@
 package io.github.jwdeveloper.tiktok.common;
 
+import com.google.gson.*;
+import io.github.jwdeveloper.tiktok.http.mappers.*;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
+import java.net.http.*;
 import java.util.Optional;
 import java.util.function.Function;
 
 @Data
 public class ActionResult<T> {
 
+	private static final Gson gson = new Gson().newBuilder().disableHtmlEscaping()
+		.registerTypeHierarchyAdapter(HttpResponse.class, new HttpResponseJsonMapper())
+		.registerTypeHierarchyAdapter(HttpRequest.class, new HttpRequestJsonMapper())
+		.setPrettyPrinting().create();
+
 	private boolean success = true;
 	private T content;
 	private String message;
+	@Accessors(chain = true, fluent = true)
+	private ActionResult<?> previous;
 
 	protected ActionResult(T object) {
 		this.content = object;
@@ -41,8 +52,9 @@ public class ActionResult<T> {
 	public boolean hasMessage() {
 		return message != null;
 	}
-	public String toStack() {
-		return hasMessage() ? " - "+message : "";
+
+	public boolean hasPrevious() {
+		return previous != null;
 	}
 
 	public boolean hasContent() {
@@ -84,4 +96,18 @@ public class ActionResult<T> {
 	public static <T> ActionResult<T> failure() {
 		return failure(null);
 	}
+
+	public JsonObject toJson() {
+		JsonObject map = new JsonObject();
+		map.addProperty("success", success);
+		map.add("content", gson.toJsonTree(content));
+		map.addProperty("message", message);
+		map.add("previous", hasPrevious() ? previous.toJson() : null);
+		return map;
+	}
+
+	@Override
+	public String toString() {
+		return "ActionResult: "+gson.toJson(toJson());
+	}
 }

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

@@ -1,5 +1,8 @@
 package io.github.jwdeveloper.tiktok.common;
 
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
@@ -7,6 +10,8 @@ public class ActionResultBuilder<T>
 {
 	private final T content;
 	private String message;
+	@Setter @Accessors(fluent = true, chain = true)
+	private ActionResult<?> previous;
 
 	public ActionResultBuilder(T content) {
 		this.content = content;
@@ -18,10 +23,10 @@ public class ActionResultBuilder<T>
 	}
 
 	public ActionResult<T> success() {
-		return ActionResult.success(content, message);
+		return ActionResult.success(content, message).previous(previous);
 	}
 
 	public ActionResult<T> failure() {
-		return ActionResult.success(content, message);
+		return ActionResult.success(content, message).previous(previous);
 	}
 }

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

@@ -0,0 +1,21 @@
+package io.github.jwdeveloper.tiktok.http.mappers;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+import java.net.http.HttpRequest;
+
+public class HttpRequestJsonMapper implements JsonSerializer<HttpRequest>
+{
+	@Override
+	public JsonElement serialize(HttpRequest src, Type typeOfSrc, JsonSerializationContext context) {
+		JsonObject object = new JsonObject();
+		object.addProperty("method", src.method());
+		object.add("timeout", context.serialize(src.timeout().toString()));
+		object.addProperty("expectContinue", src.expectContinue());
+		object.add("uri", context.serialize(src.uri()));
+		object.add("version", context.serialize(src.version().toString()));
+		object.add("headers", context.serialize(src.headers().map()));
+		return object;
+	}
+}

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

@@ -0,0 +1,21 @@
+package io.github.jwdeveloper.tiktok.http.mappers;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+import java.net.http.HttpResponse;
+
+public class HttpResponseJsonMapper implements JsonSerializer<HttpResponse>
+{
+	@Override
+	public JsonElement serialize(HttpResponse src, Type typeOfSrc, JsonSerializationContext context) {
+		JsonObject object = new JsonObject();
+		object.addProperty("statusCode", src.statusCode());
+		object.add("request", context.serialize(src.request()));
+		object.add("headers", context.serialize(src.headers().map()));
+		object.add("body", context.serialize(src.body()));
+		object.add("uri", context.serialize(src.uri().toString()));
+		object.add("version", context.serialize(src.version().toString()));
+		return object;
+	}
+}

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

@@ -22,45 +22,52 @@
  */
 package io.github.jwdeveloper.tiktok.http.mappers;
 
-import com.google.gson.JsonParser;
+import com.google.gson.*;
 import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 
+import java.util.logging.Logger;
+
 public class LiveUserDataMapper
 {
-    public LiveUserData.Response map(String json) {
-        var jsonObject = JsonParser.parseString(json).getAsJsonObject();
+    public LiveUserData.Response map(String json, Logger logger) {
+        try {
+            var jsonObject = JsonParser.parseString(json).getAsJsonObject();
 
-        var message = jsonObject.get("message").getAsString();
+            var message = jsonObject.get("message").getAsString();
 
-        if (message.equals("params_error")) {
-            throw new TikTokLiveRequestException("fetchRoomIdFromTiktokApi -> Unable to fetch roomID, contact the developer");
-        }
-        if (message.equals("user_not_found")) {
+            if (message.equals("params_error")) {
+                throw new TikTokLiveRequestException("fetchRoomIdFromTiktokApi -> Unable to fetch roomID, contact the developer");
+            }
+            if (message.equals("user_not_found")) {
+                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
+            }
+            //live -> status 2
+            //live paused -> 3
+            //not live -> status 4
+            var element = jsonObject.get("data");
+            if (element.isJsonNull()) {
+                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
+            }
+            var data = element.getAsJsonObject();
+            var user = data.getAsJsonObject("user");
+            var roomId = user.get("roomId").getAsString();
+            var status = user.get("status").getAsInt();
+
+            var liveRoom = data.getAsJsonObject("liveRoom");
+            long startTime = liveRoom.get("startTime").getAsLong();
+
+            var statusEnum = switch (status) {
+                case 2 -> LiveUserData.UserStatus.Live;
+                case 3 -> LiveUserData.UserStatus.LivePaused;
+                case 4 -> LiveUserData.UserStatus.Offline;
+                default -> LiveUserData.UserStatus.NotFound;
+            };
+
+            return new LiveUserData.Response(json, statusEnum, roomId, startTime);
+        } catch (JsonSyntaxException | IllegalStateException e) {
+            logger.warning("Malformed Json: '"+json+"' - Error Message: "+e.getMessage());
             return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
         }
-        //live -> status 2
-        //live paused -> 3
-        //not live -> status 4
-        var element = jsonObject.get("data");
-        if (element.isJsonNull()) {
-            return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
-        }
-        var data = element.getAsJsonObject();
-        var user = data.getAsJsonObject("user");
-        var roomId = user.get("roomId").getAsString();
-        var status = user.get("status").getAsInt();
-
-        var liveRoom = data.getAsJsonObject("liveRoom");
-        long startTime = liveRoom.get("startTime").getAsLong();
-
-        var statusEnum = switch (status) {
-            case 2 -> LiveUserData.UserStatus.Live;
-            case 3 -> LiveUserData.UserStatus.LivePaused;
-            case 4 -> LiveUserData.UserStatus.Offline;
-            default -> LiveUserData.UserStatus.NotFound;
-        };
-
-        return new LiveUserData.Response(json, statusEnum, roomId, startTime);
     }
 }

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

@@ -82,7 +82,7 @@ public class TikTokWebSocketClient implements SocketClient {
     private void connectDefault() {
         try {
             webSocketClient.connect();
-            pingingTask.run(webSocketClient);
+            pingingTask.run(webSocketClient, clientSettings.getPingInterval());
             isConnected = true;
         } catch (Exception e) {
             isConnected = false;
@@ -112,7 +112,7 @@ public class TikTokWebSocketClient implements SocketClient {
                     proxySettings.remove();
                 continue;
             }
-            pingingTask.run(webSocketClient);
+            pingingTask.run(webSocketClient, clientSettings.getPingInterval());
             isConnected = true;
             break;
         }

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

@@ -8,13 +8,13 @@ public class TikTokWebSocketPingingTask
 {
     private Thread thread;
     private boolean isRunning = false;
-    private final int MIN_TIMEOUT = 250;
-    private final int MAX_TIMEOUT = 500;
+    private final int MAX_TIMEOUT = 250;
+    private final int SLEEP_TIME = 500;
 
-    public void run(WebSocket webSocket)
+    public void run(WebSocket webSocket, long pingTaskTime)
     {
         stop();
-        thread = new Thread(() -> pingTask(webSocket));
+        thread = new Thread(() -> pingTask(webSocket, pingTaskTime));
         isRunning = true;
         thread.start();
     }
@@ -26,20 +26,18 @@ public class TikTokWebSocketPingingTask
         isRunning = false;
     }
 
-
-    private void pingTask(WebSocket webSocket)
+    private void pingTask(WebSocket webSocket, long pingTaskTime)
     {
         var random = new Random();
         while (isRunning) {
             try {
                 if (!webSocket.isOpen()) {
-                    Thread.sleep(100);
+                    Thread.sleep(SLEEP_TIME);
                     continue;
                 }
                 webSocket.sendPing();
 
-                var timeout = random.nextInt(MAX_TIMEOUT)+MIN_TIMEOUT;
-                Thread.sleep(timeout);
+                Thread.sleep(pingTaskTime+random.nextInt(MAX_TIMEOUT));
             }
             catch (Exception e) {
                 isRunning = false;

Examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.3.0-Release</version>
+        <version>1.5.0-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.3.0-Release</version>
+            <version>1.5.0-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

@@ -25,24 +25,18 @@ package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.extension.collector.TikTokLiveCollector;
 
+import java.io.File;
 import java.io.IOException;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class CollectorExample {
 
-
-    private static String mongoUser;
-
-    private static String mongoPassword;
-
-    private static String mongoDatabase;
-
     public static void main(String[] args) throws IOException {
 
-        var collector = TikTokLiveCollector.useMongo(settings ->
+        var path = "C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\Examples\\src\\main\\resources";
+        var collector = TikTokLiveCollector.useFile(settings ->
         {
-            settings.setConnectionUrl("mongodb+srv://" + mongoUser + ":" + mongoPassword + "@" + mongoDatabase + "/?retryWrites=true&w=majority");
+            settings.setParentFile(new File(path));
         });
         collector.connect();
 
@@ -58,18 +52,11 @@ public class CollectorExample {
                     {
                         event.getException().printStackTrace();
                     })
-                    .addListener(collector.newListener(additionalDataFields, document ->
-                    {
-                        //filtering document data before it is inserted to database
-                        if (document.get("dataType") == "message") {
-                            return false;
-                        }
-                        return true;
-                    }))
+                    .addListener(collector.newListener(additionalDataFields))
                     .buildAndConnectAsync();
         }
 
         System.in.read();
         collector.disconnect();
     }
-}
+}

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

@@ -1,7 +1,6 @@
 package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.data.events.TikTokCommentEvent;
-import io.github.jwdeveloper.tiktok.data.events.TikTokSubNotifyEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokSubscribeEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
@@ -11,7 +10,9 @@ import io.github.jwdeveloper.tiktok.data.events.social.TikTokLikeEvent;
 import io.github.jwdeveloper.tiktok.data.models.gifts.GiftComboStateType;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 
-public class Events_And_Gifts_Testing_Example {
+public class Events_And_Gifts_Testing_Example
+{
+
     public static void main(String[] args) {
         LiveClient client = TikTokLive.newClient(ConnectionExample.TIKTOK_HOSTNAME)
                 .configure(liveClientSettings ->
@@ -35,6 +36,10 @@ public class Events_And_Gifts_Testing_Example {
                 {
                     liveClient.getLogger().info("New fake Gift: " + event.getGift());
                 })
+                .onLike((liveClient, event) ->
+                {
+                    liveClient.getLogger().info("New fake Like event: " + event.getLikes());
+                })
                 .build();
 
         var gifts = TikTokLive.gifts();
@@ -57,11 +62,13 @@ public class Events_And_Gifts_Testing_Example {
         client.publishEvent(fakeMessage);
         client.publishEvent(fakeSubscriber);
         client.publishEvent(fakeFollow);
-        client.publishEvent(fakeLike);
         client.publishEvent(fakeJoin);
 
+        client.publishEvent(fakeLike);
+        client.publishMessage("WebcastLikeMessage", webcastLikeMessageBase64);
+
         client.disconnect();
     }
 
-
+    private static final String webcastLikeMessageBase64 = "SAFSBRABGKwCUgcIAhABGKwCCv8BUAFYAbABA7gBARCflqWWo8Ha72UgzoPZhd8xQrwBGg4gkAMKCSNmZmZmZmZmZiJ/qgF6CngIhYjjgPWJv7RgGhDwnZKm8J2TjvCdk47wk4WTsgIKa3lsbGVlaGFsbPICTE1TNHdMakFCQUFBQXUyX21LNEw4WGJYa3lNaUFvZzJUTnNmVjk5N09WM2tpQ3NCTkNjYWkwcWxIcUt0Q3B0UGU1N2RLYVhxb0xWSXoICwoQcG1fbXRfbXNnX3ZpZXdlchIXezA6dXNlcn0gbGlrZWQgdGhlIExJVkVIAQoSV2ViY2FzdExpa2VNZXNzYWdlGIaWvY+RhdjvZTABwAEBEA8Y+Voq7RCyAQYImwEQjwK6AQCCAgDyAkxNUzR3TGpBQkFBQUF1Ml9tSzRMOFhiWGt5TWlBb2cyVE5zZlY5OTdPVjNraUNzQk5DY2FpMHFsSHFLdENwdFBlNTdkS2FYcW9MVkl6ggTqCLoBnwUqBggBEAEYIFoNCgASCSNCMzQ3N0VGRoABDwgEEtgEEix3ZWJjYXN0LXZhL2dyYWRlX2JhZGdlX2ljb25fbGl0ZV9sdjE1X3YyLnBuZzrpAnNzbG9jYWw6Ly93ZWJjYXN0X2x5bnh2aWV3X3BvcHVwP3VzZV9zcGFyaz0xJnVybD1odHRwcyUzQSUyRiUyRmxmMTYtZ2Vja28tc291cmNlLnRpa3Rva2Nkbi5jb20lMkZvYmolMkZieXRlLWd1cmQtc291cmNlLXNnJTJGdGlrdG9rJTJGZmUlMkZsaXZlJTJGdGlrdG9rX2xpdmVfcmV2ZW51ZV91c2VyX2xldmVsX21haW4lMkZzcmMlMkZwYWdlcyUyRnByaXZpbGVnZSUyRnBhbmVsJTJGdGVtcGxhdGUuanMmaGlkZV9zdGF0dXNfYmFyPTAmaGlkZV9uYXZfYmFyPTEmY29udGFpbmVyX2JnX2NvbG9yPTAwMDAwMDAwJmhlaWdodD05MCUyNSZiZGhtX2JpZD10aWt0b2tfbGl2ZV9yZXZlbnVlX3VzZXJfbGV2ZWxfbWFpbiZ1c2VfZm9yZXN0PTEKXWh0dHBzOi8vcDE2LXdlYmNhc3QudGlrdG9rY2RuLmNvbS93ZWJjYXN0LXZhL2dyYWRlX2JhZGdlX2ljb25fbGl0ZV9sdjE1X3YyLnBuZ350cGx2LW9iai5pbWFnZQpdaHR0cHM6Ly9wMTktd2ViY2FzdC50aWt0b2tjZG4uY29tL3dlYmNhc3QtdmEvZ3JhZGVfYmFkZ2VfaWNvbl9saXRlX2x2MTVfdjIucG5nfnRwbHYtb2JqLmltYWdlIgIxNTIAOgYaAhIAIgBiDQoAEgkjQjM0NzdFRkZ4DqIBBggBEAEYIAgEEBQYCCABUukCc3Nsb2NhbDovL3dlYmNhc3RfbHlueHZpZXdfcG9wdXA/dXNlX3NwYXJrPTEmdXJsPWh0dHBzJTNBJTJGJTJGbGYxNi1nZWNrby1zb3VyY2UudGlrdG9rY2RuLmNvbSUyRm9iaiUyRmJ5dGUtZ3VyZC1zb3VyY2Utc2clMkZ0aWt0b2slMkZmZSUyRmxpdmUlMkZ0aWt0b2tfbGl2ZV9yZXZlbnVlX3VzZXJfbGV2ZWxfbWFpbiUyRnNyYyUyRnBhZ2VzJTJGcHJpdmlsZWdlJTJGcGFuZWwlMkZ0ZW1wbGF0ZS5qcyZoaWRlX3N0YXR1c19iYXI9MCZoaWRlX25hdl9iYXI9MSZjb250YWluZXJfYmdfY29sb3I9MDAwMDAwMDAmaGVpZ2h0PTkwJTI1JmJkaG1fYmlkPXRpa3Rva19saXZlX3JldmVudWVfdXNlcl9sZXZlbF9tYWluJnVzZV9mb3Jlc3Q9MVgBYk8qAjE1CgEyEhM3MTM4MzgxNzQ3MjkyNTQyNzU2GgEwIi5tb2NrX2ZpeF93aWR0aF90cmFuc3BhcmVudF83MTM4MzgxNzQ3MjkyNTQyNzU2CIWI44D1ib+0YBoQ8J2SpvCdk47wnZOO8JOFk0r1BhJBMTAweDEwMC90b3MtdXNlYXN0OC1hdnQtMDA2OC10eDIvNjY0NmM4NjZjMzI1MWEwOTY3NjhiYjY4OTUyODVjMzEK0gFodHRwczovL3AxOS1wdS1zaWduLXVzZWFzdDgudGlrdG9rY2RuLXVzLmNvbS90b3MtdXNlYXN0OC1hdnQtMDA2OC10eDIvNjY0NmM4NjZjMzI1MWEwOTY3NjhiYjY4OTUyODVjMzF+dHBsdi10aWt0b2stc2hyaW5rOjcyOjcyLndlYnA/bGszcz1hNWQ0ODA3OCZ4LWV4cGlyZXM9MTcwOTMxMjQwMCZ4LXNpZ25hdHVyZT1VMlNEbUk3Z3R5RW9rMlBlWFdmeTNsM1F6NlElM0QKyAFodHRwczovL3AxNi1wdS1zaWduLXVzZWFzdDgudGlrdG9rY2RuLXVzLmNvbS90b3MtdXNlYXN0OC1hdnQtMDA2OC10eDIvNjY0NmM4NjZjMzI1MWEwOTY3NjhiYjY4OTUyODVjMzF+YzVfMTAweDEwMC53ZWJwP2xrM3M9YTVkNDgwNzgmeC1leHBpcmVzPTE3MDkzMTI0MDAmeC1zaWduYXR1cmU9aWNWZEVZa0FnWkYlMkZ2WU5OTSUyRlVNMzE2eG9HdyUzRArGAWh0dHBzOi8vcDE5LXB1LXNpZ24tdXNlYXN0OC50aWt0b2tjZG4tdXMuY29tL3Rvcy11c2Vhc3Q4LWF2dC0wMDY4LXR4Mi82NjQ2Yzg2NmMzMjUxYTA5Njc2OGJiNjg5NTI4NWMzMX5jNV8xMDB4MTAwLndlYnA/bGszcz1hNWQ0ODA3OCZ4LWV4cGlyZXM9MTcwOTMxMjQwMCZ4LXNpZ25hdHVyZT1PQzdBQ3htQUklMkJsYlp4RkVuWktJT1RyRExGUSUzRArGAWh0dHBzOi8vcDE2LXB1LXNpZ24tdXNlYXN0OC50aWt0b2tjZG4tdXMuY29tL3Rvcy11c2Vhc3Q4LWF2dC0wMDY4LXR4Mi82NjQ2Yzg2NmMzMjUxYTA5Njc2OGJiNjg5NTI4NWMzMX5jNV8xMDB4MTAwLmpwZWc/bGszcz1hNWQ0ODA3OCZ4LWV4cGlyZXM9MTcwOTMxMjQwMCZ4LXNpZ25hdHVyZT02YUwlMkZNZWtOeHg5NXlvVTVLOTZON0xwRUlNdyUzRLICCmt5bGxlZWhhbGxCyQEIgojG1pKb0clgErwBChBwbV9tdF9tc2dfdmlld2VyEhd7MDp1c2VyfSBsaWtlZCB0aGUgTElWRRoOCgkjZmZmZmZmZmYgkAMifwgLqgF6CngIhYjjgPWJv7RgGhDwnZKm8J2TjvCdk47wk4WTsgIKa3lsbGVlaGFsbPICTE1TNHdMakFCQUFBQXUyX21LNEw4WGJYa3lNaUFvZzJUTnNmVjk5N09WM2tpQ3NCTkNjYWkwcWxIcUt0Q3B0UGU1N2RLYVhxb0xWSXo=";
 }

README.md

@@ -70,7 +70,7 @@ Maven
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.3.0-Release</version>
+             <version>1.5.0-Release</version>
             <scope>compile</scope>
         </dependency>
    </dependencies>
@@ -87,7 +87,7 @@ dependencyResolutionManagement {
 	}
 
 dependencies {
-	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.1.0-Release'
+	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.5.0-Release'
 	}
 ```
 

Tools-ReadmeGenerator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.3.0-Release</version>
+        <version>1.5.0-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.3.0-Release</version>
+        <version>1.5.0-Release</version>
     </parent>
 
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.3.0-Release</version>
+            <version>1.5.0-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/api/settings/mongo/MongoDataCollectorSettings.java

@@ -29,7 +29,6 @@ import java.util.function.Consumer;
 @Data
 public class MongoDataCollectorSettings {
 
-    @Setter
     private String connectionUrl;
 
     private String databaseName = "tiktok";

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

@@ -3,6 +3,7 @@ package io.github.jwdeveloper.tiktok.extension.collector.impl.storages;
 import io.github.jwdeveloper.tiktok.extension.collector.api.Storage;
 import io.github.jwdeveloper.tiktok.extension.collector.api.settings.FileDataCollectorSettings;
 import org.bson.Document;
+import org.bson.json.JsonWriterSettings;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,11 +30,11 @@ public class FileStorage implements Storage {
 
     @Override
     public void insert(Document document) {
-        var fileName = document.get("dataType") + ":" + document.get("dataTypeName") + ".json";
+        var fileName = document.get("dataType") + "_" + document.get("dataTypeName") + ".json";
         try {
             var file = new File(settings.getParentFile(), fileName);
             file.createNewFile();
-            Files.writeString(file.toPath(), document.toJson(), StandardOpenOption.APPEND);
+            Files.writeString(file.toPath(), document.toJson(JsonWriterSettings.builder().indent(true).build()), StandardOpenOption.APPEND);
         } catch (IOException e) {
             e.printStackTrace();
         }

extension-recorder/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.3.0-Release</version>
+        <version>1.5.0-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.3.0-Release</version>
+    <version>1.5.0-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>