Merge pull request #4 from LuminiaDev/feature/unknown-packet

feat: added support for unknown packets

Author: MEFRREEX

bridge-common/src/main/java/com/luminiadev/bridge/network/codec/BridgeCodec.java

@@ -4,6 +4,7 @@
 import com.luminiadev.bridge.network.codec.packet.BridgePacket;
 import com.luminiadev.bridge.network.codec.packet.BridgePacketDefinition;
 import com.luminiadev.bridge.network.codec.packet.BridgePacketFactory;
+import com.luminiadev.bridge.network.codec.packet.BridgeUnknownPacket;
 import com.luminiadev.bridge.network.codec.packet.serializer.BridgePacketSerializer;
 import com.luminiadev.bridge.util.ByteBuffer;
 import org.jetbrains.annotations.Nullable;
@@ -47,7 +48,7 @@ public void unregisterPacket(String packetId) {
         }
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public BridgePacket tryDecode(ByteBuffer buffer, String packetId) {
         BridgePacketDefinition<? extends BridgePacket> definition = this.getPacketDefinition(packetId);
 
@@ -57,7 +58,11 @@ public BridgePacket tryDecode(ByteBuffer buffer, String packetId) {
             packet = definition.getFactory().create();
             serializer = (BridgePacketSerializer<BridgePacket>) definition.getSerializer();
         } else {
-            throw new BridgeCodecException("Definition for packet with id " + packetId + " not found");
+            BridgeUnknownPacket unknownPacket = new BridgeUnknownPacket();
+            unknownPacket.setOriginalId(packetId);
+            unknownPacket.setOriginalPayload(buffer);
+            packet = unknownPacket;
+            serializer = (BridgePacketSerializer) new BridgeUnknownPacket.BridgeUnknownPacketSerializer();
         }
 
         serializer.deserialize(buffer, packet);
@@ -66,11 +71,16 @@ public BridgePacket tryDecode(ByteBuffer buffer, String packetId) {
 
     @SuppressWarnings("unchecked")
     public <T extends BridgePacket> void tryEncode(ByteBuffer buffer, T packet) {
-        BridgePacketDefinition<T> definition = (BridgePacketDefinition<T>) this.getPacketDefinition(packet.getId());
-        if (definition == null) {
-            throw new BridgeCodecException("Definition for packet with id " + packet.getId() + " not found");
+        BridgePacketSerializer<T> serializer;
+        if (packet instanceof BridgeUnknownPacket) {
+            serializer = (BridgePacketSerializer<T>) new BridgeUnknownPacket.BridgeUnknownPacketSerializer();
+        } else {
+            BridgePacketDefinition<T> definition = (BridgePacketDefinition<T>) this.getPacketDefinition(packet.getId());
+            if (definition == null) {
+                throw new BridgeCodecException("Definition for packet with id " + packet.getId() + " not found");
+            }
+            serializer = definition.getSerializer();
         }
-        BridgePacketSerializer<T> serializer = definition.getSerializer();
         serializer.serialize(buffer, packet);
     }
 

bridge-common/src/main/java/com/luminiadev/bridge/network/codec/packet/BridgeUnknownPacket.java

@@ -0,0 +1,39 @@
+package com.luminiadev.bridge.network.codec.packet;
+
+import com.luminiadev.bridge.network.codec.packet.serializer.BridgePacketSerializer;
+import com.luminiadev.bridge.util.ByteBuffer;
+import org.jetbrains.annotations.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(doNotUseGetters = true)
+public final class BridgeUnknownPacket implements BridgePacket {
+
+    private String originalId;
+    private ByteBuffer originalPayload;
+
+    @Override
+    public @NotNull String getId() {
+        return "unknown";
+    }
+
+    public static final class BridgeUnknownPacketSerializer implements BridgePacketSerializer<BridgeUnknownPacket> {
+
+        @Override
+        public void serialize(ByteBuffer buffer, BridgeUnknownPacket packet) {
+            buffer.writeString(packet.getOriginalId());
+            buffer.writeBytes(
+                    packet.getOriginalPayload().byteBuf(),
+                    packet.getOriginalPayload().readerIndex(),
+                    packet.getOriginalPayload().readableBytes()
+            );
+        }
+
+        @Override
+        public void deserialize(ByteBuffer buffer, BridgeUnknownPacket packet) {
+            packet.setOriginalId(buffer.readString());
+            packet.setOriginalPayload(ByteBuffer.of(buffer.readRetainedSlice(buffer.readableBytes())));
+        }
+    }
+}

bridge-common/src/main/java/com/luminiadev/bridge/util/ByteBuffer.java

@@ -27,6 +27,10 @@ public static ByteBuffer of(ByteBuf buffer) {
         return new ByteBuffer(buffer);
     }
 
+    public ByteBuf byteBuf() {
+        return buffer;
+    }
+
     public String readString() {
         int length = this.readUnsignedVarInt();
         return (String) buffer.readCharSequence(length, StandardCharsets.UTF_8);

build.gradle.kts

@@ -11,7 +11,7 @@ java {
 
 allprojects {
     group = "com.luminia"
-    version = "1.0.3-SNAPSHOT"
+    version = "1.0.4-SNAPSHOT"
 }
 
 subprojects {