aea5614a8b
useTaskProgressLoop 的 DEFAULT_TERMINAL 只认 SUCCESS|FAILED,而 COMPLETED≡SUCCESS
(task-status-text 把两者都映射成「已完成」,看板 SUCCESS_STATUSES_ORDERED 也含两者)。
收到 COMPLETED 不退出的轮询会一直空转到瞬断预算耗尽——这形状先前在跟价与风控两页踩过。
唯一被这次改宽影响的页面是 BrandCollectDataTab(它不传 isTerminal);BrandPublishTab
传自己那份含 COMPLETED+CANCELLED 的判定,行为不变,已用单独一条钉子钉住。
判据原先是"变量名恰为 status"的源码正则,同形异名全 src 有 16 处抓不到,等于恒绿;
现在用 typescript(node_modules 里已有)做 AST 尺子,并把"旧正则对三条反例失明"写进断言。
ShopMatch 的 waitForScheduledTaskStageExit 等的是阶段不是任务终态,为此给骨架加了可选
exitOn,保住它原有语义、未知状态不会挂死。
口径更正:窄集合"全 src 应为 0"不成立——实测 20 处/8 文件是 fileStatus(结果文件维度)、
loop-run 带 STOPPED 的词表、显示与下载判定,不同维度不该混进一本账;改成迁移面硬 0 +
逐文件台账只许减。catch 同理:grep 'catch (' 的 292 数不到无绑定 catch {,AST 口径 295/84。
180 lines
9.4 KiB
TypeScript
180 lines
9.4 KiB
TypeScript
// 终态词表合一之后的行为钉子(四面9分口径 §2 用户端「第二套终态词表」)。
|
||
//
|
||
// .vue 在本套件里挂不起来(没有 @vue/test-utils,见 tests/enqueue-rejection-wiring.test.ts 的说明),
|
||
// 所以这两条钉子按「页面的真实配置 + 真实骨架」两半钉:
|
||
// ① 用 AST 从页面源码里读出它喂给 useTaskProgressLoop 的终态配置(不手抄状态字面量,抄的副本会和源码漂移);
|
||
// ② 把那份配置交给真的 useTaskProgressLoop 跑,断言收到 COMPLETED 会终止、任务从轮询集合摘除、不再继续发请求。
|
||
// 跑法:npm test
|
||
import { test } from 'node:test'
|
||
import assert from 'node:assert/strict'
|
||
import { fileURLToPath } from 'node:url'
|
||
import { dirname, resolve } from 'node:path'
|
||
|
||
import { useTaskProgressLoop } from '../src/shared/composables/useTaskProgressLoop.ts'
|
||
import { TERMINAL_TASK_STATUSES, waitForTaskTerminal } from '../src/shared/utils/task-terminal.ts'
|
||
import { readProgressLoopConfigs, readSource } from './helpers/task-terminal-ast-ruler.ts'
|
||
|
||
const here = dirname(fileURLToPath(import.meta.url))
|
||
const root = resolve(here, '..')
|
||
const COLLECT = 'src/pages/brand/components/BrandCollectDataTab.vue'
|
||
const PUBLISH = 'src/pages/brand/components/BrandPublishTab.vue'
|
||
|
||
interface Item { taskId?: number; status?: string }
|
||
|
||
function setupWindow() {
|
||
const storage = new Map<string, string>()
|
||
;(globalThis as Record<string, unknown>).window = {
|
||
localStorage: {
|
||
getItem: (k: string) => storage.get(k) ?? null,
|
||
setItem: (k: string, v: string) => { storage.set(k, v) },
|
||
removeItem: (k: string) => { storage.delete(k) },
|
||
},
|
||
setTimeout: (fn: () => void, ms: number) => globalThis.setTimeout(fn, ms),
|
||
clearTimeout: (id: unknown) => globalThis.clearTimeout(id as number),
|
||
setInterval: (fn: () => void, ms: number) => globalThis.setInterval(fn, ms),
|
||
clearInterval: (id: unknown) => globalThis.clearInterval(id as number),
|
||
}
|
||
}
|
||
|
||
const tick = (ms = 0) => new Promise<void>((r) => globalThis.setTimeout(r, ms))
|
||
|
||
/**
|
||
* 按页面的真实终态配置跑一轮轮询。
|
||
* isTerminal 省略=这页吃的就是骨架那份词表(BrandCollectDataTab 正是这种)。
|
||
*/
|
||
async function driveLoop(cfg: { isTerminalWords: string[]; passesIsTerminal: boolean }, status: string) {
|
||
let fetches = 0
|
||
const terminalCalls: Array<{ taskId: number; status: string }> = []
|
||
const errors: unknown[] = []
|
||
const predicate = cfg.passesIsTerminal
|
||
? { isTerminal: (s: string) => cfg.isTerminalWords.includes((s || '').trim().toUpperCase()) }
|
||
: {}
|
||
const loop = useTaskProgressLoop<Item>({
|
||
scope: `terminal-${status}-${Date.now()}`,
|
||
fetchProgress: async () => { fetches += 1; return { items: [{ taskId: 9, status }] } },
|
||
extractTaskId: (d) => d?.taskId,
|
||
extractStatus: (d) => d?.status,
|
||
getIntervalMs: () => 5, // 窄词表空转时这一下就会露出来:请求一轮接一轮停不住
|
||
onTerminal: (taskId, _detail, s) => { terminalCalls.push({ taskId, status: s }) },
|
||
onError: (e) => { errors.push(e) },
|
||
...predicate,
|
||
})
|
||
loop.reset([9])
|
||
await tick(0) // reset 触发的那一轮
|
||
return { loop, terminalCalls, errors, polls: () => fetches }
|
||
}
|
||
|
||
test('BrandCollectDataTab 没传 isTerminal:它吃的就是骨架那份词表', () => {
|
||
const cfgs = readProgressLoopConfigs(readSource(COLLECT, root), COLLECT)
|
||
assert.equal(cfgs.length, 1, `从源码里读到 ${cfgs.length} 处 useTaskProgressLoop 调用,判据前提没了`)
|
||
assert.equal(cfgs[0].passesIsTerminal, false,
|
||
'这页一旦开始自传 isTerminal,"共用词表"这条钉子就管不到它了,要连这条一起改')
|
||
})
|
||
|
||
test('BrandCollectDataTab 的配置收到 COMPLETED 会终止,并且不再空转发请求', async () => {
|
||
setupWindow()
|
||
const cfgs = readProgressLoopConfigs(readSource(COLLECT, root), COLLECT)
|
||
const h = await driveLoop(cfgs[0], 'COMPLETED')
|
||
await tick(60)
|
||
|
||
assert.deepEqual(h.terminalCalls, [{ taskId: 9, status: 'COMPLETED' }], 'COMPLETED 必须触发一次终态回调')
|
||
assert.deepEqual(h.loop.taskIds.value, [], '任务要能从轮询集合里摘掉')
|
||
assert.equal(h.polls(), 1, `COMPLETED 之后还在发第 ${h.polls()} 轮请求 ⇒ 又空转了`)
|
||
assert.deepEqual(h.errors, [])
|
||
h.loop.dispose()
|
||
})
|
||
|
||
test('BrandPublishTab 的配置收到 COMPLETED 同样终止(它自带 CANCELLED,但仍认 COMPLETED)', async () => {
|
||
setupWindow()
|
||
const cfgs = readProgressLoopConfigs(readSource(PUBLISH, root), PUBLISH)
|
||
assert.equal(cfgs.length, 1, `从源码里读到 ${cfgs.length} 处 useTaskProgressLoop 调用`)
|
||
assert.equal(cfgs[0].passesIsTerminal, true, '这页原本就自传 isTerminal,本轮迁移不该让它退回默认')
|
||
assert.ok(cfgs[0].isTerminalWords.includes('COMPLETED'),
|
||
`页内词表 ${cfgs[0].isTerminalWords.join('|')} 里没有 COMPLETED——那这页收到 COMPLETED 会一直轮询`)
|
||
|
||
const h = await driveLoop(cfgs[0], 'COMPLETED')
|
||
await tick(60)
|
||
assert.deepEqual(h.terminalCalls, [{ taskId: 9, status: 'COMPLETED' }])
|
||
assert.equal(h.polls(), 1, 'COMPLETED 之后不该再发请求')
|
||
assert.deepEqual(h.loop.taskIds.value, [])
|
||
h.loop.dispose()
|
||
})
|
||
|
||
test('反面钉子:换成迁移前那份窄词表,同一条 COMPLETED 就会空转(证明上面两条不是恒绿)', async () => {
|
||
setupWindow()
|
||
const narrow = { passesIsTerminal: true, isTerminalWords: ['SUCCESS', 'FAILED'] }
|
||
const h = await driveLoop(narrow, 'COMPLETED')
|
||
await tick(60)
|
||
|
||
assert.deepEqual(h.terminalCalls, [], '窄词表本就不该认 COMPLETED——这条如果变了说明 driveLoop 写错了')
|
||
assert.deepEqual(h.loop.taskIds.value, [9], '任务仍留在轮询集合里')
|
||
assert.ok(h.polls() > 1, `窄词表下必须能看到"停不下来的轮询",否则上面那条钉子没有对照:实际轮询 ${h.polls()} 次`)
|
||
h.loop.dispose()
|
||
})
|
||
|
||
// —— BrandShopMatchTab 的排期阶段等待:等的是阶段退出,不是任务终态 ——
|
||
|
||
/** 骨架的紧循环只替 IO 边界;循环本体真跑。 */
|
||
function stageHarness(statuses: string[], exitOn?: (s: string) => boolean) {
|
||
const queue = [...statuses]
|
||
const sleeps: number[] = []
|
||
let disposed = false
|
||
const wait = {
|
||
taskId: 4321,
|
||
isDisposed: () => disposed,
|
||
pollStatus: async () => (queue.length > 1 ? queue.shift() as string : queue[0] ?? ''),
|
||
intervalMs: () => 1000,
|
||
isTransient: () => false,
|
||
sleep: async () => { sleeps.push(1000); if (sleeps.length > 6) disposed = true },
|
||
...(exitOn ? { exitOn } : {}),
|
||
}
|
||
return { wait, queue, sleeps }
|
||
}
|
||
|
||
test('阶段型等待:RUNNING 继续等,离开 RUNNING(含 SCHEDULED 与未知状态)立刻退出', async () => {
|
||
const stageExit = (s: string) => s !== 'RUNNING'
|
||
|
||
const running = stageHarness(['RUNNING', 'SCHEDULED'], stageExit)
|
||
assert.equal(await waitForTaskTerminal(running.wait), 'SCHEDULED', 'SCHEDULED 不在任务终态词表里,但这一轮确实结束了')
|
||
|
||
// 后端给了个谁都没见过的状态:必须退出。堆一张 terminal 表就会在这里挂死(永不命中)
|
||
const mystery = stageHarness(['MYSTAGE'], stageExit)
|
||
assert.equal(await waitForTaskTerminal(mystery.wait), 'MYSTAGE')
|
||
|
||
// 空串仍是「还没轮到结果」,不许当成退出
|
||
const blank = stageHarness(['', ''], stageExit)
|
||
assert.equal(await waitForTaskTerminal(blank.wait), 'STOPPED', '空状态只能继续等,靠 sleep 兜到 disposed')
|
||
assert.ok(blank.sleeps.length > 1, `空状态该按轮 sleep 而不是当场退出:${blank.sleeps.length}`)
|
||
})
|
||
|
||
test('窄词表的后果实测:命不中就只能等 disposed(迁移前正是这一形状)', async () => {
|
||
// 同一个 COMPLETED,配上迁移前那份词表 ⇒ 永不命中,只能被 sleep 上限的 disposed 捞出来
|
||
const h = stageHarness(['COMPLETED'])
|
||
const narrow = { ...h.wait, terminal: ['SUCCESS', 'FAILED'] }
|
||
assert.equal(await waitForTaskTerminal(narrow), 'STOPPED', '窄词表下唯一出口是 disposed')
|
||
assert.ok(h.sleeps.length > 1, `空转轮次没测出来:${h.sleeps.length}`)
|
||
|
||
// 对照:共用词表下第一轮就命中,一次都不该 sleep
|
||
const wide = stageHarness(['COMPLETED'])
|
||
assert.equal(await waitForTaskTerminal(wide.wait), 'COMPLETED')
|
||
assert.equal(wide.sleeps.length, 0, '命中终态后不该再 sleep')
|
||
})
|
||
|
||
test('exitOn 只改退出条件,不许把终态词表换掉(任务型等待仍走 terminal)', async () => {
|
||
assert.deepEqual([...TERMINAL_TASK_STATUSES].sort(), ['COMPLETED', 'FAILED', 'SUCCESS'])
|
||
const noExitOn = stageHarness(['RUNNING', 'COMPLETED'])
|
||
assert.equal(await waitForTaskTerminal(noExitOn.wait), 'COMPLETED', '不传 exitOn 时仍按共用词表命中')
|
||
})
|
||
|
||
test('排期那条链的文案与重型取数没被顺手统一掉', () => {
|
||
const source = readSource('src/pages/brand/components/BrandShopMatchTab.vue', root).replace(/\r\n/g, '\n')
|
||
const start = source.indexOf('async function waitForScheduledTaskStageExit')
|
||
assert.notEqual(start, -1, '排期等待函数没了')
|
||
const body = source.slice(start, source.indexOf('\nfunction resolvedTaskStatus', start))
|
||
for (const phrase of ['继续等待当前轮次结束', '正在等待当前轮次结束', '等待当前轮次结束超时']) {
|
||
assert.ok(body.includes(phrase), `文案改了:${phrase}`)
|
||
}
|
||
assert.ok(body.includes('getShopMatchTaskProgressBatch'), '排期链原本读重型 batch,不该顺手换成 light 端点')
|
||
assert.ok(/transientBudget:\s*30/.test(body), '瞬断预算仍是这页原本的 30')
|
||
})
|