From 26c7db8f994fd02c8c5609d2b40350fd6f7d078a Mon Sep 17 00:00:00 2001
From: JW <jacekwoln@gmail.com>
Date: Tue, 22 Aug 2023 20:47:27 +0200
Subject: [PATCH] Fix messages   - WebcastSocialMessage   - ImDeleteMessage

---
 .../jwdeveloper/tiktok/ClientSettings.java    | 13 +++++---
 .../github/jwdeveloper/tiktok/Constants.java  |  1 -
 .../events/messages/TikTokIMDeleteEvent.java  | 12 +++----
 API/src/main/proto/tiktokSchema.proto         |  3 +-
 .../github/jwdeveloper/tiktok/TikTokLive.java |  2 --
 .../tiktok/TikTokLiveClientBuilder.java       |  5 ++-
 .../tiktok/handlers/WebResponseHandler.java   |  2 +-
 .../handlers/WebResponseHandlerBase.java      |  2 +-
 .../tiktok/ParseMessagesTests.java            | 20 +++++++++---
 .../tiktok/WebResponseHandlerTests.java       | 32 +++++++++++++++++++
 .../tiktok/{ => common}/TikTokBaseTest.java   |  2 +-
 .../MessageWebcastImDeleteMessage.bin         |  1 +
 .../resources/MessageWebcastSocialMessage.bin |  1 +
 .../io/github/jwdeveloper/tiktok/Main.java    |  2 +-
 .../jwdeveloper/tiktok/SimpleExample.java     |  2 +-
 15 files changed, 70 insertions(+), 30 deletions(-)
 create mode 100644 Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java
 rename Client/src/test/java/io/github/jwdeveloper/tiktok/{ => common}/TikTokBaseTest.java (95%)
 create mode 100644 Client/src/test/resources/MessageWebcastImDeleteMessage.bin
 create mode 100644 Client/src/test/resources/MessageWebcastSocialMessage.bin

diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java b/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java
index 90ccc12..d0fc367 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java
@@ -29,11 +29,6 @@ public class ClientSettings {
     /// </summary>
 
     private String clientLanguage;
-    /// <summary>
-    /// Size for Buffer for Socket-Connection
-    /// </summary>
-
-    private int socketBufferSize;
 
     /// <summary>
     /// Whether to Retry if Connection Fails
@@ -69,8 +64,16 @@ public class ClientSettings {
     /// </summary>
     private boolean checkForUnparsedData;
 
+
+    /// <summary>
+    /// Tiktok user name
+    /// </summary>
     private String hostName;
 
+
+    /// <summary>
+    /// Parameters used in requests to tiktok api
+    /// </summary>
     private Map<String, Object> clientParameters;
 }
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/Constants.java b/API/src/main/java/io/github/jwdeveloper/tiktok/Constants.java
index 7694057..5f0cf8d 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/Constants.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/Constants.java
@@ -45,7 +45,6 @@ public class Constants {
         clientSettings.setHandleExistingMessagesOnConnect(true);
         clientSettings.setDownloadGiftInfo(true);
         clientSettings.setRetryOnConnectionFailure(true);
-        clientSettings.setSocketBufferSize(500_000);
         clientSettings.setPrintToConsole(true);
         clientSettings.setLogLevel(Level.ALL);
         clientSettings.setCheckForUnparsedData(false);
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java
index ad1959f..6f50cbb 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java
@@ -6,12 +6,10 @@ import lombok.Getter;
 
 @Getter
 public class TikTokIMDeleteEvent extends TikTokEvent {
-  private final String data1;
-  private final String data2;
+    private final byte[] data;
 
-  public TikTokIMDeleteEvent(WebcastImDeleteMessage msg) {
-    super(msg.getHeader());;
-    data1 = msg.getData1();
-    data2 = msg.getData2();
-  }
+    public TikTokIMDeleteEvent(WebcastImDeleteMessage msg) {
+        super(msg.getHeader());
+        data = msg.getData().toByteArray();
+    }
 }
diff --git a/API/src/main/proto/tiktokSchema.proto b/API/src/main/proto/tiktokSchema.proto
index 96a7510..c8cb397 100644
--- a/API/src/main/proto/tiktokSchema.proto
+++ b/API/src/main/proto/tiktokSchema.proto
@@ -749,8 +749,7 @@ message WebcastHourlyRankMessage {
 // Message related to Chat-moderation?
 message WebcastImDeleteMessage {
   MessageHeader header = 1;
-  string data1 = 2;
-  string data2 = 3;
+  bytes data = 3;
 }
 
 message WebcastInRoomBannerMessage {
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java
index a347e82..4272ed8 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLive.java
@@ -8,6 +8,4 @@ public class TikTokLive
     {
         return new TikTokLiveClientBuilder(userName);
     }
-
-
 }
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
index 394fbec..58895c7 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
@@ -48,9 +48,6 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
             clientSettings.setClientLanguage(Constants.DefaultClientSettings().getClientLanguage());
         }
 
-        if (clientSettings.getSocketBufferSize() < 500_000) {
-            clientSettings.setSocketBufferSize(Constants.DefaultClientSettings().getSocketBufferSize());
-        }
 
 
         if (clientSettings.getHostName() == null || clientSettings.getHostName() .equals("")) {
@@ -60,6 +57,8 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
         var params = clientSettings.getClientParameters();
         params.put("app_language", clientSettings.getClientLanguage());
         params.put("webcast_language", clientSettings.getClientLanguage());
+
+        logger.setLevel(clientSettings.getLogLevel());
     }
 
     public LiveClient build() {
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandler.java
index f7a3570..2d7dbdf 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandler.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandler.java
@@ -119,7 +119,7 @@ public class WebResponseHandler extends WebResponseHandlerBase {
         var message = WebcastSocialMessage.parseFrom(msg.getBinary());
 
         String type = message.getHeader().getSocialData().getType();
-        Pattern pattern = Pattern.compile("pm_mt_guidance_viewer_([0-9]+)_share");
+        Pattern pattern = Pattern.compile("\\d+");
         Matcher matcher = pattern.matcher(type);
         if (matcher.find()) {
             var value = matcher.group(0);
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandlerBase.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandlerBase.java
index b239778..36183eb 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandlerBase.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/WebResponseHandlerBase.java
@@ -78,7 +78,7 @@ public abstract class WebResponseHandlerBase {
         }
     }
 
-    private void handleSingleMessage(WebcastResponse.Message message) throws Exception {
+    public void handleSingleMessage(WebcastResponse.Message message) throws Exception {
         if (!handlers.containsKey(message.getType())) {
             tikTokEventHandler.publish(new TikTokUnhandledEvent(message));
             return;
diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/ParseMessagesTests.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/ParseMessagesTests.java
index a3bfd75..bbeb362 100644
--- a/Client/src/test/java/io/github/jwdeveloper/tiktok/ParseMessagesTests.java
+++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/ParseMessagesTests.java
@@ -1,9 +1,8 @@
 package io.github.jwdeveloper.tiktok;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import io.github.jwdeveloper.tiktok.messages.WebcastChatMessage;
-import io.github.jwdeveloper.tiktok.messages.WebcastGiftMessage;
-import io.github.jwdeveloper.tiktok.messages.WebcastLikeMessage;
+import io.github.jwdeveloper.tiktok.common.TikTokBaseTest;
+import io.github.jwdeveloper.tiktok.messages.*;
 import org.junit.Test;
 
 public class ParseMessagesTests extends TikTokBaseTest
@@ -11,13 +10,13 @@ public class ParseMessagesTests extends TikTokBaseTest
 
 
     @Test
-    public void ShouldParseLikeMessage() throws InvalidProtocolBufferException {
+    public void ShouldParseMessageWebcastLikeMessage() throws InvalidProtocolBufferException {
         var bytes = getFileBytesUtf("LikeMessage.bin");
         var message = WebcastLikeMessage.parseFrom(bytes);
     }
 
     @Test
-    public void ShouldParseGiftMessage() throws InvalidProtocolBufferException {
+    public void ShouldParseMessageWebcastGiftMessage() throws InvalidProtocolBufferException {
         var bytes = getFileBytesUtf("MessageWebcastGiftMessage.bin");
         var message = WebcastGiftMessage.parseFrom(bytes);
     }
@@ -27,5 +26,16 @@ public class ParseMessagesTests extends TikTokBaseTest
         var message = WebcastChatMessage.parseFrom(bytes);
     }
 
+    @Test
+    public void ShouldParseMessageWebcastImDeleteMessage() throws InvalidProtocolBufferException {
+        var bytes = getFileBytesUtf("MessageWebcastImDeleteMessage.bin");
+        var message = WebcastImDeleteMessage.parseFrom(bytes);
+    }
 
+
+    @Test
+    public void ShouldParseMessageWebcastSocialMessage() throws InvalidProtocolBufferException {
+        var bytes = getFileBytesUtf("MessageWebcastSocialMessage.bin");
+        var message = WebcastSocialMessage.parseFrom(bytes);
+    }
 }
diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java
new file mode 100644
index 0000000..d6fcfe4
--- /dev/null
+++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java
@@ -0,0 +1,32 @@
+package io.github.jwdeveloper.tiktok;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import io.github.jwdeveloper.tiktok.common.TikTokBaseTest;
+import io.github.jwdeveloper.tiktok.events.messages.*;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.WebResponseHandler;
+import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
+import io.github.jwdeveloper.tiktok.models.SocialTypes;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.mockito.Mockito.mock;
+
+public class WebResponseHandlerTests extends TikTokBaseTest
+{
+    public static WebResponseHandler sut;
+
+    @Before
+    public void before()
+    {
+        var mockEventHandler = mock(TikTokEventHandler.class);
+        var mockGiftManager = mock(TikTokGiftManager.class);
+        sut = new WebResponseHandler(mockEventHandler, mockGiftManager);
+    }
+
+
+}
diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokBaseTest.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/common/TikTokBaseTest.java
similarity index 95%
rename from Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokBaseTest.java
rename to Client/src/test/java/io/github/jwdeveloper/tiktok/common/TikTokBaseTest.java
index b9b76d3..a4089e2 100644
--- a/Client/src/test/java/io/github/jwdeveloper/tiktok/TikTokBaseTest.java
+++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/common/TikTokBaseTest.java
@@ -1,4 +1,4 @@
-package io.github.jwdeveloper.tiktok;
+package io.github.jwdeveloper.tiktok.common;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import io.github.jwdeveloper.tiktok.messages.WebcastWebsocketMessage;
diff --git a/Client/src/test/resources/MessageWebcastImDeleteMessage.bin b/Client/src/test/resources/MessageWebcastImDeleteMessage.bin
new file mode 100644
index 0000000..12460eb
--- /dev/null
+++ b/Client/src/test/resources/MessageWebcastImDeleteMessage.bin
@@ -0,0 +1 @@
+CjUKFldlYmNhc3RJbURlbGV0ZU1lc3NhZ2UQhZab+vyKvvJkGJKWhYz+o7DxZCC0sajzoTEwARoJhojH2ojIjaBk
\ No newline at end of file
diff --git a/Client/src/test/resources/MessageWebcastSocialMessage.bin b/Client/src/test/resources/MessageWebcastSocialMessage.bin
new file mode 100644
index 0000000..955c810
--- /dev/null
+++ b/Client/src/test/resources/MessageWebcastSocialMessage.bin
@@ -0,0 +1 @@
+CskHMAFChgcaDgoJI2ZmZmZmZmZmIJADIp8GCAsSDgoJI2ZmZmZmZmZmIJADqgGJBgqGBgiFiNKIpZnf0WIaCm1yIEEuTC5GLkFK/wQKxgFodHRwczovL3AxNi1zaWduLXVzZWFzdDJhLnRpa3Rva2Nkbi5jb20vdG9zLXVzZWFzdDJhLWF2dC0wMDY4LWV1dHRwLzkxODE3OWQ4MzQ0YWZiYjk3OTAzYjYyMGQwOTg1ZGEzfnRwbHYtdGlrdG9rLXNocmluazo3Mjo3Mi53ZWJwP3gtZXhwaXJlcz0xNjkyOTAwMDAwJngtc2lnbmF0dXJlPUE0RmtOWDMlMkIxNiUyRjlxeENvR1JReEczNFRnRUUlM0QKtAFodHRwczovL3AxNi1zaWduLXVzZWFzdDJhLnRpa3Rva2Nkbi5jb20vdG9zLXVzZWFzdDJhLWF2dC0wMDY4LWV1dHRwLzkxODE3OWQ4MzQ0YWZiYjk3OTAzYjYyMGQwOTg1ZGEzfmM1XzEwMHgxMDAud2VicD94LWV4cGlyZXM9MTY5MjkwMDAwMCZ4LXNpZ25hdHVyZT1EOHlYQUhNVGxGeUR5N3dqT3BXRllrUlBBWnclM0QKtgFodHRwczovL3AxNi1zaWduLXVzZWFzdDJhLnRpa3Rva2Nkbi5jb20vdG9zLXVzZWFzdDJhLWF2dC0wMDY4LWV1dHRwLzkxODE3OWQ4MzQ0YWZiYjk3OTAzYjYyMGQwOTg1ZGEzfmM1XzEwMHgxMDAuanBlZz94LWV4cGlyZXM9MTY5MjkwMDAwMCZ4LXNpZ25hdHVyZT1IYkIwNk00N2Y0JTJGT29jUWxla0gwREdDdkY3MCUzRBJEMTAweDEwMC90b3MtdXNlYXN0MmEtYXZ0LTAwNjgtZXV0dHAvOTE4MTc5ZDgzNDRhZmJiOTc5MDNiNjIwZDA5ODVkYTOyAQgI9h8Qmw0YAboBAIICALICCy56YXBpc3l3YW5l8gJMTVM0d0xqQUJBQUFBYXdVMzNGbnBIYllkMHdra1djeC1DTnBzeDdXT0lqOXdtOTBwQ2tRUmZPekJuZVdZczdXT0plSm5GVU5kdFh0MwoecG1fbXRfZ3VpZGFuY2Vfdmlld2VyXzEwX3NoYXJlEjJ7MDp1c2VyfSBzaGFyZWQgdGhlIExJVkUgd2l0aCBtb3JlIHRoYW4gMTAgZnJpZW5kc1ACsAEFwAECChRXZWJjYXN0U29jaWFsTWVzc2FnZRCglsC+2OG+8mQYoJaZxvrevPJkIOTf0vOhMUgBuAECEoYGSv8ECsYBaHR0cHM6Ly9wMTYtc2lnbi11c2Vhc3QyYS50aWt0b2tjZG4uY29tL3Rvcy11c2Vhc3QyYS1hdnQtMDA2OC1ldXR0cC85MTgxNzlkODM0NGFmYmI5NzkwM2I2MjBkMDk4NWRhM350cGx2LXRpa3Rvay1zaHJpbms6NzI6NzIud2VicD94LWV4cGlyZXM9MTY5MjkwMDAwMCZ4LXNpZ25hdHVyZT1BNEZrTlgzJTJCMTYlMkY5cXhDb0dSUXhHMzRUZ0VFJTNECrQBaHR0cHM6Ly9wMTYtc2lnbi11c2Vhc3QyYS50aWt0b2tjZG4uY29tL3Rvcy11c2Vhc3QyYS1hdnQtMDA2OC1ldXR0cC85MTgxNzlkODM0NGFmYmI5NzkwM2I2MjBkMDk4NWRhM35jNV8xMDB4MTAwLndlYnA/eC1leHBpcmVzPTE2OTI5MDAwMDAmeC1zaWduYXR1cmU9RDh5WEFITVRsRnlEeTd3ak9wV0ZZa1JQQVp3JTNECrYBaHR0cHM6Ly9wMTYtc2lnbi11c2Vhc3QyYS50aWt0b2tjZG4uY29tL3Rvcy11c2Vhc3QyYS1hdnQtMDA2OC1ldXR0cC85MTgxNzlkODM0NGFmYmI5NzkwM2I2MjBkMDk4NWRhM35jNV8xMDB4MTAwLmpwZWc/eC1leHBpcmVzPTE2OTI5MDAwMDAmeC1zaWduYXR1cmU9SGJCMDZNNDdmNCUyRk9vY1FsZWtIMERHQ3ZGNzAlM0QSRDEwMHgxMDAvdG9zLXVzZWFzdDJhLWF2dC0wMDY4LWV1dHRwLzkxODE3OWQ4MzQ0YWZiYjk3OTAzYjYyMGQwOTg1ZGEzsgEIEJsNGAEI9h+6AQCCAgCyAgsuemFwaXN5d2FuZfICTE1TNHdMakFCQUFBQWF3VTMzRm5wSGJZZDB3a2tXY3gtQ05wc3g3V09Jajl3bTkwcENrUVJmT3pCbmVXWXM3V09KZUpuRlVOZHRYdDMIhYjSiKWZ39FiGgptciBBLkwuRi5BGAEgAyoCLTFAGQ==
\ No newline at end of file
diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
index 0a08d29..49bef0b 100644
--- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
+++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 
 public class Main {
 
-    public static String TEST_USER_SUBJECT = "stiflerhub";
+    public static String TEST_USER_SUBJECT = "mr_cios";
 
     public static void main(String[] args) throws IOException {
         var client = TikTokLive.newClient(TEST_USER_SUBJECT)
diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
index e76af9a..ebbbd75 100644
--- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
+++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 public class SimpleExample {
     public static void main(String[] args) throws IOException {
         // Username of someone who is currently live
-        var tiktokUsername = "szwagierkaqueen";
+        var tiktokUsername = "mr_cios";
 
         TikTokLive.newClient(tiktokUsername)
                 .configure(settings ->