fix(alerts): отклонять запись устаревшего снимка правил

This commit is contained in:
Denozordec committed 2026-10-03 18:41:48 +07:00
1 parent c5c1c2812d
commit 382e318b97
23 files changed
+126 -43

No files matched your search

+3 -2
View File
@@ -1,13 +1,14 @@
import {z} from "zod"
import {normalizeAlertsConfig,alertsResponseSchema,alertsRulesReceiptSchema,telegramSettingsReceiptSchema,telegramTestReceiptSchema,putTelegramSchema,testTelegramSchema,type PutRulesBody,type PutTelegramBody,type TestTelegramBody} from "@mmapp/contracts/alerts"
import {requestJson} from "./http-client"
type Options={signal?:AbortSignal}
type Options={signal?:AbortSignal;expectedRevision?:string}
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=normalizeAlertsConfig(payload)
const receipt=parse(alertsRulesReceiptSchema,await requestJson<unknown>(baseUrl,"/api/alerts/rules",{method:"PUT",body:JSON.stringify(body),signal:signal(options)}),"Сохранение правил не подтверждено сервером")
if(!options?.expectedRevision||!/^[a-f0-9]{64}$/.test(options.expectedRevision))throw Error("Обновите снимок правил перед сохранением")
const receipt=parse(alertsRulesReceiptSchema,await requestJson<unknown>(baseUrl,"/api/alerts/rules",{method:"PUT",headers:{"If-Match":'"'+options.expectedRevision+'"'},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)