com.wallstop-studios.dxmessaging 3.0.1 → 3.1.0

package/Editor/Analyzers/System.Runtime.CompilerServices.Unsafe.dll.meta

@@ -16,21 +16,21 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        Exclude Editor: 0
+        Exclude Editor: 1
         Exclude Linux64: 1
         Exclude OSXUniversal: 1
         Exclude WebGL: 1
         Exclude Win: 1
         Exclude Win64: 1
   - first:
-      Any: 
+      Any:
     second:
       enabled: 0
       settings: {}
   - first:
       Editor: Editor
     second:
-      enabled: 1
+      enabled: 0
       settings:
         DefaultValueInitialized: true
   - first:

package/Editor/Analyzers/WallstopStudios.DxMessaging.Analyzer.dll.meta

@@ -1,5 +1,7 @@
 fileFormatVersion: 2
 guid: e02b032423e347e9a1ae26bb48fdc978
+labels:
+- RoslynAnalyzer
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -12,14 +14,25 @@ PluginImporter:
   validateReferences: 1
   platformData:
   - first:
-      Any: 
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude WebGL: 1
+        Exclude Win: 1
+        Exclude Win64: 1
+  - first:
+      Any:
     second:
       enabled: 0
       settings: {}
   - first:
       Editor: Editor
     second:
-      enabled: 1
+      enabled: 0
       settings:
         DefaultValueInitialized: true
   - first:

package/Editor/Analyzers/WallstopStudios.DxMessaging.SourceGenerators.dll.meta

@@ -18,7 +18,7 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        Exclude Editor: 0
+        Exclude Editor: 1
         Exclude Linux64: 1
         Exclude OSXUniversal: 1
         Exclude WebGL: 1
@@ -32,7 +32,7 @@ PluginImporter:
   - first:
       Editor: Editor
     second:
-      enabled: 1
+      enabled: 0
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true

package/Editor/AssemblyInfo.cs.meta

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

package/Editor/CustomEditors/MessageAwareComponentInspectorOverlay.cs

@@ -76,8 +76,9 @@ namespace DxMessaging.Editor.CustomEditors
             }
             catch (System.Exception ex)
             {
-                Debug.LogWarning(
-                    $"[DxMessaging] Failed to repaint inspectors after analyzer report update: {ex.Message}"
+                DxMessagingEditorLog.LogWarning(
+                    "Failed to repaint inspectors after analyzer report update.",
+                    ex
                 );
             }
         }
@@ -130,7 +131,7 @@ namespace DxMessaging.Editor.CustomEditors
             {
                 return;
             }
-            int instanceId = messageAwareComponent.GetInstanceID();
+            int instanceId = DxMessaging.Core.InstanceId.StableId(messageAwareComponent);
             if (!_renderedThisRepaint.Add(instanceId))
             {
                 return;
@@ -183,9 +184,7 @@ namespace DxMessaging.Editor.CustomEditors
             }
             catch (System.Exception ex)
             {
-                Debug.LogWarning(
-                    $"[DxMessaging] Inspector overlay could not load settings: {ex.Message}"
-                );
+                DxMessagingEditorLog.LogWarning("Inspector overlay could not load settings.", ex);
                 return false;
             }
 
@@ -369,7 +368,7 @@ namespace DxMessaging.Editor.CustomEditors
             }
             catch (System.Exception ex)
             {
-                Debug.LogWarning($"[DxMessaging] Failed to open script: {ex.Message}");
+                DxMessagingEditorLog.LogWarning("Failed to open script.", ex);
             }
         }
 
@@ -381,19 +380,24 @@ namespace DxMessaging.Editor.CustomEditors
             // frame, corrupting Unity's per-window layout cache. delayCall fires AFTER the
             // current GUI cycle, so the next frame's Layout pass sees the new state and
             // both passes emit consistent control counts.
-            EditorApplication.delayCall += () =>
+            DxMessagingEditorIdle.ScheduleAssetDatabaseMutation(() =>
             {
+                if (settings == null)
+                {
+                    return;
+                }
                 try
                 {
                     settings.AddIgnoredType(fullName);
                 }
                 catch (System.Exception ex)
                 {
-                    Debug.LogWarning(
-                        $"[DxMessaging] Failed to add ignored type '{fullName}': {ex.Message}"
+                    DxMessagingEditorLog.LogWarning(
+                        $"Failed to add ignored type '{fullName}'.",
+                        ex
                     );
                 }
-            };
+            });
         }
 
         private static void TryRemoveIgnoredType(DxMessagingSettings settings, string fullName)
@@ -401,19 +405,24 @@ namespace DxMessaging.Editor.CustomEditors
             // Same reasoning as TryAddIgnoredType: defer mutation past the current GUI cycle so
             // the overlay's shape gating remains identical on Layout and Repaint passes of THIS
             // frame. The next frame's Layout pass observes the new state; both passes agree.
-            EditorApplication.delayCall += () =>
+            DxMessagingEditorIdle.ScheduleAssetDatabaseMutation(() =>
             {
+                if (settings == null)
+                {
+                    return;
+                }
                 try
                 {
                     settings.RemoveIgnoredType(fullName);
                 }
                 catch (System.Exception ex)
                 {
-                    Debug.LogWarning(
-                        $"[DxMessaging] Failed to remove ignored type '{fullName}': {ex.Message}"
+                    DxMessagingEditorLog.LogWarning(
+                        $"Failed to remove ignored type '{fullName}'.",
+                        ex
                     );
                 }
-            };
+            });
         }
     }
 #endif

package/Editor/CustomEditors/MessagingComponentEditor.cs.meta

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

package/Editor/DxMessagingEditorIdle.cs

@@ -0,0 +1,62 @@
+namespace DxMessaging.Editor
+{
+#if UNITY_EDITOR
+    using System;
+    using UnityEditor;
+
+    /// <summary>
+    /// Shared guard for editor callbacks that mutate Unity's AssetDatabase.
+    /// </summary>
+    internal static class DxMessagingEditorIdle
+    {
+        internal static bool CanMutateAssetDatabase()
+        {
+            return !EditorApplication.isUpdating && !EditorApplication.isCompiling;
+        }
+
+        internal static void ScheduleAssetDatabaseMutation(Action work)
+        {
+            ScheduleAssetDatabaseMutation(work, ScheduleDelayCall, CanMutateAssetDatabase);
+        }
+
+        internal static void ScheduleAssetDatabaseMutation(
+            Action work,
+            Action<Action> scheduler,
+            Func<bool> canMutateAssetDatabase
+        )
+        {
+            if (work == null)
+            {
+                return;
+            }
+
+            Action<Action> effectiveScheduler = scheduler ?? ScheduleDelayCall;
+            Func<bool> effectiveCanMutate = canMutateAssetDatabase ?? CanMutateAssetDatabase;
+
+            effectiveScheduler(() =>
+                RunAssetDatabaseMutationWhenIdle(work, effectiveScheduler, effectiveCanMutate)
+            );
+        }
+
+        private static void RunAssetDatabaseMutationWhenIdle(
+            Action work,
+            Action<Action> scheduler,
+            Func<bool> canMutateAssetDatabase
+        )
+        {
+            if (!canMutateAssetDatabase())
+            {
+                ScheduleAssetDatabaseMutation(work, scheduler, canMutateAssetDatabase);
+                return;
+            }
+
+            work();
+        }
+
+        private static void ScheduleDelayCall(Action work)
+        {
+            EditorApplication.delayCall += () => work();
+        }
+    }
+#endif
+}

