diff --git a/apps/api/src/routes/integrations-vps-tracker.ts b/apps/api/src/routes/integrations-vps-tracker.ts index 9b5c974..98601be 100644 --- a/apps/api/src/routes/integrations-vps-tracker.ts +++ b/apps/api/src/routes/integrations-vps-tracker.ts @@ -3,7 +3,7 @@ import type { FastifyInstance } from "fastify"; import { vpsTrackerEventSchema } from "@cfdm/shared"; import { getAppSettingsSecrets } from "@cfdm/db"; import * as vpsTrackerEvents from "../services/vps-tracker-events.js"; -import { syncAllToVpsTracker } from "../services/vps-tracker-sync.js"; +import { buildAllSyncBindings } from "../services/vps-tracker-sync.js"; function verifyBearer(authHeader: string | undefined, expected: string): boolean { if (!authHeader?.startsWith("Bearer ")) return false; @@ -43,7 +43,11 @@ export async function integrationsVpsTrackerRoutes(app: FastifyInstance) { return { ok: true, reconciled }; }); - /** Запрос полной синхронизации bindings → VPS Tracker (вызывает VPS Tracker). */ + /** + * Полная синхронизация по запросу VPS Tracker (pull). + * Bindings возвращаются в ответе — клиент применяет их локально. + * Не требует доступности VPS Tracker URL из CFDM. + */ app.post("/integrations/vps-tracker/sync", async (req, reply) => { const secrets = getAppSettingsSecrets(app.db); const token = secrets.vpsTrackerIntegrationToken; @@ -57,14 +61,12 @@ export async function integrationsVpsTrackerRoutes(app: FastifyInstance) { return reply.status(401).send({ ok: false, error: "Unauthorized" }); } - const result = await syncAllToVpsTracker(app.db); - if (!result.ok) { - return reply.status(502).send({ - ok: false, - error: result.error ?? "Sync failed", - count: result.count, - }); - } - return { ok: true, count: result.count }; + const bindings = buildAllSyncBindings(app.db); + return { + ok: true, + count: bindings.length, + bindings, + fullSync: true, + }; }); } diff --git a/apps/api/src/services/vps-tracker-sync.ts b/apps/api/src/services/vps-tracker-sync.ts index f4e867a..927ca68 100644 --- a/apps/api/src/services/vps-tracker-sync.ts +++ b/apps/api/src/services/vps-tracker-sync.ts @@ -145,19 +145,21 @@ export async function syncAllToVpsTracker(db: Db): Promise<{ body: JSON.stringify({ bindings, fullSync: true }), }); if (!res.ok) { + const detail = await res.text(); return { ok: false, count: 0, - error: `HTTP ${res.status}: ${await res.text()}`, + error: `VPS Tracker ${baseUrl} ответил HTTP ${res.status}: ${detail}`, }; } touchVpsTrackerSync(db); return { ok: true, count: bindings.length }; } catch (err) { + const raw = err instanceof Error ? err.message : "Ошибка сети"; return { ok: false, count: 0, - error: err instanceof Error ? err.message : "Ошибка сети", + error: `Не удалось отправить данные в VPS Tracker (${baseUrl}): ${raw}`, }; } }