🐛修复ws重复连接情况

src/managers/server_manager/__init__.py

@@ -105,7 +105,7 @@ async def _(bot: Bot, event: PrivateMessageEvent):
 @connect_ws.handle()
 async def _(bot: Bot, event: PrivateMessageEvent):
     '''连接服务器'''
-    if ws_client.closed:
+    if ws_client.closed and not ws_client.is_connecting:
         msg = "正在连接ws服务器……"
         await connect_ws.send(msg)
         flag = await ws_client.init()
@@ -115,14 +115,15 @@ async def _(bot: Bot, event: PrivateMessageEvent):
             msg = "ws服务器连接失败！"
         await connect_ws.finish(msg)
     else:
-        msg = "ws服务器当前已连接，不要重复连接！"
+        msg = "ws服务器当前已连接或连接中，请不要重复连接！"
         await connect_ws.finish(msg)
 
 
 @close_ws.handle()
 async def _(bot: Bot, event: PrivateMessageEvent):
     '''关闭连接'''
-    await ws_client.close()
+    if not ws_client.closed:
+        await ws_client.close()
     await close_ws.finish("ws连接已关闭！")
 
 # ----------------------------------------------------------------

src/managers/server_manager/_websocket.py

@@ -28,6 +28,8 @@ class Jx3WebSocket(object):
     '''抓马播报'''
     _fuyao: bool = False
     '''扶摇播报'''
+    is_connecting: bool = False
+    '''是否在连接中'''
 
     def __new__(cls, *args, **kwargs):
         '''单例'''
@@ -100,6 +102,7 @@ async def init(self) -> bool:
             ws_token = ""
         headers = {"token": ws_token}
         logger.debug(f"<g>ws_server</g> | 正在链接jx3api的ws服务器：{ws_path}")
+        self.is_connecting = True
         for i in range(1, 101):
             try:
                 logger.debug(
@@ -110,6 +113,7 @@ async def init(self) -> bool:
                                                     ping_interval=20,
                                                     ping_timeout=20,
                                                     close_timeout=10)
+                self.is_connecting = False
                 asyncio.create_task(self._task())
                 logger.debug(
                     "<g>ws_server</g> | ws连接成功！"
@@ -119,6 +123,7 @@ async def init(self) -> bool:
                 logger.error(
                     f"<r>链接到ws服务器时发生错误：{str(e)}</r>")
                 asyncio.sleep(1)
+        self.is_connecting = False
         return False
 
     async def close(self):