Stop debugging mode when the client terminates/disconnects

Author: theogiraudet

src/main/java/net/gunivers/sniffer/Utils.java

@@ -1,8 +1,12 @@
 package net.gunivers.sniffer;
 
 import net.minecraft.server.function.ExpandedMacro;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 
+import static net.minecraft.text.Text.literal;
+
 /**
  * Utility class providing helper methods for the Datapack Debugger.
  * Contains various utility functions to work with Minecraft's internal classes
@@ -22,4 +26,15 @@ public static Identifier getId(ExpandedMacro<?> function) {
         return (Identifier) EncapsulationBreaker.getAttribute(function, "functionIdentifier").orElse(Identifier.of("foo:bar"));
     }
 
+    private static final String MESSAGE_PREFIX = "[Sniffer] ";
+
+    public static Text addSnifferPrefix(Text text) {
+        var header = Text.literal(MESSAGE_PREFIX).formatted(Formatting.AQUA);
+        return header.append(text);
+    }
+
+    public static Text addSnifferPrefix(String text) {
+        return addSnifferPrefix(Text.literal(text).formatted(Formatting.WHITE));
+    }
+
 }

src/main/java/net/gunivers/sniffer/command/BreakPointCommand.java

@@ -4,6 +4,8 @@
 import com.mojang.brigadier.arguments.*;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.command.CommandExecutionContext;
+
+import static net.gunivers.sniffer.Utils.addSnifferPrefix;
 import static net.minecraft.server.command.CommandManager.literal;
 import static net.minecraft.server.command.CommandManager.argument;
 
@@ -12,6 +14,7 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -257,7 +260,7 @@ public static void step(int steps, ServerCommandSource source) {
                         break;
                     }
                 } else {
-                    source.sendFeedback(() -> Text.translatable("sniffer.commands.breakpoint.step.over"), false);
+                    source.sendFeedback(() -> addSnifferPrefix(Text.translatable("sniffer.commands.breakpoint.step.over").formatted(Formatting.WHITE)), false);
                     continueExec(source);
                 }
             }

src/main/java/net/gunivers/sniffer/dap/DapServer.java

@@ -2,8 +2,6 @@
 
 import net.gunivers.sniffer.command.StepType;
 import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import org.eclipse.lsp4j.debug.*;
 import org.eclipse.lsp4j.debug.Thread;
@@ -17,6 +15,9 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
+import static net.gunivers.sniffer.Utils.addSnifferPrefix;
+import static net.gunivers.sniffer.command.BreakPointCommand.continueExec;
+
 /**
  * A DAP (Debug Adapter Protocol) server implementation using LSP4J.
  * Provides debugging capabilities for Minecraft datapacks.
@@ -26,11 +27,10 @@
 public class DapServer implements IDebugProtocolServer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger("sniffer");
-    private static final String MESSAGE_PREFIX = "[Sniffer]";
 
     // Constants for messages
-    private static final String ATTACHED_MESSAGE = " Attached to VSCode!";
-    private static final String DISCONNECTED_MESSAGE = " Disconnected from VSCode.";
+    private static final String ATTACHED_MESSAGE = "Attached to VSCode!";
+    private static final String DISCONNECTED_MESSAGE = "Disconnected from VSCode.";
     private static final String BREAKPOINT_DESCRIPTION = "Breakpoint reached";
     private static final String MAIN_THREAD_NAME = "Main Thread";
 
@@ -117,6 +117,7 @@ public CompletableFuture<Void> disconnect(DisconnectArguments args) {
         LOGGER.debug("Disconnect request received with arguments: {}", args);
 
         sendMessageToAllPlayers(DISCONNECTED_MESSAGE);
+        continueExec(DebuggerState.get().getCommandSource());
         return CompletableFuture.completedFuture(null);
     }
 
@@ -261,7 +262,7 @@ public CompletableFuture<ContinueResponse> continue_(ContinueArguments args) {
         LOGGER.debug("Continue request received with arguments: {}", args);
 
         try {
-            BreakPointCommand.continueExec(getCommandSource());
+            continueExec(getCommandSource());
         } catch (Exception e) {
             LOGGER.warn( "Error during continue execution", e);
         }
@@ -591,8 +592,7 @@ private void sendExitedEvent() {
     private void sendMessageToAllPlayers(String message) {
         try {
             debuggerState.getServer().getPlayerManager().getPlayerList().forEach(player -> {
-                var header = Text.literal(MESSAGE_PREFIX).formatted(Formatting.AQUA);
-                player.sendMessage(header.append(Text.literal(message).formatted(Formatting.WHITE)));
+                player.sendMessage(addSnifferPrefix(message));
             });
         } catch (Exception e) {
             LOGGER.warn("Error sending message to players", e);

src/main/java/net/gunivers/sniffer/dap/WebSocketServer.java

@@ -19,6 +19,8 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.HashSet;
 
+import static net.gunivers.sniffer.command.BreakPointCommand.continueExec;
+
 /**
  * WebSocket server implementation for the Debug Adapter Protocol.
  * This class handles the communication between the debugging client (IDE) and the Minecraft server,
@@ -91,6 +93,7 @@ public void onMessage(byte[] message) {
     public void onClose(Session session, CloseReason closeReason) {
         logger.info("WebSocket closed: {}", closeReason);
         BreakPointCommand.clear();
+        continueExec(DebuggerState.get().getCommandSource());
         cleanup();
     }
 

src/main/java/net/gunivers/sniffer/mixin/FixCommandActionMixin.java

@@ -6,6 +6,7 @@
 import net.minecraft.server.command.AbstractServerCommandSource;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -14,6 +15,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.gunivers.sniffer.command.BreakPointCommand;
 
+import static net.gunivers.sniffer.Utils.addSnifferPrefix;
 import static net.gunivers.sniffer.command.StepType.isStepOut;
 
 /**
@@ -52,7 +54,7 @@ private void execute(T abstractServerCommandSource, CommandExecutionContext<T> c
                 // We send to each player the executing command
                 var players = serverCommandSource.getServer().getPlayerManager().getPlayerList();
                 for(var player : players) {
-                    player.sendMessage(Text.translatable("sniffer.commands.breakpoint.run", this.command));
+                    player.sendMessage(addSnifferPrefix(Text.translatable("sniffer.commands.breakpoint.run", this.command).formatted(Formatting.WHITE)));
                 }
             }
         }