calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-29 20:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Just use the targetHealthCheckId as the id

Browse Source
This commit is contained in:
Owen
2026-04-21 14:56:25 -07:00
parent dc299a740b
commit ff1ca7eafb
4 changed files with 31 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/routers/newt/buildConfiguration.ts
View File

@@ -21,7 +21,6 @@ import {
generateSubnetProxyTargetV2,
SubnetProxyTargetV2
} from "@server/lib/ip";
import { supportsTargetHealthChecksV2 } from "./targets";
export async function buildClientConfigurationForNewtClient(
site: Site,
@@ -232,12 +231,7 @@ export async function buildTargetConfigurationForNewtClient(
hcUnhealthyThreshold: targetHealthCheck.hcUnhealthyThreshold
})
.from(targetHealthCheck)
.where(
and(
eq(targetHealthCheck.siteId, siteId),
eq(targetHealthCheck.hcEnabled, true)
)
);
.where(eq(targetHealthCheck.siteId, siteId));
const { tcpTargets, udpTargets } = allTargets.reduce(
(acc, target) => {
@@ -285,9 +279,7 @@ export async function buildTargetConfigurationForNewtClient(
}
return {
id: supportsTargetHealthChecksV2(version)
? target.targetId
: target.targetHealthCheckId,
id: target.targetHealthCheckId,
hcEnabled: target.hcEnabled,
hcPath: target.hcPath,
hcScheme: target.hcScheme,

13
server/routers/newt/targets.ts
View File

@@ -2,15 +2,6 @@ import { Target, TargetHealthCheck } from "@server/db";
import { sendToClient } from "#dynamic/routers/ws";
import logger from "@server/logger";
import { canCompress } from "@server/lib/clientVersionChecks";
import semver from "semver";
const NEWT_V2_TARGET_HEALTH_CHECK_VERSION = ">=1.12.0";
export function supportsTargetHealthChecksV2(version?: string | null) {
return version
? semver.satisfies(version, NEWT_V2_TARGET_HEALTH_CHECK_VERSION)
: false;
}
export async function addTargets(
newtId: string,
@@ -92,9 +83,7 @@ export async function addTargets(
}
return {
id: supportsTargetHealthChecksV2(version)
? target.targetId
: hc.targetHealthCheckId,
id: hc.targetHealthCheckId,
hcEnabled: hc.hcEnabled,
hcPath: hc.hcPath,
hcScheme: hc.hcScheme,