Minor changes to new social/gift events!

* Add .of methods for custom User objects

Adds an extra .of() function that accepts a User object, instead of a username string.

* Use username if profile name not set

* Add combo argument

* Replace WebcastGiftMessage from the new constructor

* Fix argument naming error

* Fix wrong argument order

API/pom.xml

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

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

@@ -30,14 +30,22 @@ import lombok.Getter;
 @Getter
 @EventMeta(eventType = EventType.Control)
 public class TikTokDisconnectedEvent extends TikTokLiveClientEvent {
+	public static int UNKNOWN_CLOSE_CODE = -1;
+
+	/** Valid CloseFrame code or -1 for unknown */
+	private final int code;
 	private final String reason;
 
-	public TikTokDisconnectedEvent(String reason) {
+	public TikTokDisconnectedEvent(int code, String reason) {
+		this.code = code;
 		this.reason = reason.isBlank() ? "None" : reason;
 	}
 
-	public static TikTokDisconnectedEvent of(String reason)
-	{
-		return new TikTokDisconnectedEvent(reason);
+	public TikTokDisconnectedEvent(String reason) {
+		this(UNKNOWN_CLOSE_CODE, reason);
+	}
+
+	public boolean isUnknownCloseCode() {
+		return this.code == UNKNOWN_CLOSE_CODE;
 	}
 }

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

@@ -39,11 +39,16 @@ public class TikTokGiftComboEvent extends TikTokGiftEvent {
         this.comboState = comboState;
     }
 
+    public TikTokGiftComboEvent(Gift gift, User host, User user, int combo, GiftComboStateType comboState) {
+        super(gift, user, host, combo);
+        this.comboState = comboState;
+    }
+
     public static TikTokGiftComboEvent of(Gift gift, int combo, GiftComboStateType comboState) {
-        return new TikTokGiftComboEvent(
-            gift,
-            new User(0L, "Test", new Picture("")),
-            WebcastGiftMessage.newBuilder().setComboCount(combo).build(),
-            comboState);
+        return new TikTokGiftComboEvent(gift, new User(0L, "Test", new Picture("")), WebcastGiftMessage.newBuilder().setComboCount(combo).build(), comboState);
+    }
+
+    public static TikTokGiftComboEvent of(Gift gift, User host, User user, int combo, GiftComboStateType comboState) {
+        return new TikTokGiftComboEvent(gift, host, user, combo, comboState);
     }
 }

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

@@ -50,16 +50,24 @@ public class TikTokGiftEvent extends TikTokHeaderEvent {
         combo = msg.getComboCount();
     }
     
-    public TikTokGiftEvent(Gift gift) {
+    public TikTokGiftEvent(Gift gift, User user, User toUser, int combo) {
         this.gift = gift;
-        user = new User(0L, "sender", new Picture(""));
-        toUser = new User(0L, "receiver", new Picture(""));
-        combo = 1;
+        this.user = user;
+        this.toUser = toUser;
+        this.combo = combo;
     }
 
-
     public static TikTokGiftEvent of(Gift gift) {
-        return new TikTokGiftEvent(gift);
+        return new TikTokGiftEvent(
+            gift,
+            new User(0L, "sender", new Picture("")),
+            new User(0L, "reviever", new Picture("")),
+            1
+            );
+    }
+
+    public static TikTokGiftEvent of(Gift gift, User user, User toUser) {
+        return new TikTokGiftEvent(gift, user, toUser, 1) ;
     }
 
     public static TikTokGiftEvent of(String name, int id, int diamonds) {

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

@@ -50,4 +50,14 @@ public class TikTokFollowEvent extends TikTokHeaderEvent {
                 .build())
             .build());
     }
+
+    public static TikTokFollowEvent of(User user) {
+        return new TikTokFollowEvent(WebcastSocialMessage.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName() != null ? user.getProfileName() : user.getName())
+                .setId(user.getId())
+                .build())
+            .build());
+    }
 }

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

@@ -48,8 +48,7 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
         totalUsers = msg.getMemberCount();
     }
 
-    public static TikTokJoinEvent of(String userName)
-    {
+    public static TikTokJoinEvent of(String userName) {
         return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
             .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
                 .setUsername(userName)
@@ -57,4 +56,14 @@ public class TikTokJoinEvent extends TikTokHeaderEvent {
                 .build())
             .build());
     }
+
+    public static TikTokJoinEvent of(User user) {
+        return new TikTokJoinEvent(WebcastMemberMessage.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName())
+                .setId(user.getId())
+                .build())
+            .build());
+    }
 }

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

@@ -56,8 +56,7 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
         totalLikes = msg.getTotal();
     }
 
-    public static TikTokLikeEvent of(String userName, int likes)
-    {
+    public static TikTokLikeEvent of(String userName, int likes) {
         return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
             .setCount(likes)
             .setTotal(likes)
@@ -67,4 +66,15 @@ public class TikTokLikeEvent extends TikTokHeaderEvent
                 .build())
             .build());
     }
+
+    public static TikTokLikeEvent of(User user, int likes) {
+        return new TikTokLikeEvent(WebcastLikeMessage.newBuilder()
+            .setCount(likes)
+            .setTotal(likes)
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName())
+                .build())
+            .build());
+    }
 }

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

@@ -55,4 +55,13 @@ public class TikTokShareEvent extends TikTokHeaderEvent {
                 .build())
             .build(), shaders);
     }
+
+    public static TikTokShareEvent of(User user, int shaders) {
+        return new TikTokShareEvent(WebcastSocialMessage.newBuilder()
+            .setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
+                .setUsername(user.getName())
+                .setNickname(user.getProfileName())
+                .build())
+            .build(), shaders);
+    }
 }

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

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

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

