Compare commits

...

4 Commits

Author SHA1 Message Date
kohlerpop1
cfdced9645 Add direct method to provide sessionId and ttTargetIdc for sending chats from 1 client. 2025-10-06 23:08:10 -04:00
GitHub Action
7589a2ac4a Update version in pom.xml 2025-10-05 02:40:59 +00:00
kohlerpop1
a0c445656c Slight change of decoding for TikTokWebSocketEulerListener! 2025-10-04 22:38:47 -04:00
GitHub Action
1e78fdda89 Update version in pom.xml 2025-09-24 23:28:34 +00:00
14 changed files with 45 additions and 29 deletions

View File

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

View File

@@ -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);
}

View File

@@ -102,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);
}

View File

@@ -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;

View File

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

View File

@@ -199,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) {

View File

@@ -182,23 +182,23 @@ 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");

View File

@@ -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;
}

View File

@@ -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("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
LiveUserData.Response data = LiveUserDataMapper.map(oMsg.getAsJsonObject("data").getAsJsonObject("raw").toString(), liveClient.getLogger());
liveClient.getRoomInfo().copy(data.getRoomInfo());
eventHandler.publish(liveClient, new TikTokRoomInfoEvent(liveClient.getRoomInfo()));
}
@@ -67,6 +67,7 @@ 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()) {

View File

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

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>io.github.jwdeveloper.tiktok</groupId>
<artifactId>TikTokLiveJava</artifactId>
<version>1.11.2-Release</version>
<version>1.11.4-Release</version>
</parent>

View File

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

View File

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

View File

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