diff --git a/src/server.ts b/src/server.ts index 44b32b3..909813c 100644 --- a/src/server.ts +++ b/src/server.ts @@ -221,15 +221,15 @@ class ServerHandler { ); } - const headers: Headers = response.headers; - let ip: string | null = server.requestIP(request)?.address || null; + const headers = request.headers; + let ip = server.requestIP(request)?.address; - if (!ip) { + if (!ip || ip.startsWith("172.") || ip === "127.0.0.1") { ip = - headers.get("CF-Connecting-IP") || - headers.get("X-Real-IP") || - headers.get("X-Forwarded-For") || - null; + headers.get("CF-Connecting-IP")?.trim() || + headers.get("X-Real-IP")?.trim() || + headers.get("X-Forwarded-For")?.split(",")[0].trim() || + "unknown"; } logger.custom(