calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-08-07 13:08:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add domain to the resource selection

Browse Source
This commit is contained in:
Owen
2026-08-06 12:03:40 -04:00
parent 6564bfe8ae
commit fb896d6c0f
11 changed files with 590 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/routers/siteResource/createSiteResource.ts
+12 -8
View File
@@ -168,7 +168,7 @@ const createSiteResourceSchema = z
)
.refine(
(data) => {
// destination is only optional for ssh mode with native authDaemonMode
// destination is only optional for ssh mode with native authDaemonMode or inference
if (
(data.mode === "ssh" && data.authDaemonMode === "native") ||
data.mode == "inference"
@@ -182,7 +182,7 @@ const createSiteResourceSchema = z
},
{
message:
"Destination is required unless mode is ssh with authDaemonMode native"
"Destination is required unless mode is ssh with authDaemonMode native or inference"
}
)
.refine(
@@ -509,7 +509,15 @@ export async function createSiteResource(
const existingResource = await db
.select()
.from(siteResources)
.where(eq(siteResources.fullDomain, fullDomain));
.where(
and(
eq(siteResources.fullDomain, fullDomain),
ne(
siteResources.requiresExitNodeConnection,
mode == "inference"
)
)
); // exclude looking at the ones on exit nodes if this is an inference resource
if (existingResource.length > 0) {
return next(
@@ -529,11 +537,7 @@ export async function createSiteResource(
.where(
and(
eq(siteResources.orgId, orgId),
eq(siteResources.alias, alias.trim()),
ne(
siteResources.requiresExitNodeConnection,
mode == "inference"
) // exclude looking at the ones on exit nodes if this is an inference resource
eq(siteResources.alias, alias.trim())
)
)
.limit(1);
server/routers/siteResource/updateSiteResource.ts
+11 -7
View File
@@ -172,7 +172,7 @@ const updateSiteResourceSchema = z
},
{
message:
"Destination is required unless mode is ssh with authDaemonMode native"
"Destination is required unless mode is ssh with authDaemonMode native or inference"
}
)
.refine(
@@ -481,7 +481,15 @@ export async function updateSiteResource(
const [existingDomain] = await db
.select()
.from(siteResources)
.where(eq(siteResources.fullDomain, fullDomain));
.where(
and(
eq(siteResources.fullDomain, fullDomain),
ne(
siteResources.requiresExitNodeConnection,
mode == "inference"
)
)
); // exclude looking at the ones on exit nodes if this is an inference resource
if (
existingDomain &&
@@ -511,11 +519,7 @@ export async function updateSiteResource(
and(
eq(siteResources.orgId, existingSiteResource.orgId),
eq(siteResources.alias, alias.trim()),
ne(siteResources.siteResourceId, siteResourceId), // exclude self
ne(
siteResources.requiresExitNodeConnection,
mode == "inference"
) // exclude looking at the ones on exit nodes if this is an inference resource
ne(siteResources.siteResourceId, siteResourceId) // exclude self
)
)
.limit(1);