com.wallstop-studios.dxmessaging 2.2.0 → 3.1.0

package/Runtime/Unity/MessageBusProviderHandle.cs.meta

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

package/Runtime/Unity/MessagingComponent.cs

@@ -185,8 +185,9 @@ namespace DxMessaging.Unity
         /// </summary>
         /// <param name="listener">Listener whose token should be released.</param>
         /// <remarks>
-        /// Invokes <see cref="MessageRegistrationToken.Disable"/> and removes the listener from the internal cache.
-        /// Safe to call multiple times.
+        /// Invokes <see cref="MessageRegistrationToken.Dispose"/> and removes the listener from the internal cache after
+        /// disposal succeeds. If token disposal throws, the listener remains cached so release can be retried. Safe to call
+        /// multiple times after a successful release.
         /// </remarks>
         public bool Release(MonoBehaviour listener)
         {
@@ -195,9 +196,10 @@ namespace DxMessaging.Unity
                 return false;
             }
 
-            if (_registeredListeners.Remove(listener, out MessageRegistrationToken token))
+            if (_registeredListeners.TryGetValue(listener, out MessageRegistrationToken token))
             {
-                token?.Disable();
+                token?.Dispose();
+                _ = _registeredListeners.Remove(listener);
                 return true;
             }
 
@@ -225,34 +227,65 @@ namespace DxMessaging.Unity
         /// <summary>
         /// Activates the underlying handler when this component becomes enabled.
         /// </summary>
+        /// <remarks>
+        /// When <see cref="emitMessagesWhenDisabled"/> is true, the Unity enable/disable
+        /// lifecycle leaves the handler untouched in BOTH directions, so an explicit
+        /// <see cref="ToggleMessageHandler"/> decision survives enable/disable cycles.
+        /// </remarks>
         public void OnEnable()
         {
-            ToggleMessageHandler(true);
+            if (!emitMessagesWhenDisabled)
+            {
+                ToggleMessageHandler(true);
+            }
         }
 
         /// <summary>
         /// Deactivates the underlying handler when this component becomes disabled.
         /// </summary>
+        /// <remarks>
+        /// When <see cref="emitMessagesWhenDisabled"/> is true, disabling leaves the handler
+        /// active so the GameObject keeps emitting (and listeners whose tokens are not tied to
+        /// the Unity lifecycle keep receiving).
+        /// </remarks>
         public void OnDisable()
         {
-            ToggleMessageHandler(false);
+            if (!emitMessagesWhenDisabled)
+            {
+                ToggleMessageHandler(false);
+            }
         }
 
         /// <summary>
         /// Explicitly toggle the underlying handler's active state.
         /// </summary>
         /// <param name="newActive">Desired active state.</param>
+        /// <remarks>
+        /// Explicit calls always win: unlike the Unity lifecycle, this method is never gated by
+        /// <see cref="emitMessagesWhenDisabled"/>.
+        /// </remarks>
         public void ToggleMessageHandler(bool newActive)
         {
-            if (!newActive && emitMessagesWhenDisabled)
+            if (_messageHandler != null && _messageHandler.active != newActive)
             {
-                return;
+                _messageHandler.active = newActive;
             }
+        }
 
-            if (_messageHandler != null && _messageHandler.active != newActive)
+        /// <summary>
+        /// Fetches the live (created and not released) registration token for
+        /// <paramref name="listener"/> without the double-create warning
+        /// <see cref="Create(MonoBehaviour)"/> logs.
+        /// </summary>
+        internal bool TryGetToken(MonoBehaviour listener, out MessageRegistrationToken token)
+        {
+            if (listener == null)
             {
-                _messageHandler.active = newActive;
+                token = null;
+                return false;
             }
+
+            return _registeredListeners.TryGetValue(listener, out token);
         }
 
         /// <summary>

package/Runtime/Unity/MessagingComponent.cs.meta

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

package/Runtime/Unity/MessagingComponentInstaller.cs.meta

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

package/Runtime/Unity/ScriptableMessageBusProvider.cs.meta

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

package/Runtime/Unity.meta

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

package/Runtime/WallstopStudios.DxMessaging.asmdef

@@ -1,14 +1,14 @@
-{
-  "name": "WallstopStudios.DxMessaging",
-  "rootNamespace": "DxMessaging",
-  "references": [],
-  "includePlatforms": [],
-  "excludePlatforms": [],
-  "allowUnsafeCode": true,
-  "overrideReferences": false,
-  "precompiledReferences": ["System.Runtime.CompilerServices.Unsafe.dll"],
-  "autoReferenced": true,
-  "defineConstraints": [],
-  "versionDefines": [],
-  "noEngineReferences": false
-}
+{
+  "name": "WallstopStudios.DxMessaging",
+  "rootNamespace": "DxMessaging",
+  "references": [],
+  "includePlatforms": [],
+  "excludePlatforms": [],
+  "allowUnsafeCode": true,
+  "overrideReferences": false,
+  "precompiledReferences": [],
+  "autoReferenced": true,
+  "defineConstraints": [],
+  "versionDefines": [],
+  "noEngineReferences": false
+}

package/Runtime/WallstopStudios.DxMessaging.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 184635fd03dde55408891bd932619c81
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 184635fd03dde55408891bd932619c81
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime.meta

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

package/Samples~/DI/Prefabs/MessagingInstallerSample.prefab

@@ -1,98 +1,98 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &100000
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 400000}
-  - component: {fileID: 11400000}
-  m_Layer: 0
-  m_Name: MessagingInstallerSample
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &400000
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 100000}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 400001}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 100000}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3a28d2b5a3c74e44b922cb972782f7d1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  applyOnAwake: 1
-  includeInactive: 1
-  providerHandle:
-    providerAsset: {fileID: 11400000, guid: a4f3a0b76ff44160a7453a58aa654a3a, type: 2}
-  explicitMessageBus: {}
---- !u!1 &100001
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 400001}
-  - component: {fileID: 11400001}
-  m_Layer: 0
-  m_Name: MessagingListener
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &400001
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 100001}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 400000}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &11400001
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 100001}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 98ea04ea326660845ba49942dacbf907, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  emitMessagesWhenDisabled: 0
-  autoConfigureSerializedProviderOnAwake: 0
-  _serializedProviderHandle:
-    providerAsset: {fileID: 0}
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &100000
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 400000}
+  - component: {fileID: 11400000}
+  m_Layer: 0
+  m_Name: MessagingInstallerSample
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &400000
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100000}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 400001}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a28d2b5a3c74e44b922cb972782f7d1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  applyOnAwake: 1
+  includeInactive: 1
+  providerHandle:
+    providerAsset: {fileID: 11400000, guid: a4f3a0b76ff44160a7453a58aa654a3a, type: 2}
+  explicitMessageBus: {}
+--- !u!1 &100001
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 400001}
+  - component: {fileID: 11400001}
+  m_Layer: 0
+  m_Name: MessagingListener
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &400001
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100001}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 400000}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &11400001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 98ea04ea326660845ba49942dacbf907, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  emitMessagesWhenDisabled: 0
+  autoConfigureSerializedProviderOnAwake: 0
+  _serializedProviderHandle:
+    providerAsset: {fileID: 0}

package/Samples~/DI/Prefabs/MessagingInstallerSample.prefab.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 2d5f318e8b9a4a559ef886795bc8a1dd
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 2d5f318e8b9a4a559ef886795bc8a1dd
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Samples~/DI/Prefabs.meta

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

package/Samples~/DI/Providers/GlobalMessageBusProvider.asset

@@ -1,14 +1,14 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 689f1e1a8d9f4c34f9e3ab4e3f94ec37, type: 3}
-  m_Name: GlobalMessageBusProvider
-  m_EditorClassIdentifier: 
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 689f1e1a8d9f4c34f9e3ab4e3f94ec37, type: 3}
+  m_Name: GlobalMessageBusProvider
+  m_EditorClassIdentifier: 

package/Samples~/DI/Providers/GlobalMessageBusProvider.asset.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: a4f3a0b76ff44160a7453a58aa654a3a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: a4f3a0b76ff44160a7453a58aa654a3a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Samples~/DI/Providers/InitialGlobalMessageBusProvider.asset

@@ -1,14 +1,14 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1f3f2efbb7f4441ebde8b418d178885a, type: 3}
-  m_Name: InitialGlobalMessageBusProvider
-  m_EditorClassIdentifier: 
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1f3f2efbb7f4441ebde8b418d178885a, type: 3}
+  m_Name: InitialGlobalMessageBusProvider
+  m_EditorClassIdentifier: 

package/Samples~/DI/Providers/InitialGlobalMessageBusProvider.asset.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 9224435f740044bebddcdabe6a8ecc87
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 9224435f740044bebddcdabe6a8ecc87
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Samples~/DI/Providers.meta

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