feat: Добавлена настройка network-debug

Reider745 · Jan 5, 2024 · 32f3182 · 32f3182
1 parent 57fa627
commit 32f3182
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java
@@ -423,6 +423,10 @@ public static boolean isUnsafeScriptingAllowed() {
         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
@@ -196,6 +196,8 @@ public InitializationPacketException getInitializationPacketFailureCause() {
 
     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 void send(String name, Object data) {
 
     public<T> void send(String name, T data, Class<T> 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
@@ -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 void onClientConnected(DataChannel channel, String cl) {
         }
 
         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
@@ -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 void start(int port) throws IOException {
                          continue;
                      }
 
-                     Logger.debug("New socket connection "+socket.getInetAddress());
+                     if(InnerCoreServer.isDebugInnerCoreNetwork())
+                        Logger.debug("New socket connection "+socket.getInetAddress());
 
                      try {
                          int protocol = socket.getInputStream().read();