Fix Typo,

Some refactoring
Bump v0.0.22

Author: patrick-dmxc

ArtNetSharp/ArtNetSharp.csproj

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
-		<Version>0.0.21</Version>
+		<Version>0.0.22</Version>
 		<RepositoryUrl>https://github.com/DMXControl/ArtNetSharp</RepositoryUrl>
 		<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
 		<PackageTags>RDM; ArtNet; E1.20; E1.33; E1.37-1; E1.37-2; E1.37-7</PackageTags>

ArtNetSharp/Communication/AbstractInstance.cs

@@ -36,8 +36,8 @@ public abstract class AbstractInstance : IInstance
 
         public virtual byte MajorVersion { get; } = 1;
         public virtual byte MinorVersion { get; } = 0;
-        public virtual bool EnabelDmxOutput { get; } = true;
-        protected virtual bool EnabelSync { get; } = true;
+        public virtual bool EnableDmxOutput { get; } = true;
+        protected virtual bool EnableSync { get; } = true;
 
         public virtual ushort ESTAManufacturerCode { get; } = Constants.DEFAULT_ESTA_MANUFACTURER_CODE;
         public virtual ushort OEMProductCode { get; } = Constants.DEFAULT_OEM_CODE;
@@ -244,7 +244,7 @@ public void Dispose()
         private readonly ConcurrentDictionary<RDMUID, RDMUID_ReceivedBag> knownRDMUIDs = new ConcurrentDictionary<RDMUID, RDMUID_ReceivedBag>();
         public IReadOnlyCollection<RDMUID_ReceivedBag> KnownRDMUIDs;
         public event EventHandler<RDMUID_ReceivedBag> RDMUIDReceived;
-        public event EventHandler<RDMMessage> ResponderRDMMessageReceived;
+        public event EventHandler<ResponderRDMMessageReceivedEventArgs> ResponderRDMMessageReceived;
         public event EventHandler<ControllerRDMMessageReceivedEventArgs> ControllerRDMMessageReceived;
 
         protected AbstractInstance(ArtNet _artnet)
@@ -514,7 +514,7 @@ private async Task sendArtTimeSync(ArtTimeSync timeSync, IPv4Address? ipAddress
         #region Send ArtSync
         public async Task SendArtSync()
         {
-            if (EnabelSync)
+            if (EnableSync)
                 await sendArtSync();
         }
         private async Task sendArtSync()
@@ -556,7 +556,7 @@ private async Task sendAllArtDMX()
             const double dmxKeepAliveTime = 800; // Spec 1.4dh page 53
             while (!(this.IsDisposing || this.IsDisposed))
             {
-                if (!this.EnabelDmxOutput)
+                if (!this.EnableDmxOutput)
                     continue;
                 if (this.IsDeactivated)
                     continue;
@@ -588,7 +588,7 @@ private async Task sendAllArtDMX()
                                 }
                         }
                         catch (Exception e) { Logger.LogError(e); }
-                    if (EnabelSync && sended != 0)
+                    if (EnableSync && sended != 0)
                         await sendArtSync();
 
                 }
