yml2213
d285196287
按 `docs/设计-账号一键查询.md` 实现。异步任务、支持批量（后端每账号一条任务）。 ## 功能 - 新任务类型 `query_account_overview`：**只读**聚合查询，不改账号状态、不发事件 （纯查询不是「事实」，按既有设计例行查询不进时间线，否则会刷屏） - 一次拉全：鱼翅 / 钱包兑换余额 / 积分（含到期）/ 精英宝典 / 电竞手册 / **官方兑换记录** / 限兑商品，并**重点标出「兔兔白日梦」「狂战萌兔」是否已获得** - **单项失败不整体失败**：账号没绑电竞手册是常态，失败只写进 `errors` 并在 UI **如实展示** —— 避免「没查到」被读成「没有」 - 批量：`create_douyu_planned_tasks` 本来就是每账号一条任务，前端加「批量一键查询」 - 前端：详情页一键查询卡片 + 结果面板（两个套装单独高亮）；任务页结果自动弹面板； 三个工作台的快捷操作/类型集合都加了 ## ⚠️ 修正：判定「是否已获得」用错了依据 设计文档第一版说「`storeStatus == 0` → 已拥有」，依据是 「账号 558（兑换过）count=0，账号 15407（没兑换）count=96982」。 **这是错的。** 那两条记录分别取自 **2026-08-01** 和 **2026-10-04**，相隔两个月 —— 我把**时间差异**当成了**账号差异**。 **同一时刻**同时查 558 / 607（都兑换过）和 15507（没有）， 商品项的**所有字段完全一致**，`preExchange.isExists` 也都是 0； `count` 的取值分布是 0/98746/103350/109832…，**随时间变化 = 全局库存**。 用它判「这个账号有没有」必然给错结论 —— 而对高价值资产给错结论是本功能最不能接受的。 **正确依据：`exchange_records(manual_id)`**（斗鱼官方的**账号级**兑换记录）。 真实斗鱼实测： | 账号 | 官方兑换记录 | 判定 | | --- | --- | --- | | 558 | 破片手榴弹-兔兔白日梦 | **已获得 ✅** | | 607 | 破片手榴弹-兔兔白日梦 | **已获得 ✅** | | 15507 | （0 条） | 未获得 ✅ | 同时刻三者看到的兔兔白日梦库存**都是 96956**（全局），兑换记录却区分得干干净净。 顺带发现：同一件东西有多个商品名（`套装-兔兔白日梦`、`破片手榴弹-兔兔白日梦`）， 所以按**核心词子串**匹配整个名字家族。 商品列表的 `score`/`count`/活动时间仍展示，但明确是**全局**信息 （「现在还能不能换、要多少分」），与「该账号是否已获得」分开。 ## 测试 `tests/test_account_overview.py` 22 条，含**回归用例**： `test_global_stock_never_implies_owned`（全局售罄不能推出账号拥有）—— 正是第一版踩的坑。另有失败隔离、只读性（不发事件/不改状态）、 批量每账号一条任务、`missing` 不被静默丢弃。 ## 验证 - `TZ=Asia/Shanghai` **574 passed / 6 skipped**；`TZ=UTC` 27 passed - ruff 全绿；前端 build 通过、lint 0 errors - **真实斗鱼端到端**：三个账号各跑一次真查询，8 项全部成功（`errors: []`）， 已获得/未获得判定全部正确
196 lines
8.5 KiB
Python
196 lines
8.5 KiB
Python
"""斗鱼活动任务批次执行器（入口聚合；功能域已拆分到 douyu_runner_*.py）。"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
|
|
|
from sqlalchemy.orm import joinedload
|
|
|
|
from core.douyu import DouyuActivityError
|
|
|
|
from ..database import SessionLocal
|
|
from ..models import DouyuTask
|
|
from .account_lifecycle import on_ck_verdict
|
|
from .cookie_check_service import check_douyu_cookie
|
|
from .douyu_runner_bind import BindMixin
|
|
from .douyu_runner_core import ( # noqa: F401 (douyu_batch_registry 供 routers 重导出)
|
|
DouyuBatchRunnerCore,
|
|
douyu_batch_registry,
|
|
)
|
|
from .douyu_runner_donate import DonateMixin
|
|
from .douyu_runner_gold import GoldMixin
|
|
from .douyu_runner_goods import GoodsMixin
|
|
from .douyu_runner_manual import ManualMixin
|
|
from .douyu_runner_overview import OverviewMixin
|
|
from .douyu_runner_xpd import XpdMixin
|
|
from .douyu_service import update_account_profile_from_cookie
|
|
|
|
|
|
class DouyuBatchRunner(
|
|
DouyuBatchRunnerCore,
|
|
BindMixin,
|
|
ManualMixin,
|
|
OverviewMixin,
|
|
GoldMixin,
|
|
DonateMixin,
|
|
GoodsMixin,
|
|
XpdMixin,
|
|
):
|
|
"""批量执行斗鱼活动任务（功能域 Mixin 聚合 + 批次调度）。"""
|
|
|
|
def _execute_one(self, task_id: int, config: dict, total: int):
|
|
worker_db = SessionLocal()
|
|
try:
|
|
task = (
|
|
worker_db.query(DouyuTask)
|
|
.options(joinedload(DouyuTask.account))
|
|
.filter(DouyuTask.id == task_id)
|
|
.first()
|
|
)
|
|
if not task or self._stop.is_set():
|
|
return
|
|
account = task.account
|
|
self._update_task_progress(worker_db, task, "running", "执行中")
|
|
|
|
with self._counter_lock:
|
|
self._started += 1
|
|
current = self._started
|
|
|
|
self._push_log(
|
|
"info", f"[{current}/{total}] 开始: {self._account_name(account)}"
|
|
)
|
|
# CK 与健康状态都挂在账号上（2026-10-04 CK 解耦）。
|
|
cookie = account.cookie or ""
|
|
if not cookie:
|
|
self._mark_task(worker_db, task, "failed", "账号没有可用登录 Cookie")
|
|
self._push_log(
|
|
"warning", f"[{current}] {self._account_name(account)} 无 Cookie"
|
|
)
|
|
return
|
|
|
|
cookie_check = check_douyu_cookie(cookie)
|
|
# 执行前的这次检测同样要写结论、由好变坏记事件、重算状态。
|
|
on_ck_verdict(
|
|
worker_db,
|
|
account,
|
|
"valid" if cookie_check["valid"] else "invalid",
|
|
detail=cookie_check,
|
|
occurred_at=cookie_check["checked_at"],
|
|
)
|
|
worker_db.commit()
|
|
if not cookie_check["valid"]:
|
|
message = f"Cookie 已失效，请重新登录：{cookie_check['message']}"
|
|
self._mark_task(worker_db, task, "failed", message)
|
|
self._push_log(
|
|
"warning", f"[{current}] {self._account_name(account)} {message}"
|
|
)
|
|
return
|
|
|
|
update_account_profile_from_cookie(account, cookie)
|
|
|
|
handler = {
|
|
"refresh_goods": self._execute_refresh_goods,
|
|
"refresh_esports_goods": self._execute_refresh_esports_goods,
|
|
"get_bind_qr": self._execute_get_bind_qr,
|
|
"confirm_bind": self._execute_confirm_bind,
|
|
"create_elite_qr": self._execute_create_elite_qr,
|
|
"query_elite_status": self._execute_query_elite_status,
|
|
"prepare_esports_bind": self._execute_prepare_esports_bind,
|
|
"get_esports_bind_qr": self._execute_get_esports_bind_qr,
|
|
"query_esports_game_name": self._execute_query_esports_game_name,
|
|
"confirm_esports_bind": self._execute_confirm_esports_bind,
|
|
"create_esports_qr": self._execute_create_esports_qr,
|
|
"query_esports_points": self._execute_query_esports_points,
|
|
"donate_esports_chicken_gift": self._execute_donate_esports_chicken_gift,
|
|
"donate_esports_firework_gift": self._execute_donate_esports_firework_gift,
|
|
"create_gold_qr": self._execute_create_gold_qr,
|
|
"donate_elite_gift": self._execute_donate_elite_gift,
|
|
"query_points": self._execute_query_points,
|
|
"lock_goods": self._execute_lock_goods,
|
|
"pay_locked_order": self._execute_pay_locked_order,
|
|
"exchange_goods": self._execute_exchange_goods,
|
|
"exchange_esports_goods": self._execute_exchange_esports_goods,
|
|
"query_game_name": self._execute_query_game_name,
|
|
"query_change_bind_time": self._execute_query_change_bind_time,
|
|
"query_limited_goods": self._execute_query_limited_goods,
|
|
"query_account_overview": self._execute_query_account_overview,
|
|
"query_gold_balance": self._execute_query_gold_balance,
|
|
"query_exchange_records": self._execute_query_exchange_records,
|
|
"prefetch_csrf_token": self._execute_prefetch_csrf_token,
|
|
"get_xpd_bind_qr": self._execute_get_xpd_bind_qr,
|
|
"query_xpd_bind_info": self._execute_query_xpd_bind_info,
|
|
"confirm_xpd_bind": self._execute_confirm_xpd_bind,
|
|
"query_xpd_role": self._execute_query_xpd_role,
|
|
"refresh_xpd_goods": self._execute_refresh_xpd_goods,
|
|
"query_xpd_balance": self._execute_query_xpd_balance,
|
|
"query_xpd_fragments": self._execute_query_xpd_fragments,
|
|
"query_xpd_purchase_records": self._execute_query_xpd_purchase_records,
|
|
"exchange_xpd_goods": self._execute_exchange_xpd_goods,
|
|
}.get(task.task_type)
|
|
if handler is None:
|
|
self._mark_task(worker_db, task, "failed", "不支持的任务类型")
|
|
return
|
|
|
|
handler(worker_db, task, account, cookie, config)
|
|
self._push_log(
|
|
"success", f"[{current}] {self._account_name(account)} {task.message}"
|
|
)
|
|
except DouyuActivityError as exc:
|
|
if "task" in locals() and task:
|
|
self._mark_task(worker_db, task, "failed", str(exc))
|
|
self._push_log("warning", f"斗鱼任务失败: {exc}")
|
|
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
|
if "task" in locals() and task:
|
|
self._mark_task(worker_db, task, "error", str(exc))
|
|
self._push_log("error", f"斗鱼任务异常: {exc}")
|
|
finally:
|
|
worker_db.close()
|
|
|
|
def run(self):
|
|
"""执行批次任务。"""
|
|
self._push_log("info", f"斗鱼任务批次 {self.batch_id} 开始")
|
|
try:
|
|
config = self._config_info(self.db)
|
|
tasks = (
|
|
self.db.query(DouyuTask)
|
|
.filter(
|
|
DouyuTask.batch_id == self.batch_id, DouyuTask.status == "planned"
|
|
)
|
|
.order_by(DouyuTask.id.asc())
|
|
.all()
|
|
)
|
|
if not tasks:
|
|
self._push_log("warning", "没有可执行的斗鱼任务")
|
|
self._push_log("result", "")
|
|
return
|
|
|
|
for task in tasks:
|
|
task.status = "pending"
|
|
task.message = "等待执行"
|
|
self.db.commit()
|
|
for task in tasks:
|
|
self._push_task_event(task)
|
|
|
|
total = len(tasks)
|
|
with ThreadPoolExecutor(max_workers=self.concurrency) as executor:
|
|
futures = []
|
|
for task in tasks:
|
|
if self._stop.is_set():
|
|
break
|
|
futures.append(
|
|
executor.submit(self._execute_one, task.id, config, total)
|
|
)
|
|
for future in as_completed(futures):
|
|
try:
|
|
future.result()
|
|
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
|
self._push_log("error", f"Worker 异常: {exc}")
|
|
|
|
if self._stop.is_set():
|
|
self._push_log("warning", f"斗鱼任务批次 {self.batch_id} 已停止")
|
|
else:
|
|
self._push_log("info", f"斗鱼任务批次 {self.batch_id} 完成")
|
|
self._push_log("result", "")
|
|
finally:
|
|
self.db.close()
|