Merge branch 'main' into dev

server/routers/newt/handleGetConfigMessage.ts

@@ -9,6 +9,7 @@ import { buildClientConfigurationForNewtClient } from "./buildConfiguration";
 import { convertTargetsIfNessicary } from "../client/targets";
 import { canCompress } from "@server/lib/clientVersionChecks";
 
+<<<<<<< HEAD
 const inputSchema = z.object({
     publicKey: z.string(),
     port: z.int().positive(),
@@ -17,6 +18,8 @@ const inputSchema = z.object({
 
 type Input = z.infer<typeof inputSchema>;
 
+=======
+>>>>>>> main
 export const handleGetConfigMessage: MessageHandler = async (context) => {
     const { message, client, sendToClient } = context;
     const newt = client as Newt;
@@ -35,6 +38,7 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
         return;
     }
 
+<<<<<<< HEAD
     const parsed = inputSchema.safeParse(message.data);
     if (!parsed.success) {
         logger.error(
@@ -45,6 +49,9 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
     }
 
     const { publicKey, port, chainId } = message.data as Input;
+=======
+    const { publicKey, port, chainId } = message.data;
+>>>>>>> main
     const siteId = newt.siteId;
 
     // Get the current site data

server/routers/newt/handleNewtPingRequestMessage.ts

@@ -33,7 +33,7 @@ export const handleNewtPingRequestMessage: MessageHandler = async (context) => {
         return;
     }
 
-    const { noCloud } = message.data;
+    const { noCloud, chainId } = message.data;
 
     const exitNodesList = await listExitNodes(
         site.orgId,
@@ -98,7 +98,8 @@ export const handleNewtPingRequestMessage: MessageHandler = async (context) => {
         message: {
             type: "newt/ping/exitNodes",
             data: {
-                exitNodes: filteredExitNodes
+                exitNodes: filteredExitNodes,
+                chainId: chainId
             }
         },
         broadcast: false, // Send to all clients