@@ -89,6 +89,16 @@ public class LiveClientSettings {
     /** Throw an exception on 18+ Age Restriction */
     private boolean throwOnAgeRestriction;
 
+    /** Use Eulerstream.com websocket for events
+     * @apiNote Requires API Key
+     */
+    private boolean useEulerstreamWebsocket;
+
+    /** Use Eulerstream.com enterprise endpoints
+     * @apiNote Requires API Key with
+     */
+    private boolean useEulerstreamEnterprise;
+
     /**
 	 * Optional: Sometimes not every messages from chat are send to TikTokLiveJava to fix this issue you can set sessionId.
      * <p>This requires {@link #ttTargetIdc} also being set correctly for sessionid to be effective.

API/src/main/java/io/github/jwdeveloper/tiktok/http/LiveHttpClient.java

@@ -66,5 +66,5 @@ public interface LiveHttpClient
 
     LiveConnectionData.Response fetchLiveConnectionData(LiveConnectionData.Request request);
 
-    boolean sendChat(LiveRoomInfo roomInfo, String content);
+    boolean sendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java

@@ -24,6 +24,7 @@ package io.github.jwdeveloper.tiktok.live;
 
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.listener.ListenersManager;
+import io.github.jwdeveloper.tiktok.websocket.LiveClientStopType;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
@@ -49,16 +50,16 @@ public interface LiveClient {
 
     /**
      * Disconnects the connection.
-     * @param type
-     * <p>0 - Normal - Initiates disconnection and returns
-     * <p>1 - Disconnects blocking and returns after closure
-     * <p>2 - Disconnects and kills connection to websocket
-     * <p>Default {@link #disconnect()} is 0
+     * @param type {@code LiveClientStopType}
+     * @see LiveClientStopType
      */
-    void disconnect(int type);
+    void disconnect(LiveClientStopType type);
 
+    /**
+     * Disconnects with {@link LiveClientStopType#NORMAL}
+     */
     default void disconnect() {
-        disconnect(0);
+        disconnect(LiveClientStopType.NORMAL);
     }
 
     /**
@@ -101,4 +102,12 @@ public interface LiveClient {
      * <p>We cannot fix this as it is a TikTok issue, not a library issue.
      */
     boolean sendChat(String content);
+
+    /**
+     * Send a chat message to the connected room
+     * @return true if successful, otherwise false
+     * @apiNote This is known to return true on some sessionIds despite failing!
+     * <p>We cannot fix this as it is a TikTok issue, not a library issue.
+     */
+    boolean sendChat(String content, String sessionId, String ttTargetIdc);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveRoomInfo.java

@@ -49,5 +49,7 @@ public interface LiveRoomInfo
      String getTitle();
      User getHost();
      List<RankingUser> getUsersRanking();
+     String getLanguage();
      ConnectionState getConnectionState();
+     void copy(LiveRoomInfo roomInfo);
 }

API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveClientStopType.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2023-2024 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.websocket;
+
+public enum LiveClientStopType
+{
+    /**
+     * Initiates the websocket close handshake. This method does not block<br> In oder to make sure
+     * the connection is closed use {@link LiveClientStopType#CLOSE_BLOCKING}
+     */
+    NORMAL,
+    /**
+     * Same as {@link LiveClientStopType#NORMAL} but blocks until the websocket closed or failed to do so.<br>
+     *
+     * @apiNote Can throw {@link InterruptedException} when/if the threads get interrupted
+     */
+    CLOSE_BLOCKING,
+    /**
+     * This will close the connection immediately without a proper close handshake.
+     * The code and the message therefore won't be transferred over the wire also they will be forwarded to onClose/onWebsocketClose. */
+    DISCONNECT
+}

API/src/main/java/io/github/jwdeveloper/tiktok/websocket/LiveSocketClient.java

@@ -27,6 +27,6 @@ import io.github.jwdeveloper.tiktok.live.LiveClient;
 
 public interface LiveSocketClient {
     void start(LiveConnectionData.Response webcastResponse, LiveClient tikTokLiveClient);
-    void stop(int type);
+    void stop(LiveClientStopType type);
     boolean isConnected();
 }

API/src/main/proto/data.proto

