feat(huya): 浏览器兑换三目标直达并收窄扩展注入范围
- 操作列改为「直播间 / 精英宝典 / 电竞宝典」三个直达按钮,点哪个就按哪个目标写入登录态并打开,去掉弹窗内选择
- 新增 services/huya_exchange_targets.py 统一三个目标地址,接口支持可选 body {"target": "..."}(不传=精英宝典)
- 扩展内容脚本从 <all_urls> 收窄到后台站点白名单,service worker 校验 sender.tab.url,拒绝其它来源的注入
- 注入改为 Cookie 写完后回执(ok/written/failed/error),前端按回执提示成功或失败,不再静默
- 扩展图标兜底改用 world:'MAIN' 读取;一个 Cookie 都没写成功时不打开目标页
- 兑换材料签发写审计 huya:exchange:kit(含账号与目标)
- 控制台脚本增加 huya.com 域校验与 Secure,与扩展路径保持一致
- 修复兑换记录轮询的跨账号串扰与卸载后 setState;兑换请求加 epoch 防止过期结果覆盖弹窗
- 新增 tests/test_huya_browser_exchange.py(13 项)并同步 docs/HUYA_BROWSER_EXCHANGE.md
This commit is contained in:
@@ -72,6 +72,7 @@ from ...schemas import (
|
||||
HuyaAutoRegisterBatchOut,
|
||||
HuyaAutoRegisterRequest,
|
||||
HuyaAutoRegisterRetryRequest,
|
||||
HuyaBrowserExchangeRequest,
|
||||
HuyaConfigOut,
|
||||
HuyaConfigUpdate,
|
||||
HuyaCookieImport,
|
||||
@@ -90,13 +91,17 @@ from ...schemas import (
|
||||
HuyaWorkbenchAccountsUpdate,
|
||||
)
|
||||
from ...services.audit_service import record_audit
|
||||
from ...services.huya_exchange_targets import (
|
||||
DEFAULT_EXCHANGE_TARGET,
|
||||
exchange_target_options,
|
||||
exchange_target_url,
|
||||
)
|
||||
from ...services.huya_register_runner import (
|
||||
export_success_logs_text,
|
||||
huya_register_registry,
|
||||
list_success_logs,
|
||||
)
|
||||
from ...services.huya_runner import HuyaBatchRunner, huya_batch_registry
|
||||
from ...services.huya_runner_bind import BindMixin
|
||||
from ...services.huya_service import (
|
||||
HUYA_CONFIG_FIELDS,
|
||||
SUPPORTED_TASK_TYPES,
|
||||
|
||||
@@ -10,12 +10,14 @@ router = APIRouter()
|
||||
@router.post("/accounts/{account_id}/browser-exchange")
|
||||
def create_browser_exchange_kit(
|
||||
account_id: int,
|
||||
req: HuyaBrowserExchangeRequest | None = None,
|
||||
db: Session = Depends(get_db),
|
||||
current: User = Depends(get_current_user),
|
||||
):
|
||||
"""生成指定账号的本机浏览器人工兑换材料。
|
||||
|
||||
登录态由前端引导用户在自己的 Chrome/Edge 中写入,服务端不托管浏览器会话。
|
||||
登录态由前端引导用户在自己的 Chrome/Edge 中写入,服务端不托管浏览器会话;
|
||||
`target` 选择要打开的目标页(直播间/精英宝典/电竞宝典),不传则用默认目标。
|
||||
"""
|
||||
_require_huya_perm(current, "huya:task")
|
||||
account = (
|
||||
@@ -28,18 +30,28 @@ def create_browser_exchange_kit(
|
||||
if not account.cookie:
|
||||
raise HTTPException(status_code=400, detail="该账号没有可用 Cookie,请先登录")
|
||||
config = ensure_huya_config(db)
|
||||
target_url = (
|
||||
BindMixin._bind_redirect_url(
|
||||
{
|
||||
"room_pid": huya_config_value("room_pid", config.room_pid),
|
||||
}
|
||||
)
|
||||
or "https://zt.huya.com/b02faae1/pc/index.html"
|
||||
)
|
||||
room_pid = huya_config_value("room_pid", config.room_pid)
|
||||
target = req.target if req and req.target else DEFAULT_EXCHANGE_TARGET
|
||||
targets = exchange_target_options(room_pid)
|
||||
try:
|
||||
target_url = exchange_target_url(target, room_pid)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||
pairs = dict(cookie_pairs(normalize_huya_cookie(account.cookie)))
|
||||
# 兑换材料等同账号凭证:逐次留痕,记录谁、何时、取走哪个账号、准备打开哪个页面
|
||||
record_audit(
|
||||
db,
|
||||
current,
|
||||
action="huya:exchange:kit",
|
||||
target=f"huya_account:{account.id}",
|
||||
detail={"account_id": account.id, "target": target},
|
||||
)
|
||||
db.commit()
|
||||
return {
|
||||
"account_id": account.id,
|
||||
"username": account.username or account.yyuid or "",
|
||||
"target": target,
|
||||
"targets": targets,
|
||||
"target_url": target_url,
|
||||
"cookie_string": "; ".join(f"{key}={value}" for key, value in pairs.items()),
|
||||
"cookie_script": browser_login_script(pairs, target_url),
|
||||
|
||||
@@ -528,6 +528,12 @@ class HuyaWorkbenchAccountsUpdate(BaseModel):
|
||||
account_ids: list[int] = Field(default_factory=list)
|
||||
|
||||
|
||||
class HuyaBrowserExchangeRequest(BaseModel):
|
||||
"""浏览器兑换的目标页选择(常量见 services/huya_exchange_targets.py)。"""
|
||||
|
||||
target: str | None = Field(None, pattern="^(live_room|elite|esports)$")
|
||||
|
||||
|
||||
class HuyaTaskOut(BaseModel):
|
||||
id: int
|
||||
batch_id: str
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
"""虎牙浏览器兑换的可选目标页:直播间 / 精英宝典 / 电竞宝典。
|
||||
|
||||
人工兑换时把账号登录态写入操作者自己的浏览器,再打开其中一个目标页:
|
||||
- 直播间:直接进房间,适合在房间内完成的活动操作;
|
||||
- 精英宝典:沿用绑定/充值活动的 zt 活动页(历史行为);
|
||||
- 电竞宝典:同一活动的另一个 zt 活动页,仅 uuid 不同。
|
||||
|
||||
三个地址都由 pid(`HuyaConfig.room_pid`)与固定活动常量拼出,前端只传目标 key。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from .huya_runner_bind import HUYA_BIND_ROOM_ID, HUYA_BIND_ZT_UUID
|
||||
from .huya_runner_core import HUYA_RECHARGE_SOURCE_ID
|
||||
|
||||
EXCHANGE_TARGET_LIVE_ROOM = "live_room"
|
||||
EXCHANGE_TARGET_ELITE = "elite"
|
||||
EXCHANGE_TARGET_ESPORTS = "esports"
|
||||
|
||||
#: 未指定目标时使用的默认页(保持历史行为:精英宝典)
|
||||
DEFAULT_EXCHANGE_TARGET = EXCHANGE_TARGET_ELITE
|
||||
|
||||
#: 精英宝典复用绑定/充值活动 uuid;电竞宝典为独立的 zt 活动 uuid
|
||||
HUYA_ELITE_ZT_UUID = HUYA_BIND_ZT_UUID
|
||||
HUYA_ESPORTS_ZT_UUID = "50ea007f"
|
||||
|
||||
#: 选择器展示顺序
|
||||
EXCHANGE_TARGET_KEYS: tuple[str, ...] = (
|
||||
EXCHANGE_TARGET_LIVE_ROOM,
|
||||
EXCHANGE_TARGET_ELITE,
|
||||
EXCHANGE_TARGET_ESPORTS,
|
||||
)
|
||||
|
||||
EXCHANGE_TARGET_LABELS: dict[str, str] = {
|
||||
EXCHANGE_TARGET_LIVE_ROOM: "直播间",
|
||||
EXCHANGE_TARGET_ELITE: "精英宝典",
|
||||
EXCHANGE_TARGET_ESPORTS: "电竞宝典",
|
||||
}
|
||||
|
||||
#: 供 Pydantic 校验使用的正则
|
||||
EXCHANGE_TARGET_PATTERN = "^(live_room|elite|esports)$"
|
||||
|
||||
|
||||
def _zt_exchange_url(zt_uuid: str, room_pid: str) -> str:
|
||||
"""拼 zt 活动页地址,参数与绑定/充值跳转保持一致。"""
|
||||
return (
|
||||
f"https://zt.huya.com/{zt_uuid}/pc/index.html"
|
||||
f"?sourceId={HUYA_RECHARGE_SOURCE_ID}"
|
||||
f"&pid={room_pid}"
|
||||
f"&anchorUid={room_pid}"
|
||||
f"&roomid={HUYA_BIND_ROOM_ID}"
|
||||
)
|
||||
|
||||
|
||||
def exchange_target_url(key: str, room_pid: str) -> str:
|
||||
"""返回指定目标页地址;pid 由调用方(路由)归一化,空值在这里会拼出无 pid 的地址。"""
|
||||
pid = str(room_pid or "").strip()
|
||||
if key == EXCHANGE_TARGET_LIVE_ROOM:
|
||||
return f"https://www.huya.com/{HUYA_BIND_ROOM_ID}"
|
||||
if key == EXCHANGE_TARGET_ELITE:
|
||||
return _zt_exchange_url(HUYA_ELITE_ZT_UUID, pid)
|
||||
if key == EXCHANGE_TARGET_ESPORTS:
|
||||
return _zt_exchange_url(HUYA_ESPORTS_ZT_UUID, pid)
|
||||
raise ValueError(f"不支持的兑换目标:{key}")
|
||||
|
||||
|
||||
def exchange_target_options(room_pid: str) -> list[dict[str, str]]:
|
||||
"""返回三个可选目标页,顺序固定,供前端选择器渲染。"""
|
||||
return [
|
||||
{
|
||||
"key": key,
|
||||
"label": EXCHANGE_TARGET_LABELS[key],
|
||||
"url": exchange_target_url(key, room_pid),
|
||||
}
|
||||
for key in EXCHANGE_TARGET_KEYS
|
||||
]
|
||||
Reference in New Issue
Block a user