- improve collector

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.4.0-Release</version>
+        <version>1.5.1-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>API</artifactId>

Client/pom.xml

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

Examples/pom.xml

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

README.md

@@ -70,7 +70,7 @@ Maven
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.4.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.4.0-Release</version>
+        <version>1.5.1-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

extension-collector/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
         <artifactId>TikTokLiveJava</artifactId>
-        <version>1.4.0-Release</version>
+        <version>1.5.1-Release</version>
     </parent>
 
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.4.0-Release</version>
+            <version>1.5.1-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/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(createDocument("message", method, messageContent));
+        insertDocument(liveClient, 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 doc = createDocument("error", exceptionName, content);
+        var contentBase64 = Base64.getEncoder().encodeToString(content.getBytes());
+        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) {
-        if (!settings.getFilter().apply(document)) {
+    private void insertDocument(LiveClient client, Document 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-recorder/pom.xml

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