Merge pull request #46 from jwdeveloper/develop-1.0.18

MINOR 1.0.18



- fix small fixed related to proxy system
- introduce recorder extension
- introduce collector extension

Events:
 TikTokConnectingEvent - triggered as a first event, when client is initializing connection
TikTokRoomDataResponseEvent - returns informations about room in the JSON formmat


Bugs:
  - Live is getting disconnect after few minutes, to fix that, PingingLoop have been run in background

Author: jwdeveloper

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper [email protected]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.data.events.control;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
+
+
+/**
+ * Triggered when client is connecting to live is successfully established.
+ */
+@EventMeta(eventType = EventType.Control)
+public class TikTokConnectingEvent extends TikTokLiveClientEvent
+{
+
+}

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper [email protected]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package io.github.jwdeveloper.tiktok.data.events.http;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.requests.LiveData;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@EventMeta(eventType = EventType.Debug)
+public class TikTokRoomDataResponseEvent extends TikTokEvent
+{
+    private final LiveData.Response liveData;
+}

Client/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.4</version>
+            <version>1.5.5</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>

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

@@ -50,7 +50,6 @@ public static boolean isLiveOnline(String hostName)
         return requests().fetchLiveUserData(hostName).isLiveOnline();
     }
 
-
     /**
      *
      * @param hostName profile name of Tiktok user could be found in profile link

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

@@ -26,6 +26,8 @@
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokReconnectingEvent;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent;
+import io.github.jwdeveloper.tiktok.data.events.http.TikTokRoomDataResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
 import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
 import io.github.jwdeveloper.tiktok.data.requests.LiveData;
@@ -120,7 +122,7 @@ public void tryConnect() {
         }
 
         setState(ConnectionState.CONNECTING);
-
+        tikTokEventHandler.publish(this,new TikTokConnectingEvent());
         var userDataRequest = new LiveUserData.Request(liveRoomInfo.getHostName());
         var userData = httpClient.fetchLiveUserData(userDataRequest);
         liveRoomInfo.setStartTime(userData.getStartedAtTimeStamp());
@@ -134,6 +136,7 @@ public void tryConnect() {
 
         var liveDataRequest = new LiveData.Request(userData.getRoomId());
         var liveData = httpClient.fetchLiveData(liveDataRequest);
+        tikTokEventHandler.publish(this, new TikTokRoomDataResponseEvent(liveData));
         if (liveData.getLiveStatus() == LiveData.LiveStatus.HostNotFound) {
             throw new TikTokLiveOfflineHostException("LiveStream for Host name could not be found.");
         }
@@ -159,8 +162,8 @@ public void disconnect() {
         if (liveRoomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) {
             return;
         }
-        webSocketClient.stop();
         setState(ConnectionState.DISCONNECTED);
+        webSocketClient.stop();
     }
 
     private void setState(ConnectionState connectionState) {

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

@@ -99,7 +99,6 @@ public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {}
 				try {
 					Proxy proxy = new Proxy(Proxy.Type.SOCKS, proxySettings.next().toSocketAddress());
 
-					System.err.println("Connecting to "+ url);
 					HttpsURLConnection socksConnection = (HttpsURLConnection) url.openConnection(proxy);
 					socksConnection.setSSLSocketFactory(sc.getSocketFactory());
 					socksConnection.setConnectTimeout(httpClientSettings.getTimeout().toMillisPart());

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

@@ -43,6 +43,7 @@ public class LiveDataMapper {
     public LiveData.Response map(String json) {
         var response = new LiveData.Response();
 
+        response.setJson(json);
 
         var parsedJson = JsonParser.parseString(json);
         var jsonObject = parsedJson.getAsJsonObject();

Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java

@@ -111,6 +111,7 @@ private ListenerBindingModel bindToEvents(TikTokEventListener listener) {
             EventConsumer eventMethodRef = (liveClient, event) ->
             {
                 try {
+                    method.setAccessible(true);
                     method.invoke(listener, liveClient, event);
                 } catch (Exception e) {
                     throw new TikTokEventListenerMethodException(e);

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

@@ -22,7 +22,6 @@
  */
 package io.github.jwdeveloper.tiktok.websocket;
 
-
 import io.github.jwdeveloper.tiktok.*;
 import io.github.jwdeveloper.tiktok.data.dto.ProxyData;
 import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
