Seperating out functions

server/routers/olm/buildConfiguration.ts

@@ -7,7 +7,7 @@ import config from "@server/lib/config";
 
 export async function buildSiteConfigurationForOlmClient(
     client: Client,
-    publicKey: string,
+    publicKey: string | null,
     relay: boolean
 ) {
     const siteConfigurations = [];
@@ -74,7 +74,7 @@ export async function buildSiteConfigurationForOlmClient(
             .limit(1);
 
         // Add the peer to the exit node for this site
-        if (clientSite.endpoint) {
+        if (clientSite.endpoint && publicKey) {
             logger.info(
                 `Adding peer ${publicKey} to site ${site.siteId} with endpoint ${clientSite.endpoint}`
             );

server/routers/olm/handleOlmRegisterMessage.ts

@@ -174,6 +174,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
         return;
     }
 
+    // NOTE: its important that the client here is the old client and the public key is the new key
     const siteConfigurations = await buildSiteConfigurationForOlmClient(client, publicKey, relay);
 
     // REMOVED THIS SO IT CREATES THE INTERFACE AND JUST WAITS FOR THE SITES

server/routers/olm/sync.ts

@@ -1,7 +1,18 @@
 import { Client, Olm } from "@server/db";
 import { buildSiteConfigurationForOlmClient } from "./buildSiteConfigurationForOlmClient";
+import { sendToClient } from "#dynamic/routers/ws";
+import logger from "@server/logger";
 
 export async function sendOlmSyncMessage(olm: Olm, client: Client) {
-    const siteConfigurations = await buildSiteConfigurationForOlmClient(client, publicKey, relay);
+    // NOTE: WE ARE HARDCODING THE RELAY PARAMETER TO FALSE HERE BUT IN THE REGISTER MESSAGE ITS DEFINED BY THE CLIENT
+    const siteConfigurations = await buildSiteConfigurationForOlmClient(client, client.pubKey, false);
 
+    await sendToClient(olm.olmId, {
+        type: "olm/sync",
+        data: {
+            sites: siteConfigurations
+        }
+    }).catch((error) => {
+        logger.warn(`Error sending olm sync message:`, error);
+    });
 }