fix(dashboard): улучшить логику загрузки данных на странице панели управления

Dockerfile.frontend

@@ -40,6 +40,7 @@ ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV HOSTNAME=0.0.0.0
 ENV PORT=3000
+ENV BACKEND_INTERNAL_URL=http://backend:8000
 COPY --from=build /app/public ./public
 COPY --from=build /app/.next/standalone ./
 COPY --from=build /app/.next/static ./.next/static

app/(main)/dashboard/page.tsx

@@ -691,7 +691,8 @@ export default function DashboardPage() {
       }
     }
 
-    const loadingBlock = probesLoading && liveProbes === null
+    const liveDataPending = liveServersResolved === null || liveProbes === null
+    const loadingBlock = liveDataPending || (probesLoading && liveProbes === null)
     const srvList = liveServersResolved ?? []
     const totalSrv = srvList.length
     const onlineSrv = srvList.filter((s) => s.status === "online").length

app/(main)/data-collection/page.tsx

@@ -24,7 +24,7 @@ import {
   type SchedulerRunRowDto,
   type UptimeSettingsDto,
 } from "@/lib/scheduler-settings"
-import { requestJson } from "@/shared/api/http-client"
+import { requestJson, ApiClientError } from "@/shared/api/http-client"
 import {
   parseSchedulerRunSnapshot,
   type AlertEngineRuleDiagSnapshot,
@@ -58,15 +58,46 @@ function makeApiFetch(backendUrl: string) {
   }
 }
 
