From 117df40e68ad25fd289e2e557eb288c5a7148d79 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 31 Jul 2026 10:54:18 -0400
Subject: [PATCH] send if we need to connect to the gerbil or not

---
 server/db/pg/schema/schema.ts                 |  3 +++
 server/db/sqlite/schema/schema.ts             |  5 +++++
 server/routers/olm/buildConfiguration.ts      | 22 +++++++++++++------
 .../routers/olm/handleOlmRegisterMessage.ts   | 16 +++++++++-----
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/server/db/pg/schema/schema.ts b/server/db/pg/schema/schema.ts
index 0bbf88631..9f74788d7 100644
--- a/server/db/pg/schema/schema.ts
+++ b/server/db/pg/schema/schema.ts
@@ -428,6 +428,9 @@ export const siteResources = pgTable(
                 onDelete: "restrict"
             }
         ),
+        requiresExitNodeConnection: boolean("requiresExitNodeConnection")
+            .notNull()
+            .default(false),
         niceId: varchar("niceId").notNull(),
         name: varchar("name").notNull(),
         ssl: boolean("ssl").notNull().default(false),
diff --git a/server/db/sqlite/schema/schema.ts b/server/db/sqlite/schema/schema.ts
index f13afa2cf..ec1b9e6f4 100644
--- a/server/db/sqlite/schema/schema.ts
+++ b/server/db/sqlite/schema/schema.ts
@@ -425,6 +425,11 @@ export const siteResources = sqliteTable("siteResources", {
         () => networks.networkId,
         { onDelete: "restrict" }
     ),
+    requiresExitNodeConnection: integer("requiresExitNodeConnection", {
+        mode: "boolean"
+    })
+        .notNull()
+        .default(false),
     niceId: text("niceId").notNull(),
     name: text("name").notNull(),
     ssl: integer("ssl", { mode: "boolean" }).notNull().default(false),
diff --git a/server/routers/olm/buildConfiguration.ts b/server/routers/olm/buildConfiguration.ts
index ed1b0cfae..736363a5f 100644
--- a/server/routers/olm/buildConfiguration.ts
+++ b/server/routers/olm/buildConfiguration.ts
@@ -48,10 +48,6 @@ export async function buildSiteConfigurationForOlmClient(
         )
         .where(eq(clientSitesAssociationsCache.clientId, client.clientId));
 
-    if (sitesData.length === 0) {
-        return siteConfigurations;
-    }
-
     // Batch-fetch every site resource this client has access to across ALL sites
     // in a single query, then group by siteId in memory. This avoids issuing one
     // query per site (which would be N round-trips for N sites).
@@ -68,8 +64,8 @@ export async function buildSiteConfigurationForOlmClient(
                 clientSiteResourcesAssociationsCache.siteResourceId
             )
         )
-        .innerJoin(networks, eq(siteResources.networkId, networks.networkId))
-        .innerJoin(siteNetworks, eq(networks.networkId, siteNetworks.networkId))
+        .leftJoin(networks, eq(siteResources.networkId, networks.networkId))
+        .leftJoin(siteNetworks, eq(networks.networkId, siteNetworks.networkId))
         .where(
             and(
                 eq(
@@ -80,8 +76,20 @@ 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[]>();
     for (const row of allClientSiteResources) {
+        if (!row.siteId) {
+            // because we are doing a leftJoin above to get the inference resources without a network / sites
+            continue;
+        }
         const arr = siteResourcesBySiteId.get(row.siteId);
         if (arr) {
             arr.push(row.siteResource);
@@ -226,5 +234,5 @@ export async function buildSiteConfigurationForOlmClient(
         });
     }
 
-    return siteConfigurations;
+    return { siteConfigurations, haveInferenceResources };
 }
diff --git a/server/routers/olm/handleOlmRegisterMessage.ts b/server/routers/olm/handleOlmRegisterMessage.ts
index 8d148380c..7fa270fa2 100644
--- a/server/routers/olm/handleOlmRegisterMessage.ts
+++ b/server/routers/olm/handleOlmRegisterMessage.ts
@@ -337,6 +337,8 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
             return;
         }
 
+        // TODO: IF WE DO NOT HAVE AN INFERENCE RESOURCE DO WE NEED TO BE HOLDING A SUBNET ON THE CLIENT?
+
         const newSubnet = await getUniqueSubnetForExitNode(exitNode);
 
         if (!newSubnet) {
@@ -452,12 +454,13 @@ 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 = await buildSiteConfigurationForOlmClient(
-        client,
-        publicKey,
-        relay,
-        jitMode
-    );
+    const { siteConfigurations, haveInferenceResources } =
+        await buildSiteConfigurationForOlmClient(
+            client,
+            publicKey,
+            relay,
+            jitMode
+        );
 
     // Return connect message with all site configurations
     return {
@@ -470,6 +473,7 @@ 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
                               endpoint: `${exitNode.endpoint}:${exitNode.listenPort}`,
                               relayPort:
                                   config.getRawConfig().gerbil