fix(test): совместить перехват аудита с наблюдателем checkpoint и починить сбои purge

Устаревшие тесты, не дефекты продукта.
- Фикстур configuration-audit-commit оборачивал клиента через Proxy; вместе с
  committed-scoped-checkpoint-observer, который подменяет client.query на
  экземпляре, это давало бесконечную рекурсию (RangeError в приёмке scoped
  route community). Теперь фикстур, как и наблюдатель, подменяет query на
  экземпляре и восстанавливает его при release; отключение не затирает более
  поздние обёртки pool.connect.
- Приёмка NetFlow purge внедряла сбой журнала событий через pool.query, а
  событие пишется через withPartitionWrite на клиенте pool.connect(), поэтому
  режим journal-failure не срабатывал. Сбои журнала/обслуживания партиций
  проверяются в обоих перехватчиках; сообщения assert называют режим.
Проверено: node scripts/test-mcp-postgres.mjs --recovery-maintenance → exit 0.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
DenozordecandClaude Opus 5.5 committed 2026-11-15 23:15:17 +07:00
1 parent dfb73555a7
commit 1094acb5c5
2 files changed
+36 -23

No files matched your search

+28 -20
View File
@@ -9,29 +9,37 @@ type Payload = Record<string, unknown> & { object?: { kind?: unknown } }
* beforeIntent / beforeAcknowledgement may throw to simulate an unavailable or lost audit write.
*/
export function hookConfigurationAudits(hooks: { afterIntentCommit?: (payload: Payload) => Promise<unknown> | unknown; beforeIntent?: (payload: Payload) => void; beforeAcknowledgement?: (payload: Payload) => void }) {
const connect = pool.connect
pool.connect = ((...connectArgs: unknown[]) => {
if (connectArgs.length) return Reflect.apply(connect, pool, connectArgs)
return (Reflect.apply(connect, pool, []) as Promise<PoolClient>).then(client => {
const original = pool.connect
// Wrap the checked-out client in place and restore it on release, so other
// fixtures using the same pattern (e.g. committed-scoped-checkpoint-observer) compose.
let active = true
const connect = ((...connectArgs: unknown[]) => {
if (connectArgs.length || !active) return Reflect.apply(original, pool, connectArgs)
return (Reflect.apply(original, pool, []) as Promise<PoolClient>).then(client => {
const originalQuery = client.query, originalRelease = client.release
let intent: Payload | undefined
return new Proxy(client, { get(target, key) {
if (key === "query") return async (...args: unknown[]) => {
const values = args[1] as unknown[] | undefined
const action = typeof args[0] === "string" && args[0].startsWith("INSERT INTO mcp_audit") ? values?.[1] : undefined
const payload = action ? JSON.parse(String(values?.[3])) as Payload : undefined
if (action === "configuration.intent") hooks.beforeIntent?.(payload!)
if (action === "configuration.acknowledged") hooks.beforeAcknowledgement?.(payload!)
const result = await Reflect.apply(target.query, target, args)
if (action === "configuration.intent") intent = payload
if (args[0] === "COMMIT" && intent) { const committed = intent; intent = undefined; await hooks.afterIntentCommit?.(committed) }
return result
}
const value = Reflect.get(target, key)
return typeof value === "function" ? value.bind(target) : value
} })
client.query = (async (...args: unknown[]) => {
if (typeof args.at(-1) === "function") return Reflect.apply(originalQuery, client, args)
const values = args[1] as unknown[] | undefined
const action = typeof args[0] === "string" && args[0].startsWith("INSERT INTO mcp_audit") ? values?.[1] : undefined
const payload = action ? JSON.parse(String(values?.[3])) as Payload : undefined
if (action === "configuration.intent") hooks.beforeIntent?.(payload!)
if (action === "configuration.acknowledged") hooks.beforeAcknowledgement?.(payload!)
const result = await Reflect.apply(originalQuery, client, args)
if (action === "configuration.intent") intent = payload
if (args[0] === "COMMIT" && intent) { const committed = intent; intent = undefined; await hooks.afterIntentCommit?.(committed) }
return result
}) as typeof client.query
client.release = ((...args: unknown[]) => {
client.query = originalQuery; client.release = originalRelease
return Reflect.apply(originalRelease, client, args)
}) as typeof client.release
return client
})
}) as typeof pool.connect
return () => { pool.connect = connect }
pool.connect = connect
// A later wrapper may still hold this one as its original; deactivate instead of clobbering it.
return () => { active = false; if (pool.connect === connect) pool.connect = original }
}
const matcher = (kind: string | ((payload: Payload) => boolean)) => typeof kind === "string" ? (payload: Payload) => payload.object?.kind === kind : kind
+8 -3
View File
@@ -51,6 +51,11 @@ export async function verifyMcpFlowPurge(actor:AuthUser){
await originalQuery("INSERT INTO flow_daily_facts(server_id,day,iface,country,service,asn,bytes) VALUES($1,$2,'fixture','XX','other',0,100)",[sid,day])
await originalQuery("UPDATE traffic_flow_settings SET packets_received=42,last_exporter_ip='192.0.2.1',last_error='fixture' WHERE id=1")
}
// Journal/maintenance faults may run on pool.query or on a partition-write client.
const postPurgeFault=(sql:string)=>{
if(!injected&&mode==="journal-failure"&&/^insert into "events"/i.test(sql)){injected=true;return Promise.reject(Error("NEVER_EVENT_PRIVATE"))}
if(!injected&&mode==="maintenance-failure"&&deletions>faultBaseline&&sql.includes("FROM pg_inherits")){injected=true;return Promise.reject(Error("NEVER_PARTITION_PRIVATE"))}
}
// Faults intercept only the exact owned deletion transaction. A lost COMMIT
// response is simulated after the real COMMIT, proving unknown without replay.
pool.connect=(async(...connectionArgs:unknown[])=>{
@@ -64,6 +69,7 @@ export async function verifyMcpFlowPurge(actor:AuthUser){
if(deleting&&!injected&&mode==="rollback"&&sql==="DELETE FROM flow_minute_dims"){injected=true;return Promise.reject(Error("owned delete failure"))}
if(deleting&&!injected&&mode==="late-source"&&sql.startsWith("SELECT id FROM traffic_flow_settings")){injected=true;return(query as(...args:unknown[])=>Promise<unknown>)(...args).then(async value=>{await query("UPDATE traffic_flow_settings SET top_n=top_n+1 WHERE id=1");return value})}
if(deleting&&!injected&&mode==="lost-commit"&&sql==="COMMIT"){injected=true;return(query as(...args:unknown[])=>Promise<unknown>)(...args).then(()=>{throw Error("lost COMMIT response")})}
const fault=postPurgeFault(sql);if(fault)return fault
return(query as(...args:unknown[])=>unknown)(...args)
})as typeof client.query
client.release=((...args:unknown[])=>{client.query=query as typeof client.query;client.release=release;return(release as(...args:unknown[])=>unknown)(...args)})as typeof client.release
@@ -71,8 +77,7 @@ export async function verifyMcpFlowPurge(actor:AuthUser){
})as typeof pool.connect
pool.query=((...args:unknown[])=>{
const sql=typeof args[0]==="string"?args[0]:(args[0]as{text?:string})?.text??""
if(!injected&&mode==="journal-failure"&&/^insert into "events"/i.test(sql)){injected=true;return Promise.reject(Error("NEVER_EVENT_PRIVATE"))}
if(!injected&&mode==="maintenance-failure"&&deletions>faultBaseline&&sql.includes("FROM pg_inherits")){injected=true;return Promise.reject(Error("NEVER_PARTITION_PRIVATE"))}
const fault=postPurgeFault(sql);if(fault)return fault
const pending=(originalQuery as(...args:unknown[])=>Promise<unknown>)(...args)
if(!injected&&mode==="new-flow"&&sql.startsWith("UPDATE mcp_operation_steps SET state='applied'")){injected=true;return pending.then(async value=>{await originalQuery("INSERT INTO flow_buckets(server_id,bucket_at,src,dst,bytes) VALUES($1,$2,'192.0.2.2','198.51.100.2',200)",[sid,stamp]);return value})}
return pending
@@ -97,7 +102,7 @@ export async function verifyMcpFlowPurge(actor:AuthUser){
assert.equal(count,fault==="lost-commit"?0:1);const after:number=deletions;await applyPlan(principal,result.plan.planId,result.key);assert.equal(deletions,after);assert.ok(after<=before+1)
}
for(const fault of["journal-failure","maintenance-failure","new-flow"]){
mode=fault;injected=false;faultBaseline=deletions;await seed();result=await apply();assert.equal(result.state,"applied");assert.equal(injected,true)
mode=fault;injected=false;faultBaseline=deletions;await seed();result=await apply();assert.equal(result.state,"applied",fault);assert.equal(injected,true,fault)
const receipt=(await originalQuery("SELECT result FROM mcp_operation_steps WHERE operation_id=$1",[result.op.id])).rows[0].result
assert.ok(!JSON.stringify(receipt).includes("NEVER_EVENT_PRIVATE"));assert.ok(!JSON.stringify(receipt).includes("NEVER_PARTITION_PRIVATE"))
if(fault==="journal-failure")assert.ok(receipt.eventError)