-function Toggle({ checked, onChange }: { checked: boolean; onChange: (v: boolean) => void }) {
+function extractApiError(reason: unknown): string {
+  if (reason instanceof ApiClientError) return reason.message
+  if (reason instanceof Error) return reason.message
+  return String(reason)
+}
+
+function readSettled<T>(result: PromiseSettledResult<T>): T | null {
+  return result.status === "fulfilled" ? result.value : null
+}
+
+function collectSettledErrors(results: PromiseSettledResult<unknown>[], labels: string[]): string[] {
+  const errors: string[] = []
+  for (let i = 0; i < results.length; i += 1) {
+    const result = results[i]
+    if (result.status === "rejected") {
+      errors.push(`${labels[i]}: ${extractApiError(result.reason)}`)
+    }
+  }
+  return errors
+}
+
+function Toggle({
+  checked,
+  onChange,
+  disabled,
+}: {
+  checked: boolean
+  onChange: (v: boolean) => void
+  disabled?: boolean
+}) {
   return (
     <button
       type="button"
       role="switch"
       aria-checked={checked}
+      disabled={disabled}
       onClick={() => onChange(!checked)}
       className={cn(
-        "relative inline-flex h-5 w-9 shrink-0 rounded-full border-2 border-transparent transition-colors cursor-pointer",
+        "relative inline-flex h-5 w-9 shrink-0 rounded-full border-2 border-transparent transition-colors",
+        disabled ? "cursor-not-allowed opacity-50" : "cursor-pointer",
         checked ? "bg-primary" : "bg-input",
       )}
     >
@@ -729,9 +760,41 @@ function RunRowDetail({ r }: { r: SchedulerRunRowDto }) {
   )
 }
 
+type SchedulerToggleOverrides = {
+  trafficEnabled?: boolean
+  serversApiEnabled?: boolean
+  resourcesEnabled?: boolean
+  pingEnabled?: boolean
+  speedEnabled?: boolean
+  internetPathEnabled?: boolean
+  certRenewEnabled?: boolean
+}
+
+function applySchedulerJobsToDrafts(
+  jobs: SchedulerJobStatusDto[],
+  setters: {
+    setDraftTrafficEnabled: (value: boolean) => void
+    setDraftServersApiEnabled: (value: boolean) => void
+    setDraftResourcesEnabled: (value: boolean) => void
+    setDraftPingEnabled: (value: boolean) => void
+    setDraftSpeedEnabled: (value: boolean) => void
+    setDraftInternetPathEnabled: (value: boolean) => void
+    setDraftCertRenewEnabled: (value: boolean) => void
+  },
+) {
+  const byKey = Object.fromEntries(jobs.map((job) => [job.jobKey, job])) as Record<string, SchedulerJobStatusDto>
+  if (byKey.traffic) setters.setDraftTrafficEnabled(!!byKey.traffic.enabled)
+  if (byKey.servers_rest_ping) setters.setDraftServersApiEnabled(!!byKey.servers_rest_ping.enabled)
+  if (byKey.uptime_resources) setters.setDraftResourcesEnabled(!!byKey.uptime_resources.enabled)
+  if (byKey.uptime_ping) setters.setDraftPingEnabled(!!byKey.uptime_ping.enabled)
+  if (byKey.uptime_speed) setters.setDraftSpeedEnabled(!!byKey.uptime_speed.enabled)
+  if (byKey.internet_path) setters.setDraftInternetPathEnabled(!!byKey.internet_path.enabled)
+  if (byKey.certificates_renew) setters.setDraftCertRenewEnabled(!!byKey.certificates_renew.enabled)
+}
+
 export default function DataCollectionPage() {
-  const { mode, backendUrl } = useDataSource()
-  const isLive = mode === "live"
+  const { mode, backendUrl, prefsHydrated } = useDataSource()
+  const isLive = prefsHydrated && mode === "live"
   const apiFetch = useMemo(() => makeApiFetch(backendUrl), [backendUrl])
 
   const [trafficCollector, setTrafficCollector] = useState<CollectorSettingsDto | null>(null)
@@ -786,7 +849,7 @@ export default function DataCollectionPage() {
         runFilterJobKey && SCHEDULER_JOB_KEYS.includes(runFilterJobKey as (typeof SCHEDULER_JOB_KEYS)[number])
           ? `?limit=80&jobKey=${encodeURIComponent(runFilterJobKey)}`
           : "?limit=80"
-      const [traffic, serversApi, uptime, internetPath, certRenew, runsRes] = await Promise.all([
+      const [trafficRes, serversApiRes, uptimeRes, internetPathRes, certRenewRes, runsRes] = await Promise.allSettled([
         apiFetch<CollectorSettingsDto>("/api/traffic/settings"),
         apiFetch<CollectorSettingsDto>("/api/servers-api-ping/settings"),
         apiFetch<UptimeSettingsDto>("/api/uptime/settings"),
@@ -794,28 +857,71 @@ export default function DataCollectionPage() {
         apiFetch<{ enabled: boolean; intervalSec: number; renewBeforeDays: number }>("/api/certificates/renew-settings"),
         apiFetch<{ runs: SchedulerRunRowDto[] }>(`/api/scheduler/runs${runsQuery}`),
       ])
-      setTrafficCollector(traffic)
-      setServersApiCollector(serversApi)
-      setUptimeCollector(uptime)
-      setInternetPathCollector(internetPath)
-      setSchedulerRuns(runsRes.runs ?? [])
-      setTrafficIntervalDraft(String(traffic.intervalSec))
-      setTrafficRetentionDraft(String(traffic.retentionDays))
-      setUptimeResourceIntervalDraft(String(uptime.intervalSec ?? 300))
-      setUptimeIntervalDraft(String(uptime.probeIntervalSec ?? 15))
-      setUptimeSpeedIntervalDraft(String(uptime.speedIntervalSec ?? 60))
-      setUptimeRetentionDraft(String(uptime.retentionDays))
-      setDraftTrafficEnabled(!!traffic.enabled)
-      setDraftServersApiEnabled(!!serversApi.enabled)
-      setServersApiIntervalDraft(String(serversApi.intervalSec ?? 120))
-      setDraftResourcesEnabled(!!(uptime.resourcesEnabled ?? uptime.enabled))
-      setDraftPingEnabled(!!(uptime.pingEnabled ?? uptime.enabled))
-      setDraftSpeedEnabled(!!(uptime.speedEnabled ?? uptime.enabled))
-      setDraftInternetPathEnabled(!!internetPath.enabled)
-      setInternetPathIntervalDraft(String(internetPath.intervalSec ?? 300))
-      setDraftCertRenewEnabled(!!certRenew.enabled)
-      setCertRenewIntervalDraft(String(certRenew.intervalSec ?? 21600))
-      setRenewBeforeDaysDraft(String(certRenew.renewBeforeDays ?? 30))
+
+      const loadErrors = collectSettledErrors(
+        [trafficRes, serversApiRes, uptimeRes, internetPathRes, certRenewRes, runsRes],
+        ["трафик", "серверы REST API", "uptime", "internet path", "сертификаты", "журнал планировщика"],
+      )
+      if (loadErrors.length > 0) {
+        setCollectorError(loadErrors.join("; "))
+      }
+
+      const traffic = readSettled(trafficRes)
+      if (traffic) {
+        setTrafficCollector(traffic)
+        setTrafficIntervalDraft(String(traffic.intervalSec))
+        setTrafficRetentionDraft(String(traffic.retentionDays))
+        setDraftTrafficEnabled(!!traffic.enabled)
+      }
+
+      const serversApi = readSettled(serversApiRes)
+      if (serversApi) {
+        setServersApiCollector(serversApi)
+        setDraftServersApiEnabled(!!serversApi.enabled)
+        setServersApiIntervalDraft(String(serversApi.intervalSec ?? 120))
+      }
+
+      const uptime = readSettled(uptimeRes)
+      if (uptime) {
+        setUptimeCollector(uptime)
+        setUptimeResourceIntervalDraft(String(uptime.intervalSec ?? 300))
+        setUptimeIntervalDraft(String(uptime.probeIntervalSec ?? 15))
+        setUptimeSpeedIntervalDraft(String(uptime.speedIntervalSec ?? 60))
+        setUptimeRetentionDraft(String(uptime.retentionDays))
+        setDraftResourcesEnabled(!!(uptime.resourcesEnabled ?? uptime.enabled))
+        setDraftPingEnabled(!!(uptime.pingEnabled ?? uptime.enabled))
+        setDraftSpeedEnabled(!!(uptime.speedEnabled ?? uptime.enabled))
+        if (uptime.scheduler?.jobs?.length) {
+          applySchedulerJobsToDrafts(uptime.scheduler.jobs, {
+            setDraftTrafficEnabled,
+            setDraftServersApiEnabled,
+            setDraftResourcesEnabled,
+            setDraftPingEnabled,
+            setDraftSpeedEnabled,
+            setDraftInternetPathEnabled,
+            setDraftCertRenewEnabled,
+          })
+        }
+      }
+
+      const internetPath = readSettled(internetPathRes)
+      if (internetPath) {
+        setInternetPathCollector(internetPath)
+        setDraftInternetPathEnabled(!!internetPath.enabled)
+        setInternetPathIntervalDraft(String(internetPath.intervalSec ?? 300))
+      }
+
+      const certRenew = readSettled(certRenewRes)
+      if (certRenew) {
+        setDraftCertRenewEnabled(!!certRenew.enabled)
+        setCertRenewIntervalDraft(String(certRenew.intervalSec ?? 21600))
+        setRenewBeforeDaysDraft(String(certRenew.renewBeforeDays ?? 30))
+      }
+
+      const runsPayload = readSettled(runsRes)
+      if (runsPayload) {
+        setSchedulerRuns(runsPayload.runs ?? [])
+      }
     } catch (e) {
       setCollectorError(e instanceof Error ? e.message : "Не удалось загрузить данные")
     } finally {
@@ -823,6 +929,138 @@ export default function DataCollectionPage() {
     }
   }, [apiFetch, isLive, runFilterJobKey])
 
+  const persistSchedulerDrafts = useCallback(async (overrides: SchedulerToggleOverrides = {}) => {
+    const trafficEnabled = overrides.trafficEnabled ?? draftTrafficEnabled
+    const serversApiEnabled = overrides.serversApiEnabled ?? draftServersApiEnabled
+    const resourcesEnabled = overrides.resourcesEnabled ?? draftResourcesEnabled
+    const pingEnabled = overrides.pingEnabled ?? draftPingEnabled
+    const speedEnabled = overrides.speedEnabled ?? draftSpeedEnabled
+    const internetPathEnabled = overrides.internetPathEnabled ?? draftInternetPathEnabled
+    const certRenewEnabled = overrides.certRenewEnabled ?? draftCertRenewEnabled
+
+    const tInt = Math.max(5, Number.parseInt(trafficIntervalDraft, 10) || 30)
+    const tRet = Math.max(1, Number.parseInt(trafficRetentionDraft, 10) || 14)
+    const uRes = Math.max(5, Number.parseInt(uptimeResourceIntervalDraft, 10) || 300)
+    const uPing = Math.max(5, Number.parseInt(uptimeIntervalDraft, 10) || 15)
+    const uSpd = Math.max(10, Number.parseInt(uptimeSpeedIntervalDraft, 10) || 60)
+    const uRet = Math.max(1, Number.parseInt(uptimeRetentionDraft, 10) || 14)
+    const sApiInt = Math.max(10, Number.parseInt(serversApiIntervalDraft, 10) || 120)
+    const ipInt = Math.max(30, Number.parseInt(internetPathIntervalDraft, 10) || 300)
+    const certRenewInt = Math.max(300, Number.parseInt(certRenewIntervalDraft, 10) || 21600)
+    const renewBeforeDays = Math.max(1, Math.min(90, Number.parseInt(renewBeforeDaysDraft, 10) || 30))
+
+    const saveResults = await Promise.allSettled([
+      apiFetch("/api/traffic/settings", {
+        method: "PUT",
+        body: JSON.stringify({
+          enabled: trafficEnabled,
+          intervalSec: tInt,
+          retentionDays: tRet,
+        }),
+      }),
+      apiFetch("/api/servers-api-ping/settings", {
+        method: "PUT",
+        body: JSON.stringify({
+          enabled: serversApiEnabled,
+          intervalSec: sApiInt,
+        }),
+      }),
+      apiFetch("/api/uptime/settings", {
+        method: "PUT",
+        body: JSON.stringify({
+          resourcesEnabled,
+          pingEnabled,
+          speedEnabled,
+          intervalSec: uRes,
+          probeIntervalSec: uPing,
+          speedIntervalSec: uSpd,
+          retentionDays: uRet,
+        }),
+      }),
+      apiFetch("/api/internet-path/settings", {
+        method: "PUT",
+        body: JSON.stringify({
+          enabled: internetPathEnabled,
+          intervalSec: ipInt,
+        }),
+      }),
+      apiFetch("/api/certificates/renew-settings", {
+        method: "PUT",
+        body: JSON.stringify({
+          enabled: certRenewEnabled,
+          intervalSec: certRenewInt,
+          renewBeforeDays,
+        }),
+      }),
+    ])
+
+    const saveErrors = collectSettledErrors(
+      saveResults,
+      ["трафик", "серверы REST API", "uptime", "internet path", "сертификаты"],
+    )
+    if (saveErrors.length > 0) {
+      throw new Error(`Не все настройки сохранились: ${saveErrors.join("; ")}`)
+    }
+  }, [
+    apiFetch,
+    certRenewIntervalDraft,
+    draftCertRenewEnabled,
+    draftInternetPathEnabled,
+    draftPingEnabled,
+    draftResourcesEnabled,
+    draftServersApiEnabled,
+    draftSpeedEnabled,
+    draftTrafficEnabled,
+    internetPathIntervalDraft,
+    renewBeforeDaysDraft,
+    serversApiIntervalDraft,
+    trafficIntervalDraft,
+    trafficRetentionDraft,
+    uptimeIntervalDraft,
+    uptimeResourceIntervalDraft,
+    uptimeRetentionDraft,
+    uptimeSpeedIntervalDraft,
+  ])
+
+  const handleJobEnabledChange = useCallback(async (jobKey: (typeof SCHEDULER_JOB_KEYS)[number], nextEnabled: boolean) => {
+    const overrides: SchedulerToggleOverrides = {}
+    if (jobKey === "traffic") {
+      setDraftTrafficEnabled(nextEnabled)
+      overrides.trafficEnabled = nextEnabled
+    } else if (jobKey === "servers_rest_ping") {
+      setDraftServersApiEnabled(nextEnabled)
+      overrides.serversApiEnabled = nextEnabled
+    } else if (jobKey === "uptime_resources") {
+      setDraftResourcesEnabled(nextEnabled)
+      overrides.resourcesEnabled = nextEnabled
+    } else if (jobKey === "uptime_ping") {
+      setDraftPingEnabled(nextEnabled)
+      overrides.pingEnabled = nextEnabled
+    } else if (jobKey === "uptime_speed") {
+      setDraftSpeedEnabled(nextEnabled)
+      overrides.speedEnabled = nextEnabled
+    } else if (jobKey === "certificates_renew") {
+      setDraftCertRenewEnabled(nextEnabled)
+      overrides.certRenewEnabled = nextEnabled
+    } else if (jobKey === "internet_path") {
+      setDraftInternetPathEnabled(nextEnabled)
+      overrides.internetPathEnabled = nextEnabled
+    } else {
+      return
+    }
+
+    setCollectorError(null)
+    setSchedulerSaveBusy(true)
+    try {
+      await persistSchedulerDrafts(overrides)
+      await loadCollectors()
+    } catch (e) {
+      setCollectorError(e instanceof Error ? e.message : "Не удалось сохранить")
+    } finally {
+      setSchedulerSaveBusy(false)
+    }
+  }, [loadCollectors, persistSchedulerDrafts])
+
   useEffect(() => {
     if (!isLive) {
       setTrafficCollector(null)
@@ -851,6 +1089,9 @@ export default function DataCollectionPage() {
   }
 
   const enabledJobsCount = useMemo(() => {
+    const jobs = uptimeCollector?.scheduler?.jobs
+    if (jobs?.length) return jobs.filter((job) => job.enabled).length
+
     let n = draftTrafficEnabled ? 1 : 0
     if (draftServersApiEnabled) n += 1
     if (draftResourcesEnabled) n += 1
@@ -867,6 +1108,7 @@ export default function DataCollectionPage() {
     draftServersApiEnabled,
     draftSpeedEnabled,
     draftTrafficEnabled,
+    uptimeCollector?.scheduler?.jobs,
   ])
 
   const schedulerJobCount = SCHEDULER_JOB_KEYS.length
@@ -883,7 +1125,9 @@ export default function DataCollectionPage() {
       {
         label: "Включено задач",
         value: `${enabledJobsCount} / ${schedulerJobCount}`,
-        sub: "По переключателям на этой странице (до сохранения)",
+        sub: uptimeCollector?.scheduler?.jobs?.length
+          ? "По сохранённым задачам планировщика"
+          : "По переключателям на этой странице",
         icon: <CalendarClockIcon className="size-4 text-muted-foreground" />,
       },
       {
@@ -950,7 +1194,18 @@ export default function DataCollectionPage() {
 
       <div className="flex-1 overflow-y-auto p-6">
         <div className="flex flex-col gap-5 max-w-[1100px] mx-auto w-full">
-          {!isLive && (
+          {!prefsHydrated && (
+            <Card>
+              <CardHeader>
+                <CardTitle className="text-base">Загрузка настроек подключения</CardTitle>
+                <CardDescription className="text-xs">
+                  Читаем режим данных и адрес API из локальных настроек.
+                </CardDescription>
+              </CardHeader>
+            </Card>
+          )}
+
+          {prefsHydrated && !isLive && (
             <Card>
               <CardHeader>
                 <CardTitle className="text-base">Нужен live-режим</CardTitle>
@@ -995,7 +1250,7 @@ export default function DataCollectionPage() {
                 <CardHeader className="border-b border-border pb-4">
                   <CardTitle className="text-base">Планировщик сбора данных</CardTitle>
                   <CardDescription className="text-xs">
-                    Интервалы и вкл/выкл по задачам. Сохранение отправляет настройки на бекенд и перезапускает таймеры.
+                    Интервалы и вкл/выкл по задачам. Переключатель сразу сохраняет задачу на бекенде; кнопка ниже — интервалы и срок хранения.
                   </CardDescription>
                 </CardHeader>
                 <CardContent className="px-0 pb-0">
@@ -1021,15 +1276,15 @@ export default function DataCollectionPage() {
                               ? draftTrafficEnabled
                               : jobKey === "servers_rest_ping"
                                 ? draftServersApiEnabled
-                            : jobKey === "uptime_resources"
+                                : jobKey === "uptime_resources"
                                   ? draftResourcesEnabled
                                   : jobKey === "uptime_ping"
                                     ? draftPingEnabled
-                                : jobKey === "uptime_speed"
-                                  ? draftSpeedEnabled
-                                  : jobKey === "certificates_renew"
-                                    ? draftCertRenewEnabled
-                                    : draftInternetPathEnabled
+                                    : jobKey === "uptime_speed"
+                                      ? draftSpeedEnabled
+                                      : jobKey === "certificates_renew"
+                                        ? draftCertRenewEnabled
+                                        : draftInternetPathEnabled
                           const iv = fixedSchedule
                             ? String(j?.intervalSec ?? (jobKey === "gre_bgp" ? 30 : 20))
                             : jobKey === "traffic"
@@ -1088,15 +1343,10 @@ export default function DataCollectionPage() {
                                 <span className={fixedSchedule ? "inline-flex pointer-events-none opacity-50" : "inline-flex"}>
                                   <Toggle
                                     checked={en}
+                                    disabled={fixedSchedule || schedulerSaveBusy}
                                     onChange={(v) => {
-                                      if (fixedSchedule) return
-                                      if (jobKey === "traffic") setDraftTrafficEnabled(v)
-                                      else if (jobKey === "servers_rest_ping") setDraftServersApiEnabled(v)
-                                      else if (jobKey === "uptime_resources") setDraftResourcesEnabled(v)
-                                      else if (jobKey === "uptime_ping") setDraftPingEnabled(v)
-                                      else if (jobKey === "uptime_speed") setDraftSpeedEnabled(v)
-                                      else if (jobKey === "certificates_renew") setDraftCertRenewEnabled(v)
-                                      else setDraftInternetPathEnabled(v)
+                                      if (fixedSchedule || schedulerSaveBusy) return
+                                      void handleJobEnabledChange(jobKey, v)
                                     }}
                                   />
                                 </span>
@@ -1218,58 +1468,7 @@ export default function DataCollectionPage() {
                         setSchedulerSaveBusy(true)
                         setCollectorError(null)
                         try {
-                          const tInt = Math.max(5, Number.parseInt(trafficIntervalDraft, 10) || 30)
-                          const tRet = Math.max(1, Number.parseInt(trafficRetentionDraft, 10) || 14)
-                          const uRes = Math.max(5, Number.parseInt(uptimeResourceIntervalDraft, 10) || 300)
-                          const uPing = Math.max(5, Number.parseInt(uptimeIntervalDraft, 10) || 15)
-                          const uSpd = Math.max(10, Number.parseInt(uptimeSpeedIntervalDraft, 10) || 60)
-                          const uRet = Math.max(1, Number.parseInt(uptimeRetentionDraft, 10) || 14)
-                          const sApiInt = Math.max(10, Number.parseInt(serversApiIntervalDraft, 10) || 120)
-                          const ipInt = Math.max(30, Number.parseInt(internetPathIntervalDraft, 10) || 300)
-                          await apiFetch("/api/traffic/settings", {
-                            method: "PUT",
-                            body: JSON.stringify({
-                              enabled: draftTrafficEnabled,
-                              intervalSec: tInt,
-                              retentionDays: tRet,
-                            }),
-                          })
-                          await apiFetch("/api/servers-api-ping/settings", {
-                            method: "PUT",
-                            body: JSON.stringify({
-                              enabled: draftServersApiEnabled,
-                              intervalSec: sApiInt,
-                            }),
-                          })
-                          await apiFetch("/api/uptime/settings", {
-                            method: "PUT",
-                            body: JSON.stringify({
-                              resourcesEnabled: draftResourcesEnabled,
-                              pingEnabled: draftPingEnabled,
-                              speedEnabled: draftSpeedEnabled,
-                              intervalSec: uRes,
-                              probeIntervalSec: uPing,
-                              speedIntervalSec: uSpd,
-                              retentionDays: uRet,
-                            }),
-                          })
-                          const certRenewInt = Math.max(300, Number.parseInt(certRenewIntervalDraft, 10) || 21600)
-                          const renewBeforeDays = Math.max(1, Math.min(90, Number.parseInt(renewBeforeDaysDraft, 10) || 30))
-                          await apiFetch("/api/internet-path/settings", {
-                            method: "PUT",
-                            body: JSON.stringify({
-                              enabled: draftInternetPathEnabled,
-                              intervalSec: ipInt,
-                            }),
-                          })
-                          await apiFetch("/api/certificates/renew-settings", {
-                            method: "PUT",
-                            body: JSON.stringify({
-                              enabled: draftCertRenewEnabled,
-                              intervalSec: certRenewInt,
-                              renewBeforeDays,
-                            }),
-                          })
+                          await persistSchedulerDrafts()
                           await loadCollectors()
                         } catch (e) {
                           setCollectorError(e instanceof Error ? e.message : "Не удалось сохранить")

backend/.gitignore

@@ -4,3 +4,4 @@ dist/
 *.db-shm
 *.db-wal
 .env
+storage/backups/

backend/src/db/index.ts

@@ -1,4 +1,6 @@
 import Database from "better-sqlite3"
+import { existsSync, readFileSync } from "node:fs"
+import path from "node:path"
 
 type SqliteHandle = InstanceType<typeof Database>
 import { drizzle } from "drizzle-orm/better-sqlite3"
@@ -391,6 +393,19 @@ CREATE TABLE IF NOT EXISTS backup_schedule_settings (
   updated_at TEXT NOT NULL DEFAULT (datetime('now'))
 );
 
+CREATE TABLE IF NOT EXISTS backup_entries (
+  id TEXT PRIMARY KEY,
+  server_id TEXT NOT NULL,
+  server_name TEXT NOT NULL,
+  filename TEXT NOT NULL,
+  size_bytes INTEGER NOT NULL,
+  kind TEXT NOT NULL DEFAULT 'manual',
+  notes TEXT,
+  created_at TEXT NOT NULL
+);
+CREATE INDEX IF NOT EXISTS idx_backup_entries_server_created ON backup_entries(server_id, created_at);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_backup_entries_filename ON backup_entries(filename);
+
 CREATE TABLE IF NOT EXISTS alert_rules (
   id TEXT PRIMARY KEY,
   name TEXT NOT NULL,
@@ -669,6 +684,41 @@ SELECT 1, NULL
 WHERE NOT EXISTS (SELECT 1 FROM alert_engine_cursor WHERE id = 1);
 `)
 
+const backupEntryCount = sqlite.prepare(`SELECT COUNT(*) AS c FROM backup_entries`).get() as { c: number }
+if (backupEntryCount.c === 0) {
+  const legacyIndexPath = path.resolve(process.cwd(), "storage", "backups", "index.json")
+  if (existsSync(legacyIndexPath)) {
+    try {
+      const parsed = JSON.parse(readFileSync(legacyIndexPath, "utf8")) as unknown
+      if (Array.isArray(parsed)) {
+        const insert = sqlite.prepare(`
+          INSERT OR IGNORE INTO backup_entries (id, server_id, server_name, filename, size_bytes, kind, notes, created_at)
+          VALUES (@id, @serverId, @serverName, @filename, @sizeBytes, @kind, @notes, @createdAt)
+        `)
+        for (const row of parsed) {
+          if (!row || typeof row !== "object") continue
+          const item = row as Record<string, unknown>
+          const id = String(item.id ?? "").trim()
+          const filename = String(item.filename ?? "").trim()
+          if (!id || !filename) continue
+          insert.run({
+            id,
+            serverId: String(item.serverId ?? ""),
+            serverName: String(item.serverName ?? ""),
+            filename,
+            sizeBytes: Number(item.sizeBytes ?? 0) || 0,
+            kind: item.kind === "auto" ? "auto" : "manual",
+            notes: item.notes == null ? null : String(item.notes),
+            createdAt: String(item.createdAt ?? new Date().toISOString()),
+          })
+        }
+      }
+    } catch {
+      /* legacy index.json не читается — пропускаем */
+    }
+  }
+}
+
 export const db = drizzle(sqlite, { schema })
 
 /** Прямой доступ к better-sqlite3 для сложных read-only запросов (напр. /api/alerts). */

backend/src/db/schema.ts

@@ -340,6 +340,17 @@ export const backupScheduleSettings = sqliteTable("backup_schedule_settings", {
   updatedAt:      text("updated_at").notNull().default(sql`(datetime('now'))`),
 })
 
+export const backupEntries = sqliteTable("backup_entries", {
+  id:         text("id").primaryKey(),
+  serverId:   text("server_id").notNull(),
+  serverName: text("server_name").notNull(),
+  filename:   text("filename").notNull(),
+  sizeBytes:  integer("size_bytes").notNull(),
+  kind:       text("kind", { enum: ["manual", "auto"] }).notNull().default("manual"),
+  notes:      text("notes"),
+  createdAt:  text("created_at").notNull(),
+})
+
 /** Группы правил: ANY = хотя бы одно; ALL = все одновременно в окне тика. */
 export const alertGroups = sqliteTable("alert_groups", {
   id:                text("id").primaryKey(),
@@ -562,6 +573,7 @@ export type AcmeSettingsRow = typeof acmeSettings.$inferSelect
 export type CertificateIssueJobRow = typeof certificateIssueJobs.$inferSelect
 export type CertificateRenewSettingsRow = typeof certificateRenewSettings.$inferSelect
 export type BackupScheduleSettingsRow = typeof backupScheduleSettings.$inferSelect
+export type BackupEntryRow = typeof backupEntries.$inferSelect
 export type AlertGroupRow = typeof alertGroups.$inferSelect
 export type AlertRuleRow = typeof alertRules.$inferSelect
 export type AlertRuleTargetRow = typeof alertRuleTargets.$inferSelect

backend/src/routes/backups.ts

@@ -1,5 +1,5 @@
 import { randomUUID } from "node:crypto"
-import { readFile, rm } from "node:fs/promises"
+import { readFile } from "node:fs/promises"
 import path from "node:path"
 import { z } from "zod"
 import type { FastifyPluginAsyncZod } from "@fastify/type-provider-zod"
@@ -8,12 +8,13 @@ import { listServersRead } from "../modules/servers/service/servers-service.js"
 import { appendEvent } from "../modules/events/service/events-service.js"
 import { refreshScheduler } from "../services/scheduler.js"
 import {
+  deleteBackupRecord,
+  getBackupById,
   getBackupsDir,
   getBackupScheduleSettings,
-  readBackupIndex,
+  listBackups,
   runBackupForServer,
   updateBackupScheduleSettings,
-  writeBackupIndex,
   type BackupMeta,
 } from "../services/backup-service.js"
 
@@ -47,11 +48,9 @@ const BackupJobIdParamSchema = z.object({
 async function processBackupJob(job: BackupJob, ids: string[], notes?: string) {
   job.status = "running"
   job.startedAt = new Date().toISOString()
-  const indexRows = await readBackupIndex()
   for (const id of ids) {
     try {
       const meta = await runBackupForServer(id, "manual", notes)
-      indexRows.unshift(meta)
       job.created.push(meta)
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err)
@@ -60,7 +59,6 @@ async function processBackupJob(job: BackupJob, ids: string[], notes?: string) {
       job.completed += 1
     }
   }
-  await writeBackupIndex(indexRows)
   job.status = "done"
   job.finishedAt = new Date().toISOString()
   appendEvent({
@@ -82,9 +80,7 @@ async function processBackupJob(job: BackupJob, ids: string[], notes?: string) {
 
 const backupsRoutes: FastifyPluginAsyncZod = async (app) => {
   app.get("/backups", async (_req, reply) => {
-    const rows = await readBackupIndex()
-    rows.sort((a, b) => b.createdAt.localeCompare(a.createdAt))
-    return reply.send(rows)
+    return reply.send(listBackups())
   })
 
   app.get("/backups/schedule", async (_req, reply) => {
@@ -171,8 +167,7 @@ const backupsRoutes: FastifyPluginAsyncZod = async (app) => {
   })
 
   app.get("/backups/:id/download", { schema: { params: BackupIdParamSchema } }, async (req, reply) => {
-    const rows = await readBackupIndex()
-    const hit = rows.find((r) => r.id === req.params.id)
+    const hit = getBackupById(req.params.id)
     if (!hit) return reply.status(404).send({ error: "Бэкап не найден" })
     const filePath = path.join(getBackupsDir(), hit.filename)
     const content = await readFile(filePath, "utf8").catch(() => null)
@@ -183,12 +178,8 @@ const backupsRoutes: FastifyPluginAsyncZod = async (app) => {
   })
 
   app.delete("/backups/:id", { schema: { params: BackupIdParamSchema } }, async (req, reply) => {
-    const rows = await readBackupIndex()
-    const idx = rows.findIndex((r) => r.id === req.params.id)
-    if (idx < 0) return reply.status(404).send({ error: "Бэкап не найден" })
-    const [hit] = rows.splice(idx, 1)
-    await writeBackupIndex(rows)
-    await rm(path.join(getBackupsDir(), hit.filename), { force: true })
+    const hit = await deleteBackupRecord(req.params.id)
+    if (!hit) return reply.status(404).send({ error: "Бэкап не найден" })
     return reply.status(204).send()
   })
 }

backend/src/services/backup-scheduler-collector.ts

@@ -5,11 +5,9 @@ import {
   getBackupScheduleSettings,
   isBackupDue,
   pruneBackupsForServer,
-  readBackupIndex,
   resolveBackupServerIds,
   runBackupForServer,
   touchBackupScheduleRunMeta,
-  writeBackupIndex,
 } from "./backup-service.js"
 
 let collecting = false
@@ -62,7 +60,6 @@ export async function collectScheduledBackupsOnce(): Promise<BackupsRunSnapshot>
   collecting = true
   const started = Date.now()
   const serverIds = resolveBackupServerIds(settings)
-  const indexRows = await readBackupIndex()
 
   appendEvent({
     level: "info",
@@ -78,8 +75,7 @@ export async function collectScheduledBackupsOnce(): Promise<BackupsRunSnapshot>
   try {
     for (const id of serverIds) {
       try {
-        const meta = await runBackupForServer(id, "auto")
-        indexRows.unshift(meta)
+        await runBackupForServer(id, "auto")
         snapshot.created += 1
       } catch (e) {
         const message = e instanceof Error ? e.message : String(e)
@@ -88,8 +84,6 @@ export async function collectScheduledBackupsOnce(): Promise<BackupsRunSnapshot>
       }
     }
 
-    await writeBackupIndex(indexRows)
-
     for (const id of serverIds) {
       snapshot.pruned += await pruneBackupsForServer(id, settings.keepCount)
     }

backend/src/services/backup-service.ts

@@ -1,17 +1,16 @@
 import { randomUUID } from "node:crypto"
-import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises"
+import { mkdir, rm, stat, writeFile } from "node:fs/promises"
 import path from "node:path"
-import { eq } from "drizzle-orm"
+import { desc, eq } from "drizzle-orm"
 import type { BackupScheduleSettingsDto } from "@mmapp/contracts/backups"
 import { db } from "../db/index.js"
-import { backupScheduleSettings } from "../db/schema.js"
+import { backupEntries, backupScheduleSettings } from "../db/schema.js"
 import { getServerRowById } from "../modules/servers/repository/servers-repository.js"
 import { listServersRead } from "../modules/servers/service/servers-service.js"
 import { MikrotikClient } from "./mikrotik.js"
 
 const SETTINGS_ID = 1
 const BACKUPS_DIR = path.resolve(process.cwd(), "storage", "backups")
-const INDEX_PATH = path.join(BACKUPS_DIR, "index.json")
 
 export type BackupMeta = {
   id: string
@@ -24,25 +23,51 @@ export type BackupMeta = {
   notes?: string
 }
 
+function rowToMeta(row: typeof backupEntries.$inferSelect): BackupMeta {
+  return {
+    id: row.id,
+    serverId: row.serverId,
+    serverName: row.serverName,
+    filename: row.filename,
+    sizeBytes: row.sizeBytes,
+    createdAt: row.createdAt,
+    kind: row.kind,
+    notes: row.notes ?? undefined,
+  }
+}
+
 export async function ensureBackupStorage(): Promise<void> {
   await mkdir(BACKUPS_DIR, { recursive: true })
 }
 
-export async function readBackupIndex(): Promise<BackupMeta[]> {
-  await ensureBackupStorage()
-  try {
-    const raw = await readFile(INDEX_PATH, "utf8")
-    const parsed = JSON.parse(raw) as unknown
-    if (!Array.isArray(parsed)) return []
-    return parsed as BackupMeta[]
-  } catch {
-    return []
-  }
+export function listBackups(): BackupMeta[] {
+  return db.select().from(backupEntries).orderBy(desc(backupEntries.createdAt)).all().map(rowToMeta)
 }
 
-export async function writeBackupIndex(rows: BackupMeta[]): Promise<void> {
-  await ensureBackupStorage()
-  await writeFile(INDEX_PATH, JSON.stringify(rows, null, 2), "utf8")
+export function getBackupById(id: string): BackupMeta | null {
+  const row = db.select().from(backupEntries).where(eq(backupEntries.id, id)).limit(1).all()[0]
+  return row ? rowToMeta(row) : null
+}
+
+export function insertBackup(meta: BackupMeta): void {
+  db.insert(backupEntries).values({
+    id: meta.id,
+    serverId: meta.serverId,
+    serverName: meta.serverName,
+    filename: meta.filename,
+    sizeBytes: meta.sizeBytes,
+    kind: meta.kind,
+    notes: meta.notes ?? null,
+    createdAt: meta.createdAt,
+  }).run()
+}
+
+export async function deleteBackupRecord(id: string): Promise<BackupMeta | null> {
+  const hit = getBackupById(id)
+  if (!hit) return null
+  db.delete(backupEntries).where(eq(backupEntries.id, id)).run()
+  await rm(path.join(BACKUPS_DIR, hit.filename), { force: true })
+  return hit
 }
 
 function fmtTs(d = new Date()): string {
@@ -152,7 +177,22 @@ export function resolveBackupServerIds(settings: BackupScheduleSettingsDto): str
   return [...new Set(requested)].filter((id) => enabled.has(id))
 }
 
-function sameLocalSlot(a: Date, b: Date): boolean {
+function scheduledSlotForDate(now: Date, settings: BackupScheduleSettingsDto): Date | null {
+  if (settings.frequency === "weekly") {
+    const currentDow = (now.getDay() + 6) % 7
+    if (currentDow !== settings.weekDay) return null
+  } else if (settings.frequency === "monthly") {
+    if (now.getDate() !== settings.monthDay) return null
+  }
+
+  const slot = new Date(now)
+  slot.setSeconds(0, 0)
+  slot.setMilliseconds(0)
+  slot.setHours(settings.hour, settings.minute, 0, 0)
+  return slot
+}
+
+function sameLocalMinute(a: Date, b: Date): boolean {
   return a.getFullYear() === b.getFullYear()
     && a.getMonth() === b.getMonth()
     && a.getDate() === b.getDate()
@@ -160,27 +200,21 @@ function sameLocalSlot(a: Date, b: Date): boolean {
     && a.getMinutes() === b.getMinutes()
 }
 
+/** Срабатывает только в минуту расписания; 60 с в UI — интервал проверки, не частота бэкапа. */
 export function isBackupDue(now: Date, settings: BackupScheduleSettingsDto, lastRunAt: string | null | undefined): boolean {
   if (!settings.enabled) return false
-  const slot = new Date(now)
-  slot.setSeconds(0, 0)
-  slot.setHours(settings.hour, settings.minute, 0, 0)
-
-  if (settings.frequency === "weekly") {
-    const currentDow = (now.getDay() + 6) % 7
-    if (currentDow !== settings.weekDay) return false
-  } else if (settings.frequency === "monthly") {
-    if (now.getDate() !== settings.monthDay) return false
-  }
 
+  const slot = scheduledSlotForDate(now, settings)
+  if (!slot) return false
   if (now < slot) return false
+  if (!sameLocalMinute(now, slot)) return false
+
   if (lastRunAt) {
     const prev = new Date(lastRunAt)
     if (Number.isNaN(prev.getTime())) return true
-    if (settings.frequency === "daily" && sameLocalSlot(prev, slot)) return false
-    if (settings.frequency === "weekly" && sameLocalSlot(prev, slot)) return false
-    if (settings.frequency === "monthly" && prev.getFullYear() === slot.getFullYear() && prev.getMonth() === slot.getMonth() && prev.getDate() === slot.getDate()) return false
+    if (sameLocalMinute(prev, slot)) return false
   }
+
   return true
 }
 
@@ -203,9 +237,10 @@ export async function runBackupForServer(
   const safeServer = row.name.replace(/[^a-zA-Z0-9._-]+/g, "_")
   const filename = `${safeServer}_${ts}.rsc`
   const filePath = path.join(BACKUPS_DIR, filename)
+  await ensureBackupStorage()
   await writeFile(filePath, script, "utf8")
   const st = await stat(filePath)
-  return {
+  const meta: BackupMeta = {
     id: randomUUID(),
     serverId: String(row.id),
     serverName: row.name,
@@ -215,27 +250,24 @@ export async function runBackupForServer(
     kind,
     notes,
   }
+  insertBackup(meta)
+  return meta
 }
 
 export async function pruneBackupsForServer(serverId: string, keepCount: number): Promise<number> {
-  const rows = await readBackupIndex()
-  const forServer = rows.filter((r) => r.serverId === serverId)
-  if (forServer.length <= keepCount) return 0
-  const sorted = [...forServer].sort((a, b) => b.createdAt.localeCompare(a.createdAt))
-  const toDelete = sorted.slice(keepCount)
-  const deleteIds = new Set(toDelete.map((r) => r.id))
+  const rows = db.select().from(backupEntries)
+    .where(eq(backupEntries.serverId, serverId))
+    .orderBy(desc(backupEntries.createdAt))
+    .all()
+  if (rows.length <= keepCount) return 0
+  const toDelete = rows.slice(keepCount)
   for (const hit of toDelete) {
+    db.delete(backupEntries).where(eq(backupEntries.id, hit.id)).run()
     await rm(path.join(BACKUPS_DIR, hit.filename), { force: true })
   }
-  const next = rows.filter((r) => !deleteIds.has(r.id))
-  await writeBackupIndex(next)
   return toDelete.length
 }
 
 export function getBackupsDir(): string {
   return BACKUPS_DIR
 }
-
-export function getBackupIndexPath(): string {
-  return INDEX_PATH
-}

deploy/docker-compose.yml

@@ -18,8 +18,12 @@ services:
     image: git.shts.su/denozord/mikrotikmanager-frontend:latest
     container_name: mmapp-frontend
     restart: unless-stopped
+    depends_on:
+      - backend
     ports:
       - "3000:3000"
+    environment:
+      BACKEND_INTERNAL_URL: http://backend:8000
     labels:
       mmapp.updater.managed: "true"
       mmapp.updater.target: frontend

deploy/updater/entrypoint.sh

@@ -321,7 +321,7 @@ wait_for_health() {
   while (( SECONDS < deadline )); do
     if [[ "$health_type" == "http" ]]; then
       local status
-      status="$(curl --silent --output /dev/null --write-out '%{http_code}' --max-time 5 "$health_url" || true)"
+      status="$(curl --silent --location --output /dev/null --write-out '%{http_code}' --max-time 5 "$health_url" || true)"
       last_status="$status"
       if [[ "$status" == "$expect_status" ]]; then
         log info "target=${target_id} action=health_ok status=${status}"

deploy/updater/targets.json.example

@@ -16,7 +16,7 @@
       "image": "git.shts.su/denozord/mikrotikmanager-frontend:latest",
       "health": {
         "type": "http",
-        "url": "http://frontend:3000/",
+        "url": "http://frontend:3000/dashboard",
         "expect_status": 200
       }
     }

lib/data-source.tsx

@@ -91,9 +91,12 @@ export function DataSourceProvider({ children }: { children: React.ReactNode })
   }, [backendUrlLocked])
 
   const checkBackend = useCallback(async () => {
-    const url = normalizeBackendUrl(backendUrl)
+    const healthUrl =
+      configuredBackendUrl().kind === "same-origin"
+        ? "/health"
+        : `${normalizeBackendUrl(backendUrl)}/health`
     try {
-      const res = await fetch(`${url}/health`, { signal: AbortSignal.timeout(3000) })
+      const res = await fetch(healthUrl, { signal: AbortSignal.timeout(3000) })
       setBackendStatus(res.ok)
     } catch {
       setBackendStatus(false)

shared/api/http-client.ts

@@ -1,3 +1,5 @@
+import { configuredBackendUrl } from "@/lib/backend-url"
+
 export class ApiClientError extends Error {
   constructor(
     message: string,
@@ -13,13 +15,20 @@ function trimBaseUrl(baseUrl: string): string {
   return baseUrl.replace(/\/$/, "")
 }
 
+function resolveRequestUrl(baseUrl: string, path: string): string {
+  if (path.startsWith("/") && configuredBackendUrl().kind === "same-origin") {
+    return path
+  }
+  return trimBaseUrl(baseUrl) + path
+}
+
 export async function requestJson<T>(
   baseUrl: string,
   path: string,
   init?: RequestInit,
 ): Promise<T> {
   const hasBody = init?.body != null
-  const res = await fetch(trimBaseUrl(baseUrl) + path, {
+  const res = await fetch(resolveRequestUrl(baseUrl, path), {
     ...init,
     headers: {
       ...(hasBody ? { "Content-Type": "application/json" } : {}),