Merge pull request #212 from Identity-One-LLC/feature/delegation-support

Add event for receiving all OSDP replies and support queuing commands without awaiting responses

Author: bytedreamer

src/OSDP.Net/ControlPanel.cs

@@ -187,11 +187,27 @@ public async Task SendCustomCommand(Guid connectionId, byte address, CommandData
             await SendCommand(connectionId, address, command).ConfigureAwait(false);
         }
 
-        /// <summary>Request to get an ID Report from the PD.</summary>
-        /// <param name="connectionId">Identify the connection for communicating to the device.</param>
-        /// <param name="address">Address assigned to the device.</param>
-        /// <returns>ID report reply data that was requested.</returns>
-        public async Task<DeviceIdentification> IdReport(Guid connectionId, byte address) => 
+		/// <summary>
+		/// Enqueue a custom command to be sent without waiting for a response.
+		/// </summary>
+		/// <param name="connectionId">Identify the connection for communicating to the device.</param>
+		/// <param name="address">Address assigned to the device.</param>
+		/// <param name="command">The custom command to send.</param>
+		public void EnqueueCustomCommand(Guid connectionId, byte address, CommandData command)
+		{
+			if (!_buses.TryGetValue(connectionId, out var bus))
+			{
+				throw new ArgumentException("Connection could not be found", nameof(connectionId));
+			}
+
+			bus.SendCommand(address, command);
+		}
+
+		/// <summary>Request to get an ID Report from the PD.</summary>
+		/// <param name="connectionId">Identify the connection for communicating to the device.</param>
+		/// <param name="address">Address assigned to the device.</param>
+		/// <returns>ID report reply data that was requested.</returns>
+		public async Task<DeviceIdentification> IdReport(Guid connectionId, byte address) => 
             await IdReport(connectionId, address, CancellationToken.None).ConfigureAwait(false);
 
         /// <summary>Request to get an ID Report from the PD.</summary>
@@ -1447,8 +1463,9 @@ private void OnConnectionStatusChanged(Guid connectionId, byte address, bool isC
         private void OnReplyReceived(ReplyTracker reply)
         {
             ReplyReceived?.Invoke(this, new ReplyEventArgs { Reply = reply });
+			RawReplyReceived?.Invoke(this, new RawReplyEventArgs(reply.ConnectionId, reply.ReplyMessage.Address, reply.ReplyMessage.Type, reply.ReplyMessage.Payload));
 
-            switch ((ReplyType)reply.ReplyMessage.Type)
+			switch ((ReplyType)reply.ReplyMessage.Type)
             {
                 case ReplyType.Nak:
                     NakReplyReceived?.Invoke(this,
@@ -1530,10 +1547,15 @@ private void OnReplyReceived(ReplyTracker reply)
 
         private event EventHandler<ReplyEventArgs> ReplyReceived;
 
-        /// <summary>
-        /// Occurs when connection status changed.
-        /// </summary>
-        public event EventHandler<ConnectionStatusEventArgs> ConnectionStatusChanged;
+		/// <summary>
+		/// Occurs when any reply is received
+		/// </summary>
+		public event EventHandler<RawReplyEventArgs> RawReplyReceived;
+
+		/// <summary>
+		/// Occurs when connection status changed.
+		/// </summary>
+		public event EventHandler<ConnectionStatusEventArgs> ConnectionStatusChanged;
 
         /// <summary>
         /// Occurs when a negative reply is received.
@@ -2152,7 +2174,48 @@ internal FileTransferException(string msg, FileTransferStatus status) : base(msg
             public FileTransferStatus Status { get; }
         }
 
-        private class ReplyEventArgs : EventArgs
+		/// <summary>
+		/// A reply has been received.
+		/// </summary>
+		public class RawReplyEventArgs : EventArgs
+		{
+			/// <summary>
+			/// Initializes a new instance of the <see cref="RawReplyEventArgs"/> class.
+			/// </summary>
+			/// <param name="connectionId">Identify the connection for communicating to the device.</param>
+			/// <param name="address">Address assigned to the device.</param>
+			/// <param name="command">The reply code of the message.</param>
+			/// <param name="payload">The raw reply payload.</param>
+			public RawReplyEventArgs(Guid connectionId, byte address, byte command, byte[] payload)
+			{
+				ConnectionId = connectionId;
+				Address = address;
+				Command = command;
+				Payload = payload;
+			}
+
+			/// <summary>
+			/// Identify the connection for communicating to the device.
+			/// </summary>
+			public Guid ConnectionId { get; }
+
+			/// <summary>
+			/// Address assigned to the device.
+			/// </summary>
+			public byte Address { get; }
+
+			/// <summary>
+			/// The reply code of the message.
+			/// </summary>
+			public byte Command { get; }
+
+			/// <summary>
+			/// The raw reply payload.
+			/// </summary>
+			public byte[] Payload { get; }
+		}
+
+		private class ReplyEventArgs : EventArgs
         {
             public ReplyTracker Reply { get; set; }
         }