Merge pull request #1960 from Fredkiss3/refactor/separate-tables

refactor: separate tables
This commit is contained in:
Milo Schwartz
2025-12-03 11:28:21 -08:00
committed by GitHub
31 changed files with 4383 additions and 3229 deletions

View File

@@ -11,6 +11,7 @@ const runMigrations = async () => {
migrationsFolder: migrationsFolder
});
console.log("Migrations completed successfully.");
process.exit(0);
} catch (error) {
console.error("Error running migrations:", error);
process.exit(1);

View File

@@ -359,10 +359,8 @@ export async function getNextAvailableOrgSubnet(): Promise<string> {
return subnet;
}
export function generateRemoteSubnets(
allSiteResources: SiteResource[]
): string[] {
let remoteSubnets = allSiteResources
export function generateRemoteSubnets(allSiteResources: SiteResource[]): string[] {
const remoteSubnets = allSiteResources
.filter((sr) => {
if (sr.mode === "cidr") return true;
if (sr.mode === "host") {
@@ -415,7 +413,7 @@ export function generateSubnetProxyTargets(
subnet: string | null;
}[]
): SubnetProxyTarget[] {
let targets: SubnetProxyTarget[] = [];
const targets: SubnetProxyTarget[] = [];
if (clients.length === 0) {
logger.debug(

View File

@@ -394,9 +394,9 @@ async function handleMessagesForSiteClients(
return;
}
let newtJobs: Promise<any>[] = [];
let olmJobs: Promise<any>[] = [];
let exitNodeJobs: Promise<any>[] = [];
const newtJobs: Promise<any>[] = [];
const olmJobs: Promise<any>[] = [];
const exitNodeJobs: Promise<any>[] = [];
// Combine all clients that need processing (those being added or removed)
const clientsToProcess = new Map<
@@ -632,8 +632,8 @@ async function handleSubnetProxyTargetUpdates(
return;
}
let proxyJobs = [];
let olmJobs = [];
const proxyJobs = [];
const olmJobs = [];
// Generate targets for added associations
if (clientSiteResourcesToAdd.length > 0) {
const addedClients = allClients.filter((client) =>

View File

@@ -1043,7 +1043,7 @@ hybridRouter.get(
);
}
let rules = await db
const rules = await db
.select()
.from(resourceRules)
.where(eq(resourceRules.resourceId, resourceId));

View File

@@ -246,7 +246,7 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
.from(siteResources)
.where(eq(siteResources.siteId, siteId));
let targetsToSend: SubnetProxyTarget[] = [];
const targetsToSend: SubnetProxyTarget[] = [];
for (const resource of allSiteResources) {
// Get clients associated with this specific resource

View File

@@ -304,8 +304,7 @@ export async function updateSiteResource(
});
}
// Update olms for both destination and alias changes
let olmJobs: Promise<void>[] = [];
const olmJobs: Promise<void>[] = [];
for (const client of mergedAllClients) {
// we also need to update the remote subnets on the olms for each client that has access to this site
olmJobs.push(