fix(alerts): проверять ответы и подтверждать сохранённые параметры

shared/api/alerts.test.ts

@@ -0,0 +1,40 @@
+import assert from "node:assert/strict"
+import {test} from "node:test"
+import {getAlerts,saveAlertRules,saveAlertsTelegram,testAlertsTelegram} from "./alerts"
+const telegram={chatId:"",tokenConfigured:false,connected:false,messageThreadId:null}
+const empty={telegram,groups:[],rules:[],history:[],meta:{servers:[],greClients:[],probeTargets:[],rttLossTargets:[],trafficServers:[],serversDetail:[]}}
+test("Alerts reader preserves known empty/false/null and rejects malformed collections, public secrets and dates",async()=>{
+ const original=globalThis.fetch;try{
+  globalThis.fetch=async()=>Response.json(empty);assert.deepEqual(await getAlerts("https://backend.test"),empty)
+  for(const raw of [{},{...empty,rules:null},{...empty,groups:undefined},{...empty,telegram:{...telegram,connected:true}},{...empty,telegram:{...telegram,token:"secret"}},{...empty,history:[{id:"h",ruleName:"r",severity:"info",message:"m",sent:false,firedAt:"invalid",source:"db"}]}]){globalThis.fetch=async()=>Response.json(raw);await assert.rejects(getAlerts("https://backend.test"),/не подтверждены/)}
+ }finally{globalThis.fetch=original}
+})
+test("Alerts mutations require literal complete receipts and never repeat unknown requests",async()=>{
+ const original=globalThis.fetch;try{
+  for(const call of [()=>saveAlertRules("https://backend.test",{rules:[],groups:[]}),()=>saveAlertsTelegram("https://backend.test",{chatId:""}),()=>testAlertsTelegram("https://backend.test")])for(const raw of [{},{ok:false},{ok:"true"},{ok:true,error:"failed"}]){let calls=0;globalThis.fetch=async()=>{calls++;return Response.json(raw)};await assert.rejects(call(),/не подтвержден/);assert.equal(calls,1)}
+  globalThis.fetch=async()=>Response.json({ok:true,groups:[],rules:[]});assert.equal((await saveAlertRules("https://backend.test",{groups:[],rules:[]})).ok,true)
+  globalThis.fetch=async()=>Response.json({ok:true});assert.deepEqual(await testAlertsTelegram("https://backend.test"),{ok:true})
+ }finally{globalThis.fetch=original}
+})
+test("Telegram selective save confirms sent values and rejects mismatched configured secret/thread/chat",async()=>{
+ const original=globalThis.fetch;try{
+  globalThis.fetch=async(_url,init)=>{assert.deepEqual(JSON.parse(init?.body as string),{chatId:" 123 ",messageThreadId:null});return Response.json({ok:true,telegram:{...telegram,chatId:"123"}})}
+  assert.equal((await saveAlertsTelegram("https://backend.test",{chatId:" 123 ",messageThreadId:null})).telegram.chatId,"123")
+  globalThis.fetch=async()=>Response.json({ok:true,telegram})
+  for(const patch of [{chatId:"123"},{messageThreadId:1},{token:"fixture-secret"}])await assert.rejects(saveAlertsTelegram("https://backend.test",patch),/не совпадают/)
+  assert.equal((await saveAlertsTelegram("https://backend.test",{token:null})).telegram.tokenConfigured,false)
+ }finally{globalThis.fetch=original}
+})
+test("invalid Telegram thread/empty patch and abort do not send requests",async()=>{
+ const original=globalThis.fetch;let calls=0;try{globalThis.fetch=async()=>{calls++;return Response.json({ok:true})};await assert.rejects(saveAlertsTelegram("https://backend.test",{}),/Нет изменённых/);for(const id of [0,-1,1.5,NaN]){await assert.rejects(saveAlertsTelegram("https://backend.test",{messageThreadId:id}),/Проверьте/);await assert.rejects(testAlertsTelegram("https://backend.test",{messageThreadId:id}),/Проверьте/)}const controller=new AbortController();controller.abort();await assert.rejects(getAlerts("https://backend.test",{signal:controller.signal}));assert.equal(calls,0)}finally{globalThis.fetch=original}
+})
+
+test("rules save checks IDs, fields and normalized target/condition arrays without substituting computed labels",async()=>{
+ const original=globalThis.fetch;try{
+  const rule={id:"r",name:"Server",type:"server" as const,target:"host",targets:[" host "],groupId:null,condition:"down",conditions:[" down "],severity:"critical" as const,enabled:false,cooldown:"5м" as const,confirmStabilitySec:0,recoveryMode:"never" as const,recoveryStabilitySec:null,chatId:""}
+  const saved={...rule,targets:["host"],conditions:["down"],confirmStabilitySec:null,lastFiredAt:null}
+  globalThis.fetch=async()=>Response.json({ok:true,groups:[],rules:[saved]});assert.equal((await saveAlertRules("https://backend.test",{rules:[rule],groups:[]})).rules[0].enabled,false)
+  for(const wrong of [{...saved,enabled:true},{...saved,targets:["other"]},{...saved,name:"Other"}]){globalThis.fetch=async()=>Response.json({ok:true,groups:[],rules:[wrong]});await assert.rejects(saveAlertRules("https://backend.test",{rules:[rule],groups:[]}),/не совпадают/)}
+  let calls=0;globalThis.fetch=async()=>{calls++;return Response.json({ok:true})};await assert.rejects(saveAlertRules("https://backend.test",{rules:[rule,rule]}),/Повторяющиеся/);await assert.rejects(saveAlertRules("https://backend.test",{rules:[{...rule,targets:[" "],conditions:[" "]}]}),/непустые/);assert.equal(calls,0)
+ }finally{globalThis.fetch=original}
+})

