Handle aliases when registering

server/routers/olm/buildConfiguration.ts

@@ -19,6 +19,7 @@ import logger from "@server/logger";
 import { and, eq, inArray } from "drizzle-orm";
 import { addPeer, deletePeer } from "../newt/peers";
 import config from "@server/lib/config";
+import { SiR } from "react-icons/si";
 
 export async function buildSiteConfigurationForOlmClient(
     client: Client,
@@ -38,6 +39,8 @@ export async function buildSiteConfigurationForOlmClient(
         aliases: Alias[];
     }[] = [];
 
+    let exitNodeAliases: string[] = [];
+
     // Get all sites data
     const sitesData = await db
         .select()
@@ -76,16 +79,12 @@ export async function buildSiteConfigurationForOlmClient(
             )
         );
 
-    const haveInferenceResources = allClientSiteResources.some(
-        (row) => row.siteResource.requiresExitNodeConnection === true
-    );
-
-    if (sitesData.length === 0) {
-        return { siteConfigurations, haveInferenceResources };
-    }
-
     const siteResourcesBySiteId = new Map<number, SiteResource[]>();
+    let siteResourcesForExitNode = [];
     for (const row of allClientSiteResources) {
+        if (row.siteResource.requiresExitNodeConnection) {
+            siteResourcesForExitNode.push(row.siteResource);
+        }
         if (!row.siteId) {
             // because we are doing a leftJoin above to get the inference resources without a network / sites
             continue;
@@ -98,6 +97,17 @@ export async function buildSiteConfigurationForOlmClient(
         }
     }
 
+    exitNodeAliases = siteResourcesForExitNode
+        .map((sr) => sr.alias)
+        .filter((a) => a != null);
+
+    if (sitesData.length == 0) {
+        return {
+            siteConfigurations,
+            exitNodeAliases
+        };
+    }
+
     // Batch-fetch exit nodes for all sites in one query (only needed in relay mode).
     const exitNodesById = new Map<number, typeof exitNodes.$inferSelect>();
     if (!jitMode && relay) {
@@ -234,5 +244,8 @@ export async function buildSiteConfigurationForOlmClient(
         });
     }
 
-    return { siteConfigurations, haveInferenceResources };
+    return {
+        siteConfigurations,
+        exitNodeAliases
+    };
 }

server/routers/olm/handleOlmRegisterMessage.ts

@@ -462,7 +462,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
     // NOTE: its important that the client here is the old client and the public key is the new key
     await waitForClientRebuildIdle(olm.clientId);
 
-    const { siteConfigurations, haveInferenceResources } =
+    const { siteConfigurations, exitNodeAliases } =
         await buildSiteConfigurationForOlmClient(
             client,
             publicKey,
@@ -470,6 +470,10 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
             jitMode
         );
 
+    logger.info(
+        `+++++++++++++++++++++++++++++++ ExitNode Aliases: ${exitNodeAliases}`
+    );
+
     // Return connect message with all site configurations
     return {
         message: {
@@ -481,11 +485,9 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
                 exitNode:
                     exitNode && client.exitNodeSubnet
                         ? {
-                              connect: haveInferenceResources, // we do not need to connect to the exit node if we do not have inference resources
+                              aliases: exitNodeAliases,
+                              connect: exitNodeAliases.length > 0, // we do not need to connect to the exit node if we do not have inference resources and right now all site resources on the exit node have an alias
                               endpoint: `${exitNode.endpoint}:${exitNode.listenPort}`,
-                              relayPort:
-                                  config.getRawConfig().gerbil
-                                      .clients_start_port,
                               publicKey: exitNode.publicKey,
                               serverIP: exitNode.address.split("/")[0],
                               tunnelIP: client.exitNodeSubnet.split("/")[0]