From 1dc3f24cfe72ffc375b4fcd75e4e2c25846b8a1c Mon Sep 17 00:00:00 2001
From: UnCLAS-Prommer <gitunclasprommer@gmail.com>
Date: Sat, 5 Apr 2025 11:59:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0exception=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=8Efallback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/chat/message_sender.py | 18 ++++++++++++------
 src/plugins/message/api.py         |  5 ++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/plugins/chat/message_sender.py b/src/plugins/chat/message_sender.py
index 5b4adc8d1..e86efb64e 100644
--- a/src/plugins/chat/message_sender.py
+++ b/src/plugins/chat/message_sender.py
@@ -43,6 +43,12 @@ class Message_Sender:
         # 按thinking_start_time排序，时间早的在前面
         return recalled_messages
 
+    async def send_via_ws(self, message: MessageSending) -> None:
+        try:
+            await global_api.send_message(message)
+        except Exception as e:
+            raise ValueError(f"未找到平台：{message.message_info.platform} 的url配置，请检查配置文件") from e
+
     async def send_message(
         self,
         message: MessageSending,
@@ -69,14 +75,14 @@ class Message_Sender:
                     if end_point:
                         # logger.info(f"发送消息到{end_point}")
                         # logger.info(message_json)
-                        await global_api.send_message_REST(end_point, message_json)
-                    else:
                         try:
-                            await global_api.send_message(message)
+                            await global_api.send_message_REST(end_point, message_json)
                         except Exception as e:
-                            raise ValueError(
-                                f"未找到平台：{message.message_info.platform} 的url配置，请检查配置文件"
-                            ) from e
+                            logger.error(f"REST方式发送失败，出现错误: {str(e)}")
+                            logger.info("尝试使用ws发送")
+                            await self.send_via_ws(message)
+                    else:
+                        await self.send_via_ws(message)
                     logger.success(f"发送消息“{message_preview}”成功")
                 except Exception as e:
                     logger.error(f"发送消息“{message_preview}”失败: {str(e)}")
diff --git a/src/plugins/message/api.py b/src/plugins/message/api.py
index 855ff8b95..2a6a2b6fc 100644
--- a/src/plugins/message/api.py
+++ b/src/plugins/message/api.py
@@ -215,9 +215,8 @@ class MessageServer(BaseMessageHandler):
             try:
                 async with session.post(url, json=data, headers={"Content-Type": "application/json"}) as response:
                     return await response.json()
-            except Exception:
-                # logger.error(f"发送消息失败: {str(e)}")
-                pass
+            except Exception as e:
+                raise e
 
 
 class BaseMessageAPI: