com.wallstop-studios.dxmessaging 2.2.0 → 3.1.0

package/Runtime/Core/MessageBus/MessageBus.cs.meta

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

package/Runtime/Core/MessageBus/MessageBusRebindMode.cs.meta

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

package/Runtime/Core/MessageBus/MessageRegistrationBuilder.cs

@@ -1,9 +1,45 @@
 namespace DxMessaging.Core.MessageBus
 {
     using System;
+    using System.Runtime.ExceptionServices;
     using System.Threading;
     using DxMessaging.Core;
 
+    /// <summary>
+    /// Exception thrown when <see cref="MessageRegistrationBuildOptions.ActivateOnBuild"/> fails and
+    /// the builder cannot fully clean up the partially constructed lease before returning control.
+    /// </summary>
+    public sealed class MessageRegistrationBuildException : Exception
+    {
+        internal MessageRegistrationBuildException(
+            string message,
+            MessageRegistrationLease lease,
+            Exception activationException,
+            Exception cleanupException
+        )
+            : base(message, activationException)
+        {
+            Lease = lease ?? throw new ArgumentNullException(nameof(lease));
+            ActivationException = activationException;
+            CleanupException = cleanupException;
+        }
+
+        /// <summary>
+        /// Lease that still owns retryable token cleanup. Dispose it after resolving the cleanup failure.
+        /// </summary>
+        public MessageRegistrationLease Lease { get; }
+
+        /// <summary>
+        /// Original exception raised while activating the lease.
+        /// </summary>
+        public Exception ActivationException { get; }
+
+        /// <summary>
+        /// Exception raised while attempting to clean up the partially constructed lease.
+        /// </summary>
+        public Exception CleanupException { get; }
+    }
+
     /// <summary>
     /// Options controlling how <see cref="MessageRegistrationBuilder"/> constructs registration tokens.
     /// </summary>
@@ -144,6 +180,8 @@ namespace DxMessaging.Core.MessageBus
         private readonly MessageRegistrationLifecycle _lifecycle;
         private bool _isActive;
         private bool _disposed;
+        private bool _deactivateHookInvoked;
+        private bool _disposeHookInvoked;
 
         internal MessageRegistrationLease(
             MessageRegistrationToken token,
@@ -159,6 +197,8 @@ namespace DxMessaging.Core.MessageBus
             _lifecycle = lifecycle;
             _isActive = false;
             _disposed = false;
+            _deactivateHookInvoked = false;
+            _disposeHookInvoked = false;
         }
 
         /// <summary>
@@ -199,13 +239,27 @@ namespace DxMessaging.Core.MessageBus
             }
 
             _messageHandler.active = true;
-            _token.Enable();
-            if (_lifecycle.OnActivate != null)
+            _deactivateHookInvoked = false;
+            try
             {
-                _lifecycle.OnActivate(_token);
+                _token.Enable();
+            }
+            catch
+            {
+                _messageHandler.active = _token.Enabled;
+                _isActive = _token.Enabled;
+                throw;
             }
 
+            // _isActive is set BEFORE the user callback runs so the lease's
+            // state matches the registrations even if OnActivate throws:
+            // Deactivate()/Dispose() can then always release the live
+            // registrations (a post-callback assignment left them wedged).
             _isActive = true;
+            if (_lifecycle.OnActivate != null)
+            {
+                _lifecycle.OnActivate(_token);
+            }
         }
 
         /// <summary>
@@ -218,14 +272,43 @@ namespace DxMessaging.Core.MessageBus
                 return;
             }
 
-            if (_lifecycle.OnDeactivate != null)
+            Exception deactivateFailure = null;
+            try
+            {
+                if (!_deactivateHookInvoked && _lifecycle.OnDeactivate != null)
+                {
+                    _deactivateHookInvoked = true;
+                    _lifecycle.OnDeactivate(_token);
+                }
+            }
+            catch (Exception exception)
             {
-                _lifecycle.OnDeactivate(_token);
+                deactivateFailure = exception;
+            }
+            finally
+            {
+                try
+                {
+                    try
+                    {
+                        _token.Disable();
+                    }
+                    catch (Exception exception)
+                    {
+                        deactivateFailure ??= exception;
+                    }
+                }
+                finally
+                {
+                    _messageHandler.active = _token.Enabled;
+                    _isActive = _token.Enabled;
+                }
             }
 
