com.wallstop-studios.dxmessaging 3.0.1 → 3.2.0

package/Runtime/Core/MessageRegistrationToken.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Messages/GlobalStringMessage.cs.meta

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

package/Runtime/Core/Messages/IBroadcastMessage.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Messages/ITargetedMessage.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Messages/IUntargetedMessage.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Messages/ReflexiveMessage.cs.meta

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

package/Runtime/Core/Messages/SourcedStringMessage.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Core/Messages/StringMessage.cs.meta

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

package/Runtime/Core/MessagingDebug.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Unity/CurrentGlobalMessageBusProvider.cs.meta

@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:
 

package/Runtime/Unity/DxMessagingRuntimeInitializer.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Unity/InitialGlobalMessageBusProvider.cs.meta

@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:
 

package/Runtime/Unity/Integrations/Reflex/AssemblyInfo.cs.meta

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

package/Runtime/Unity/Integrations/Reflex/ReflexRegistrationInstaller.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Unity/Integrations/VContainer/AssemblyInfo.cs.meta

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

package/Runtime/Unity/Integrations/VContainer/VContainerRegistrationExtensions.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Unity/Integrations/Zenject/AssemblyInfo.cs.meta

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

package/Runtime/Unity/Integrations/Zenject/ZenjectRegistrationInstaller.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Unity/MessageAwareComponent.cs

@@ -19,6 +19,8 @@ namespace DxMessaging.Unity
     /// - <see cref="Awake"/> creates the token and calls <see cref="RegisterMessageHandlers"/>.
     /// - <see cref="OnEnable"/>/<see cref="OnDisable"/> enable/disable the token when
     ///   <see cref="MessageRegistrationTiedToEnableStatus"/> is true.
+    /// - <see cref="OnEnable"/> can additionally re-create a released token when
+    ///   <see cref="ReregisterOnEnableAfterRelease"/> is overridden to true.
     /// - <see cref="OnDestroy"/> disables the token and releases references.
     /// </remarks>
     /// <example>
@@ -61,6 +63,25 @@ namespace DxMessaging.Unity
         /// </summary>
         protected virtual bool MessageRegistrationTiedToEnableStatus => true;
 
+        /// <summary>
+        /// Controls whether enabling this component re-creates its registration token and replays
+        /// <see cref="RegisterMessageHandlers"/> after the token was released (for example via
+        /// <see cref="MessagingComponent.Release"/>).
+        /// </summary>
+        /// <remarks>
+        /// Default <c>false</c>: once released, the component stays unregistered across
+        /// enable/disable cycles until <see cref="MessagingComponent.Create"/> is invoked manually.
+        /// Override to return <c>true</c> to opt into automatic recovery on the next enable:
+        /// if no live token exists, a fresh one is created and <see cref="RegisterMessageHandlers"/>
+        /// replays exactly once; if a manual <see cref="MessagingComponent.Create"/> already minted
+        /// a fresh token since the release, that token is adopted as-is (the manual creator owns
+        /// staging, so nothing is replayed and nothing double-stages).
+        /// When <see cref="MessageRegistrationTiedToEnableStatus"/> is false, the recovery still
+        /// re-creates and stages but does NOT enable the new token; call
+        /// <see cref="MessageRegistrationToken.Enable"/> yourself, exactly as for the original token.
+        /// </remarks>
+        protected virtual bool ReregisterOnEnableAfterRelease => false;
+
         /// <summary>
         /// If true, registers demo handlers for <see cref="Core.Messages.StringMessage"/> and
         /// <see cref="Core.Messages.GlobalStringMessage"/>. Override and return <c>false</c> to disable.
@@ -138,9 +159,33 @@ namespace DxMessaging.Unity
 
         /// <summary>
         /// Enables the token if <see cref="MessageRegistrationTiedToEnableStatus"/> is true.
