fix(douyu): 对齐绑定小程序码并修复残留任务停止

This commit is contained in:
yml
2026-11-22 22:15:48 +08:00
parent 5393b668e0
commit d315e983f6
9 changed files with 409 additions and 38 deletions
+126 -17
View File
@@ -4,6 +4,7 @@ from __future__ import annotations
import json import json
import re import re
import secrets
import time import time
from collections.abc import Callable from collections.abc import Callable
from typing import Any, cast from typing import Any, cast
@@ -23,6 +24,11 @@ PC_UA = (
"AppleWebKit/537.36 (KHTML, like Gecko) " "AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/133.0.0.0 Safari/537.36" "Chrome/133.0.0.0 Safari/537.36"
) )
DOUYU_BIND_DEFAULT_ROOM_ID = "9263298"
DOUYU_LEGACY_BIND_GAME_ID = "cjm"
LIVELINK_MINI_QR_API = (
"https://livelinkbind.game.qq.com/api/qrcode/getMiniAppQrcode"
)
class DouyuActivityError(RuntimeError): class DouyuActivityError(RuntimeError):
@@ -417,13 +423,17 @@ class DouyuActivityClient:
ctn = cookie_value(self.cookie, "acf_ccn") or ctn ctn = cookie_value(self.cookie, "acf_ccn") or ctn
return ctn return ctn
def get_bind_qr(self, act_alias: str) -> dict[str, Any]: def get_bind_qr(
self,
act_alias: str,
*,
room_id: str = DOUYU_BIND_DEFAULT_ROOM_ID,
) -> dict[str, Any]:
"""生成腾讯游戏角色绑定二维码。 """生成腾讯游戏角色绑定二维码。
2026-11-22 新 HAR:活动页“切换”按钮会引导用户去斗鱼个人中心,个人中心 2026-11-22 HAR:``bindRoleParam.url`` 是来联绑定页参数入口,页面内部再
普通入口携带完整游戏列表,二维码无法自动选中和平精英。``gameRoleBindUrl`` 调用 ``getMiniAppQrcode`` 生成真正的微信小程序码。``gameRoleBindUrl``
仍是旧版直接角色绑定页,带 ``gameIdList=cjm``,优先使用;只有旧入口缺失 是直接角色绑定页,把它编码成普通二维码会进入错误的网页流程。
时才回退到普通 ``url``。
""" """
ctn = self.acf_ccn(refresh_subscribe=False) ctn = self.acf_ccn(refresh_subscribe=False)
payload = self._request_json( payload = self._request_json(
@@ -432,15 +442,19 @@ class DouyuActivityClient:
"获取绑定二维码", "获取绑定二维码",
params={"actAlias": act_alias}, params={"actAlias": act_alias},
headers={ headers={
"Referer": "https://www.douyu.com/", "Referer": self._peace_page_referer(room_id),
}, },
) )
data = payload.get("data") or {} data = payload.get("data") or {}
url = data.get("gameRoleBindUrl") or data.get("url") or "" url = data.get("url") or data.get("gameRoleBindUrl") or ""
if not url: if not url:
raise DouyuActivityError(payload.get("msg") or "获取绑定二维码失败") raise DouyuActivityError(payload.get("msg") or "获取绑定二维码失败")
mini_qrcode = self.get_livelink_mini_qrcode(url)
return { return {
"url": url, "url": url,
"mini_qrcode_image": mini_qrcode["mini_qrcode_image"],
"qrcode_token": mini_qrcode["qrcode_token"],
"has_mini_qrcode": True,
"role_param_url": data.get("url") or "", "role_param_url": data.get("url") or "",
"game_role_bind_url": data.get("gameRoleBindUrl") or "", "game_role_bind_url": data.get("gameRoleBindUrl") or "",
"query_params": data.get("queryParams") or {}, "query_params": data.get("queryParams") or {},
@@ -449,6 +463,80 @@ class DouyuActivityClient:
"raw": payload, "raw": payload,
} }
@staticmethod
def _livelink_qrcode_image_src(qrcode: str) -> str:
"""把来联接口返回的二维码内容转换为可直接展示的图片地址。"""
text = str(qrcode or "").strip()
if not text:
return ""
lower = text.lower()
if lower.startswith(("https://", "http://", "data:image/")):
return text
mime = "image/png" if text.startswith("iVBOR") else "image/jpeg"
return f"data:{mime};base64,{text}"
def get_livelink_mini_qrcode(self, bind_page_url: str) -> dict[str, str]:
"""按来联绑定页参数生成真正可扫的微信小程序码。"""
query = urlsplit(bind_page_url or "").query
if not query:
raise DouyuActivityError("绑定小程序码参数缺失")
params = parse_qs(query, keep_blank_values=True)
platform_id = (params.get("livePlatId") or [""])[0]
act_id = (params.get("actId") or [""])[0]
from_id = (params.get("fromId") or [""])[0]
if len(from_id) > 32:
from_id = ""
suffix = "".join(
secrets.choice("abcdefghijklmnopqrstuvwxyz0123456789") for _ in range(8)
)
session_id = f"{int(time.time())}_{suffix}"
request_payload = {"queryString": f"{query}&sessionId={session_id}"}
request_headers = {
"User-Agent": PC_UA,
"Accept": "application/json, text/plain, */*",
"Accept-Language": "zh-CN,zh;q=0.9",
"Content-Type": "application/json;charset=UTF-8",
"Origin": "https://livelink.qq.com",
"Referer": "https://livelink.qq.com/",
"Gap-Plat-Id": platform_id,
"Gap-Act-Id": act_id,
"Gap-User-From": "pc",
"Gap-From-Id": from_id,
"Vulcan-AccType": "auth_in_h5",
"Vulcan-PlatUser-Session": "",
}
try:
with requests.Session() as session:
session.trust_env = False
response = session.post(
LIVELINK_MINI_QR_API,
json=request_payload,
headers=request_headers,
timeout=self.timeout,
)
response.raise_for_status()
payload = response.json()
except requests.RequestException as exc:
raise DouyuActivityError(f"获取绑定小程序码失败: {exc}") from exc
except ValueError as exc:
raise DouyuActivityError("绑定小程序码接口返回不是 JSON") from exc
if payload.get("iRet") not in (0, "0"):
raise DouyuActivityError(
str(payload.get("sMsg") or "获取绑定小程序码失败")
)
data = payload.get("jData") if isinstance(payload.get("jData"), dict) else {}
image = self._livelink_qrcode_image_src(str(data.get("qrcode") or ""))
if not image:
raise DouyuActivityError("绑定小程序码接口未返回二维码图片")
self.logger(
f"获取绑定小程序码: plat={platform_id or '-'} "
f"act={act_id or '-'} token={'有' if data.get('qrcodeToken') else '无'}"
)
return {
"mini_qrcode_image": image,
"qrcode_token": str(data.get("qrcodeToken") or ""),
}
@staticmethod @staticmethod
def _first_present(data: dict[str, Any], *keys: str): def _first_present(data: dict[str, Any], *keys: str):
"""按候选 key 取第一个非 None 值。""" """按候选 key 取第一个非 None 值。"""
@@ -457,20 +545,39 @@ class DouyuActivityClient:
return data.get(key) return data.get(key)
return None return None
def bind_info(self, act_alias: str, *, v2: bool = False) -> dict[str, Any]: def bind_info(
"""查询绑定游戏账号信息。""" self,
act_alias: str,
*,
v2: bool = False,
room_id: str = DOUYU_BIND_DEFAULT_ROOM_ID,
) -> dict[str, Any]:
"""查询绑定游戏账号信息。
2026-11-22 HAR:活动 alias 使用 ``actAlias``,legacy 最新态 ``cjm``
使用 ``gameId``。两者不能统一拼成 ``actAlias=cjm``。
"""
url = self.BIND_INFO_V2_API if v2 else self.BIND_INFO_API url = self.BIND_INFO_V2_API if v2 else self.BIND_INFO_API
alias = str(act_alias or "").strip()
params = (
{"gameId": alias}
if alias == DOUYU_LEGACY_BIND_GAME_ID
else {"actAlias": alias}
)
payload = self._request_json( payload = self._request_json(
"get", "get",
url, url,
"查询绑定信息", "查询绑定信息",
params={"actAlias": act_alias}, params=params,
headers={"Origin": "", "Referer": "https://www.douyu.com/"}, headers={
"Origin": "",
"Referer": self._peace_page_referer(room_id),
},
) )
if payload.get("error") not in (0, "0", None): if payload.get("error") not in (0, "0", None):
raise DouyuActivityError(payload.get("msg") or "查询绑定信息失败") raise DouyuActivityError(payload.get("msg") or "查询绑定信息失败")
parsed = self._parse_bind_info( parsed = self._parse_bind_info(
payload, act_alias=act_alias, api_version="v2" if v2 else "v1" payload, act_alias=alias, api_version="v2" if v2 else "v1"
) )
self._log_bind_info(parsed) self._log_bind_info(parsed)
return parsed return parsed
@@ -672,7 +779,12 @@ class DouyuActivityClient:
raise DouyuActivityError(bind.get("msg") or "完成电竞手册绑定失败") raise DouyuActivityError(bind.get("msg") or "完成电竞手册绑定失败")
return {"agreement": agreement, "act_bind": bind} return {"agreement": agreement, "act_bind": bind}
def confirm_bind(self, act_alias: str) -> dict[str, Any]: def confirm_bind(
self,
act_alias: str,
*,
room_id: str = DOUYU_BIND_DEFAULT_ROOM_ID,
) -> dict[str, Any]:
"""按最新 actBind 链路确认当前扫码选择的游戏角色。""" """按最新 actBind 链路确认当前扫码选择的游戏角色。"""
ctn = self.acf_ccn(refresh_subscribe=False) ctn = self.acf_ccn(refresh_subscribe=False)
payload = self._request_json( payload = self._request_json(
@@ -681,10 +793,7 @@ class DouyuActivityClient:
"确认绑定", "确认绑定",
files=self._multipart_fields({"actAlias": act_alias, "ctn": ctn}), files=self._multipart_fields({"actAlias": act_alias, "ctn": ctn}),
headers={ headers={
"Referer": ( "Referer": self._peace_page_referer(room_id),
"https://www.douyu.com/pages/live-peace-handbook/web"
"?ditchname=pass0"
),
}, },
) )
if payload.get("error") not in (0, "0"): if payload.get("error") not in (0, "0"):
+9 -1
View File
@@ -48,10 +48,18 @@
| 动作 | 方法 | 地址/常量 | 关键参数 | | 动作 | 方法 | 地址/常量 | 关键参数 |
| --- | --- | --- | --- | | --- | --- | --- | --- |
| 查询绑定信息 | GET | `/wgapi/ordnc/live/memberthird/tencent/bindInfo` | `actAlias` | | 查询绑定信息 | GET | `/wgapi/ordnc/live/memberthird/tencent/bindInfo` | 活动 alias 用 `actAlias`;legacy `cjm` 用 `gameId` |
| 生成角色二维码 | GET | `/wgapi/ordnc/live/memberthird/tencent/bindRoleParam` | `actAlias` | | 生成角色二维码 | GET | `/wgapi/ordnc/live/memberthird/tencent/bindRoleParam` | `actAlias` |
| 确认绑定 | POST multipart | `/wgapi/ordnc/live/memberthird/tencent/actBind` | `actAlias`、`acf_ccn` | | 确认绑定 | POST multipart | `/wgapi/ordnc/live/memberthird/tencent/actBind` | `actAlias`、`acf_ccn` |
2026-11-22 HAR 中三个绑定接口的 `Referer` 都是
`https://www.douyu.com/pages/live-peace-handbook/web?ditchname=pass0&roomId=9263298`。
legacy 最新扫码态固定使用 `bindInfo?gameId=cjm`,不能拼成 `actAlias=cjm`。
`bindRoleParam` 的 `data.url` 是来联绑定参数入口,必须再请求
`https://livelinkbind.game.qq.com/api/qrcode/getMiniAppQrcode` 获取微信小程序码。
`data.gameRoleBindUrl` 是直接角色绑定页,不能当作扫码二维码内容使用。
### alias 职责 ### alias 职责
站内绑定信息不是单一数据源,`actAlias` 必须按职责区分: 站内绑定信息不是单一数据源,`actAlias` 必须按职责区分:
+111 -2
View File
@@ -497,6 +497,10 @@ def test_latest_elite_binding_endpoints_are_used_once():
def test_qr_and_confirm_requests_follow_latest_har(monkeypatch): def test_qr_and_confirm_requests_follow_latest_har(monkeypatch):
calls: list[dict[str, Any]] = [] calls: list[dict[str, Any]] = []
expected_referer = (
"https://www.douyu.com/pages/live-peace-handbook/web"
"?ditchname=pass0&roomId=9263298"
)
client = DouyuActivityClient("acf_ccn=ctn") client = DouyuActivityClient("acf_ccn=ctn")
monkeypatch.setattr( monkeypatch.setattr(
client, client,
@@ -524,23 +528,66 @@ def test_qr_and_confirm_requests_follow_latest_har(monkeypatch):
return {"error": 0, "msg": "请求正常", "data": {}} return {"error": 0, "msg": "请求正常", "data": {}}
monkeypatch.setattr(client, "_request_json", request_json) monkeypatch.setattr(client, "_request_json", request_json)
monkeypatch.setattr(
client,
"get_livelink_mini_qrcode",
lambda _url: {
"mini_qrcode_image": "data:image/png;base64,bWluaS1xcg==",
"qrcode_token": "token-1",
},
)
qr = client.get_bind_qr(ACT_ALIAS) qr = client.get_bind_qr(ACT_ALIAS)
confirmed = client.confirm_bind(ACT_ALIAS) confirmed = client.confirm_bind(ACT_ALIAS)
assert qr["url"] == "https://livelink.example/bind" assert qr["url"] == "https://livelink.example/role"
assert qr["mini_qrcode_image"] == "data:image/png;base64,bWluaS1xcg=="
assert qr["qrcode_token"] == "token-1"
assert qr["has_mini_qrcode"] is True
assert qr["role_param_url"] == "https://livelink.example/role" assert qr["role_param_url"] == "https://livelink.example/role"
assert qr["game_role_bind_url"] == "https://livelink.example/bind" assert qr["game_role_bind_url"] == "https://livelink.example/bind"
assert confirmed["ctn"] == "ctn" assert confirmed["ctn"] == "ctn"
assert calls[0]["method"] == "get" assert calls[0]["method"] == "get"
assert calls[0]["url"].endswith("/bindRoleParam") assert calls[0]["url"].endswith("/bindRoleParam")
assert calls[0]["params"] == {"actAlias": ACT_ALIAS} assert calls[0]["params"] == {"actAlias": ACT_ALIAS}
assert calls[0]["headers"]["Referer"] == expected_referer
assert calls[1]["method"] == "post" assert calls[1]["method"] == "post"
assert calls[1]["url"].endswith("/actBind") assert calls[1]["url"].endswith("/actBind")
assert calls[1]["files"] == { assert calls[1]["files"] == {
"actAlias": (None, ACT_ALIAS), "actAlias": (None, ACT_ALIAS),
"ctn": (None, "ctn"), "ctn": (None, "ctn"),
} }
assert calls[1]["headers"]["Referer"] == expected_referer
def test_bind_info_uses_game_id_for_legacy_and_full_page_referer(monkeypatch):
calls: list[dict[str, Any]] = []
expected_referer = (
"https://www.douyu.com/pages/live-peace-handbook/web"
"?ditchname=pass0&roomId=9263298"
)
client = DouyuActivityClient("acf_ccn=ctn")
def request_json(method: str, url: str, source: str, **kwargs: Any):
calls.append(
{
"method": method,
"url": url,
"source": source,
**kwargs,
}
)
return {"error": 0, "msg": "请求正常", "data": {}}
monkeypatch.setattr(client, "_request_json", request_json)
client.bind_info(ACT_ALIAS)
client.bind_info("cjm")
assert calls[0]["params"] == {"actAlias": ACT_ALIAS}
assert calls[1]["params"] == {"gameId": "cjm"}
assert calls[0]["headers"]["Referer"] == expected_referer
assert calls[1]["headers"]["Referer"] == expected_referer
def test_confirm_bind_preserves_platform_cooldown_error_code(monkeypatch): def test_confirm_bind_preserves_platform_cooldown_error_code(monkeypatch):
@@ -569,7 +616,7 @@ def test_confirm_bind_preserves_platform_cooldown_error_code(monkeypatch):
assert exc_info.value.payload == payload assert exc_info.value.payload == payload
def test_get_bind_qr_falls_back_to_role_param_url(monkeypatch): def test_get_bind_qr_uses_role_param_url_for_mini_qrcode(monkeypatch):
client = DouyuActivityClient("acf_ccn=ctn") client = DouyuActivityClient("acf_ccn=ctn")
monkeypatch.setattr( monkeypatch.setattr(
client, client,
@@ -584,8 +631,70 @@ def test_get_bind_qr_falls_back_to_role_param_url(monkeypatch):
"data": {"url": "https://livelink.example/role"}, "data": {"url": "https://livelink.example/role"},
}, },
) )
mini_urls: list[str] = []
monkeypatch.setattr(
client,
"get_livelink_mini_qrcode",
lambda url: (
mini_urls.append(url)
or {
"mini_qrcode_image": "data:image/png;base64,bWluaS1xcg==",
"qrcode_token": "token-2",
}
),
)
qr = client.get_bind_qr(ACT_ALIAS) qr = client.get_bind_qr(ACT_ALIAS)
assert qr["url"] == "https://livelink.example/role" assert qr["url"] == "https://livelink.example/role"
assert qr["game_role_bind_url"] == "" assert qr["game_role_bind_url"] == ""
assert mini_urls == ["https://livelink.example/role"]
def test_livelink_mini_qrcode_uses_har_query_and_headers(monkeypatch):
calls: list[dict[str, Any]] = []
client = DouyuActivityClient("")
class Response:
@staticmethod
def raise_for_status():
return None
@staticmethod
def json():
return {
"iRet": 0,
"jData": {
"qrcode": "iVBORw0KGgo=",
"qrcodeToken": "token-3",
},
}
class Session:
trust_env = True
def __enter__(self):
return self
def __exit__(self, *_args):
return None
@staticmethod
def post(url: str, **kwargs: Any):
calls.append({"url": url, **kwargs})
return Response()
monkeypatch.setattr("core.douyu.activity_client.requests.Session", Session)
result = client.get_livelink_mini_qrcode(
"https://livelink.example/bind?actId=16046&livePlatId=douyu&fromId=abc"
)
assert result["qrcode_token"] == "token-3"
assert result["mini_qrcode_image"].startswith("data:image/png;base64,")
assert calls[0]["json"]["queryString"].startswith(
"actId=16046&livePlatId=douyu&fromId=abc&sessionId="
)
assert calls[0]["headers"]["Gap-Act-Id"] == "16046"
assert calls[0]["headers"]["Gap-Plat-Id"] == "douyu"
assert calls[0]["headers"]["Origin"] == "https://livelink.qq.com"
+22
View File
@@ -190,6 +190,28 @@ def test_cleanup_preserves_recoverable_binding_poll(db):
assert task.queue_lane == "binding_poll" assert task.queue_lane == "binding_poll"
def test_force_cleanup_stops_recoverable_binding_poll(db):
_, _, task = _fixtures(db, status="running")
task.queue_lane = "binding_poll"
task.next_run_at = datetime.now(UTC) + timedelta(seconds=5)
task.run_deadline_at = datetime.now(UTC) + timedelta(minutes=10)
db.commit()
cleaned = douyu_service.cleanup_orphan_douyu_tasks(
db,
batch_id=task.batch_id,
statuses=("running",),
include_durable=True,
message="任务已停止(批次不存在)",
)
db.refresh(task)
assert cleaned == 1
assert task.status == "stopped"
assert task.queue_lane == ""
assert task.next_run_at is None
@pytest.mark.parametrize( @pytest.mark.parametrize(
("elapsed", "expected"), ("elapsed", "expected"),
[ [
+23 -1
View File
@@ -12,7 +12,10 @@ from web.backend.routers.douyu import (
_visible_tasks_query, _visible_tasks_query,
list_tasks, list_tasks,
) )
from web.backend.services.douyu_service import DOUYU_HANDBOOK_TASK_TYPES from web.backend.services.douyu_service import (
DOUYU_HANDBOOK_TASK_TYPES,
sanitize_douyu_task_result,
)
def _legacy_page( def _legacy_page(
@@ -54,6 +57,25 @@ def _legacy_page(
return [task.id for task in query.all()], total return [task.id for task in query.all()], total
def test_task_list_slims_mini_qrcode_and_keeps_detail_image():
result = {
"url": "https://livelink.example/bind",
"has_mini_qrcode": True,
"mini_qrcode_image": "data:image/png;base64,bWluaS1xcg==",
}
listed = sanitize_douyu_task_result(result, "get_bind_qr")
detailed = sanitize_douyu_task_result(
result,
"get_bind_qr",
include_detail=True,
)
assert listed["has_mini_qrcode"] is True
assert "mini_qrcode_image" not in listed
assert detailed["mini_qrcode_image"] == "data:image/png;base64,bWluaS1xcg=="
def _new_page(result): def _new_page(result):
if isinstance(result, dict): if isinstance(result, dict):
return [item.id for item in result["items"]], result["total"] return [item.id for item in result["items"]], result["total"]
+8 -2
View File
@@ -1612,7 +1612,10 @@ def stop_batch(
if batch.get("finished"): if batch.get("finished"):
douyu_batch_registry.pop(batch_id) douyu_batch_registry.pop(batch_id)
cleaned = cleanup_orphan_douyu_tasks( cleaned = cleanup_orphan_douyu_tasks(
db, batch_id=batch_id, message="批次已结束" db,
batch_id=batch_id,
include_durable=True,
message="批次已结束",
) )
if cleaned: if cleaned:
return { return {
@@ -1633,7 +1636,10 @@ def stop_batch(
return {"message": "已发送停止信号", "success": True} return {"message": "已发送停止信号", "success": True}
cleaned = cleanup_orphan_douyu_tasks( cleaned = cleanup_orphan_douyu_tasks(
db, batch_id=batch_id, message="任务已停止(批次不存在)" db,
batch_id=batch_id,
include_durable=True,
message="任务已停止(批次不存在)",
) )
if cleaned: if cleaned:
if is_recharge_batch: if is_recharge_batch:
+16 -2
View File
@@ -422,9 +422,14 @@ def cleanup_orphan_douyu_tasks(
active_batch_ids: set[str] | None = None, active_batch_ids: set[str] | None = None,
batch_id: str | None = None, batch_id: str | None = None,
statuses: tuple[str, ...] = DOUYU_ACTIVE_TASK_STATUSES, statuses: tuple[str, ...] = DOUYU_ACTIVE_TASK_STATUSES,
include_durable: bool = False,
message: str = "任务已中断(服务重启或批次丢失)", message: str = "任务已中断(服务重启或批次丢失)",
) -> int: ) -> int:
"""清理没有执行器接管的斗鱼任务。""" """清理没有执行器接管的斗鱼任务。
启动清理默认保留仍可恢复的扫码/支付轮询;用户主动停止时传
``include_durable=True``,确保内存注册表丢失后也能终止残留轮询。
"""
query = db.query(DouyuTask).filter(DouyuTask.status.in_(statuses)) query = db.query(DouyuTask).filter(DouyuTask.status.in_(statuses))
if batch_id: if batch_id:
query = query.filter(DouyuTask.batch_id == batch_id) query = query.filter(DouyuTask.batch_id == batch_id)
@@ -451,7 +456,8 @@ def cleanup_orphan_douyu_tasks(
DouyuTask.run_deadline_at.isnot(None), DouyuTask.run_deadline_at.isnot(None),
DouyuTask.run_deadline_at > now, DouyuTask.run_deadline_at > now,
) )
query = query.filter(~or_(durable_binding, durable_payment)) if not include_durable:
query = query.filter(~or_(durable_binding, durable_payment))
tasks = query.all() tasks = query.all()
if not tasks: if not tasks:
@@ -471,6 +477,8 @@ def cleanup_orphan_douyu_tasks(
task.status = "stopped" task.status = "stopped"
task.message = message task.message = message
task.finished_at = now task.finished_at = now
task.queue_lane = ""
task.next_run_at = None
account = accounts.get(int(task.account_id)) if task.account_id else None account = accounts.get(int(task.account_id)) if task.account_id else None
if account is not None: if account is not None:
event_contexts.append( event_contexts.append(
@@ -590,6 +598,12 @@ def sanitize_douyu_task_result(
data = strip_douyu_raw_snapshots(result) data = strip_douyu_raw_snapshots(result)
if not isinstance(data, dict): if not isinstance(data, dict):
return None return None
mini_qrcode_image = data.get("mini_qrcode_image")
if isinstance(mini_qrcode_image, str) and mini_qrcode_image:
data["has_mini_qrcode"] = True
data.pop("mini_qrcode_image", None)
elif data.get("has_mini_qrcode"):
data["has_mini_qrcode"] = True
removable_keys = { removable_keys = {
"bind_info", "bind_info",
"before_bind_info", "before_bind_info",
+13 -4
View File
@@ -45,12 +45,21 @@ export default function QrActions({ wrapRef, url, disabled }: Props) {
const copyImage = async () => { const copyImage = async () => {
const canvas = wrapRef.current?.querySelector('canvas'); const canvas = wrapRef.current?.querySelector('canvas');
if (!canvas) return; const image = wrapRef.current?.querySelector('img');
if (!canvas && !image) return;
setCopyingImage(true); setCopyingImage(true);
try { try {
const blob = await new Promise<Blob>((resolve, reject) => { const blob = canvas
canvas.toBlob((b) => (b ? resolve(b) : reject(new Error('二维码图片导出失败'))), 'image/png'); ? await new Promise<Blob>((resolve, reject) => {
}); canvas.toBlob(
(b) => (b ? resolve(b) : reject(new Error('二维码图片导出失败'))),
'image/png',
);
})
: await fetch(image!.src).then(async (response) => {
if (!response.ok) throw new Error('二维码图片读取失败');
return response.blob();
});
await copyImageToClipboard(blob); await copyImageToClipboard(blob);
message.success('二维码已复制到剪贴板'); message.success('二维码已复制到剪贴板');
} catch (error) { } catch (error) {
@@ -256,6 +256,7 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
// 绑定/支付弹窗以 task 为唯一数据源;二维码弹窗支持多账号并行(Tabs 切换) // 绑定/支付弹窗以 task 为唯一数据源;二维码弹窗支持多账号并行(Tabs 切换)
const [qrTaskIds, setQrTaskIds] = useState<number[]>([]); const [qrTaskIds, setQrTaskIds] = useState<number[]>([]);
const [activeQrTaskId, setActiveQrTaskId] = useState<number | null>(null); const [activeQrTaskId, setActiveQrTaskId] = useState<number | null>(null);
const [qrImageByTaskId, setQrImageByTaskId] = useState<Record<number, string>>({});
const [esportsBindTask, setEsportsBindTask] = useState<DouyuTaskItem | null>(null); const [esportsBindTask, setEsportsBindTask] = useState<DouyuTaskItem | null>(null);
const [paySessions, setPaySessions] = useState<DouyuPaySession[]>([]); const [paySessions, setPaySessions] = useState<DouyuPaySession[]>([]);
const [activePayBatchId, setActivePayBatchId] = useState<string | null>(null); const [activePayBatchId, setActivePayBatchId] = useState<string | null>(null);
@@ -711,10 +712,40 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
return () => clearInterval(timer); return () => clearInterval(timer);
}, [hasActivePayTasks, hasActiveTasks, loadTasks, logs.connected, runningBatchIds]); }, [hasActivePayTasks, hasActiveTasks, loadTasks, logs.connected, runningBatchIds]);
const openQrTask = useCallback((task: DouyuTaskItem, activate = true) => { const openQrTask = useCallback(async (task: DouyuTaskItem, activate = true) => {
autoOpenedQrTaskIds.current.add(task.id); let resolved = task;
setQrTaskIds((prev) => (prev.includes(task.id) ? prev : [...prev, task.id])); if (
if (activate) setActiveQrTaskId(task.id); resultFlag(task.result, 'has_mini_qrcode')
&& !resultText(task.result, 'mini_qrcode_image')
) {
try {
const detail = await douyuApi.getTask(task.id);
resolved = {
...task,
...detail,
result: {
...(task.result || {}),
...(detail.result || {}),
},
};
setTasks((previous) => previous.map((item) => (
item.id === task.id ? resolved : item
)));
} catch (error) {
message.error(`二维码加载失败: ${getErrorMessage(error)}`);
return;
}
}
const miniQrcodeImage = resultText(resolved.result, 'mini_qrcode_image');
if (miniQrcodeImage) {
setQrImageByTaskId((previous) => ({
...previous,
[resolved.id]: miniQrcodeImage,
}));
}
autoOpenedQrTaskIds.current.add(resolved.id);
setQrTaskIds((prev) => (prev.includes(resolved.id) ? prev : [...prev, resolved.id]));
if (activate) setActiveQrTaskId(resolved.id);
// 绑定二维码与支付/电竞面板互斥,避免两个 Modal 叠加混淆 // 绑定二维码与支付/电竞面板互斥,避免两个 Modal 叠加混淆
setEsportsBindTask(null); setEsportsBindTask(null);
setPayOpen(false); setPayOpen(false);
@@ -837,7 +868,7 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
.sort((a, b) => b.id - a.id); .sort((a, b) => b.id - a.id);
if (candidates.length === 0) return; if (candidates.length === 0) return;
// 全部加入标签栏但不抢焦点;仅在当前无 active 标签时激活最新(id 最大)的 // 全部加入标签栏但不抢焦点;仅在当前无 active 标签时激活最新(id 最大)的
for (const candidate of candidates) openQrTask(candidate, false); for (const candidate of candidates) void openQrTask(candidate, false);
setActiveQrTaskId((cur) => cur ?? candidates[0].id); setActiveQrTaskId((cur) => cur ?? candidates[0].id);
}, [openQrTask, visibleTasks]); }, [openQrTask, visibleTasks]);
@@ -1521,6 +1552,9 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
// ---- QR panel derived state ---- // ---- QR panel derived state ----
const qrResult = qrTask?.result || null; const qrResult = qrTask?.result || null;
const qrUrl = resultText(qrResult, 'url'); const qrUrl = resultText(qrResult, 'url');
const qrMiniQrcodeImage = qrTask
? (qrImageByTaskId[qrTask.id] || resultText(qrResult, 'mini_qrcode_image'))
: '';
const qrBindPhase = resultText(qrResult, 'bind_phase'); const qrBindPhase = resultText(qrResult, 'bind_phase');
const qrAutoPolling = qrTask?.status === 'running' && qrResult?.bind_polling === true; const qrAutoPolling = qrTask?.status === 'running' && qrResult?.bind_polling === true;
const isXpdBindTask = qrTask?.task_type === 'get_xpd_bind_qr'; const isXpdBindTask = qrTask?.task_type === 'get_xpd_bind_qr';
@@ -1886,6 +1920,10 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
// 只要结果里还有二维码地址就一直展示:绑定类任务等不到扫码时也会以 // 只要结果里还有二维码地址就一直展示:绑定类任务等不到扫码时也会以
// success 收尾(「已生成绑定二维码,未检测到新扫码角色」),二维码必须留着。 // success 收尾(「已生成绑定二维码,未检测到新扫码角色」),二维码必须留着。
const url = taskQrUrl(task); const url = taskQrUrl(task);
const miniQrcodeImage = task
? (qrImageByTaskId[task.id] || resultText(task.result, 'mini_qrcode_image'))
: '';
const hasMiniQrcode = resultFlag(task?.result, 'has_mini_qrcode');
if (!url) return null; if (!url) return null;
if ( if (
task task
@@ -1897,14 +1935,31 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
} }
const openTask = () => { const openTask = () => {
if (!task) return; if (!task) return;
if (hasBindQrcode(task)) openQrTask(task); if (hasBindQrcode(task)) void openQrTask(task);
else if (hasPaymentQrcode(task)) void openPayBatch(task.batch_id, task); else if (hasPaymentQrcode(task)) void openPayBatch(task.batch_id, task);
else if (task.task_type === 'get_xpd_bind_qr') openQrTask(task); else if (task.task_type === 'get_xpd_bind_qr') void openQrTask(task);
else openEsportsBindTask(task); else openEsportsBindTask(task);
}; };
return ( return (
<div onClick={openTask} style={{ cursor: 'pointer', display: 'inline-block', lineHeight: 0 }} title="点击查看大图"> <div onClick={openTask} style={{ cursor: 'pointer', display: 'inline-block', lineHeight: 0 }} title="点击查看大图">
<QRCode value={url} size={56} /> {miniQrcodeImage
? (
<span style={{
display: 'inline-flex',
padding: 4,
borderRadius: 4,
background: '#fff',
}}>
<img
src={miniQrcodeImage}
alt="绑定小程序码"
style={{ width: 56, height: 56, objectFit: 'contain' }}
/>
</span>
)
: hasMiniQrcode
? <QrcodeOutlined style={{ fontSize: 28 }} />
: <QRCode value={url} size={56} />}
</div> </div>
); );
}, },
@@ -3137,7 +3192,24 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
<Tag color={qrXpdBound ? 'success' : qrBindReady ? 'gold' : qrBindPhase === 'role_timeout' ? 'orange' : 'processing'}> <Tag color={qrXpdBound ? 'success' : qrBindReady ? 'gold' : qrBindPhase === 'role_timeout' ? 'orange' : 'processing'}>
{qrStatusText} {qrStatusText}
</Tag> </Tag>
{qrUrl ? ( {qrMiniQrcodeImage ? (
<div
ref={qrCanvasWrapRef}
style={{
display: 'inline-flex',
padding: 10,
borderRadius: 8,
background: '#fff',
lineHeight: 0,
}}
>
<img
src={qrMiniQrcodeImage}
alt="绑定小程序码"
style={{ width: 220, height: 220, objectFit: 'contain' }}
/>
</div>
) : qrUrl ? (
<div ref={qrCanvasWrapRef}> <div ref={qrCanvasWrapRef}>
<QRCode value={qrUrl} size={220} bordered={false} /> <QRCode value={qrUrl} size={220} bordered={false} />
</div> </div>