com.wallstop-studios.dxmessaging 2.2.0 → 3.1.0

package/Runtime/Core/DataStructure/CyclicBuffer.cs

@@ -15,7 +15,7 @@ namespace DxMessaging.Core.DataStructure
     [Serializable]
     internal sealed class CyclicBuffer<T> : IReadOnlyList<T>
     {
-        public struct CyclicBufferEnumerator : IEnumerator<T>
+        internal struct CyclicBufferEnumerator : IEnumerator<T>
         {
             private readonly CyclicBuffer<T> _buffer;
 
@@ -70,13 +70,15 @@ namespace DxMessaging.Core.DataStructure
         /// <summary>Maximum number of elements retained in the buffer.</summary>
         public int Capacity { get; private set; }
 
-        /// <summary>Current number of elements stored (≤ <see cref="Capacity"/>).</summary>
+        /// <summary>Current number of elements stored (<= <see cref="Capacity"/>).</summary>
         public int Count { get; private set; }
 
         private readonly List<T> _buffer;
         private readonly List<T> _cache;
         private int _position;
 
+        internal int ScratchCacheCount => _cache.Count;
+
         /// <summary>
         /// Accesses the element at the specified chronological index (0 = oldest).
         /// </summary>
@@ -180,30 +182,37 @@ namespace DxMessaging.Core.DataStructure
             comparer ??= EqualityComparer<T>.Default;
 
             _cache.Clear();
-            for (int i = 0; i < Count; ++i)
+            try
             {
-                _cache.Add(_buffer[AdjustedIndexFor(i)]);
-            }
+                for (int i = 0; i < Count; ++i)
+                {
+                    _cache.Add(_buffer[AdjustedIndexFor(i)]);
+                }
 
-            // Find and remove the element
-            bool removed = false;
-            for (int i = 0; i < _cache.Count; ++i)
-            {
-                if (comparer.Equals(_cache[i], element))
+                // Find and remove the element
+                bool removed = false;
+                for (int i = 0; i < _cache.Count; ++i)
                 {
-                    _cache.RemoveAt(i);
-                    removed = true;
-                    break;
+                    if (comparer.Equals(_cache[i], element))
+                    {
+                        _cache.RemoveAt(i);
+                        removed = true;
+                        break;
+                    }
                 }
-            }
 
-            if (!removed)
+                if (!removed)
+                {
+                    return false;
+                }
+
+                RebuildFromCache();
+                return true;
+            }
+            finally
             {
-                return false;
+                _cache.Clear();
             }
-
-            RebuildFromCache();
-            return true;
         }
 
         /// <summary>
@@ -219,19 +228,26 @@ namespace DxMessaging.Core.DataStructure
             }
 
             _cache.Clear();
-            for (int i = 0; i < Count; ++i)
+            try
             {
-                _cache.Add(_buffer[AdjustedIndexFor(i)]);
-            }
+                for (int i = 0; i < Count; ++i)
+                {
+                    _cache.Add(_buffer[AdjustedIndexFor(i)]);
+                }
+
+                int removedCount = _cache.RemoveAll(predicate);
+                if (removedCount == 0)
+                {
+                    return 0;
+                }
 
-            int removedCount = _cache.RemoveAll(predicate);
-            if (removedCount == 0)
+                RebuildFromCache();
+                return removedCount;
+            }
+            finally
             {
-                return 0;
+                _cache.Clear();
             }
-
-            RebuildFromCache();
-            return removedCount;
         }
 
         private void RebuildFromCache()
@@ -240,6 +256,7 @@ namespace DxMessaging.Core.DataStructure
             _buffer.AddRange(_cache);
             Count = _cache.Count;
             _position = Count < Capacity ? Count : 0;
+            _cache.Clear();
         }
 
         /// <summary>
@@ -250,6 +267,7 @@ namespace DxMessaging.Core.DataStructure
             Count = 0;
             _position = 0;
             _buffer.Clear();
+            _cache.Clear();
         }
 
         /// <summary>

