`accounts.bind_status` 是个**语义垃圾场**:一个自由文本列,6 个文件、**29 处写入**、
20 多种取值,混了三种东西 —— 真状态(`bind_confirmed`)、动作痕迹(`goods_locked`)、
纯查询痕迹(`points_queried`)。它是**覆盖式**的,所以 `bind_confirmed` 会被之后
任意一次查询盖掉 —— 「这个账号到底绑没绑」根本查不出来。
`esports_bind_status` / `xpd_bind_status` 是同一个病。
## 收敛成四值 + 三列一义
`unknown` / `unbound` / `pending` / `bound`,每个作用域一列:
| 列 | 作用域 |
| --- | --- |
| `accounts.role_bind_status`(**新增**) | 精英宝典角色 |
| `accounts.esports_bind_status`(收敛) | 电竞手册角色 |
| `accounts.xpd_bind_status`(收敛) | 和平小店角色 |
- 新增 `services/account_binding.py`:唯一写入口 `set_bind_status()`,
传旧自由文本直接 `ValueError`(否则垃圾会被写回去);`map_legacy_bind_status()` 负责旧值映射。
- **29 处自由文本写入全部删除或改走枚举**:真状态走枚举,动作/查询痕迹**不再写状态列**
(动作已由 S5 的直发事件记录,查询痕迹本来就不该是状态)。
- `accounts.bind_status` 保留原值便于比对,**已无任何写入方**,待 S8 drop。
- 一条**源码扫描用例**禁止任何地方再出现 `account.bind_status = "..."` 这类写入。
## 回填不猜(设计文档 §5.5)
只映射**明确陈述了绑定关系**的取值(`bind_confirmed`/`esports_bound`/`xpd_bound` → bound,
`*_qr_*`/`*_ready` → pending,`game_not_bound`/`xpd_not_bound` → unbound),
**其余一律 unknown**。因为列是覆盖式的,「最后一件事是查询」并不代表没绑定。
迁移 SQL 与 Python 映射有一致性用例:**解析迁移源码里的 CASE 逐条比对**
(已反向验证:故意改错一条映射,用例立刻红)。
## ⚠️ 顺带救回一个差点被我自己丢掉的状态
「**电竞手册是否已开通**」以前**只寄生在 `esports_bind_status` 的 `esports_opened`
取值里**(`elite_opened` 有独立布尔列,电竞没有)。归一化会把那个取值抹成 `unknown`
→ **静默丢状态**。所以:
- 新增 `accounts.esports_opened` 布尔列(与 `elite_opened` 对称),开通任务成功时置位;
- 迁移里**必须先 `save_esports_opened()` 再归一化**,顺序用例钉住;
- 详情页「电竞手册」开通状态改读 `esports_opened`。
## 前端不再从任务日志反推账号状态
工作台原来从**当前加载的那一页任务**里挑每个账号最新的一条来推绑定状态
(`latestConfirmBindTaskByAccount` 等)。两个问题:① 支撑任务一旦翻出窗口,
**显示的状态就是错的**;② 这让任务日志变成「账号状态库」,于是它永远不敢清理。
现在状态读账号字段,任务日志只补「扫码流程中的瞬时信息」(如确认前的
`pending_role_name`)。删掉了两个不再需要的派生与对应的 `clearPending` 绕行逻辑。
## 踩到并修掉的东西
- **模型与迁移不一致**:我把模型收窄成 `String(16)`,迁移却留着 `String(32)` ——
测试库按模型建、生产按迁移建,两边列宽不同。已让迁移也收窄,且**收窄必须在
归一化之后**(旧取值最长 19 字符,先收窄会截断成废值)。downgrade 也补齐了反向操作,
已实测 `downgrade -1 && upgrade head` 干净。
- **parity 用例第一版是抄了一份 SQL**(迁移改了用例也不会红,等于没测)——
改成解析迁移源码;后来又因为列已收窄、19 字符的旧值塞不进测试库,
干脆改成源码级解析比对(不造数据)。
## 验证
- `TZ=Asia/Shanghai`:**490 passed / 6 skipped**(S5 后 450 → 净增 40)
- `TZ=UTC`(相关文件)106 passed;迁移链 3 passed;ruff 全绿
- 前端 `tsc -b && vite build` 通过、`npm run lint` **0 errors**
- 真实开发库:迁移重放后三列均为 `varchar(16) NOT NULL DEFAULT 'unknown'`;
12 个账号的旧值 `elite_status_queried`(纯查询痕迹)→ **unknown**(没有猜成 bound)
未做(后续):S6 的**账号页重构**(列表关键列 / 生命周期主页)保留;
`bind_status` 旧列待 S8 drop;保留策略里「状态派生类查询」现在技术上可下探到 7 天档,
保守起见留待确认(影响的是在用页面显示,不是历史)。
341 lines
13 KiB
Python
341 lines
13 KiB
Python
"""斗鱼任务执行器:送礼(由 douyu_runner.py 按功能域拆分)。"""
|
||
|
||
from __future__ import annotations
|
||
|
||
from datetime import UTC, datetime
|
||
from typing import TYPE_CHECKING, Any
|
||
|
||
from sqlalchemy.orm import Session
|
||
|
||
from core.douyu import DouyuActivityClient
|
||
|
||
from ..models import Account, DouyuTask
|
||
from .business_events import record_points_credit
|
||
|
||
DOUYU_GIFT_POINTS_REFRESH_TIMES = 3
|
||
DOUYU_GIFT_POINTS_REFRESH_INTERVAL = 2
|
||
|
||
|
||
class DonateMixin:
|
||
"""送礼域:精英令/电竞任务礼物赠送与积分确认。"""
|
||
|
||
if TYPE_CHECKING:
|
||
_stop: Any
|
||
|
||
def _client(self, cookie: str) -> DouyuActivityClient: ...
|
||
def _task_payload(self, task: DouyuTask) -> dict: ...
|
||
def _push_log(self, level: str, message: str) -> None: ...
|
||
def _mark_task(self, *args: Any, **kwargs: Any) -> None: ...
|
||
def _update_task_progress(self, *args: Any, **kwargs: Any) -> None: ...
|
||
def _refresh_account_points(
|
||
self,
|
||
client: DouyuActivityClient,
|
||
account: Account,
|
||
cookie: str,
|
||
*,
|
||
ctn: str | None = None,
|
||
) -> dict: ...
|
||
def _refresh_account_gold_balance(
|
||
self, client: DouyuActivityClient, account: Account
|
||
) -> dict: ...
|
||
def _refresh_esports_handbook(
|
||
self, client: DouyuActivityClient, account: Account, *, manual_id: str
|
||
) -> dict: ...
|
||
|
||
def _refresh_points_after_elite_gift(
|
||
self,
|
||
db: Session,
|
||
task: DouyuTask,
|
||
account: Account,
|
||
client: DouyuActivityClient,
|
||
cookie: str,
|
||
ctn: str | None,
|
||
result: dict,
|
||
baseline_points: int | None,
|
||
gift_count: int,
|
||
) -> dict:
|
||
"""赠送精英令后短轮询积分;1 个精英令约等于 10 积分。"""
|
||
expected_gain = max(0, gift_count) * 10
|
||
target_points = (
|
||
baseline_points + expected_gain if baseline_points is not None else None
|
||
)
|
||
result["gift_points_baseline"] = baseline_points
|
||
result["gift_points_expected_gain"] = expected_gain
|
||
result["gift_points_target"] = target_points
|
||
|
||
last_points = None
|
||
refresh_result: dict = {}
|
||
for index in range(1, DOUYU_GIFT_POINTS_REFRESH_TIMES + 1):
|
||
refresh_result = self._refresh_account_points(
|
||
client, account, cookie, ctn=ctn
|
||
)
|
||
db.commit()
|
||
last_points = refresh_result["points"]
|
||
result.update(refresh_result)
|
||
result["gift_points_refresh_count"] = index
|
||
if target_points is None or (
|
||
last_points is not None and last_points >= target_points
|
||
):
|
||
result["gift_points_confirmed"] = (
|
||
target_points is None or last_points is not None
|
||
)
|
||
return refresh_result
|
||
if index < DOUYU_GIFT_POINTS_REFRESH_TIMES:
|
||
self._update_task_progress(
|
||
db,
|
||
task,
|
||
"running",
|
||
f"赠送精英令成功,等待积分同步(当前 {last_points if last_points is not None else '-'},预期 {target_points})",
|
||
result,
|
||
)
|
||
if self._stop.wait(DOUYU_GIFT_POINTS_REFRESH_INTERVAL):
|
||
break
|
||
|
||
result["gift_points_confirmed"] = False
|
||
result["points"] = last_points
|
||
return refresh_result
|
||
|
||
def _execute_donate_esports_gift(
|
||
self,
|
||
db: Session,
|
||
task: DouyuTask,
|
||
account: Account,
|
||
cookie: str,
|
||
config: dict,
|
||
*,
|
||
gift_name: str,
|
||
config_gift_id_key: str,
|
||
config_skin_id_key: str,
|
||
):
|
||
"""赠送电竞手册任务礼物并刷新独立积分。"""
|
||
payload = self._task_payload(task)
|
||
try:
|
||
gift_count = max(
|
||
1, int(payload.get("gift_count") or payload.get("count") or 1)
|
||
)
|
||
except (TypeError, ValueError):
|
||
self._mark_task(db, task, "failed", "赠送数量必须是正整数")
|
||
return
|
||
|
||
manual_id = str(config.get("esports_manual_id") or "").strip()
|
||
gift_id = str(
|
||
payload.get("gift_id") or config.get(config_gift_id_key) or ""
|
||
).strip()
|
||
skin_id = str(
|
||
payload.get("skin_id") or config.get(config_skin_id_key) or ""
|
||
).strip()
|
||
room_id = str(payload.get("room_id") or config.get("room_id") or "").strip()
|
||
if not manual_id or not gift_id or not skin_id or not room_id:
|
||
self._mark_task(db, task, "failed", "请先完整配置电竞手册、房间和礼物参数")
|
||
return
|
||
|
||
client = self._client(cookie)
|
||
baseline_points = account.esports_points
|
||
try:
|
||
baseline = self._refresh_esports_handbook(
|
||
client, account, manual_id=manual_id
|
||
)
|
||
baseline_points = baseline["esports_points"]
|
||
db.commit()
|
||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||
self._push_log("warning", f"赠送{gift_name}前刷新电竞积分失败: {exc}")
|
||
|
||
result = client.donate_esports_gift(
|
||
gift_name=gift_name,
|
||
gift_count=gift_count,
|
||
room_id=room_id,
|
||
gift_id=gift_id,
|
||
skin_id=skin_id,
|
||
)
|
||
result.update(
|
||
{
|
||
"gift_name": gift_name,
|
||
"gift_id": gift_id,
|
||
"skin_id": skin_id,
|
||
"gift_count": gift_count,
|
||
"esports_points_baseline": baseline_points,
|
||
}
|
||
)
|
||
refresh_errors = []
|
||
try:
|
||
result.update(self._refresh_account_gold_balance(client, account))
|
||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||
refresh_errors.append(f"鱼翅余额: {exc}")
|
||
try:
|
||
points_result = self._refresh_esports_handbook(
|
||
client, account, manual_id=manual_id
|
||
)
|
||
result.update(points_result)
|
||
result["esports_points_after_gift"] = points_result["esports_points"]
|
||
result["esports_points_changed"] = (
|
||
baseline_points is not None
|
||
and points_result["esports_points"] is not None
|
||
and points_result["esports_points"] != baseline_points
|
||
)
|
||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||
refresh_errors.append(f"电竞积分: {exc}")
|
||
if refresh_errors:
|
||
result["refresh_errors"] = refresh_errors
|
||
|
||
account.updated_at = datetime.now(UTC)
|
||
confirmed = bool(result.get("esports_points_changed"))
|
||
message = f"赠送{gift_name}成功: {gift_count}"
|
||
if account.gold_balance is not None:
|
||
message += f",鱼翅余额: {account.gold_balance}"
|
||
if account.esports_points is not None:
|
||
message += f",电竞积分: {account.esports_points}"
|
||
# 电竞礼物同样产生积分到账 —— 这一类此前**从来不在收集范围**
|
||
# (不在 COLLECTED_TASK_TYPES 里),时间线上一直是空白。
|
||
record_points_credit(
|
||
db,
|
||
account,
|
||
task_id=task.id,
|
||
gain=_esports_gift_points(result, baseline_points),
|
||
points_after=account.esports_points,
|
||
confirmed=confirmed,
|
||
source_label=gift_name,
|
||
)
|
||
self._mark_task(db, task, "success", message, result)
|
||
|
||
def _execute_donate_esports_chicken_gift(
|
||
self,
|
||
db: Session,
|
||
task: DouyuTask,
|
||
account: Account,
|
||
cookie: str,
|
||
config: dict,
|
||
):
|
||
"""赠送冠军鸡腿。"""
|
||
self._execute_donate_esports_gift(
|
||
db,
|
||
task,
|
||
account,
|
||
cookie,
|
||
config,
|
||
gift_name="冠军鸡腿",
|
||
config_gift_id_key="esports_chicken_gift_id",
|
||
config_skin_id_key="esports_chicken_skin_id",
|
||
)
|
||
|
||
def _execute_donate_esports_firework_gift(
|
||
self,
|
||
db: Session,
|
||
task: DouyuTask,
|
||
account: Account,
|
||
cookie: str,
|
||
config: dict,
|
||
):
|
||
"""赠送冠军烟花。"""
|
||
self._execute_donate_esports_gift(
|
||
db,
|
||
task,
|
||
account,
|
||
cookie,
|
||
config,
|
||
gift_name="冠军烟花",
|
||
config_gift_id_key="esports_firework_gift_id",
|
||
config_skin_id_key="esports_firework_skin_id",
|
||
)
|
||
|
||
def _execute_donate_elite_gift(
|
||
self, db: Session, task: DouyuTask, account: Account, cookie: str, config: dict
|
||
):
|
||
payload = self._task_payload(task)
|
||
gift_count = int(payload.get("gift_count") or payload.get("count") or 1)
|
||
client = self._client(cookie)
|
||
ctn = None
|
||
baseline_points = account.points
|
||
try:
|
||
ctn = client.acf_ccn(refresh_subscribe=False)
|
||
baseline_result = self._refresh_account_points(
|
||
client, account, cookie, ctn=ctn
|
||
)
|
||
db.commit()
|
||
baseline_points = baseline_result["points"]
|
||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||
self._push_log("warning", f"赠送精英令前刷新积分失败: {exc}")
|
||
result = client.donate_elite_gift(
|
||
gift_count=gift_count,
|
||
room_id=str(payload.get("room_id") or config["room_id"]),
|
||
gift_id=str(payload.get("gift_id") or config["gift_id"]),
|
||
skin_id=str(payload.get("skin_id") or config["skin_id"]),
|
||
)
|
||
result["gift_points_baseline"] = baseline_points
|
||
refresh_errors = []
|
||
try:
|
||
result.update(self._refresh_account_gold_balance(client, account))
|
||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||
refresh_errors.append(f"鱼翅余额: {exc}")
|
||
try:
|
||
result.update(
|
||
self._refresh_points_after_elite_gift(
|
||
db,
|
||
task,
|
||
account,
|
||
client,
|
||
cookie,
|
||
ctn,
|
||
result,
|
||
baseline_points,
|
||
gift_count,
|
||
)
|
||
)
|
||
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
|
||
refresh_errors.append(f"积分: {exc}")
|
||
if refresh_errors:
|
||
result["refresh_errors"] = refresh_errors
|
||
account.updated_at = datetime.now(UTC)
|
||
message = f"赠送精英令成功: {gift_count}"
|
||
if account.gold_balance is not None:
|
||
message += f",鱼翅余额: {account.gold_balance}"
|
||
confirmed = bool(result.get("gift_points_confirmed"))
|
||
if account.points is not None:
|
||
message += f",积分: {account.points}"
|
||
if result.get("gift_points_target") is not None and not confirmed:
|
||
message += f"(未确认涨到 {result['gift_points_target']})"
|
||
# 积分到账是业务事实。**未确认也记,但把 confirmed 明确写进 detail** ——
|
||
# 旧收集器把「预期涨幅」当既成事实写进台账(未确认时也记 +980),
|
||
# 那是把预期记成到账。这里宁可标清楚,也不假装它是确认过的数字。
|
||
# 金额用本地可等价重算的值(1 个精英令 ≈ 10 分),不再依赖 result 里的字段。
|
||
record_points_credit(
|
||
db,
|
||
account,
|
||
task_id=task.id,
|
||
gain=max(0, gift_count) * 10,
|
||
points_after=account.points,
|
||
expire_at=_points_expire_at(result),
|
||
confirmed=confirmed,
|
||
source_label="精英令",
|
||
)
|
||
self._mark_task(db, task, "success", message, result)
|
||
|
||
|
||
def _points_expire_at(result: dict) -> object:
|
||
"""从积分查询结果里取出到期时间(同样是为了给时间线留全信息)。
|
||
|
||
旧收集器走的是 `result["points_query"]["raw"]["data"]["willExpireTime"]` 这条
|
||
「猜出来」的路径;这里收敛成一个具名函数,只有它知道那段结构。
|
||
"""
|
||
query = result.get("points_query")
|
||
if not isinstance(query, dict):
|
||
return None
|
||
raw = query.get("raw")
|
||
data = raw.get("data") if isinstance(raw, dict) else None
|
||
return data.get("willExpireTime") if isinstance(data, dict) else None
|
||
|
||
|
||
def _esports_gift_points(result: dict, baseline_points: int | None) -> int | None:
|
||
"""电竞礼物带来的积分增量。
|
||
|
||
以**实际观测到的积分变化**为准(`esports_points_after_gift` - 基线),
|
||
而不是像旧收集器那样去读一个「预期涨幅」。观测不到就返回 None ——
|
||
金额宁可空着,也不要写一个猜出来的数字进台账。
|
||
"""
|
||
after = result.get("esports_points_after_gift")
|
||
if not isinstance(after, (int, float)) or not isinstance(
|
||
baseline_points, (int, float)
|
||
):
|
||
return None
|
||
delta = int(after) - int(baseline_points)
|
||
return delta if delta > 0 else None
|