From 92d720889f348335ad48eb40514a3a5089254d2c Mon Sep 17 00:00:00 2001
From: Andy Zhang <37402126+AnzhiZhang@users.noreply.github.com>
Date: Wed, 2 Oct 2024 20:24:53 +0100
Subject: [PATCH] =?UTF-8?q?fix(qq):=20=F0=9F=90=9B=20fix=20websocket=20con?=
 =?UTF-8?q?nection=20with=20invalid=20path?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platforms/qq/protocol/QQWsServer.java     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQWsServer.java b/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQWsServer.java
index 9d0ed02..0f06228 100644
--- a/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQWsServer.java
+++ b/src/main/java/com/zhanganzhi/chathub/platforms/qq/protocol/QQWsServer.java
@@ -32,15 +32,29 @@ public QQWsServer(String host, Integer port, String validResourcePath, Queue<QQE
 
     @Override
     public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
-        logger.info("QQ WebSocket connection opened at [{}], path:[{}]", webSocket.getLocalSocketAddress(), clientHandshake.getResourceDescriptor());
-        if (validResourcePath.equals(clientHandshake.getResourceDescriptor())) {
+        InetSocketAddress remoteSocketAddress = webSocket.getRemoteSocketAddress();
+        String resourceDescriptor = webSocket.getResourceDescriptor();
+        if (validResourcePath.equals(resourceDescriptor)) {
             clients.add(webSocket);
+            logger.info(
+                    "QQ WebSocket client at [{}] connection established with path [{}]",
+                    remoteSocketAddress,
+                    resourceDescriptor
+            );
+        } else {
+            webSocket.close();
+            logger.warn(
+                    "QQ WebSocket client at [{}] connection established with invalid path [{}], connection closed",
+                    remoteSocketAddress,
+                    resourceDescriptor
+            );
         }
     }
 
     @Override
     public void onClose(WebSocket webSocket, int i, String s, boolean b) {
-        logger.info("QQ WebSocket connection closed");
+        logger.info("QQ WebSocket client at [{}] connection closed", webSocket.getRemoteSocketAddress());
+        clients.remove(webSocket);
     }
 
     @Override