package/Runtime/Core/DataStructure/CyclicBuffer.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: 7d8dbf8640e24846bf35fb18a1b7c504
-timeCreated: 1749671893
+fileFormatVersion: 2
+guid: 7d8dbf8640e24846bf35fb18a1b7c504
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/DataStructure.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: 9862044472704c86ade5612ddcdfd5b5
+fileFormatVersion: 2
+guid: 9862044472704c86ade5612ddcdfd5b5
 timeCreated: 1749671887

package/Runtime/Core/Diagnostics/MessageEmissionData.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: 8eafaabae0f549ec82f67ea18be788e1
-timeCreated: 1749672335
+fileFormatVersion: 2
+guid: 8eafaabae0f549ec82f67ea18be788e1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Diagnostics/MessageRegistrationData.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: 01598791b01241caabfecea4c1f5880d
-timeCreated: 1749672447
+fileFormatVersion: 2
+guid: 01598791b01241caabfecea4c1f5880d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Diagnostics/MessageRegistrationType.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: 7d393cfbb3c8429d83af17a737fdaf0e
-timeCreated: 1749672471
+fileFormatVersion: 2
+guid: 7d393cfbb3c8429d83af17a737fdaf0e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Diagnostics.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: 9606a03ced274c3888a4d993309786a4
+fileFormatVersion: 2
+guid: 9606a03ced274c3888a4d993309786a4
 timeCreated: 1749672323

package/Runtime/Core/DxMessagingStaticState.cs

@@ -50,7 +50,26 @@ namespace DxMessaging.Core
                 MessageRegistrationHandle.SetIdSeed(Baseline.MessageRegistrationHandleSeed);
                 MessageRegistrationBuilder.SetSyntheticOwnerCounter(Baseline.SyntheticOwnerCounter);
 
+                // Capture the active global bus before ResetStatics swaps it back to the default
+                // instance. If a user installed a custom global bus via SetGlobalMessageBus, we
+                // also bump that bus's reset generation so deregister closures captured against
+                // it (e.g. a deferred Object.Destroy that lands after Reset) silently no-op
+                // instead of logging spurious over-deregistration errors. We deliberately do NOT
+                // call ResetState() on the custom bus -- that would clear its sinks, which the
+                // user may have intentionally preserved.
+                IMessageBus activeBus = MessageHandler.MessageBus;
+                IMessageBus defaultBus = MessageHandler.InitialGlobalMessageBus;
+
                 MessageHandler.ResetStatics();
+                MessageBus.MessageBus.ResetStaticPools();
+
+                if (
+                    !ReferenceEquals(activeBus, defaultBus)
+                    && activeBus is MessageBus.MessageBus customConcrete
+                )
+                {
+                    customConcrete.BumpResetGeneration();
+                }
             }
         }
 

package/Runtime/Core/DxMessagingStaticState.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 2fbeee7b1ae4484f978aba9de68b3d1d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 2fbeee7b1ae4484f978aba9de68b3d1d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Extensions/EnumExtensions.cs

@@ -2,6 +2,7 @@ namespace DxMessaging.Core.Extensions
 {
     using System;
     using System.Runtime.CompilerServices;
+    using DxMessaging.Core.Internal;
 
     internal static class EnumExtensions
     {
@@ -26,12 +27,12 @@ namespace DxMessaging.Core.Extensions
         {
             try
             {
-                return Unsafe.SizeOf<T>() switch
+                return DxUnsafe.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),
+                    1 => DxUnsafe.As<T, byte>(ref value),
+                    2 => DxUnsafe.As<T, ushort>(ref value),
+                    4 => DxUnsafe.As<T, uint>(ref value),
+                    8 => DxUnsafe.As<T, ulong>(ref value),
                     _ => null,
                 };
             }

package/Runtime/Core/Extensions/EnumExtensions.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: f01ee914d7634a69a85f86bb02f2f07e
-timeCreated: 1745162639
+fileFormatVersion: 2
+guid: f01ee914d7634a69a85f86bb02f2f07e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Extensions/IListExtensions.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: f6956caef19744a0b0d96215d4e5154a
-timeCreated: 1749671953
+fileFormatVersion: 2
+guid: f6956caef19744a0b0d96215d4e5154a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Extensions/MessageBusExtensions.cs.meta

@@ -1,12 +1,12 @@
-fileFormatVersion: 2
-guid: 2d2a3b7979da4f248a398e05be9f83d4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-
+fileFormatVersion: 2
+guid: 2d2a3b7979da4f248a398e05be9f83d4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+

package/Runtime/Core/Extensions/MessageExtensions.cs

@@ -79,12 +79,6 @@ namespace DxMessaging.Core.Extensions
         {
             InstanceId targetId = target;
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(ITargetedMessage))
-            {
-                resolvedBus.UntypedTargetedBroadcast(targetId, message);
-                return;
-            }
-
             resolvedBus.TargetedBroadcast(ref targetId, ref message);
         }
 
