dev (#298)

scx567888 · Nov 27, 2024 · b299205 · b299205
1 parent ebd6020
commit b299205
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>live-room-watcher</artifactId>
-    <version>0.3.22</version>
+    <version>0.3.23</version>
 
     <name>Live Room Watcher</name>
     <url>https://github.com/scx567888/live-room-watcher</url>
@@ -175,7 +175,7 @@
 
     <properties>
         <scx.mainClass>cool.scx.live_room_watcher.Main</scx.mainClass>
-        <scx.version>3.2.7</scx.version>
+        <scx.version>3.2.8</scx.version>
         <protobuf.version>4.28.3</protobuf.version>
         <jsoup.version>1.18.1</jsoup.version>
         <graalvm-js.version>24.1.1</graalvm-js.version>

diff --git a/src/main/java/cool/scx/live_room_watcher/impl/_560game/_560GameWatchTask.java b/src/main/java/cool/scx/live_room_watcher/impl/_560game/_560GameWatchTask.java
@@ -5,8 +5,8 @@
 import cool.scx.common.util.ObjectUtils;
 import cool.scx.common.util.ScxExceptionHelper;
 import cool.scx.scheduling.ScheduleStatus;
-import cool.scx.http.ScxClientWebSocketBuilder;
-import cool.scx.http.ScxWebSocket;
+import cool.scx.http.web_socket.ScxClientWebSocketBuilder;
+import cool.scx.http.web_socket.ScxWebSocket;
 import cool.scx.http.helidon.ScxHttpClientHelper;
 
 import static cool.scx.live_room_watcher.impl._560game._560GameHelper.getWsUrl;
@@ -67,7 +67,7 @@ public void start() {
                     logger.log(ERROR, "调用 callMessage 发生错误 :", e);
                 }
             }));
-            ws.onClose((v,a) -> {
+            ws.onClose((v) -> {
                 logger.log(DEBUG, "连接关闭 ");
                 //重连
                 start();
@@ -102,7 +102,7 @@ public void stop() {
 
     public void stopWebSocket() {
         if (webSocket != null && !webSocket.isClosed()) {
-            webSocket.onClose((c,a) -> {});
+            webSocket.onClose((c) -> {});
             webSocket.onError((c) -> {});
             webSocket.close();
                 logger.log(DEBUG, "关闭成功");

diff --git a/src/main/java/cool/scx/live_room_watcher/impl/douyin_hack/DouYinHackHelper.java b/src/main/java/cool/scx/live_room_watcher/impl/douyin_hack/DouYinHackHelper.java
@@ -6,10 +6,10 @@
 import cool.scx.common.util.ObjectUtils;
 import cool.scx.common.util.URIBuilder;
 import cool.scx.io.zip.GunzipBuilder;
-import cool.scx.http.ScxClientWebSocketBuilder;
+import cool.scx.http.web_socket.ScxClientWebSocketBuilder;
 import cool.scx.http.ScxHttpClient;
-import cool.scx.http.ScxServerWebSocket;
-import cool.scx.http.ScxWebSocket;
+import cool.scx.http.web_socket.ScxServerWebSocket;
+import cool.scx.http.web_socket.ScxWebSocket;
 import cool.scx.http.cookie.Cookie;
 import cool.scx.http.cookie.CookieWritable;
 import cool.scx.http.helidon.ScxHttpClientHelper;

diff --git a/src/main/java/cool/scx/live_room_watcher/impl/douyin_hack/DouYinHackLiveRoomWatcher.java b/src/main/java/cool/scx/live_room_watcher/impl/douyin_hack/DouYinHackLiveRoomWatcher.java
@@ -3,10 +3,10 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import cool.scx.common.functional.ScxConsumer;
 import cool.scx.common.util.$;
-import cool.scx.http.ScxClientWebSocketBuilder;
+import cool.scx.http.web_socket.ScxClientWebSocketBuilder;
 import cool.scx.http.ScxHttpClientResponse;
-import cool.scx.http.ScxServerWebSocket;
-import cool.scx.http.ScxWebSocket;
+import cool.scx.http.web_socket.ScxServerWebSocket;
+import cool.scx.http.web_socket.ScxWebSocket;
 import cool.scx.http.cookie.Cookie;
 import cool.scx.live_room_watcher.AbstractLiveRoomWatcher;
 import cool.scx.live_room_watcher.impl.douyin_hack.enumeration.ControlMessageAction;

diff --git a/src/main/java/cool/scx/live_room_watcher/impl/tiktok_hack/TikTokHackHelper.java b/src/main/java/cool/scx/live_room_watcher/impl/tiktok_hack/TikTokHackHelper.java
@@ -2,7 +2,7 @@
 
 import com.google.protobuf.ByteString;
 import cool.scx.io.zip.GunzipBuilder;
-import cool.scx.http.ScxWebSocket;
+import cool.scx.http.web_socket.ScxWebSocket;
 import cool.scx.http.uri.ScxURI;
 import cool.scx.http.uri.ScxURIWritable;
 import cool.scx.live_room_watcher.impl.tiktok_hack.proto_entity.webcast.im.PushFrame;

diff --git a/src/main/java/cool/scx/live_room_watcher/impl/tiktok_hack/TikTokHackLiveRoomWatcher.java b/src/main/java/cool/scx/live_room_watcher/impl/tiktok_hack/TikTokHackLiveRoomWatcher.java
@@ -3,9 +3,9 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import cool.scx.common.functional.ScxConsumer;
 import cool.scx.common.util.$;
-import cool.scx.http.ScxClientWebSocketBuilder;
+import cool.scx.http.web_socket.ScxClientWebSocketBuilder;
 import cool.scx.http.ScxHttpClientResponse;
-import cool.scx.http.ScxWebSocket;
+import cool.scx.http.web_socket.ScxWebSocket;
 import cool.scx.http.cookie.Cookie;
 import cool.scx.http.helidon.ScxHttpClientHelper;
 import cool.scx.http.uri.ScxURI;

diff --git a/src/main/java/cool/scx/live_room_watcher/util/Browser.java b/src/main/java/cool/scx/live_room_watcher/util/Browser.java
@@ -2,6 +2,7 @@
 
 
 import cool.scx.http.*;
+import cool.scx.http.web_socket.*;
 import cool.scx.http.cookie.Cookie;
 import cool.scx.http.helidon.ScxHttpClientHelper;