@@ -17,7 +17,7 @@ import { Separator } from "@/components/ui/separator"
import { cn } from "@/lib/utils"
import { filtersResponseSchema , filtersMutationSchema , filtersGreResponseSchema , filtersRecursiveResponseSchema } from "@/lib/filters-response"
import { firewallServersSchema } from "@/lib/firewall-response"
import { requestJson } from "@/shared/api/http-client"
import { ApiClientError , requestJson } from "@/shared/api/http-client"
import {
servers , greTunnels , serverFilterRulesets , filters as mockFiltersCatalog ,
type FilterRule , type ServerFilterRuleset , type Server , type GreTunnel ,
@@ -874,7 +874,7 @@ function CopyRulesSheet({
greByServer : Record < string , GreTunnel [ ] >
ensureGreFor ? : ( serverId : string ) = > void
recRoutesByServer : Record < string , RecursiveRouteLite [ ] >
ensureRecursiveFor ? : ( serverId : string ) = > void
ensureRecursiveFor ? : ( serverId : string ) = > Promise < void >
catalogReady? : GatewayReadiness
} ) {
const [ selected , setSelected ] = useState < Set < string > > ( ( ) = > new Set ( sourceRules . map ( r = > r . id ) ) )
@@ -1229,7 +1229,11 @@ function CopyRulesSheet({
< / fieldset >
{ targetId && ! mappingReady && < div className = "px-5 py-3 flex flex-col gap-2" >
< p role = "alert" className = "text-sm text-destructive" > К а т а л о г и и л и с о п о с т а в л е н и е ш л ю з о в н е п о д т в е р ж д е н ы . К о п и р о в а н и е м а р ш р у т о в з а б л о к и р о в а н о . < / p >
< Button variant = "outline" disabled = { copying } onClick = { ( ) = > { for ( const id of [ sourceServerId , targetId ] ) { ensureGreFor ? . ( id ) ; ensureRecursiveFor ? . ( id ) } } } > О б н о в и т ь ш л ю з ы < / Button >
< Button variant = "outline" disabled = { copying } onClick = { ( ) = > {
ensureGreFor ? . ( sourceServerId )
ensureGreFor ? . ( targetId )
void ensureRecursiveFor ? . ( sourceServerId ) . then ( ( ) = > ensureRecursiveFor ( targetId ) )
} } > О б н о в и т ь ш л ю з ы < / Button >
< / div > }
{ copyError && < p role = "alert" className = "px-5 py-3 text-sm text-destructive" > { copyError } < / p > }
{ copying && < p role = "status" className = "px-5 py-2 text-sm text-muted-foreground" > О ж и д а н и е п о д т в е р ж д е н и я к о п и р о в а н и я … < / p > }
@@ -1268,6 +1272,28 @@ function makeApiFetch(backendUrl: string) {
}
}
const configurationBusyMessage = "Конфигурация временно занята другой операцией"
function isConfigurationBusy ( error : unknown ) : boolean {
if ( ! ( error instanceof ApiClientError ) || error . status !== 409 ) return false
const payload = error . payload
return ( typeof payload === "object" && payload !== null && "code" in payload && payload . code === "CONFIGURATION_BUSY" )
|| /^(?:Глобальная конфигурация|Конфигурация сервера) изменяется другой операцией$/ . test ( error . message )
}
async function readFiltersWithRetry < T > ( read : ( ) = > Promise < T > , isCurrent : ( ) = > boolean ) : Promise < T > {
for ( const delay of [ 350 , 1000 ] ) {
try {
return await read ( )
} catch ( error ) {
if ( ! isConfigurationBusy ( error ) || ! isCurrent ( ) ) throw error
await new Promise ( resolve = > setTimeout ( resolve , delay ) )
if ( ! isCurrent ( ) ) throw error
}
}
return read ( )
}
function FiltersPage() {
const { mode , backendUrl } = useDataSource ( )
const mounted = useRef ( true )
@@ -1336,7 +1362,10 @@ function FiltersPage() {
setGatewayReady ( prev = > ( { . . . prev , [ serverId ] : { . . . prev [ serverId ] , [ kind ] : false } } ) )
try {
const path = kind === "gre" ? "/api/filters/gre-tunnels" : "/api/recursive-routes"
const payload = await apiFetch < unknown > ( ` ${ path } ?serverId= ${ encodeURIComponent ( serverId ) } ` )
const payload = await readFiltersWithRetry (
( ) = > apiFetch < unknown > ( ` ${ path } ?serverId= ${ encodeURIComponent ( serverId ) } ` ) ,
( ) = > mounted . current && gatewayEpoch . current [ key ] === epoch ,
)
if ( ! mounted . current || gatewayEpoch . current [ key ] !== epoch ) return
if ( kind === "gre" ) {
const parsed = filtersGreResponseSchema . safeParse ( payload )
@@ -1352,7 +1381,9 @@ function FiltersPage() {
setGatewayErrors ( prev = > ( { . . . prev , [ serverId ] : { . . . prev [ serverId ] , [ kind ] : undefined } } ) )
} catch ( error ) {
if ( ! mounted . current || gatewayEpoch . current [ key ] !== epoch ) return
setGatewayErrors ( prev = > ( { . . . prev , [ serverId ] : { . . . prev [ serverId ] , [ kind ] : error instanceof Error ? error . message : "Каталог шлюзов недоступен" } } ) )
const message = isConfigurationBusy ( error ) ? configurationBusyMessage
: error instanceof Error ? error . message : "Каталог шлюзов недоступен"
setGatewayErrors ( prev = > ( { . . . prev , [ serverId ] : { . . . prev [ serverId ] , [ kind ] : message } } ) )
}
} , [ isLive , apiFetch ] )
const ensureGreTunnels = useCallback ( ( serverId : string ) = > loadGatewayCatalog ( serverId , "gre" ) , [ loadGatewayCatalog ] )
@@ -1374,7 +1405,8 @@ function FiltersPage() {
const [ movePending , setMovePending ] = useState ( false )
const [ moveError , setMoveError ] = useState < string | null > ( null )
const moveLock = useRef ( false )
const [ liveStale , setLiveStale ] = useState ( false )
const [ rulesReadFailure , setRulesReadFailure ] = useState < "busy" | "unavailable" | null > ( null )
const liveStale = rulesReadFailure !== null
const readEpoch = useRef ( 0 )
const [ readyServerId , setReadyServerId ] = useState < string | null > ( null )
const [ rulesReading , setRulesReading ] = useState ( false )
@@ -1394,7 +1426,7 @@ function FiltersPage() {
setRulesets ( buildRulesets ( servers , serverFilterRulesets ) )
setSelectedServerId ( servers [ 0 ] ? . id ? ? "" )
setLiveLoadState ( "idle" )
setLiveStale ( false )
setRulesReadFailure ( null )
} )
return
}
@@ -1454,8 +1486,9 @@ function FiltersPage() {
setReadyServerId ( null )
setRulesReading ( true )
try {
const payload = await apiFetch < unknown > (
` /api/filters/rules?serverId= ${ encodeURIComponent ( serverId ) } ` ,
const payload = await readFiltersWithRetry (
( ) = > apiFetch < unknown > ( ` /api/filters/rules?serverId= ${ encodeURIComponent ( serverId ) } ` ) ,
( ) = > mounted . current && epoch === readEpoch . current ,
)
if ( epoch !== readEpoch . current ) return false
const parsed = filtersResponseSchema . safeParse ( payload )
@@ -1469,35 +1502,47 @@ function FiltersPage() {
if ( ! has ) return [ . . . prev , { serverId , rules : liveRules } ]
return prev . map ( ( rs ) = > rs . serverId === serverId ? { . . . rs , rules : liveRules } : rs )
} )
setLiveStale ( false )
setRulesReadFailure ( null )
setReadyServerId ( serverId )
setRulesReceipt ( prev = > ( { . . . prev , [ serverId ] : { at : new Date ( ) . toISOString ( ) , kind : "read" } } ) )
return true
} catch ( err ) {
if ( epoch !== readEpoch . current ) return false
setLiveStale ( true )
toast . error ( "Не удалось прочитать правила с роутера" , { description : String ( err ) } )
const busy = isConfigurationBusy ( err )
setRulesReadFailure ( busy ? "busy" : "unavailable" )
if ( ! busy ) toast . error ( "Не удалось прочитать правила с роутера" , {
description : err instanceof Error ? err . message : "Ошибка чтения правил" ,
} )
return false
} finally {
if ( epoch === readEpoch . current ) setRulesReading ( false )
}
} , [ isLive , apiFetch ] )
const loadServerFilters = useCallback ( async ( serverId : string ) = > {
const gre = ensureGreTunnels ( serverId )
const rules = loadLiveRules ( serverId )
const epoch = readEpoch . current
await rules
// Both these GETs record observations under the same exclusive application lock.
if ( mounted . current && epoch === readEpoch . current ) await ensureRecursiveRoutes ( serverId )
await gre
} , [ loadLiveRules , ensureGreTunnels , ensureRecursiveRoutes ] )
useEffect ( ( ) = > {
if ( ! isLive || ! selectedServerId || liveLoadState !== "idle" ) return
if ( ! liveServers . some ( ( s ) = > s . id === selectedServerId ) ) return
void Promise . all ( [
loadLiveRules ( selectedServerId ) ,
ensureGreTunnels ( selectedServerId ) ,
ensureRecursiveRoutes ( selectedServerId ) ,
] )
} , [ isLive , selectedServerId , liveLoadState , liveServers , ensureGreTunnels , ensureRecursiveRoutes , loadLiveRules ] )
void loadServerFilters ( selectedServerId )
} , [ isLive , selectedServerId , liveLoadState , liveServers , loadServerFilters ] )
const allServers = ! isLive ? servers : liveServers
const allTunnels = ! isLive ? greTunnels : ( greByServer [ selectedServerId ] ? ? [ ] )
const selectedServer = allServers . find ( s = > s . id === selectedServerId ) ? ? allServers [ 0 ]
const totalRules = rulesets . reduce ( ( s , r ) = > s + r . rules . length , 0 )
const mutationsLocked = ( isLive && ! can ( "mm:filters:write" ) ) || movePending || ( isLive && ( applyBusy || historyRestoring || rulesReading || readyServerId !== selectedServerId || liveStale || liveLoadState !== "idle" ) )
const gatewayMessages = [ . . . new Set ( Object . values ( gatewayErrors [ selectedServerId ] ? ? { } ) ) ]
. filter ( ( message ) : message is string = > Boolean ( message ) && ! ( rulesReadFailure === "busy" && message === configurationBusyMessage ) )
const gatewaysBusy = gatewayMessages . every ( message = > message === configurationBusyMessage )
const filterRailItems = useMemo < ServerTileItem [ ] > ( ( ) = > (
allServers . map ( ( s ) = > ( {
@@ -1518,7 +1563,7 @@ function FiltersPage() {
readEpoch . current += 1
setReadyServerId ( null )
setRulesReading ( false )
setLiveStale ( false )
setRulesReadFailure ( null )
setSheetOpen ( false )
setPendingDelete ( null )
setDeleteError ( null )
@@ -1552,7 +1597,9 @@ function FiltersPage() {
if ( ! mounted . current ) return { ok : false , error : "Источник данных изменён" }
if ( applyLock . current || applyBusy || historyRestoring ) return { ok : false , error : "Дождитесь завершения текущей операции" }
if ( isLive && ( liveStale || liveLoadState !== "idle" || ( serverId === selectedServerId && readyServerId !== serverId ) ) ) {
const error = "Роутер недоступен — изменения заблокированы "
const error = rulesReadFailure === "busy "
? configurationBusyMessage + ". Изменения недоступны до обновления правил."
: "Роутер недоступен — изменения заблокированы"
toast . error ( error )
return { ok : false , error }
}
@@ -1589,23 +1636,19 @@ function FiltersPage() {
applyLock . current = false
setApplyBusy ( false )
}
} , [ isLive , apiFetch , applyBusy , historyRestoring , liveStale , liveLoadState , readyServerId , selectedServerId ] )
} , [ isLive , apiFetch , applyBusy , historyRestoring , liveStale , rulesReadFailure , liveLoadState , readyServerId , selectedServerId ] )
const refreshFromRouter = useCallback ( async ( ) = > {
if ( ! isLive || ! selectedServerId || ! mounted . current || applyLock . current || applyBusy || historyRestoring ) return
applyLock . current = true
setApplyBusy ( true )
try {
await loadLiveRules ( selectedServerId )
await Promise . all ( [
ensureGreTunnels ( selectedServerId ) ,
ensureRecursiveRoutes ( selectedServerId ) ,
] )
await loadServerFilters ( selectedServerId )
} finally {
applyLock . current = false
setApplyBusy ( false )
}
} , [ isLive , selectedServerId , applyBusy , historyRestoring , loadLiveRules , ensureGreTunnels , ensureRecursiveRoutes ] )
} , [ isLive , selectedServerId , applyBusy , historyRestoring , loadServerFilters ] )
useEffect ( ( ) = > ( ) = > { historyEpoch . current += 1 ; readEpoch . current += 1 } , [ selectedServerId , backendUrl , isLive ] )
@@ -1653,7 +1696,7 @@ function FiltersPage() {
if ( ! await loadLiveRules ( selectedServerId ) ) throw new Error ( "Версия применена, но актуальные правила не прочитаны — обновите данные" )
}
if ( ! mounted . current ) return
setLiveStale ( false )
setRulesReadFailure ( null )
setReadyServerId ( selectedServerId )
await loadRevisions ( )
if ( ! mounted . current ) return
@@ -1879,15 +1922,17 @@ function FiltersPage() {
< Button variant = "outline" size = "sm" onClick = { ( ) = > setLoadAttempt ( n = > n + 1 ) } > П о в т о р и т ь з а г р у з к у < / Button >
< / div >
) }
{ isLive && Object . values ( gatewayErrors [ selectedServerId ] ? ? { } ) . some ( Boolean ) && < div className = "border-b px-6 py-3 flex items-center gap-3" >
< p role = "alert" className = "text-xs text-destructive" > { Object . values ( gatewayErrors [ selectedServerId ] ? ? { } ) . filter ( Boolean ) . join ( " · " ) } . С о х р а н е н ы п о с л е д н и е к а т а л о г и ш л ю з о в . < / p >
{ isLive && gatewayMessages . length > 0 && < div className = "border-b px-6 py-3 flex items-center gap-3" >
< p role = { gatewaysBusy ? "status" : "alert" } className = { cn ( "text-xs" , gatewaysBusy ? "text-muted-foreground" : "text-destructive" ) } > { gatewayMessages . join ( " · " ) } . С о х р а н е н ы п о с л е д н и е к а т а л о г и ш л ю з о в . < / p >
< Button variant = "outline" size = "sm" disabled = { applyBusy } onClick = { ( ) = > { void ensureGreTunnels ( selectedServerId ) ; void ensureRecursiveRoutes ( selectedServerId ) } } > О б н о в и т ь ш л ю з ы < / Button >
< / div > }
{ isLive && rulesReading && < p role = "status" className = "border-b px-6 py-2 text-xs text-muted-foreground" > Ч т е н и е а к т у а л ь н ы х п р а в и л у с т р о й с т в а … И з м е н е н и я в р е м е н н о з а б л о к и р о в а н ы . < / p > }
{ isLive && liveStale && liveLoadState !== "error" && (
< div className = "shrink-0 border-b border-amber-500/30 bg-amber-500/10 px-6 py-2.5 text-xs text-amber-700 dark:text-amber-400 flex items-center gap-2" >
< AlertTriangleIcon className = "size-3.5 shrink-0" / >
Р о у т е р н е д о с т у п е н — п о к а з а н к э ш . И з м е н е н и я з а б л о к и р о в а н ы , п о к а н е у д а с т с я п р о ч и т а т ь CHR .
{ rulesReadFailure === "busy"
? configurationBusyMessage + ". Показаны последние правила. Изменения недоступны до обновления правил."
: "Роутер недоступен — показан кэш. Изменения заблокированы, пока не удастся прочитать CHR." }
< / div >
) }
< div className = "border-b px-4 py-3 flex items-center gap-3 flex-wrap shrink-0 md:px-6" >