com.wallstop-studios.dxmessaging 2.0.0-rc09 → 2.0.0-rc11

package/README.md

@@ -17,12 +17,12 @@ This project has a dependency on my [`Unity Helpers`](https://github.com/wallsto
 DxMessaging is currently a bit slower (2-3x) than Unity's built in messaging solution (when running in Unity). [Source](./Tests/Runtime/Benchmarks/PerformanceTests.cs).
 | Message Tech | Operations / Second |
 | ------------ | ------------------- |
-| Unity | 2,101,721 |
-| DxMessaging (GameObject) - Normal | 889,760 |
-| DxMessaging (Component) - Normal | 869,437 |
-| DxMessaging (GameObject) - No-Copy | 871,880 |
-| DxMessaging (Component) - No-Copy | 899,361 |
-| DxMessaging (Untargeted) - No-Copy | 1,239,673 |
+| Unity | 2,509,901 |
+| DxMessaging (GameObject) - Normal | 1,031,034 |
+| DxMessaging (Component) - Normal | 1,066,371 |
+| DxMessaging (GameObject) - No-Copy | 1,001,639 |
+| DxMessaging (Component) - No-Copy | 1,080,738 |
+| DxMessaging (Untargeted) - No-Copy | 1,389,542 |
 
 # Functionality
 While not as fast, DxMessaging offers *additional functionality* as compared to Unity's messaging solution.

package/Runtime/Core/MessageBus/MessageBus.cs

@@ -33,42 +33,39 @@
 
         public RegistrationLog Log => _log;
 
+        private readonly Dictionary<Type, SortedList<int, SortedList<MessageHandler, int>>> _sinks =
+            new();
         private readonly Dictionary<
             Type,
-            SortedDictionary<int, Dictionary<MessageHandler, int>>
-        > _sinks = new();
-        private readonly Dictionary<
-            Type,
-            Dictionary<InstanceId, SortedDictionary<int, Dictionary<MessageHandler, int>>>
+            Dictionary<InstanceId, SortedList<int, SortedList<MessageHandler, int>>>
         > _targetedSinks = new();
 
         private readonly Dictionary<
             Type,
-            Dictionary<InstanceId, SortedDictionary<int, Dictionary<MessageHandler, int>>>
+            Dictionary<InstanceId, SortedList<int, SortedList<MessageHandler, int>>>
         > _broadcastSinks = new();
         private readonly Dictionary<
             Type,
-            SortedDictionary<int, Dictionary<MessageHandler, int>>
+            SortedList<int, SortedList<MessageHandler, int>>
         > _postProcessingSinks = new();
         private readonly Dictionary<
             Type,
-            Dictionary<InstanceId, SortedDictionary<int, Dictionary<MessageHandler, int>>>
+            Dictionary<InstanceId, SortedList<int, SortedList<MessageHandler, int>>>
         > _postProcessingTargetedSinks = new();
         private readonly Dictionary<
             Type,
-            Dictionary<InstanceId, SortedDictionary<int, Dictionary<MessageHandler, int>>>
+            Dictionary<InstanceId, SortedList<int, SortedList<MessageHandler, int>>>
         > _postProcessingBroadcastSinks = new();
         private readonly Dictionary<
             Type,
-            SortedDictionary<int, Dictionary<MessageHandler, int>>
+            SortedList<int, SortedList<MessageHandler, int>>
         > _postProcessingTargetedWithoutTargetingSinks = new();
         private readonly Dictionary<
             Type,
-            SortedDictionary<int, Dictionary<MessageHandler, int>>
+            SortedList<int, SortedList<MessageHandler, int>>
         > _postProcessingBroadcastWithoutSourceSinks = new();
-        private readonly Dictionary<MessageHandler, int> _globalSinks = new();
-        private readonly Dictionary<Type, SortedDictionary<int, List<object>>> _interceptsByType =
-            new();
+        private readonly SortedList<MessageHandler, int> _globalSinks = new();
+        private readonly Dictionary<Type, SortedList<int, List<object>>> _interceptsByType = new();
         private readonly Dictionary<object, Dictionary<int, int>> _uniqueInterceptorsAndPriorities =
             new();
 
@@ -79,7 +76,7 @@
         // These are used so we aren't allocating as much every time we send messages
         private readonly Stack<List<MessageHandler>> _messageHandlers = new();
         private readonly Stack<
-            List<KeyValuePair<int, Dictionary<MessageHandler, int>>>
+            List<KeyValuePair<int, SortedList<MessageHandler, int>>>
         > _sortedHandlers = new();
         private readonly Stack<List<List<object>>> _interceptors = new();
         private readonly Stack<List<object>> _innerInterceptorsStack = new();
@@ -309,11 +306,11 @@
             if (
                 !_interceptsByType.TryGetValue(
                     type,
-                    out SortedDictionary<int, List<object>> prioritizedInterceptors
+                    out SortedList<int, List<object>> prioritizedInterceptors
                 )
             )
             {
-                prioritizedInterceptors = new SortedDictionary<int, List<object>>();
+                prioritizedInterceptors = new SortedList<int, List<object>>();
                 _interceptsByType[type] = prioritizedInterceptors;
             }
 
@@ -461,7 +458,7 @@
             if (
                 _postProcessingSinks.TryGetValue(
                     type,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> sortedHandlers
+                    out SortedList<int, SortedList<MessageHandler, int>> sortedHandlers
                 )
                 && 0 < sortedHandlers.Count
             )
@@ -469,18 +466,18 @@
                 foundAnyHandlers = true;
                 if (sortedHandlers.Count == 1)
                 {
-                    KeyValuePair<int, Dictionary<MessageHandler, int>> entry =
+                    KeyValuePair<int, SortedList<MessageHandler, int>> entry =
                         sortedHandlers.First();
                     RunUntargetedPostProcessing(ref typedMessage, entry.Key, entry.Value);
                 }
                 else
                 {
-                    List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+                    List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                         GetOrAddMessageHandlerStack(sortedHandlers);
                     try
                     {
                         foreach (
-                            KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList
+                            KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList
                         )
                         {
                             RunUntargetedPostProcessing(ref typedMessage, entry.Key, entry.Value);
@@ -506,7 +503,7 @@
         private void RunUntargetedPostProcessing<TMessage>(
             ref TMessage typedMessage,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : IUntargetedMessage
         {
@@ -597,12 +594,12 @@
                     type,
                     out Dictionary<
                         InstanceId,
-                        SortedDictionary<int, Dictionary<MessageHandler, int>>
+                        SortedList<int, SortedList<MessageHandler, int>>
                     > targetedHandlers
                 )
                 && targetedHandlers.TryGetValue(
                     target,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> sortedHandlers
+                    out SortedList<int, SortedList<MessageHandler, int>> sortedHandlers
                 )
                 && 0 < sortedHandlers.Count
             )
@@ -610,18 +607,18 @@
                 foundAnyHandlers = true;
                 if (sortedHandlers.Count == 1)
                 {
-                    KeyValuePair<int, Dictionary<MessageHandler, int>> entry =
+                    KeyValuePair<int, SortedList<MessageHandler, int>> entry =
                         sortedHandlers.First();
                     RunTargetedBroadcast(ref target, ref typedMessage, entry.Key, entry.Value);
                 }
                 else
                 {
-                    List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+                    List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                         GetOrAddMessageHandlerStack(sortedHandlers);
                     try
                     {
                         foreach (
-                            KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList
+                            KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList
                         )
                         {
                             RunTargetedBroadcast(
@@ -650,18 +647,18 @@
                 foundAnyHandlers = true;
                 if (sortedHandlers.Count == 1)
                 {
-                    KeyValuePair<int, Dictionary<MessageHandler, int>> entry =
+                    KeyValuePair<int, SortedList<MessageHandler, int>> entry =
                         sortedHandlers.First();
                     RunTargetedPostProcessing(ref target, ref typedMessage, entry.Key, entry.Value);
                 }
                 else
                 {
-                    List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+                    List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                         GetOrAddMessageHandlerStack(sortedHandlers);
                     try
                     {
                         foreach (
-                            KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList
+                            KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList
                         )
                         {
                             RunTargetedPostProcessing(
@@ -686,7 +683,7 @@
             {
                 if (sortedHandlers.Count == 1)
                 {
-                    KeyValuePair<int, Dictionary<MessageHandler, int>> entry =
+                    KeyValuePair<int, SortedList<MessageHandler, int>> entry =
                         sortedHandlers.First();
                     RunTargetedWithoutTargetingPostProcessing(
                         ref target,
@@ -697,12 +694,12 @@
                 }
                 else
                 {
-                    List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+                    List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                         GetOrAddMessageHandlerStack(sortedHandlers);
                     try
                     {
                         foreach (
-                            KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList
+                            KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList
                         )
                         {
                             RunTargetedWithoutTargetingPostProcessing(
@@ -735,7 +732,7 @@
             ref InstanceId target,
             ref TMessage typedMessage,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : ITargetedMessage
         {
@@ -787,7 +784,7 @@
             ref InstanceId target,
             ref TMessage typedMessage,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : ITargetedMessage
         {
@@ -839,7 +836,7 @@
             ref InstanceId target,
             ref TMessage typedMessage,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : ITargetedMessage
         {
@@ -929,12 +926,12 @@
                     type,
                     out Dictionary<
                         InstanceId,
-                        SortedDictionary<int, Dictionary<MessageHandler, int>>
+                        SortedList<int, SortedList<MessageHandler, int>>
                     > broadcastHandlers
                 )
                 && broadcastHandlers.TryGetValue(
                     source,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> sortedHandlers
+                    out SortedList<int, SortedList<MessageHandler, int>> sortedHandlers
                 )
                 && 0 < sortedHandlers.Count
             )
@@ -942,18 +939,18 @@
                 foundAnyHandlers = true;
                 if (sortedHandlers.Count == 1)
                 {
-                    KeyValuePair<int, Dictionary<MessageHandler, int>> entry =
+                    KeyValuePair<int, SortedList<MessageHandler, int>> entry =
                         sortedHandlers.First();
                     RunBroadcast(ref source, ref typedMessage, entry.Key, entry.Value);
                 }
                 else
                 {
-                    List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+                    List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                         GetOrAddMessageHandlerStack(sortedHandlers);
                     try
                     {
                         foreach (
-                            KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList
+                            KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList
                         )
                         {
                             RunBroadcast(ref source, ref typedMessage, entry.Key, entry.Value);
@@ -977,7 +974,7 @@
                 foundAnyHandlers = true;
                 if (sortedHandlers.Count == 1)
                 {
-                    KeyValuePair<int, Dictionary<MessageHandler, int>> entry =
+                    KeyValuePair<int, SortedList<MessageHandler, int>> entry =
                         sortedHandlers.First();
                     RunBroadcastPostProcessing(
                         ref source,
@@ -988,12 +985,12 @@
                 }
                 else
                 {
-                    List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+                    List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                         GetOrAddMessageHandlerStack(sortedHandlers);
                     try
                     {
                         foreach (
-                            KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList
+                            KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList
                         )
                         {
                             RunBroadcastPostProcessing(
@@ -1018,7 +1015,7 @@
             {
                 if (sortedHandlers.Count == 1)
                 {
-                    KeyValuePair<int, Dictionary<MessageHandler, int>> entry =
+                    KeyValuePair<int, SortedList<MessageHandler, int>> entry =
                         sortedHandlers.First();
                     RunBroadcastWithoutSourcePostProcessing(
                         ref source,
@@ -1029,12 +1026,12 @@
                 }
                 else
                 {
-                    List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+                    List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                         GetOrAddMessageHandlerStack(sortedHandlers);
                     try
                     {
                         foreach (
-                            KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList
+                            KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList
                         )
                         {
                             RunBroadcastWithoutSourcePostProcessing(
@@ -1067,7 +1064,7 @@
             ref InstanceId source,
             ref TMessage typedMessage,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : IBroadcastMessage
         {
@@ -1119,7 +1116,7 @@
             ref InstanceId source,
             ref TMessage typedMessage,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : IBroadcastMessage
         {
@@ -1171,7 +1168,7 @@
             ref InstanceId source,
             ref TMessage typedMessage,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : IBroadcastMessage
         {
@@ -1336,10 +1333,7 @@
         )
         {
             if (
-                !_interceptsByType.TryGetValue(
-                    type,
-                    out SortedDictionary<int, List<object>> interceptors
-                )
+                !_interceptsByType.TryGetValue(type, out SortedList<int, List<object>> interceptors)
                 || interceptors.Count <= 0
             )
             {
@@ -1504,7 +1498,7 @@
             if (
                 !_sinks.TryGetValue(
                     type,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> sortedHandlers
+                    out SortedList<int, SortedList<MessageHandler, int>> sortedHandlers
                 )
                 || sortedHandlers.Count <= 0
             )
@@ -1514,16 +1508,16 @@
 
             if (sortedHandlers.Count == 1)
             {
-                KeyValuePair<int, Dictionary<MessageHandler, int>> entry = sortedHandlers.First();
+                KeyValuePair<int, SortedList<MessageHandler, int>> entry = sortedHandlers.First();
                 RunUntargetedBroadcast(ref message, entry.Key, entry.Value);
                 return true;
             }
 
-            List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+            List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                 GetOrAddMessageHandlerStack(sortedHandlers);
             try
             {
-                foreach (KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList)
+                foreach (KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList)
                 {
                     RunUntargetedBroadcast(ref message, entry.Key, entry.Value);
                 }
@@ -1539,7 +1533,7 @@
         private void RunUntargetedBroadcast<TMessage>(
             ref TMessage message,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : IMessage
         {
@@ -1587,7 +1581,7 @@
             if (
                 !_sinks.TryGetValue(
                     type,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> sortedHandlers
+                    out SortedList<int, SortedList<MessageHandler, int>> sortedHandlers
                 )
                 || sortedHandlers.Count <= 0
             )
@@ -1597,16 +1591,16 @@
 
             if (sortedHandlers.Count == 1)
             {
-                KeyValuePair<int, Dictionary<MessageHandler, int>> entry = sortedHandlers.First();
+                KeyValuePair<int, SortedList<MessageHandler, int>> entry = sortedHandlers.First();
                 RunTargetedWithoutTargeting(ref target, ref message, entry.Key, entry.Value);
                 return true;
             }
 
-            List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+            List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                 GetOrAddMessageHandlerStack(sortedHandlers);
             try
             {
-                foreach (KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList)
+                foreach (KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList)
                 {
                     RunTargetedWithoutTargeting(ref target, ref message, entry.Key, entry.Value);
                 }
@@ -1623,7 +1617,7 @@
             ref InstanceId target,
             ref TMessage message,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : ITargetedMessage
         {
@@ -1676,7 +1670,7 @@
             if (
                 !_sinks.TryGetValue(
                     type,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> sortedHandlers
+                    out SortedList<int, SortedList<MessageHandler, int>> sortedHandlers
                 )
                 || sortedHandlers.Count <= 0
             )
@@ -1686,16 +1680,16 @@
 
             if (sortedHandlers.Count == 1)
             {
-                KeyValuePair<int, Dictionary<MessageHandler, int>> entry = sortedHandlers.First();
+                KeyValuePair<int, SortedList<MessageHandler, int>> entry = sortedHandlers.First();
                 RunBroadcastWithoutSource(ref source, ref message, entry.Key, entry.Value);
                 return true;
             }
 
-            List<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlerList =
+            List<KeyValuePair<int, SortedList<MessageHandler, int>>> handlerList =
                 GetOrAddMessageHandlerStack(sortedHandlers);
             try
             {
-                foreach (KeyValuePair<int, Dictionary<MessageHandler, int>> entry in handlerList)
+                foreach (KeyValuePair<int, SortedList<MessageHandler, int>> entry in handlerList)
                 {
                     RunBroadcastWithoutSource(ref source, ref message, entry.Key, entry.Value);
                 }
@@ -1712,7 +1706,7 @@
             ref InstanceId source,
             ref TMessage message,
             int priority,
-            Dictionary<MessageHandler, int> handlers
+            SortedList<MessageHandler, int> handlers
         )
             where TMessage : IBroadcastMessage
         {
@@ -1762,7 +1756,7 @@
 
         private Action InternalRegisterUntargeted<T>(
             MessageHandler messageHandler,
-            Dictionary<Type, SortedDictionary<int, Dictionary<MessageHandler, int>>> sinks,
+            Dictionary<Type, SortedList<int, SortedList<MessageHandler, int>>> sinks,
             RegistrationMethod registrationMethod,
             int priority
         )
@@ -1779,17 +1773,17 @@
             if (
                 !sinks.TryGetValue(
                     type,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> handlers
+                    out SortedList<int, SortedList<MessageHandler, int>> handlers
                 )
             )
             {
-                handlers = new SortedDictionary<int, Dictionary<MessageHandler, int>>();
+                handlers = new SortedList<int, SortedList<MessageHandler, int>>();
                 sinks[type] = handlers;
             }
 
-            if (!handlers.TryGetValue(priority, out Dictionary<MessageHandler, int> handler))
+            if (!handlers.TryGetValue(priority, out SortedList<MessageHandler, int> handler))
             {
-                handler = new Dictionary<MessageHandler, int>();
+                handler = new SortedList<MessageHandler, int>();
                 handlers[priority] = handler;
             }
 
@@ -1866,7 +1860,7 @@
             MessageHandler messageHandler,
             Dictionary<
                 Type,
-                Dictionary<InstanceId, SortedDictionary<int, Dictionary<MessageHandler, int>>>
+                Dictionary<InstanceId, SortedList<int, SortedList<MessageHandler, int>>>
             > sinks,
             RegistrationMethod registrationMethod,
             int priority
@@ -1883,33 +1877,30 @@
                     type,
                     out Dictionary<
                         InstanceId,
-                        SortedDictionary<int, Dictionary<MessageHandler, int>>
+                        SortedList<int, SortedList<MessageHandler, int>>
                     > broadcastHandlers
                 )
             )
             {
                 broadcastHandlers =
-                    new Dictionary<
-                        InstanceId,
-                        SortedDictionary<int, Dictionary<MessageHandler, int>>
-                    >();
+                    new Dictionary<InstanceId, SortedList<int, SortedList<MessageHandler, int>>>();
                 sinks[type] = broadcastHandlers;
             }
 
             if (
                 !broadcastHandlers.TryGetValue(
                     context,
-                    out SortedDictionary<int, Dictionary<MessageHandler, int>> handlers
+                    out SortedList<int, SortedList<MessageHandler, int>> handlers
                 )
             )
             {
-                handlers = new SortedDictionary<int, Dictionary<MessageHandler, int>>();
+                handlers = new SortedList<int, SortedList<MessageHandler, int>>();
                 broadcastHandlers[context] = handlers;
             }
 
-            if (!handlers.TryGetValue(priority, out Dictionary<MessageHandler, int> handler))
+            if (!handlers.TryGetValue(priority, out SortedList<MessageHandler, int> handler))
             {
-                handler = new Dictionary<MessageHandler, int>();
+                handler = new SortedList<MessageHandler, int>();
                 handlers[priority] = handler;
             }
 
@@ -1987,18 +1978,18 @@
         }
 
         private List<
-            KeyValuePair<int, Dictionary<MessageHandler, int>>
+            KeyValuePair<int, SortedList<MessageHandler, int>>
         > GetOrAddMessageHandlerStack(
-            IEnumerable<KeyValuePair<int, Dictionary<MessageHandler, int>>> handlers
+            IEnumerable<KeyValuePair<int, SortedList<MessageHandler, int>>> handlers
         )
         {
             if (
                 !_sortedHandlers.TryPop(
-                    out List<KeyValuePair<int, Dictionary<MessageHandler, int>>> messageHandlers
+                    out List<KeyValuePair<int, SortedList<MessageHandler, int>>> messageHandlers
                 )
             )
             {
-                return new List<KeyValuePair<int, Dictionary<MessageHandler, int>>>(handlers);
+                return new List<KeyValuePair<int, SortedList<MessageHandler, int>>>(handlers);
             }
 
             messageHandlers.Clear();

package/Runtime/Core/MessageHandler.cs

@@ -12,6 +12,9 @@
     /// kinds of types to trigger functions that are registered with it.
     /// </summary>
     public sealed class MessageHandler
+        : IEquatable<MessageHandler>,
+            IComparable,
+            IComparable<MessageHandler>
     {
         public delegate void FastHandler<TMessage>(ref TMessage message)
             where TMessage : IMessage;
@@ -1220,6 +1223,46 @@
             return (messageBus ?? MessageBus).RegisterTargetedInterceptor(interceptor, priority);
         }
 
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as MessageHandler);
+        }
+
+        public bool Equals(MessageHandler other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(other, this))
+            {
+                return true;
+            }
+
+            return owner.Equals(other.owner);
+        }
+
+        public override int GetHashCode()
+        {
+            return owner.GetHashCode();
+        }
+
+        public int CompareTo(MessageHandler other)
+        {
+            if (other == null)
+            {
+                return -1;
+            }
+
+            return owner.CompareTo(other.owner);
+        }
+
+        public int CompareTo(object obj)
+        {
+            return CompareTo(obj as MessageHandler);
+        }
+
         public override string ToString()
         {
             return new
@@ -1231,7 +1274,7 @@
                         .Values.SelectMany(handlers => handlers.Keys)
                         .Distinct()
                         .Select(type => type.Name)
-                        .OrderBy(_ => _)
+                        .OrderBy(x => x)
                 ),
             }.ToString();
         }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.wallstop-studios.dxmessaging",
-  "version": "2.0.0-rc09",
+  "version": "2.0.0-rc11",
   "displayName": "DxMessaging",
   "description": "Synchronous Event Bus for Unity",
   "unity": "2021.3",
   "dependencies": {
-    "com.wallstop-studios.unity-helpers" : "2.0.0-rc13"
+    "com.wallstop-studios.unity-helpers" : "2.0.0-rc15"
   },
   "keywords": [
     "messaging",