@@ -62,12 +62,11 @@ message Text {
     int32 type = 1;
     TextFormat format = 2;
     string stringValue = 11;
-    oneof textPieceType
-    {
     TextPieceUser userValue = 21;
     TextPieceGift giftValue = 22;
-    }
+    TextPieceHeart heartValue = 23;
     TextPiecePatternRef patternRefValue = 24;
+    TextPieceImage imageValue = 25;
   }
 
   message TextFormat {
@@ -83,7 +82,7 @@ message Text {
 
   message TextPieceGift {
     int32 giftId = 1;
-    PatternRef nameRef = 2;
+    TextPiecePatternRef nameRef = 2;
     ShowType showType = 3; // Enum
     int64 colorId = 4;
   }
@@ -98,16 +97,19 @@ message Text {
     bool withColon = 2;
   }
 
-  message PatternRef {
-    string key = 1;
-    string default_pattern = 2;
-  }
-
   enum ShowType {
     SHOW_TYPE_NORMAL = 0;
     SHOW_TYPE_FADE_IN_OUT = 1;
   }
 
+  message TextPieceHeart {
+    string color = 1;
+  }
+
+  message TextPieceImage {
+    Image image_model = 1;
+  }
+
 }
 
 // @Image
@@ -151,7 +153,7 @@ message BadgeStruct {
   bool is_customized = 24;
 
   message CombineBadge {
-    int32 badge_display_type = 1;
+    BadgeDisplayType badge_display_type = 1;
     Image icon = 2;
     TextBadge text = 3;
     string str = 4;

Client/pom.xml

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

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

@@ -23,6 +23,7 @@
 package io.github.jwdeveloper.tiktok;
 
 import com.google.protobuf.ByteString;
+import io.github.jwdeveloper.tiktok.common.AsyncHandler;
 import io.github.jwdeveloper.tiktok.data.events.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.data.events.control.*;
@@ -35,11 +36,11 @@ import io.github.jwdeveloper.tiktok.listener.ListenersManager;
 import io.github.jwdeveloper.tiktok.live.*;
 import io.github.jwdeveloper.tiktok.messages.webcast.ProtoMessageFetchResult;
 import io.github.jwdeveloper.tiktok.models.ConnectionState;
-import io.github.jwdeveloper.tiktok.websocket.LiveSocketClient;
+import io.github.jwdeveloper.tiktok.websocket.*;
 import lombok.Getter;
 
 import java.util.Base64;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 
@@ -79,19 +80,21 @@ public class TikTokLiveClient implements LiveClient
 
     public void connect() {
         try {
+            if (clientSettings.isUseEulerstreamWebsocket())
+                tryEulerConnect();
+            else
                 tryConnect();
         } catch (TikTokLiveException e) {
             setState(ConnectionState.DISCONNECTED);
             tikTokEventHandler.publish(this, new TikTokErrorEvent(e));
-            tikTokEventHandler.publish(this, new TikTokDisconnectedEvent("Exception: "+e.getMessage()));
+            tikTokEventHandler.publish(this, new TikTokDisconnectedEvent("Exception: " + e.getMessage()));
 
             if (e instanceof TikTokLiveOfflineHostException && clientSettings.isRetryOnConnectionFailure()) {
-                try {
-                    Thread.sleep(clientSettings.getRetryConnectionTimeout().toMillis());
-                } catch (Exception ignored) {}
+                AsyncHandler.getReconnectScheduler().schedule(() -> {
                     logger.info("Reconnecting");
                     tikTokEventHandler.publish(this, new TikTokReconnectingEvent());
                     this.connect();
+                }, clientSettings.getRetryConnectionTimeout().toMillis(), TimeUnit.MILLISECONDS);
             }
             throw e;
         } catch (Exception e) {
@@ -101,6 +104,17 @@ public class TikTokLiveClient implements LiveClient
         }
     }
 
+    private void tryEulerConnect() {
+        if (!roomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) {
+            throw new TikTokLiveException("Already connected");
+        }
+
+        setState(ConnectionState.CONNECTING);
+        tikTokEventHandler.publish(this, new TikTokConnectingEvent());
+        webSocketClient.start(null, this);
+        setState(ConnectionState.CONNECTED);
+    }
+
     public void tryConnect() {
         if (!roomInfo.hasConnectionState(ConnectionState.DISCONNECTED)) {
             throw new TikTokLiveException("Already connected");
@@ -110,8 +124,6 @@ public class TikTokLiveClient implements LiveClient
         tikTokEventHandler.publish(this, new TikTokConnectingEvent());
         var userDataRequest = new LiveUserData.Request(roomInfo.getHostName());
         var userData = httpClient.fetchLiveUserData(userDataRequest);
-        roomInfo.setStartTime(userData.getStartTime());
-        roomInfo.setRoomId(userData.getRoomId());
 
         if (userData.getUserStatus() == LiveUserData.UserStatus.Offline)
             throw new TikTokLiveOfflineHostException("User is offline: " + roomInfo.getHostName(), userData, null);
@@ -119,7 +131,9 @@ public class TikTokLiveClient implements LiveClient
         if (userData.getUserStatus() == LiveUserData.UserStatus.NotFound)
             throw new TikTokLiveUnknownHostException("User not found: " + roomInfo.getHostName(), userData, null);
 
-        var liveDataRequest = new LiveData.Request(userData.getRoomId());
+        roomInfo.copy(userData.getRoomInfo());
+
+        var liveDataRequest = new LiveData.Request(userData.getRoomInfo().getRoomId());
         var liveData = httpClient.fetchLiveData(liveDataRequest);
 
         if (liveData.isAgeRestricted() && clientSettings.isThrowOnAgeRestriction())
@@ -143,9 +157,9 @@ public class TikTokLiveClient implements LiveClient
             throw new TikTokLivePreConnectionException(preconnectEvent);
 
         if (clientSettings.isFetchGifts())
-            giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomId()).getGifts());
+            giftManager.attachGiftsList(httpClient.fetchRoomGiftsData(userData.getRoomInfo().getRoomId()).getGifts());
 
-        var liveConnectionRequest = new LiveConnectionData.Request(userData.getRoomId());
+        var liveConnectionRequest = new LiveConnectionData.Request(userData.getRoomInfo().getRoomId());
         var liveConnectionData = httpClient.fetchLiveConnectionData(liveConnectionRequest);
         webSocketClient.start(liveConnectionData, this);
 
@@ -153,7 +167,7 @@ public class TikTokLiveClient implements LiveClient
         tikTokEventHandler.publish(this, new TikTokRoomInfoEvent(roomInfo));
     }
 
-    public void disconnect(int type) {
+    public void disconnect(LiveClientStopType type) {
         if (webSocketClient.isConnected())
             webSocketClient.stop(type);
 		if (!roomInfo.hasConnectionState(ConnectionState.DISCONNECTED))
@@ -185,7 +199,12 @@ public class TikTokLiveClient implements LiveClient
 
     @Override
     public boolean sendChat(String content) {
-        return httpClient.sendChat(roomInfo, content);
+        return sendChat(content, clientSettings.getSessionId(), clientSettings.getTtTargetIdc());
+    }
+
+    @Override
+    public boolean sendChat(String content, String sessionId, String ttTargetIdc) {
+        return httpClient.sendChat(roomInfo, content, sessionId, ttTargetIdc);
     }
 
     public void connectAsync(Consumer<LiveClient> onConnection) {

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

@@ -42,6 +42,7 @@ import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokGiftEventHandler;
 import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokRoomInfoEventHandler;
 import io.github.jwdeveloper.tiktok.mappers.handlers.TikTokSocialMediaEventHandler;
 import io.github.jwdeveloper.tiktok.websocket.*;
+import io.github.jwdeveloper.tiktok.websocket.euler.TikTokWebSocketEulerClient;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -132,12 +133,12 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
 
         //networking
         dependance.registerSingleton(HttpClientFactory.class);
-        dependance.registerSingleton(WebSocketHeartbeatTask.class); // True global singleton - Static objects are located to serve as global
+        dependance.registerSingleton(WebSocketHeartbeatTask.class);
         if (clientSettings.isOffline()) {
             dependance.registerSingleton(LiveSocketClient.class, TikTokWebSocketOfflineClient.class);
             dependance.registerSingleton(LiveHttpClient.class, TikTokLiveHttpOfflineClient.class);
         } else {
-            dependance.registerSingleton(LiveSocketClient.class, TikTokWebSocketClient.class);
+            dependance.registerSingleton(LiveSocketClient.class, clientSettings.isUseEulerstreamWebsocket() ? TikTokWebSocketEulerClient.class : TikTokWebSocketClient.class);
             dependance.registerSingleton(LiveHttpClient.class, TikTokLiveHttpClient.class);
         }
 

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

@@ -45,6 +45,8 @@ public class TikTokLiveHttpClient implements LiveHttpClient
 	 */
     private static final String TIKTOK_SIGN_API = "https://tiktok.eulerstream.com/webcast/fetch";
     private static final String TIKTOK_CHAT_URL = "https://tiktok.eulerstream.com/webcast/chat";
+    private static final String TIKTOK_SIGN_ENTERPRISE_API = "https://tiktok.enterprise.eulerstream.com/webcast/fetch";
+    private static final String TIKTOK_CHAT_ENTERPRISE_URL = "https://tiktok.enterprise.eulerstream.com/webcast/chat";
     private static final String TIKTOK_URL_WEB = "https://www.tiktok.com/";
     private static final String TIKTOK_URL_WEBCAST = "https://webcast.tiktok.com/webcast/";
     private static final String TIKTOK_ROOM_GIFTS_URL = TIKTOK_URL_WEBCAST+"gift/list/";
@@ -53,9 +55,6 @@ public class TikTokLiveHttpClient implements LiveHttpClient
 
     private final HttpClientFactory httpFactory;
     private final LiveClientSettings clientSettings;
-    private final LiveUserDataMapper liveUserDataMapper;
-    private final LiveDataMapper liveDataMapper;
-    private final GiftsDataMapper giftsDataMapper;
     private final Logger logger;
 
     @Inject
@@ -63,9 +62,6 @@ public class TikTokLiveHttpClient implements LiveHttpClient
         this.httpFactory = factory;
         this.clientSettings = factory.getLiveClientSettings();
         this.logger = LoggerFactory.create("HttpClient-"+hashCode(), clientSettings);
-        liveUserDataMapper = new LiveUserDataMapper();
-        liveDataMapper = new LiveDataMapper();
-        giftsDataMapper = new GiftsDataMapper();
     }
 
     public TikTokLiveHttpClient(Consumer<LiveClientSettings> consumer) {
@@ -95,7 +91,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             throw new TikTokLiveRequestException("Unable to fetch gifts information's - "+result);
 
         var json = result.getContent();
-        return giftsDataMapper.mapRoom(json);
+        return GiftsDataMapper.mapRoom(json);
     }
 
     @Override
@@ -125,7 +121,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             throw new TikTokLiveRequestException("Unable to get information's about user - "+result);
 
         var json = result.getContent();
-        return liveUserDataMapper.map(json, logger);
+        return LiveUserDataMapper.map(json, logger);
     }
 
     @Override
@@ -153,7 +149,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient
             throw new TikTokLiveRequestException("Unable to get info about live room - "+result);
 
         var json = result.getContent();
-        return liveDataMapper.map(json);
+        return LiveDataMapper.map(json);
     }
 
     @Override
@@ -186,31 +182,29 @@ public class TikTokLiveHttpClient implements LiveHttpClient
     }
 
     @Override
-    public boolean sendChat(LiveRoomInfo roomInfo, String content) {
+    public boolean sendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc) {
         var proxyClientSettings = clientSettings.getHttpSettings().getProxyClientSettings();
         if (proxyClientSettings.isEnabled()) {
             while (proxyClientSettings.hasNext()) {
                 try {
-                    return requestSendChat(roomInfo, content);
+                    return requestSendChat(roomInfo, content, sessionId, ttTargetIdc);
                 } catch (TikTokProxyRequestException ignored) {}
             }
         }
-        return requestSendChat(roomInfo, content);
+        return requestSendChat(roomInfo, content, sessionId, ttTargetIdc);
     }
 
-    public boolean requestSendChat(LiveRoomInfo roomInfo, String content) {
+    public boolean requestSendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc) {
         JsonObject body = new JsonObject();
         body.addProperty("content", content);
-        body.addProperty("sessionId", clientSettings.getSessionId());
-        body.addProperty("ttTargetIdc", clientSettings.getTtTargetIdc());
+        body.addProperty("sessionId", sessionId);
+        body.addProperty("ttTargetIdc", ttTargetIdc);
         body.addProperty("roomId", roomInfo.getRoomId());
+        HttpClientBuilder builder = httpFactory.client(clientSettings.isUseEulerstreamEnterprise() ? TIKTOK_CHAT_ENTERPRISE_URL : TIKTOK_CHAT_URL)
+            .withHeader("Content-Type", "application/json");
         if (clientSettings.getApiKey() != null)
-            body.addProperty("apiKey", clientSettings.getApiKey());
-        var result = httpFactory.client(TIKTOK_CHAT_URL)
-            .withHeader("Content-Type", "application/json")
-            .withBody(HttpRequest.BodyPublishers.ofString(body.toString()))
-            .build()
-            .toJsonResponse();
+            builder.withHeader("x-api-key", clientSettings.getApiKey());
+        var result = builder.withBody(HttpRequest.BodyPublishers.ofString(body.toString())).build().toJsonResponse();
         return result.isSuccess();
     }
 
@@ -227,14 +221,14 @@ public class TikTokLiveHttpClient implements LiveHttpClient
     }
 
     protected ActionResult<HttpResponse<byte[]>> getByteResponse(String room_id) {
-        HttpClientBuilder builder = httpFactory.client(TIKTOK_SIGN_API)
+        HttpClientBuilder builder = httpFactory.client(clientSettings.isUseEulerstreamEnterprise() ? TIKTOK_SIGN_ENTERPRISE_API : TIKTOK_SIGN_API)
             .withParam("client", "ttlive-java")
             .withParam("room_id", room_id);
 
         if (clientSettings.getSessionId() != null) // Allows receiving of all comments and Subscribe Events
             builder.withParam("session_id", clientSettings.getSessionId());
         if (clientSettings.getApiKey() != null)
-            builder.withParam("apiKey", clientSettings.getApiKey());
+            builder.withHeader("x-api-key", clientSettings.getApiKey());
 
         var result = builder.build().toHttpResponse(HttpResponse.BodyHandlers.ofByteArray());
 

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

@@ -40,7 +40,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, null);
+        return new LiveUserData.Response("", LiveUserData.UserStatus.Live, null);
     }
 
     @Override
