From 2fd8134a573055f8b1678740019065e1efa504b4 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Thu, 19 Jun 2025 18:04:33 -0400
Subject: [PATCH] Dont go over capacity or accept no capacity

---
 .../routers/newt/handleNewtPingRequestMessage.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/routers/newt/handleNewtPingRequestMessage.ts b/server/routers/newt/handleNewtPingRequestMessage.ts
index d8d9a951..4e37c8fd 100644
--- a/server/routers/newt/handleNewtPingRequestMessage.ts
+++ b/server/routers/newt/handleNewtPingRequestMessage.ts
@@ -3,7 +3,7 @@ import { MessageHandler } from "../ws";
 import { exitNodes, Newt } from "@server/db";
 import logger from "@server/logger";
 import config from "@server/lib/config";
-import { eq, and, count } from "drizzle-orm";
+import { ne, eq, and, count } from "drizzle-orm";
 
 export const handleNewtPingRequestMessage: MessageHandler = async (context) => {
     const { message, client, sendToClient } = context;
@@ -17,7 +17,10 @@ export const handleNewtPingRequestMessage: MessageHandler = async (context) => {
     }
 
     // TODO: pick which nodes to send and ping better than just all of them
-    const exitNodesList = await db.select().from(exitNodes);
+    const exitNodesList = await db
+        .select()
+        .from(exitNodes)
+        .where(ne(exitNodes.maxConnections, 0));
 
     let lastExitNodeId = null;
     if (newt.siteId) {
@@ -50,6 +53,10 @@ export const handleNewtPingRequestMessage: MessageHandler = async (context) => {
                         )
                     );
 
+                    if (currentConnections.count >= maxConnections) {
+                        return null
+                    }
+
                 weight =
                     (maxConnections - currentConnections.count) /
                     maxConnections;
@@ -65,11 +72,14 @@ export const handleNewtPingRequestMessage: MessageHandler = async (context) => {
         })
     );
 
+    // filter out null values
+    const filteredExitNodes = exitNodesPayload.filter((node) => node !== null);
+
     return {
         message: {
             type: "newt/ping/exitNodes",
             data: {
-                exitNodes: exitNodesPayload
+                exitNodes: filteredExitNodes
             }
         },
         broadcast: false, // Send to all clients