Get new api endpoints working

server/routers/newt/getNewtToken.ts

@@ -24,7 +24,7 @@ export const newtGetTokenBodySchema = z.object({
 
 export type NewtGetTokenBody = z.infer<typeof newtGetTokenBodySchema>;
 
-export async function getToken(
+export async function getNewtToken(
     req: Request,
     res: Response,
     next: NextFunction

server/routers/newt/handleGetConfigMessage.ts

@@ -10,8 +10,7 @@ import config from "@server/lib/config";
 
 const inputSchema = z.object({
     publicKey: z.string(),
-    endpoint: z.string(),
-    listenPort: z.number()
+    endpoint: z.string()
 });
 
 type Input = z.infer<typeof inputSchema>;
@@ -20,6 +19,9 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
     const { message, client, sendToClient } = context;
     const newt = client as Newt;
 
+    logger.debug(JSON.stringify(message.data));
+    
+
     logger.debug("Handling Newt get config message!");
 
     if (!newt) {
@@ -99,8 +101,8 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
     );
 
     const configResponse = {
-        listenPort: site.listenPort, // ?????
-        // ipAddress: exitNode[0].address,
+        listenPort: site.listenPort,
+        ipAddress: site.address,
         peers
     };
 

server/routers/newt/handleReceiveBandwidthMessage.ts

@@ -12,9 +12,12 @@ interface PeerBandwidth {
 
 export const handleReceiveBandwidthMessage: MessageHandler = async (context) => {
     const { message, client, sendToClient } = context;
-    const newt = client as Newt;
 
-    const bandwidthData: PeerBandwidth[] = message.data;
+    if (!message.data.bandwidthData) {
+        logger.warn("No bandwidth data provided");
+    }
+
+    const bandwidthData: PeerBandwidth[] = message.data.bandwidthData;
 
     if (!Array.isArray(bandwidthData)) {
         throw new Error("Invalid bandwidth data");
@@ -63,6 +66,4 @@ export const handleReceiveBandwidthMessage: MessageHandler = async (context) =>
                 .where(eq(clients.clientId, client.clientId));
         }
     });
-
-    logger.info("Handling register olm message!");
 };

server/routers/newt/index.ts

@@ -1,4 +1,4 @@
 export * from "./createNewt";
-export * from "./getToken";
+export * from "./getNewtToken";
 export * from "./handleNewtRegisterMessage";
 export* from "./handleReceiveBandwidthMessage";