MINOR

Develop 1.2.0

API/pom.xml

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

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023-2023 jwdeveloper jacekwoln@gmail.com
+ *
+ * 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.*;
+import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
+import io.github.jwdeveloper.tiktok.data.requests.*;
+import lombok.*;
+
+/**
+ * Triggered before the connection is established.
+ */
+@EventMeta(eventType = EventType.Control)
+public class TikTokPreConnectionEvent extends TikTokLiveClientEvent
+{
+	@Getter private final LiveUserData.Response userData;
+	@Getter private final LiveData.Response roomData;
+	@Getter @Setter boolean cancelConnection = false;
+
+	public TikTokPreConnectionEvent(LiveUserData.Response userData, LiveData.Response liveData) {
+		this.userData = userData;
+		this.roomData = liveData;
+	}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/data/requests/LiveData.java

@@ -44,6 +44,7 @@ public class LiveData {
         private int totalViewers;
         private boolean ageRestricted;
         private User host;
+        private LiveType liveType;
     }
 
     public enum LiveStatus {
@@ -51,4 +52,11 @@ public class LiveData {
         HostOnline,
         HostOffline,
     }
-}
+
+    public enum LiveType {
+        SOLO,
+        BOX,
+        BATTLE,
+        CO_HOST
+    }
+}

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

@@ -36,7 +36,6 @@ public class LiveClientSettings {
     /**
      * ISO-Language for Client
      */
-
     private String clientLanguage;
 
     /**
@@ -44,7 +43,6 @@ public class LiveClientSettings {
      */
     private boolean retryOnConnectionFailure;
 
-
     /**
      * Before retrying connect, wait for select amount of time
      */
@@ -53,42 +51,35 @@ public class LiveClientSettings {
     /**
      * Whether to print Logs to Console
      */
-
     private boolean printToConsole = true;
+
     /**
      * LoggingLevel for Logs
      */
     private Level logLevel;
 
-
     /**
      * Optional: Use it if you need to change TikTok live hostname in builder
      */
     private String hostName;
 
-
     /**
      * Parameters used in requests to TikTok api
      */
     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
      */
     private String sessionId;
 
-    /*
+    /**
      * Optional: By default roomID is fetched before connect to live, but you can set it manually
      *
      */
     private String roomId;
 
-
-
-
-
     public static LiveClientSettings createDefault()
     {
         var httpSettings = new HttpClientSettings();
@@ -103,12 +94,10 @@ public class LiveClientSettings {
         clientSettings.setPrintToConsole(false);
         clientSettings.setLogLevel(Level.ALL);
 
-
         clientSettings.setHttpSettings(httpSettings);
         return clientSettings;
     }
 
-
     /**
      * Default Parameters for HTTP-Request
      */
@@ -147,11 +136,9 @@ public class LiveClientSettings {
         clientParams.put("webcast_sdk_version", "1.3.0");
         clientParams.put("update_version_code", "1.3.0");
 
-
         return clientParams;
     }
 
-
     /**
      * Default Headers for HTTP-Request
      */
@@ -167,6 +154,4 @@ public class LiveClientSettings {
         headers.put("Accept-Language", "en-US,en; q=0.9");
         return headers;
     }
-
-}
-
+}

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

@@ -33,11 +33,10 @@ import java.util.function.Consumer;
 @Setter
 public class ProxyClientSettings implements Iterator<ProxyData>
 {
-    private boolean enabled, lastSuccess;
+    private boolean enabled, lastSuccess, autoDiscard = true, fallback = true;
     private Rotation rotation = Rotation.CONSECUTIVE;
     private final List<ProxyData> proxyList = new ArrayList<>();
-    private int index = 0;
-    private boolean autoDiscard = true;
+    private int index = -1;
     private Proxy.Type type = Proxy.Type.DIRECT;
     private Consumer<ProxyData> onProxyUpdated = x -> {};
 
@@ -78,7 +77,10 @@ public class ProxyClientSettings implements Iterator<ProxyData>
                 index = new Random().nextInt(proxyList.size());
                 yield proxyList.get(index).clone();
             }
-            case NONE -> proxyList.get(index).clone();
+            case NONE -> {
+                index = Math.max(index, 0);
+                yield proxyList.get(index).clone();
+            }
         };
         onProxyUpdated.accept(nextProxy);
         return nextProxy;
@@ -87,6 +89,7 @@ public class ProxyClientSettings implements Iterator<ProxyData>
     @Override
     public void remove() {
         proxyList.remove(index);
+        lastSuccess = false; // index is no longer valid and lastSuccess needs falsified
     }
 
     public void setIndex(int index) {
@@ -98,6 +101,7 @@ public class ProxyClientSettings implements Iterator<ProxyData>
             this.index = index;
         }
     }
