refactor(binding): 收口斗鱼角色状态判定
This commit is contained in:
@@ -359,6 +359,30 @@ class BindMixin:
|
||||
if not candidates:
|
||||
return None
|
||||
|
||||
ordered = self._ordered_bind_candidates(candidates, prefer_aliases)
|
||||
|
||||
if prefer_pending:
|
||||
pending = self._pick_pending_role_info(
|
||||
ordered,
|
||||
prefer_aliases=prefer_aliases,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
)
|
||||
if pending is not None:
|
||||
return pending
|
||||
for info in ordered:
|
||||
if str(info.get("role_name") or "").strip():
|
||||
return info
|
||||
return ordered[0]
|
||||
|
||||
@staticmethod
|
||||
def _ordered_bind_candidates(
|
||||
candidates: list[dict],
|
||||
prefer_aliases: list[str] | None,
|
||||
) -> list[dict]:
|
||||
"""按业务 alias 优先级稳定排序,供所有角色候选选择复用。"""
|
||||
|
||||
def _alias_rank(info: dict) -> int:
|
||||
alias = str(info.get("act_alias") or "")
|
||||
if not prefer_aliases:
|
||||
@@ -369,23 +393,34 @@ class BindMixin:
|
||||
return len(prefer_aliases) + 1
|
||||
|
||||
ranked = sorted(
|
||||
enumerate(candidates), key=lambda item: (_alias_rank(item[1]), item[0])
|
||||
enumerate(candidates),
|
||||
key=lambda item: (_alias_rank(item[1]), item[0]),
|
||||
)
|
||||
ordered = [item[1] for item in ranked]
|
||||
return [item[1] for item in ranked]
|
||||
|
||||
if prefer_pending:
|
||||
for info in ordered:
|
||||
if self._is_pending_role(
|
||||
info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
):
|
||||
return info
|
||||
for info in ordered:
|
||||
if str(info.get("role_name") or "").strip():
|
||||
def _pick_pending_role_info(
|
||||
self,
|
||||
candidates: list[dict],
|
||||
*,
|
||||
prefer_aliases: list[str] | None,
|
||||
baseline_role_name: str = "",
|
||||
baseline_is_bound_act: bool = False,
|
||||
baseline_info: dict | None = None,
|
||||
) -> dict | None:
|
||||
"""唯一的新角色候选选择入口。
|
||||
|
||||
“是否 pending”只调用 ``_is_pending_role``;二维码轮询、查询角色和换绑
|
||||
时间查询都从这里选候选,避免各自用角色名或 bindRole 再写一套判断。
|
||||
"""
|
||||
for info in self._ordered_bind_candidates(candidates, prefer_aliases):
|
||||
if self._is_pending_role(
|
||||
info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
):
|
||||
return info
|
||||
return ordered[0]
|
||||
return None
|
||||
|
||||
def _pick_current_bound_info(
|
||||
self,
|
||||
@@ -1246,24 +1281,18 @@ class BindMixin:
|
||||
# 1) 优先“已生效绑定”角色(bound_act=1 且有角色名,通常是活动 alias)。
|
||||
# 避免把扫码后未确认的新角色当成当前绑定结果。
|
||||
bound_info = self._pick_current_bound_info(candidates, config)
|
||||
# 2) 待确认角色(cjm 扫码后未确认;无已绑定时也用于首次绑定展示)
|
||||
pending_info = (
|
||||
self._pick_role_info_for_aliases(
|
||||
candidates,
|
||||
self._role_alias_priority(config),
|
||||
pending_only=True,
|
||||
)
|
||||
or self._pick_role_info_for_aliases(
|
||||
candidates,
|
||||
self._role_alias_priority(config),
|
||||
)
|
||||
or candidates[0]
|
||||
# 2) 待确认角色统一交给共享状态机判断。cjm 中与当前绑定同名的残留
|
||||
# 不算 pending;同名但活动状态发生 needBindAct 转换才算 pending。
|
||||
pending_info = self._pick_pending_role_info(
|
||||
candidates,
|
||||
prefer_aliases=self._role_alias_priority(config),
|
||||
baseline_role_name=str((bound_info or {}).get("role_name") or ""),
|
||||
baseline_is_bound_act=self._is_bound_act(bound_info),
|
||||
baseline_info=bound_info,
|
||||
)
|
||||
pending_role = str(pending_info.get("role_name") or "").strip()
|
||||
pending_role = str((pending_info or {}).get("role_name") or "").strip()
|
||||
bound_role = str(bound_info.get("role_name") or "") if bound_info else ""
|
||||
has_pending = bool(pending_role) and (
|
||||
pending_role != bound_role or not bound_info
|
||||
)
|
||||
has_pending = pending_info is not None and bool(pending_role)
|
||||
|
||||
# 查询结果角色 = 已生效绑定;首次绑定(无绑定)时回退待确认角色
|
||||
bind_info = (
|
||||
@@ -1282,7 +1311,7 @@ class BindMixin:
|
||||
"info",
|
||||
"查询角色 "
|
||||
f"aliases={','.join(query_aliases)} bound_hit={(bound_info or {}).get('act_alias') or '-'} "
|
||||
f"pending_hit={pending_info.get('act_alias') or '-'} "
|
||||
f"pending_hit={(pending_info or {}).get('act_alias') or '-'} "
|
||||
f"{self._format_bind_summary(bind_info) if bind_info else 'role=- bound_act=-'}",
|
||||
)
|
||||
# 只有已生效绑定才写账号表;待确认角色不污染 game_name
|
||||
@@ -1371,6 +1400,15 @@ class BindMixin:
|
||||
f"查询换绑时间候选 act={item.get('act_alias') or '-'} "
|
||||
f"{self._format_bind_summary(item)}",
|
||||
)
|
||||
current_bound = self._pick_current_bound_info(candidates, config)
|
||||
pending_info = self._pick_pending_role_info(
|
||||
candidates,
|
||||
prefer_aliases=self._role_alias_priority(config),
|
||||
baseline_role_name=str((current_bound or {}).get("role_name") or ""),
|
||||
baseline_is_bound_act=self._is_bound_act(current_bound),
|
||||
baseline_info=current_bound,
|
||||
)
|
||||
pending_role = str((pending_info or {}).get("role_name") or "").strip()
|
||||
# 换绑时间看“当前已绑定”活动态,不要优先 cjm(cjm 常无 changeRoleWaitTime)
|
||||
bind_info = (
|
||||
self._pick_change_wait_bind_info(candidates, config) or candidates[0]
|
||||
@@ -1401,8 +1439,9 @@ class BindMixin:
|
||||
"query_act_aliases": query_aliases,
|
||||
**snapshot,
|
||||
"change_role_wait_text": wait_text,
|
||||
"bind_ready_for_confirm": bool(snapshot["role_name"])
|
||||
and not snapshot["is_bound_act"],
|
||||
# 待确认语义统一由 _pick_pending_role_info 决定;这里不再根据
|
||||
# “只是有角色名且 bindAct=0”自行推断。
|
||||
"bind_ready_for_confirm": pending_info is not None,
|
||||
"bind_confirmed": snapshot["is_bound_act"],
|
||||
"bind_summary": f"act={source_alias or '-'} {self._format_bind_summary(bind_info)}",
|
||||
"bind_candidates": [
|
||||
@@ -1418,6 +1457,13 @@ class BindMixin:
|
||||
for item in candidates
|
||||
],
|
||||
}
|
||||
if (
|
||||
pending_info is not None
|
||||
and pending_role != str(snapshot["role_name"] or "").strip()
|
||||
):
|
||||
result["pending_role_name"] = pending_role
|
||||
result["pending_area_name"] = str(pending_info.get("area_name") or "")
|
||||
result["pending_plat_name"] = str(pending_info.get("plat_name") or "")
|
||||
self._push_log(
|
||||
"info",
|
||||
f"查询换绑时间 hit={source_alias or '-'} role={role_name} "
|
||||
|
||||
Reference in New Issue
Block a user