Seperate config gen into functions

server/routers/ws/messageHandlers.ts

@@ -5,7 +5,8 @@ import {
     handleDockerStatusMessage,
     handleDockerContainersMessage,
     handleNewtPingRequestMessage,
-    handleApplyBlueprintMessage
+    handleApplyBlueprintMessage,
+    handleNewtPingMessage
 } from "../newt";
 import {
     handleOlmRegisterMessage,
@@ -24,6 +25,7 @@ export const messageHandlers: Record<string, MessageHandler> = {
     "olm/wg/relay": handleOlmRelayMessage,
     "olm/wg/unrelay": handleOlmUnRelayMessage,
     "olm/ping": handleOlmPingMessage,
+    "newt/ping": handleNewtPingMessage,
     "newt/wg/register": handleNewtRegisterMessage,
     "newt/wg/get-config": handleGetConfigMessage,
     "newt/receive-bandwidth": handleReceiveBandwidthMessage,

server/routers/ws/types.ts

@@ -52,7 +52,11 @@ export interface HandlerContext {
     senderWs: WebSocket;
     client: Newt | Olm | RemoteExitNode | undefined;
     clientType: ClientType;
-    sendToClient: (clientId: string, message: WSMessage, options?: SendMessageOptions) => Promise<boolean>;
+    sendToClient: (
+        clientId: string,
+        message: WSMessage,
+        options?: SendMessageOptions
+    ) => Promise<boolean>;
     broadcastToAllExcept: (
         message: WSMessage,
         excludeClientId?: string,

server/routers/ws/ws.ts

@@ -95,7 +95,7 @@ const sendToClientLocal = async (
     if (!clients || clients.length === 0) {
         return false;
     }
-    
+
     // Increment config version if requested
     if (options.incrementConfigVersion) {
         const currentVersion = clientConfigVersions.get(clientId) || 0;
@@ -106,14 +106,14 @@ const sendToClientLocal = async (
             client.configVersion = newVersion;
         });
     }
-    
+
     // Include config version in message
     const configVersion = clientConfigVersions.get(clientId) || 0;
     const messageWithVersion = {
         ...message,
         configVersion
     };
-    
+
     const messageString = JSON.stringify(messageWithVersion);
     clients.forEach((client) => {
         if (client.readyState === WebSocket.OPEN) {
@@ -189,7 +189,7 @@ const hasActiveConnections = async (clientId: string): Promise<boolean> => {
 };
 
 // Get the current config version for a client
-const getClientConfigVersion = (clientId: string): number => {
+const getClientConfigVersion = async (clientId: string): Promise<number> => {
     return clientConfigVersions.get(clientId) || 0;
 };