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
+8 -2
View File
@@ -1612,7 +1612,10 @@ def stop_batch(
if batch.get("finished"):
douyu_batch_registry.pop(batch_id)
cleaned = cleanup_orphan_douyu_tasks(
db, batch_id=batch_id, message="批次已结束"
db,
batch_id=batch_id,
include_durable=True,
message="批次已结束",
)
if cleaned:
return {
@@ -1633,7 +1636,10 @@ def stop_batch(
return {"message": "已发送停止信号", "success": True}
cleaned = cleanup_orphan_douyu_tasks(
db, batch_id=batch_id, message="任务已停止(批次不存在)"
db,
batch_id=batch_id,
include_durable=True,
message="任务已停止(批次不存在)",
)
if cleaned:
if is_recharge_batch:
+16 -2
View File
@@ -422,9 +422,14 @@ def cleanup_orphan_douyu_tasks(
active_batch_ids: set[str] | None = None,
batch_id: str | None = None,
statuses: tuple[str, ...] = DOUYU_ACTIVE_TASK_STATUSES,
include_durable: bool = False,
message: str = "任务已中断(服务重启或批次丢失)",
) -> int:
"""清理没有执行器接管的斗鱼任务。"""
"""清理没有执行器接管的斗鱼任务。
启动清理默认保留仍可恢复的扫码/支付轮询;用户主动停止时传
``include_durable=True``,确保内存注册表丢失后也能终止残留轮询。
"""
query = db.query(DouyuTask).filter(DouyuTask.status.in_(statuses))
if 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 > now,
)
query = query.filter(~or_(durable_binding, durable_payment))
if not include_durable:
query = query.filter(~or_(durable_binding, durable_payment))
tasks = query.all()
if not tasks:
@@ -471,6 +477,8 @@ def cleanup_orphan_douyu_tasks(
task.status = "stopped"
task.message = message
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
if account is not None:
event_contexts.append(
@@ -590,6 +598,12 @@ def sanitize_douyu_task_result(
data = strip_douyu_raw_snapshots(result)
if not isinstance(data, dict):
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 = {
"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 canvas = wrapRef.current?.querySelector('canvas');
if (!canvas) return;
const image = wrapRef.current?.querySelector('img');
if (!canvas && !image) return;
setCopyingImage(true);
try {
const blob = await new Promise<Blob>((resolve, reject) => {
canvas.toBlob((b) => (b ? resolve(b) : reject(new Error('二维码图片导出失败'))), 'image/png');
});
const blob = canvas
? 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);
message.success('二维码已复制到剪贴板');
} catch (error) {
@@ -256,6 +256,7 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
// 绑定/支付弹窗以 task 为唯一数据源;二维码弹窗支持多账号并行(Tabs 切换)
const [qrTaskIds, setQrTaskIds] = useState<number[]>([]);
const [activeQrTaskId, setActiveQrTaskId] = useState<number | null>(null);
const [qrImageByTaskId, setQrImageByTaskId] = useState<Record<number, string>>({});
const [esportsBindTask, setEsportsBindTask] = useState<DouyuTaskItem | null>(null);
const [paySessions, setPaySessions] = useState<DouyuPaySession[]>([]);
const [activePayBatchId, setActivePayBatchId] = useState<string | null>(null);
@@ -711,10 +712,40 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
return () => clearInterval(timer);
}, [hasActivePayTasks, hasActiveTasks, loadTasks, logs.connected, runningBatchIds]);
const openQrTask = useCallback((task: DouyuTaskItem, activate = true) => {
autoOpenedQrTaskIds.current.add(task.id);
setQrTaskIds((prev) => (prev.includes(task.id) ? prev : [...prev, task.id]));
if (activate) setActiveQrTaskId(task.id);
const openQrTask = useCallback(async (task: DouyuTaskItem, activate = true) => {
let resolved = task;
if (
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 叠加混淆
setEsportsBindTask(null);
setPayOpen(false);
@@ -837,7 +868,7 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
.sort((a, b) => b.id - a.id);
if (candidates.length === 0) return;
// 全部加入标签栏但不抢焦点;仅在当前无 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);
}, [openQrTask, visibleTasks]);
@@ -1521,6 +1552,9 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
// ---- QR panel derived state ----
const qrResult = qrTask?.result || null;
const qrUrl = resultText(qrResult, 'url');
const qrMiniQrcodeImage = qrTask
? (qrImageByTaskId[qrTask.id] || resultText(qrResult, 'mini_qrcode_image'))
: '';
const qrBindPhase = resultText(qrResult, 'bind_phase');
const qrAutoPolling = qrTask?.status === 'running' && qrResult?.bind_polling === true;
const isXpdBindTask = qrTask?.task_type === 'get_xpd_bind_qr';
@@ -1886,6 +1920,10 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
// 只要结果里还有二维码地址就一直展示:绑定类任务等不到扫码时也会以
// success 收尾(「已生成绑定二维码,未检测到新扫码角色」),二维码必须留着。
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 (
task
@@ -1897,14 +1935,31 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
}
const openTask = () => {
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 (task.task_type === 'get_xpd_bind_qr') openQrTask(task);
else if (task.task_type === 'get_xpd_bind_qr') void openQrTask(task);
else openEsportsBindTask(task);
};
return (
<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>
);
},
@@ -3137,7 +3192,24 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
<Tag color={qrXpdBound ? 'success' : qrBindReady ? 'gold' : qrBindPhase === 'role_timeout' ? 'orange' : 'processing'}>
{qrStatusText}
</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}>
<QRCode value={qrUrl} size={220} bordered={false} />
</div>