package/{Runtime/Core/Internal/TypedDispatchLinkIndex.cs.meta → Editor/DxMessagingEditorIdle.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 031ffa9bfbf249728da382bb9e03b017
+guid: 6f73f10f1fd14bb6bc417bc2e23f425d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Editor/DxMessagingEditorInitializer.cs

@@ -1,6 +1,7 @@
 namespace DxMessaging.Editor
 {
 #if UNITY_EDITOR
+    using System;
     using Core;
     using Core.MessageBus;
     using Settings;
@@ -13,13 +14,30 @@ namespace DxMessaging.Editor
     [InitializeOnLoad]
     public static class DxMessagingEditorInitializer
     {
+        internal const string DomainReloadWarningMessage =
+            "[DxMessaging] Enter Play Mode Options are disabling domain reload. "
+            + "DxMessaging resets its internal statics, but third-party static state will persist. "
+            + "Audit integration code or re-enable domain reload if inconsistent behaviour occurs.";
+
         private static bool s_playModeWarningIssued;
+        private static bool s_ensureSettingsAssetScheduled;
+
+        internal static Action StaticStateResetter { get; set; } = DxMessagingStaticState.Reset;
+        internal static Func<DxMessagingSettings> PassiveSettingsLoader { get; set; } =
+            DxMessagingSettings.LoadSettingsPassive;
+        internal static Func<DxMessagingSettings> SettingsAssetEnsurer { get; set; } =
+            DxMessagingSettings.GetOrCreateSettings;
+        internal static Action<Action> AssetDatabaseMutationScheduler { get; set; } =
+            DxMessagingEditorIdle.ScheduleAssetDatabaseMutation;
+        internal static Func<bool> DomainReloadDisabledDetector { get; set; } =
+            IsDomainReloadDisabled;
+        internal static Action<string> DomainReloadWarningLogger { get; set; } =
+            message => Debug.LogWarning(message);
 
         static DxMessagingEditorInitializer()
         {
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
             ApplyEditorSettings();
-            WarnIfDomainReloadDisabled();
         }
 
         private static void OnPlayModeStateChanged(PlayModeStateChange stateChange)
@@ -30,7 +48,6 @@ namespace DxMessaging.Editor
             )
             {
                 ApplyEditorSettings();
-                WarnIfDomainReloadDisabled();
             }
         }
 
@@ -45,34 +62,114 @@ namespace DxMessaging.Editor
             ApplyEditorSettings();
         }
 
-        private static void ApplyEditorSettings()
+        internal static void ApplyEditorSettings()
+        {
+            (StaticStateResetter ?? DxMessagingStaticState.Reset)();
+
+            // Issue #210: ApplyEditorSettings is reachable from the [InitializeOnLoad] static
+            // constructor during the domain-load asset-import window, where a synchronous
+            // AssetDatabase mutation -- the CreateAsset/SaveAssets/legacy-migration inside
+            // GetOrCreateSettings -- can re-enter the importer and hard-crash the native editor
+            // (GuidReservations::Reserve abort on Unity 6000.4+). Read current values via a
+            // mutation-free passive load now; ensure the asset exists/migrates on the next editor
+            // tick, off the import window.
+            Func<DxMessagingSettings> passiveSettingsLoader =
+                PassiveSettingsLoader ?? DxMessagingSettings.LoadSettingsPassive;
+            ApplySettingsAndDiagnostics(passiveSettingsLoader());
+            ScheduleEnsureSettingsAsset();
+        }
+
+        private static void ScheduleEnsureSettingsAsset()
+        {
+            // Debounce: ApplyEditorSettings runs from the cctor and on every play-mode transition,
+            // so coalesce to a single pending callback (mirrors the harvester's _rescanScheduled
+            // latch) instead of stacking redundant delayCall registrations.
+            if (s_ensureSettingsAssetScheduled)
+            {
+                return;
+            }
+            s_ensureSettingsAssetScheduled = true;
+            Action<Action> scheduler =
+                AssetDatabaseMutationScheduler
+                ?? DxMessagingEditorIdle.ScheduleAssetDatabaseMutation;
+            scheduler(EnsureSettingsAssetThenApplyGlobals);
+        }
+
+        private static void EnsureSettingsAssetThenApplyGlobals()
         {
-            DxMessagingStaticState.Reset();
-            DxMessagingSettings settings = DxMessagingSettings.GetOrCreateSettings();
+            // Clear the latch BEFORE the work so a throw still leaves the next ApplyEditorSettings
+            // free to reschedule (self-healing). GetOrCreateSettings touches the AssetDatabase, so
+            // this callback must only be scheduled through DxMessagingEditorIdle's idle gate. Guard
+            // defensively rather than letting an exception escape this editor callback.
+            s_ensureSettingsAssetScheduled = false;
+            try
+            {
+                Func<DxMessagingSettings> settingsAssetEnsurer =
+                    SettingsAssetEnsurer ?? DxMessagingSettings.GetOrCreateSettings;
+                ApplySettingsAndDiagnostics(settingsAssetEnsurer());
+            }
+            catch (Exception ex)
+            {
+                DxMessagingEditorLog.LogWarning(
+                    "Deferred settings initialization failed; will retry on the next editor settings refresh.",
+                    ex
+                );
+            }
+        }
+
+        private static void ApplySettingsAndDiagnostics(DxMessagingSettings settings)
+        {
+            ApplyGlobals(settings);
+            WarnIfDomainReloadDisabled(settings);
+        }
+
+        private static void ApplyGlobals(DxMessagingSettings settings)
+        {
+            if (settings == null)
+            {
+                return;
+            }
             IMessageBus.GlobalDiagnosticsTargets = settings.DiagnosticsTargets;
             IMessageBus.GlobalMessageBufferSize = settings.MessageBufferSize;
         }
 