@@ -41,6 +40,8 @@ public class TikTokWebSocketClient implements SocketClient {
     private final TikTokLiveMessageHandler messageHandler;
     private final TikTokLiveEventHandler tikTokEventHandler;
     private WebSocketClient webSocketClient;
+
+    private TikTokWebSocketPingingTask pingingTask;
     private boolean isConnected;
 
     public TikTokWebSocketClient(
@@ -51,11 +52,11 @@ public TikTokWebSocketClient(
         this.messageHandler = messageHandler;
         this.tikTokEventHandler = tikTokEventHandler;
         isConnected = false;
+        pingingTask = new TikTokWebSocketPingingTask();
     }
 
     @Override
-    public void start(LiveConnectionData.Response connectionData, LiveClient liveClient)
-    {
+    public void start(LiveConnectionData.Response connectionData, LiveClient liveClient) {
         if (isConnected) {
             stop();
         }
@@ -74,16 +75,16 @@ public void start(LiveConnectionData.Response connectionData, LiveClient liveCli
         // ProxyClientSettings proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         // if (proxyClientSettings.isEnabled())
         //     connectProxy(proxyClientSettings);
-		// else
-            connectDefault();
+        // else
+        connectDefault();
     }
 
     private void connectDefault() {
         try {
             webSocketClient.connect();
+            pingingTask.run(webSocketClient);
             isConnected = true;
-        } catch (Exception e)
-        {
+        } catch (Exception e) {
             isConnected = false;
             throw new TikTokLiveException("Failed to connect to the websocket", e);
         }
@@ -105,28 +106,34 @@ public void connectProxy(ProxyClientSettings proxySettings) {
     }
 
     public boolean tryProxyConnection(ProxyClientSettings proxySettings, ProxyData proxyData) {
-        webSocketClient.setProxy(new Proxy(proxySettings.getType(), proxyData.toSocketAddress()));
         try {
             if (proxySettings.getType() == Proxy.Type.SOCKS) {
                 SSLContext sc = SSLContext.getInstance("SSL");
                 sc.init(null, new TrustManager[]{new X509TrustManager() {
-                    public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {}
-                    public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {}
-                    public X509Certificate[] getAcceptedIssuers() { return null; }
+                    public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
+                    }
+
+                    public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
+                    }
+
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return null;
+                    }
                 }}, null);
                 webSocketClient.setSocketFactory(sc.getSocketFactory());
             }
+            webSocketClient.setProxy(new Proxy(proxySettings.getType(), proxyData.toSocketAddress()));
             webSocketClient.connect();
             return true;
-        } catch (Exception e)
-        {
+        } catch (Exception e) {
             return false;
         }
     }
 
     public void stop() {
         if (isConnected && webSocketClient != null && webSocketClient.isOpen()) {
             webSocketClient.closeConnection(0, "");
+            pingingTask.stop();
         }
         webSocketClient = null;
         isConnected = false;

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

@@ -0,0 +1,60 @@
+package io.github.jwdeveloper.tiktok.websocket;
+
+import org.java_websocket.WebSocket;
+
+import java.util.Random;
+
+public class TikTokWebSocketPingingTask
+{
+    private Thread thread;
+    private boolean isRunning = false;
+    private final int MIN_TIMEOUT = 250;
+    private final int MAX_TIMEOUT = 500;
+
+
+    public void run(WebSocket webSocket)
+    {
+        stop();
+        thread = new Thread(() ->
+        {
+            pingTask(webSocket);
+        });
+        isRunning =true;
+        thread.start();
+    }
+
+    public void stop()
+    {
+        if(thread != null)
+        {
+            thread.interrupt();
+        }
+        isRunning = false;
+    }
+
+
+    private void pingTask(WebSocket webSocket)
+    {
+        var random = new Random();
+        while (isRunning)
+        {
+            try
+            {
+                if(!webSocket.isOpen())
+                {
+                    Thread.sleep(100);
+                    continue;
+                }
+                webSocket.sendPing();
+
+                var timeout = random.nextInt(MAX_TIMEOUT)+MIN_TIMEOUT;
+                Thread.sleep(timeout);
+            }
+            catch (Exception e)
+            {
+                isRunning = false;
+            }
+        }
+
+    }
+}