10 12 25

доработал получение инфы о клиенте из соединения

shine-server-geo/build.gradle

@@ -17,6 +17,11 @@ repositories {
 
 dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1'  // json
+
+    implementation 'org.eclipse.jetty:jetty-server:11.0.20'           // WS сервер
+    implementation 'org.eclipse.jetty:jetty-servlet:11.0.20'
+    implementation 'org.eclipse.jetty.websocket:websocket-jetty-server:11.0.20'
+
 }
 
 java {

shine-server-geo/src/main/java/shine.geo/ClientInfoService.java

@@ -0,0 +1,106 @@
+package shine.geo;
+
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.UpgradeRequest;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.List;
+
+public final class ClientInfoService {
+
+    public static final String CLIENT_INFO_UNKNOWN = "";
+    public static final String LANGUAGE_UNKNOWN = "";
+
+    private ClientInfoService() { }
+
+    public static String buildClientInfoString(Session wsSession) {
+        if (wsSession == null) {
+            return CLIENT_INFO_UNKNOWN;
+        }
+
+        UpgradeRequest req = wsSession.getUpgradeRequest();
+        if (req == null) {
+            return CLIENT_INFO_UNKNOWN;
+        }
+
+        String userAgent     = getFirstHeader(req, "User-Agent");
+        String secChUa       = getFirstHeader(req, "Sec-CH-UA");
+        String secChPlatform = getFirstHeader(req, "Sec-CH-UA-Platform");
+        String secChMobile   = getFirstHeader(req, "Sec-CH-UA-Mobile");
+
+        // --- Исправленный блок определения IP ---
+        String remoteIp = "";
+        SocketAddress rawAddr = wsSession.getRemoteAddress();
+        if (rawAddr instanceof InetSocketAddress inet) {
+            if (inet.getAddress() != null) {
+                remoteIp = inet.getAddress().getHostAddress();
+            }
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        if (userAgent != null) {
+            sb.append("UA=").append(userAgent);
+        }
+        if (secChUa != null) {
+            appendSep(sb);
+            sb.append("chUa=").append(secChUa);
+        }
+        if (secChPlatform != null) {
+            appendSep(sb);
+            sb.append("platform=").append(secChPlatform);
+        }
+        if (secChMobile != null) {
+            appendSep(sb);
+            sb.append("mobile=").append(secChMobile);
+        }
+        if (!remoteIp.isEmpty()) {
+            appendSep(sb);
+            sb.append("remote=").append(remoteIp);
+        }
+
+        String result = sb.toString().trim();
+        return result.isEmpty() ? CLIENT_INFO_UNKNOWN : result;
+    }
+
+    public static String extractPreferredLanguageTag(Session wsSession) {
+        if (wsSession == null) {
+            return LANGUAGE_UNKNOWN;
+        }
+
+        UpgradeRequest req = wsSession.getUpgradeRequest();
+        if (req == null) {
+            return LANGUAGE_UNKNOWN;
+        }
+
+        String acceptLanguage = getFirstHeader(req, "Accept-Language");
+        if (acceptLanguage == null || acceptLanguage.isBlank()) {
+            return LANGUAGE_UNKNOWN;
+        }
+
+        String first = acceptLanguage.split(",")[0].trim();
+        if (first.isEmpty()) {
+            return LANGUAGE_UNKNOWN;
+        }
+
+        String[] parts = first.split(";");
+        String tag = parts[0].trim();
+
+        return tag.isEmpty() ? LANGUAGE_UNKNOWN : tag;
+    }
+
+    private static String getFirstHeader(UpgradeRequest req, String headerName) {
+        if (req == null || headerName == null) return null;
+        List<String> values = req.getHeaders().get(headerName);
+        if (values == null || values.isEmpty()) return null;
+        String v = values.get(0);
+        return (v == null || v.isBlank()) ? null : v.trim();
+    }
+
+    private static void appendSep(StringBuilder sb) {
+        if (sb.length() > 0) {
+            sb.append("; ");
+        }
+    }
+}