@@ -64,7 +64,7 @@ public class TikTokLiveHttpOfflineClient implements LiveHttpClient {
     }
 
     @Override
-    public boolean sendChat(LiveRoomInfo roomInfo, String content) {
+    public boolean sendChat(LiveRoomInfo roomInfo, String content, String sessionId, String ttTargetIdc) {
         // DO NOTHING
         return false;
     }

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

@@ -32,29 +32,19 @@ import java.util.LinkedList;
 import java.util.List;
 
 @Data
-public class TikTokRoomInfo implements LiveRoomInfo {
+public class TikTokRoomInfo implements LiveRoomInfo
+{
 	private String roomId;
-
 	private int likesCount;
-
 	private int viewersCount;
-
 	private int totalViewersCount;
-
 	private long startTime;
-
 	private boolean ageRestricted;
-
 	private User host;
-
 	private List<RankingUser> usersRanking = new LinkedList<>();
-
 	private String hostName;
-
 	private String title;
-
 	private String language = "en";
-
 	private ConnectionState connectionState = ConnectionState.DISCONNECTED;
 
 	public boolean hasConnectionState(ConnectionState state) {
@@ -65,4 +55,21 @@ public class TikTokRoomInfo implements LiveRoomInfo {
 		usersRanking.clear();
 		usersRanking.addAll(rankingUsers);
 	}
+
+	@Override
+	public void copy(LiveRoomInfo roomInfo) {
+		if (roomInfo == null) return;
+		this.roomId = roomInfo.getRoomId();
+		this.likesCount = roomInfo.getLikesCount();
+		this.viewersCount = roomInfo.getViewersCount();
+		this.totalViewersCount = roomInfo.getTotalViewersCount();
+		this.startTime = roomInfo.getStartTime();
+		this.ageRestricted = roomInfo.isAgeRestricted();
+		this.host = roomInfo.getHost();
+		this.usersRanking = roomInfo.getUsersRanking();
+		this.hostName = roomInfo.getHostName();
+		this.title = roomInfo.getTitle();
+		this.language = roomInfo.getLanguage();
+		// this.connectionState = roomInfo.getConnectionState(); // This should not be copied - Controlled elsewhere!
+	}
 }

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

@@ -0,0 +1,22 @@
+package io.github.jwdeveloper.tiktok.common;
+
+import lombok.Getter;
+
+import java.util.concurrent.*;
+
+public class AsyncHandler
+{
+	@Getter
+	private static final ScheduledExecutorService heartBeatScheduler = Executors.newScheduledThreadPool(1, r -> {
+		Thread t = new Thread(r, "heartbeat-pool");
+		t.setDaemon(true);
+		return t;
+	});
+
+	@Getter
+	private static final ScheduledExecutorService reconnectScheduler = Executors.newScheduledThreadPool(0, r -> {
+		Thread t = new Thread(r, "reconnect-pool");
+		t.setDaemon(true);
+		return t;
+	});
+}

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

@@ -32,7 +32,7 @@ import java.util.List;
 
 public class GiftsDataMapper {
 
-    public GiftsData.Response map(String json) {
+    public static GiftsData.Response map(String json) {
         var parsedJson = JsonParser.parseString(json);
         var jsonObject = parsedJson.getAsJsonObject();
         var gifts = jsonObject.entrySet()
@@ -43,7 +43,7 @@ public class GiftsDataMapper {
         return new GiftsData.Response(json, gifts);
     }
 
-    private Gift mapSingleGift(JsonElement jsonElement) {
+    private static Gift mapSingleGift(JsonElement jsonElement) {
         var jsonObject = jsonElement.getAsJsonObject();
 
         var id = jsonObject.get("id").getAsInt();
@@ -53,7 +53,7 @@ public class GiftsDataMapper {
         return new Gift(id, name, diamondCost, new Picture(image), jsonObject);
     }
 
-    public GiftsData.Response mapRoom(String json) {
+    public static GiftsData.Response mapRoom(String json) {
         var parsedJson = JsonParser.parseString(json);
         var jsonObject = parsedJson.getAsJsonObject();
         if (jsonObject.get("data") instanceof JsonObject data && data.get("gifts") instanceof JsonArray giftArray) {
@@ -69,7 +69,7 @@ public class GiftsDataMapper {
         return new GiftsData.Response("", List.of());
     }
 
-    private Gift mapSingleRoomGift(JsonElement jsonElement) {
+    private static Gift mapSingleRoomGift(JsonElement jsonElement) {
         var jsonObject = jsonElement.getAsJsonObject();
 
         var id = jsonObject.get("id").getAsInt();

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

@@ -41,7 +41,7 @@ public class LiveDataMapper {
      * 3 - ?
      * 4 - Offline
      */
-    public LiveData.Response map(String json) {
+    public static LiveData.Response map(String json) {
         var response = new LiveData.Response();
 
         response.setJson(json);
@@ -128,7 +128,7 @@ public class LiveDataMapper {
         return response;
     }
 
-    public User getUser(JsonObject jsonElement) {
+    public static User getUser(JsonObject jsonElement) {
         var id = jsonElement.get("id").getAsLong();
         var name = jsonElement.get("display_id").getAsString();
         var profileName = jsonElement.get("nickname").getAsString();

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

@@ -23,17 +23,18 @@
 package io.github.jwdeveloper.tiktok.http.mappers;
 
 import com.google.gson.*;
+import io.github.jwdeveloper.tiktok.*;
 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.*;
 import java.util.logging.Logger;
 
 public class LiveUserDataMapper
 {
-    public LiveUserData.Response map(String json, Logger logger) {
+    public static LiveUserData.Response map(String json, Logger logger) {
         try {
             var jsonObject = JsonParser.parseString(json).getAsJsonObject();
 
@@ -43,14 +44,14 @@ 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, null);
+                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, 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, null);
+                return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, null);
             }
             var data = element.getAsJsonObject();
             var user = data.getAsJsonObject("user");
@@ -58,8 +59,16 @@ public class LiveUserDataMapper
             var roomId = user.get("roomId").getAsString();
             var status = user.get("status").getAsInt();
 
+            TikTokRoomInfo roomInfo = new TikTokRoomInfo();
+            roomInfo.setRoomId(roomId);
+
             var liveRoom = data.getAsJsonObject("liveRoom");
-            long startTime = liveRoom.get("startTime").getAsLong();
+
+            roomInfo.setTitle(liveRoom.get("title").getAsString());
+            roomInfo.setStartTime(liveRoom.get("startTime").getAsLong());
+            roomInfo.setViewersCount(liveRoom.getAsJsonObject("liveRoomStats").get("userCount").getAsInt());
+            roomInfo.setTotalViewersCount(liveRoom.getAsJsonObject("liveRoomStats").get("enterCount").getAsInt());
+            roomInfo.setAgeRestricted(jsonObject.get("statusCode").getAsInt() == TikTokLiveHttpClient.TIKTOK_AGE_RESTRICTED_CODE);
 
             var statusEnum = switch (status) {
                 case 2 -> LiveUserData.UserStatus.Live;
@@ -78,10 +87,55 @@ public class LiveUserDataMapper
                 stats.get("followerCount").getAsLong(),
                 List.of());
 
-            return new LiveUserData.Response(json, statusEnum, roomId, startTime, foundUser);
-        } catch (JsonSyntaxException | IllegalStateException e) {
+            roomInfo.setHost(foundUser);
+            roomInfo.setHostName(foundUser.getName());
+
+            return new LiveUserData.Response(json, statusEnum, roomInfo);
+        } catch (JsonSyntaxException | IllegalStateException | NullPointerException e) {
             logger.warning("Malformed Json: '"+json+"' - Error Message: "+e.getMessage());
-            return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, "", -1, null);
+            return new LiveUserData.Response(json, LiveUserData.UserStatus.NotFound, null);
+        }
+    }
+
+    public static LiveUserData.Response mapEulerstream(JsonObject jsonObject, Logger logger) {
+        try {
+			JsonObject roomInfoJson = jsonObject.getAsJsonObject("roomInfo");
+			JsonObject userJson = jsonObject.getAsJsonObject("user");
+
+            var roomId = roomInfoJson.get("id").getAsString();
+            var status = roomInfoJson.get("status").getAsInt();
+
+            TikTokRoomInfo roomInfo = new TikTokRoomInfo();
+            roomInfo.setRoomId(roomId);
+            roomInfo.setTitle(roomInfoJson.get("title").getAsString());
+            roomInfo.setStartTime(roomInfoJson.get("startTime").getAsLong());
+            roomInfo.setViewersCount(Optional.ofNullable(roomInfoJson.get("currentViewers")).filter(JsonElement::isJsonPrimitive).map(JsonElement::getAsInt).orElse(0));
+            roomInfo.setTotalViewersCount(roomInfoJson.get("totalViewers").getAsInt());
+
+            var statusEnum = switch (status) {
+                case 2 -> LiveUserData.UserStatus.Live;
+                case 3 -> LiveUserData.UserStatus.LivePaused;
+                case 4 -> LiveUserData.UserStatus.Offline;
+                default -> LiveUserData.UserStatus.NotFound;
+            };
+
+            User foundUser = new User(
+                Long.parseLong(userJson.get("numericUid").getAsString()),
+                userJson.get("uniqueId").getAsString(),
+                userJson.get("nickname").getAsString(),
+                userJson.get("signature").getAsString(),
+                new Picture(userJson.get("avatarUrl").getAsString()),
+                userJson.get("following").getAsLong(),
+                userJson.get("followers").getAsLong(),
+                List.of());
+
+            roomInfo.setHost(foundUser);
+            roomInfo.setHostName(foundUser.getName());
+
+            return new LiveUserData.Response(jsonObject.toString(), statusEnum, roomInfo);
+        } catch (JsonSyntaxException | IllegalStateException | NullPointerException e) {
+            logger.warning("Malformed Json: '"+jsonObject.toString()+"' - Error Message: "+e.getMessage());
+            return new LiveUserData.Response(jsonObject.toString(), LiveUserData.UserStatus.NotFound, null);
         }
     }
 }

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

@@ -57,7 +57,7 @@ public class TikTokWebSocketClient implements LiveSocketClient {
     @Override
     public void start(LiveConnectionData.Response connectionData, LiveClient liveClient) {
         if (isConnected())
-			stop(0);
+			stop(LiveClientStopType.NORMAL);
 
         messageHandler.handle(liveClient, connectionData.getWebcastResponse());
 
@@ -77,7 +77,7 @@ public class TikTokWebSocketClient implements LiveSocketClient {
             connectDefault();
     }
 
-    private void connectDefault() {
+    public void connectDefault() {
         try {
             webSocketClient.connect();
             heartbeatTask.run(webSocketClient, clientSettings.getPingInterval());
@@ -129,20 +129,20 @@ public class TikTokWebSocketClient implements LiveSocketClient {
         }
     }
 
-    public void stop(int type) {
+    public void stop(LiveClientStopType type) {
         if (isConnected()) {
             switch (type) {
-				case 1 -> {
+                case CLOSE_BLOCKING -> {
 					try {
 						webSocketClient.closeBlocking();
 					} catch (InterruptedException e) {
                         throw new TikTokLiveException("Failed to stop the websocket");
                     }
 				}
-                case 2 -> webSocketClient.closeConnection(CloseFrame.NORMAL, "");
+                case DISCONNECT -> webSocketClient.closeConnection(CloseFrame.NORMAL, "");
                 default -> webSocketClient.close();
             }
-            heartbeatTask.stop(webSocketClient);
+            heartbeatTask.stop();
         }
         webSocketClient = null;
     }

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

@@ -39,9 +39,9 @@ import java.util.*;
 
 public class TikTokWebSocketListener extends WebSocketClient {
 
-    private final LiveMessagesHandler messagesHandler;
-    private final LiveEventsHandler eventHandler;
-    private final LiveClient liveClient;
+    protected final LiveMessagesHandler messagesHandler;
+    protected final LiveEventsHandler eventHandler;
+    protected final LiveClient liveClient;
 
     public TikTokWebSocketListener(URI serverUri,
                                    Map<String, String> httpHeaders,
@@ -67,7 +67,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
         }
     }
 
-    private void handleBinary(byte[] buffer) {
+    protected void handleBinary(byte[] buffer) {
         var websocketPushFrameOptional = getWebcastPushFrame(buffer);
         if (websocketPushFrameOptional.isEmpty()) {
             return;
@@ -97,7 +97,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
 
     @Override
     public void onClose(int code, String reason, boolean remote) {
-        eventHandler.publish(liveClient, new TikTokDisconnectedEvent(reason));
+        eventHandler.publish(liveClient, new TikTokDisconnectedEvent(code, reason));
         liveClient.disconnect();
     }
 
@@ -111,11 +111,7 @@ public class TikTokWebSocketListener extends WebSocketClient {
 
     private Optional<WebcastPushFrame> getWebcastPushFrame(byte[] buffer) {
         try {
-            var websocketMessage = WebcastPushFrame.parseFrom(buffer);
-            if (websocketMessage.getPayload().isEmpty()) {
-                return Optional.empty();
-            }
-            return Optional.of(websocketMessage);
+            return Optional.of(WebcastPushFrame.parseFrom(buffer)).filter(msg -> !msg.getPayload().isEmpty());
 		} catch (Exception e) {
             throw new TikTokProtocolBufferException("Unable to parse WebcastPushFrame", buffer, e);
         }

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

@@ -44,7 +44,7 @@ public class TikTokWebSocketOfflineClient implements LiveSocketClient {
     }
 
     @Override
-    public void stop(int type) {
+    public void stop(LiveClientStopType type) {
 		if (liveClient != null)
 			handler.publish(liveClient, new TikTokDisconnectedEvent("Stopping"));
 	}

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

@@ -22,6 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.websocket;
 
+import io.github.jwdeveloper.tiktok.common.AsyncHandler;
 import org.java_websocket.WebSocket;
 
 import java.util.*;
@@ -29,47 +30,30 @@ import java.util.concurrent.*;
 
 public class WebSocketHeartbeatTask
 {
-    // Single shared pool for all heartbeat tasks
-    private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1, r -> {
-        Thread t = new Thread(r, "heartbeat-pool");
-        t.setDaemon(true);
-        return t;
-    });
-    private static final Map<WebSocket, ScheduledFuture<?>> tasks = new ConcurrentHashMap<>();
-    private static final Map<WebSocket, Long> commTime = new ConcurrentHashMap<>();
+    private ScheduledFuture<?> task;
+    private Long commTime;
 
-    private final byte[] heartbeatBytes = Base64.getDecoder().decode("MgJwYjoCaGI="); // Used to be '3A026862' aka ':\x02hb', now is '2\x02pb:\x02hb'.
+    private final static byte[] heartbeatBytes = Base64.getDecoder().decode("MgJwYjoCaGI="); // Used to be '3A026862' aka ':\x02hb', now is '2\x02pb:\x02hb'.
 
     public void run(WebSocket webSocket, long pingTaskTime) {
-        stop(webSocket); // remove existing task if any
+        stop(); // remove existing task if any
 
-        tasks.put(webSocket, scheduler.scheduleAtFixedRate(() -> {
+        task = AsyncHandler.getHeartBeatScheduler().scheduleAtFixedRate(() -> {
             try {
                 if (webSocket.isOpen()) {
                     webSocket.send(heartbeatBytes);
-                    commTime.put(webSocket, System.currentTimeMillis());
-                } else {
-                    Long time = commTime.get(webSocket);
-                    if (time != null && System.currentTimeMillis() - time >= 60_000) // Stop if disconnected longer than 60s
-                        stop(webSocket);
-                }
+                    commTime = System.currentTimeMillis();
+                } else if (commTime != null && System.currentTimeMillis() - commTime >= 60_000) // Stop if disconnected longer than 60s
+					stop();
             } catch (Exception e) {
                 e.printStackTrace();
-                stop(webSocket);
+                stop();
             }
-        }, 0, pingTaskTime, TimeUnit.MILLISECONDS));
+        }, 0, pingTaskTime, TimeUnit.MILLISECONDS);
     }
 
-    public void stop(WebSocket webSocket) {
-        ScheduledFuture<?> future = tasks.remove(webSocket);
-        if (future != null)
-			future.cancel(true);
-        commTime.remove(webSocket);
-    }
-
-    public void shutdown() {
-        tasks.values().forEach(f -> f.cancel(true));
-        commTime.clear();
-        scheduler.shutdownNow();
+    public void stop() {
+        if (task != null)
+            task.cancel(true);
     }
 }

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerClient.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2023-2024 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.websocket.euler;
+
+import io.github.jwdeveloper.tiktok.data.requests.LiveConnectionData;
+import io.github.jwdeveloper.tiktok.data.settings.LiveClientSettings;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+import io.github.jwdeveloper.tiktok.live.*;
+import io.github.jwdeveloper.tiktok.websocket.*;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.framing.CloseFrame;
+
+import java.net.URI;
+import java.util.HashMap;
+
+public class TikTokWebSocketEulerClient implements LiveSocketClient {
+
+    private final LiveClientSettings clientSettings;
+    private final LiveMessagesHandler messageHandler;
+    private final LiveEventsHandler tikTokEventHandler;
+    private WebSocketClient webSocketClient;
+
+    public TikTokWebSocketEulerClient(
+        LiveClientSettings clientSettings,
+        LiveMessagesHandler messageHandler,
+        LiveEventsHandler tikTokEventHandler)
+    {
+        this.clientSettings = clientSettings;
+        this.messageHandler = messageHandler;
+        this.tikTokEventHandler = tikTokEventHandler;
+    }
+
+    @Override
+    public void start(LiveConnectionData.Response connectionData, LiveClient liveClient) {
+        if (isConnected())
+			stop(LiveClientStopType.NORMAL);
+
+        String url = "wss://ws.eulerstream.com?uniqueId=%s&apiKey=%s&features.rawMessages=true".formatted(liveClient.getRoomInfo().getHostName(), clientSettings.getApiKey())
+                     + (clientSettings.isUseEulerstreamWebsocket() ? "&features.useEnterpriseApi=true" : "");
+
+        webSocketClient = new TikTokWebSocketEulerListener(
+            URI.create(url),
+            new HashMap<>(clientSettings.getHttpSettings().getHeaders()),
+            clientSettings.getHttpSettings().getTimeout().toMillisPart(),
+            messageHandler,
+            tikTokEventHandler,
+            liveClient);
+
+        connect();
+    }
+
+    public void connect() {
+        try {
+            webSocketClient.connect();
+        } catch (Exception e) {
+            throw new TikTokLiveException("Failed to connect to the websocket", e);
+        }
+    }
+
+    public void stop(LiveClientStopType type) {
+        if (isConnected()) {
+            switch (type) {
+                case CLOSE_BLOCKING -> {
+                    try {
+                        webSocketClient.closeBlocking();
+                    } catch (InterruptedException e) {
+                        throw new TikTokLiveException("Failed to stop the websocket");
+                    }
+                }
+                case DISCONNECT -> webSocketClient.closeConnection(CloseFrame.NORMAL, "");
+                default -> webSocketClient.close();
+            }
+        }
+        webSocketClient = null;
+    }
+
+    public boolean isConnected() {
+        return webSocketClient != null && webSocketClient.isOpen();
+    }
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023-2024 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.websocket.euler;
+
+import com.google.gson.*;
+import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
+import io.github.jwdeveloper.tiktok.data.events.room.TikTokRoomInfoEvent;
+import io.github.jwdeveloper.tiktok.data.requests.LiveUserData;
+import io.github.jwdeveloper.tiktok.http.mappers.LiveUserDataMapper;
+import io.github.jwdeveloper.tiktok.live.*;
+import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketListener;
+
+import java.net.URI;
+import java.util.Map;
+
+public class TikTokWebSocketEulerListener extends TikTokWebSocketListener
+{
+
+    public TikTokWebSocketEulerListener(URI serverUri,
+                                        Map<String, String> httpHeaders,
+                                        int connectTimeout,
+                                        LiveMessagesHandler messageHandler,
+                                        LiveEventsHandler tikTokEventHandler,
+                                        LiveClient tikTokLiveClient) {
+        super(serverUri, httpHeaders, connectTimeout, messageHandler, tikTokEventHandler, tikTokLiveClient);
+    }
+
+	@Override
+    public void onMessage(String raw) {
+        try {
+            JsonElement element = JsonParser.parseString(raw);
+            if (element instanceof JsonObject o) {
+                if (o.get("messages") instanceof JsonArray msgs) {
+                    for (JsonElement msg : msgs) {
+                        if (msg instanceof JsonObject oMsg) {
+                            switch (oMsg.get("type").getAsString()) { // Should only receive these 2 types ever
+                                case "workerInfo" -> liveClient.getLogger().info(oMsg.toString()); // Always 1st message
+                                case "roomInfo" -> { // Always 2nd message
+									LiveUserData.Response data = LiveUserDataMapper.mapEulerstream(oMsg.getAsJsonObject("data"), liveClient.getLogger());
+                                    liveClient.getRoomInfo().copy(data.getRoomInfo());
+                                    eventHandler.publish(liveClient, new TikTokRoomInfoEvent(liveClient.getRoomInfo()));
+                                }
+                            }
+                        }
+                    }
+                }
+            } else
+                throw new IllegalArgumentException("Invalid JsonObject: "+element);
+        } catch (Exception e) {
+            e.printStackTrace();
+            eventHandler.publish(liveClient, new TikTokErrorEvent(e));
+        }
+        if (isOpen()) {
+            sendPing();
+        }
+    }
+}

README.md

@@ -70,7 +70,7 @@ Maven
          <dependency>
             <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
             <artifactId>Client</artifactId>
-             <version>1.10.0-Release</version>
+             <version>1.11.0-Release</version>
             <scope>compile</scope>
         </dependency>
    </dependencies>

examples/pom.xml

@@ -41,7 +41,7 @@
     <parent>
         <artifactId>TikTokLiveJava</artifactId>
         <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.10.8-Release</version>
+        <version>1.11.7-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.10.8-Release</version>
+        <version>1.11.7-Release</version>
     </parent>
 
 

extension-recorder/pom.xml

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

pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.github.jwdeveloper.tiktok</groupId>
     <artifactId>TikTokLiveJava</artifactId>
     <packaging>pom</packaging>
-    <version>1.10.8-Release</version>
+    <version>1.11.7-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.10.8-Release</version>
+        <version>1.11.7-Release</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>