Merge remote-tracking branch 'origin/master'

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.2-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
+     * Interval of time in milliseconds between pings to TikTok
-     * documentation how to obtain sessionId https://github.com/isaackogan/TikTok-Live-Connector#send-chat-messages
+     * @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;
 
     /**

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.2-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) {
+        if (giftsManager == null) {
-            return giftsManager;
+            synchronized (GiftsManager.class) {
-        }
+                giftsManager = new TikTokGiftsManager(requests().fetchGiftsData().getGifts());
-        synchronized (GiftsManager.class)
-        {
-            if (giftsManager == null)
-            {
-                return new TikTokGiftsManager(requests().fetchGiftsData().getGifts());
             }
         }
         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());

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) {
+    public LiveUserData.Response map(String json, Logger logger) {
-        var jsonObject = JsonParser.parseString(json).getAsJsonObject();
+        try {
+            var jsonObject = JsonParser.parseString(json).getAsJsonObject();
 
-        var message = jsonObject.get("message").getAsString();
+            var message = jsonObject.get("message").getAsString();
 
-        if (message.equals("params_error")) {
+            if (message.equals("params_error")) {
-            throw new TikTokLiveRequestException("fetchRoomIdFromTiktokApi -> Unable to fetch roomID, contact the developer");
+                throw new TikTokLiveRequestException("fetchRoomIdFromTiktokApi -> Unable to fetch roomID, contact the developer");
-        }
+            }
-        if (message.equals("user_not_found")) {
+            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 = 250;
-    private final int MAX_TIMEOUT = 500;
+    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, long pingTaskTime)
-    private void pingTask(WebSocket webSocket)
     {
         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(pingTaskTime+random.nextInt(MAX_TIMEOUT));
-                Thread.sleep(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.2-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.2-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.*;
-import java.util.Map;
 
 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,14 +52,7 @@ public class CollectorExample {
                     {
                         event.getException().printStackTrace();
                     })
-                    .addListener(collector.newListener(additionalDataFields, document ->
+                    .addListener(collector.newListener(additionalDataFields))
-                    {
-                        //filtering document data before it is inserted to database
-                        if (document.get("dataType") == "message") {
-                            return false;
-                        }
-                        return true;
-                    }))
                     .buildAndConnectAsync();
         }
 

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.2-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.2-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.2-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

extension-collector/src/main/java/io/github/jwdeveloper/tiktok/extension/collector/api/CollectorEvent.java

@@ -0,0 +1,8 @@
+package io.github.jwdeveloper.tiktok.extension.collector.api;
+
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+import org.bson.Document;
+
+public interface CollectorEvent {
+    boolean execute(LiveClient client, Document document);
+}

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

@@ -1,5 +1,6 @@
 package io.github.jwdeveloper.tiktok.extension.collector.api.settings;
 
+import io.github.jwdeveloper.tiktok.extension.collector.api.CollectorEvent;
 import lombok.Data;
 import org.bson.Document;
 
@@ -9,5 +10,5 @@ import java.util.function.Function;
 @Data
 public class CollectorListenerSettings {
     private Map<String, Object> extraFields;
-    private Function<Document, Boolean> filter;
+    private CollectorEvent filter;
 }

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/DataCollector.java

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.extension.collector.impl;
 
+import io.github.jwdeveloper.tiktok.extension.collector.api.CollectorEvent;
 import io.github.jwdeveloper.tiktok.extension.collector.api.Storage;
 import io.github.jwdeveloper.tiktok.extension.collector.api.settings.CollectorListenerSettings;
 import org.bson.Document;
@@ -40,6 +41,7 @@ public class DataCollector {
     public void connect() {
         storage.connect();
     }
+
     public void disconnect() {
         storage.disconnect();
     }
@@ -49,11 +51,11 @@ public class DataCollector {
     }
 
     public DataCollectorListener newListener(Map<String, Object> additionalFields) {
-        return newListener(additionalFields, (e) -> true);
+        return newListener(additionalFields, (live, document) -> true);
     }
 
     public DataCollectorListener newListener(Map<String, Object> additionalFields,
-                                             Function<Document, Boolean> filter) {
+                                             CollectorEvent filter) {
         var settings = new CollectorListenerSettings();
         settings.setExtraFields(additionalFields);
         settings.setFilter(filter);

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

@@ -17,13 +17,13 @@ import org.bson.Document;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Base64;
-import java.util.UUID;
+import java.util.Date;
 
 public class DataCollectorListener implements LiveDataCollector {
 
     private final Storage storage;
     private final CollectorListenerSettings settings;
-    private String sessionId;
+    private String roomId;
     private String userName;
 
     public DataCollectorListener(Storage collection, CollectorListenerSettings settings) {
@@ -41,44 +41,42 @@ public class DataCollectorListener implements LiveDataCollector {
     @TikTokEventObserver
     private void onEvent(LiveClient liveClient, TikTokEvent event) {
         if (event instanceof TikTokConnectingEvent) {
-            sessionId = UUID.randomUUID().toString();
             userName = liveClient.getRoomInfo().getHostName();
+            roomId = liveClient.getRoomInfo().getRoomId();
         }
-
         if (event instanceof TikTokErrorEvent) {
             return;
         }
 
-        includeEvent(event);
+        includeEvent(liveClient, event);
     }
 
     @TikTokEventObserver
     private void onError(LiveClient liveClient, TikTokErrorEvent event) {
         event.getException().printStackTrace();
-        includeError(event);
+        includeError(liveClient, event);
     }
 
 
     private void includeResponse(LiveClient liveClient, WebcastResponse message) {
         var messageContent = Base64.getEncoder().encodeToString(message.toByteArray());
-        insertDocument(createDocument("response", "webcast", messageContent));
+        insertDocument(liveClient, createDocument("response", "webcast", messageContent));
     }
 
     private void includeMessage(LiveClient liveClient, WebcastResponse.Message message) {
         var method = message.getMethod();
         var messageContent = Base64.getEncoder().encodeToString(message.getPayload().toByteArray());
-
+        insertDocument(liveClient, createDocument("message", method, messageContent));
-        insertDocument(createDocument("message", method, messageContent));
     }
 
-    private void includeEvent(TikTokEvent event) {
+    private void includeEvent(LiveClient client, TikTokEvent event) {
         var json = JsonUtil.toJson(event);
         var content = Base64.getEncoder().encodeToString(json.getBytes());
         var name = event.getClass().getSimpleName();
-        insertDocument(createDocument("event", name, content));
+        insertDocument(client, createDocument("event", name, content));
     }
 
-    private void includeError(TikTokErrorEvent event) {
+    private void includeError(LiveClient client, TikTokErrorEvent event) {
         var exception = event.getException();
         var exceptionName = event.getException().getClass().getSimpleName();
 
@@ -86,18 +84,18 @@ public class DataCollectorListener implements LiveDataCollector {
         var pw = new PrintWriter(sw);
         event.getException().printStackTrace(pw);
         var content = sw.toString();
-
+        var contentBase64 = Base64.getEncoder().encodeToString(content.getBytes());
-        var doc = createDocument("error", exceptionName, content);
+        var doc = createDocument("error", exceptionName, contentBase64);
         if (exception instanceof TikTokLiveMessageException ex) {
             doc.append("message", ex.messageToBase64())
                     .append("response", ex.webcastResponseToBase64());
         }
-        insertDocument(doc);
+        insertDocument(client, doc);
     }
 
 
-    private void insertDocument(Document document) {
+    private void insertDocument(LiveClient client, Document document) {
-        if (!settings.getFilter().apply(document)) {
+        if (!settings.getFilter().execute(client, document)) {
             return;
         }
         storage.insert(document);
@@ -106,7 +104,7 @@ public class DataCollectorListener implements LiveDataCollector {
 
     private Document createDocument(String dataType, String dataTypeName, String content) {
         var doc = new Document();
-        doc.append("session", sessionId);
+        doc.append("roomId", roomId);
         for (var entry : settings.getExtraFields().entrySet()) {
             doc.append(entry.getKey(), entry.getValue());
         }
@@ -114,6 +112,7 @@ public class DataCollectorListener implements LiveDataCollector {
         doc.append("dataType", dataType);
         doc.append("dataTypeName", dataTypeName);
         doc.append("content", content);
+        doc.append("createdAt", new Date());
         return doc;
     }
 }

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.2-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extension-recorder</artifactId>

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

@@ -30,6 +30,7 @@ import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
 import io.github.jwdeveloper.tiktok.extension.recorder.api.LiveRecorder;
 import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.*;
 import io.github.jwdeveloper.tiktok.extension.recorder.impl.enums.LiveQuality;
+import io.github.jwdeveloper.tiktok.extension.recorder.impl.event.TikTokLiveRecorderStartedEvent;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.models.ConnectionState;
 
@@ -60,7 +61,9 @@ public class RecorderListener implements LiveRecorder {
         var json = event.getLiveData().getJson();
 
         liveClient.getLogger().info("Searching for live download url");
-		downloadData = settings.getPrepareDownloadData() != null ? settings.getPrepareDownloadData().apply(json) : mapToDownloadData(json);
+        downloadData = settings.getPrepareDownloadData() != null ?
+                settings.getPrepareDownloadData().apply(json) :
+                mapToDownloadData(json);
 
         if (downloadData.getDownloadLiveUrl().isEmpty())
             liveClient.getLogger().warning("Unable to find download live url!");
@@ -72,8 +75,11 @@ public class RecorderListener implements LiveRecorder {
     private void onConnected(LiveClient liveClient, TikTokConnectedEvent event) {
         if (isConnected())
             return;
+
+
         liveDownloadThread = new Thread(() -> {
             try {
+                liveClient.getLogger().info("Recording started");
                 var url = new URL(downloadData.getFullUrl());
                 HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
                 var headers = LiveClientSettings.DefaultRequestHeaders();
@@ -87,8 +93,8 @@ public class RecorderListener implements LiveRecorder {
                 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;
@@ -98,13 +104,19 @@ public class RecorderListener implements LiveRecorder {
                     }
                 } catch (IOException ignored) {
                 } finally {
-                    liveClient.getLogger().severe("Stopped recording "+liveClient.getRoomInfo().getHostName());
+                    liveClient.getLogger().severe("Stopped recording " + liveClient.getRoomInfo().getHostName());
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
         });
 
+        var recordingStartedEvent = new TikTokLiveRecorderStartedEvent(downloadData);
+        liveClient.publishEvent(recordingStartedEvent);
+        if (recordingStartedEvent.isCanceled()) {
+            liveClient.getLogger().info("Recording cancelled");
+            return;
+        }
         liveDownloadThread.start();
     }
 
@@ -120,32 +132,6 @@ public class RecorderListener implements LiveRecorder {
             liveDownloadThread.interrupt();
     }
 
-    private int terminateFfmpeg(final Process process) {
-        if (!process.isAlive()) {
-            // ffmpeg -version, do nothing
-            return process.exitValue();
-        }
-
-        // ffmpeg -f x11grab
-        System.out.println("About to destroy the child process...");
-        try (final OutputStreamWriter out = new OutputStreamWriter(process.getOutputStream(), UTF_8)) {
-            out.write('q');
-        } catch (final IOException ioe) {
-            ioe.printStackTrace();
-        }
-        try {
-            if (!process.waitFor(5L, TimeUnit.SECONDS)) {
-                process.destroy();
-                process.waitFor();
-            }
-            return process.exitValue();
-        } catch (InterruptedException ie) {
-            System.out.println("Interrupted");
-            ie.printStackTrace();
-            Thread.currentThread().interrupt();
-            return -1;
-        }
-    }
 
     private DownloadData mapToDownloadData(String json) {
 

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

@@ -26,10 +26,18 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.DownloadData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 @AllArgsConstructor
-@Data
+@Getter
-public class TikTokLiveRecorderStartedEvent extends TikTokEvent
+public class TikTokLiveRecorderStartedEvent extends TikTokEvent {
-{
     DownloadData downloadData;
+
+    @Setter
+    boolean canceled;
+
+    public TikTokLiveRecorderStartedEvent(DownloadData downloadData) {
+        this.downloadData = downloadData;
+    }
 }

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.2-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>