Seperate get gerbil config

server/hybridServer.ts

@@ -8,6 +8,7 @@ import { addPeer, deletePeer } from "./routers/gerbil/peers";
 import { db, exitNodes } from "./db";
 import { TraefikConfigManager } from "./lib/remoteTraefikConfig";
 import { tokenManager } from "./lib/tokenManager";
+import { APP_VERSION } from "./lib/consts";
 
 export async function createHybridClientServer() {
     const monitor = new TraefikConfigManager();
@@ -67,6 +68,9 @@ export async function createHybridClientServer() {
     // Listen to connection events
     client.on("connect", () => {
         console.log("Connected to WebSocket server");
+        client.sendMessage("remoteExitNode/register", {
+            remoteExitNodeVersion: APP_VERSION
+        });
     });
 
     client.on("disconnect", () => {

server/routers/gerbil/getConfig.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { sites, resources, targets, exitNodes } from "@server/db";
+import { sites, resources, targets, exitNodes, ExitNode } from "@server/db";
 import { db } from "@server/db";
 import { eq, isNotNull, and } from "drizzle-orm";
 import HttpCode from "@server/types/HttpCode";
@@ -11,6 +11,7 @@ import { getUniqueExitNodeEndpointName } from "../../db/names";
 import { findNextAvailableCidr } from "@server/lib/ip";
 import { fromError } from "zod-validation-error";
 import { getAllowedIps } from "../target/helpers";
+import { proxyToRemote } from "@server/lib/remoteProxy";
 // Define Zod schema for request validation
 const getConfigSchema = z.object({
     publicKey: z.string(),
@@ -101,12 +102,34 @@ export async function getConfig(
             );
         }
 
+        // STOP HERE IN HYBRID MODE
+        if (config.isHybridMode()) {
+            return proxyToRemote(req, res, next, "gerbil/get-config");
+        }
+
+        const configResponse = await generateGerbilConfig(exitNode[0]);
+
+        logger.debug("Sending config: ", configResponse);
+
+        return res.status(HttpCode.OK).send(configResponse);
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "An error occurred..."
+            )
+        );
+    }
+}
+
+async function generateGerbilConfig(exitNode: ExitNode) {
     const sitesRes = await db
         .select()
         .from(sites)
         .where(
             and(
-                    eq(sites.exitNodeId, exitNode[0].exitNodeId),
+                eq(sites.exitNodeId, exitNode.exitNodeId),
                 isNotNull(sites.pubKey),
                 isNotNull(sites.subnet)
             )
@@ -133,23 +156,12 @@ export async function getConfig(
     );
 
     const configResponse: GetConfigResponse = {
-            listenPort: exitNode[0].listenPort || 51820,
+        listenPort: exitNode.listenPort || 51820,
-            ipAddress: exitNode[0].address,
+        ipAddress: exitNode.address,
         peers
     };
 
-        logger.debug("Sending config: ", configResponse);
+    return configResponse;
-
-        return res.status(HttpCode.OK).send(configResponse);
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(
-                HttpCode.INTERNAL_SERVER_ERROR,
-                "An error occurred..."
-            )
-        );
-    }
 }
 
 async function getNextAvailableSubnet(): Promise<string> {

server/routers/internal.ts

@@ -54,10 +54,6 @@ internalRouter.use("/gerbil", gerbilRouter);
 if (config.isHybridMode()) {
     // Use proxy router to forward requests to remote cloud server
     // Proxy endpoints for each gerbil route
-    gerbilRouter.post("/get-config", (req, res, next) =>
-        proxyToRemote(req, res, next, "gerbil/get-config")
-    );
-
     gerbilRouter.post("/receive-bandwidth", (req, res, next) =>
         proxyToRemote(req, res, next, "gerbil/receive-bandwidth")
     );
@@ -69,6 +65,9 @@ if (config.isHybridMode()) {
     gerbilRouter.post("/get-all-relays", (req, res, next) =>
         proxyToRemote(req, res, next, "gerbil/get-all-relays")
     );
+
+    // GET CONFIG IS HANDLED IN THE ORIGINAL HANDLER
+    // SO IT CAN REGISTER THE LOCAL EXIT NODE
 } else {
     // Use local gerbil endpoints
     gerbilRouter.post("/get-config", gerbil.getConfig);