Add increment options and slight cleanup

server/routers/olm/handleOlmPingMessage.ts

@@ -170,18 +170,18 @@ export const handleOlmPingMessage: MessageHandler = async (context) => {
                 lastPing: Math.floor(Date.now() / 1000),
                 online: true
             })
-            .where(eq(clients.clientId, olm.clientId)).returning();
-
+            .where(eq(clients.clientId, olm.clientId))
+            .returning();
 
         // get the version
         const configVersion = await getClientConfigVersion(olm.olmId);
 
         if (message.configVersion && configVersion != message.configVersion) {
-            logger.warn(`Olm ping with outdated config version: ${message.configVersion} (current: ${configVersion})`);
+            logger.warn(
+                `Olm ping with outdated config version: ${message.configVersion} (current: ${configVersion})`
+            );
             await sendOlmSyncMessage(olm, client);
         }
-
-
     } catch (error) {
         logger.error("Error handling ping message", { error });
     }

server/routers/olm/handleOlmRegisterMessage.ts

@@ -157,12 +157,11 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
         .where(eq(clientSitesAssociationsCache.clientId, client.clientId));
 
     // Extract the count value from the result array
-    const sitesCount = sitesCountResult.length > 0 ? sitesCountResult[0].count : 0;
+    const sitesCount =
+        sitesCountResult.length > 0 ? sitesCountResult[0].count : 0;
 
     // Prepare an array to store site configurations
-    logger.debug(
-        `Found ${sitesCount} sites for client ${client.clientId}`
-    );
+    logger.debug(`Found ${sitesCount} sites for client ${client.clientId}`);
 
     // this prevents us from accepting a register from an olm that has not hole punched yet.
     // the olm will pump the register so we can keep checking
@@ -175,7 +174,11 @@ 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
-    const siteConfigurations = await buildSiteConfigurationForOlmClient(client, publicKey, relay);
+    const siteConfigurations = await buildSiteConfigurationForOlmClient(
+        client,
+        publicKey,
+        relay
+    );
 
     // REMOVED THIS SO IT CREATES THE INTERFACE AND JUST WAITS FOR THE SITES
     // if (siteConfigurations.length === 0) {

server/routers/olm/peers.ts

@@ -45,7 +45,7 @@ export async function addPeer(
             remoteSubnets: peer.remoteSubnets, // optional, comma-separated list of subnets that this site can access
             aliases: peer.aliases
         }
-    }).catch((error) => {
+    }, { incrementConfigVersion: true }).catch((error) => {
         logger.warn(`Error sending message:`, error);
     });
 
@@ -76,7 +76,7 @@ export async function deletePeer(
             publicKey,
             siteId: siteId
         }
-    }).catch((error) => {
+    }, { incrementConfigVersion: true }).catch((error) => {
         logger.warn(`Error sending message:`, error);
     });
 
@@ -121,7 +121,7 @@ export async function updatePeer(
             remoteSubnets: peer.remoteSubnets,
             aliases: peer.aliases
         }
-    }).catch((error) => {
+    }, { incrementConfigVersion: true }).catch((error) => {
         logger.warn(`Error sending message:`, error);
     });
 
@@ -161,6 +161,8 @@ export async function initPeerAddHandshake(
                 endpoint: peer.exitNode.endpoint
             }
         }
+    // }, { incrementConfigVersion: true }).catch((error) => {
+    // TODO: DOES THIS NEED TO BE A INCREMENT VERSION? I AM NOT SURE BECAUSE IT WOULD BE TRIGGERED BY THE SYNC?
     }).catch((error) => {
         logger.warn(`Error sending message:`, error);
     });

server/routers/olm/sync.ts

@@ -5,7 +5,11 @@ import logger from "@server/logger";
 
 export async function sendOlmSyncMessage(olm: Olm, client: Client) {
     // 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);
+    const siteConfigurations = await buildSiteConfigurationForOlmClient(
+        client,
+        client.pubKey,
+        false
+    );
 
     await sendToClient(olm.olmId, {
         type: "olm/sync",