+        /// When <see cref="ReregisterOnEnableAfterRelease"/> is true and the token was released,
+        /// a fresh token is created and <see cref="RegisterMessageHandlers"/> replays first.
         /// </summary>
         protected virtual void OnEnable()
         {
+            if (
+                ReregisterOnEnableAfterRelease
+                && _messageRegistrationToken != null
+                && _messagingComponent != null
+            )
+            {
+                if (_messagingComponent.TryGetToken(this, out MessageRegistrationToken liveToken))
+                {
+                    // A manual MessagingComponent.Create(this) between the release and
+                    // this enable minted a fresh token the field does not know about;
+                    // adopt it so Token/Enable() operate on the live registration. The
+                    // manual creator owns staging in that case, so RegisterMessageHandlers
+                    // is NOT replayed here (no double-staging).
+                    _messageRegistrationToken = liveToken;
+                }
+                else
+                {
+                    _messageRegistrationToken = _messagingComponent.Create(this);
+                    RegisterMessageHandlers();
+                }
+            }
+
             if (MessageRegistrationTiedToEnableStatus)
             {
                 _messageRegistrationToken?.Enable();
@@ -159,7 +204,7 @@ namespace DxMessaging.Unity
                 Debug.LogError(
                     $"[DxMessaging] {GetType().Name} appears to be missing a base.Awake() call; "
                         + "no registration token exists, so this component will not receive messages. "
-                        + "See https://github.com/wallstop/DxMessaging/blob/master/docs/reference/analyzers.md#dxmsg006-missing-base-call",
+                        + "See https://github.com/Ambiguous-Interactive/DxMessaging/blob/master/docs/reference/analyzers.md#dxmsg006-missing-base-call",
                     this
                 );
             }

package/Runtime/Unity/MessageAwareComponent.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Unity/MessageBusProviderHandle.cs.meta

@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  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

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Runtime/Unity/MessagingComponentInstaller.cs.meta

@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:
 

package/Runtime/Unity/ScriptableMessageBusProvider.cs.meta

@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:
 

package/Runtime/WallstopStudios.DxMessaging.asmdef

@@ -6,7 +6,7 @@
   "excludePlatforms": [],
   "allowUnsafeCode": true,
   "overrideReferences": false,
-  "precompiledReferences": ["System.Runtime.CompilerServices.Unsafe.dll"],
+  "precompiledReferences": [],
   "autoReferenced": true,
   "defineConstraints": [],
   "versionDefines": [],

package/Samples~/DI/README.md

@@ -31,15 +31,15 @@ Each sample shows:
 1. **Place the prefab**  
    Drag `Prefabs/MessagingInstallerSample.prefab` into your test scene. The root object carries `MessagingComponentInstaller` with its provider handle already pointing at the global provider ScriptableObject.
 
-1. **Hook up the container**  
-   - **Zenject**:  
-     - Add `DxMessagingRegistrationInstaller` (from [Runtime/Unity/Integrations](../../Runtime/Unity/Integrations/)) to your ProjectContext or scene installer list.  
+1. **Hook up the container**
+   - **Zenject**:
+     - Add `DxMessagingRegistrationInstaller` (from [Runtime/Unity/Integrations](../../Runtime/Unity/Integrations/)) to your ProjectContext or scene installer list.
      - Drop [SampleInstaller.cs](./Zenject/SampleInstaller.cs) into your project and register it alongside other installers. When the scene runs, the installer resolves `IMessageRegistrationBuilder`, stages a `PlayerSpawned` listener, and activates via the Zenject lifecycle.
-   - **VContainer**:  
-     - Define `VCONTAINER_PRESENT` and reference the optional extension under [VContainerRegistrationExtensions.cs](../../Runtime/Unity/Integrations/VContainerRegistrationExtensions.cs).  
+   - **VContainer**:
+     - Define `VCONTAINER_PRESENT` and reference the optional extension under [VContainerRegistrationExtensions.cs](../../Runtime/Unity/Integrations/VContainer/VContainerRegistrationExtensions.cs).
      - Add [SampleLifetimeScope.cs](./VContainer/SampleLifetimeScope.cs) to the scene (or derive from it); the sample scope registers the builder and an entry point that emits/consumes `ScoreUpdated` messages each tick.
-   - **Reflex**:  
-     - Enable `REFLEX_PRESENT` and install `DxMessagingRegistrationInstaller` into your container bootstrap.  
+   - **Reflex**:
+     - Enable `REFLEX_PRESENT` and install `DxMessagingRegistrationInstaller` into your container bootstrap.
      - Include [SampleInstaller.cs](./Reflex/SampleInstaller.cs) in your installer chain. The sample service resolves `IMessageRegistrationBuilder`, subscribes to `PlayerAlert`, and can emit alerts via `EmitAlertFor`.
 
 1. **Emit a message**  

package/Samples~/DI/Reflex/SampleInstaller.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/DI/VContainer/SampleLifetimeScope.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/DI/Zenject/SampleInstaller.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/Mini Combat/Boot.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/Mini Combat/Enemy.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/Mini Combat/Messages.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/Mini Combat/Player.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/Mini Combat/UIOverlay.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/UI Buttons + Inspector/DiagnosticsEnabler.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/UI Buttons + Inspector/Messages.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/UI Buttons + Inspector/MessagingObserver.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/Samples~/UI Buttons + Inspector/UIButtonEmitter.cs.meta

@@ -6,6 +6,6 @@ MonoImporter:
   defaultReferences: []
   executionOrder: 0
   icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant: