207225eb86
后端
- 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 词表不误报)
97 lines
4.4 KiB
TypeScript
97 lines
4.4 KiB
TypeScript
// 终态集合只能有一套:六个品牌 Tab 的"任务到没到终态"判定不许再各写一遍字面量。
|
|
// 跑法:npm test
|
|
import { test } from 'node:test'
|
|
import assert from 'node:assert/strict'
|
|
import { readFileSync } from 'node:fs'
|
|
import { fileURLToPath } from 'node:url'
|
|
import { resolve, dirname } from 'node:path'
|
|
|
|
import { TERMINAL_TASK_STATUSES } from '../src/shared/utils/task-terminal.ts'
|
|
|
|
const here = dirname(fileURLToPath(import.meta.url))
|
|
const TABS = [
|
|
'BrandPatrolDeleteTab.vue',
|
|
'BrandPriceTrackTab.vue',
|
|
'BrandProductRiskTab.vue',
|
|
'BrandQueryAsinTab.vue',
|
|
'BrandShopMatchTab.vue',
|
|
'BrandWithdrawTab.vue',
|
|
]
|
|
|
|
/**
|
|
* 只抓"SUCCESS|FAILED 两个就收尾"的窄集合写法。
|
|
* 后面还跟着 COMPLETED / STOPPED 的不算——巡掉/循环跑那类另有自己的终态词表,
|
|
* 判据一旦误红,下次就没人信它。
|
|
*/
|
|
const NARROW_TERMINAL = /===\s*'SUCCESS'\s*\|\|\s*status\s*===\s*'FAILED'\s*\)/g
|
|
|
|
function findNarrow(source: string): number[] {
|
|
return [...source.matchAll(NARROW_TERMINAL)].map((m) => source.slice(0, m.index).split('\n').length)
|
|
}
|
|
|
|
test('判据自己先自证:窄写法要被抓到、宽写法不许误报', () => {
|
|
assert.deepEqual(findNarrow("if (status === 'SUCCESS' || status === 'FAILED') {"), [1])
|
|
assert.deepEqual(findNarrow("if (status === 'SUCCESS' || status === 'FAILED' || status === 'COMPLETED') {"), [],
|
|
'含 COMPLETED 的是宽集合,不该报')
|
|
assert.deepEqual(findNarrow("return status === 'SUCCESS' || status === 'FAILED' || status === 'STOPPED'"), [],
|
|
'循环跑另有词表,不该报')
|
|
assert.deepEqual(findNarrow("if (isTerminalTaskStatus(status))"), [], '共用判定不该报')
|
|
})
|
|
|
|
test('六个 Tab 里再无窄终态集合', () => {
|
|
const offenders: string[] = []
|
|
for (const tab of TABS) {
|
|
const source = readFileSync(resolve(here, '../src/pages/brand/components', tab), 'utf-8')
|
|
const lines = findNarrow(source)
|
|
if (lines.length) offenders.push(`${tab}:${lines.join(',')}`)
|
|
}
|
|
assert.deepEqual(offenders, [], `这些位置只认 SUCCESS|FAILED:收到 COMPLETED 会空转到瞬断预算耗尽 —— ${offenders}`)
|
|
})
|
|
|
|
/** 只截 waitForTaskTerminal 的函数体:别处的同名局部变量不该被这条判据算进来。 */
|
|
function waitBody(source: string, tab: string): string {
|
|
const start = source.indexOf('async function waitForTaskTerminal(taskId: number)')
|
|
assert.notEqual(start, -1, `${tab} 里没有 waitForTaskTerminal`)
|
|
let depth = 0
|
|
let i = source.indexOf('{', start)
|
|
for (; i < source.length; i += 1) {
|
|
if (source[i] === '{') depth += 1
|
|
else if (source[i] === '}') {
|
|
depth -= 1
|
|
if (depth === 0) break
|
|
}
|
|
}
|
|
return source.slice(start, i + 1)
|
|
}
|
|
|
|
test('六个 Tab 的等待循环都真的走了共用骨架', () => {
|
|
const offenders: string[] = []
|
|
for (const tab of TABS) {
|
|
const source = readFileSync(resolve(here, '../src/pages/brand/components', tab), 'utf-8')
|
|
const body = waitBody(source, tab)
|
|
if (!body.includes('waitForTaskTerminalShared(')) offenders.push(`${tab} 没调骨架`)
|
|
// 骨架之外不该再有第二份 while (true) 的等待循环:`let transientErrorCount` 是它的签名
|
|
if (/let transientErrorCount/.test(body)) offenders.push(`${tab} 仍自己数瞬断`)
|
|
if (/while\s*\(\s*true\s*\)/.test(body)) offenders.push(`${tab} 仍自己写循环`)
|
|
}
|
|
assert.deepEqual(offenders, [], `这些页还在各写一份循环:${offenders}`)
|
|
})
|
|
|
|
test('被改宽的两页确实改用共用判定了', () => {
|
|
for (const tab of ['BrandPriceTrackTab.vue', 'BrandProductRiskTab.vue']) {
|
|
const source = readFileSync(resolve(here, '../src/pages/brand/components', tab), 'utf-8')
|
|
assert.match(source, /from '@\/shared\/utils\/task-terminal'/, `${tab} 没引共用终态判定`)
|
|
assert.ok(source.includes('isTerminalTaskStatus('), `${tab} 引了但没用`)
|
|
}
|
|
})
|
|
|
|
test('COMPLETED 与 SUCCESS 同类的口径两头都有出处', () => {
|
|
// 前端显示表:两个状态都是「已完成」/success 样式
|
|
const display = readFileSync(resolve(here, '../src/shared/utils/task-status-text.ts'), 'utf-8')
|
|
for (const key of TERMINAL_TASK_STATUSES) {
|
|
assert.ok(display.includes(`${key}:`), `显示表里没有 ${key},统一集合就成了无源之水`)
|
|
}
|
|
assert.equal(display.includes("SUCCESS: '已完成'") && display.includes("COMPLETED: '已完成'"), true,
|
|
'COMPLETED≡SUCCESS 的前提是这张表,它变了就得重新对账')
|
|
})
|