com.wallstop-studios.dxmessaging 2.0.0-rc16 → 2.0.0-rc18

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

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 8c1cadaf86b083c49aac429e53fa3008
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9e450a3f92f4be74da41959260563827
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/SetupCscRsp.cs

@@ -35,10 +35,13 @@ namespace DxMessaging.Editor
             "Microsoft.CodeAnalysis.dll",
             "Microsoft.CodeAnalysis.CSharp.dll",
             "System.Reflection.Metadata.dll",
+            "System.Runtime.CompilerServices.Unsafe.dll",
         };
 
         private static readonly string LibraryArgument = $"-a:\"{LibraryPathRelative}\"";
 
+        private static readonly HashSet<string> DllNames = new(StringComparer.OrdinalIgnoreCase);
+
         static SetupCscRsp()
         {
             EditorApplication.delayCall += EnsureDLLsExistInAssets;
@@ -47,19 +50,27 @@ namespace DxMessaging.Editor
 
         private static void EnsureDLLsExistInAssets()
         {
-            HashSet<string> dllNames = new();
+            DllNames.Clear();
             foreach (
                 string dllGuid in AssetDatabase.FindAssets("t:DefaultAsset", new[] { "Assets" })
             )
             {
                 string dllPath = AssetDatabase.GUIDToAssetPath(dllGuid);
-                if (!dllPath.EndsWith(".dll"))
+                if (!dllPath.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
                 {
                     continue;
                 }
 
-                string dllName = Path.GetFileName(dllPath);
-                dllNames.Add(dllName);
+                if (
+                    !dllPath.Contains(
+                        "Assets/Plugins/WallstopStudios.DxMessaging",
+                        StringComparison.OrdinalIgnoreCase
+                    )
+                )
+                {
+                    string dllName = Path.GetFileName(dllPath);
+                    DllNames.Add(dllName);
+                }
             }
 
             string[] dllRelativeDirectories = { LibraryPathRelative, AnalyzerPathRelative };
@@ -67,7 +78,7 @@ namespace DxMessaging.Editor
             bool anyFound = false;
             foreach (
                 string requiredDllName in RequiredDllNames.Where(dllName =>
-                    !dllNames.Contains(dllName)
+                    !DllNames.Contains(dllName)
                 )
             )
             {
@@ -85,13 +96,31 @@ namespace DxMessaging.Editor
                         const string pluginsDirectory =
                             "Assets/Plugins/WallstopStudios.DxMessaging/";
                         string outputAsset = $"{pluginsDirectory}{requiredDllName}";
+                        string sourceAsset = $"{relativeDirectory}{requiredDllName}";
                         Directory.CreateDirectory(pluginsDirectory);
                         if (!File.Exists(outputAsset))
                         {
-                            File.Copy($"{relativeDirectory}{requiredDllName}", outputAsset);
+                            File.Copy(sourceAsset, outputAsset);
                             AssetDatabase.ImportAsset(outputAsset);
                             found = true;
                         }
+                        else
+                        {
+                            FileInfo sourceInfo = new(sourceAsset);
+                            FileInfo destInfo = new(outputAsset);
+
+                            if (destInfo.LastWriteTime < sourceInfo.LastWriteTime)
+                            {
+                                // Source file is newer, so copy the file (overwrite destination)
+                                File.Copy(sourceAsset, outputAsset, true);
+                                AssetDatabase.ImportAsset(outputAsset);
+                                found = true;
+                            }
+                            else
+                            {
+                                continue;
+                            }
+                        }
 
                         if (requiredDllName == SourceGeneratorDllName)
                         {
@@ -120,10 +149,6 @@ namespace DxMessaging.Editor
                 }
 
                 anyFound |= found;
-                Debug.Log(
-                    $"Missing required dll '{requiredDllName}', "
-                        + $"{(found ? "creation successful." : "WARNING! Manual creation required.")}"
-                );
             }
 
             if (anyFound)
@@ -143,12 +168,12 @@ namespace DxMessaging.Editor
                 }
 
                 string rspContent = File.ReadAllText(RspFilePath);
-                if (rspContent.Contains(LibraryArgument))
+                if (rspContent.Contains(LibraryArgument, StringComparison.OrdinalIgnoreCase))
                 {
                     return;
                 }
 
-                File.AppendAllText(RspFilePath, $"{LibraryArgument}\n");
+                File.AppendAllText(RspFilePath, $"{LibraryArgument}{Environment.NewLine}");
                 AssetDatabase.ImportAsset("csc.rsp");
                 Debug.Log("Updated csc.rsp.");
             }

package/README.md

@@ -26,26 +26,23 @@ Check out the latest [Releases](https://github.com/wallstop/DxMessaging/releases
 4. Add an entry for a new "Scoped Registry"
     - Name: `NPM`
     - URL: `https://registry.npmjs.org`
-    - Scope(s): `com.wallstop-studios.dxmessaging` *and* `com.wallstop-studios.unity-helpers`
+    - Scope(s): `com.wallstop-studios.dxmessaging`
 5. Resolve the latest `DxMessaging`
 
 ## From Source
 Grab a copy of this repo (either `git clone` both [this repo](https://github.com/wallstop/DxMessaging) *and* [Unity Helpers](https://github.com/wallstop/unity-helpers) or [download a zip of the source](https://github.com/wallstop/DxMessaging/archive/refs/heads/master.zip) and [Unity Helper's source](https://github.com/wallstop/unity-helpers/archive/refs/heads/main.zip)) and copy the contents to your project's `Assets` folder.
 
-# Dependencies
-This project has a dependency on my [`Unity Helpers`](https://github.com/wallstop/unity-helpers) project, which contains the `System.Runtime.CompilerServices.Unsafe.dll`, which is used for some speed hacks in DxMessaging directly. Unity Helpers bundles a few (small) dependencies, including protobuf. If you don't want these dependencies, or if they conflict in some way, you can either include a copy of the `System.Runtime.CompilerServices.Unsafe.dll` yourself without relying on UnityHelpers, or manually download and include the Unity Helpers project and delete anything that conflicts with your project. Or, manually download this project without UnityHelpers. The choice is yours.
-
 # Benchmarks
-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).
+DxMessaging is currently roughly on-par with than Unity's built in messaging solution (when running in Unity). [Source](./Tests/Runtime/Benchmarks/PerformanceTests.cs). However, it is allocation-free and can be used in hot paths.
 
 | Message Tech | Operations / Second | Allocations? |
 | ------------ | ------------------- | ------------ | 
-| Unity | 2,287,562 | Yes |
-| DxMessaging (GameObject) - Normal | 1,198,797 | No |
-| DxMessaging (Component) - Normal | 1,198,796 | No |
-| DxMessaging (GameObject) - No-Copy | 1,137,634 | No |
-| DxMessaging (Component) - No-Copy | 1,225,105 | No |
-| DxMessaging (Untargeted) - No-Copy | 1,681,407 | No |
+| Unity | 2,621,200 | Yes |
+| DxMessaging (GameObject) - Normal | 2,048,600 | No |
+| DxMessaging (Component) - Normal | 2,054,600 | No |
+| DxMessaging (GameObject) - No-Copy | 2,137,800 | No |
+| DxMessaging (Component) - No-Copy | 2,136,400 | No |
+| DxMessaging (Untargeted) - No-Copy | 3,028,400 | No |
 
 # Functionality
 While not as fast, DxMessaging offers *additional functionality* as compared to Unity's messaging solution.
@@ -121,16 +118,6 @@ public partial struct SimpleUntargetedMessage // No longer needed : IUntargetedM
 }
 ```
 
-Or, if you already have messages, you can leave the interface implementations as-is and get a no-boxing implementation with the `DxAutoMessageType` attribute. `partial` is still required.
-
-To use:
-```csharp
-[DxAutoMessageType]
-public partial struct SimpleTargetedMessage : ITargetedMessage<SimpleTargetedMessage>
-{
-}
-```
-
 ## Integration
 See the [tests](./Tests/Runtime/Scripts/) directory for examples about how to integrate with the MessageAwareComponent. But, for some starters:
 ```csharp

package/Runtime/Core/Attributes/DxBroadcastMessageAttribute.cs

@@ -2,6 +2,10 @@
 {
     using System;
 
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+    [AttributeUsage(
+        AttributeTargets.Class | AttributeTargets.Struct,
+        Inherited = false,
+        AllowMultiple = false
+    )]
     public sealed class DxBroadcastMessageAttribute : Attribute { }
 }

package/Runtime/Core/Attributes/DxTargetedMessageAttribute.cs

@@ -2,6 +2,10 @@
 {
     using System;
 
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+    [AttributeUsage(
+        AttributeTargets.Class | AttributeTargets.Struct,
+        Inherited = false,
+        AllowMultiple = false
+    )]
     public sealed class DxTargetedMessageAttribute : Attribute { }
 }

package/Runtime/Core/Attributes/DxUntargetedMessageAttribute.cs

@@ -2,6 +2,10 @@
 {
     using System;
 
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+    [AttributeUsage(
+        AttributeTargets.Class | AttributeTargets.Struct,
+        Inherited = false,
+        AllowMultiple = false
+    )]
     public sealed class DxUntargetedMessageAttribute : Attribute { }
 }

package/Runtime/Core/IMessage.cs

@@ -8,5 +8,18 @@
     public interface IMessage
     {
         Type MessageType => GetType();
+
+        /// <summary>
+        /// Gets the optimized, unique integer ID for this message type, if available.
+        /// Returns null if this type uses the fallback mechanism (e.g., due to a compile-time
+        /// hash collision or manual implementation without an assigned ID).
+        /// </summary>
+        /// <remarks>
+        /// The ID is generated at compile-time for attributed types and is stable
+        /// across builds assuming the type's fully qualified name does not change.
+        /// It facilitates faster dictionary lookups compared to using System.Type directly.
+        /// Check for HasValue before using the Value.
+        /// </remarks>
+        int? OptimizedMessageId => null;
     }
 }

package/Runtime/Core/InstanceId.cs

@@ -46,22 +46,12 @@
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static implicit operator InstanceId(UnityEngine.GameObject gameObject)
         {
-            if (gameObject == null)
-            {
-                throw new ArgumentNullException(nameof(gameObject));
-            }
-
             return new InstanceId(gameObject);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static implicit operator InstanceId(UnityEngine.Component component)
         {
-            if (component == null)
-            {
-                throw new ArgumentNullException(nameof(component));
-            }
-
             return new InstanceId(component);
         }
 #endif
@@ -98,37 +88,37 @@
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator ==(InstanceId lhs, InstanceId rhs)
         {
-            return lhs.Equals(rhs);
+            return lhs._id == rhs._id;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator !=(InstanceId lhs, InstanceId rhs)
         {
-            return !lhs.Equals(rhs);
+            return lhs._id != rhs._id;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator <(InstanceId lhs, InstanceId rhs)
         {
-            return lhs.CompareTo(rhs) < 0;
+            return lhs._id.CompareTo(rhs._id) < 0;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator <=(InstanceId lhs, InstanceId rhs)
         {
-            return lhs.CompareTo(rhs) <= 0;
+            return lhs._id.CompareTo(rhs._id) <= 0;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator >(InstanceId lhs, InstanceId rhs)
         {
-            return lhs.CompareTo(rhs) > 0;
+            return lhs._id.CompareTo(rhs._id) > 0;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator >=(InstanceId lhs, InstanceId rhs)
         {
-            return lhs.CompareTo(rhs) >= 0;
+            return lhs._id.CompareTo(rhs._id) >= 0;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]