Merge pull request #69 from jwdeveloper/develop-1.5.4

Changed isNotClosing to isOpen

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.3-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.3-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -1,15 +1,22 @@
 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;
@@ -93,7 +100,7 @@ public class ActionResult<T> {
 	public JsonObject toJson() {
 		JsonObject map = new JsonObject();
 		map.addProperty("success", success);
-		map.add("content", new Gson().toJsonTree(content));
+		map.add("content", gson.toJsonTree(content));
 		map.addProperty("message", message);
 		map.add("previous", hasPrevious() ? previous.toJson() : null);
 		return map;
@@ -101,6 +108,6 @@ public class ActionResult<T> {
 
 	@Override
 	public String toString() {
-		return "ActionResult: "+new Gson().newBuilder().setPrettyPrinting().create().toJson(toJson());
+		return "ActionResult: "+gson.toJson(toJson());
 	}
 }

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

@@ -65,7 +65,7 @@ public class LiveUserDataMapper
             };
 
             return new LiveUserData.Response(json, statusEnum, roomId, startTime);
-        } catch (JsonSyntaxException e) {
+        } catch (JsonSyntaxException | IllegalStateException e) {
             logger.warning("Malformed Json: '"+json+"' - Error Message: "+e.getMessage());
             return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
         }

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

@@ -61,7 +61,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
         } catch (Exception e) {
             tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(e));
         }
-        if (isNotClosing()) {
+        if (isOpen()) {
             sendPing();
         }
     }
@@ -79,8 +79,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
             pushFrameBuilder.setPayloadType("ack");
             pushFrameBuilder.setLogId(websocketPushFrame.getLogId());
             pushFrameBuilder.setPayload(webcastResponse.getInternalExtBytes());
-            if (isNotClosing())
+            if (isOpen()) {
-            {
                 this.send(pushFrameBuilder.build().toByteArray());
             }
         }
@@ -90,7 +89,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
         tikTokEventHandler.publish(tikTokLiveClient, new TikTokConnectedEvent());
-        if (isNotClosing()) {
+        if (isOpen()) {
             sendPing();
         }
     }
@@ -104,7 +103,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onError(Exception error) {
         tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(error));
-        if (isNotClosing()) {
+        if (isOpen()) {
             sendPing();
         }
     }
@@ -129,10 +128,6 @@ public class TikTokWebSocketListener extends WebSocketClient {
         }
     }
 
-    private boolean isNotClosing() {
-        return !isClosed() && !isClosing();
-    }
-
     @Override
     public void onMessage(String s) {
         // System.err.println(s);

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

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.3-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.3-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.3-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(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-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.3-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.4.0-Release</version>
+    <version>1.5.3-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>