@@ -129,12 +123,6 @@ namespace DxMessaging.Core.Extensions
         {
             InstanceId targetId = target;
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(ITargetedMessage))
-            {
-                resolvedBus.UntypedTargetedBroadcast(targetId, message);
-                return;
-            }
-
             resolvedBus.TargetedBroadcast(ref targetId, ref message);
         }
 #endif
@@ -178,12 +166,6 @@ namespace DxMessaging.Core.Extensions
             where TMessage : struct, ITargetedMessage
         {
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(ITargetedMessage))
-            {
-                resolvedBus.UntypedTargetedBroadcast(target, message);
-                return;
-            }
-
             resolvedBus.TargetedBroadcast(ref target, ref message);
         }
 
@@ -259,12 +241,6 @@ namespace DxMessaging.Core.Extensions
             where TMessage : struct, IUntargetedMessage
         {
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(IUntargetedMessage))
-            {
-                resolvedBus.UntypedUntargetedBroadcast(message);
-                return;
-            }
-
             resolvedBus.UntargetedBroadcast(ref message);
         }
 
@@ -296,12 +272,6 @@ namespace DxMessaging.Core.Extensions
             where TMessage : struct, IUntargetedMessage
         {
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(IUntargetedMessage))
-            {
-                resolvedBus.UntypedUntargetedBroadcast(message);
-                return;
-            }
-
             resolvedBus.UntargetedBroadcast(ref message);
         }
 
@@ -341,12 +311,6 @@ namespace DxMessaging.Core.Extensions
             where TMessage : struct, ITargetedMessage
         {
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(ITargetedMessage))
-            {
-                resolvedBus.UntypedTargetedBroadcast(target, message);
-                return;
-            }
-
             resolvedBus.TargetedBroadcast(ref target, ref message);
         }
 
@@ -386,12 +350,6 @@ namespace DxMessaging.Core.Extensions
             where TMessage : struct, IBroadcastMessage
         {
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(ITargetedMessage))
-            {
-                resolvedBus.UntypedSourcedBroadcast(source, message);
-                return;
-            }
-
             resolvedBus.SourcedBroadcast(ref source, ref message);
         }
 
@@ -437,12 +395,6 @@ namespace DxMessaging.Core.Extensions
         {
             InstanceId sourceId = source;
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(IBroadcastMessage))
-            {
-                resolvedBus.UntypedSourcedBroadcast(sourceId, message);
-                return;
-            }
-
             resolvedBus.SourcedBroadcast(ref sourceId, ref message);
         }
 
@@ -487,12 +439,6 @@ namespace DxMessaging.Core.Extensions
         {
             InstanceId sourceId = source;
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(IBroadcastMessage))
-            {
-                resolvedBus.UntypedSourcedBroadcast(sourceId, message);
-                return;
-            }
-
             resolvedBus.SourcedBroadcast(ref sourceId, ref message);
         }
 #endif
@@ -536,12 +482,6 @@ namespace DxMessaging.Core.Extensions
             where TMessage : struct, IBroadcastMessage
         {
             IMessageBus resolvedBus = ResolveMessageBus(messageBus, messageBusProvider);
-            if (typeof(TMessage) == typeof(IBroadcastMessage))
-            {
-                resolvedBus.UntypedSourcedBroadcast(source, message);
-                return;
-            }
-
             resolvedBus.SourcedBroadcast(ref source, ref message);
         }
 

