fix(integrations): pull bindings из CFDM вместо обратного push
Docker / build (push) Failing after 19s

Устраняет fetch failed при ручном sync, когда CFDM не может достучаться до VPS Tracker. Ошибки показывают URL; UI подсказывает URL из App Switcher.

Co-authored-by: Cursor <[email protected]>
This commit is contained in:
Denozordec
2026-08-01 00:36:04 +07:00
co-authored by Cursor
parent fd2d5f39c0
commit c5198cdd7f
4 changed files with 139 additions and 15 deletions
+70 -6
View File
@@ -1,12 +1,39 @@
import { settingsRepository } from '@cfdm/db/repositories/settings'
import { vpsDomainsRepository } from '@cfdm/db/repositories/vps-domains'
import {
cfdmSyncBindingsBodySchema,
type CfdmBindingSyncItem,
} from '@cfdm/shared/contracts/integration-cfdm'
function isUsableHttpUrl(raw: string): boolean {
try {
const u = new URL(raw)
if (u.protocol !== 'http:' && u.protocol !== 'https:') return false
const host = u.hostname.toLowerCase()
if (host === 'example.com' || host.endsWith('.example.com')) return false
return true
} catch {
return false
}
}
function resolveCfdmApiBase(): string | null {
const row = settingsRepository.getBySpace()
if (!row) return null
const explicit = row.cfdmApiUrl?.trim()
if (explicit) return explicit.replace(/\/$/, '')
if (explicit && isUsableHttpUrl(explicit)) return explicit.replace(/\/$/, '')
const cfdm = settingsRepository.getAppSwitcher().apps.find((a) => a.id === 'cfdm')
return cfdm?.url?.trim().replace(/\/$/, '') ?? null
const fromSwitcher = cfdm?.url?.trim().replace(/\/$/, '') ?? ''
if (fromSwitcher && isUsableHttpUrl(fromSwitcher)) return fromSwitcher
return null
}
function networkErrorMessage(baseUrl: string, err: unknown): string {
const raw = err instanceof Error ? err.message : 'Ошибка сети'
return (
`Не удалось подключиться к CFDM (${baseUrl}): ${raw}. ` +
'Укажите URL API CFDM (доступный с хоста VPS Tracker API) и сохраните.'
)
}
export async function requestCfdmFullSync(): Promise<{
@@ -16,30 +43,67 @@ export async function requestCfdmFullSync(): Promise<{
}> {
const token = settingsRepository.getIntegrationToken()
const baseUrl = resolveCfdmApiBase()
if (!baseUrl) return { ok: false, error: 'Укажите URL API CFDM' }
if (!baseUrl) {
return {
ok: false,
error:
'Укажите URL API CFDM в настройках интеграции (или добавьте приложение cfdm в App Switcher)',
}
}
if (!token) return { ok: false, error: 'Укажите integration token' }
const syncUrl = `${baseUrl}/api/v1/integrations/vps-tracker/sync`
try {
const res = await fetch(`${baseUrl}/api/v1/integrations/vps-tracker/sync`, {
const res = await fetch(syncUrl, {
method: 'POST',
headers: { Authorization: `Bearer ${token}` },
signal: AbortSignal.timeout(60_000),
})
const body = (await res.json().catch(() => ({}))) as {
ok?: boolean
count?: number
error?: string
bindings?: CfdmBindingSyncItem[]
fullSync?: boolean
}
if (!res.ok || body.ok === false) {
return {
ok: false,
error: body.error ?? `HTTP ${res.status}`,
error: body.error ?? `CFDM HTTP ${res.status} (${syncUrl})`,
}
}
// Pull: CFDM отдаёт bindings в ответе — применяем локально (без обратного push).
if (Array.isArray(body.bindings)) {
const parsed = cfdmSyncBindingsBodySchema.safeParse({
bindings: body.bindings,
fullSync: body.fullSync !== false,
})
if (!parsed.success) {
return {
ok: false,
error: `Некорректный ответ CFDM: ${parsed.error.message}`,
}
}
const applied = vpsDomainsRepository.syncBindings(parsed.data.bindings, {
fullSync: parsed.data.fullSync === true,
})
settingsRepository.touchIntegrationSync()
return {
ok: true,
count: parsed.data.bindings.length || applied.upserted,
}
}
// Legacy: CFDM уже запушил bindings сам и вернул только count.
settingsRepository.touchIntegrationSync()
return { ok: true, count: body.count ?? 0 }
} catch (err) {
return {
ok: false,
error: err instanceof Error ? err.message : 'Ошибка сети',
error: networkErrorMessage(baseUrl, err),
}
}
}