yml2213
18bc7be4b1
在既有「管理员分配 → 客服导入工作台 → 手动选号」之外**新增**一条 「客服选皮肤 + 数量 → 系统分配账号 + 按需补积分 → 用完自动收回」的路径。 旧路径只做并集与可选参数扩展，行为不变（有用例守着）。 - 归属与使用权分离：新增 account_leases（生成列 + 唯一索引，并发抢号由数据库裁决）， assigned_to 收窄为管理员/运营的维护责任；客服可见范围扩为「名下 ∪ 租用中」 - account_pool 服务：候选筛选、两梯队排序（先花快过期的 / 先选充值少的）、 供给与成本预估、租约领取/释放/回收 - 补给链：查余额 → 充鱼翅（单次 ≤800 元，超限拆单）→ 赠精英令 → 兑换； 运行期两道闸门：_skip_when（余额已够就别再花钱）、_depends_on（前置未成功就跳过） - 转人工：鱼翅支付等 10 分钟未到账转 manual_required，租约先不还； account_lease_reaper 兜 TTL 到期 / 漏释放 / 孤儿批次 - 运营流水：业务事件补 actor_id = task.created_by；账号详情页展示操作人、渠道 与租赁记录 - 新工作台：/douyu/pool + 菜单「账号分配台」（新建，不改造旧工作台） - 修复 D1：官方补录的兑换事件漏写 subject_key（10,612 条主键为空）， 会让 365 天同皮肤规则漏判 87% 的历史；补代码 + 回填脚本 - 迁移 20261007_0052；权限 account:pool_use / account:pool_admin 测试：766 passed, 6 skipped（改动前基线 727）；ruff 与 tsc -b 干净。 设计稿与实施记录：docs/设计-账号自动分配与回收.md
209 lines
9.3 KiB
Python
209 lines
9.3 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)}"
|
|
)
|
|
# 补给链的两个运行期闸门（见 `account_pool.build_supply_chain`）：
|
|
# `_depends_on` 前置没成功就别跑，`_skip_when` 条件已满足就别做（省的是钱）。
|
|
# 放在 CK 检测**之前** —— 被跳过的任务不该因为 CK 失效再报一次失败。
|
|
skip_reason = self._dependency_reason(worker_db, task) or self._skip_reason(
|
|
account, task
|
|
)
|
|
if skip_reason:
|
|
self._mark_task(worker_db, task, "skipped", skip_reason)
|
|
self._push_log(
|
|
"info", f"[{current}] {self._account_name(account)} {skip_reason}"
|
|
)
|
|
return
|
|
# 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:
|
|
if getattr(self, "close_db", True):
|
|
self.db.close()
|