package/Runtime/Core/Extensions/MessageExtensions.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 760f3c3fe4dffe647b41eef37728c4f4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 760f3c3fe4dffe647b41eef37728c4f4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Extensions.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 963c131823f1c5948a69209dbac6533f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 963c131823f1c5948a69209dbac6533f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Helper/MessageCache.cs

@@ -155,6 +155,25 @@ namespace DxMessaging.Core.Helper
             return false;
         }
 
+        /// <summary>
+        /// Attempts to get the value at an already-resolved message type index.
+        /// </summary>
+        /// <param name="index">Index previously assigned by <see cref="MessageHelperIndexer{TMessage}"/>.</param>
+        /// <param name="value">Out parameter receiving the value if present.</param>
+        /// <returns>True if a non-null value was present.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal bool TryGetValueAtIndex(int index, out TValue value)
+        {
+            if (0 <= index && index < _values.Count)
+            {
+                value = _values[index];
+                return value != null;
+            }
+
+            value = default;
+            return false;
+        }
+
         /// <summary>
         /// Removes the value for the given <typeparamref name="TMessage"/> key.
         /// </summary>
@@ -170,6 +189,19 @@ namespace DxMessaging.Core.Helper
             }
         }
 
+        /// <summary>
+        /// Removes the value at an already-resolved message type index.
+        /// </summary>
+        /// <param name="index">Index previously assigned by <see cref="MessageHelperIndexer{TMessage}"/>.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void RemoveAtIndex(int index)
+        {
+            if (0 <= index && index < _values.Count)
+            {
+                _values[index] = null;
+            }
+        }
+
         /// <summary>
         /// Returns an enumerator iterating over non-null entries in insertion order.
         /// </summary>

package/Runtime/Core/Helper/MessageCache.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: 23cb3bf7f25d479c862736482ee96fa7
-timeCreated: 1745102344
+fileFormatVersion: 2
+guid: 23cb3bf7f25d479c862736482ee96fa7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Helper/MessageHelperIndexer.cs.meta

@@ -1,3 +1,11 @@
-fileFormatVersion: 2
-guid: 612c352c3d984a3486ac4b19bb69fa37
-timeCreated: 1745101032
+fileFormatVersion: 2
+guid: 612c352c3d984a3486ac4b19bb69fa37
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Helper.meta

@@ -1,3 +1,3 @@
-fileFormatVersion: 2
-guid: 351ee8f890884099b6c7c32e66f196a9
+fileFormatVersion: 2
+guid: 351ee8f890884099b6c7c32e66f196a9
 timeCreated: 1745100990

package/Runtime/Core/IMessage.cs

@@ -8,9 +8,9 @@ namespace DxMessaging.Core
     /// <remarks>
     /// DxMessaging models three primary categories of messages:
     /// <list type="bullet">
-    /// <item><description><see cref="Messages.IUntargetedMessage"/> — global notifications (for example: settings changed).</description></item>
-    /// <item><description><see cref="Messages.ITargetedMessage"/> — commands or events directed at a specific target.</description></item>
-    /// <item><description><see cref="Messages.IBroadcastMessage"/> — events emitted by a specific source and consumable by any listener.</description></item>
+    /// <item><description><see cref="Messages.IUntargetedMessage"/> -- global notifications (for example: settings changed).</description></item>
+    /// <item><description><see cref="Messages.ITargetedMessage"/> -- commands or events directed at a specific target.</description></item>
+    /// <item><description><see cref="Messages.IBroadcastMessage"/> -- events emitted by a specific source and consumable by any listener.</description></item>
     /// </list>
     /// <para>
     /// Implementors typically use the generic variants (for example, <c>IUntargetedMessage&lt;T&gt;</c>) on <c>struct</c> messages

package/Runtime/Core/IMessage.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 7d57ad19529ae9d4eb2521c7f44af929
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 7d57ad19529ae9d4eb2521c7f44af929
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: