Merge branch 'dev' into msg-opt

2026-03-24 11:36:39 +00:00 · 2026-03-23 16:00:50 -07:00
parent b01fcc70fe 7c8b865379
commit c660df55cd
203 changed files with 4955 additions and 4932 deletions
--- a/server/routers/client/createClient.ts
+++ b/server/routers/client/createClient.ts
@@ -48,7 +48,7 @@ registry.registerPath({
    method: "put",
    path: "/org/{orgId}/client",
    description: "Create a new client for an organization.",
-    tags: [OpenAPITags.Client, OpenAPITags.Org],
+    tags: [OpenAPITags.Client],
    request: {
        params: createClientParamsSchema,
        body: {
--- a/server/routers/client/createUserClient.ts
+++ b/server/routers/client/createUserClient.ts
@@ -49,7 +49,7 @@ registry.registerPath({
    path: "/org/{orgId}/user/{userId}/client",
    description:
        "Create a new client for a user and associate it with an existing olm.",
-    tags: [OpenAPITags.Client, OpenAPITags.Org, OpenAPITags.User],
+    tags: [OpenAPITags.Client],
    request: {
        params: paramsSchema,
        body: {
--- a/server/routers/client/getClient.ts
+++ b/server/routers/client/getClient.ts
@@ -243,7 +243,7 @@ registry.registerPath({
    path: "/org/{orgId}/client/{niceId}",
    description:
        "Get a client by orgId and niceId. NiceId is a readable ID for the site and unique on a per org basis.",
-    tags: [OpenAPITags.Org, OpenAPITags.Site],
+    tags: [OpenAPITags.Site],
    request: {
        params: z.object({
            orgId: z.string(),
--- a/server/routers/client/listClients.ts
+++ b/server/routers/client/listClients.ts
@@ -70,7 +70,7 @@ async function getLatestOlmVersion(): Promise<string | null> {
        tags = tags.filter((version) => !version.name.includes("rc"));
        const latestVersion = tags[0].name;

-        olmVersionCache.set("latestOlmVersion", latestVersion);
+        olmVersionCache.set("latestOlmVersion", latestVersion, 3600);

        return latestVersion;
    } catch (error: any) {
@@ -237,7 +237,7 @@ registry.registerPath({
    method: "get",
    path: "/org/{orgId}/clients",
    description: "List all clients for an organization.",
-    tags: [OpenAPITags.Client, OpenAPITags.Org],
+    tags: [OpenAPITags.Client],
    request: {
        query: listClientsSchema,
        params: listClientsParamsSchema
--- a/server/routers/client/listUserDevices.ts
+++ b/server/routers/client/listUserDevices.ts
@@ -71,7 +71,7 @@ async function getLatestOlmVersion(): Promise<string | null> {
        tags = tags.filter((version) => !version.name.includes("rc"));
        const latestVersion = tags[0].name;

-        olmVersionCache.set("latestOlmVersion", latestVersion);
+        olmVersionCache.set("latestOlmVersion", latestVersion, 3600);

        return latestVersion;
    } catch (error: any) {
@@ -256,7 +256,7 @@ registry.registerPath({
    method: "get",
    path: "/org/{orgId}/user-devices",
    description: "List all user devices for an organization.",
-    tags: [OpenAPITags.Client, OpenAPITags.Org],
+    tags: [OpenAPITags.Client],
    request: {
        query: listUserDevicesSchema,
        params: listUserDevicesParamsSchema
--- a/server/routers/client/pickClientDefaults.ts
+++ b/server/routers/client/pickClientDefaults.ts
@@ -23,7 +23,7 @@ registry.registerPath({
    method: "get",
    path: "/org/{orgId}/pick-client-defaults",
    description: "Return pre-requisite data for creating a client.",
-    tags: [OpenAPITags.Client, OpenAPITags.Site],
+    tags: [OpenAPITags.Client],
    request: {
        params: pickClientDefaultsSchema
    },
--- a/server/routers/client/targets.ts
+++ b/server/routers/client/targets.ts
@@ -1,31 +1,16 @@
 import { sendToClient } from "#dynamic/routers/ws";
-import { S } from "@faker-js/faker/dist/airline-Dz1uGqgJ";
-import { db, newts, olms, Transaction } from "@server/db";
+import { db, newts, olms } from "@server/db";
 import {
    Alias,
    convertSubnetProxyTargetsV2ToV1,
    SubnetProxyTarget,
    SubnetProxyTargetV2
 } from "@server/lib/ip";
+import { canCompress } from "@server/lib/clientVersionChecks";
 import logger from "@server/logger";
 import { eq } from "drizzle-orm";
 import semver from "semver";

-const BATCH_SIZE = 50;
-const BATCH_DELAY_MS = 50;
-
-function sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-function chunkArray<T>(array: T[], size: number): T[][] {
-    const chunks: T[][] = [];
-    for (let i = 0; i < array.length; i += size) {
-        chunks.push(array.slice(i, i + size));
-    }
-    return chunks;
-}
-
 const NEWT_V2_TARGETS_VERSION = ">=1.11.0";

 export async function convertTargetsIfNessicary(
@@ -59,53 +44,36 @@ export async function convertTargetsIfNessicary(

 export async function addTargets(
    newtId: string,
-    targets: SubnetProxyTarget[] | SubnetProxyTargetV2[]
+    targets: SubnetProxyTarget[] | SubnetProxyTargetV2[],
+    version?: string | null
 ) {
    targets = await convertTargetsIfNessicary(newtId, targets);

-    const batches = chunkArray<SubnetProxyTarget | SubnetProxyTargetV2>(
-        targets,
-        BATCH_SIZE
+    await sendToClient(
+        newtId,
+        {
+            type: `newt/wg/targets/add`,
+            data: targets
+        },
+        { incrementConfigVersion: true, compress: canCompress(version, "newt") }
    );
-
-    for (let i = 0; i < batches.length; i++) {
-        if (i > 0) {
-            await sleep(BATCH_DELAY_MS);
-        }
-        await sendToClient(
-            newtId,
-            {
-                type: `newt/wg/targets/add`,
-                data: batches[i]
-            },
-            { incrementConfigVersion: true }
-        );
-    }
 }

 export async function removeTargets(
    newtId: string,
-    targets: SubnetProxyTarget[] | SubnetProxyTargetV2[]
+    targets: SubnetProxyTarget[] | SubnetProxyTargetV2[],
+    version?: string | null
 ) {
    targets = await convertTargetsIfNessicary(newtId, targets);

-    const batches = chunkArray<SubnetProxyTarget | SubnetProxyTargetV2>(
-        targets,
-        BATCH_SIZE
+    await sendToClient(
+        newtId,
+        {
+            type: `newt/wg/targets/remove`,
+            data: targets
+        },
+        { incrementConfigVersion: true, compress: canCompress(version, "newt") }
    );
-    for (let i = 0; i < batches.length; i++) {
-        if (i > 0) {
-            await sleep(BATCH_DELAY_MS);
-        }
-        await sendToClient(
-            newtId,
-            {
-                type: `newt/wg/targets/remove`,
-                data: batches[i]
-            },
-            { incrementConfigVersion: true }
-        );
-    }
 }

 export async function updateTargets(
@@ -113,7 +81,8 @@ export async function updateTargets(
    targets: {
        oldTargets: SubnetProxyTarget[] | SubnetProxyTargetV2[];
        newTargets: SubnetProxyTarget[] | SubnetProxyTargetV2[];
-    }
+    },
+    version?: string | null
 ) {
    // get the newt
    const [newt] = await db
@@ -143,35 +112,19 @@ export async function updateTargets(
        };
    }

-    const oldBatches = chunkArray<SubnetProxyTarget | SubnetProxyTargetV2>(
-        targets.oldTargets,
-        BATCH_SIZE
-    );
-    const newBatches = chunkArray<SubnetProxyTarget | SubnetProxyTargetV2>(
-        targets.newTargets,
-        BATCH_SIZE
-    );
-
-    const maxBatches = Math.max(oldBatches.length, newBatches.length);
-
-    for (let i = 0; i < maxBatches; i++) {
-        if (i > 0) {
-            await sleep(BATCH_DELAY_MS);
-        }
-        await sendToClient(
-            newtId,
-            {
-                type: `newt/wg/targets/update`,
-                data: {
-                    oldTargets: oldBatches[i] || [],
-                    newTargets: newBatches[i] || []
-                }
-            },
-            { incrementConfigVersion: true }
-        ).catch((error) => {
-            logger.warn(`Error sending message:`, error);
-        });
-    }
+    await sendToClient(
+        newtId,
+        {
+            type: `newt/wg/targets/update`,
+            data: {
+                oldTargets: targets.oldTargets,
+                newTargets: targets.newTargets
+            }
+        },
+        { incrementConfigVersion: true, compress: canCompress(version, "newt") }
+    ).catch((error) => {
+        logger.warn(`Error sending message:`, error);
+    });
 }

 export async function addPeerData(
@@ -179,7 +132,8 @@ export async function addPeerData(
    siteId: number,
    remoteSubnets: string[],
    aliases: Alias[],
-    olmId?: string
+    olmId?: string,
+    version?: string | null
 ) {
    if (!olmId) {
        const [olm] = await db
@@ -191,6 +145,7 @@ export async function addPeerData(
            return; // ignore this because an olm might not be associated with the client anymore
        }
        olmId = olm.olmId;
+        version = olm.version;
    }

    await sendToClient(
@@ -203,7 +158,7 @@ export async function addPeerData(
                aliases: aliases
            }
        },
-        { incrementConfigVersion: true }
+        { incrementConfigVersion: true, compress: canCompress(version, "olm") }
    ).catch((error) => {
        logger.warn(`Error sending message:`, error);
    });
@@ -214,7 +169,8 @@ export async function removePeerData(
    siteId: number,
    remoteSubnets: string[],
    aliases: Alias[],
-    olmId?: string
+    olmId?: string,
+    version?: string | null
 ) {
    if (!olmId) {
        const [olm] = await db
@@ -226,6 +182,7 @@ export async function removePeerData(
            return;
        }
        olmId = olm.olmId;
+        version = olm.version;
    }

    await sendToClient(
@@ -238,7 +195,7 @@ export async function removePeerData(
                aliases: aliases
            }
        },
-        { incrementConfigVersion: true }
+        { incrementConfigVersion: true, compress: canCompress(version, "olm") }
    ).catch((error) => {
        logger.warn(`Error sending message:`, error);
    });
@@ -259,7 +216,8 @@ export async function updatePeerData(
              newAliases: Alias[];
          }
        | undefined,
-    olmId?: string
+    olmId?: string,
+    version?: string | null
 ) {
    if (!olmId) {
        const [olm] = await db
@@ -271,6 +229,7 @@ export async function updatePeerData(
            return;
        }
        olmId = olm.olmId;
+        version = olm.version;
    }

    await sendToClient(
@@ -283,7 +242,7 @@ export async function updatePeerData(
                ...aliases
            }
        },
-        { incrementConfigVersion: true }
+        { incrementConfigVersion: true, compress: canCompress(version, "olm") }
    ).catch((error) => {
        logger.warn(`Error sending message:`, error);
    });