Build client site resource associations and send messages

server/routers/client/deleteClient.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { clients, clientSites } from "@server/db";
+import { clients, clientSitesAssociationsCache } from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -70,8 +70,8 @@ export async function deleteClient(
         await db.transaction(async (trx) => {
             // Delete the client-site associations first
             await trx
-                .delete(clientSites)
-                .where(eq(clientSites.clientId, clientId));
+                .delete(clientSitesAssociationsCache)
+                .where(eq(clientSitesAssociationsCache.clientId, clientId));
 
             // Then delete the client itself
             await trx.delete(clients).where(eq(clients.clientId, clientId));

server/routers/client/getClient.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { clients, clientSites } from "@server/db";
+import { clients, clientSitesAssociationsCache } from "@server/db";
 import { eq, and } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -29,9 +29,9 @@ async function query(clientId: number) {
 
     // Get the siteIds associated with this client
     const sites = await db
-        .select({ siteId: clientSites.siteId })
-        .from(clientSites)
-        .where(eq(clientSites.clientId, clientId));
+        .select({ siteId: clientSitesAssociationsCache.siteId })
+        .from(clientSitesAssociationsCache)
+        .where(eq(clientSitesAssociationsCache.clientId, clientId));
 
     // Add the siteIds to the client object
     return {

server/routers/client/listClients.ts

@@ -5,7 +5,7 @@ import {
     roleClients,
     sites,
     userClients,
-    clientSites
+    clientSitesAssociationsCache
 } from "@server/db";
 import logger from "@server/logger";
 import HttpCode from "@server/types/HttpCode";
@@ -142,14 +142,14 @@ async function getSiteAssociations(clientIds: number[]) {
 
     return db
         .select({
-            clientId: clientSites.clientId,
-            siteId: clientSites.siteId,
+            clientId: clientSitesAssociationsCache.clientId,
+            siteId: clientSitesAssociationsCache.siteId,
             siteName: sites.name,
             siteNiceId: sites.niceId
         })
-        .from(clientSites)
-        .leftJoin(sites, eq(clientSites.siteId, sites.siteId))
-        .where(inArray(clientSites.clientId, clientIds));
+        .from(clientSitesAssociationsCache)
+        .leftJoin(sites, eq(clientSitesAssociationsCache.siteId, sites.siteId))
+        .where(inArray(clientSitesAssociationsCache.clientId, clientIds));
 }
 
 type OlmWithUpdateAvailable = Awaited<ReturnType<typeof queryClients>>[0] & {

server/routers/client/targets.ts

@@ -3,7 +3,7 @@ import { SubnetProxyTarget } from "@server/lib/ip";
 
 export async function addTargets(newtId: string, targets: SubnetProxyTarget[]) {
     await sendToClient(newtId, {
-        type: `newt/wg/target/add`,
+        type: `newt/wg/targets/add`,
         data: targets
     });
 }
@@ -13,7 +13,7 @@ export async function removeTargets(
     targets: SubnetProxyTarget[]
 ) {
     await sendToClient(newtId, {
-        type: `newt/wg/target/remove`,
+        type: `newt/wg/targets/remove`,
         data: targets
     });
 }
@@ -26,7 +26,7 @@ export async function updateTargets(
     }
 ) {
     await sendToClient(newtId, {
-        type: `newt/wg/target/update`,
+        type: `newt/wg/targets/update`,
         data: targets
     });
 }

server/routers/client/updateClient.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { Client, db, exitNodes, olms, sites } from "@server/db";
-import { clients, clientSites } from "@server/db";
+import { clients, clientSitesAssociationsCache } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";