fix(通知): 麦象不可读不再折叠成「无异常」、探活 4xx 不冒充正常、交付不完整独立成 scene,前端入队拒绝按机器码决定重试

- MaixiangConsoleClient 新增 probeReadable/classifyReadout,把四种「读不出来」的形状与
  「确实无异常」分开;MaixiangAnomalyScanner 在六项扫描前先过这道闸,读不通就喊一条
  天级去重的管理员异常并退出本轮——此前后台挂掉时六项一致报「无异常」,服务探测还是绿的。
- NotificationScanScheduler 的探活改三态 ALIVE/UNVERIFIED/DOWN:401/403/404 说明请求被
  挡在业务之外,拿不到健康证据,不能再按 <500 判成「服务正常」。
- task_partial(交付不完整)从 task_failed 里拆出来独立成 scene,仍归任务异常大类;
  NotificationDispatchService 的管理员行改用 SCENE_TASK_PARTIAL。
- 前端 dispatch-guard 用机器码 shop_busy/queue_full 判定「等一会儿再推就会成」,
  暂缓 20s×15 封顶;此前页面靠 includes('当前店铺正在执行中') 匹配中文,而文案中间
  插了店铺名,永远匹配不到⇒同店互斥被写成任务失败。

护栏:后端 notification 六支用例(含 MaixiangConsoleClientTest 15 例、
MaixiangAnomalyScannerTest 24 例)、前端 dispatch-guard 与 enqueue-rejection-wiring 两支;
后端全量 3827 例 0 红、前端 717 例 0 失败;变异 M1-M7、M12-M14 共 10/10 杀。
This commit is contained in:
2026-10-06 11:46:54 +08:00
parent e0cdd102d5
commit fcb7fca0b0
18 changed files with 545 additions and 47 deletions
@@ -126,6 +126,7 @@ import { createCategorizedTimers } from '@/shared/utils/categorized-timers'
import { saveUrlWithProgress } from '@/shared/utils/download-progress'
import {
checkQueuePayload,
classifyQueueRejection,
guardBlocked,
} from '@/shared/dispatch-guard'
import { passGuard } from '@/shared/dispatch-guard-ui'
@@ -1187,11 +1188,6 @@ function scheduleAutoAdvanceRetry(delayMs = 3000) {
}, delayMs)
}
function isQueueBusyError(message?: string) {
if (!message) return false
return message.includes('当前店铺正在执行中')
}
function isPythonQueueBusy() {
for (const task of sessionTasks.value) {
for (const item of task.items) {
@@ -1303,7 +1299,9 @@ async function runItem(item: DeleteBrandResultItem, options?: { auto?: boolean }
qpr = `启动任务失败:${message}`
queuePushResult.value = qpr
saveSessionTask(taskId, sessionTask.items, qpr, queuePayloadText.value)
if (options?.auto && isQueueBusyError(message)) {
// 同店互斥/队列满只是"客户端这会儿接不下",交给自动续排稍后再推。
// 页面过去自己匹配中文提示,而客户端把店名插在提示中间,那条判据从来没命中过。
if (options?.auto && classifyQueueRejection(pushResult).deferrable) {
return { success: false, retryable: true }
}
}
@@ -234,8 +234,12 @@ import { getTaskPollIntervalMs } from '@/shared/task-progress-config'
import { createCategorizedTimers } from '@/shared/utils/categorized-timers'
import { saveUrlWithProgress } from '@/shared/utils/download-progress'
import {
ENQUEUE_DEFERRAL_ATTEMPTS,
ENQUEUE_DEFERRAL_RETRY_MS,
EXCEL_CSV_EXTENSIONS,
checkQueuePayload,
classifyQueueRejection,
shouldDeferQueuePush,
} from '@/shared/dispatch-guard'
import { passGuard } from '@/shared/dispatch-guard-ui'
import { useZiniaoVersion } from '@/shared/utils/ziniao-version'
@@ -1061,20 +1065,30 @@ async function enqueueCreatedTask(api: PywebviewApi, taskId: number, queuePayloa
await compensateDispatchFailure(taskId, reason)
throw new Error(reason)
}
let pushResult: Awaited<ReturnType<NonNullable<PywebviewApi['enqueue_json']>>>
try {
pushResult = await api.enqueue_json(queuePayload)
} catch (error) {
const reason = `任务队列调用异常:${error instanceof Error ? error.message : String(error || '未知错误')}`
await compensateDispatchFailure(taskId, reason)
throw new Error(reason)
let attempt = 0
let reason = '任务队列拒绝接收任务'
while (true) {
if (disposed) throw new Error('component disposed')
let pushResult: Awaited<ReturnType<NonNullable<PywebviewApi['enqueue_json']>>>
try {
pushResult = await api.enqueue_json(queuePayload)
} catch (error) {
reason = `任务队列调用异常:${error instanceof Error ? error.message : String(error || '未知错误')}`
await compensateDispatchFailure(taskId, reason)
throw new Error(reason)
}
if (pushResult?.success) return pushResult
const rejection = classifyQueueRejection(pushResult)
reason = pushResult?.error || '任务队列拒绝接收任务'
// 同店互斥/队列满不是「任务失败」:客户端那边跑完就腾出位置了。等到预算用尽
// 才落 FAILED —— 否则点重一次就把任务和已扣的次数一起判死,还多投一条任务失败通知。
if (!shouldDeferQueuePush(rejection, attempt, ENQUEUE_DEFERRAL_ATTEMPTS)) break
attempt += 1
queuePushResult.value = `${reason},${ENQUEUE_DEFERRAL_RETRY_MS / 1000} 秒后重试(${attempt}/${ENQUEUE_DEFERRAL_ATTEMPTS})`
await sleep(ENQUEUE_DEFERRAL_RETRY_MS)
}
if (!pushResult?.success) {
const reason = pushResult?.error || '任务队列拒绝接收任务'
await compensateDispatchFailure(taskId, reason)
throw new Error(reason)
}
return pushResult
await compensateDispatchFailure(taskId, reason)
throw new Error(reason)
}
async function compensateDispatchFailure(taskId: number, reason: string) {