From 32f318205fc847ddf574031acfaf7c2fd37f6c06 Mon Sep 17 00:00:00 2001 From: Reider745 <70357814+Reider745@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:38:37 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20network-debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/reider745/InnerCoreServer.java | 4 ++++ .../apparatus/multiplayer/server/ConnectedClient.java | 6 +++++- .../apparatus/multiplayer/server/ModdedServer.java | 5 +++++ .../apparatus/multiplayer/socket/SocketServer.java | 4 +++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java index 688535c0..6b6fab13 100644 --- a/src/main/java/com/reider745/InnerCoreServer.java +++ b/src/main/java/com/reider745/InnerCoreServer.java @@ -423,6 +423,10 @@ public class InnerCoreServer { return singleton.getPropertyBoolean("allow-unsafe-scripting", true); } + public static boolean isDebugInnerCoreNetwork(){ + return singleton.getPropertyBoolean("network-debug", false); + } + public static boolean isDeveloperMode() { return singleton.getPropertyBoolean("developer-mode", false); } diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java index d15f663d..620c98d4 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java +++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ConnectedClient.java @@ -196,6 +196,8 @@ public class ConnectedClient extends Thread implements ChannelInterface.OnPacket public void send(String name, Object data) { try{ + if(InnerCoreServer.isDebugInnerCoreNetwork()) + Logger.debug("Send packet "+name+", state: "+getClientState().name()); if(!channel.isClosed() && (name.startsWith("system") || name.startsWith("server_fixed") || getClientState() == ClientState.OPEN)) channel.send(name, data); }catch (Throwable e){ @@ -211,7 +213,9 @@ public class ConnectedClient extends Thread implements ChannelInterface.OnPacket public void send(String name, T data, Class dataType) { try{ - if(!channel.isClosed()) + if(InnerCoreServer.isDebugInnerCoreNetwork()) + Logger.debug("Send packet "+name+", state: "+getClientState().name()); + if(!channel.isClosed() && (name.startsWith("system") || name.startsWith("server_fixed") || getClientState() == ClientState.OPEN)) channel.send(name, data, dataType); }catch (Throwable e){ ICLog.e("Network", "error send "+playerUid, e); diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ModdedServer.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ModdedServer.java index 107d54c4..33805e23 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ModdedServer.java +++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/server/ModdedServer.java @@ -1,6 +1,7 @@ package com.zhekasmirnov.apparatus.multiplayer.server; import android.util.Pair; +import com.reider745.InnerCoreServer; import com.zhekasmirnov.apparatus.adapter.innercore.EngineConfig; import com.zhekasmirnov.apparatus.mcpe.NativeNetworking; import com.zhekasmirnov.apparatus.multiplayer.NetworkConfig; @@ -146,12 +147,16 @@ public class ModdedServer implements SocketServer.IClientConnectListener, Native } for (String name : initializationPacketListenerMap.keySet()) { + if(InnerCoreServer.isDebugInnerCoreNetwork()) + Logger.debug("Initialization packet received "+name); for (ConnectedClient.InitializationPacketListener listener : initializationPacketListenerMap.get(name)) { client.addInitializationPacketListener(name, listener); } } client.getChannelInterface().addListener((String name, Object data, Class dataType) -> { + if(InnerCoreServer.isDebugInnerCoreNetwork()) + Logger.debug("Packet received "+name); int separatorIndex = name.indexOf('#'); String meta = null; if (separatorIndex != -1) { diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java index 0d7f9195..554e71e2 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java +++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java @@ -1,5 +1,6 @@ package com.zhekasmirnov.apparatus.multiplayer.socket; +import com.reider745.InnerCoreServer; import com.zhekasmirnov.apparatus.multiplayer.ThreadTypeMarker; import com.zhekasmirnov.apparatus.multiplayer.channel.data.DataChannel; import com.zhekasmirnov.apparatus.multiplayer.channel.data.DataChannelFactory; @@ -43,7 +44,8 @@ public class SocketServer { continue; } - Logger.debug("New socket connection "+socket.getInetAddress()); + if(InnerCoreServer.isDebugInnerCoreNetwork()) + Logger.debug("New socket connection "+socket.getInetAddress()); try { int protocol = socket.getInputStream().read();