Merge pull request #1 from darcymiranda/fix-byte-attribute-names

Refactor single byte attribute name serialization
darcymiranda · May 11, 2024 · c8f208b · c8f208b
2 parents d39bc8c + a457580
commit c8f208b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -337,4 +337,7 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+
+src/PFire.Console/Logs/
+src/PFire.Console/*.sqlite*
diff --git a/src/PFire.Core/Protocol/MessageSerializer.cs b/src/PFire.Core/Protocol/MessageSerializer.cs
@@ -35,40 +35,23 @@ public static IMessage Deserialize(BinaryReader reader, IMessage messageBase)
 
             for (var i = 0; i < attributeCount; i++)
             {
-                var attributeName = GetAttributeName(reader, messageType);
+                var attributeNameAsBytes = GetAttributeNameAsBytes(reader, messageType);
 
                 var attributeType = reader.ReadByte();
 
                 var value = XFireAttributeFactory.Instance.GetAttribute(attributeType).ReadValue(reader);
 
                 var field = fieldInfo
                     .Where(a => a.GetCustomAttribute<XMessageField>() != null)
-                    .FirstOrDefault(a =>
-                    {
-                        var attribute = a.GetCustomAttribute<XMessageField>();
-                        if (attribute != null)
-                        {
-                            if (attributeName.Length == 1)
-                            {
-                                // If attributeName is a single byte, compare with the attribute's NameAsBytes
-                                return attribute.NameAsBytes.SequenceEqual(attributeName);
-                            }
-                            else
-                            {
-                                // If attributeName is a byte array with length > 1, compare with the attribute's Name converted to string
-                                return Encoding.UTF8.GetString(attributeName) == attribute.Name;
-                            }
-                        }
-                        return false;
-                    });
+                    .FirstOrDefault(a => a.GetCustomAttribute<XMessageField>().NameAsBytes.SequenceEqual(attributeNameAsBytes));
 
                 if (field != null)
                 {
                     field.SetValue(messageBase, value);
                 }
                 else
                 {
-                    Debug.WriteLine($"WARN: No attribute defined for {attributeName} on class {messageType.Name}");
+                    Debug.WriteLine($"WARN: No attribute defined for {attributeNameAsBytes} on class {messageType.Name}");
                 }
             }
 
@@ -77,9 +60,11 @@ public static IMessage Deserialize(BinaryReader reader, IMessage messageBase)
             return messageBase;
         }
 
-        private static byte[] GetAttributeName(BinaryReader reader, Type messageType)
+        private static byte[] GetAttributeNameAsBytes(BinaryReader reader, Type messageType)
         {
-            HashSet<Type> messageTypeSet = new HashSet<Type>
+            // These messages contain a single field represented by a byte value instead of
+            // the usual first byte representing the attribute name length.
+            var messagesWithoutAttributeNames = new HashSet<Type>
             {
                 typeof(StatusChange),
                 typeof(GameServerFetchAll),
@@ -92,21 +77,14 @@ private static byte[] GetAttributeName(BinaryReader reader, Type messageType)
                 typeof(UserRequestAdvancedInfo)
             };
 
-            byte count = messageTypeSet.Contains(messageType) ? (byte)1 : reader.ReadByte();
 
-            // Check if count is 1, indicating a single byte
-            if (count == 1)
-            {
-                // Read the single byte and treat it as a numeric value
-                byte numericValue = reader.ReadByte();
-                return [numericValue];
-            }
-            else
+            if (messagesWithoutAttributeNames.Contains(messageType))
             {
-                // Read the bytes for the attribute name
-                var readBytes = reader.ReadBytes(count);
-                return readBytes;
+                return [reader.ReadByte()];
             }
+
+            var length = reader.ReadByte();
+            return reader.ReadBytes(length);
         }
 
         public static byte[] Serialize(IMessage message)

diff --git a/src/PFire.Core/Protocol/XFireAttributeFactory.cs b/src/PFire.Core/Protocol/XFireAttributeFactory.cs
@@ -9,9 +9,9 @@ public class XFireAttributeFactory
     {
         private static readonly XFireAttributeFactory instance = null;
 
-        private readonly Dictionary<byte, XFireAttribute> _attributeTypes = new Dictionary<byte, XFireAttribute>();
+        private readonly Dictionary<byte, XFireAttribute> _attributeTypes = [];
 
-        private static readonly byte[] IgnoreKnownUnimplementedTypes = {18};
+        private static readonly byte[] IgnoreKnownUnimplementedTypes = [18];
 
         private XFireAttributeFactory()
         {

diff --git a/src/PFire.Core/Protocol/XMessageField.cs b/src/PFire.Core/Protocol/XMessageField.cs
@@ -13,11 +13,12 @@ internal sealed class XMessageField : Attribute
         public XMessageField(string name)
         {
             Name = name;
+            NameAsBytes = Encoding.UTF8.GetBytes(name);
         }
 
         public XMessageField(params byte[] name)
-               //: this(Encoding.UTF8.GetString(name))
         {
+            Name = Encoding.UTF8.GetString(name);
             NonTextualName = true;
             NameAsBytes = name;
         }