com.wallstop-studios.dxmessaging 2.0.0-rc26.7 → 2.0.0-rc26.9

package/Runtime/Core/DataStructure/CyclicBuffer.cs

@@ -51,6 +51,7 @@ namespace DxMessaging.Core.DataStructure
         public int Count { get; private set; }
 
         private readonly List<T> _buffer;
+        private readonly List<T> _cache = new();
         private int _position;
 
         public T this[int index]
@@ -132,21 +133,24 @@ namespace DxMessaging.Core.DataStructure
                 return false;
             }
 
-            int write = 0;
-            bool removed = false;
             comparer ??= EqualityComparer<T>.Default;
+
+            _cache.Clear();
             for (int i = 0; i < Count; ++i)
             {
-                int readIdx = AdjustedIndexFor(i);
-                T item = _buffer[readIdx];
+                _cache.Add(_buffer[AdjustedIndexFor(i)]);
+            }
 
-                if (!removed && comparer.Equals(item, element))
+            // Find and remove the element
+            bool removed = false;
+            for (int i = 0; i < _cache.Count; ++i)
+            {
+                if (comparer.Equals(_cache[i], element))
                 {
+                    _cache.RemoveAt(i);
                     removed = true;
-                    continue;
+                    break;
                 }
-
-                _buffer[write++] = item;
             }
 
             if (!removed)
@@ -154,9 +158,10 @@ namespace DxMessaging.Core.DataStructure
                 return false;
             }
 
-            _buffer.RemoveRange(write, _buffer.Count - write);
-
-            Count--;
+            // Rebuild the buffer with linearized data
+            _buffer.Clear();
+            _buffer.AddRange(_cache);
+            Count = _cache.Count;
             _position = Count < Capacity ? Count : 0;
             return true;
         }

package/Runtime/Core/Extensions/EnumExtensions.cs

@@ -9,29 +9,36 @@ namespace DxMessaging.Core.Extensions
         internal static bool HasFlagNoAlloc<T>(this T value, T flag)
             where T : unmanaged, Enum
         {
-            ulong valueUnderlying = GetUInt64(value);
-            ulong flagUnderlying = GetUInt64(flag);
-            return (valueUnderlying & flagUnderlying) == flagUnderlying;
+            ulong? valueUnderlying = GetUInt64(value);
+            ulong? flagUnderlying = GetUInt64(flag);
+            if (valueUnderlying == null || flagUnderlying == null)
+            {
+                // Fallback for unsupported enum sizes
+                return value.HasFlag(flag);
+            }
+
+            return (valueUnderlying.Value & flagUnderlying.Value) == flagUnderlying.Value;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static unsafe ulong GetUInt64<T>(T value)
+        private static ulong? GetUInt64<T>(T value)
             where T : unmanaged
         {
-            /*
-                Works because T is constrained to unmanaged, so it's safe to reinterpret
-                All enums are value types and have a fixed size
-             */
-            return sizeof(T) switch
+            try
+            {
+                return Unsafe.SizeOf<T>() switch
+                {
+                    1 => Unsafe.As<T, byte>(ref value),
+                    2 => Unsafe.As<T, ushort>(ref value),
+                    4 => Unsafe.As<T, uint>(ref value),
+                    8 => Unsafe.As<T, ulong>(ref value),
+                    _ => null,
+                };
+            }
+            catch
             {
-                1 => *(byte*)&value,
-                2 => *(ushort*)&value,
-                4 => *(uint*)&value,
-                8 => *(ulong*)&value,
-                _ => throw new ArgumentException(
-                    $"Unsupported enum size: {sizeof(T)} for type {typeof(T)}"
-                ),
-            };
+                return null;
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.dxmessaging",
-  "version": "2.0.0-rc26.7",
+  "version": "2.0.0-rc26.9",
   "displayName": "DxMessaging",
   "description": "Synchronous Event Bus for Unity",
   "unity": "2021.3",
@@ -32,10 +32,3 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   }
 }
-
-
-
-
-
-
-