From 9811492a0b590e857eca52630ea4e6bb559a45e6 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Tue, 4 Aug 2026 14:23:25 -0400
Subject: [PATCH] send the aliases when connecting for the first time

---
 server/lib/rebuildClientAssociations.ts | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/server/lib/rebuildClientAssociations.ts b/server/lib/rebuildClientAssociations.ts
index 63a71382d..fe1cdea6f 100644
--- a/server/lib/rebuildClientAssociations.ts
+++ b/server/lib/rebuildClientAssociations.ts
@@ -1116,7 +1116,8 @@ async function syncClientExitNodeConnections(
 
     const requiresExitNodeRows = await trx
         .select({
-            clientId: clientSiteResourcesAssociationsCache.clientId
+            clientId: clientSiteResourcesAssociationsCache.clientId,
+            alias: siteResources.alias
         })
         .from(clientSiteResourcesAssociationsCache)
         .innerJoin(
@@ -1141,6 +1142,20 @@ async function syncClientExitNodeConnections(
         requiresExitNodeRows.map((r) => r.clientId)
     );
 
+    // Aliases for every exit-node-backed resource this client can reach, so
+    // the live connect push carries the same alias list the register/reconnect
+    // path (buildSiteConfigurationForOlmClient) would compute.
+    const exitNodeAliasesByClientId = new Map<number, string[]>();
+    for (const row of requiresExitNodeRows) {
+        if (row.alias == null) continue;
+        const existing = exitNodeAliasesByClientId.get(row.clientId);
+        if (existing) {
+            existing.push(row.alias);
+        } else {
+            exitNodeAliasesByClientId.set(row.clientId, [row.alias]);
+        }
+    }
+
     const exitNodeIds = Array.from(
         new Set(
             clientsData
@@ -1215,7 +1230,10 @@ async function syncClientExitNodeConnections(
                         relayPort,
                         publicKey: exitNode.publicKey,
                         serverIP: exitNode.address.split("/")[0],
-                        tunnelIP: client.exitNodeSubnet.split("/")[0]
+                        tunnelIP: client.exitNodeSubnet.split("/")[0],
+                        aliases: exitNodeAliasesByClientId.get(
+                            client.clientId
+                        ) ?? []
                     }
                 },
                 options: {