Send localEndpoints on sites to olm

server/routers/newt/handleNewtRegisterMessage.ts

@@ -133,7 +133,9 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
                 pubKey: publicKey,
                 exitNodeId: exitNodeId,
                 subnet: newSubnet,
-                localEndpoints: localEndpoints || null
+                localEndpoints: localEndpoints
+                    ? JSON.stringify(localEndpoints)
+                    : null
             })
             .where(eq(sites.siteId, siteId))
             .returning();
@@ -142,7 +144,9 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
             .update(sites)
             .set({
                 pubKey: publicKey,
-                localEndpoints: localEndpoints || null
+                localEndpoints: localEndpoints
+                    ? JSON.stringify(localEndpoints)
+                    : null
             })
             .where(eq(sites.siteId, siteId))
             .returning();

server/routers/olm/buildConfiguration.ts

@@ -30,6 +30,7 @@ export async function buildSiteConfigurationForOlmClient(
         siteId: number;
         name?: string;
         endpoint?: string;
+        localEndpoints?: string[];
         publicKey?: string;
         serverIP?: string | null;
         serverPort?: number | null;
@@ -206,6 +207,9 @@ export async function buildSiteConfigurationForOlmClient(
             name: site.name,
             // relayEndpoint: relayEndpoint, // this can be undefined now if not relayed // lets not do this for now because it would conflict with the hole punch testing
             endpoint: site.endpoint,
+            localEndpoints: site.localEndpoints
+                ? JSON.parse(site.localEndpoints)
+                : undefined,
             publicKey: site.publicKey,
             serverIP: site.address,
             serverPort: site.listenPort,

server/routers/olm/handleOlmServerPeerAddMessage.ts

@@ -3,24 +3,15 @@ import {
     db,
     networks,
     siteNetworks,
-    siteResources,
+    siteResources
 } from "@server/db";
 import { MessageHandler } from "@server/routers/ws";
-import {
+import { clients, clientSitesAssociationsCache, Olm, sites } from "@server/db";
-    clients,
-    clientSitesAssociationsCache,
-    Olm,
-    sites
-} from "@server/db";
 import { and, eq, inArray, isNotNull, isNull } from "drizzle-orm";
 import logger from "@server/logger";
-import {
+import { generateAliasConfig } from "@server/lib/ip";
-    generateAliasConfig,
-} from "@server/lib/ip";
 import { generateRemoteSubnets } from "@server/lib/ip";
-import {
+import { addPeer as newtAddPeer } from "@server/routers/newt/peers";
-    addPeer as newtAddPeer,
-} from "@server/routers/newt/peers";
 
 export const handleOlmServerPeerAddMessage: MessageHandler = async (
     context
@@ -135,10 +126,7 @@ export const handleOlmServerPeerAddMessage: MessageHandler = async (
                 clientSiteResourcesAssociationsCache.siteResourceId
             )
         )
-        .innerJoin(
+        .innerJoin(networks, eq(siteResources.networkId, networks.networkId))
-            networks,
-            eq(siteResources.networkId, networks.networkId)
-        )
         .innerJoin(
             siteNetworks,
             and(
@@ -147,10 +135,7 @@ export const handleOlmServerPeerAddMessage: MessageHandler = async (
             )
         )
         .where(
-            eq(
+            eq(clientSiteResourcesAssociationsCache.clientId, client.clientId)
-                clientSiteResourcesAssociationsCache.clientId,
-                client.clientId
-            )
         );
 
     // Return connect message with all site configurations
@@ -161,6 +146,9 @@ export const handleOlmServerPeerAddMessage: MessageHandler = async (
                 siteId: site.siteId,
                 name: site.name,
                 endpoint: site.endpoint,
+                localEndpoints: site.localEndpoints
+                    ? JSON.parse(site.localEndpoints)
+                    : undefined,
                 publicKey: site.publicKey,
                 serverIP: site.address,
                 serverPort: site.listenPort,
@@ -170,7 +158,7 @@ export const handleOlmServerPeerAddMessage: MessageHandler = async (
                 aliases: generateAliasConfig(
                     allSiteResources.map(({ siteResources }) => siteResources)
                 ),
-                chainId: chainId,
+                chainId: chainId
             }
         },
         broadcast: false,

server/routers/olm/peers.ts

@@ -18,6 +18,7 @@ export async function addPeer(
         serverPort: number | null;
         remoteSubnets: string[] | null; // optional, comma-separated list of subnets that this site can access
         aliases: Alias[];
+        localEndpoints?: string[]; // optional, list of local endpoints for the peer
     },
     olmId?: string,
     version?: string | null
@@ -44,6 +45,7 @@ export async function addPeer(
                 name: peer.name,
                 publicKey: peer.publicKey,
                 endpoint: peer.endpoint,
+                localEndpoints: peer.localEndpoints,
                 relayEndpoint: peer.relayEndpoint,
                 serverIP: peer.serverIP,
                 serverPort: peer.serverPort,