Merge pull request #94 from jwdeveloper/develop-1.8.5

Develop 1.8.5

API/pom.xml

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

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

@@ -58,6 +58,7 @@ public class TikTokCommentEvent extends TikTokHeaderEvent {
         var builder = WebcastChatMessage.newBuilder();
         builder.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
                 .setNickname(userName)
+                .setDisplayId(userName)
                 .build());
         builder.setContentLanguage("en");
         builder.setVisibleToSender(true);

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

@@ -29,4 +29,9 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
 public class TikTokConnectedEvent extends TikTokLiveClientEvent
 {
 
+
+    public static TikTokConnectedEvent of()
+    {
+        return new TikTokConnectedEvent();
+    }
 }

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

@@ -39,4 +39,10 @@ public class TikTokDisconnectedEvent extends TikTokLiveClientEvent {
 	public TikTokDisconnectedEvent() {
 		this("None");
 	}
+
+
+	public static TikTokDisconnectedEvent of(String reason)
+	{
+		return new TikTokDisconnectedEvent(reason);
+	}
 }

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

@@ -25,13 +25,18 @@ package io.github.jwdeveloper.tiktok.data.events;
 import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 @EventMeta(eventType = EventType.Control)
-public class TikTokErrorEvent extends TikTokLiveClientEvent
-{
+public class TikTokErrorEvent extends TikTokLiveClientEvent {
     private final Throwable exception;
+
+
+    public static TikTokErrorEvent of(String message) {
+        return new TikTokErrorEvent(new TikTokLiveException(message));
+    }
 }

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

@@ -24,9 +24,14 @@ package io.github.jwdeveloper.tiktok.data.events;
 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.events.control.TikTokConnectingEvent;
 
 
 @EventMeta(eventType = EventType.Message)
 public class TikTokLiveEndedEvent extends TikTokEvent {
+
+
+    public static TikTokLiveEndedEvent of() {
+        return new TikTokLiveEndedEvent();
+    }
 }

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

@@ -53,6 +53,7 @@ public class TikTokSubscribeEvent extends TikTokHeaderEvent {
     public static TikTokSubscribeEvent of(String userName) {
         return new TikTokSubscribeEvent(WebcastMemberMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
                         .setNickname(userName)
                         .build())
                 .build());

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

@@ -31,7 +31,9 @@ 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
-{
+public class TikTokConnectingEvent extends TikTokLiveClientEvent {
 
+    public static TikTokConnectingEvent of() {
+        return new TikTokConnectingEvent();
+    }
 }

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

@@ -1,38 +0,0 @@
-/*
- * 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.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;
-}

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokFollowEvent.java

@@ -32,8 +32,7 @@ import lombok.Value;
 
 @Value
 @EventMeta(eventType = EventType.Message)
-public class TikTokFollowEvent extends TikTokHeaderEvent
-{
+public class TikTokFollowEvent extends TikTokHeaderEvent {
     User user;
     int totalFollowers;
 
@@ -43,12 +42,12 @@ public class TikTokFollowEvent extends TikTokHeaderEvent
         totalFollowers = msg.getFollowCount();
     }
 
-    public static TikTokFollowEvent of(String userName)
-    {
+    public static TikTokFollowEvent of(String userName) {
         return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
-            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
-                .setNickname(userName)
-                .build())
-            .build());
+                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
+                        .setNickname(userName)
+                        .build())
+                .build());
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java

@@ -53,6 +53,7 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
     {
         return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
                         .setNickname(userName)
                         .build())
                 .build());

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokLikeEvent.java

@@ -62,6 +62,7 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
                 .setCount(likes)
                 .setTotal(likes)
                 .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
                         .setNickname(userName)
                         .build())
                 .build());

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokShareEvent.java

@@ -26,6 +26,7 @@ import io.github.jwdeveloper.tiktok.annotations.EventMeta;
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
+import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
 
@@ -33,18 +34,27 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Message)
 public class TikTokShareEvent extends TikTokHeaderEvent {
-	private final User user;
-	private final int totalShares;
+    private final User user;
+    private final int totalShares;
 
-	public TikTokShareEvent(WebcastSocialMessage msg, Integer amount) {
-		super(msg.getCommon());
-		user = User.map(msg.getUser());
-		this.totalShares = amount;
-	}
+    public TikTokShareEvent(WebcastSocialMessage msg, Integer amount) {
+        super(msg.getCommon());
+        user = User.map(msg.getUser());
+        this.totalShares = amount;
+    }
 
-	public TikTokShareEvent(WebcastSocialMessage msg) {
-		super(msg.getCommon());
-		user = User.map(msg.getUser());
-		totalShares = 1;
-	}
+    public TikTokShareEvent(WebcastSocialMessage msg) {
+        super(msg.getCommon());
+        user = User.map(msg.getUser());
+        totalShares = 1;
+    }
+
+    public static TikTokShareEvent of(String userName, int shaders) {
+        return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
+                .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                        .setDisplayId(userName)
+                        .setNickname(userName)
+                        .build())
+                .build(), shaders);
+    }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/users/ListUser.java

@@ -53,4 +53,19 @@ public class ListUser
         AUDIO,
         VIDEO
     }
+
+    @Override
+    public String toString() {
+        return "ListUser{" +
+            "user=" + user +
+            ", linkType=" + linkType +
+            ", linkMicId=" + linkMicId +
+            ", linkStatus=" + linkStatus +
+            ", modifyTime=" + modifyTime +
+            ", linkerId=" + linkerId +
+            ", userPosition=" + userPosition +
+            ", silenceStatus=" + silenceStatus +
+            ", roleType=" + roleType +
+            "}";
+    }
 }

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

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.data.requests;
 
+import io.github.jwdeveloper.tiktok.data.models.users.User;
 import lombok.*;
 
 public class LiveUserData {
@@ -44,6 +45,7 @@ public class LiveUserData {
         private final UserStatus userStatus;
         private final String roomId;
         private final long startTime;
+        private final User user;
 
         public boolean isLiveOnline() {
             return userStatus == LiveUserData.UserStatus.Live || userStatus == LiveUserData.UserStatus.LivePaused;

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

@@ -82,9 +82,9 @@ public class LiveClientSettings {
 
     /**
      * Interval of time in milliseconds between pings to TikTok
-     * @apiNote Min: 250 (0.25 seconds), Default: 5000 (5 seconds)
+     * @apiNote Min: 250 (0.25 seconds), Default: 10000 (10 seconds - TikTok Default)
      */
-    private long pingInterval = 5000;
+    private long pingInterval = 10000;
 
     /** Throw an exception on 18+ Age Restriction */
     private boolean throwOnAgeRestriction;

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.*;
 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.TikTokPreConnectionEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftComboEvent;
 import io.github.jwdeveloper.tiktok.data.events.gift.TikTokGiftEvent;
@@ -60,6 +61,18 @@ public interface EventsBuilder<T> {
         return onEvent(TikTokEvent.class, action);
     }
 
+
+    /**
+     * As a first event after method `LiveClient::connect()` is performed
+     *
+     * @param action consumable action
+     * @return self instance
+     */
+    default T onConnecting(EventConsumer<TikTokConnectingEvent> action)
+    {
+        return onEvent(TikTokConnectingEvent.class, action);
+    }
+
     /**
      * Invoked when information about room (live) got updated such as viewer count, etc..
      *

Client/pom.xml

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

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

@@ -26,7 +26,6 @@ import com.google.protobuf.ByteString;
 import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 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.*;
 import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
@@ -89,8 +88,7 @@ public class TikTokLiveClient implements LiveClient
             if (e instanceof TikTokLiveOfflineHostException && clientSettings.isRetryOnConnectionFailure()) {
                 try {
                     Thread.sleep(clientSettings.getRetryConnectionTimeout().toMillis());
-                } catch (Exception ignored) {
-                }
+                } catch (Exception ignored) {}
                 logger.info("Reconnecting");
                 tikTokEventHandler.publish(this, new TikTokReconnectingEvent());
                 this.connect();
@@ -133,8 +131,6 @@ public class TikTokLiveClient implements LiveClient
         if (liveData.getLiveStatus() == LiveData.LiveStatus.HostOffline)
             throw new TikTokLiveOfflineHostException("LiveStream for " + roomInfo.getHostName() + " not found, is the Host offline?");
 
-        tikTokEventHandler.publish(this, new TikTokRoomDataResponseEvent(liveData));
-
         roomInfo.setTitle(liveData.getTitle());
         roomInfo.setViewersCount(liveData.getViewers());
         roomInfo.setTotalViewersCount(liveData.getTotalViewers());

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

@@ -138,7 +138,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
         //networking
         dependance.registerSingleton(HttpClientFactory.class);
-        dependance.registerSingleton(TikTokWebSocketPingingTask.class);
+        dependance.registerSingleton(WebSocketHeartbeatTask.class);
         if (clientSettings.isOffline()) {
             dependance.registerSingleton(LiveSocketClient.class, TikTokWebSocketOfflineClient.class);
             dependance.registerSingleton(LiveHttpClient.class, TikTokLiveHttpOfflineClient.class);

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

@@ -203,7 +203,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
         }
     }
 
-    private ActionResult<HttpResponse<byte[]>> getStartingPayload(LiveConnectionData.Request request) {
+    protected ActionResult<HttpResponse<byte[]>> getStartingPayload(LiveConnectionData.Request request) {
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
@@ -215,7 +215,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
         return getByteResponse(request.getRoomId());
     }
 
-    private ActionResult<HttpResponse<byte[]>> getByteResponse(String room_id) {
+    protected ActionResult<HttpResponse<byte[]>> getByteResponse(String room_id) {
         HttpClientBuilder builder = httpFactory.client(TIKTOK_SIGN_API)
             .withParam("client", "ttlive-java")
             .withParam("uuc", "1") //MAGIC NUMBER!

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

@@ -47,7 +47,7 @@ public class TikTokLiveHttpOfflineClient implements LiveHttpClient {
 
     @Override
     public LiveUserData.Response fetchLiveUserData(LiveUserData.Request request) {
-        return new LiveUserData.Response("", LiveUserData.UserStatus.Live, "offline_room_id", 0);
+        return new LiveUserData.Response("", LiveUserData.UserStatus.Live, "offline_room_id", 0, null);
     }
 
     @Override

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

@@ -23,9 +23,12 @@
 package io.github.jwdeveloper.tiktok.http.mappers;
 
 import com.google.gson.*;
+import io.github.jwdeveloper.tiktok.data.models.Picture;
+import io.github.jwdeveloper.tiktok.data.models.users.User;
 import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 
+import java.util.List;
 import java.util.logging.Logger;
 
 public class LiveUserDataMapper
@@ -40,17 +43,18 @@ public class LiveUserDataMapper
                 throw new TikTokLiveRequestException("fetchRoomIdFromTiktokApi -> Unable to fetch roomID, contact the developer");
             }
             if (message.equals("user_not_found")) {
-                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
+                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1, null);
             }
             //live -> status 2
             //live paused -> 3
             //not live -> status 4
             var element = jsonObject.get("data");
             if (element.isJsonNull()) {
-                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
+                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1, null);
             }
             var data = element.getAsJsonObject();
             var user = data.getAsJsonObject("user");
+            var stats = data.getAsJsonObject("stats");
             var roomId = user.get("roomId").getAsString();
             var status = user.get("status").getAsInt();
 
@@ -64,10 +68,19 @@ public class LiveUserDataMapper
                 default -> LiveUserData.UserStatus.NotFound;
             };
 
-            return new LiveUserData.Response(json, statusEnum, roomId, startTime);
+            User foundUser = new User(
+                Long.parseLong(user.get("id").getAsString()),
+                user.get("uniqueId").getAsString(),
+                user.get("nickname").getAsString(),
+                new Picture(user.get("avatarLarger").getAsString()),
+                stats.get("followingCount").getAsLong(),
+                stats.get("followerCount").getAsLong(),
+                List.of());
+
+            return new LiveUserData.Response(json, statusEnum, roomId, startTime, foundUser);
         } catch (JsonSyntaxException | IllegalStateException e) {
             logger.warning("Malformed Json: '"+json+"' - Error Message: "+e.getMessage());
-            return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1);
+            return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1, null);
         }
     }
 }

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

@@ -40,7 +40,7 @@ public class TikTokWebSocketClient implements LiveSocketClient {
     private final LiveClientSettings clientSettings;
     private final LiveMessagesHandler messageHandler;
     private final LiveEventsHandler tikTokEventHandler;
-    private final TikTokWebSocketPingingTask pingingTask;
+    private final WebSocketHeartbeatTask heartbeatTask;
     private WebSocketClient webSocketClient;
     private boolean isConnected;
 
@@ -48,12 +48,12 @@ public class TikTokWebSocketClient implements LiveSocketClient {
             LiveClientSettings clientSettings,
             LiveMessagesHandler messageHandler,
             LiveEventsHandler tikTokEventHandler,
-            TikTokWebSocketPingingTask pingingTask)
+            WebSocketHeartbeatTask heartbeatTask)
     {
         this.clientSettings = clientSettings;
         this.messageHandler = messageHandler;
         this.tikTokEventHandler = tikTokEventHandler;
-        this.pingingTask = pingingTask;
+        this.heartbeatTask = heartbeatTask;
         isConnected = false;
     }
 
@@ -84,7 +84,7 @@ public class TikTokWebSocketClient implements LiveSocketClient {
     private void connectDefault() {
         try {
             webSocketClient.connect();
-            pingingTask.run(webSocketClient, clientSettings.getPingInterval());
+            heartbeatTask.run(webSocketClient, clientSettings.getPingInterval());
             isConnected = true;
         } catch (Exception e) {
             isConnected = false;
@@ -120,7 +120,7 @@ public class TikTokWebSocketClient implements LiveSocketClient {
                     proxySettings.remove();
                 continue;
             }
-            pingingTask.run(webSocketClient, clientSettings.getPingInterval());
+            heartbeatTask.run(webSocketClient, clientSettings.getPingInterval());
             isConnected = true;
             break;
         }
@@ -141,7 +141,7 @@ public class TikTokWebSocketClient implements LiveSocketClient {
     public void stop() {
         if (isConnected && webSocketClient != null && webSocketClient.isOpen()) {
             webSocketClient.closeConnection(0, "");
-            pingingTask.stop();
+            heartbeatTask.stop();
         }
         webSocketClient = null;
         isConnected = false;

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

@@ -22,18 +22,19 @@
  */
 package io.github.jwdeveloper.tiktok.websocket;
 
-import io.github.jwdeveloper.tiktok.live.LiveEventsHandler;
 import org.java_websocket.WebSocket;
 
-public class TikTokWebSocketPingingTask {
+public class WebSocketHeartbeatTask
+{
     private Thread thread;
     private boolean isRunning = false;
     private final int MAX_TIMEOUT = 250;
     private final int SLEEP_TIME = 500;
+    private final byte[] heartbeatBytes = {58, 2, 104, 98}; // Byte Array of "3A026862" which is TikTok's custom heartbeat value
 
     public void run(WebSocket webSocket, long pingTaskTime) {
         stop();
-        thread = new Thread(() -> pingTask(webSocket, pingTaskTime), "pinging-task");
+        thread = new Thread(() -> heartbeatTask(webSocket, pingTaskTime), "heartbeat-task");
         isRunning = true;
         thread.start();
     }
@@ -44,11 +45,11 @@ public class TikTokWebSocketPingingTask {
         isRunning = false;
     }
 
-    private void pingTask(WebSocket webSocket, long pingTaskTime) {
+    private void heartbeatTask(WebSocket webSocket, long pingTaskTime) {
         while (isRunning) {
             try {
                 if (webSocket.isOpen()) {
-                    webSocket.sendPing();
+                    webSocket.send(heartbeatBytes);
                     Thread.sleep(pingTaskTime + (int) (Math.random() * MAX_TIMEOUT));
                 } else
                     Thread.sleep(SLEEP_TIME);

Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokLiveClientTests.java

@@ -6,7 +6,6 @@ import io.github.jwdeveloper.tiktok.data.events.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.data.events.control.TikTokConnectingEvent;
 import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
-import io.github.jwdeveloper.tiktok.data.events.http.TikTokRoomDataResponseEvent;
 import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.live.builder.LiveClientBuilder;
@@ -43,7 +42,6 @@ public class TikTokLiveClientTests extends TikTokTestBase {
         Assert.assertEquals(ConnectionState.CONNECTED, roomInfoMock().getConnectionState());
         AssertEvents(
                 TikTokConnectingEvent.class,
-                TikTokRoomDataResponseEvent.class,
                 TikTokPreConnectionEvent.class,
                 TikTokConnectedEvent.class,
                 TikTokRoomInfoEvent.class);

examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.0-Release</version>
+        <version>1.8.4-Release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

extension-collector/pom.xml

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

extension-recorder/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.8.0-Release</version>
+        <version>1.8.4-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extension-recorder</artifactId>

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

@@ -25,7 +25,7 @@ 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.*;
-import io.github.jwdeveloper.tiktok.data.events.http.TikTokRoomDataResponseEvent;
+import io.github.jwdeveloper.tiktok.data.events.control.TikTokPreConnectionEvent;
 import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
 import io.github.jwdeveloper.tiktok.extension.recorder.api.LiveRecorder;
 import io.github.jwdeveloper.tiktok.extension.recorder.impl.data.*;
@@ -34,28 +34,29 @@ import io.github.jwdeveloper.tiktok.extension.recorder.impl.event.TikTokLiveReco
 import io.github.jwdeveloper.tiktok.live.LiveClient;
 import io.github.jwdeveloper.tiktok.models.ConnectionState;
 
-import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
-import java.net.URL;
-import java.util.function.*;
+import java.net.URI;
+import java.net.http.*;
+import java.time.Duration;
+import java.util.function.BiConsumer;
 
 public class RecorderListener implements LiveRecorder {
 
     private final BiConsumer<RecorderSettings, LiveClient> consumer;
-    private RecorderSettings settings;
+    private final RecorderSettings settings;
     private DownloadData downloadData;
     private Thread liveDownloadThread;
 
     public RecorderListener(BiConsumer<RecorderSettings, LiveClient> consumer) {
         this.consumer = consumer;
+        this.settings = RecorderSettings.DEFAULT();
     }
 
     @TikTokEventObserver
-    private void onResponse(LiveClient liveClient, TikTokRoomDataResponseEvent event) {
-        settings = RecorderSettings.DEFAULT();
+    private void onResponse(LiveClient liveClient, TikTokPreConnectionEvent event) {
         consumer.accept(settings, liveClient);
 
-        var json = event.getLiveData().getJson();
+        var json = event.getUserData().getJson();
 
         liveClient.getLogger().info("Searching for live download url");
         downloadData = settings.getPrepareDownloadData() != null ?
@@ -70,26 +71,26 @@ public class RecorderListener implements LiveRecorder {
 
     @TikTokEventObserver
     private void onConnected(LiveClient liveClient, TikTokConnectedEvent event) {
-        if (isConnected())
+        if (isConnected() || downloadData.getDownloadLiveUrl().isEmpty())
             return;
 
         liveDownloadThread = new Thread(() -> {
             try {
                 liveClient.getLogger().info("Recording started "+liveClient.getRoomInfo().getHostName());
-                var url = new URL(downloadData.getFullUrl());
-                HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
-                var headers = LiveClientSettings.DefaultRequestHeaders();
-                for (var entry : headers.entrySet()) {
-                    connection.setRequestProperty(entry.getKey(), entry.getValue());
-                }
+
+				HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(URI.create(downloadData.getFullUrl())).GET();
+                for (var entry : LiveClientSettings.DefaultRequestHeaders().entrySet())
+					requestBuilder.header(entry.getKey(), entry.getValue());
+                HttpResponse<InputStream> serverResponse = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL)
+                    .connectTimeout(Duration.ofSeconds(10)).build().send(requestBuilder.build(), HttpResponse.BodyHandlers.ofInputStream());
 
                 var file = settings.getOutputFile();
                 file.getParentFile().mkdirs();
                 file.createNewFile();
 
                 try (
-                    var in = connection.getInputStream();
-                    var fos = new FileOutputStream(file)
+                    var in = serverResponse.body();
+                    var fos = new FileOutputStream(file, true)
                 ) {
                     byte[] dataBuffer = new byte[1024];
                     int bytesRead;
@@ -128,35 +129,38 @@ public class RecorderListener implements LiveRecorder {
 
 
     private DownloadData mapToDownloadData(String json) {
-
-        var parsedJson = JsonParser.parseString(json);
-        var jsonObject = parsedJson.getAsJsonObject();
-        var streamDataJson = jsonObject.getAsJsonObject("data")
-                .getAsJsonObject("stream_url")
-                .getAsJsonObject("live_core_sdk_data")
+        try {
+            var parsedJson = JsonParser.parseString(json);
+            var jsonObject = parsedJson.getAsJsonObject();
+            var streamDataJson = jsonObject.getAsJsonObject("data")
+                .getAsJsonObject("liveRoom")
+                .getAsJsonObject("streamData")
                 .getAsJsonObject("pull_data")
                 .get("stream_data")
                 .getAsString();
 
-        var streamDataJsonObject = JsonParser.parseString(streamDataJson).getAsJsonObject();
+            var streamDataJsonObject = JsonParser.parseString(streamDataJson).getAsJsonObject();
 
-        var urlLink = streamDataJsonObject.getAsJsonObject("data")
+            var urlLink = streamDataJsonObject.getAsJsonObject("data")
                 .getAsJsonObject(LiveQuality.origin.name())
                 .getAsJsonObject("main")
                 .get("flv")
                 .getAsString();
 
-        var sessionId = streamDataJsonObject.getAsJsonObject("common")
+            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
-        //https://pull-f5-tt03.fcdn.eu.tiktokcdn.com/game/stream-3284937501738533765_sd5.flv?_session_id=136-20240109001052D91FDBC00143211020C8.1704759052997&_webnoredir=1
-        //https://pull-f5-tt02.fcdn.eu.tiktokcdn.com/stage/stream-3861399216374940610_uhd5.flv?_session_id=136-20240109000223D0BAA1A83974490EE630.1704758544391&_webnoredir=1
+            //main
+            //https://pull-f5-tt03.fcdn.eu.tiktokcdn.com/stage/stream-3284937501738533765.flv?session_id=136-20240109000954BF818F1B3A8E5E39E238&_webnoredir=1
+            //Working
+            //https://pull-f5-tt03.fcdn.eu.tiktokcdn.com/game/stream-3284937501738533765_sd5.flv?_session_id=136-20240109001052D91FDBC00143211020C8.1704759052997&_webnoredir=1
+            //https://pull-f5-tt02.fcdn.eu.tiktokcdn.com/stage/stream-3861399216374940610_uhd5.flv?_session_id=136-20240109000223D0BAA1A83974490EE630.1704758544391&_webnoredir=1
 
-        return new DownloadData(urlLink, sessionId);
+            return new DownloadData(urlLink, sessionId);
+        } catch (Exception e) {
+            return new DownloadData("", "");
+        }
     }
 
     private boolean isConnected() {

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 + (downloadLiveUrl.contains("?") ? "&" : "?") + "_webnoredir=1&session_id=" + sessionId;
+	}
 }

pom.xml

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

tools-readme/pom.xml

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