From 4114ac49b99004a68858c29493bbde9b20dfcd76 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 18 Nov 2026 23:53:44 +0100 Subject: Delay on-demand signing actions until the server applies the chat session Closes #539 --- .../aizistral/nochatreports/common/NCRClient.java | 4 +- .../common/core/ServerSafetyState.java | 72 +++++++++++++++++++--- .../common/mixins/client/MixinChatListener.java | 3 +- .../common/mixins/client/MixinChatScreen.java | 6 +- .../client/MixinClientPacketListenerTick.java | 20 ++++++ 5 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListenerTick.java (limited to 'src/main/java/com/aizistral') diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 0efec78..b77d2a1 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -81,7 +81,7 @@ public class NCRClient { signingKeysPresent = present; } - public static void resendLastChatMessage() { + public static void resendChatMessage(String message) { var mc = Minecraft.getInstance(); var chatScr = mc.gui.screen() instanceof ChatScreen chat ? chat : null; @@ -90,7 +90,7 @@ public class NCRClient { chatScr.init(mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight()); } - chatScr.handleChatInput(ServerSafetyState.getLastMessage(), false); + chatScr.handleChatInput(message, false); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java index 9ed7529..9f3a62e 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java @@ -1,11 +1,17 @@ package com.aizistral.nochatreports.common.core; +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.gui.UnsafeServerScreen; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.client.multiplayer.PlayerInfo; +import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.resolver.ServerAddress; import net.minecraft.network.chat.LocalChatSession; +import net.minecraft.network.chat.RemoteChatSession; import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket; import org.jetbrains.annotations.Nullable; @@ -23,6 +29,9 @@ import java.util.concurrent.atomic.AtomicBoolean; public final class ServerSafetyState { private static final List SIGNING_ACTIONS = new ArrayList<>(); private static final AtomicBoolean ALLOW_CHAT_SIGNING = new AtomicBoolean(false); + private static final int SESSION_ACK_TIMEOUT_TICKS = 60; + private static ClientPacketListener signingActionsOwner = null; + private static int sessionAckTicksLeft = 0; private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; private volatile static ServerAddress lastServer = null; private volatile static String lastMessage = "???"; @@ -48,18 +57,56 @@ public final class ServerSafetyState { if (allow && connection.chatSession == null) return mc.getProfileKeyPairManager().prepareKeyPair() - .thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> { - connection.setKeyPair(profileKeyPair); - - SIGNING_ACTIONS.forEach(Runnable::run); - SIGNING_ACTIONS.clear(); - }), mc); + .thenAcceptAsync(optional -> optional.ifPresent(connection::setKeyPair), mc); } } return CompletableFuture.completedFuture(null); } + public static void tickSigningActions(ClientPacketListener connection) { + if (SIGNING_ACTIONS.isEmpty()) + return; + + if (connection != signingActionsOwner) { + SIGNING_ACTIONS.clear(); + signingActionsOwner = null; + return; + } + + if (connection.chatSession == null) + return; + + boolean acknowledged = isChatSessionAcknowledged(connection); + boolean ncrServer = !acknowledged && isNoChatReportsServer(); + + if (!acknowledged && !ncrServer && --sessionAckTicksLeft > 0) + return; + + if (NCRConfig.getCommon().enableDebugLog()) { + NCRCore.LOGGER.info(acknowledged ? "Server acknowledged chat session, running signing actions." + : ncrServer ? "Server runs No Chat Reports, running signing actions without acknowledgement." + : "Server did not acknowledge chat session in time, running signing actions anyway."); + } + + List actions = new ArrayList<>(SIGNING_ACTIONS); + SIGNING_ACTIONS.clear(); + signingActionsOwner = null; + actions.forEach(Runnable::run); + } + + private static boolean isChatSessionAcknowledged(ClientPacketListener connection) { + PlayerInfo info = connection.getPlayerInfo(connection.getLocalGameProfile().id()); + RemoteChatSession remote = info != null ? info.getChatSession() : null; + return remote != null && remote.sessionId().equals(connection.chatSession.sessionId()); + } + + private static boolean isNoChatReportsServer() { + ServerData server = Minecraft.getInstance().getCurrentServer(); + return server instanceof ServerDataExtension data && data.preventsChatReports() + && ServerAddress.parseString(server.ip).equals(lastServer); + } + public static void toggleChatSigning() { setAllowChatSigning(!ALLOW_CHAT_SIGNING.get()); } @@ -95,7 +142,15 @@ public final class ServerSafetyState { } public static void scheduleSigningAction(Runnable action) { + ClientPacketListener connection = Minecraft.getInstance().getConnection(); + + if (connection != signingActionsOwner) { + SIGNING_ACTIONS.clear(); + signingActionsOwner = connection; + } + SIGNING_ACTIONS.add(action); + sessionAckTicksLeft = SESSION_ACK_TIMEOUT_TICKS; } public static void reset() { @@ -104,7 +159,10 @@ public final class ServerSafetyState { ALLOW_CHAT_SIGNING.set(false); UnsafeServerScreen.setHideThisSession(false); - SIGNING_ACTIONS.clear(); + if (Minecraft.getInstance().isSameThread()) { + SIGNING_ACTIONS.clear(); + signingActionsOwner = null; + } } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index bb84fc5..a1ffacf 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -60,7 +60,8 @@ public class MixinChatListener { return; if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ON_DEMAND)) { - ServerSafetyState.scheduleSigningAction(NCRClient::resendLastChatMessage); + String lastMessage = ServerSafetyState.getLastMessage(); + ServerSafetyState.scheduleSigningAction(() -> NCRClient.resendChatMessage(lastMessage)); ServerSafetyState.setAllowChatSigning(true); if (NCRConfig.getClient().hideSigningRequestMessage()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index 4d4bf2d..720be22 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -67,9 +67,11 @@ public abstract class MixinChatScreen extends Screen { private void onHandleChatInput(String string, boolean bl, CallbackInfo info) { if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ALWAYS) && !ServerSafetyState.allowChatSigning()) { if (this.minecraft.getConnection().onlineMode()) { - if (!this.normalizeChatMessage(string).isEmpty()) { + String message = this.normalizeChatMessage(string); + + if (!message.isEmpty()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); - ServerSafetyState.scheduleSigningAction(NCRClient::resendLastChatMessage); + ServerSafetyState.scheduleSigningAction(() -> NCRClient.resendChatMessage(message)); ServerSafetyState.setAllowChatSigning(true); info.cancel(); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListenerTick.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListenerTick.java new file mode 100644 index 0000000..21f8068 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListenerTick.java @@ -0,0 +1,20 @@ +package com.aizistral.nochatreports.common.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.aizistral.nochatreports.common.core.ServerSafetyState; + +import net.minecraft.client.multiplayer.ClientPacketListener; + +@Mixin(ClientPacketListener.class) +public class MixinClientPacketListenerTick { + + @Inject(method = "tick()V", at = @At("HEAD")) + private void onTick(CallbackInfo info) { + ServerSafetyState.tickSigningActions((ClientPacketListener) (Object) this); + } + +} -- cgit v1.2.3