BUFF自动发货支持多Steam账号发货

Author: jiajiaxd

plugins/BuffAutoAcceptOffer.py

@@ -1,5 +1,6 @@
 import time
 
+import utils.static as static
 from BuffApi import BuffAccount
 from utils.buff_helper import get_valid_session_for_buff
 from utils.logger import PluginLogger, handle_caught_exception
@@ -8,6 +9,7 @@
 
 logger = PluginLogger("BuffAutoAcceptOffer")
 
+
 class BuffAutoAcceptOffer:
     def __init__(self, steam_client, steam_client_mutex, config):
         self.steam_client = steam_client
@@ -30,6 +32,10 @@ def require_buyer_send_offer(self):
         except Exception as e:
             logger.error(f"开启买家发起交易报价功能失败: {str(e)}")
 
+    def get_steam_info(self):
+        steam_info = self.buff_account.get('https://buff.163.com/account/api/steam/info').json()['data']
+        return steam_info
+
     def check_buff_account_state(self):
         try:
             username = self.buff_account.get_user_nickname()
@@ -52,11 +58,8 @@ def format_item_info(self, trade):
 
         for good_id, good_item in trade["goods_infos"].items():
             result += f"发货商品：{good_item['name']}"
-            if trade.get('items_to_trade'):
-                if len(trade["items_to_trade"]) > 1:
-                    result += f" 等{len(trade['items_to_trade'])}个物品"
-            else:
-                result += " (求购报价，数量未知)"
+            if len(trade.get('items_to_trade', [])) > 1:
+                result += f" 等{len(trade['items_to_trade'])}个物品"
 
             if trade["tradeofferid"] in self.order_info:
                 price = float(self.order_info[trade["tradeofferid"]]["price"])
@@ -74,19 +77,28 @@ def exec(self):
 
         try:
             user_info = self.buff_account.get_user_info()
-            if not user_info or "steamid" not in user_info:
-                logger.error("获取BUFF绑定的SteamID失败")
-                exit_code.set(1)
-                return 1
-
-            steamid_buff = user_info["steamid"]
+            steamid_buff = user_info['steamid']
+            logger.info('为了避免访问接口过于频繁，休眠5秒...')
+            time.sleep(5)
+            steam_info = self.get_steam_info()
         except Exception as e:
-            logger.error(f"获取BUFF绑定的SteamID失败: {str(e)}")
+            logger.error(f"获取BUFF用户信息失败！")
+            handle_caught_exception(e, "BuffAutoAcceptOffer")
             exit_code.set(1)
             return 1
 
-        if self.steam_client.get_steam64id_from_cookies() != steamid_buff:
-            logger.error("当前登录账号与BUFF绑定的Steam账号不一致!")
+        to_exit = True
+        if steam_info['max_bind_count'] == 1:
+            if str(static.STEAM_64_ID) == steamid_buff:
+                to_exit = False
+        else:
+            for account in steam_info['items']:
+                if account['steamid'] == str(static.STEAM_64_ID):
+                    logger.info(f'检测到当前已经登录多个Steam账号，只会处理SteamID为{static.STEAM_64_ID}的交易')
+                    to_exit = False
+                    break
+        if to_exit:
+            logger.error(f"当前登录的Steam账号不在BUFF账号绑定列表中，无法进行自动发货！")
             exit_code.set(1)
             return 1
 
@@ -97,7 +109,8 @@ def exec(self):
         else:
             logger.info("当前账号已开启只允许买家发起报价功能")
 
-        ignored_offer = []
+        ignored_offer = {}  # 使用字典记录忽略次数
+        REPROCESS_THRESHOLD = 10  # 定义重新处理的阈值
         interval = self.config["buff_auto_accept_offer"]["interval"]
         dota2_support = self.config["buff_auto_accept_offer"].get("dota2_support", False)
 
@@ -109,7 +122,7 @@ def exec(self):
 
         while True:
             try:
