Summarize packet error into periodic debug output; use more efficient data parsing.

InitAuther97 · InitAuther97 · commit a3dbe3d8a2de · 2025-05-11T01:57:26.000+08:00
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/MessengerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/MessengerBridge.java
@@ -1,6 +1,7 @@
 package io.izzel.arclight.common.bridge.bukkit;
 
 import io.izzel.arclight.common.mod.plugin.messaging.ArclightPluginChannel;
+import io.izzel.arclight.common.mod.plugin.messaging.PacketRecorder;
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
 import net.minecraft.resources.ResourceLocation;
 import org.bukkit.craftbukkit.v.entity.CraftPlayer;
@@ -19,4 +20,6 @@ public interface MessengerBridge {
     void bridge$registerAnonymousOutgoing(ResourceLocation location);
     ArclightPluginChannel<?> bridge$getAndCheckCrossSend(Plugin src, ResourceLocation channel);
     void bridge$checkUnsafeSend(Plugin src, ResourceLocation channel);
+
+    PacketRecorder bridge$getPacketRecorder();
 }
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginPacketListenerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginPacketListenerBridge.java
@@ -17,8 +17,8 @@ public interface ServerLoginPacketListenerBridge {
     void bridge$disconnect(String reason);
 
     default FriendlyByteBuf bridge$getDiscardedQueryAnswerData(ServerboundCustomQueryAnswerPacket packet) {
-        return packet.payload() instanceof ArclightCustomQueryAnswerPayload payload
-            ? new FriendlyByteBuf(payload.buf())
+        return packet.payload() instanceof ArclightCustomQueryAnswerPayload(io.netty.buffer.ByteBuf buf)
+            ? new FriendlyByteBuf(buf)
             : null;
     }
 
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/StandardMessengerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/StandardMessengerMixin.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.MultimapBuilder;
 import com.google.common.collect.SetMultimap;
 import io.izzel.arclight.common.bridge.bukkit.MessengerBridge;
+import io.izzel.arclight.common.mod.plugin.messaging.PacketRecorder;
 import io.izzel.arclight.common.mod.server.ArclightServer;
 import io.izzel.arclight.common.mod.plugin.messaging.ArclightPluginChannel;
 import net.minecraft.resources.ResourceLocation;
@@ -34,6 +35,9 @@ public abstract class StandardMessengerMixin implements Messenger, MessengerBrid
     @Unique
     private SetMultimap<Plugin, ResourceLocation> arclight$crossSend;
 
+    @Unique
+    private PacketRecorder arclight$recorder;
+
     @ModifyConstant(
             method = "validateAndCorrectChannel",
             constant = @Constant(intValue = Messenger.MAX_CHANNEL_SIZE)
@@ -88,6 +92,11 @@ public abstract class StandardMessengerMixin implements Messenger, MessengerBrid
         arclight$updateChannel(location, true);
     }
 
+    @Override
+    public PacketRecorder bridge$getPacketRecorder() {
+        return arclight$recorder;
+    }
+
     @Unique
     private void arclight$updateChannel(ResourceLocation location, boolean create) {
         if (location != null) {
@@ -115,6 +124,7 @@ public abstract class StandardMessengerMixin implements Messenger, MessengerBrid
     private void arclight$init(CallbackInfo ci) {
         arclight$registry = new HashMap<>();
         arclight$crossSend = MultimapBuilder.hashKeys().hashSetValues().build();
+        arclight$recorder = new PacketRecorder();
     }
 
     @Redirect(method = {"removeFromOutgoing*", "removeFromIncoming*"}, at = @At(value = "INVOKE", target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;"))
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/plugin/messaging/PacketRecorder.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/plugin/messaging/PacketRecorder.java
@@ -0,0 +1,38 @@
+package io.izzel.arclight.common.mod.plugin.messaging;
+
+import io.izzel.arclight.common.mod.server.ArclightServer;
+import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
+import net.minecraft.Util;
+
+import java.util.stream.Collectors;
+
+public class PacketRecorder {
+    private final Object2IntArrayMap<String> unknown = new Object2IntArrayMap<>();
+    private long lastUpdate = Util.getMillis();
+
+    public PacketRecorder() {
+        unknown.defaultReturnValue(0);
+    }
+
+    public void recordUnknown(String id) {
+        int num = unknown.getInt(id);
+        unknown.put(id, num + 1);
+    }
+
+    public void update() {
+        long now = Util.getMillis();
+        if (now - lastUpdate > 5*60*1000) {
+            consumeAndLog();
+            lastUpdate = now;
+        }
+    }
+
+    public void consumeAndLog() {
+        String unknowns = unknown.object2IntEntrySet().stream()
+                .map(it -> it.getKey() + '(' + it.getIntValue() + ')')
+                .collect(Collectors.joining(", ", "unknown=[", "];"));
+        unknown.clear();
+
+        ArclightServer.LOGGER.debug("Packet error statistics: {}", unknowns);
+    }
+}
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/plugin/messaging/RawPayload.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/plugin/messaging/RawPayload.java
@@ -2,7 +2,6 @@
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -18,9 +17,7 @@ static <B extends FriendlyByteBuf> StreamCodec<B, ArclightRawPayload> channelCod
                 StreamCodec.of(FriendlyByteBuf::writeBytes, buf -> {
                     var size = buf.readableBytes();
                     Preconditions.checkArgument(size <= max, "Custom payload size may not be larger than " + max);
-                    ByteBuf data = Unpooled.buffer(size, size);
-                    buf.readBytes(data);
-                    return data;
+                    return buf.copy();
                 }),
                 RawPayload::data,
                 it -> new ArclightRawPayload(type, it)
@@ -33,7 +30,7 @@ static <B extends FriendlyByteBuf> StreamCodec<B, CustomPacketPayload> discarded
             public DiscardedPayload decode(B buf) {
                 int j = buf.readableBytes();
                 if (j >= 0 && j <= max) {
-                    var heap = buf.readBytes(j);
+                    var heap = buf.copy();
                     var payload = new DiscardedPayload(location);
                     ((RawPayload)(Object)payload).setData(heap);
                     return payload;
diff --git a/arclight-fabric/src/main/java/io/izzel/arclight/fabric/mixin/core/network/ServerCommonPacketListenerImplMixin_Fabric.java b/arclight-fabric/src/main/java/io/izzel/arclight/fabric/mixin/core/network/ServerCommonPacketListenerImplMixin_Fabric.java
@@ -1,8 +1,22 @@
 package io.izzel.arclight.fabric.mixin.core.network;
 
+import io.izzel.arclight.common.bridge.bukkit.MessengerBridge;
 import io.izzel.arclight.common.bridge.core.network.common.ServerCommonPacketListenerBridge;
+import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 import net.minecraft.server.network.ServerCommonPacketListenerImpl;
+import org.bukkit.Bukkit;
 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;
 
 @Mixin(ServerCommonPacketListenerImpl.class)
-public abstract class ServerCommonPacketListenerImplMixin_Fabric implements ServerCommonPacketListenerBridge {}
+public abstract class ServerCommonPacketListenerImplMixin_Fabric implements ServerCommonPacketListenerBridge {
+
+    @Inject(method = "handleCustomPayload", at = @At("TAIL"))
+    private void arclight$handleUnknownPayload(ServerboundCustomPayloadPacket packet, CallbackInfo ci) {
+        var recorder = ((MessengerBridge) Bukkit.getMessenger()).bridge$getPacketRecorder();
+        recorder.recordUnknown(packet.payload().type().id().toString());
+        recorder.update();
+    }
+}
diff --git a/arclight-fabric/src/main/java/io/izzel/arclight/fabric/mixin/core/network/ServerGamePacketListenerImplMixin_Fabric.java b/arclight-fabric/src/main/java/io/izzel/arclight/fabric/mixin/core/network/ServerGamePacketListenerImplMixin_Fabric.java
@@ -0,0 +1,21 @@
+package io.izzel.arclight.fabric.mixin.core.network;
+
+import io.izzel.arclight.common.bridge.bukkit.MessengerBridge;
+import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import org.bukkit.Bukkit;
+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;
+
+@Mixin(ServerGamePacketListenerImpl.class)
+public class ServerGamePacketListenerImplMixin_Fabric {
+
+    @Inject(method = "handleCustomPayload", at = @At("TAIL"))
+    private void arclight$recordUnknown(ServerboundCustomPayloadPacket packet, CallbackInfo ci) {
+        var recorder = ((MessengerBridge) Bukkit.getMessenger()).bridge$getPacketRecorder();
+        recorder.recordUnknown(packet.payload().type().id().toString());
+        recorder.update();
+    }
+}
diff --git a/arclight-forge/src/main/java/io/izzel/arclight/forge/mixin/forge/ForgeHooksMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/forge/mixin/forge/ForgeHooksMixin.java
@@ -1,10 +1,13 @@
 package io.izzel.arclight.forge.mixin.forge;
 
+import io.izzel.arclight.common.bridge.bukkit.MessengerBridge;
 import io.izzel.arclight.common.mod.util.ArclightCaptures;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.event.network.CustomPayloadEvent;
+import org.bukkit.Bukkit;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -22,4 +25,13 @@ public class ForgeHooksMixin {
     private static void arclight$removeHand(UseOnContext context, CallbackInfoReturnable<InteractionResult> cir) {
         ArclightCaptures.getPlaceEventHand(InteractionHand.MAIN_HAND);
     }
+
+    @Inject(method = "onCustomPayload(Lnet/minecraftforge/event/network/CustomPayloadEvent;)Z", at = @At("RETURN"))
+    private static void arclight$recordUnknown(CustomPayloadEvent event, CallbackInfoReturnable<Boolean> cir) {
+        if (!cir.getReturnValueZ()) {
+            var recorder = ((MessengerBridge) Bukkit.getMessenger()).bridge$getPacketRecorder();
+            recorder.recordUnknown(event.getChannel().toString());
+            recorder.update();
+        }
+    }
 }
diff --git a/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ArclightForgeMessaging.java b/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ArclightForgeMessaging.java
@@ -25,11 +25,11 @@ public static ArclightPluginChannel<? extends ForgePayloadHandler> setupChannel(
             var registration = channel.getChannelHandler();
             try {
                 NetworkRegistryAccessor.setLock(false);
-                var simple = ChannelBuilder.named(location)
+                var event = ChannelBuilder.named(location)
                         .serverAcceptedVersions(ACCEPT_ALL)
                         .optional()
-                        .simpleChannel();
-                registration.initialize(simple);
+                        .eventNetworkChannel();
+                registration.initialize(event);
             } finally {
                 NetworkRegistryAccessor.setLock(true);
             }
diff --git a/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ArclightForgePayloadDestroyer.java b/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ArclightForgePayloadDestroyer.java
@@ -6,6 +6,7 @@
 import net.minecraftforge.event.network.CustomPayloadEvent;
 
 public record ArclightForgePayloadDestroyer(ArclightPluginChannel<ArclightForgePayloadDestroyer> channel) implements ForgePayloadHandler, PayloadDestroyer {
+
     @Override
-    public void accept(ArclightRawPayload arclightRawPayload, CustomPayloadEvent.Context context) {}
+    public void accept(CustomPayloadEvent customPayloadEvent) {}
 }
diff --git a/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ArclightForgePayloadHandler.java b/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ArclightForgePayloadHandler.java
@@ -1,49 +1,62 @@
 package io.izzel.arclight.forge.mod.plugin.messaging;
 
+import com.google.common.base.Preconditions;
 import io.izzel.arclight.common.bridge.core.network.common.ServerCommonPacketListenerBridge;
+import io.izzel.arclight.common.mod.ArclightConstants;
 import io.izzel.arclight.common.mod.plugin.messaging.ArclightPluginChannel;
-import io.izzel.arclight.common.mod.plugin.messaging.ArclightRawPayload;
+import io.netty.buffer.Unpooled;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.event.network.CustomPayloadEvent;
-import net.minecraftforge.network.NetworkProtocol;
+import net.minecraftforge.network.EventNetworkChannel;
 import net.minecraftforge.network.PacketDistributor;
-import net.minecraftforge.network.SimpleChannel;
 import org.bukkit.craftbukkit.v.entity.CraftPlayer;
 import org.bukkit.plugin.Plugin;
 
 public class ArclightForgePayloadHandler implements ForgePayloadHandler {
 
     private final ArclightPluginChannel<?> bukkit;
-    private SimpleChannel forge;
+    private EventNetworkChannel forge;
 
     public ArclightForgePayloadHandler(ArclightPluginChannel<?> bukkit) {
         this.bukkit = bukkit;
     }
 
-    public void initialize(SimpleChannel unconfigured) {
-        forge = unconfigured
-                .messageBuilder(ArclightRawPayload.class, NetworkProtocol.PLAY)
-                .codec(bukkit.getCast())
-                .consumerMainThread(this)
-                .add();
-    }
-
-    @Override
-    public void accept(ArclightRawPayload payload, CustomPayloadEvent.Context ctx) {
-        // Already on main thread thanks to SimpleChannel
-        var listener = ctx.getConnection().getPacketListener();
-        if (listener instanceof ServerCommonPacketListenerBridge bridge) {
-            var craftbukkit = bridge.bridge$getCraftPlayer();
-            bukkit.dispatchMessage(craftbukkit, payload.data().array());
-        }
+    public void initialize(EventNetworkChannel unconfigured) {
+        forge = unconfigured.addListener(this);
     }
 
     @Override
     public void sendCustomPayload(Plugin src, CraftPlayer dst, byte[] data) {
-        forge.send(new ArclightRawPayload(bukkit.getType(), data), PacketDistributor.PLAYER.with(dst.getHandle()));
+        forge.send(new FriendlyByteBuf(Unpooled.copiedBuffer(data)), PacketDistributor.PLAYER.with(dst.getHandle()));
     }
 
     @Override
     public ArclightPluginChannel<?> channel() {
         return bukkit;
     }
+
+    @Override
+    public void accept(CustomPayloadEvent event) {
+        var ctx = event.getSource();
+        ctx.setPacketHandled(true);
+        var buf = event.getPayload();
+        final var max = ArclightConstants.MAX_C2S_CUSTOM_PAYLOAD_SIZE;
+        Preconditions.checkArgument(buf.readableBytes() <= max, "Custom payload size may not be larger than " + max);
+
+        byte[] data;
+        if (buf.hasArray()) {
+            data = buf.array();
+        } else {
+            data = new byte[buf.readableBytes()];
+            buf.readBytes(data);
+        }
+
+        ctx.enqueueWork(() -> {
+            var listener = ctx.getConnection().getPacketListener();
+            if (listener instanceof ServerCommonPacketListenerBridge bridge) {
+                var craftbukkit = bridge.bridge$getCraftPlayer();
+                bukkit.dispatchMessage(craftbukkit, data);
+            }
+        });
+    }
 }
diff --git a/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ForgePayloadHandler.java b/arclight-forge/src/main/java/io/izzel/arclight/forge/mod/plugin/messaging/ForgePayloadHandler.java
@@ -1,9 +1,8 @@
 package io.izzel.arclight.forge.mod.plugin.messaging;
 
-import io.izzel.arclight.common.mod.plugin.messaging.ArclightRawPayload;
 import io.izzel.arclight.common.mod.plugin.messaging.PluginChannelHandler;
 import net.minecraftforge.event.network.CustomPayloadEvent;
 
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
-public interface ForgePayloadHandler extends PluginChannelHandler, BiConsumer<ArclightRawPayload, CustomPayloadEvent.Context> {}
+public interface ForgePayloadHandler extends PluginChannelHandler, Consumer<CustomPayloadEvent> {}
diff --git a/arclight-neoforge/src/main/java/io/izzel/arclight/neoforge/mixin/neoforge/NetworkRegistryMixin.java b/arclight-neoforge/src/main/java/io/izzel/arclight/neoforge/mixin/neoforge/NetworkRegistryMixin.java
@@ -1,9 +1,11 @@
 package io.izzel.arclight.neoforge.mixin.neoforge;
 
 import com.google.common.collect.ImmutableMap;
+import io.izzel.arclight.common.bridge.bukkit.MessengerBridge;
 import io.izzel.arclight.common.bridge.core.network.common.ServerCommonPacketListenerBridge;
 import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge;
 import io.izzel.arclight.common.mod.ArclightConstants;
+import io.izzel.arclight.common.mod.plugin.messaging.PacketRecorder;
 import io.izzel.arclight.common.mod.plugin.messaging.RawPayload;
 import io.izzel.arclight.mixin.Decorate;
 import io.izzel.arclight.mixin.DecorationOps;
@@ -22,7 +24,9 @@
 import net.neoforged.neoforge.network.registration.NetworkPayloadSetup;
 import net.neoforged.neoforge.network.registration.NetworkRegistry;
 import net.neoforged.neoforge.network.registration.PayloadRegistration;
+import org.bukkit.Bukkit;
 import org.objectweb.asm.Opcodes;
+import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -48,12 +52,21 @@ public abstract class NetworkRegistryMixin {
     }
 
     @Inject(method = "getCodec", cancellable = true, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V"))
-    private static void arclight$interceptEncoder(ResourceLocation id, ConnectionProtocol protocol, PacketFlow flow, CallbackInfoReturnable<StreamCodec<? super FriendlyByteBuf, ? extends CustomPacketPayload>> cir) {
+    private static void arclight$discardIllegal(ResourceLocation id, ConnectionProtocol protocol, PacketFlow flow, CallbackInfoReturnable<StreamCodec<? super FriendlyByteBuf, ? extends CustomPacketPayload>> cir) {
         if (flow == PacketFlow.CLIENTBOUND) {
             cir.setReturnValue(RawPayload.discardedCodec(id, ArclightConstants.MAX_C2S_CUSTOM_PAYLOAD_SIZE));
         }
     }
 
+    @Redirect(method = "getCodec", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V"))
+    private static void arclight$recordUnknown(Logger instance, String s, Object o) {
+        if (o instanceof String id) {
+            PacketRecorder recorder = ((MessengerBridge) Bukkit.getMessenger()).bridge$getPacketRecorder();
+            recorder.recordUnknown(id);
+            recorder.update();
+        }
+    }
+
     @Inject(method = "checkPacket(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/protocol/common/ServerCommonPacketListener;)V", cancellable = true, at = @At("HEAD"))
     private static void arclight$interceptSendCheck(Packet<?> packet, ServerCommonPacketListener listener, CallbackInfo ci) {
         if (packet instanceof ClientboundCustomPayloadPacket(CustomPacketPayload payload)) {

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public interface ServerLoginPacketListenerBridge {`
`17`	`17`	`void bridge$disconnect(String reason);`
`18`	`18`
`19`	`19`	`default FriendlyByteBuf bridge$getDiscardedQueryAnswerData(ServerboundCustomQueryAnswerPacket packet) {`
`20`		`- return packet.payload() instanceof ArclightCustomQueryAnswerPayload payload`
`21`		`- ? new FriendlyByteBuf(payload.buf())`
	`20`	`+ return packet.payload() instanceof ArclightCustomQueryAnswerPayload(io.netty.buffer.ByteBuf buf)`
	`21`	`+ ? new FriendlyByteBuf(buf)`
`22`	`22`	`: null;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import net.minecraftforge.event.network.CustomPayloadEvent;`
`7`	`7`
`8`	`8`	`public record ArclightForgePayloadDestroyer(ArclightPluginChannel<ArclightForgePayloadDestroyer> channel) implements ForgePayloadHandler, PayloadDestroyer {`
	`9`	`+`
`9`	`10`	`@Override`
`10`		`- public void accept(ArclightRawPayload arclightRawPayload, CustomPayloadEvent.Context context) {}`
	`11`	`+ public void accept(CustomPayloadEvent customPayloadEvent) {}`
`11`	`12`	`}`