Merge branch 'refs/heads/master' into develop-1.11.3

Change static schedulers to AsyncHandler to hold for heartbeat and reconnect logic.
2026-02-28 09:19:40 -05:00 · 2025-09-22 22:32:44 -04:00 · 2025-09-22 22:30:52 -04:00
9 changed files with 20 additions and 23 deletions
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>TikTokLiveJava</artifactId>
        <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.3-Release</version>
+        <version>1.11.2-Release</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>API</artifactId>
--- a/API/src/main/proto/data.proto
+++ b/API/src/main/proto/data.proto
@@ -62,11 +62,12 @@ message Text {
    int32 type = 1;
    TextFormat format = 2;
    string stringValue = 11;
-    TextPieceUser userValue = 21;
-    TextPieceGift giftValue = 22;
-    TextPieceHeart heartValue = 23;
+    oneof textPieceType
+    {
+      TextPieceUser userValue = 21;
+      TextPieceGift giftValue = 22;
+    }
    TextPiecePatternRef patternRefValue = 24;
-    TextPieceImage imageValue = 25;
  }

  message TextFormat {
@@ -82,7 +83,7 @@ message Text {

  message TextPieceGift {
    int32 giftId = 1;
-    TextPiecePatternRef nameRef = 2;
+    PatternRef nameRef = 2;
    ShowType showType = 3; // Enum
    int64 colorId = 4;
  }
@@ -97,19 +98,16 @@ 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
@@ -153,7 +151,7 @@ message BadgeStruct {
  bool is_customized = 24;

  message CombineBadge {
-    BadgeDisplayType badge_display_type = 1;
+    int32 badge_display_type = 1;
    Image icon = 2;
    TextBadge text = 3;
    string str = 4;
--- a/Client/pom.xml
+++ b/Client/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>TikTokLiveJava</artifactId>
        <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.3-Release</version>
+        <version>1.11.2-Release</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/euler/TikTokWebSocketEulerListener.java
@@ -56,7 +56,7 @@ public class TikTokWebSocketEulerListener extends TikTokWebSocketListener
                            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.map(oMsg.getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
+									LiveUserData.Response data = LiveUserDataMapper.map(oMsg.getAsJsonObject("data").getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
                                    liveClient.getRoomInfo().copy(data.getRoomInfo());
                                    eventHandler.publish(liveClient, new TikTokRoomInfoEvent(liveClient.getRoomInfo()));
                                }
@@ -67,7 +67,6 @@ public class TikTokWebSocketEulerListener extends TikTokWebSocketListener
            } else
                throw new IllegalArgumentException("Invalid JsonObject: "+element);
        } catch (Exception e) {
-            e.printStackTrace();
            eventHandler.publish(liveClient, new TikTokErrorEvent(e));
        }
        if (isOpen()) {
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -41,7 +41,7 @@
    <parent>
        <artifactId>TikTokLiveJava</artifactId>
        <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.3-Release</version>
+        <version>1.11.2-Release</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/extension-collector/pom.xml
+++ b/extension-collector/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>io.github.jwdeveloper.tiktok</groupId>
        <artifactId>TikTokLiveJava</artifactId>
-        <version>1.11.3-Release</version>
+        <version>1.11.2-Release</version>
    </parent>


--- a/extension-recorder/pom.xml
+++ b/extension-recorder/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>TikTokLiveJava</artifactId>
        <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.3-Release</version>
+        <version>1.11.2-Release</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>extension-recorder</artifactId>
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
    <groupId>io.github.jwdeveloper.tiktok</groupId>
    <artifactId>TikTokLiveJava</artifactId>
    <packaging>pom</packaging>
-    <version>1.11.3-Release</version>
+    <version>1.11.2-Release</version>
    <modules>
        <module>API</module>
        <module>Client</module>
--- a/tools-readme/pom.xml
+++ b/tools-readme/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>TikTokLiveJava</artifactId>
        <groupId>io.github.jwdeveloper.tiktok</groupId>
-        <version>1.11.3-Release</version>
+        <version>1.11.2-Release</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
kohlerpop1	e3e247b73b	Merge branch 'refs/heads/master' into develop-1.11.3	2025-09-22 22:32:44 -04:00
kohlerpop1	9abc1a399d	Change static schedulers to AsyncHandler to hold for heartbeat and reconnect logic.	2025-09-22 22:30:52 -04:00