Compare commits

..
1 Commits
Author SHA1 Message Date
DenozordecandCursor 4c59780ff0 fix(health): импортировать isHealthy при нескольких FQDN на одни IP
quality / commitlint (push) Skipped
CD / update-wiki (push) Successful in 6s
quality / changes (push) Successful in 8s
quality / web (push) Skipped
quality / docker-check (push) Skipped
quality / api (push) Successful in 42s
CD / quality (push) Successful in 54s
CD / publish (push) Successful in 1m36s
Схлопывание дубликатов в группе вызывало ReferenceError при сохранении сервиса.

Co-authored-by: Cursor <[email protected]>
2026-08-20 14:01:43 +07:00
2 changed files with 50 additions and 0 deletions
@@ -29,6 +29,7 @@ import * as domainService from "./domain-service.js";
import { syncServiceToVpsTracker } from "./vps-tracker-sync.js";
import { fireEnsureHealthWorker, DEFAULT_HEALTH_FALLBACKS } from "./health/health-worker-deploy.js";
import {
isHealthy,
selectActiveIpsByMode,
withBindingLock,
type LbIpRow,
@@ -78,4 +78,53 @@ describe("service bindings prune", () => {
expect(bindings).toHaveLength(2);
expect(bindings.map((b) => b.hostname).sort()).toEqual(["api", "www"]);
});
it("updateConfig with extra FQDN per IP does not throw when group health-check is on", async () => {
const db = setupDb();
const cf = mockCf();
const health = {
health_check_enabled: true,
health_check_type: "tcp" as const,
health_check_port: 443,
health_check_providers: ["local", "cloudflare", "globalping"] as const,
health_check_aggregate: "majority" as const,
};
repos.createDomain(db, null, "example.com", "cf-zone-example");
const group = repos.createServiceGroup(
db,
"VPN",
"vpn",
null,
"vpn.example.com",
{ ...health },
);
const service = repos.createService(db, "GT", "gt");
repos.setServiceGroup(db, service.id, group.id);
repos.setServiceEnabled(db, service.id, true);
const view = await updateConfig(db, cf, service.id, {
ips: ["93.115.203.183", "130.49.213.153"],
domains: [
{
fqdn: "gt.example.com",
target_ips: ["93.115.203.183", "130.49.213.153"],
...health,
},
{
fqdn: "rutg.example.com",
target_ips: ["93.115.203.183"],
...health,
},
{
fqdn: "nsgt.example.com",
target_ips: ["130.49.213.153"],
...health,
},
],
});
expect(view.domains).toHaveLength(3);
expect(view.ips.sort()).toEqual(["130.49.213.153", "93.115.203.183"]);
});
});