-                logger.info("正在检查BUFF账户登录状态...")
+                logger.info("正在进行BUFF待发货/待收货饰品检查...")
                 username = self.check_buff_account_state()
                 if username == "":
                     logger.info("BUFF账户登录状态失效, 尝试重新登录...")
@@ -118,10 +131,7 @@ def exec(self):
                         logger.error("BUFF账户登录状态失效, 无法自动重新登录!")
                         return
                     self.buff_account = BuffAccount(session)
-                logger.info("为了避免访问接口过于频繁，休眠5秒...")
-                time.sleep(5)
-                
-                logger.info("正在进行BUFF待发货/待收货饰品检查...")
+
                 notification = self.buff_account.get_notification()
 
                 # 处理响应检查是否有错误
@@ -161,8 +171,9 @@ def exec(self):
                                 if trade_offer["tradeofferid"] is not None and trade_offer["tradeofferid"] != "":
                                     self.order_info[trade_offer["tradeofferid"]] = trade_offer
                                     if not any(trade_offer["tradeofferid"] == trade["tradeofferid"] for trade in trades):
-                                        
-                                        for goods_id,goods_info in response_data["goods_infos"].items():
+                                        if str(trade_offer['seller_steamid']) != str(static.STEAM_64_ID):
+                                            continue  # 跳过不是当前账号的报价
+                                        for goods_id, goods_info in response_data["goods_infos"].items():
                                             goods_id = str(goods_id)
                                             trade_offer["goods_id"] = str(trade_offer["goods_id"])
                                             if goods_id == trade_offer["goods_id"]:
@@ -183,24 +194,39 @@ def exec(self):
                         if len(trades) != 0:
                             for i, trade in enumerate(trades):
                                 offer_id = trade["tradeofferid"]
-
                                 logger.info(f"正在处理第 {i+1} 个交易报价 报价ID：{offer_id}")
-                                if offer_id not in ignored_offer:
+
+                                process_this_offer = False  # 标记是否需要处理当前报价
+
+                                if offer_id in ignored_offer:
+                                    ignored_offer[offer_id] += 1  # 增加计数
+                                    if ignored_offer[offer_id] > REPROCESS_THRESHOLD:
+                                        logger.warning(f"报价 {offer_id} 已被忽略 {ignored_offer[offer_id]-1} 次，超过阈值 {REPROCESS_THRESHOLD}，将尝试重新处理")
+                                        del ignored_offer[offer_id]  # 从忽略字典中移除
+                                        process_this_offer = True  # 标记需要处理
+                                    else:
+                                        logger.info(f"该报价已被处理过，跳过")
+                                        process_this_offer = False  # 标记不需要处理
+                                else:
+                                    # 如果不在忽略列表里，标记需要处理
+                                    process_this_offer = True
+
+                                if process_this_offer:
                                     try:
                                         logger.info("正在接受报价...")
                                         desc = self.format_item_info(trade)
                                         if accept_trade_offer(self.steam_client, self.steam_client_mutex, offer_id, desc=desc):
-                                            ignored_offer.append(offer_id)
+                                            ignored_offer[offer_id] = 1  # 成功接受后，加入忽略字典，计数为1
                                             logger.info("接受完成! 已经将此交易报价加入忽略名单!")
+                                        # else: # 可选：处理 accept_trade_offer 返回 False 但未抛出异常的情况
+                                        #     logger.warning(f"尝试接受报价 {offer_id} 失败，但未添加到忽略列表。")
 
                                         if trades.index(trade) != len(trades) - 1:
                                             logger.info("为了避免频繁访问Steam接口, 等待5秒后继续...")
                                             time.sleep(5)
                                     except Exception as e:
                                         logger.error(f"处理交易报价时出错: {str(e)}", exc_info=True)
                                         logger.info("出现错误, 稍后再试!")
-                                else:
-                                    logger.info("该报价已经被处理过, 跳过.")
 
                     except Exception as e:
                         handle_caught_exception(e, "BuffAutoAcceptOffer")