@@ -946,13 +946,17 @@ private async void processArtRDM(ArtRDM artRDM, IPv4Address source)
             {
                 if (!artRDM.RDMMessage.Command.HasFlag(ERDM_Command.RESPONSE))
                 {
-                    var eventArgs = new ControllerRDMMessageReceivedEventArgs(artRDM.RDMMessage);
+                    var eventArgs = new ControllerRDMMessageReceivedEventArgs(artRDM.RDMMessage, artRDM.PortAddress);
                     ControllerRDMMessageReceived?.InvokeFailSafe(this, eventArgs);
                     if (eventArgs.Handled)
                         await sendArtRDM(eventArgs.Response, artRDM.PortAddress, source);
                 }
                 else
-                    ResponderRDMMessageReceived?.InvokeFailSafe(this, artRDM.RDMMessage);
+                {
+                    var eventArgs = new ResponderRDMMessageReceivedEventArgs(artRDM.RDMMessage, artRDM.PortAddress);
+
+                    ResponderRDMMessageReceived?.InvokeFailSafe(this, eventArgs);
+                }
             }
             catch (Exception ex) { Logger.LogError(ex); }
             _ = Task.Run(async () =>

ArtNetSharp/Misc/RDMMessageReceivedEventArgs.cs

@@ -8,9 +8,11 @@ public class ControllerRDMMessageReceivedEventArgs : EventArgs
         public readonly RDMMessage Request;
         public bool Handled { get => Response != null; }
         public RDMMessage Response;
-        public ControllerRDMMessageReceivedEventArgs (RDMMessage Request)
+        public readonly PortAddress PortAddress;
+        public ControllerRDMMessageReceivedEventArgs (in RDMMessage request, in PortAddress portAddress)
         { 
-            this.Request = Request;
+            this.Request = request;
+            this.PortAddress = portAddress;
         }
         public void SetResponse (RDMMessage response)
         {
@@ -23,4 +25,14 @@ public void SetResponse (RDMMessage response)
             }
         }
     }
+    public class ResponderRDMMessageReceivedEventArgs : EventArgs
+    {
+        public readonly RDMMessage Response;
+        public readonly PortAddress PortAddress;
+        public ResponderRDMMessageReceivedEventArgs(RDMMessage response, in PortAddress portAddress)
+        {
+            this.Response = response;
+            this.PortAddress = portAddress;
+        }
+    }
 }

ArtNetTests/Mocks/RDMDeviceMock.cs

@@ -1,4 +1,5 @@
 using ArtNetSharp;
+using ArtNetSharp.Misc;
 using RDMSharp;
 
 namespace ArtNetTests.Mocks
@@ -26,13 +27,13 @@ protected override async Task SendRDMMessage(RDMMessage rdmMessage)
             await Controller.SendArtRDM(rdmMessage);
         }
 
-        private async void Controller_RDMMessageReceived(object? sender, RDMMessage e)
+        private async void Controller_RDMMessageReceived(object? sender, ResponderRDMMessageReceivedEventArgs e)
         {
 #if DEBUG
-            if (e.SourceUID.Manufacturer == RDMSharp.ParameterWrapper.EManufacturer.DMXControlProjects_eV)
+            if (e.Response.SourceUID.Manufacturer == RDMSharp.ParameterWrapper.EManufacturer.DMXControlProjects_eV)
                 return;
 #endif
-            await ReceiveRDMMessage(e);
+            await ReceiveRDMMessage(e.Response);
         }
     }
 }

ArtNetTests/ObjectTypesTests.cs

@@ -486,13 +486,15 @@ public void TestNodeStatus()
         [Test]
         public void TestControllerRDMMessageReceivedEventArgs()
         {
-            var e = new ControllerRDMMessageReceivedEventArgs(new RDMMessage() { Command = ERDM_Command.SET_COMMAND, Parameter = ERDM_Parameter.CURVE });
+            var e = new ControllerRDMMessageReceivedEventArgs(new RDMMessage() { Command = ERDM_Command.SET_COMMAND, Parameter = ERDM_Parameter.CURVE }, new PortAddress(123));
 
             Assert.That(e.Handled, Is.False);
             e.SetResponse(new RDMMessage() { Command = ERDM_Command.SET_COMMAND_RESPONSE, Parameter = ERDM_Parameter.CURVE });
             Assert.That(e.Handled, Is.True);
             e.SetResponse(new RDMMessage() { Command = ERDM_Command.SET_COMMAND_RESPONSE, Parameter = ERDM_Parameter.CURVE });
             Assert.That(e.Handled, Is.True);
+
+            Assert.That(e.PortAddress, Is.EqualTo(new PortAddress(123)));
         }
         [Test]
         [Retry(2)]