fix: 风控保护报错

Author: HenryXiaoYang

WechatAPI/Client/__init__.py

@@ -37,7 +37,7 @@ async def send_at_message(self, wxid: str, content: str, at: list[str]) -> tuple
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         output = ""
         for id in at:

WechatAPI/Client/chatroom.py

@@ -21,7 +21,7 @@ async def add_chatroom_member(self, chatroom: str, wxid: str) -> bool:
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "Chatroom": chatroom, "InviteWxids": wxid}
@@ -69,7 +69,7 @@ async def get_chatroom_info(self, chatroom: str) -> dict:
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "Chatroom": chatroom}
@@ -141,7 +141,7 @@ async def invite_chatroom_member(self, wxid: Union[str, list], chatroom: str) ->
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         if isinstance(wxid, list):
             wxid = ",".join(wxid)

WechatAPI/Client/friend.py

@@ -33,7 +33,7 @@ async def accept_friend(self, scene: int, v1: str, v2: str) -> bool:
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "Scene": scene, "V1": v1, "V2": v2}

WechatAPI/Client/message.py

@@ -80,7 +80,7 @@ async def revoke_message(self, wxid: str, client_msg_id: int, create_time: int,
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "ClientMsgId": client_msg_id, "CreateTime": create_time,
@@ -122,7 +122,7 @@ async def _send_text_message(self, wxid: str, content: str, at: list[str] = None
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         if at is None:
             at = []
@@ -164,7 +164,7 @@ async def _send_image_message(self, wxid: str, image_path: str = "", image_base6
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         if bool(image_path) == bool(image_base64):
             raise ValueError("Please provide either image_path or image_base64")
@@ -281,7 +281,7 @@ async def _send_voice_message(self, wxid: str, voice_base64: str = "", voice_pat
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
         elif bool(voice_path) == bool(voice_base64):
             raise ValueError("Please provide either voice_path or voice_base64")
         elif format not in ["amr", "wav", "mp3"]:
@@ -366,7 +366,7 @@ async def _send_link_message(self, wxid: str, url: str, title: str = "", descrip
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "Url": url, "Title": title, "Desc": description,
@@ -408,7 +408,7 @@ async def _send_emoji_message(self, wxid: str, md5: str, total_length: int) -> t
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "Md5": md5, "TotalLen": total_length}
@@ -446,7 +446,7 @@ async def _send_card_message(self, wxid: str, card_wxid: str, card_nickname: str
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "CardWxid": card_wxid, "CardAlias": card_alias,
@@ -487,7 +487,7 @@ async def _send_app_message(self, wxid: str, xml: str, type: int) -> tuple[int,
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "Xml": xml, "Type": type}
@@ -523,7 +523,7 @@ async def _send_cdn_file_msg(self, wxid: str, xml: str) -> tuple[int, int, int]:
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "Content": xml}
@@ -558,7 +558,7 @@ async def _send_cdn_img_msg(self, wxid: str, xml: str) -> tuple[int, int, int]:
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "Content": xml}
@@ -593,7 +593,7 @@ async def _send_cdn_video_msg(self, wxid: str, xml: str) -> tuple[int, int]:
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "ToWxid": wxid, "Content": xml}

WechatAPI/Client/tool.py

@@ -130,13 +130,13 @@ async def set_step(self, count: int) -> bool:
 
         Raises:
             UserLoggedOut: 未登录时调用
-            BanProtection: 登录新设备后4小时内请不要操作以避免风控
+            BanProtection: 风控保护: 新设备登录后4小时内请挂机
             根据error_handler处理错误
         """
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif not self.ignore_protect and protector.check(14400):
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "StepCount": count}

WechatAPI/Client/user.py

@@ -46,13 +46,13 @@ async def get_my_qrcode(self, style: int = 0) -> str:
 
         Raises:
             UserLoggedOut: 未登录时调用
-            BanProtection: 登录新设备后4小时内请不要操作以避免风控
+            BanProtection: 风控保护: 新设备登录后4小时内请挂机
             根据error_handler处理错误
         """
         if not self.wxid:
             raise UserLoggedOut("请先登录")
         elif protector.check(14400) and not self.ignore_protect:
-            raise BanProtection("登录新设备后4小时内请不要操作以避免风控")
+            raise BanProtection("风控保护: 新设备登录后4小时内请挂机")
 
         async with aiohttp.ClientSession() as session:
             json_param = {"Wxid": self.wxid, "Style": style}

bot_core.py

@@ -3,30 +3,18 @@
 import os
 import time
 import tomllib
-import traceback
 from pathlib import Path
 
 from loguru import logger
 
 import WechatAPI
 from WechatAPI import is_running_in_docker
-from WechatAPI.errors import BanProtection
 from database.database import BotDatabase
 from utils.decorators import scheduler
 from utils.plugin_manager import plugin_manager
 from utils.xybot import XYBot
 
 
-async def handle_message(xybot, msg):
-    """处理单条消息"""
-    try:
-        await xybot.process_message(msg)
-    except BanProtection:
-        logger.warning("登录新设备后4小时内请不要操作以避免风控")
-    except Exception:
-        logger.error(traceback.format_exc())
-
-
 async def bot_core():
     # 设置工作目录
     script_dir = Path(__file__).resolve().parent
@@ -218,9 +206,9 @@ async def bot_core():
             await asyncio.sleep(5)
             continue
 
-        data = data.get("AddMsgs", None)
+        data = data.get("AddMsgs")
         if data:
             for message in data:
-                asyncio.create_task(handle_message(xybot, message))
+                asyncio.create_task(xybot.process_message(message))
         while time.time() - now < 1:
             pass

utils/xybot.py

@@ -5,6 +5,7 @@
 from loguru import logger
 
 from WechatAPI import WechatAPIClient
+from WechatAPI.Client.protect import protector
 from utils.event_manager import EventManager
 
 
@@ -19,10 +20,13 @@ def __init__(self, bot_client: WechatAPIClient):
         with open("main_config.toml", "rb") as f:
             main_config = tomllib.load(f)
 
+        self.ignore_protection = main_config.get("XYBot", {}).get("ignore-protection", False)
+
         self.ignore_mode = main_config.get("XYBot", {}).get("ignore-mode", "")
         self.whitelist = main_config.get("XYBot", {}).get("whitelist", [])
         self.blacklist = main_config.get("XYBot", {}).get("blacklist", [])
 
+
     def update_profile(self, wxid: str, nickname: str, alias: str, phone: str):
         """更新机器人信息"""
         self.wxid = wxid
@@ -66,7 +70,10 @@ async def process_message(self, message: Dict[str, Any]):
             await self.process_system_message(message)
 
         elif msg_type == 37:  # 好友请求
-            await EventManager.emit("friend_request", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("friend_request", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
         elif msg_type == 51:
             pass
@@ -119,7 +126,10 @@ async def process_text_message(self, message: Dict[str, Any]):
                         message["Content"])
 
             if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-                await EventManager.emit("at_message", self.bot, message)
+                if self.ignore_protection or not protector.check(14400):
+                    await EventManager.emit("at_message", self.bot, message)
+                else:
+                    logger.warning("风控保护: 新设备登录后4小时内请挂机")
             return
 
         logger.info("收到文本消息: 消息ID:{} 来自:{} 发送人:{} @:{} 内容:{}",
@@ -130,7 +140,10 @@ async def process_text_message(self, message: Dict[str, Any]):
                     message["Content"])
 
         if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-            await EventManager.emit("text_message", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("text_message", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
     async def process_image_message(self, message: Dict[str, Any]):
         """处理图片消息"""
@@ -175,7 +188,10 @@ async def process_image_message(self, message: Dict[str, Any]):
             message["Content"] = await self.bot.download_image(aeskey, cdnmidimgurl)
 
         if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-            await EventManager.emit("image_message", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("image_message", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
     async def process_voice_message(self, message: Dict[str, Any]):
         """处理语音消息"""
@@ -225,7 +241,10 @@ async def process_voice_message(self, message: Dict[str, Any]):
             message["Content"] = await self.bot.silk_base64_to_wav_byte(silk_base64)
 
         if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-            await EventManager.emit("voice_message", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("voice_message", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
     async def process_xml_message(self, message: Dict[str, Any]):
         """处理xml消息"""
@@ -364,7 +383,10 @@ async def process_quote_message(self, message: Dict[str, Any]):
                     message["Quote"])
 
         if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-            await EventManager.emit("quote_message", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("quote_message", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
     async def process_video_message(self, message):
         # 预处理消息
@@ -394,7 +416,10 @@ async def process_video_message(self, message):
         message["Video"] = await self.bot.download_video(message["MsgId"])
 
         if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-            await EventManager.emit("video_message", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("video_message", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
     async def process_file_message(self, message: Dict[str, Any]):
         """处理文件消息"""
@@ -419,7 +444,10 @@ async def process_file_message(self, message: Dict[str, Any]):
         message["File"] = await self.bot.download_attach(attach_id)
 
         if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-            await EventManager.emit("file_message", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("file_message", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
     async def process_system_message(self, message: Dict[str, Any]):
         """处理系统消息"""
@@ -480,7 +508,10 @@ async def process_pat_message(self, message: Dict[str, Any]):
                     message["PatSuffix"])
 
         if self.ignore_check(message["FromWxid"], message["SenderWxid"]):
-            await EventManager.emit("pat_message", self.bot, message)
+            if self.ignore_protection or not protector.check(14400):
+                await EventManager.emit("pat_message", self.bot, message)
+            else:
+                logger.warning("风控保护: 新设备登录后4小时内请挂机")
 
     def ignore_check(self, FromWxid: str, SenderWxid: str):
         if self.ignore_mode == "Whitelist":