Codec implementation

Havret · Mar 9, 2024 · d818132 · d818132
1 parent 6b2a0c6
commit d818132
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/src/ArtemisNetCoreClient/Framing/Codec.cs b/src/ArtemisNetCoreClient/Framing/Codec.cs
@@ -0,0 +1,37 @@
+namespace ActiveMQ.Artemis.Core.Client.Framing;
+
+internal static class Codec
+{
+    public static void Encode(ByteBuffer buffer, Packet packet, long channelId)
+    {
+        buffer.WriteInt(0); // The length gets filled in at the end
+
+        var type = packet switch
+        {
+            CreateSessionMessageV2 => CreateSessionMessageV2.Type,
+            _ => throw new ArgumentOutOfRangeException(nameof(packet), packet, $"{packet.GetType()} is not supported for encoding")
+        };
+        buffer.WriteByte(type);
+        buffer.WriteLong(channelId);
+
+        packet.Encode(buffer);
+
+        buffer.WriteSize();
+    }
+
+    public static (Packet packet, long channelId) Decode(ByteBuffer buffer)
+    {
+        var type = buffer.ReadByte();
+        var channelId = buffer.ReadLong();
+
+        Packet packet = type switch
+        {
+            CreateSessionResponseMessage.Type => new CreateSessionResponseMessage(),
+            _ => throw new ArgumentOutOfRangeException($"Type {type} is not supported for decoding")
+        };
+
+        packet.Decode(buffer);
+
+        return (packet, channelId);
+    }
+}
diff --git a/src/ArtemisNetCoreClient/Framing/CreateSessionMessageV2.cs b/src/ArtemisNetCoreClient/Framing/CreateSessionMessageV2.cs
@@ -2,7 +2,7 @@ namespace ActiveMQ.Artemis.Core.Client.Framing;
 
 internal class CreateSessionMessageV2 : Packet
 {
-    public override byte Type => unchecked((byte) -18);
+    public const byte Type = unchecked((byte) -18);
     public required string Name { get; init; }
     public long SessionChannelId { get; init; }
     public int Version { get; init; }
@@ -16,16 +16,9 @@ internal class CreateSessionMessageV2 : Packet
     public int WindowSize { get; init; }
     public string? DefaultAddress { get; init; }
     public string? ClientId { get; init; }
-    public long ChannelId { get; init; }
 
     public override void Encode(ByteBuffer buffer)
     {
-        // header
-        buffer.WriteInt(0); // The length gets filled in at the end
-        buffer.WriteByte(Type);
-        buffer.WriteLong(ChannelId);
-
-        // rest
         buffer.WriteString(Name);
         buffer.WriteLong(SessionChannelId);
         buffer.WriteInt(Version);
@@ -39,9 +32,6 @@ public override void Encode(ByteBuffer buffer)
         buffer.WriteBool(PreAcknowledge);
         buffer.WriteNullableString(DefaultAddress);
         buffer.WriteNullableString(ClientId);
-
-        // size
-        buffer.WriteSize();
     }
 
     public override void Decode(ByteBuffer buffer)

diff --git a/src/ArtemisNetCoreClient/Framing/CreateSessionResponseMessage.cs b/src/ArtemisNetCoreClient/Framing/CreateSessionResponseMessage.cs
@@ -2,20 +2,16 @@ namespace ActiveMQ.Artemis.Core.Client.Framing;
 
 internal class CreateSessionResponseMessage : Packet
 {
-    public long ChannelId { get; private set; }
+    public const byte Type = 31;
     public int ServerVersion { get; private set; }
 
-    public override byte Type { get; } = 31;
-
     public override void Encode(ByteBuffer buffer)
     {
         throw new NotImplementedException();
     }
 
     public override void Decode(ByteBuffer buffer)
     {
-        _ = buffer.ReadByte(); // type
-        ChannelId = buffer.ReadLong();
         ServerVersion = buffer.ReadInt();
     }
 }
diff --git a/src/ArtemisNetCoreClient/Framing/Packet.cs b/src/ArtemisNetCoreClient/Framing/Packet.cs
@@ -2,7 +2,7 @@ namespace ActiveMQ.Artemis.Core.Client.Framing;
 
 internal abstract class Packet
 {
-    public abstract byte Type { get;  }
     public abstract void Encode(ByteBuffer buffer);
+
     public abstract void Decode(ByteBuffer buffer);
 }