shared/api/alerts.ts

@@ -0,0 +1,35 @@
+import {z} from "zod"
+import {alertsResponseSchema,alertsRulesReceiptSchema,telegramSettingsReceiptSchema,telegramTestReceiptSchema,putRulesSchema,putTelegramSchema,testTelegramSchema,type PutRulesBody,type PutTelegramBody,type TestTelegramBody} from "@mmapp/contracts/alerts"
+import {requestJson} from "./http-client"
+type Options={signal?:AbortSignal}
+const signal=(options?:Options)=>{const active=options?.signal?AbortSignal.any([options.signal,AbortSignal.timeout(30_000)]):AbortSignal.timeout(30_000);active.throwIfAborted();return active}
+function parse<S extends z.ZodType>(schema:S,raw:unknown,message:string):z.output<S>{const result=schema.safeParse(raw);if(!result.success)throw Error(message);return result.data}
+export async function getAlerts(baseUrl:string,options?:Options){return parse(alertsResponseSchema,await requestJson<unknown>(baseUrl,"/api/alerts",{signal:signal(options),cache:"no-store"}),"Данные оповещений не подтверждены сервером")}
+export async function saveAlertRules(baseUrl:string,payload:PutRulesBody,options?:Options){
+ const body=parse(putRulesSchema,payload,"Проверьте правила и группы оповещений")
+ const ids=new Set(body.rules.map(rule=>rule.id));if(ids.size!==body.rules.length)throw Error("Повторяющиеся ID правил")
+ if(body.groups){const groups=new Set(body.groups.map(group=>group.id));if(groups.size!==body.groups.length||body.rules.some(rule=>rule.groupId?.trim()&&!groups.has(rule.groupId.trim())))throw Error("Повторяющиеся группы или неизвестная группа правила")}
+ for(const rule of body.rules){if(!(rule.targets?.length?rule.targets:[rule.target??""]).some(value=>value.trim())||!(rule.conditions?.length?rule.conditions:[rule.condition??""]).some(value=>value.trim()))throw Error("Нужны непустые объекты и условия правила")}
+ const receipt=parse(alertsRulesReceiptSchema,await requestJson<unknown>(baseUrl,"/api/alerts/rules",{method:"PUT",body:JSON.stringify(body),signal:signal(options)}),"Сохранение правил не подтверждено сервером")
+ const same=(a:unknown,b:unknown)=>JSON.stringify(a)===JSON.stringify(b)
+ if(receipt.rules.length!==body.rules.length||body.rules.some(rule=>{
+  const saved=receipt.rules.find(row=>row.id===rule.id)
+  if(!saved)return true
+  const targets=(rule.targets?.length?rule.targets:[rule.target??""]).map(value=>value.trim()).filter(Boolean)
+  const conditions=(rule.conditions?.length?rule.conditions:[rule.condition??""]).map(value=>value.trim()).filter(Boolean)
+  const expected={name:rule.name,type:rule.type,targets,conditions,groupId:rule.groupId?.trim()||null,severity:rule.severity,enabled:rule.enabled,cooldown:rule.cooldown,confirmStabilitySec:rule.confirmStabilitySec||null,recoveryMode:rule.recoveryMode??"always",recoveryStabilitySec:rule.recoveryStabilitySec||null,chatId:rule.chatId}
+  return Object.entries(expected).some(([key,value])=>!same(saved[key as keyof typeof saved],value))
+ })||body.groups!==undefined&&(receipt.groups.length!==body.groups.length||body.groups.some(group=>{const saved=receipt.groups.find(row=>row.id===group.id);return !saved||Object.entries({...group,name:group.name.trim()||group.id}).some(([key,value])=>!same(saved[key as keyof typeof saved],value))})))throw Error("Сохранённые правила или группы не совпадают с отправленными")
+ return receipt
+}
+export async function saveAlertsTelegram(baseUrl:string,payload:PutTelegramBody,options?:Options){
+ const body=parse(putTelegramSchema,payload,"Проверьте параметры Telegram")
+ if(Object.keys(body).length===0)throw Error("Нет изменённых параметров Telegram")
+ const receipt=parse(telegramSettingsReceiptSchema,await requestJson<unknown>(baseUrl,"/api/alerts/telegram",{method:"PUT",body:JSON.stringify(body),signal:signal(options)}),"Сохранение параметров Telegram не подтверждено сервером")
+ if(body.chatId!==undefined&&receipt.telegram.chatId!==body.chatId.trim()||body.messageThreadId!==undefined&&receipt.telegram.messageThreadId!==body.messageThreadId||body.token!==undefined&&receipt.telegram.tokenConfigured!==Boolean(body.token?.trim()))throw Error("Сохранённые параметры Telegram не совпадают с отправленными")
+ return receipt
+}
+export async function testAlertsTelegram(baseUrl:string,payload:TestTelegramBody={},options?:Options){
+ const body=parse(testTelegramSchema,payload,"Проверьте параметры тестового сообщения Telegram")
+ return parse(telegramTestReceiptSchema,await requestJson<unknown>(baseUrl,"/api/alerts/telegram/test",{method:"POST",body:JSON.stringify(body),signal:signal(options)}),"Отправка тестового сообщения не подтверждена сервером")
+}