perf(douyu): 拆分任务槽并改造绑定扫码调度
This commit is contained in:
@@ -632,6 +632,172 @@ class BindMixin:
|
||||
)
|
||||
return "", result
|
||||
|
||||
@staticmethod
|
||||
def _schedule_next_bind_poll(
|
||||
task: DouyuTask,
|
||||
*,
|
||||
now: datetime,
|
||||
interval_seconds: int,
|
||||
) -> None:
|
||||
task.queue_lane = "binding_poll"
|
||||
task.next_run_at = now + timedelta(seconds=max(1, interval_seconds))
|
||||
task.last_run_at = now
|
||||
task.attempt_count = int(task.attempt_count or 0) + 1
|
||||
|
||||
def poll_bind_role_once(
|
||||
self,
|
||||
db: Session,
|
||||
task: DouyuTask,
|
||||
account: Account,
|
||||
config: dict,
|
||||
) -> None:
|
||||
"""Run one scheduled binding poll and immediately release the worker."""
|
||||
now = datetime.now(UTC)
|
||||
task.last_run_at = now
|
||||
task.attempt_count = int(task.attempt_count or 0) + 1
|
||||
result = dict(task.result or {})
|
||||
query_aliases = [
|
||||
str(value)
|
||||
for value in (result.get("query_act_aliases") or [])
|
||||
if str(value or "").strip()
|
||||
]
|
||||
if not query_aliases:
|
||||
query_aliases = self._query_bind_act_aliases(config)
|
||||
deadline = task.run_deadline_at
|
||||
if deadline is not None and now >= deadline:
|
||||
result.update(
|
||||
{
|
||||
"bind_polling": False,
|
||||
"bind_ready_for_confirm": False,
|
||||
"bind_phase": "role_timeout",
|
||||
}
|
||||
)
|
||||
task.queue_lane = ""
|
||||
task.next_run_at = None
|
||||
self._mark_task(
|
||||
db,
|
||||
task,
|
||||
"failed",
|
||||
"绑定二维码已过期,未识别到新扫码角色",
|
||||
result,
|
||||
)
|
||||
return
|
||||
|
||||
client = self._client(str(account.cookie or ""))
|
||||
candidates = self._fetch_bind_info_candidates(client, query_aliases)
|
||||
if not candidates:
|
||||
attempts = max(1, int(task.attempt_count or 1))
|
||||
backoff = min(30, max(DOUYU_BIND_ROLE_POLL_INTERVAL, attempts * 2))
|
||||
result["bind_poll_error"] = "所有 actAlias 查询绑定信息失败"
|
||||
result["bind_polling"] = True
|
||||
result["bind_phase"] = "waiting_scan"
|
||||
self._schedule_next_bind_poll(task, now=now, interval_seconds=backoff)
|
||||
self._update_task_progress(
|
||||
db,
|
||||
task,
|
||||
"running",
|
||||
"等待扫码绑定:角色查询暂时失败",
|
||||
result,
|
||||
sync_platform=False,
|
||||
)
|
||||
return
|
||||
|
||||
baseline_role_name = str(result.get("baseline_role_name") or "")
|
||||
baseline_is_bound_act = bool(result.get("baseline_is_bound_act"))
|
||||
baseline_info = result.get("before_bind_info")
|
||||
if not isinstance(baseline_info, dict):
|
||||
baseline_info = None
|
||||
bind_info = (
|
||||
self._pick_bind_info(
|
||||
candidates,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
prefer_pending=True,
|
||||
prefer_aliases=query_aliases,
|
||||
)
|
||||
or candidates[0]
|
||||
)
|
||||
snapshot = self._bind_snapshot(bind_info)
|
||||
is_pending_role = self._is_pending_role(
|
||||
bind_info,
|
||||
baseline_role_name=baseline_role_name,
|
||||
baseline_is_bound_act=baseline_is_bound_act,
|
||||
baseline_info=baseline_info,
|
||||
)
|
||||
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)}"
|
||||
)
|
||||
|
||||
if is_pending_role:
|
||||
task.queue_lane = ""
|
||||
task.next_run_at = None
|
||||
result.update(
|
||||
{
|
||||
**snapshot,
|
||||
"act_alias": query_alias,
|
||||
"query_act_alias": query_alias,
|
||||
"bind_ready_for_confirm": True,
|
||||
"bind_confirmed": False,
|
||||
"bind_phase": "role_ready",
|
||||
"bind_polling": False,
|
||||
"poll_count": int(result.get("poll_count") or 0) + 1,
|
||||
"bind_summary": summary,
|
||||
}
|
||||
)
|
||||
account.updated_at = now
|
||||
self._mark_task(
|
||||
db,
|
||||
task,
|
||||
"success",
|
||||
f"已识别角色: {snapshot['role_name']},待确认绑定",
|
||||
result,
|
||||
)
|
||||
return
|
||||
|
||||
if snapshot["role_name"] and snapshot["is_bound_act"]:
|
||||
result["current_role_name"] = snapshot["role_name"]
|
||||
result["current_area_name"] = snapshot["area_name"]
|
||||
result["current_plat_name"] = snapshot["plat_name"]
|
||||
result.update(
|
||||
{
|
||||
"bind_info": bind_info,
|
||||
"act_alias": query_alias,
|
||||
"query_act_alias": query_alias,
|
||||
"is_bound_act": snapshot["is_bound_act"],
|
||||
"is_bound_role": snapshot["is_bound_role"],
|
||||
"is_bound_account": snapshot["is_bound_account"],
|
||||
"need_bind_act": snapshot["need_bind_act"],
|
||||
"need_bind_role": snapshot["need_bind_role"],
|
||||
"change_role_wait_time": snapshot["change_role_wait_time"],
|
||||
"can_change_role": snapshot["can_change_role"],
|
||||
"role_name": "",
|
||||
"area_name": "",
|
||||
"plat_name": "",
|
||||
"bind_ready_for_confirm": False,
|
||||
"bind_confirmed": False,
|
||||
"bind_phase": "waiting_scan",
|
||||
"bind_polling": True,
|
||||
"poll_count": int(result.get("poll_count") or 0) + 1,
|
||||
"bind_summary": summary,
|
||||
}
|
||||
)
|
||||
self._schedule_next_bind_poll(
|
||||
task,
|
||||
now=now,
|
||||
interval_seconds=DOUYU_BIND_ROLE_POLL_INTERVAL,
|
||||
)
|
||||
self._update_task_progress(
|
||||
db,
|
||||
task,
|
||||
"running",
|
||||
f"等待扫码绑定 ({summary})",
|
||||
result,
|
||||
sync_platform=False,
|
||||
)
|
||||
|
||||
def _execute_get_bind_qr(
|
||||
self, db: Session, task: DouyuTask, account: Account, cookie: str, config: dict
|
||||
):
|
||||
@@ -763,40 +929,26 @@ class BindMixin:
|
||||
"qr_expires_at": (
|
||||
qr_generated_at + timedelta(seconds=DOUYU_BIND_ROLE_POLL_SECONDS)
|
||||
).isoformat(),
|
||||
"baseline_role_name": current_role_name,
|
||||
"baseline_is_bound_act": before_snapshot["is_bound_act"],
|
||||
"poll_count": 0,
|
||||
}
|
||||
account.updated_at = datetime.now(UTC)
|
||||
# 关键:先把二维码 progress 出去,前端 running 期间即可弹窗扫码。
|
||||
task.queue_lane = "binding_poll"
|
||||
task.next_run_at = qr_generated_at + timedelta(
|
||||
seconds=DOUYU_BIND_ROLE_POLL_INTERVAL
|
||||
)
|
||||
task.run_deadline_at = qr_generated_at + timedelta(
|
||||
seconds=DOUYU_BIND_ROLE_POLL_SECONDS
|
||||
)
|
||||
task.last_run_at = qr_generated_at
|
||||
task.attempt_count = 0
|
||||
# Publish the QR immediately, then return without holding a worker while
|
||||
# the customer scans. The durable scheduler resumes role polling.
|
||||
self._update_task_progress(
|
||||
db, task, "running", "已生成绑定二维码,等待扫码绑定", result
|
||||
)
|
||||
|
||||
role_name, result = self._wait_bind_role_result(
|
||||
client,
|
||||
db,
|
||||
task,
|
||||
account,
|
||||
query_aliases,
|
||||
result,
|
||||
baseline_role_name=current_role_name,
|
||||
baseline_is_bound_act=before_snapshot["is_bound_act"],
|
||||
baseline_info=before,
|
||||
)
|
||||
if role_name:
|
||||
self._mark_task(
|
||||
db, task, "success", f"已识别角色: {role_name},待确认绑定", result
|
||||
)
|
||||
return
|
||||
if result.get("bind_phase") == "stopped":
|
||||
self._mark_task(db, task, "stopped", "任务已停止", result)
|
||||
return
|
||||
last_summary = str(result.get("bind_summary") or "")
|
||||
timeout_msg = "已生成绑定二维码,未检测到新扫码角色"
|
||||
if current_role_name:
|
||||
timeout_msg = f"{timeout_msg}(当前仍是 {current_role_name})"
|
||||
if last_summary:
|
||||
timeout_msg = f"{timeout_msg} | {last_summary}"
|
||||
self._mark_task(db, task, "success", timeout_msg, result)
|
||||
|
||||
def _execute_confirm_bind(
|
||||
self, db: Session, task: DouyuTask, account: Account, cookie: str, config: dict
|
||||
):
|
||||
|
||||
Reference in New Issue
Block a user