-            _token.Disable();
-            _messageHandler.active = false;
-            _isActive = false;
+            if (deactivateFailure != null)
+            {
+                ExceptionDispatchInfo.Capture(deactivateFailure).Throw();
+            }
         }
 
         /// <summary>
@@ -238,13 +321,58 @@ namespace DxMessaging.Core.MessageBus
                 return;
             }
 
-            Deactivate();
-            if (_lifecycle.OnDispose != null)
+            Exception disposeFailure = null;
+            bool tokenCleanupFailed = false;
+            try
+            {
+                try
+                {
+                    Deactivate();
+                }
+                catch (Exception exception)
+                {
+                    disposeFailure = exception;
+                }
+
+                if (!_disposeHookInvoked && _lifecycle.OnDispose != null)
+                {
+                    _disposeHookInvoked = true;
+                    try
+                    {
+                        _lifecycle.OnDispose(_token);
+                    }
+                    catch (Exception exception)
+                    {
+                        disposeFailure ??= exception;
+                    }
+                }
+            }
+            finally
             {
-                _lifecycle.OnDispose(_token);
+                try
+                {
+                    try
+                    {
+                        _token.Dispose();
+                    }
+                    catch (Exception exception)
+                    {
+                        tokenCleanupFailed = true;
+                        disposeFailure ??= exception;
+                    }
+                }
+                finally
+                {
+                    _messageHandler.active = _token.Enabled;
+                    _isActive = _token.Enabled;
+                    _disposed = !tokenCleanupFailed;
+                }
             }
 
-            _disposed = true;
+            if (disposeFailure != null)
+            {
+                ExceptionDispatchInfo.Capture(disposeFailure).Throw();
+            }
         }
 
         internal void InvokeBuildHook()
@@ -305,6 +433,7 @@ namespace DxMessaging.Core.MessageBus
         /// <param name="options">Options controlling bus selection, diagnostics, and lifecycle behavior.</param>
         /// <returns>A lease that wraps the created <see cref="MessageRegistrationToken"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="options"/> is <see langword="null"/>.</exception>
+        /// <exception cref="MessageRegistrationBuildException">Thrown when ActivateOnBuild activation fails and automatic cleanup remains retryable.</exception>
         public MessageRegistrationLease Build(MessageRegistrationBuildOptions options)
         {
             if (options == null)
@@ -338,12 +467,56 @@ namespace DxMessaging.Core.MessageBus
 
             if (options.ActivateOnBuild)
             {
-                lease.Activate();
+                try
+                {
+                    lease.Activate();
+                }
+                catch (Exception exception)
+                {
+                    HandleActivateOnBuildFailure(lease, exception);
+                }
             }
 
             return lease;
         }
 
+        private static void HandleActivateOnBuildFailure(
+            MessageRegistrationLease lease,
+            Exception activationException
+        )
+        {
+            Exception cleanupException = null;
+            try
+            {
+                lease.Dispose();
+            }
+            catch (Exception exception)
+            {
+                cleanupException = exception;
+            }
+
+            if (lease.Token.Enabled)
+            {
+                throw new MessageRegistrationBuildException(
+                    "ActivateOnBuild failed and automatic lease cleanup did not complete. Dispose the Lease property after resolving the cleanup failure.",
+                    lease,
+                    activationException,
+                    cleanupException
+                );
+            }
+
+            if (cleanupException != null && MessagingDebug.enabled)
+            {
+                MessagingDebug.Log(
+                    LogLevel.Error,
+                    "ActivateOnBuild cleanup failed after activation failure: {0}",
+                    cleanupException
+                );
+            }
+
+            ExceptionDispatchInfo.Capture(activationException).Throw();
+        }
+
         private static InstanceId ResolveOwner(MessageRegistrationBuildOptions options)
         {
 #if UNITY_2021_3_OR_NEWER
@@ -359,7 +532,7 @@ namespace DxMessaging.Core.MessageBus
                     return component;
                 }
 
-                return new InstanceId(options.UnityOwner.GetInstanceID());
+                return new InstanceId(InstanceId.StableId(options.UnityOwner));
             }
 #endif
             if (options.Owner.HasValue)

package/Runtime/Core/MessageBus/MessageRegistrationBuilder.cs.meta

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

package/Runtime/Core/MessageBus/MessagingRegistration.cs.meta

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

package/Runtime/Core/MessageBus/RegistrationLog.cs.meta

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

package/Runtime/Core/MessageBus.meta

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