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:
@@ -0,0 +1,96 @@
|
||||
// 终态集合只能有一套:六个品牌 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 的前提是这张表,它变了就得重新对账')
|
||||
})
|
||||
@@ -0,0 +1,118 @@
|
||||
// 任务终态等待骨架的行为契约。跑法:npm test(node --test tests/*.test.ts)
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
|
||||
import {
|
||||
DEFAULT_TRANSIENT_BUDGET,
|
||||
TERMINAL_TASK_STATUSES,
|
||||
isTerminalTaskStatus,
|
||||
waitForTaskTerminal,
|
||||
} from '../src/shared/utils/task-terminal.ts'
|
||||
|
||||
/**
|
||||
* 只替 IO 边界(取数/睡眠/ disposed),循环本体真跑。
|
||||
* sleep 里把 disposed 置上,避免非终态分支把用例吊死;keepPolling 让状态序列能走完。
|
||||
*/
|
||||
function harness(overrides: any = {}) {
|
||||
const state: any = {
|
||||
disposed: false,
|
||||
statuses: [] as string[],
|
||||
errors: [] as Error[],
|
||||
sleeps: [] as number[],
|
||||
keepPolling: false,
|
||||
...overrides,
|
||||
}
|
||||
const base: any = {
|
||||
taskId: 7,
|
||||
isDisposed: () => state.disposed,
|
||||
pollStatus: async () => {
|
||||
if (state.errors.length) throw state.errors.shift()
|
||||
return state.statuses.length > 1 ? state.statuses.shift() : state.statuses[0] ?? ''
|
||||
},
|
||||
intervalMs: () => 1000,
|
||||
isTransient: (error: any) =>
|
||||
/502|503|504|无法连接到服务|bad gateway|gateway timeout|network error|timeout/i.test(
|
||||
String(error?.message ?? error),
|
||||
),
|
||||
sleep: async (ms: number) => {
|
||||
state.sleeps.push(ms)
|
||||
if (!state.keepPolling) state.disposed = true
|
||||
},
|
||||
}
|
||||
return { state, base }
|
||||
}
|
||||
|
||||
test('COMPLETED 是终态:窄集合那三页以前会空转到预算耗尽', async () => {
|
||||
const { base, state } = harness({ keepPolling: true })
|
||||
state.statuses = ['RUNNING', 'COMPLETED']
|
||||
|
||||
assert.equal(await waitForTaskTerminal(base), 'COMPLETED')
|
||||
assert.equal(state.statuses.length, 1, 'COMPLETED 命中后不该继续把队列取空')
|
||||
})
|
||||
|
||||
test('SUCCESS 与 FAILED 同样立即终止', async () => {
|
||||
for (const status of ['SUCCESS', 'FAILED']) {
|
||||
const { base } = harness()
|
||||
base.pollStatus = async () => status
|
||||
assert.equal(await waitForTaskTerminal(base), status)
|
||||
}
|
||||
})
|
||||
|
||||
test('非终态继续等,并且每轮按页面给的间隔睡一次', async () => {
|
||||
const { base, state } = harness({ keepPolling: true })
|
||||
state.statuses = ['RUNNING', 'PENDING', 'QUEUED', 'SUCCESS']
|
||||
|
||||
assert.equal(await waitForTaskTerminal(base), 'SUCCESS')
|
||||
assert.equal(state.sleeps.length, 3, '前三轮非终态各睡一次,第四轮命中即返回')
|
||||
assert.ok(state.sleeps.every((ms) => ms === 1000), 'sleep 用的是 intervalMs 的值')
|
||||
})
|
||||
|
||||
test('disposed 优先于一切判定', async () => {
|
||||
const { base, state } = harness()
|
||||
state.disposed = true
|
||||
state.statuses = ['SUCCESS']
|
||||
assert.equal(await waitForTaskTerminal(base), 'STOPPED')
|
||||
})
|
||||
|
||||
test('瞬断计预算、恢复后清零、耗尽时抛错', async () => {
|
||||
const transient = () => new Error('502 Bad Gateway')
|
||||
|
||||
const recovered = harness({ keepPolling: true })
|
||||
const attempts: number[][] = []
|
||||
recovered.base.onTransient = (attempt: number, budget: number) => attempts.push([attempt, budget])
|
||||
recovered.state.errors = [transient(), transient()]
|
||||
recovered.state.statuses = ['RUNNING', 'SUCCESS']
|
||||
assert.equal(await waitForTaskTerminal(recovered.base), 'SUCCESS')
|
||||
assert.deepEqual(attempts, [[1, DEFAULT_TRANSIENT_BUDGET], [2, DEFAULT_TRANSIENT_BUDGET]])
|
||||
|
||||
const exhausted = harness({ keepPolling: true })
|
||||
exhausted.state.statuses = ['RUNNING']
|
||||
exhausted.state.errors = Array.from({ length: DEFAULT_TRANSIENT_BUDGET }, transient)
|
||||
await assert.rejects(() => waitForTaskTerminal(exhausted.base), /等待服务恢复超时/)
|
||||
})
|
||||
|
||||
test('非瞬断异常直接上抛,不被骨架吞掉', async () => {
|
||||
const { base, state } = harness({ keepPolling: true })
|
||||
state.errors = [new Error('任务不存在')]
|
||||
state.statuses = ['RUNNING']
|
||||
await assert.rejects(() => waitForTaskTerminal(base), /任务不存在/)
|
||||
})
|
||||
|
||||
test('页专属终态(DELETED)必须显式传 terminal 才生效', async () => {
|
||||
const { base } = harness({ keepPolling: true })
|
||||
base.pollStatus = async () => 'DELETED'
|
||||
|
||||
// 默认集合里没有 DELETED ⇒ 巡店删除页必须自己把它列进 terminal,否则会永远等下去
|
||||
const widened = await waitForTaskTerminal({
|
||||
...base,
|
||||
terminal: [...TERMINAL_TASK_STATUSES, 'DELETED'],
|
||||
})
|
||||
assert.equal(widened, 'DELETED')
|
||||
})
|
||||
|
||||
test('isTerminalTaskStatus 与集合口径一致', () => {
|
||||
assert.equal(isTerminalTaskStatus('completed'), true, '大小写不敏感')
|
||||
assert.equal(isTerminalTaskStatus(' RUNNING '), false)
|
||||
assert.equal(isTerminalTaskStatus(undefined), false, '空状态不能算终态')
|
||||
assert.deepEqual([...TERMINAL_TASK_STATUSES].sort(), ['COMPLETED', 'FAILED', 'SUCCESS'])
|
||||
})
|
||||
Reference in New Issue
Block a user