feat(护栏三面): 鉴权盲区启动自检 + SQL 分层口径落码 + 六页等待循环合一
后端
- AdminApiGuardFilter 增 guardedPrefixes()/matchesPrefix() 公开入口(原 private,
自检抄一份清单迟早与守卫脱钩);行为零变化
- 新增 ApiGuardCoverageAuditor:启动期把"已映射端点既不在守卫前缀名单、也不在
公开/待收清单里"打成 API_GUARD_UNCOVERED 一行 WARN,供现网巡检 grep;
PUBLIC_BY_DESIGN 与 PENDING_CONVERGENCE 两张清单逐条写理由(只读不拦)
- SQL 分层按新口径落码:AsinResultCacheMapper 的两条动态 SQL(<foreach> 批量 +
ON DUPLICATE KEY UPDATE + 逐列 COALESCE)迁到 resources/mapper/asincache/,
注解摘干净(注解+XML 同名会让启动期抛重复语句)
- 判据:SqlLayeringConventionTest(注解写 SQL 基线 16 接口/29 条只减不增、
@Select 65 条/16 文件、wrapper 夹带函数级 SQL 4 文件/15 条,last("LIMIT n")
205 处显式豁免并反向钉住豁免面)、ApiGuardCoverageAuditorTest(含清单腐烂与
欠账/名单重叠两类反向失明)、AsinResultCacheMapperXmlTest(真解析 XML 向
BoundSql 断言 28 个占位符与 5 个 COALESCE 列)
用户端 frontend-vue
- 终态集合合一:实测六页里 PriceTrack/ProductRisk 只认 SUCCESS|FAILED,
而 COMPLETED≡SUCCESS 早有出处(task-status-text 两者都译「已完成」,
后端 TaskCenterQueryMapper SUCCESS_STATUSES_ORDERED 也含 COMPLETED)
⇒ 窄集合页收到 COMPLETED 会空转到瞬断预算耗尽,PriceTrack 的轮询摘除路径
同样窄 ⇒ 任务永不退出轮询、列表卡在"执行中"
- 新增 shared/utils/task-terminal.ts 循环骨架(disposed/瞬断预算/恢复提示/
每轮 sleep/非瞬断上抛),六页全部接上;取数、文案、快照合并、DELETED 语义
留在各页回调,没有顺手统一
- 判据两支:骨架 8 例契约 + 六页源码窄集合回归钉(含"判据自己先自证"一例,
loop-run 的 STOPPED 词表不误报)
This commit is contained in:
@@ -297,6 +297,7 @@ import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
|
||||
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm';
|
||||
import { TERMINAL_TASK_STATUSES, isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
|
||||
const MAX_TRANSIENT_ERRORS = 30;
|
||||
/** 任务终态后等待结果文件(Java 侧异步生成)的最大轮次,12 × 10s ≈ 2 分钟 */
|
||||
@@ -1016,57 +1017,46 @@ function findHistoryItemByTaskId(taskId: number) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0;
|
||||
let fileWaitRounds = 0;
|
||||
while (true) {
|
||||
if (disposed) return "STOPPED";
|
||||
if (activeTaskId.value !== taskId) return "DELETED";
|
||||
try {
|
||||
// DELETED 是本页专属终态(会话切走 / 任务行被删),不在通用集合里,必须显式列出
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
if (activeTaskId.value !== taskId) return "DELETED";
|
||||
const missingTaskIds = await refreshActiveTaskProgress([taskId]);
|
||||
if (missingTaskIds.includes(taskId)) {
|
||||
clearActiveQueueTask();
|
||||
return "DELETED";
|
||||
}
|
||||
if (activeTaskId.value !== taskId) return "DELETED";
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
}
|
||||
transientErrorCount = 0;
|
||||
const item = findHistoryItemByTaskId(taskId);
|
||||
const status = item?.taskStatus || "";
|
||||
if (status === "SUCCESS" || status === "FAILED" || status === "COMPLETED") {
|
||||
// 任务终态后结果 Excel 还在异步生成,必须继续轮询到文件就绪再退出:
|
||||
// 一旦退出,clearActiveQueueTask 会停掉历史轮询,fileReady 就再也刷不出来了
|
||||
if (isResultFilePending(item) && fileWaitRounds < MAX_FILE_WAIT_ROUNDS) {
|
||||
fileWaitRounds += 1;
|
||||
console.log(
|
||||
`[patrol-delete] 任务 ${taskId} 已终态(${status}),等待结果文件生成 ${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS}`,
|
||||
);
|
||||
queuePushResult.value = `任务 ${taskId} 已完成,正在生成结果文件(${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS})...`;
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
continue;
|
||||
}
|
||||
if (isResultFilePending(item)) {
|
||||
console.warn(
|
||||
`[patrol-delete] 任务 ${taskId} 结果文件等待超时(${MAX_FILE_WAIT_ROUNDS} 轮),按任务终态返回,可刷新页面查看`,
|
||||
);
|
||||
}
|
||||
return status;
|
||||
// 任务终态后结果 Excel 还在异步生成:报成"非终态"继续等,否则 clearActiveQueueTask
|
||||
// 停掉历史轮询后 fileReady 再也刷不出来
|
||||
if (isTerminalTaskStatus(status) && isResultFilePending(item) && fileWaitRounds < MAX_FILE_WAIT_ROUNDS) {
|
||||
fileWaitRounds += 1;
|
||||
console.log(`[patrol-delete] 任务 ${taskId} 已终态(${status}),等待结果文件生成 ${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS}`);
|
||||
queuePushResult.value = `任务 ${taskId} 已完成,正在生成结果文件(${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS})...`;
|
||||
return "";
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error;
|
||||
if (isTerminalTaskStatus(status) && isResultFilePending(item)) {
|
||||
console.warn(`[patrol-delete] 任务 ${taskId} 结果文件等待超时(${MAX_FILE_WAIT_ROUNDS} 轮),按任务终态返回,可刷新页面查看`);
|
||||
}
|
||||
transientErrorCount += 1;
|
||||
if (transientErrorCount >= MAX_TRANSIENT_ERRORS) {
|
||||
throw new Error(
|
||||
`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`,
|
||||
);
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${transientErrorCount}/${MAX_TRANSIENT_ERRORS})...`;
|
||||
}
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
}
|
||||
return status;
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
intervalMs: getTaskPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: MAX_TRANSIENT_ERRORS,
|
||||
terminal: [...TERMINAL_TASK_STATUSES, "DELETED"],
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -278,6 +278,7 @@ import {
|
||||
import { getPollingProgressBatch } from '@/shared/api/task-progress-polling.ts'
|
||||
import { formatDateTime } from '@/shared/utils/datetime'
|
||||
import { taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text'
|
||||
import { isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
import { runBatchDelete } from '@/shared/utils/batch-delete'
|
||||
import { isRecordMissingError } from '@/shared/utils/task-queue-state.ts'
|
||||
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
@@ -1110,24 +1111,24 @@ async function compensateDispatchFailure(taskId: number, reason: string) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0
|
||||
const maxTransientErrors = 30
|
||||
while (true) {
|
||||
if (disposed) return 'STOPPED'
|
||||
try {
|
||||
const TRANSIENT = ['无法连接到服务', 'bad gateway', 'gateway timeout', 'network error', 'timeout', '502', '503', '504']
|
||||
// 消失与终态的收尾动作原本就是同一组,这里合并成一处
|
||||
const settle = async () => {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
syncPollingIdsWithHistory()
|
||||
}
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
// F5:等待终态的紧循环只读 status(轻量白名单覆盖),走 light 端点减小轮询响应体,异常回退重型 batch
|
||||
const batch = await getPollingProgressBatch('priceTrack', [taskId], {
|
||||
fallback: () => getPriceTrackTaskProgressBatch([taskId]),
|
||||
})
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
}
|
||||
transientErrorCount = 0
|
||||
const batch = await getPollingProgressBatch('priceTrack', [taskId], {
|
||||
fallback: () => getPriceTrackTaskProgressBatch([taskId]),
|
||||
})
|
||||
if ((batch.missingTaskIds || []).includes(taskId)) {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
syncPollingIdsWithHistory()
|
||||
await settle()
|
||||
return 'FAILED'
|
||||
}
|
||||
const detail = (batch.items || []).find((item) => item.task?.id === taskId)
|
||||
@@ -1142,30 +1143,27 @@ async function waitForTaskTerminal(taskId: number) {
|
||||
taskDetails.value = { ...taskDetails.value, [taskId]: status }
|
||||
saveTaskDetailsToStorage()
|
||||
}
|
||||
if (status === 'SUCCESS' || status === 'FAILED') {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
syncPollingIdsWithHistory()
|
||||
return status
|
||||
}
|
||||
} catch (error) {
|
||||
if (isTerminalTaskStatus(status)) await settle()
|
||||
return status
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${attempt}/${budget})...`
|
||||
if (attempt === 1 || attempt % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
},
|
||||
isTransient: (error: unknown) => {
|
||||
const message = (error instanceof Error ? error.message : String(error || '')).toLowerCase()
|
||||
const transient = ['无法连接到服务', 'bad gateway', 'gateway timeout', 'network error', 'timeout', '502', '503', '504'].some((pattern) => message.includes(pattern.toLowerCase()))
|
||||
if (!transient) throw error
|
||||
transientErrorCount += 1
|
||||
if (transientErrorCount >= maxTransientErrors) {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${transientErrorCount}/${maxTransientErrors})...`
|
||||
if (transientErrorCount === 1 || transientErrorCount % 5 === 0) {
|
||||
ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
continue
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
}
|
||||
return TRANSIENT.some((pattern) => message.includes(pattern.toLowerCase()))
|
||||
},
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
},
|
||||
intervalMs: getPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: 30,
|
||||
})
|
||||
}
|
||||
|
||||
function setLoopRun(next: PriceTrackLoopRunVo | null) {
|
||||
@@ -1444,7 +1442,7 @@ async function refreshTaskBatch() {
|
||||
}
|
||||
if (status) {
|
||||
taskDetails.value[taskId] = status
|
||||
if (status === 'SUCCESS' || status === 'FAILED') {
|
||||
if (isTerminalTaskStatus(status)) {
|
||||
console.log(`[price-track] 任务 ${taskId} 已到终态 ${status},移出轮询集合并刷新列表`)
|
||||
removePollingTask(taskId)
|
||||
settled = true
|
||||
|
||||
@@ -181,6 +181,7 @@ import { getPywebviewApi } from '@/shared/bridges/pywebview'
|
||||
import { getTaskPollIntervalMs } from '@/shared/task-progress-config'
|
||||
import { createCategorizedTimers } from '@/shared/utils/categorized-timers'
|
||||
import { saveUrlWithProgress } from '@/shared/utils/download-progress'
|
||||
import { isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
import { checkQueuePayload, guardBlocked } from '@/shared/dispatch-guard'
|
||||
import { passGuard } from '@/shared/dispatch-guard-ui'
|
||||
import ZiniaoVersionSetting from '@/shared/components/ZiniaoVersionSetting.vue'
|
||||
@@ -644,7 +645,7 @@ function taskStatusOf(taskId?: number) {
|
||||
}
|
||||
|
||||
function isTerminalStatus(status?: string) {
|
||||
return status === 'SUCCESS' || status === 'FAILED'
|
||||
return isTerminalTaskStatus(status)
|
||||
}
|
||||
|
||||
function isTaskTerminalById(taskId?: number) {
|
||||
@@ -874,28 +875,19 @@ function stopPolling() {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0
|
||||
const maxTransientErrors = 30
|
||||
while (true) {
|
||||
if (disposed) return 'STOPPED'
|
||||
try {
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
// F5:等待终态的紧循环只读 status,走 light 端点(异常回退重型 batch)
|
||||
const batch = await getPollingProgressBatch('productRisk', [taskId], {
|
||||
fallback: () => getProductRiskTaskProgressBatch([taskId]),
|
||||
})
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
}
|
||||
transientErrorCount = 0
|
||||
const detail = (batch.items || []).find((d) => d.task?.id === taskId)
|
||||
const status = detail?.task?.status || ''
|
||||
|
||||
if (detail) {
|
||||
const prev = taskSnapshots.value[taskId]
|
||||
taskSnapshots.value = {
|
||||
...taskSnapshots.value,
|
||||
[taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail,
|
||||
}
|
||||
taskSnapshots.value = { ...taskSnapshots.value, [taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail }
|
||||
triggerRef(taskSnapshots)
|
||||
saveTaskSnapshotsToStorage()
|
||||
}
|
||||
@@ -903,30 +895,28 @@ async function waitForTaskTerminal(taskId: number) {
|
||||
taskDetails.value[taskId] = status
|
||||
saveTaskDetailsToStorage()
|
||||
}
|
||||
|
||||
if (status === 'SUCCESS' || status === 'FAILED') {
|
||||
if (isTerminalTaskStatus(status)) {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
return status
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error
|
||||
}
|
||||
transientErrorCount += 1
|
||||
if (transientErrorCount >= maxTransientErrors) {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${transientErrorCount}/${maxTransientErrors})...`
|
||||
if (transientErrorCount === 1 || transientErrorCount % 5 === 0) {
|
||||
ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
continue
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
}
|
||||
return status
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${attempt}/${budget})...`
|
||||
if (attempt === 1 || attempt % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
},
|
||||
intervalMs: getPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: 30,
|
||||
})
|
||||
}
|
||||
|
||||
async function confirmAdd() {
|
||||
|
||||
@@ -252,6 +252,7 @@ import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
|
||||
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm';
|
||||
import { TERMINAL_TASK_STATUSES, isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
import { dispatchedPruneNotice, mergeDispatchedArchive, pruneRows } from '@/shared/utils/dispatch-row-prune';
|
||||
import {
|
||||
parseRememberedNames,
|
||||
@@ -996,37 +997,26 @@ function findHistoryItemByTaskId(taskId: number) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0;
|
||||
while (true) {
|
||||
if (disposed) return "STOPPED";
|
||||
try {
|
||||
// 取数与文案留在本页,循环骨架(disposed / 瞬断预算 / 每轮 sleep / 非瞬断上抛)走共用实现
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
await refreshActiveTaskProgress([taskId]);
|
||||
if (activeTaskId.value !== taskId) {
|
||||
return "FAILED";
|
||||
}
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
}
|
||||
transientErrorCount = 0;
|
||||
const item = findHistoryItemByTaskId(taskId);
|
||||
const status = item?.taskStatus || "";
|
||||
if (status === "SUCCESS" || status === "FAILED" || status === "COMPLETED") {
|
||||
return status;
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error;
|
||||
}
|
||||
transientErrorCount += 1;
|
||||
if (transientErrorCount >= MAX_TRANSIENT_ERRORS) {
|
||||
throw new Error(
|
||||
`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`,
|
||||
);
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${transientErrorCount}/${MAX_TRANSIENT_ERRORS})...`;
|
||||
}
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
}
|
||||
if (activeTaskId.value !== taskId) return "FAILED";
|
||||
return findHistoryItemByTaskId(taskId)?.taskStatus || "";
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
intervalMs: getTaskPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: MAX_TRANSIENT_ERRORS,
|
||||
});
|
||||
}
|
||||
|
||||
async function processQueue() {
|
||||
|
||||
@@ -138,6 +138,7 @@ import { useZiniaoVersion } from '@/shared/utils/ziniao-version'
|
||||
import { runBatchDelete } from '@/shared/utils/batch-delete'
|
||||
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
|
||||
import { waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
|
||||
const COUNTRY_OPTIONS = [{ code: 'DE', label: '德国' }, { code: 'UK', label: '英国' }, { code: 'FR', label: '法国' }, { code: 'IT', label: '意大利' }, { code: 'ES', label: '西班牙' }] as const
|
||||
const shopInput = ref('')
|
||||
@@ -481,10 +482,56 @@ function getPollIntervalMs() { return getTaskPollIntervalMs() }
|
||||
function scheduleNextPoll(immediate = false) { if (disposed) return; if (pollTimer.value) { if (!immediate) return; timers.clearTimer('task-poll', pollTimer.value); pollTimer.value = null } const run = async () => { pollTimer.value = null; if (disposed) return; if (pollingInFlight.value || !pollingTaskIds.value.length) { if (pollingTaskIds.value.length) scheduleNextPoll(); return } pollingInFlight.value = true; try { const { settledTaskIds } = await refreshTaskBatch(); if (settledTaskIds.length) await Promise.allSettled([loadHistory(), loadDashboard()]) } finally { pollingInFlight.value = false } if (!disposed && pollingTaskIds.value.length) pollTimer.value = timers.setTimeout('task-poll', run, getPollIntervalMs()) }; if (immediate) void run(); else pollTimer.value = timers.setTimeout('task-poll', run, getPollIntervalMs()) }
|
||||
function ensurePolling(immediate = false) { scheduleNextPoll(immediate) }
|
||||
function stopPolling() { if (pollTimer.value) { timers.clearTimer('task-poll', pollTimer.value); pollTimer.value = null } }
|
||||
async function waitForTaskTerminal(taskId: number) { let transientErrorCount = 0; const maxTransientErrors = 30; while (true) { if (disposed) return 'STOPPED'; try { // F5:等待终态的紧循环只读 status,走 light 端点减小轮询响应体,异常回退重型 batch
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
// F5:等待终态的紧循环只读 status,走 light 端点减小轮询响应体,异常回退重型 batch
|
||||
const batch = await getPollingProgressBatch('shopMatch', [taskId], {
|
||||
fallback: () => getShopMatchTaskProgressBatch([taskId]),
|
||||
}); if (transientErrorCount > 0) queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`; transientErrorCount = 0; if ((batch.missingTaskIds || []).includes(taskId)) { removeTaskLocally(taskId); await refreshTaskViewsBestEffort(); restoreScheduledDispatches(); return 'FAILED' } const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { const prev = taskSnapshots.value[taskId]; taskSnapshots.value = { ...taskSnapshots.value, [taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail }; triggerRef(taskSnapshots); saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (isTaskTerminalStatus(status)) { removePollingTask(taskId); await refreshTaskViewsBestEffort(); restoreScheduledDispatches(); return status } } catch (error) { if (!isTransientBackendError(error)) throw error; transientErrorCount += 1; if (transientErrorCount >= maxTransientErrors) throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`); queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${transientErrorCount}/${maxTransientErrors})...`; if (transientErrorCount === 1 || transientErrorCount % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`); await sleep(getPollIntervalMs()); continue } await sleep(getPollIntervalMs()) } }
|
||||
});
|
||||
if ((batch.missingTaskIds || []).includes(taskId)) {
|
||||
removeTaskLocally(taskId);
|
||||
await refreshTaskViewsBestEffort();
|
||||
restoreScheduledDispatches();
|
||||
return 'FAILED';
|
||||
}
|
||||
const detail = (batch.items || []).find((item) => item.task?.id === taskId);
|
||||
const status = detail?.task?.status || '';
|
||||
if (detail) {
|
||||
const prev = taskSnapshots.value[taskId];
|
||||
taskSnapshots.value = { ...taskSnapshots.value, [taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail };
|
||||
triggerRef(taskSnapshots);
|
||||
saveTaskSnapshotsToStorage();
|
||||
}
|
||||
if (status) {
|
||||
taskDetails.value[taskId] = status;
|
||||
saveTaskDetailsToStorage();
|
||||
}
|
||||
if (isTaskTerminalStatus(status)) {
|
||||
removePollingTask(taskId);
|
||||
await refreshTaskViewsBestEffort();
|
||||
restoreScheduledDispatches();
|
||||
}
|
||||
return status;
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
if (attempt === 1 || attempt % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`);
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`);
|
||||
},
|
||||
intervalMs: getPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: 30,
|
||||
});
|
||||
}
|
||||
async function waitForScheduledTaskStageExit(taskId: number) {
|
||||
let transientErrorCount = 0
|
||||
const maxTransientErrors = 30
|
||||
|
||||
@@ -279,6 +279,7 @@ import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
|
||||
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
|
||||
import { waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
|
||||
const MAX_TRANSIENT_ERRORS = 30;
|
||||
const ziniaoVersion = useZiniaoVersion();
|
||||
@@ -1027,37 +1028,28 @@ function findHistoryItemByTaskId(taskId: number) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0;
|
||||
while (true) {
|
||||
if (disposed) return "STOPPED";
|
||||
try {
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
await refreshActiveTaskProgress([taskId]);
|
||||
if (activeTaskId.value !== taskId) {
|
||||
return "FAILED";
|
||||
}
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
}
|
||||
transientErrorCount = 0;
|
||||
const item = findHistoryItemByTaskId(taskId);
|
||||
const status = item?.taskStatus || "";
|
||||
if (status === "SUCCESS" || status === "FAILED" || status === "COMPLETED") {
|
||||
return status;
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error;
|
||||
}
|
||||
transientErrorCount += 1;
|
||||
if (transientErrorCount >= MAX_TRANSIENT_ERRORS) {
|
||||
throw new Error(
|
||||
`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`,
|
||||
);
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${transientErrorCount}/${MAX_TRANSIENT_ERRORS})...`;
|
||||
}
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
}
|
||||
if (activeTaskId.value !== taskId) return "FAILED";
|
||||
return findHistoryItemByTaskId(taskId)?.taskStatus || "";
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`);
|
||||
},
|
||||
intervalMs: getTaskPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: MAX_TRANSIENT_ERRORS,
|
||||
});
|
||||
}
|
||||
|
||||
async function processQueue() {
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
/**
|
||||
* 任务终态等待的共用骨架(原先在 6 个品牌 Tab 里各写一份 while(true))。
|
||||
*
|
||||
* 抽这一层的原因不是"代码重复",而是**终态集合六份不一致**:
|
||||
* PriceTrack / ProductRisk / ShopMatch 三页只认 `SUCCESS|FAILED`,另三页认 `SUCCESS|COMPLETED|FAILED`。
|
||||
* 而 COMPLETED≡SUCCESS 在两头早就定了:本仓统一文案表 `shared/utils/task-status-text.ts`
|
||||
* 把两者都映射成「已完成」/success 样式,后端看板 `TaskCenterQueryMapper.SUCCESS_STATUSES_ORDERED`
|
||||
* 也是 List.of("SUCCESS","COMPLETED")。窄集合那三页一旦收到 COMPLETED(后端 delete-brand 链路
|
||||
* 与本地会话态 `BrandDeleteBrandTab:611` 都会产出这个值)就会**一路空转到 30 次瞬断预算耗尽**,
|
||||
* 用户看到的是"任务永远执行中",而服务端那边任务早就结束了。
|
||||
*
|
||||
* 除状态外的差异(取数方式、提示文案、页专属副作用)留在调用方回调里,本文件不统一它们:
|
||||
* 那部分是各页的业务形状,合并只会把差异藏起来。
|
||||
*/
|
||||
|
||||
/** 与 task-status-text 的 success/failed 分类一致;CANCELLED 不在任务等待面出现,故不列。 */
|
||||
export const TERMINAL_TASK_STATUSES: readonly string[] = ['SUCCESS', 'COMPLETED', 'FAILED']
|
||||
|
||||
export function isTerminalTaskStatus(status?: string): boolean {
|
||||
if (!status) return false
|
||||
return TERMINAL_TASK_STATUSES.includes(status.trim().toUpperCase())
|
||||
}
|
||||
|
||||
/** 各页瞬断容忍次数原本都是 30,抽成默认值以免第六份再抄一遍。 */
|
||||
export const DEFAULT_TRANSIENT_BUDGET = 30
|
||||
|
||||
export interface TaskTerminalWait {
|
||||
taskId: number
|
||||
/** 页面卸载/停止时返回 true ⇒ 立刻以 'STOPPED' 退出(原先六页都写 `if (disposed) return 'STOPPED'`)。 */
|
||||
isDisposed: () => boolean
|
||||
/**
|
||||
* 取一次状态。返回空串表示"还没到终态,继续等"。
|
||||
* 页专属判定(任务行被删、会话切走、结果文件还没生成)留在这里,
|
||||
* 需要立刻收尾时返回一个终态值即可——`DELETED` / `FAILED` 由各页自己决定,骨架不猜。
|
||||
*/
|
||||
pollStatus: () => Promise<string>
|
||||
/** 每轮一次的页专属副作用(合并快照、刷新进度文案)。 */
|
||||
onStatus?: (status: string) => void
|
||||
/** 瞬断后恢复时的一次提示。 */
|
||||
onRecovered?: () => void
|
||||
/** 每次瞬断的提示(attempt 从 1 开始)。 */
|
||||
onTransient?: (attempt: number, budget: number) => void
|
||||
/** 瞬断判定,沿用各页原有的 TRANSIENT_BACKEND_ERROR_PATTERNS 口径。 */
|
||||
isTransient: (error: unknown) => boolean
|
||||
/** 预算耗尽:六页原本都是 throw(措辞各异),所以默认抛通用文案。 */
|
||||
onBudgetExhausted?: (attempt: number) => never
|
||||
intervalMs: () => number
|
||||
sleep: (ms: number) => Promise<void>
|
||||
transientBudget?: number
|
||||
terminal?: readonly string[]
|
||||
}
|
||||
|
||||
/**
|
||||
* 等到任务终态并返回那个状态字符串。
|
||||
*
|
||||
* 与旧实现保持同一点行为:非瞬断异常照常上抛(不吞),只有被 `isTransient` 认出的错误才计预算;
|
||||
* 预算内的每一轮都 sleep 后再看,disposed 优先于一切判定先返回。
|
||||
*/
|
||||
export async function waitForTaskTerminal(wait: TaskTerminalWait): Promise<string> {
|
||||
const budget = wait.transientBudget ?? DEFAULT_TRANSIENT_BUDGET
|
||||
const terminal = wait.terminal ?? TERMINAL_TASK_STATUSES
|
||||
let transientErrors = 0
|
||||
|
||||
while (true) {
|
||||
if (wait.isDisposed()) return 'STOPPED'
|
||||
try {
|
||||
const status = await wait.pollStatus()
|
||||
if (transientErrors > 0) wait.onRecovered?.()
|
||||
transientErrors = 0
|
||||
wait.onStatus?.(status)
|
||||
const normalized = (status || '').trim().toUpperCase()
|
||||
if (normalized && terminal.includes(normalized)) return normalized
|
||||
} catch (error) {
|
||||
if (!wait.isTransient(error)) throw error
|
||||
transientErrors += 1
|
||||
if (transientErrors >= budget) {
|
||||
if (wait.onBudgetExhausted) return wait.onBudgetExhausted(transientErrors)
|
||||
throw new Error(`任务 ${wait.taskId} 等待服务恢复超时,请稍后刷新查看状态`)
|
||||
}
|
||||
wait.onTransient?.(transientErrors, budget)
|
||||
}
|
||||
await wait.sleep(wait.intervalMs())
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user