fix(task-board): 任务卡片假死自救——轮询失败退避重试+面板刷新按钮+补检轮进度文案
task 31769:外观专利任务后端 18:08 已 SUCCESS,但页面卡片冻在「正在组装 xlsx 92%」 一天多——Patent 轮询配的 propagate 让一次瞬时错误永久杀死轮询,且无自救出口。 - useLiveTaskBoard 摘除 pollErrorMode:失败一律吞掉重试,连续失败按倍数降频(封顶 5x) - TaskCenterPanel 头部新增「刷新」按钮,外观专利/货源查询两页接上(强拉 history+dashboard) - 补检轮触发时进度文案改「有 N 行未完成检测,补检中」,不再停在「正在组装 xlsx」假死 - 回归:AppearancePatentRecheckProgressMessageTest+task-board-poll-resilience.test.ts
This commit is contained in:
@@ -37,6 +37,7 @@
|
||||
<section class="right-panel">
|
||||
<TaskCenterPanel
|
||||
:on-batch-delete="batchDeleteHistory"
|
||||
:on-refresh="refreshBoard"
|
||||
title="外观专利检测"
|
||||
:cards="patentCards"
|
||||
:current-items="currentTaskViews"
|
||||
@@ -171,8 +172,6 @@ const board = useLiveTaskBoard<AppearancePatentHistoryItem>({
|
||||
}
|
||||
return { taskIds, force: true }
|
||||
},
|
||||
// 轮询回调抛错时上抛、轮询停止(与原实现一致)
|
||||
pollErrorMode: 'propagate',
|
||||
getPendingParseItem: () => pendingParseItem.value,
|
||||
download: {
|
||||
buildUrl: (resultId) => getAppearancePatentResultDownloadUrl(resultId),
|
||||
@@ -188,6 +187,16 @@ const board = useLiveTaskBoard<AppearancePatentHistoryItem>({
|
||||
})
|
||||
|
||||
const visibleTaskSummary = computed(() => parseResult.value || queuedTaskSummary.value)
|
||||
|
||||
/** 手动刷新:强拉历史 + 统计 + 当前轮询任务进度(轮询意外中断后的自救出口) */
|
||||
async function refreshBoard() {
|
||||
await Promise.all([
|
||||
board.loadDashboard(),
|
||||
board.loadHistory({ force: true }),
|
||||
board.refreshTaskProgress(),
|
||||
])
|
||||
}
|
||||
|
||||
const pendingParseItem = computed<AppearancePatentHistoryItem | null>(() => {
|
||||
const result = parseResult.value
|
||||
if (!result?.taskId) return null
|
||||
|
||||
@@ -77,6 +77,7 @@
|
||||
<section class="right-panel">
|
||||
<TaskCenterPanel
|
||||
:on-batch-delete="batchDeleteHistory"
|
||||
:on-refresh="refreshBoard"
|
||||
title="货源查询"
|
||||
:cards="asinCards"
|
||||
:current-items="currentTaskViews"
|
||||
@@ -221,8 +222,6 @@ const board = useLiveTaskBoard<SimilarAsinHistoryItem>({
|
||||
pendingIds.forEach((taskId) => forceThrottle.markForce(taskId))
|
||||
}
|
||||
},
|
||||
// 瞬时请求失败不打断轮询(与原实现一致)
|
||||
pollErrorMode: 'swallow',
|
||||
onPendingFileTaskRemoved: (taskId) => forceThrottle.clear(taskId),
|
||||
getPendingParseItem: () => pendingParseItem.value,
|
||||
download: {
|
||||
@@ -270,6 +269,15 @@ const currentTaskViews = computed<TaskItemView[]>(() => board.currentItems.value
|
||||
|
||||
const historyTaskViews = computed<TaskItemView[]>(() => board.historyOnlyItems.value.map(toAsinTaskView))
|
||||
|
||||
/** 手动刷新:强拉历史 + 统计 + 当前轮询任务进度(轮询意外中断后的自救出口) */
|
||||
async function refreshBoard() {
|
||||
await Promise.all([
|
||||
board.loadDashboard(),
|
||||
board.loadHistory({ force: true }),
|
||||
board.refreshTaskProgress(),
|
||||
])
|
||||
}
|
||||
|
||||
function itemSource(item: TaskItemView): SimilarAsinHistoryItem {
|
||||
return item.source as SimilarAsinHistoryItem
|
||||
}
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
<template>
|
||||
<div class="task-center-panel">
|
||||
<div class="panel-header">
|
||||
<span class="panel-header__title">{{ title }}</span>
|
||||
<div class="panel-header__left">
|
||||
<span class="panel-header__title">{{ title }}</span>
|
||||
<button v-if="onRefresh" type="button" class="panel-refresh" :disabled="refreshing" @click="handleRefresh">
|
||||
{{ refreshing ? '刷新中…' : '刷新' }}
|
||||
</button>
|
||||
</div>
|
||||
<HistoryTaskLayer
|
||||
:count="historyItems.length"
|
||||
:history-title="historyTitle"
|
||||
@@ -45,12 +50,14 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import HistoryTaskLayer from './HistoryTaskLayer.vue'
|
||||
import TaskItemCard from './TaskItemCard.vue'
|
||||
import TaskStatCards from './TaskStatCards.vue'
|
||||
import type { TaskItemView, TaskStatCard } from './types'
|
||||
|
||||
withDefaults(defineProps<{
|
||||
const props = withDefaults(defineProps<{
|
||||
/** 面板标题(右侧 panel-header) */
|
||||
title: string
|
||||
/** 统计卡 */
|
||||
@@ -68,6 +75,8 @@ withDefaults(defineProps<{
|
||||
historyEmptyText?: string
|
||||
/** 历史记录批量删除回调(传入后历史弹层支持勾选批量删除) */
|
||||
onBatchDelete?: (items: TaskItemView[]) => Promise<void> | void
|
||||
/** 手动刷新回调(传入后面板头部出现「刷新」按钮) */
|
||||
onRefresh?: () => Promise<void> | void
|
||||
}>(), {
|
||||
cards: () => [],
|
||||
currentItems: () => [],
|
||||
@@ -77,6 +86,20 @@ withDefaults(defineProps<{
|
||||
currentEmptyText: '暂无当前任务',
|
||||
historyEmptyText: '暂无历史任务',
|
||||
})
|
||||
|
||||
const refreshing = ref(false)
|
||||
|
||||
async function handleRefresh() {
|
||||
if (!props.onRefresh || refreshing.value) return
|
||||
refreshing.value = true
|
||||
try {
|
||||
await props.onRefresh()
|
||||
} catch {
|
||||
ElMessage.error('刷新失败,请稍后重试')
|
||||
} finally {
|
||||
refreshing.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
@@ -96,12 +119,32 @@ withDefaults(defineProps<{
|
||||
border-bottom: 1px solid #2e3a52;
|
||||
}
|
||||
|
||||
.panel-header__left {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.panel-header__title {
|
||||
font-size: 15px;
|
||||
font-weight: 600;
|
||||
color: #c8d2e2;
|
||||
}
|
||||
|
||||
.panel-refresh {
|
||||
padding: 4px 12px;
|
||||
border: 1px solid #2e3a52;
|
||||
border-radius: 6px;
|
||||
background: transparent;
|
||||
color: #6ea8fe;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.panel-refresh:hover { border-color: #3498db; }
|
||||
.panel-refresh:disabled { opacity: .55; cursor: not-allowed; }
|
||||
|
||||
.task-list-wrap {
|
||||
flex: 1;
|
||||
padding: 16px 20px;
|
||||
|
||||
@@ -20,7 +20,6 @@ import type { TaskItemView } from '../components/tasks/types'
|
||||
* - 状态归一化 normalizeTaskStatus / isResultPreparing(两 Tab 语义不同)
|
||||
* - 终态后是否登记 pending 文件任务、哪些任务状态参与文件结算
|
||||
* - 进度批量请求的预/后处理(SimilarAsin 的 force 节流、Patent 的 light 行版本检查)
|
||||
* - 轮询回调抛错时是否打断轮询(SimilarAsin 吞掉、Patent 上抛——保持原行为)
|
||||
* - 下载 URL / 文件名兜底 / 进度 key 前缀、删除判定与本地清理
|
||||
*
|
||||
* 其余手写轮询的 Tab(QueryAsin/Withdraw 等)后续可渐进接入。
|
||||
@@ -105,12 +104,6 @@ export interface UseLiveTaskBoardOptions<T extends LiveTaskHistoryItem> {
|
||||
) => Promise<{ taskIds: number[]; force: boolean } | null> | { taskIds: number[]; force: boolean } | null
|
||||
/** 批量进度请求后处理(SimilarAsin 的 force 节流登记)。 */
|
||||
afterBatch?: (taskIds: number[], pendingFileTaskIds: number[], forced: boolean) => void
|
||||
/**
|
||||
* 轮询回调抛错时的处理:
|
||||
* - 'swallow'(SimilarAsin):瞬时失败不打断轮询;
|
||||
* - 'propagate'(Patent):异常上抛,轮询停止(与原实现一致)。
|
||||
*/
|
||||
pollErrorMode?: 'swallow' | 'propagate'
|
||||
/** pending 文件任务被移除时的回调(SimilarAsin 的 forceThrottle.clear) */
|
||||
onPendingFileTaskRemoved?: (taskId: number) => void
|
||||
/** 当前任务区顶部的「解析待启动」占位条目;返回 null 表示没有 */
|
||||
@@ -226,7 +219,6 @@ export function useLiveTaskBoard<T extends LiveTaskHistoryItem>(
|
||||
options: UseLiveTaskBoardOptions<T>,
|
||||
): UseLiveTaskBoardReturn<T> {
|
||||
const timers = createCategorizedTimers(options.scope)
|
||||
const pollErrorMode = options.pollErrorMode ?? 'swallow'
|
||||
|
||||
const pollingTaskIds = ref<number[]>([])
|
||||
const pendingFileTaskIds = ref<number[]>([])
|
||||
@@ -351,7 +343,13 @@ export function useLiveTaskBoard<T extends LiveTaskHistoryItem>(
|
||||
savePollingIds()
|
||||
}
|
||||
|
||||
// ---- 轮询循环(两 Tab 逐字相同;抛错处理按 pollErrorMode 参数化)----
|
||||
// ---- 轮询循环 ----
|
||||
// 瞬时请求失败不打断轮询(task 31769:Patent 曾配 'propagate',一次网络抖动就永久停轮询,
|
||||
// 卡片冻结在「正在组装 xlsx 92%」一天多,后端实际早已 SUCCESS);连续失败时按倍数降频,
|
||||
// 成功即恢复原间隔。
|
||||
|
||||
let consecutivePollFailures = 0
|
||||
const POLL_FAILURE_STRETCH_CAP = 5
|
||||
|
||||
function ensurePolling() {
|
||||
if (disposed) return
|
||||
@@ -385,23 +383,20 @@ export function useLiveTaskBoard<T extends LiveTaskHistoryItem>(
|
||||
pollTimer.value = null
|
||||
if (disposed) return
|
||||
if (!pollingTaskIds.value.length && !pendingFileTaskIds.value.length) return
|
||||
if (pollErrorMode === 'propagate') {
|
||||
try {
|
||||
await refreshTaskProgress()
|
||||
consecutivePollFailures = 0
|
||||
} catch {
|
||||
consecutivePollFailures += 1
|
||||
} finally {
|
||||
scheduleFollowUp()
|
||||
} else {
|
||||
try {
|
||||
await refreshTaskProgress()
|
||||
} catch {
|
||||
// A transient request failure must not stop progress polling permanently.
|
||||
} finally {
|
||||
scheduleFollowUp()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function scheduleFollowUp() {
|
||||
if (!disposed && pollTimer.value == null && (pollingTaskIds.value.length || pendingFileTaskIds.value.length)) {
|
||||
pollTimer.value = timers.setTimeout('task-poll', runPollCycle, getTaskPollIntervalMs())
|
||||
const stretch = Math.min(consecutivePollFailures, POLL_FAILURE_STRETCH_CAP)
|
||||
pollTimer.value = timers.setTimeout('task-poll', runPollCycle, getTaskPollIntervalMs() * stretch)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user