Update websockets should now have access to real client IP

Author: zigazajc007

bun.lock

@@ -1,7 +1,7 @@
 {
 	"name": "uptimemonitor-server",
 	"module": "src/index.ts",
-	"version": "0.2.9",
+	"version": "0.2.10",
 	"type": "module",
 	"private": true,
 	"scripts": {
@@ -16,8 +16,8 @@
 	},
 	"dependencies": {
 		"@clickhouse/client": "^1.16.0",
-		"@rabbit-company/web": "^0.17.0",
-		"@rabbit-company/web-middleware": "^0.17.0",
+		"@rabbit-company/web": "^0.18.0",
+		"@rabbit-company/web-middleware": "^0.18.0",
 		"nodemailer": "^7.0.12"
 	}
 }

package.json

@@ -405,7 +405,7 @@ app.websocket({
 	idleTimeout: 120,
 	maxPayloadLength: 1024 * 1024, // 1 MB
 	open(ws) {
-		Logger.audit("WebSocket connection opened", { ip: ws.remoteAddress });
+		Logger.audit("WebSocket connection opened", { ip: ws.data.clientIp || ws.remoteAddress });
 		ws.send(
 			JSON.stringify({
 				action: "connected",
@@ -679,7 +679,7 @@ app.websocket({
 			const channel = `slug-${data.slug}`;
 			ws.subscribe(channel);
 
-			Logger.audit(`WebSocket subscribed to channel: ${channel}`, { ip: ws.remoteAddress });
+			Logger.audit(`WebSocket subscribed to channel: ${channel}`, { ip: ws.data.clientIp || ws.remoteAddress });
 
 			ws.send(
 				JSON.stringify({
@@ -721,7 +721,7 @@ app.websocket({
 
 			ws.unsubscribe(channel);
 
-			Logger.audit(`WebSocket unsubscribed from ${channel}`, { ip: ws.remoteAddress });
+			Logger.audit(`WebSocket unsubscribed from ${channel}`, { ip: ws.data.clientIp || ws.remoteAddress });
 
 			ws.send(
 				JSON.stringify({
@@ -763,15 +763,15 @@ app.websocket({
 		);
 	},
 	close(ws, code, reason) {
-		Logger.audit(`WebSocket connection closed`, { ip: ws.remoteAddress, code, reason: reason || "none" });
+		Logger.audit(`WebSocket connection closed`, { ip: ws.data.clientIp || ws.remoteAddress, code, reason: reason || "none" });
 
 		ws.subscriptions.forEach((subscription) => {
 			ws.unsubscribe(subscription);
 		});
 	},
 	error(ws, error) {
 		Logger.error("WebSocket runtime error", {
-			ip: ws.remoteAddress,
+			ip: ws.data.clientIp || ws.remoteAddress,
 			error,
 		});
 	},

src/index.ts

@@ -1,4 +1,4 @@
-import type { Server } from "@rabbit-company/web";
+import type { Server, WebSocketData } from "@rabbit-company/web";
 import { cache } from "./cache";
 import { Logger } from "./logger";
 import type { Monitor, PulseMonitor } from "./types";
@@ -194,7 +194,7 @@ export function notifyAllPulseMonitorClients(server: Server): void {
  * Returns the subscription response or null if invalid
  */
 export function handlePulseMonitorSubscription(
-	ws: Bun.ServerWebSocket<undefined>,
+	ws: Bun.ServerWebSocket<WebSocketData<Record<string, unknown>>>,
 	token: string,
 ): { success: true; pulseMonitor: PulseMonitor; channel: string; configs: any[] } | { success: false; error: string } {
 	const pulseMonitor = cache.getPulseMonitorByToken(token);
@@ -210,7 +210,7 @@ export function handlePulseMonitorSubscription(
 	ws.subscribe(channel);
 
 	Logger.audit("PulseMonitor client subscribed", {
-		ip: ws.remoteAddress,
+		ip: ws.data.clientIp || ws.remoteAddress,
 		pulseMonitorId: pulseMonitor.id,
 		pulseMonitorName: pulseMonitor.name,
 		channel,