-        private static void WarnIfDomainReloadDisabled()
+        internal static void ResetTestSeams()
+        {
+            s_playModeWarningIssued = false;
+            s_ensureSettingsAssetScheduled = false;
+            StaticStateResetter = DxMessagingStaticState.Reset;
+            PassiveSettingsLoader = DxMessagingSettings.LoadSettingsPassive;
+            SettingsAssetEnsurer = DxMessagingSettings.GetOrCreateSettings;
+            AssetDatabaseMutationScheduler = DxMessagingEditorIdle.ScheduleAssetDatabaseMutation;
+            DomainReloadDisabledDetector = IsDomainReloadDisabled;
+            DomainReloadWarningLogger = message => Debug.LogWarning(message);
+        }
+
+        private static void WarnIfDomainReloadDisabled(DxMessagingSettings settings)
         {
-            DxMessagingSettings settings = DxMessagingSettings.GetOrCreateSettings();
+            // Missing settings cannot be created from the domain-load passive path. The deferred
+            // ensure callback re-enters this method with the realized asset, so an initial null
+            // never permanently suppresses an explicitly unsuppressed settings asset.
             if (
                 s_playModeWarningIssued
+                || settings == null
                 || settings.SuppressDomainReloadWarning
-                || !EditorSettings.enterPlayModeOptionsEnabled
-                || (EditorSettings.enterPlayModeOptions & EnterPlayModeOptions.DisableDomainReload)
-                    == 0
+                || !(DomainReloadDisabledDetector ?? IsDomainReloadDisabled)()
             )
             {
                 return;
             }
 
             s_playModeWarningIssued = true;
-            Debug.LogWarning(
-                "[DxMessaging] Enter Play Mode Options are disabling domain reload. "
-                    + "DxMessaging resets its internal statics, but third-party static state will persist. "
-                    + "Audit integration code or re-enable domain reload if inconsistent behaviour occurs."
-            );
+            Action<string> warningLogger = DomainReloadWarningLogger ?? Debug.LogWarning;
+            warningLogger(DomainReloadWarningMessage);
+        }
+
+        private static bool IsDomainReloadDisabled()
+        {
+            return EditorSettings.enterPlayModeOptionsEnabled
+                && (EditorSettings.enterPlayModeOptions & EnterPlayModeOptions.DisableDomainReload)
+                    != 0;
         }
     }
 #endif

package/Editor/DxMessagingEditorInitializer.cs.meta

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

package/Editor/DxMessagingEditorLog.cs

@@ -0,0 +1,32 @@
+namespace DxMessaging.Editor
+{
+#if UNITY_EDITOR
+    using System;
+    using UnityEngine;
+
+    internal static class DxMessagingEditorLog
+    {
+        internal static void LogWarning(string message, Exception exception)
+        {
+            if (exception == null)
+            {
+                Debug.LogWarning($"[DxMessaging] {message}");
+                return;
+            }
+
+            Debug.LogWarning($"[DxMessaging] {message}{Environment.NewLine}{exception}");
+        }
+
+        internal static void LogError(string message, Exception exception)
+        {
+            if (exception == null)
+            {
+                Debug.LogError($"[DxMessaging] {message}");
+                return;
+            }
+
+            Debug.LogError($"[DxMessaging] {message}{Environment.NewLine}{exception}");
+        }
+    }
+#endif
+}

package/Editor/DxMessagingEditorLog.cs.meta

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