fix(douyu): 修复多 alias 待确认绑定并补充协议文档
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import time
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from typing import TYPE_CHECKING, Any
|
||||
@@ -17,6 +18,7 @@ from .account_binding import (
|
||||
BIND_UNBOUND,
|
||||
SCOPE_ELITE,
|
||||
SCOPE_ESPORTS,
|
||||
binding_pending_decision,
|
||||
binding_snapshot,
|
||||
is_bound_act,
|
||||
is_pending_binding_role,
|
||||
@@ -136,6 +138,7 @@ class BindMixin:
|
||||
baseline_role_name: str = "",
|
||||
baseline_is_bound_act: bool = False,
|
||||
baseline_info: dict | None = None,
|
||||
actionable_aliases: tuple[str, ...] | list[str] = (),
|
||||
) -> bool:
|
||||
"""判断是否出现了可确认的扫码角色。
|
||||
|
||||
@@ -151,6 +154,7 @@ class BindMixin:
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=actionable_aliases,
|
||||
)
|
||||
|
||||
def _bind_snapshot(self, bind_info: dict | None) -> dict:
|
||||
@@ -178,6 +182,75 @@ class BindMixin:
|
||||
f"{pending_text}"
|
||||
)
|
||||
|
||||
def _binding_candidate_decisions(
|
||||
self,
|
||||
candidates: list[dict],
|
||||
*,
|
||||
baseline_role_name: str = "",
|
||||
baseline_is_bound_act: bool = False,
|
||||
baseline_info: dict | None = None,
|
||||
actionable_aliases: list[str] | tuple[str, ...] = (),
|
||||
) -> list[dict[str, Any]]:
|
||||
"""按同一规则解释每个 actAlias 候选,供任务结果和日志复盘。"""
|
||||
return [
|
||||
binding_pending_decision(
|
||||
info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=actionable_aliases,
|
||||
)
|
||||
for info in candidates
|
||||
]
|
||||
|
||||
def _push_binding_decision_log(
|
||||
self,
|
||||
*,
|
||||
task: DouyuTask,
|
||||
stage: str,
|
||||
candidates: list[dict],
|
||||
decisions: list[dict[str, Any]],
|
||||
selected: dict | None,
|
||||
baseline_info: dict | None,
|
||||
actionable_aliases: list[str] | tuple[str, ...],
|
||||
) -> None:
|
||||
"""输出一条可检索的多渠道判定日志,不包含 Cookie 等凭据。"""
|
||||
compact = [
|
||||
{
|
||||
"alias": item.get("alias") or "",
|
||||
"role": item.get("role_name") or "",
|
||||
"bind_act": 1 if item.get("is_bound_act") else 0,
|
||||
"bind_role": 1 if item.get("is_bound_role") else 0,
|
||||
"need_act": 1 if item.get("need_bind_act") else 0,
|
||||
"need_role": 1 if item.get("need_bind_role") else 0,
|
||||
"actionable_alias": bool(item.get("actionable_alias")),
|
||||
"confirmable": bool(item.get("confirmable")),
|
||||
"reason": item.get("reason") or "",
|
||||
}
|
||||
for item in decisions
|
||||
]
|
||||
self._push_log(
|
||||
"info",
|
||||
"绑定多渠道判定 | "
|
||||
+ json.dumps(
|
||||
{
|
||||
"task_id": int(task.id),
|
||||
"stage": stage,
|
||||
"action_aliases": list(actionable_aliases),
|
||||
"baseline_alias": str((baseline_info or {}).get("act_alias") or ""),
|
||||
"baseline_role": str((baseline_info or {}).get("role_name") or ""),
|
||||
"baseline_bind_act": 1
|
||||
if self._is_bound_act(baseline_info)
|
||||
else 0,
|
||||
"selected_alias": str((selected or {}).get("act_alias") or ""),
|
||||
"candidate_count": len(candidates),
|
||||
"candidates": compact,
|
||||
},
|
||||
ensure_ascii=False,
|
||||
separators=(",", ":"),
|
||||
),
|
||||
)
|
||||
|
||||
def _apply_bind_info_to_account(
|
||||
self, account: Account, bind_info: dict, state: str | None = None
|
||||
) -> None:
|
||||
@@ -330,18 +403,24 @@ class BindMixin:
|
||||
extra_prefer_aliases=[primary_alias] if primary_alias else None,
|
||||
)
|
||||
aliases = self._role_alias_priority(config, primary_alias)
|
||||
actionable_aliases = self._action_act_aliases(config)
|
||||
if bound is not None:
|
||||
changed_pending = self._pick_role_info_for_aliases(
|
||||
changed_pending = self._pick_pending_role_info(
|
||||
candidates,
|
||||
aliases,
|
||||
pending_only=True,
|
||||
exclude_role_name=str(bound.get("role_name") or ""),
|
||||
prefer_aliases=aliases,
|
||||
baseline_role_name=str(bound.get("role_name") or ""),
|
||||
baseline_is_bound_act=self._is_bound_act(bound),
|
||||
baseline_info=bound,
|
||||
actionable_aliases=actionable_aliases,
|
||||
)
|
||||
return changed_pending or bound
|
||||
return self._pick_role_info_for_aliases(
|
||||
return self._pick_pending_role_info(
|
||||
candidates,
|
||||
aliases,
|
||||
pending_only=True,
|
||||
prefer_aliases=aliases,
|
||||
baseline_role_name="",
|
||||
baseline_is_bound_act=False,
|
||||
baseline_info=None,
|
||||
actionable_aliases=actionable_aliases,
|
||||
) or self._pick_role_info_for_aliases(candidates, aliases)
|
||||
|
||||
def _pick_bind_info(
|
||||
@@ -353,6 +432,7 @@ class BindMixin:
|
||||
baseline_info: dict | None = None,
|
||||
prefer_pending: bool = True,
|
||||
prefer_aliases: list[str] | None = None,
|
||||
actionable_aliases: list[str] | tuple[str, ...] = (),
|
||||
) -> dict | None:
|
||||
"""从多个 alias 结果里挑最有用的绑定信息。
|
||||
|
||||
@@ -371,6 +451,7 @@ class BindMixin:
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=actionable_aliases,
|
||||
)
|
||||
if pending is not None:
|
||||
return pending
|
||||
@@ -409,6 +490,7 @@ class BindMixin:
|
||||
baseline_role_name: str = "",
|
||||
baseline_is_bound_act: bool = False,
|
||||
baseline_info: dict | None = None,
|
||||
actionable_aliases: list[str] | tuple[str, ...] = (),
|
||||
) -> dict | None:
|
||||
"""唯一的新角色候选选择入口。
|
||||
|
||||
@@ -421,6 +503,7 @@ class BindMixin:
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=actionable_aliases,
|
||||
):
|
||||
return info
|
||||
return None
|
||||
@@ -496,6 +579,11 @@ class BindMixin:
|
||||
result["baseline_role_name"] = baseline_role_name
|
||||
result["baseline_is_bound_act"] = baseline_is_bound_act
|
||||
result["query_act_aliases"] = query_aliases
|
||||
action_aliases = [
|
||||
str(value)
|
||||
for value in (result.get("action_act_aliases") or [])
|
||||
if str(value or "").strip()
|
||||
]
|
||||
self._push_log(
|
||||
"info",
|
||||
"开始轮询绑定角色 "
|
||||
@@ -529,6 +617,7 @@ class BindMixin:
|
||||
baseline_info=baseline_info,
|
||||
prefer_pending=True,
|
||||
prefer_aliases=query_aliases,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
or candidates[0]
|
||||
)
|
||||
@@ -538,6 +627,7 @@ class BindMixin:
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
query_alias = str(bind_info.get("act_alias") or "")
|
||||
summary = (
|
||||
@@ -707,6 +797,7 @@ class BindMixin:
|
||||
baseline_info = result.get("before_bind_info")
|
||||
if not isinstance(baseline_info, dict):
|
||||
baseline_info = None
|
||||
action_aliases = self._action_act_aliases(config)
|
||||
bind_info = (
|
||||
self._pick_bind_info(
|
||||
candidates,
|
||||
@@ -715,21 +806,40 @@ class BindMixin:
|
||||
baseline_info=baseline_info,
|
||||
prefer_pending=True,
|
||||
prefer_aliases=query_aliases,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
or candidates[0]
|
||||
)
|
||||
snapshot = self._bind_snapshot(bind_info)
|
||||
is_pending_role = self._is_pending_role(
|
||||
candidate_decisions = self._binding_candidate_decisions(
|
||||
candidates,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
selected_decision = binding_pending_decision(
|
||||
bind_info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
is_pending_role = bool(selected_decision["confirmable"])
|
||||
query_alias = str(bind_info.get("act_alias") or "")
|
||||
summary = (
|
||||
f"act={query_alias or '-'} "
|
||||
f"{self._format_bind_summary(bind_info, pending=is_pending_role)}"
|
||||
)
|
||||
self._push_binding_decision_log(
|
||||
task=task,
|
||||
stage=f"poll:{int(result.get('poll_count') or 0) + 1}",
|
||||
candidates=candidates,
|
||||
decisions=candidate_decisions,
|
||||
selected=bind_info,
|
||||
baseline_info=baseline_info,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
|
||||
if is_pending_role:
|
||||
task.queue_lane = ""
|
||||
@@ -743,8 +853,12 @@ class BindMixin:
|
||||
"bind_confirmed": False,
|
||||
"bind_phase": "role_ready",
|
||||
"bind_polling": False,
|
||||
"pending_role_name": snapshot["role_name"],
|
||||
"poll_count": int(result.get("poll_count") or 0) + 1,
|
||||
"bind_summary": summary,
|
||||
"action_act_aliases": action_aliases,
|
||||
"bind_decision": selected_decision,
|
||||
"bind_candidate_decisions": candidate_decisions,
|
||||
}
|
||||
)
|
||||
account.updated_at = now
|
||||
@@ -782,6 +896,9 @@ class BindMixin:
|
||||
"bind_polling": True,
|
||||
"poll_count": int(result.get("poll_count") or 0) + 1,
|
||||
"bind_summary": summary,
|
||||
"action_act_aliases": action_aliases,
|
||||
"bind_decision": selected_decision,
|
||||
"bind_candidate_decisions": candidate_decisions,
|
||||
}
|
||||
)
|
||||
self._schedule_next_bind_poll(
|
||||
@@ -804,6 +921,7 @@ class BindMixin:
|
||||
client = self._client(cookie)
|
||||
qr_act_alias = self._bind_qr_act_alias(config)
|
||||
query_aliases = self._query_bind_act_aliases(config)
|
||||
action_aliases = self._action_act_aliases(config)
|
||||
if not qr_act_alias and not query_aliases:
|
||||
self._mark_task(db, task, "failed", "请先配置绑定活动 actAlias")
|
||||
return
|
||||
@@ -826,12 +944,28 @@ class BindMixin:
|
||||
before_candidates,
|
||||
baseline_role_name=str(before.get("role_name") or ""),
|
||||
baseline_is_bound_act=self._is_bound_act(before),
|
||||
baseline_info=before,
|
||||
prefer_pending=True,
|
||||
prefer_aliases=query_aliases,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
or before
|
||||
or before_candidates[0]
|
||||
)
|
||||
candidate_decisions = self._binding_candidate_decisions(
|
||||
before_candidates,
|
||||
baseline_role_name=str(before.get("role_name") or ""),
|
||||
baseline_is_bound_act=self._is_bound_act(before),
|
||||
baseline_info=before,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
pending_decision = binding_pending_decision(
|
||||
pending_before,
|
||||
baseline_role_name=str(before.get("role_name") or ""),
|
||||
baseline_is_bound_act=self._is_bound_act(before),
|
||||
baseline_info=before,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
before_snapshot = self._bind_snapshot(before)
|
||||
cooldown_snapshot = self._bind_snapshot(cooldown_info)
|
||||
current_role_name = before_snapshot["role_name"] or (
|
||||
@@ -848,6 +982,15 @@ class BindMixin:
|
||||
f"pending_hit={pending_before.get('act_alias') or '-'} "
|
||||
f"{self._format_bind_summary(pending_before)}",
|
||||
)
|
||||
self._push_binding_decision_log(
|
||||
task=task,
|
||||
stage="qr_preflight",
|
||||
candidates=before_candidates,
|
||||
decisions=candidate_decisions,
|
||||
selected=pending_before,
|
||||
baseline_info=before,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
|
||||
# 生成二维码前强制检查换绑冷却:冷却中直接失败,绝不发码
|
||||
if self._is_change_cooling(cooldown_info):
|
||||
@@ -931,8 +1074,47 @@ class BindMixin:
|
||||
).isoformat(),
|
||||
"baseline_role_name": current_role_name,
|
||||
"baseline_is_bound_act": before_snapshot["is_bound_act"],
|
||||
"action_act_aliases": action_aliases,
|
||||
"bind_decision": pending_decision,
|
||||
"bind_candidate_decisions": candidate_decisions,
|
||||
"poll_count": 0,
|
||||
}
|
||||
if pending_decision["confirmable"]:
|
||||
pending_snapshot = self._bind_snapshot(pending_before)
|
||||
pending_role = str(pending_snapshot["role_name"] or "")
|
||||
pending_alias = str(pending_before.get("act_alias") or "")
|
||||
pending_summary = (
|
||||
f"act={pending_alias or '-'} "
|
||||
f"{self._format_bind_summary(pending_before, pending=True)}"
|
||||
)
|
||||
result.update(
|
||||
{
|
||||
**pending_snapshot,
|
||||
"act_alias": pending_alias,
|
||||
"query_act_alias": pending_alias,
|
||||
"pending_role_name": pending_role,
|
||||
"bind_ready_for_confirm": True,
|
||||
"bind_confirmed": False,
|
||||
"bind_phase": "role_ready",
|
||||
"bind_polling": False,
|
||||
"bind_summary": pending_summary,
|
||||
}
|
||||
)
|
||||
account.updated_at = qr_generated_at
|
||||
self._push_log(
|
||||
"success",
|
||||
"生成二维码前已发现活动 alias 待确认角色 "
|
||||
f"act={pending_alias or '-'} role={pending_role or '-'} "
|
||||
f"reason={pending_decision['reason']}",
|
||||
)
|
||||
self._mark_task(
|
||||
db,
|
||||
task,
|
||||
"success",
|
||||
f"已识别现有待确认角色: {pending_role},待确认绑定",
|
||||
result,
|
||||
)
|
||||
return
|
||||
account.updated_at = datetime.now(UTC)
|
||||
task.queue_lane = "binding_poll"
|
||||
task.next_run_at = qr_generated_at + timedelta(
|
||||
@@ -955,6 +1137,7 @@ class BindMixin:
|
||||
client = self._client(cookie)
|
||||
confirm_alias = self._confirm_act_alias(config)
|
||||
query_aliases = self._query_bind_act_aliases(config)
|
||||
action_aliases = self._action_act_aliases(config)
|
||||
if confirm_alias and confirm_alias not in query_aliases:
|
||||
query_aliases = [confirm_alias, *query_aliases]
|
||||
if not confirm_alias:
|
||||
@@ -993,6 +1176,22 @@ class BindMixin:
|
||||
)
|
||||
before = before or before_bound or before_candidates[0]
|
||||
before_snapshot = self._bind_snapshot(before)
|
||||
candidate_decisions = self._binding_candidate_decisions(
|
||||
before_candidates,
|
||||
baseline_role_name=str((before_bound or {}).get("role_name") or ""),
|
||||
baseline_is_bound_act=self._is_bound_act(before_bound),
|
||||
baseline_info=before_bound,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
self._push_binding_decision_log(
|
||||
task=task,
|
||||
stage="confirm_precheck",
|
||||
candidates=before_candidates,
|
||||
decisions=candidate_decisions,
|
||||
selected=before,
|
||||
baseline_info=before_bound,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
role_name = before_snapshot["role_name"]
|
||||
query_alias = str(before.get("act_alias") or "")
|
||||
if expected_role_name and role_name.casefold() != expected_role_name.casefold():
|
||||
@@ -1436,6 +1635,17 @@ class BindMixin:
|
||||
role_name = str(role.get("role_name") or "")
|
||||
pending_role = str(role.get("pending_role_name") or "")
|
||||
source_alias = str(role.get("source_alias") or "")
|
||||
action_aliases = self._action_act_aliases(config)
|
||||
raw_candidates = [
|
||||
item for item in (role.get("bind_infos") or []) if isinstance(item, dict)
|
||||
]
|
||||
candidate_decisions = self._binding_candidate_decisions(
|
||||
raw_candidates,
|
||||
baseline_role_name=str(role_name or ""),
|
||||
baseline_is_bound_act=status == ROLE_BOUND,
|
||||
baseline_info=bind_info if isinstance(bind_info, dict) else None,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
summary = (
|
||||
f"act={source_alias or '-'} {self._format_bind_summary(bind_info)}"
|
||||
if bind_info
|
||||
@@ -1448,6 +1658,15 @@ class BindMixin:
|
||||
f"status={status} source={source_alias or '-'} "
|
||||
f"{self._format_bind_summary(bind_info) if bind_info else 'role=- bound_act=-'}",
|
||||
)
|
||||
self._push_binding_decision_log(
|
||||
task=task,
|
||||
stage="query_game_name",
|
||||
candidates=raw_candidates,
|
||||
decisions=candidate_decisions,
|
||||
selected=bind_info,
|
||||
baseline_info=bind_info if isinstance(bind_info, dict) else None,
|
||||
actionable_aliases=action_aliases,
|
||||
)
|
||||
persist_probe_result(
|
||||
db,
|
||||
account,
|
||||
@@ -1483,6 +1702,9 @@ class BindMixin:
|
||||
),
|
||||
"bind_summary": summary,
|
||||
"bind_candidates": role.get("candidates") or [],
|
||||
"action_act_aliases": action_aliases,
|
||||
"bind_decision": role.get("decision") or {},
|
||||
"bind_candidate_decisions": candidate_decisions,
|
||||
"errors": role.get("errors") or [],
|
||||
}
|
||||
if pending_role:
|
||||
|
||||
Reference in New Issue
Block a user