+
     public ProxyClientSettings clone()
     {
         ProxyClientSettings settings = new ProxyClientSettings();

API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokLiveRequestException.java

@@ -23,7 +23,7 @@
 package io.github.jwdeveloper.tiktok.exceptions;
 
 
-/*
+/**
  * Happens while bad response from Http request to TikTok
  */
 public class TikTokLiveRequestException extends TikTokLiveException
@@ -46,4 +46,4 @@ public class TikTokLiveRequestException extends TikTokLiveException
     public TikTokLiveRequestException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/live/builder/EventsBuilder.java

@@ -24,6 +24,7 @@ package io.github.jwdeveloper.tiktok.live.builder;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.*;
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
 import io.github.jwdeveloper.tiktok.data.events.http.TikTokHttpResponseEvent;
@@ -149,6 +150,13 @@ public interface EventsBuilder<T> {
      */
     T onConnected(EventConsumer<TikTokConnectedEvent> action);
 
+    /**
+     * Invoked before client has been successfully connected to live
+     * @param action
+     * @return
+     */
+    T onPreConnection(EventConsumer<TikTokPreConnectionEvent> action);
+
     /**
      * Invoked when client tries to reconnect
      * @param action
@@ -215,6 +223,4 @@ public interface EventsBuilder<T> {
     //T onLinkMicBattle(TikTokEventConsumer<TikTokLinkMicBattleEvent> event);
 
     //T onUnhandledControl(TikTokEventConsumer<TikTokUnhandledControlEvent> event);
-}
-
-
+}

Client/pom.xml

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

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

@@ -26,7 +26,7 @@ import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
 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.control.*;
 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;
@@ -150,6 +150,11 @@ public class TikTokLiveClient implements LiveClient {
         liveRoomInfo.setAgeRestricted(liveData.isAgeRestricted());
         liveRoomInfo.setHost(liveData.getHost());
 
+        var preconnectEvent = new TikTokPreConnectionEvent(userData, liveData);
+        tikTokEventHandler.publish(this, preconnectEvent);
+        if (preconnectEvent.isCancelConnection())
+            throw new TikTokLiveException("TikTokPreConnectionEvent cancelled connection!");
+
         var liveConnectionRequest =new LiveConnectionData.Request(userData.getRoomId());
         var liveConnectionData = httpClient.fetchLiveConnectionData(liveConnectionRequest);
         webSocketClient.start(liveConnectionData, this);

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

@@ -24,6 +24,7 @@ package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
 import io.github.jwdeveloper.tiktok.data.events.envelop.TikTokChestEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
@@ -275,9 +276,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return build().connectAsync();
     }
 
-
-    public TikTokLiveClientBuilder onUnhandledSocial(
-            EventConsumer<TikTokUnhandledSocialEvent> event) {
+    public TikTokLiveClientBuilder onUnhandledSocial(EventConsumer<TikTokUnhandledSocialEvent> event) {
         tikTokEventHandler.subscribe(TikTokUnhandledSocialEvent.class, event);
         return this;
     }
@@ -289,8 +288,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
     }
 
 
-    public TikTokLiveClientBuilder onLinkMicFanTicket(
-            EventConsumer<TikTokLinkMicFanTicketEvent> event) {
+    public TikTokLiveClientBuilder onLinkMicFanTicket(EventConsumer<TikTokLinkMicFanTicketEvent> event) {
         tikTokEventHandler.subscribe(TikTokLinkMicFanTicketEvent.class, event);
         return this;
     }
@@ -305,14 +303,12 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
-    public TikTokLiveClientBuilder onDetect(
-            EventConsumer<TikTokDetectEvent> event) {
+    public TikTokLiveClientBuilder onDetect(EventConsumer<TikTokDetectEvent> event) {
         tikTokEventHandler.subscribe(TikTokDetectEvent.class, event);
         return this;
     }
 
-    public TikTokLiveClientBuilder onLinkLayer(
-            EventConsumer<TikTokLinkLayerEvent> event) {
+    public TikTokLiveClientBuilder onLinkLayer(EventConsumer<TikTokLinkLayerEvent> event) {
         tikTokEventHandler.subscribe(TikTokLinkLayerEvent.class, event);
         return this;
     }
@@ -322,6 +318,11 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
+    public TikTokLiveClientBuilder onPreConnection(EventConsumer<TikTokPreConnectionEvent> event) {
+        tikTokEventHandler.subscribe(TikTokPreConnectionEvent.class, event);
+        return this;
+    }
+
     public TikTokLiveClientBuilder onCaption(EventConsumer<TikTokCaptionEvent> event) {
         tikTokEventHandler.subscribe(TikTokCaptionEvent.class, event);
         return this;
@@ -332,8 +333,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
-    public TikTokLiveClientBuilder onRoomPin(
-            EventConsumer<TikTokRoomPinEvent> event) {
+    public TikTokLiveClientBuilder onRoomPin(EventConsumer<TikTokRoomPinEvent> event) {
         tikTokEventHandler.subscribe(TikTokRoomPinEvent.class, event);
         return this;
     }
@@ -373,8 +373,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
-    public TikTokLiveClientBuilder onBarrage(
-            EventConsumer<TikTokBarrageEvent> event) {
+    public TikTokLiveClientBuilder onBarrage(EventConsumer<TikTokBarrageEvent> event) {
         tikTokEventHandler.subscribe(TikTokBarrageEvent.class, event);
         return this;
     }
@@ -391,8 +390,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
     }
 
 
-    public TikTokLiveClientBuilder onLinkMicArmies(
-            EventConsumer<TikTokLinkMicArmiesEvent> event) {
+    public TikTokLiveClientBuilder onLinkMicArmies(EventConsumer<TikTokLinkMicArmiesEvent> event) {
         tikTokEventHandler.subscribe(TikTokLinkMicArmiesEvent.class, event);
         return this;
     }
@@ -402,20 +400,17 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
-    public TikTokLiveClientBuilder onUnauthorizedMember(
-            EventConsumer<TikTokUnauthorizedMemberEvent> event) {
+    public TikTokLiveClientBuilder onUnauthorizedMember(EventConsumer<TikTokUnauthorizedMemberEvent> event) {
         tikTokEventHandler.subscribe(TikTokUnauthorizedMemberEvent.class, event);
         return this;
     }
 
-    public TikTokLiveClientBuilder onInRoomBanner(
-            EventConsumer<TikTokInRoomBannerEvent> event) {
+    public TikTokLiveClientBuilder onInRoomBanner(EventConsumer<TikTokInRoomBannerEvent> event) {
         tikTokEventHandler.subscribe(TikTokInRoomBannerEvent.class, event);
         return this;
     }
 
-    public TikTokLiveClientBuilder onLinkMicMethod(
-            EventConsumer<TikTokLinkMicMethodEvent> event) {
+    public TikTokLiveClientBuilder onLinkMicMethod(EventConsumer<TikTokLinkMicMethodEvent> event) {
         tikTokEventHandler.subscribe(TikTokLinkMicMethodEvent.class, event);
         return this;
     }
@@ -487,8 +482,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
-    public TikTokLiveClientBuilder onUnhandledMember(
-            EventConsumer<TikTokUnhandledMemberEvent> event) {
+    public TikTokLiveClientBuilder onUnhandledMember(EventConsumer<TikTokUnhandledMemberEvent> event) {
         tikTokEventHandler.subscribe(TikTokUnhandledMemberEvent.class, event);
         return this;
     }
@@ -498,20 +492,17 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
         return this;
     }
 
-    public TikTokLiveClientBuilder onLinkMicBattle(
-            EventConsumer<TikTokLinkMicBattleEvent> event) {
+    public TikTokLiveClientBuilder onLinkMicBattle(EventConsumer<TikTokLinkMicBattleEvent> event) {
         tikTokEventHandler.subscribe(TikTokLinkMicBattleEvent.class, event);
         return this;
     }
 
-    public TikTokLiveClientBuilder onDisconnected(
-            EventConsumer<TikTokDisconnectedEvent> event) {
+    public TikTokLiveClientBuilder onDisconnected(EventConsumer<TikTokDisconnectedEvent> event) {
         tikTokEventHandler.subscribe(TikTokDisconnectedEvent.class, event);
         return this;
     }
 
-    public TikTokLiveClientBuilder onUnhandledControl(
-            EventConsumer<TikTokUnhandledControlEvent> event) {
+    public TikTokLiveClientBuilder onUnhandledControl(EventConsumer<TikTokUnhandledControlEvent> event) {
         tikTokEventHandler.subscribe(TikTokUnhandledControlEvent.class, event);
         return this;
     }

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

@@ -66,6 +66,22 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
 
     public GiftsData.Response fetchGiftsData() {
         var url = TIKTOK_URL_WEBCAST + "gift/list/";
+        var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
+        if (proxyClientSettings.isEnabled()) {
+            while (proxyClientSettings.hasNext()) {
+                try {
+                    var optional = httpFactory.client(url)
+                            .build()
+                            .toJsonResponse();
+
+                    if (optional.isEmpty()) {
+                        throw new TikTokLiveRequestException("Unable to fetch gifts information's");
+                    }
+                    var json = optional.get();
+                    return giftsDataMapper.map(json);
+                } catch (TikTokProxyRequestException ignored) {}
+            }
+        }
         var optional = httpFactory.client(url)
                 .build()
                 .toJsonResponse();
@@ -73,6 +89,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
         if (optional.isEmpty()) {
             throw new TikTokLiveRequestException("Unable to fetch gifts information's");
         }
+
         var json = optional.get();
         return giftsDataMapper.map(json);
     }
@@ -85,11 +102,11 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
 
     @Override
     public LiveUserData.Response fetchLiveUserData(LiveUserData.Request request) {
+        var url = TIKTOK_URL_WEB + "api-live/user/room";
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    var url = TIKTOK_URL_WEB + "api-live/user/room";
                     var optional = httpFactory.client(url)
                         .withParam("uniqueId", request.getUserName())
                         .withParam("sourceType", "54")
@@ -105,7 +122,6 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
                 } catch (TikTokProxyRequestException ignored) {}
             }
         }
-        var url = TIKTOK_URL_WEB + "api-live/user/room";
         var optional = httpFactory.client(url)
                 .withParam("uniqueId", request.getUserName())
                 .withParam("sourceType", "54")
@@ -127,11 +143,11 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
 
     @Override
     public LiveData.Response fetchLiveData(LiveData.Request request) {
+        var url = TIKTOK_URL_WEBCAST + "room/info";
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    var url = TIKTOK_URL_WEBCAST + "room/info";
                     var optional = httpFactory.client(url)
                         .withParam("room_id", request.getRoomId())
                         .build()
@@ -146,7 +162,6 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
                 } catch (TikTokProxyRequestException ignored) {}
             }
         }
-        var url = TIKTOK_URL_WEBCAST + "room/info";
         var optional = httpFactory.client(url)
                 .withParam("room_id", request.getRoomId())
                 .build()

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

@@ -39,7 +39,7 @@ public class HttpClient {
     protected final String url;
     private final Pattern pattern = Pattern.compile("charset=(.*?)(?=&|$)");
 
-    public  Optional<HttpResponse<byte[]>> toResponse() {
+    public Optional<HttpResponse<byte[]>> toResponse() {
         var client = prepareClient();
         var request = prepareGetRequest();
         try {

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

@@ -77,6 +77,11 @@ public class HttpProxyClient extends HttpClient
 				if (proxySettings.isAutoDiscard())
 					proxySettings.remove();
 				proxySettings.setLastSuccess(false);
+				throw new TikTokProxyRequestException(e);
+			} catch (IOException e) {
+				if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
+					return super.toResponse();
+				throw new TikTokProxyRequestException(e);
 			} catch (Exception e) {
 				throw new TikTokLiveRequestException(e);
 			}
@@ -119,6 +124,8 @@ public class HttpProxyClient extends HttpClient
 					proxySettings.setLastSuccess(true);
 					return Optional.of(response);
 				} catch (IOException e) {
+					if (e.getMessage().contains("503") && proxySettings.isFallback()) // Indicates proxy protocol is not supported
+						return super.toResponse();
 					if (proxySettings.isAutoDiscard())
 						proxySettings.remove();
 					proxySettings.setLastSuccess(false);

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

@@ -105,6 +105,22 @@ public class LiveDataMapper {
             response.setHost(user);
         }
 
+        if (data.has("link_mic")) {
+            var element = data.getAsJsonObject("link_mic");
+            var multi_live = element.get("multi_live_enum").getAsInt();
+            var rival_id = element.get("rival_anchor_id").getAsInt();
+            var battle_scores = element.get("battle_scores").getAsJsonArray();
+            if (multi_live == 1) {
+                if (!battle_scores.isEmpty())
+                    response.setLiveType(LiveData.LiveType.BATTLE);
+                else if (rival_id != 0)
+                    response.setLiveType(LiveData.LiveType.CO_HOST);
+                else
+                    response.setLiveType(LiveData.LiveType.BOX);
+            } else
+                response.setLiveType(LiveData.LiveType.SOLO);
+        }
+
         return response;
     }
 
@@ -127,4 +143,4 @@ public class LiveDataMapper {
         user.addAttribute(UserAttribute.LiveHost);
         return user;
     }
-}
+}

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

@@ -26,7 +26,7 @@ import io.github.jwdeveloper.tiktok.*;
 import io.github.jwdeveloper.tiktok.data.dto.ProxyData;
 import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
 import io.github.jwdeveloper.tiktok.data.settings.*;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+import io.github.jwdeveloper.tiktok.exceptions.*;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import org.java_websocket.client.WebSocketClient;
 
@@ -41,7 +41,7 @@ public class TikTokWebSocketClient implements SocketClient {
     private final TikTokLiveEventHandler tikTokEventHandler;
     private WebSocketClient webSocketClient;
 
-    private TikTokWebSocketPingingTask pingingTask;
+    private final TikTokWebSocketPingingTask pingingTask;
     private boolean isConnected;
 
     public TikTokWebSocketClient(
@@ -91,6 +91,20 @@ public class TikTokWebSocketClient implements SocketClient {
     }
 
     public void connectProxy(ProxyClientSettings proxySettings) {
+        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; }
+                }}, null);
+                webSocketClient.setSocketFactory(sc.getSocketFactory());
+            }
+        } catch (Exception e) {
+            // This will never be thrown.
+            throw new TikTokProxyRequestException("Unable to set Socks proxy SSL instance");
+        }
         while (proxySettings.hasNext()) {
             ProxyData proxyData = proxySettings.next();
             if (!tryProxyConnection(proxySettings, proxyData)) {
@@ -98,6 +112,7 @@ public class TikTokWebSocketClient implements SocketClient {
                     proxySettings.remove();
                 continue;
             }
+            pingingTask.run(webSocketClient);
             isConnected = true;
             break;
         }
@@ -107,21 +122,6 @@ public class TikTokWebSocketClient implements SocketClient {
 
     public boolean tryProxyConnection(ProxyClientSettings proxySettings, ProxyData proxyData) {
         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;
-                    }
-                }}, null);
-                webSocketClient.setSocketFactory(sc.getSocketFactory());
-            }
             webSocketClient.setProxy(new Proxy(proxySettings.getType(), proxyData.toSocketAddress()));
             webSocketClient.connect();
             return true;

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

@@ -11,24 +11,18 @@ public class TikTokWebSocketPingingTask
     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 = new Thread(() -> pingTask(webSocket));
+        isRunning = true;
         thread.start();
     }
 
     public void stop()
     {
-        if(thread != null)
-        {
+        if (thread != null)
             thread.interrupt();
-        }
         isRunning = false;
     }
 
@@ -36,12 +30,9 @@ public class TikTokWebSocketPingingTask
     private void pingTask(WebSocket webSocket)
     {
         var random = new Random();
-        while (isRunning)
-        {
-            try
-            {
-                if(!webSocket.isOpen())
-                {
+        while (isRunning) {
+            try {
+                if (!webSocket.isOpen()) {
                     Thread.sleep(100);
                     continue;
                 }
@@ -50,11 +41,10 @@ public class TikTokWebSocketPingingTask
                 var timeout = random.nextInt(MAX_TIMEOUT)+MIN_TIMEOUT;
                 Thread.sleep(timeout);
             }
-            catch (Exception e)
-            {
+            catch (Exception e) {
                 isRunning = false;
             }
         }
 
     }
-}
+}

Examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.0.17-Release</version>
+        <version>1.1.2-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -63,13 +63,19 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>extension-collector</artifactId>
-            <version>1.0.14-Release</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>extension-recorder</artifactId>
-            <version>1.0.14-Release</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.jwdeveloper.tiktok</groupId>
+            <artifactId>extension-collector</artifactId>
+            <version>1.1.2-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

@@ -22,9 +22,10 @@
  */
 package io.github.jwdeveloper.tiktok;
 
-import io.github.jwdeveloper.tiktok.extension.collector.TikTokLiveCollector;
 
 
+import io.github.jwdeveloper.tiktok.extension.collector.TikTokLiveCollector;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -48,7 +49,7 @@ public class CollectorExample {
         collector.connectDatabase();
 
         var users = List.of("tehila_723", "dino123597", "domaxyzx", "dash4214", "obserwacje_live");
-        var sessionTag = "Dupa";
+        var sessionTag = "Tag1";
         for (var user : users) {
             TikTokLive.newClient(user)
                     .configure(liveClientSettings ->

README.md

@@ -29,8 +29,7 @@ A Java library inspired by [TikTokLive](https://github.com/isaackogan/TikTokLive
 The library includes a wrapper that connects to the WebCast service using just the username (`uniqueId`). This allows you to connect to your own live chat as well as the live chat of other streamers.
 No credentials are required. Events such as [Members Joining](#member), [Gifts](#gift), [Subscriptions](#subscribe), [Viewers](#roomuser), [Follows](#social), [Shares](#social), [Questions](#questionnew), [Likes](#like) and [Battles](#linkmicbattle) can be tracked.
 
-# Contributors
-[Library documentation for contributors](https://github.com/jwdeveloper/TikTokLiveJava/wiki)
+
 
 <div align="center">
   <a href="https://www.youtube.com/watch?v=eerWGgUKc6c" align="right" target="blank"><img src="https://img.youtube.com/vi/eerWGgUKc6c/hqdefault.jpg" alt="IMAGE ALT TEXT" width="38%" align="right"></a>
@@ -50,6 +49,7 @@ Do you prefer other programming languages?
 #### Overview
 - [Getting started](#getting-started)
 - [Events](#events)
+- [Extensions](#extensions)
 - [Listeners](#listeners)
 - [Contributing](#contributing)
 
@@ -70,7 +70,7 @@ Maven
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.0.16-Release</version>
+             <version>1.2.0-Release</version>
             <scope>compile</scope>
         </dependency>
    </dependencies>
@@ -87,7 +87,7 @@ dependencyResolutionManagement {
 	}
 
 dependencies {
-	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.0.16-Release'
+	        implementation 'com.github.jwdeveloper.TikTok-Live-Java:Client:1.1.0-Release'
 	}
 ```
 
@@ -166,37 +166,79 @@ TikTokLive.newClient("bangbetmenygy")
 
 
 
+## Events
+
+
+
 **Control**:
 
-- [onConnected](#onconnected-tiktokconnectedevent)
-- [onDisconnected](#ondisconnected-tiktokdisconnectedevent)
 - [onReconnecting](#onreconnecting-tiktokreconnectingevent)
 - [onError](#onerror-tiktokerrorevent)
+- [onConnected](#onconnected-tiktokconnectedevent)
+- [onDisconnected](#ondisconnected-tiktokdisconnectedevent)
 
 **Message**:
 
 - [onEvent](#onevent-tiktokevent)
-- [onSubscribe](#onsubscribe-tiktoksubscribeevent)
-- [onQuestion](#onquestion-tiktokquestionevent)
-- [onFollow](#onfollow-tiktokfollowevent)
-- [onLike](#onlike-tiktoklikeevent)
-- [onLiveEnded](#onliveended-tiktokliveendedevent)
-- [onRoomInfo](#onroominfo-tiktokroominfoevent)
-- [onShare](#onshare-tiktokshareevent)
-- [onGiftCombo](#ongiftcombo-tiktokgiftcomboevent)
-- [onEmote](#onemote-tiktokemoteevent)
-- [onGift](#ongift-tiktokgiftevent)
+- [onEvent](#onevent-tiktokevent)
 - [onComment](#oncomment-tiktokcommentevent)
-- [onLivePaused](#onlivepaused-tiktoklivepausedevent)
+- [onRoomInfo](#onroominfo-tiktokroominfoevent)
+- [onGift](#ongift-tiktokgiftevent)
+- [onSubscribe](#onsubscribe-tiktoksubscribeevent)
+- [onFollow](#onfollow-tiktokfollowevent)
+- [onGiftCombo](#ongiftcombo-tiktokgiftcomboevent)
+- [onLiveEnded](#onliveended-tiktokliveendedevent)
+- [onQuestion](#onquestion-tiktokquestionevent)
+- [onShare](#onshare-tiktokshareevent)
 - [onLiveUnpaused](#onliveunpaused-tiktokliveunpausedevent)
+- [onEmote](#onemote-tiktokemoteevent)
 - [onJoin](#onjoin-tiktokjoinevent)
+- [onLike](#onlike-tiktoklikeevent)
+- [onLivePaused](#onlivepaused-tiktoklivepausedevent)
 
 **Debug**:
 
-- [onWebsocketUnhandledMessage](#onwebsocketunhandledmessage-tiktokwebsocketunhandledmessageevent)
 - [onWebsocketResponse](#onwebsocketresponse-tiktokwebsocketresponseevent)
+- [onWebsocketUnhandledMessage](#onwebsocketunhandledmessage-tiktokwebsocketunhandledmessageevent)
+- [onHttpResponse](#onhttpresponse-tiktokhttpresponseevent)
 - [onWebsocketMessage](#onwebsocketmessage-tiktokwebsocketmessageevent)
 # Examples
+<br>
+
+## onReconnecting [TikTokReconnectingEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java)
+
+
+
+```java
+TikTokLive.newClient("host-name")
+.onReconnecting((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onError [TikTokErrorEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java)
+
+
+General error event. You should handle this.
+
+
+```java
+TikTokLive.newClient("host-name")
+.onError((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
 <br>
 
 ## onConnected [TikTokConnectedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java)
@@ -238,32 +280,15 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onReconnecting [TikTokReconnectingEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java)
+## onEvent [TikTokEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.java)
 
 
-
-```java
-TikTokLive.newClient("host-name")
-.onReconnecting((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onError [TikTokErrorEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java)
-
-
-General error event. You should handle this.
+Base class for all events
 
 
 ```java
 TikTokLive.newClient("host-name")
-.onError((liveClient, event) ->
+.onEvent((liveClient, event) ->
 {
 
 })
@@ -293,91 +318,15 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onSubscribe [TikTokSubscribeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java)
+## onComment [TikTokCommentEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java)
 
 
-Triggers when a user creates a subscription.
+Triggered every time a new chat comment arrives.
 
 
 ```java
 TikTokLive.newClient("host-name")
-.onSubscribe((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onQuestion [TikTokQuestionEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java)
-
-
-Triggered every time someone asks a new question via the question feature.
-
-
-```java
-TikTokLive.newClient("host-name")
-.onQuestion((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onFollow [TikTokFollowEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java)
-
-
-Triggers when a user follows the streamer. Based on social event.
-
-
-```java
-TikTokLive.newClient("host-name")
-.onFollow((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onLike [TikTokLikeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java)
-
-
-Triggered when a viewer sends likes to the streamer. For streams with many viewers, this event is not always triggered by TikTok.
-
-
-```java
-TikTokLive.newClient("host-name")
-.onLike((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onLiveEnded [TikTokLiveEndedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java)
-
-
-Triggered when the live stream gets terminated by the host. Will also trigger the TikTokDisconnectedEvent event.
-
-
-```java
-TikTokLive.newClient("host-name")
-.onLiveEnded((liveClient, event) ->
+.onComment((liveClient, event) ->
 {
 
 })
@@ -391,6 +340,8 @@ TikTokLive.newClient("host-name")
 ## onRoomInfo [TikTokRoomInfoEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomInfoEvent.java)
 
 
+Triggered when LiveRoomInfo got updated such as likes, viewers, ranking ....
+
 
 ```java
 TikTokLive.newClient("host-name")
@@ -403,73 +354,6 @@ TikTokLive.newClient("host-name")
 
 
 
-<br>
-
-## onShare [TikTokShareEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java)
-
-
-Triggers when a user shares the stream. Based on social event.
-
-
-```java
-TikTokLive.newClient("host-name")
-.onShare((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onGiftCombo [TikTokGiftComboEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java)
-
-
-Triggered every time gift is sent
-
-@see GiftSendType it has 3 states
-
-  <p>Example when user sends gift with combo</p>
-  <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
-  <p>Combo: 4 -> comboState = GiftSendType.Active</p>
-  <p>Combo: 8 -> comboState = GiftSendType.Active</p>
-  <p>Combo: 12 -> comboState = GiftSendType.Finished</p>
-
-Remember if comboState is Finished both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
-
-
-```java
-TikTokLive.newClient("host-name")
-.onGiftCombo((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onEmote [TikTokEmoteEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java)
-
-
-Triggered every time a subscriber sends an emote (sticker).
-
-
-```java
-TikTokLive.newClient("host-name")
-.onEmote((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
 <br>
 
 ## onGift [TikTokGiftEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java)
@@ -493,15 +377,15 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onComment [TikTokCommentEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java)
+## onSubscribe [TikTokSubscribeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java)
 
 
-Triggered every time a new chat comment arrives.
+Triggers when a user creates a subscription.
 
 
 ```java
 TikTokLive.newClient("host-name")
-.onComment((liveClient, event) ->
+.onSubscribe((liveClient, event) ->
 {
 
 })
@@ -512,13 +396,101 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onLivePaused [TikTokLivePausedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java)
+## onFollow [TikTokFollowEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java)
 
 
+Triggers when a user follows the streamer. Based on social event.
+
 
 ```java
 TikTokLive.newClient("host-name")
-.onLivePaused((liveClient, event) ->
+.onFollow((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onGiftCombo [TikTokGiftComboEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java)
+
+
+Triggered every time gift is sent
+
+@see GiftSendType it has 3 states
+
+  <p>Example when user sends gift with combo</p>
+  <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
+  <p>Combo: 4 -> comboState = GiftSendType.Active</p>
+  <p>Combo: 8 -> comboState = GiftSendType.Active</p>
+  <p>Combo: 12 -> comboState = GiftSendType.Finsihed</p>
+  <p>
+  Remember if comboState is Finsihed both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
+
+
+```java
+TikTokLive.newClient("host-name")
+.onGiftCombo((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onLiveEnded [TikTokLiveEndedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveEndedEvent.java)
+
+
+Triggered when the live stream gets terminated by the host. Will also trigger the TikTokDisconnectedEvent event.
+
+
+```java
+TikTokLive.newClient("host-name")
+.onLiveEnded((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onQuestion [TikTokQuestionEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java)
+
+
+Triggered every time someone asks a new question via the question feature.
+
+
+```java
+TikTokLive.newClient("host-name")
+.onQuestion((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onShare [TikTokShareEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java)
+
+
+Triggers when a user shares the stream. Based on social event.
+
+
+```java
+TikTokLive.newClient("host-name")
+.onShare((liveClient, event) ->
 {
 
 })
@@ -544,6 +516,25 @@ TikTokLive.newClient("host-name")
 
 
 
+<br>
+
+## onEmote [TikTokEmoteEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokEmoteEvent.java)
+
+
+Triggered every time a subscriber sends an emote (sticker).
+
+
+```java
+TikTokLive.newClient("host-name")
+.onEmote((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
 <br>
 
 ## onJoin [TikTokJoinEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java)
@@ -561,6 +552,59 @@ TikTokLive.newClient("host-name")
 
 
 
+<br>
+
+## onLike [TikTokLikeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java)
+
+
+Triggered when a viewer sends likes to the streamer. For streams with many viewers, this event is not always triggered by TikTok.
+
+
+```java
+TikTokLive.newClient("host-name")
+.onLike((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onLivePaused [TikTokLivePausedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLivePausedEvent.java)
+
+
+
+```java
+TikTokLive.newClient("host-name")
+.onLivePaused((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onWebsocketResponse [TikTokWebsocketResponseEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java)
+
+
+
+```java
+TikTokLive.newClient("host-name")
+.onWebsocketResponse((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
 <br>
 
 ## onWebsocketUnhandledMessage [TikTokWebsocketUnhandledMessageEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketUnhandledMessageEvent.java)
@@ -582,17 +626,17 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onWebsocketResponse [TikTokWebsocketResponseEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java)
+## onHttpResponse [TikTokHttpResponseEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/http/TikTokHttpResponseEvent.java)
 
 
 
 ```java
 TikTokLive.newClient("host-name")
-        .onWebsocketResponse((liveClient, event) ->
-        {
+.onHttpResponse((liveClient, event) ->
+{
 
-        })
-        .buildAndConnect();
+})
+.buildAndConnect();
 ```
 
 
@@ -602,24 +646,37 @@ TikTokLive.newClient("host-name")
 ## onWebsocketMessage [TikTokWebsocketMessageEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java)
 
 
-Triggered every time a protobuf encoded webcast message arrives. You can deserialize the binary object depending on the use case.
+Triggered every time TikTok sends data. Data incoming as protobuf message.
+You can deserialize the binary object depending on the use case.
 
 
 ```java
 TikTokLive.newClient("host-name")
-        .onWebsocketMessage((liveClient, event) ->
-        {
+.onWebsocketMessage((liveClient, event) ->
+{
 
-        })
-        .buildAndConnect();
+})
+.buildAndConnect();
 ```
 
 
 
 
 
+
 <br>
 
+
+## Extensions
+
+List of extensions (addons) to TiktokLiveJava
+that will save your time
+
+- [Video Recorder](https://github.com/jwdeveloper/TikTokLiveJava/tree/master/extension-recorder)
+- [Live data collector to database](https://github.com/jwdeveloper/TikTokLiveJava/tree/master/extension-collector)
+
+
+
 ## Listeners
 
 ```java
@@ -694,4 +751,7 @@ public static class CustomListener implements TikTokEventListener {
 
 
 ## Contributing
+
+[Library documentation for contributors](https://github.com/jwdeveloper/TikTokLiveJava/wiki)
+
 Your improvements are welcome! Feel free to open an <a href="https://github.com/jwdeveloper/TikTok-Live-Java/issues">issue</a> or <a href="https://github.com/jwdeveloper/TikTok-Live-Java/pulls">pull request</a>.

Tools-EventsCollector/pom.xml

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

Tools-EventsWebViewer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.0.17-Release</version>
+        <version>1.1.2-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>Tools-EventsWebViewer</artifactId>

Tools-ReadmeGenerator/pom.xml

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

Tools-ReadmeGenerator/src/main/resources/output.md

@@ -126,7 +126,6 @@ TikTokLive.newClient("bangbetmenygy")
                 {
                     settings.setHostName("bangbetmenygy"); // This method is useful in case you want change hostname later
                     settings.setClientLanguage("en"); // Language
-                    settings.setTimeout(Duration.ofSeconds(2)); // Connection timeout
                     settings.setLogLevel(Level.ALL); // Log level
                     settings.setPrintToConsole(true); // Printing all logs to console even if log level is Level.OFF
                     settings.setRetryOnConnectionFailure(true); // Reconnecting if TikTok user is offline
@@ -152,35 +151,73 @@ TikTokLive.newClient("bangbetmenygy")
 
  **Control**:
 
-- [onConnected](#onconnected-tiktokconnectedevent)
-- [onDisconnected](#ondisconnected-tiktokdisconnectedevent)
 - [onReconnecting](#onreconnecting-tiktokreconnectingevent)
 - [onError](#onerror-tiktokerrorevent)
+- [onConnected](#onconnected-tiktokconnectedevent)
+- [onDisconnected](#ondisconnected-tiktokdisconnectedevent)
 
  **Message**:
 
 - [onEvent](#onevent-tiktokevent)
-- [onSubscribe](#onsubscribe-tiktoksubscribeevent)
-- [onQuestion](#onquestion-tiktokquestionevent)
-- [onFollow](#onfollow-tiktokfollowevent)
-- [onLike](#onlike-tiktoklikeevent)
-- [onLiveEnded](#onliveended-tiktokliveendedevent)
-- [onRoomInfo](#onroominfo-tiktokroominfoevent)
-- [onShare](#onshare-tiktokshareevent)
-- [onGiftCombo](#ongiftcombo-tiktokgiftcomboevent)
-- [onEmote](#onemote-tiktokemoteevent)
-- [onGift](#ongift-tiktokgiftevent)
+- [onEvent](#onevent-tiktokevent)
 - [onComment](#oncomment-tiktokcommentevent)
-- [onLivePaused](#onlivepaused-tiktoklivepausedevent)
+- [onRoomInfo](#onroominfo-tiktokroominfoevent)
+- [onGift](#ongift-tiktokgiftevent)
+- [onSubscribe](#onsubscribe-tiktoksubscribeevent)
+- [onFollow](#onfollow-tiktokfollowevent)
+- [onGiftCombo](#ongiftcombo-tiktokgiftcomboevent)
+- [onLiveEnded](#onliveended-tiktokliveendedevent)
+- [onQuestion](#onquestion-tiktokquestionevent)
+- [onShare](#onshare-tiktokshareevent)
 - [onLiveUnpaused](#onliveunpaused-tiktokliveunpausedevent)
+- [onEmote](#onemote-tiktokemoteevent)
 - [onJoin](#onjoin-tiktokjoinevent)
+- [onLike](#onlike-tiktoklikeevent)
+- [onLivePaused](#onlivepaused-tiktoklivepausedevent)
 
  **Debug**:
 
-- [onWebsocketUnhandledMessage](#onwebsocketunhandledmessage-tiktokwebsocketunhandledmessageevent)
 - [onWebsocketResponse](#onwebsocketresponse-tiktokwebsocketresponseevent)
+- [onWebsocketUnhandledMessage](#onwebsocketunhandledmessage-tiktokwebsocketunhandledmessageevent)
+- [onHttpResponse](#onhttpresponse-tiktokhttpresponseevent)
 - [onWebsocketMessage](#onwebsocketmessage-tiktokwebsocketmessageevent)
 # Examples
+<br>
+
+## onReconnecting [TikTokReconnectingEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java)
+
+
+
+```java
+TikTokLive.newClient("host-name")
+.onReconnecting((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onError [TikTokErrorEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java)
+
+
+  General error event. You should handle this.
+ 
+
+```java
+TikTokLive.newClient("host-name")
+.onError((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
 <br>
 
 ## onConnected [TikTokConnectedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokConnectedEvent.java)
@@ -222,32 +259,15 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onReconnecting [TikTokReconnectingEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokReconnectingEvent.java)
+## onEvent [TikTokEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/common/TikTokEvent.java)
 
 
-
-```java
-TikTokLive.newClient("host-name")
-.onReconnecting((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onError [TikTokErrorEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokErrorEvent.java)
-
-
-  General error event. You should handle this.
+  Base class for all events
  
 
 ```java
 TikTokLive.newClient("host-name")
-.onError((liveClient, event) ->
+.onEvent((liveClient, event) ->
 {
 
 })
@@ -277,15 +297,15 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onSubscribe [TikTokSubscribeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java)
+## onComment [TikTokCommentEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java)
 
 
-  Triggers when a user creates a subscription.
+  Triggered every time a new chat comment arrives.
  
 
 ```java
 TikTokLive.newClient("host-name")
-.onSubscribe((liveClient, event) ->
+.onComment((liveClient, event) ->
 {
 
 })
@@ -296,15 +316,55 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onQuestion [TikTokQuestionEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java)
+## onRoomInfo [TikTokRoomInfoEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomInfoEvent.java)
 
 
-Triggered every time someone asks a new question via the question feature.
+Triggered when LiveRoomInfo got updated such as likes, viewers, ranking ....
  
 
 ```java
 TikTokLive.newClient("host-name")
-.onQuestion((liveClient, event) ->
+.onRoomInfo((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onGift [TikTokGiftEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java)
+
+
+  Triggered when user sends gifts that has
+  no combo (most of expensive gifts)
+  or if combo has finished
+ 
+
+```java
+TikTokLive.newClient("host-name")
+.onGift((liveClient, event) ->
+{
+
+})
+.buildAndConnect();
+```
+
+
+
+<br>
+
+## onSubscribe [TikTokSubscribeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokSubscribeEvent.java)
+
+
+  Triggers when a user creates a subscription.
+ 
+
+```java
+TikTokLive.newClient("host-name")
+.onSubscribe((liveClient, event) ->
 {
 
 })
@@ -334,15 +394,25 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onLike [TikTokLikeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java)
+## onGiftCombo [TikTokGiftComboEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java)
 
 
-  Triggered when a viewer sends likes to the streamer. For streams with many viewers, this event is not always triggered by TikTok.
+  Triggered every time gift is sent
+ 
+  @see GiftSendType it has 3 states
+ 
+  <p>Example when user sends gift with combo</p>
+  <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
+  <p>Combo: 4 -> comboState = GiftSendType.Active</p>
+  <p>Combo: 8 -> comboState = GiftSendType.Active</p>
+  <p>Combo: 12 -> comboState = GiftSendType.Finsihed</p>
+  <p>
+  Remember if comboState is Finsihed both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
  
 
 ```java
 TikTokLive.newClient("host-name")
-.onLike((liveClient, event) ->
+.onGiftCombo((liveClient, event) ->
 {
 
 })
@@ -372,13 +442,15 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onRoomInfo [TikTokRoomInfoEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/room/TikTokRoomInfoEvent.java)
+## onQuestion [TikTokQuestionEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokQuestionEvent.java)
 
 
+Triggered every time someone asks a new question via the question feature.
+ 
 
 ```java
 TikTokLive.newClient("host-name")
-.onRoomInfo((liveClient, event) ->
+.onQuestion((liveClient, event) ->
 {
 
 })
@@ -408,25 +480,13 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onGiftCombo [TikTokGiftComboEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftComboEvent.java)
+## onLiveUnpaused [TikTokLiveUnpausedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveUnpausedEvent.java)
 
 
-  Triggered every time gift is sent
- 
-  @see GiftSendType it has 3 states
- 
-  <p>Example when user sends gift with combo</p>
-  <p>>Combo: 1  -> comboState = GiftSendType.Begin</p>
-  <p>Combo: 4 -> comboState = GiftSendType.Active</p>
-  <p>Combo: 8 -> comboState = GiftSendType.Active</p>
-  <p>Combo: 12 -> comboState = GiftSendType.Finsihed</p>
- 
-  Remember if comboState is Finsihed both TikTokGiftComboEvent and TikTokGiftEvent event gets triggered
- 
 
 ```java
 TikTokLive.newClient("host-name")
-.onGiftCombo((liveClient, event) ->
+.onLiveUnpaused((liveClient, event) ->
 {
 
 })
@@ -456,17 +516,13 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onGift [TikTokGiftEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/gift/TikTokGiftEvent.java)
+## onJoin [TikTokJoinEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java)
 
 
-  Triggered when user sends gifts that has
-   no combo (most of expensive gifts)
-   or if combo has finished
- 
 
 ```java
 TikTokLive.newClient("host-name")
-.onGift((liveClient, event) ->
+.onJoin((liveClient, event) ->
 {
 
 })
@@ -477,15 +533,15 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onComment [TikTokCommentEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokCommentEvent.java)
+## onLike [TikTokLikeEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java)
 
 
-  Triggered every time a new chat comment arrives.
+  Triggered when a viewer sends likes to the streamer. For streams with many viewers, this event is not always triggered by TikTok.
  
 
 ```java
 TikTokLive.newClient("host-name")
-.onComment((liveClient, event) ->
+.onLike((liveClient, event) ->
 {
 
 })
@@ -513,30 +569,13 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onLiveUnpaused [TikTokLiveUnpausedEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLiveUnpausedEvent.java)
+## onWebsocketResponse [TikTokWebsocketResponseEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java)
 
 
 
 ```java
 TikTokLive.newClient("host-name")
-.onLiveUnpaused((liveClient, event) ->
-{
-
-})
-.buildAndConnect();
-```
-
-
-
-<br>
-
-## onJoin [TikTokJoinEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java)
-
-
-
-```java
-TikTokLive.newClient("host-name")
-.onJoin((liveClient, event) ->
+.onWebsocketResponse((liveClient, event) ->
 {
 
 })
@@ -566,13 +605,13 @@ TikTokLive.newClient("host-name")
 
 <br>
 
-## onWebsocketResponse [TikTokWebsocketResponseEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketResponseEvent.java)
+## onHttpResponse [TikTokHttpResponseEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/http/TikTokHttpResponseEvent.java)
 
 
 
 ```java
 TikTokLive.newClient("host-name")
-.onWebsocketResponse((liveClient, event) ->
+.onHttpResponse((liveClient, event) ->
 {
 
 })
@@ -586,7 +625,8 @@ TikTokLive.newClient("host-name")
 ## onWebsocketMessage [TikTokWebsocketMessageEvent](https://github.com/jwdeveloper/TikTokLiveJava/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/data/events/websocket/TikTokWebsocketMessageEvent.java)
 
 
-  Triggered every time a protobuf encoded webcast message arrives. You can deserialize the binary object depending on the use case.
+  Triggered every time TikTok sends data. Data incoming as protobuf message.
+  You can deserialize the binary object depending on the use case.
  
 
 ```java
@@ -602,6 +642,17 @@ TikTokLive.newClient("host-name")
 
 
 
+{{for item of data }} 
+
+{{if item is 2}}
+
+my name is {{item.name}}
+
+{{else}}
+
+{{end}}
+
+{{end}}
 <br>
 
 ## Listeners
@@ -628,7 +679,7 @@ TikTokLive.newClient("host-name")
     /**
      *
      *  Method in TikTokEventListener should meet 4 requirements to be detected
-     *         - must have @TikTokEventHandler annotation
+     *         - must have @TikTokEventObserver annotation
      *         - must have 2 parameters
      *         - first parameter must be LiveClient
      *         - second must be class that extending TikTokEvent
@@ -636,24 +687,24 @@ TikTokLive.newClient("host-name")
 
     public static class CustomListener implements TikTokEventListener {
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onLike(LiveClient liveClient, TikTokLikeEvent event) {
             System.out.println(event.toString());
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onError(LiveClient liveClient, TikTokErrorEvent event) {
           //  event.getException().printStackTrace();
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onComment(LiveClient liveClient, TikTokCommentEvent event) {
             var userName = event.getUser().getName();
             var text = event.getText();
             liveClient.getLogger().info(userName + ": " + text);
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onGift(LiveClient liveClient, TikTokGiftEvent event) {
             var message = switch (event.getGift()) {
                 case ROSE -> "Thanks :)";
@@ -666,7 +717,7 @@ TikTokLive.newClient("host-name")
             liveClient.getLogger().info(message);
         }
 
-        @TikTokEventHandler
+        @TikTokEventObserver
         public void onAnyEvent(LiveClient liveClient, TikTokEvent event) {
             liveClient.getLogger().info(event.getClass().getSimpleName());
         }

Tools/pom.xml

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

extension-collector/README.md

@@ -0,0 +1,64 @@
+Collects live data to mongodb database
+
+
+```xml
+   <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
+            <artifactId>Client</artifactId>
+            <version>1.1.0-Release</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
+            <artifactId>extension-collector</artifactId>
+            <version>1.1.0-Release</version>
+        </dependency>
+    </dependencies>
+```
+
+
+Usage
+
+```java
+    public static void main(String[] args) throws IOException {
+
+        var collector = TikTokLiveCollector.use(settings ->
+        {
+        settings.setConnectionUrl("mongodb+srv://" + mongoUser + ":" + mongoPassword + "@" + mongoDatabase + "/?retryWrites=true&w=majority");
+        settings.setDatabaseName("tiktok");
+        });
+        collector.connectDatabase();
+
+        var users = List.of("tehila_723", "dino123597", "domaxyzx", "dash4214", "obserwacje_live");
+        var sessionTag = "Tag1";
+        for (var user : users) {
+        TikTokLive.newClient(user)
+        .configure(liveClientSettings ->
+        {
+        liveClientSettings.setPrintToConsole(true);
+        })
+        .onError((liveClient, event) ->
+        {
+        event.getException().printStackTrace();
+        })
+        .addListener(collector.newListener(Map.of("sessionTag", sessionTag), document ->
+        {
+        if (document.get("dataType") == "message") {
+        return false;
+        }
+        return true;
+        }))
+        .buildAndConnectAsync();
+        }
+
+        System.in.read();
+        collector.disconnectDatabase();
+        }
+```

extension-collector/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
         <artifactId>TikTokLiveJava</artifactId>
-        <version>1.0.14-Release</version>
+        <version>1.1.2-Release</version>
     </parent>
 
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.0.17-Release</version>
+            <version>1.1.2-Release</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

extension-recorder/README.md

@@ -0,0 +1,56 @@
+
+Records stream to flv file
+
+
+```xml
+   <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
+            <artifactId>Client</artifactId>
+            <version>1.1.0-Release</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
+            <artifactId>extension-recorder</artifactId>
+            <version>1.1.0-Release</version>
+        </dependency>
+    </dependencies>
+```
+
+
+Usage
+
+```java
+
+public static void main(String[] args) {
+
+        TikTokLive.newClient("bangbetmenygy")
+        .configure(liveClientSettings ->
+        {
+        liveClientSettings.setPrintToConsole(true);
+        })
+        .onError((liveClient, event) ->
+        {
+        event.getException().printStackTrace();
+        })
+        .addListener(TikTokLiveRecorder.use(recorderSettings ->
+        {
+        recorderSettings.setFfmpegPath("C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\extension-recorder\\libs\\ffmpeg.exe");
+        recorderSettings.setOutputPath("C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\extension-recorder\\out");
+        recorderSettings.setOutputFileName("test.flv");
+        }))
+        .onEvent(TikTokLiveRecorderStartedEvent.class, (liveClient, event) ->
+        {
+        System.out.println(event.getDownloadData().getFullUrl());
+        })
+        .buildAndConnect();
+
+        }
+```

extension-recorder/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.0.14-Release</version>
+        <version>1.1.2-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extension-recorder</artifactId>
@@ -13,19 +13,13 @@
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>Client</artifactId>
-            <version>1.0.14-Release</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.bramp.ffmpeg</groupId>
-            <artifactId>ffmpeg</artifactId>
-            <version>0.8.0</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.github.jwdeveloper.tiktok</groupId>
             <artifactId>API</artifactId>
-            <version>1.0.17-Release</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

@@ -24,28 +24,18 @@ package io.github.jwdeveloper.tiktok.extension.recorder.impl;
 
 import com.google.gson.JsonParser;
 import io.github.jwdeveloper.tiktok.annotations.TikTokEventObserver;
-import io.github.jwdeveloper.tiktok.data.events.TikTokLiveEndedEvent;
-import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
-import io.github.jwdeveloper.tiktok.extension.recorder.api.LiveRecorder;
-import io.github.jwdeveloper.tiktok.data.events.TikTokConnectedEvent;
-import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
-import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.DownloadData;
-import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.RecorderSettings;
+import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.http.TikTokRoomDataResponseEvent;
+import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+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.http.HttpClientFactory;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
-import net.bramp.ffmpeg.FFmpeg;
-import net.bramp.ffmpeg.FFmpegExecutor;
-import net.bramp.ffmpeg.RunProcessFunction;
-import net.bramp.ffmpeg.builder.FFmpegBuilder;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
 import java.net.URL;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -90,46 +80,11 @@ public class RecorderListener implements LiveRecorder {
             throw new TikTokLiveException("Unable to find download live url!");
         }
         liveClient.getLogger().info("Live download url found!");
-
     }
 
     @TikTokEventObserver
     private void onConnected(LiveClient liveClient, TikTokConnectedEvent event) {
-      /*  liveDownloadThread = new Thread(() ->
-        {
-            try {
-                var ffmpeg = new FFmpeg(settings.getFfmpegPath(), new RunProcessFunction() {
-                    @Override
-                    public Process run(final List<String> args) throws IOException {
-                        var process = super.run(args);
-                        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-                            terminateFfmpeg(process);
-                        }, "FFmpeg process destroyer"));
-                        return process;
-                    }
-                });
-
-                var builder = new FFmpegBuilder()
-                        .setInput(downloadData.getFullUrl())
-                        .addOutput(settings.getOutputPath() + File.separator + settings.getOutputFileName()) // Set the output file path
-                        .setFormat("mp4")
-                        .done();
-
-                var executor = new FFmpegExecutor(ffmpeg);
-                var ffmpegProcess = executor.createJob(builder, (progress)-> {
-                    liveClient.getLogger().info("Downloading stream: " +progress.total_size);
-                });
-                ffmpegProcess.run();
-                liveClient.publishEvent(new TikTokLiveRecorderStartedEvent(downloadData));
-
-            } catch (Exception e) {
-                throw new TikTokLiveException("Unable to run ffmpeg drivers",e);
-            }
-        });
-*/
-
-        liveDownloadThread = new Thread(() ->
-        {
+        liveDownloadThread = new Thread(() -> {
             try {
                 var bufferSize = 1024;
                 var url = new URL(downloadData.getFullUrl());
@@ -139,41 +94,33 @@ public class RecorderListener implements LiveRecorder {
                     socksConnection.setRequestProperty(entry.getKey(), entry.getValue());
                 }
 
-                System.out.println(socksConnection.getResponseCode());
-                try (var in = new BufferedInputStream(socksConnection.getInputStream())) {
-                    var path = settings.getOutputPath() + File.separator + settings.getOutputFileName();
-                    var file = new File(path);
-                    file.getParentFile().mkdirs();
-                    var fileOutputStream = new FileOutputStream(file);
-                    byte dataBuffer[] = new byte[bufferSize];
-                    int bytesRead;
-                    while ((bytesRead = in.read(dataBuffer, 0, bufferSize)) != -1) {
-                        fileOutputStream.write(dataBuffer, 0, bytesRead);
-                    }
-                } catch (IOException e) {
-                    throw e;
+                var in = new BufferedInputStream(socksConnection.getInputStream());
+                var path = settings.getOutputPath() + File.separator + settings.getOutputFileName();
+                var file = new File(path);
+                file.getParentFile().mkdirs();
+                var fileOutputStream = new FileOutputStream(file);
+                byte[] dataBuffer = new byte[bufferSize];
+                int bytesRead;
+                while ((bytesRead = in.read(dataBuffer, 0, bufferSize)) != -1) {
+                    fileOutputStream.write(dataBuffer, 0, bytesRead);
                 }
-            } catch (Exception e) {
+                in.close();
+			} catch (Exception e) {
                 e.printStackTrace();
-                ;
             }
-
         });
 
-
         liveDownloadThread.start();
     }
 
-
     private static void downloadUsingStream(String urlStr, String file) throws IOException {
         URL url = new URL(urlStr);
         BufferedInputStream bis = new BufferedInputStream(url.openStream());
         FileOutputStream fis = new FileOutputStream(file);
         byte[] buffer = new byte[1024];
-        int count = 0;
-        while ((count = bis.read(buffer, 0, 1024)) != -1) {
+        int count;
+        while ((count = bis.read(buffer, 0, 1024)) != -1)
             fis.write(buffer, 0, count);
-        }
         fis.close();
         bis.close();
     }
@@ -181,25 +128,23 @@ public class RecorderListener implements LiveRecorder {
 
     @TikTokEventObserver
     private void onDisconnected(LiveClient liveClient, TikTokDisconnectedEvent event) {
-        liveDownloadThread.interrupt();
+        if (isConnected())
+            liveDownloadThread.interrupt();
     }
 
     @TikTokEventObserver
     private void onDisconnected(LiveClient liveClient, TikTokLiveEndedEvent event) {
-        liveDownloadThread.interrupt();
+        if (isConnected())
+            liveDownloadThread.interrupt();
     }
 
     private int terminateFfmpeg(final Process process) {
         if (!process.isAlive()) {
-            /*
-             * ffmpeg -version, do nothing
-             */
+            // ffmpeg -version, do nothing
             return process.exitValue();
         }
 
-        /*
-         * ffmpeg -f x11grab
-         */
+        // 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');
@@ -212,7 +157,7 @@ public class RecorderListener implements LiveRecorder {
                 process.waitFor();
             }
             return process.exitValue();
-        } catch (final InterruptedException ie) {
+        } catch (InterruptedException ie) {
             System.out.println("Interrupted");
             ie.printStackTrace();
             Thread.currentThread().interrupt();
@@ -239,12 +184,10 @@ public class RecorderListener implements LiveRecorder {
                 .get("flv")
                 .getAsString();
 
-
         var sessionId = streamDataJsonObject.getAsJsonObject("common")
                 .get("session_id")
                 .getAsString();
 
-
         //main
         //https://pull-f5-tt03.fcdn.eu.tiktokcdn.com/stage/stream-3284937501738533765.flv?session_id=136-20240109000954BF818F1B3A8E5E39E238&_webnoredir=1
         //Working
@@ -254,5 +197,7 @@ public class RecorderListener implements LiveRecorder {
         return new DownloadData(urlLink, sessionId);
     }
 
-
-}
+    private boolean isConnected() {
+        return liveDownloadThread != null && liveDownloadThread.isAlive();
+    }
+}

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

@@ -34,6 +34,6 @@ public class DownloadData {
     private String sessionId;
 
     public String getFullUrl() {
-        return downloadLiveUrl + "?_webnoredir=1&session_id=" + sessionId;
+        return downloadLiveUrl + "&_webnoredir=1&session_id=" + sessionId;
     }
-}
+}

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

@@ -29,25 +29,6 @@ import lombok.Setter;
 
 import java.util.function.Function;
 
-/**
- * self,
- * path: str,
- * duration: Optional[int] = None,
- * quality: Optional[VideoQuality] = None,
- * verbose: bool = True,
- * loglevel: str = "error",
- * global_options: Set[str] = set(),
- * inputs: Dict[str, str] = dict(),
- * outputs: Dict[str, str] = dict()
- * :param loglevel: Set the FFmpeg log level
- * :param outputs: Pass custom params to FFmpeg outputs
- * :param inputs: Pass custom params to FFmpeg inputs
- * :param global_options: Pass custom params to FFmpeg global options
- * :param path: The path to download the livestream video to
- * :param duration: If duration is None or less than 1, download will go forever
- * :param quality: If quality is None, download quality will auto
- * :param verbose: Whether to log info about the download in console
- */
 @Getter
 @Setter
 public class RecorderSettings {
@@ -63,20 +44,11 @@ public class RecorderSettings {
         return new RecorderSettings();
     }
 
-    public void setQuality(String format) {
-        this.format = format;
-    }
-
     public void setQuality(LiveQuality quality) {
         this.quality = quality.name();
     }
 
-
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
     public void setFormat(LiveFormat format) {
         this.format = format.name();
     }
-}
+}

pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.github.jwdeveloper.tiktok</groupId>
     <artifactId>TikTokLiveJava</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.17-Release</version>
+    <version>1.1.2-Release</version>
     <modules>
         <module>API</module>
         <module>Client</module>