fix(huya): 抽出通用绑定角色查询,修复外部单协作读到旧角色

This commit is contained in:
yml2213
2026-11-09 22:13:07 +08:00
parent b06b622eb3
commit 3a48d9c624
5 changed files with 190 additions and 92 deletions
+81
View File
@@ -1522,6 +1522,87 @@ class HuyaHttpClient:
return self._raw_from_wup(resp) if isinstance(resp, WupResponse) else None
def _bind_game_account_has_role(resp: Any) -> bool:
"""响应是否真的带出了角色名(角色名是判断「最新角色」的唯一可靠信号)。"""
account_data = getattr(resp, "accountData", None)
game_role = getattr(account_data, "gameRole", None)
return bool(getattr(game_role, "roleName", ""))
def query_bind_game_account(
client: Any,
*,
uid: int,
cookie: str,
b_act_id: int,
gid: int = 0,
outer_act_id: str = "",
is_use_outer_act_id: int = 1,
scene: str = "",
timeout: float | None = None,
) -> tuple[Any, dict[str, Any]]:
"""查询绑定游戏账号(官方活动页两条查询,返回最新角色)。
2026-11-09 真机定论:新版活动页先查 ``gid + outerActId``,再查
``gid + outerActId=空``;**角色名以第二路为准**(第一路会返回旧的缓存角色)。
旧协议(gid=0)第二路会被服务端判 501,保持外层优先、缺角色时补查内层。
返回 ``(status, detail)``:
- ``status``:最终选中的 ``CheckUserBindGameAccountResp``(``None`` 表示接口无响应);
- ``detail``:两路响应与来源标记,供任务结果透传(可 JSON 序列化)。
"""
def _call(outer_id: str, use_outer: int):
kwargs: dict[str, Any] = {
"uid": uid,
"cookie": cookie,
"b_act_id": b_act_id,
"gid": gid,
"outer_act_id": outer_id,
"is_use_outer_act_id": use_outer,
"scene": scene,
}
if timeout is not None:
kwargs["timeout"] = timeout
return client.check_user_bind_game_account(**kwargs)
outer = _call(outer_act_id, is_use_outer_act_id)
if outer is None:
return None, {}
detail: dict[str, Any] = {
"bind_status_source": "outer",
"outer_bind_status": outer.to_dict(),
}
if outer.status != 200:
return outer, detail
chosen = outer
if gid:
# 第二路(gid + outerActId=空)是最新角色源,带出角色就优先采用。
inner = _call("", 0)
if inner is not None:
detail["inner_bind_status"] = inner.to_dict()
if inner.status == 200 and _bind_game_account_has_role(inner):
chosen = inner
detail["bind_status_source"] = "inner"
else:
account_data = getattr(outer, "accountData", None)
if not _bind_game_account_has_role(outer) and bool(
getattr(account_data, "isNeedActCheck", 0)
or not getattr(account_data, "isBindAcount", 0)
or not getattr(account_data, "isBindRole", 0)
):
inner = _call("", 0)
if inner is not None:
detail["inner_bind_status"] = inner.to_dict()
if inner.status == 200 and _bind_game_account_has_role(inner):
chosen = inner
detail["bind_status_source"] = "inner"
detail["bind_status"] = chosen.to_dict()
return chosen, detail
def _self_check():
uid = 1199647239697
guid = "0a8973013ad3476a53029ddb9edb071f"