From c824fb5e9b873e87be1d47cfdb6ffe76a8ba3bb916325dc21c277a88912a8069 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Wed, 22 Apr 2026 15:03:14 +0300 Subject: [PATCH] =?UTF-8?q?fix(debug-api):=20=D0=BF=D0=BE=D1=87=D0=B8?= =?UTF-8?q?=D0=BD=D0=B8=D1=82=D1=8C=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D1=83?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20merge=20=D0=B8=20=D1=83?= =?UTF-8?q?=D0=BD=D0=B8=D1=84=D0=B8=D1=86=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B1=D1=83=D1=84=D0=B5=D1=80=20debug-=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/ws_protocol/JSON}/debug/DebugRunLogBuffer.java | 2 +- .../JSON/handlers/system/Net_ClientDebugLog_Handler.java | 2 +- src/main/java/server/debug/DebugClientsServlet.java | 3 ++- src/main/java/server/debug/DebugConnectServlet.java | 1 + src/main/java/server/debug/DebugLogsServlet.java | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) rename {src/main/java/server => shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON}/debug/DebugRunLogBuffer.java (98%) diff --git a/src/main/java/server/debug/DebugRunLogBuffer.java b/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/debug/DebugRunLogBuffer.java similarity index 98% rename from src/main/java/server/debug/DebugRunLogBuffer.java rename to shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/debug/DebugRunLogBuffer.java index 57e3b39..9347384 100644 --- a/src/main/java/server/debug/DebugRunLogBuffer.java +++ b/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/debug/DebugRunLogBuffer.java @@ -1,4 +1,4 @@ -package server.debug; +package server.logic.ws_protocol.JSON.debug; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/system/Net_ClientDebugLog_Handler.java b/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/system/Net_ClientDebugLog_Handler.java index d830fe1..7f4e4f9 100644 --- a/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/system/Net_ClientDebugLog_Handler.java +++ b/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/system/Net_ClientDebugLog_Handler.java @@ -2,8 +2,8 @@ package server.logic.ws_protocol.JSON.handlers.system; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import server.debug.DebugRunLogBuffer; import server.logic.ws_protocol.JSON.ConnectionContext; +import server.logic.ws_protocol.JSON.debug.DebugRunLogBuffer; import server.logic.ws_protocol.JSON.entyties.Net_Request; import server.logic.ws_protocol.JSON.entyties.Net_Response; import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; diff --git a/src/main/java/server/debug/DebugClientsServlet.java b/src/main/java/server/debug/DebugClientsServlet.java index 9747b1c..4fa2988 100644 --- a/src/main/java/server/debug/DebugClientsServlet.java +++ b/src/main/java/server/debug/DebugClientsServlet.java @@ -18,6 +18,7 @@ import java.net.SocketAddress; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.Set; /** * GET /debug/ws/clients @@ -43,7 +44,7 @@ public class DebugClientsServlet extends HttpServlet { return; } - List contexts = ActiveConnectionsRegistry.getInstance().getAllConnectionsSnapshot(); + Set contexts = ActiveConnectionsRegistry.getInstance().getAllConnectionsSnapshot(); List rows = new ArrayList<>(); for (ConnectionContext ctx : contexts) { Session ws = ctx.getWsSession(); diff --git a/src/main/java/server/debug/DebugConnectServlet.java b/src/main/java/server/debug/DebugConnectServlet.java index 8765a11..576afcf 100644 --- a/src/main/java/server/debug/DebugConnectServlet.java +++ b/src/main/java/server/debug/DebugConnectServlet.java @@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import server.logic.ws_protocol.JSON.ActiveConnectionsRegistry; import server.logic.ws_protocol.JSON.ConnectionContext; +import server.logic.ws_protocol.JSON.debug.DebugRunLogBuffer; import server.logic.ws_protocol.JSON.push.WsEventSender; import java.io.IOException; diff --git a/src/main/java/server/debug/DebugLogsServlet.java b/src/main/java/server/debug/DebugLogsServlet.java index 9e22170..bdb1ca5 100644 --- a/src/main/java/server/debug/DebugLogsServlet.java +++ b/src/main/java/server/debug/DebugLogsServlet.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import server.logic.ws_protocol.JSON.debug.DebugRunLogBuffer; import java.io.IOException; import java.util.List;