More refactorings

OpenChargingCloud · Jul 27, 2024 · 2514348 · 2514348
1 parent 069dd69
commit 2514348
Show file tree

Hide file tree

Showing 32 changed files with 1,598 additions and 966 deletions.
diff --git a/WWCP_OCPPv2.1/Extensions/BinaryStreamsExtensions/Messages/BinaryDataTransferRequest.cs b/WWCP_OCPPv2.1/Extensions/BinaryStreamsExtensions/Messages/BinaryDataTransferRequest.cs
@@ -165,11 +165,17 @@ this.Format.    GetHashCode()       *  3 ^
         /// <param name="RequestId">The request identification.</param>
         /// <param name="DestinationId">The charging station/networking node identification.</param>
         /// <param name="NetworkPath">The network path of the request.</param>
+        /// <param name="RequestTimestamp">An optional request timestamp.</param>
+        /// <param name="RequestTimeout">An optional request timeout.</param>
+        /// <param name="EventTrackingId">An optional event tracking identification for correlating this request with other events.</param>
         /// <param name="CustomDataTransferRequestParser">An optional delegate to parse custom BinaryDataTransfer requests.</param>
         public static BinaryDataTransferRequest Parse(Byte[]                                                  Binary,
                                                       Request_Id                                              RequestId,
                                                       NetworkingNode_Id                                       DestinationId,
                                                       NetworkPath                                             NetworkPath,
+                                                      DateTime?                                               RequestTimestamp                  = null,
+                                                      TimeSpan?                                               RequestTimeout                    = null,
+                                                      EventTracking_Id?                                       EventTrackingId                   = null,
                                                       CustomBinaryParserDelegate<BinaryDataTransferRequest>?  CustomDataTransferRequestParser   = null)
         {
 
@@ -179,6 +185,9 @@ public static BinaryDataTransferRequest Parse(Byte[]
                          NetworkPath,
                          out var binaryDataTransferRequest,
                          out var errorResponse,
+                         RequestTimestamp,
+                         RequestTimeout,
+                         EventTrackingId,
                          CustomDataTransferRequestParser))
             {
                 return binaryDataTransferRequest;
@@ -202,13 +211,19 @@ public static BinaryDataTransferRequest Parse(Byte[]
         /// <param name="NetworkPath">The network path of the request.</param>
         /// <param name="BinaryDataTransferRequest">The parsed BinaryDataTransfer request.</param>
         /// <param name="ErrorResponse">An optional error response.</param>
+        /// <param name="RequestTimestamp">An optional request timestamp.</param>
+        /// <param name="RequestTimeout">An optional request timeout.</param>
+        /// <param name="EventTrackingId">An optional event tracking identification for correlating this request with other events.</param>
         /// <param name="CustomBinaryDataTransferRequestParser">An optional delegate to parse custom BinaryDataTransfer requests.</param>
         public static Boolean TryParse(Byte[]                                                  Binary,
                                        Request_Id                                              RequestId,
                                        NetworkingNode_Id                                       DestinationId,
                                        NetworkPath                                             NetworkPath,
                                        [NotNullWhen(true)]  out BinaryDataTransferRequest?     BinaryDataTransferRequest,
                                        [NotNullWhen(false)] out String?                        ErrorResponse,
+                                       DateTime?                                               RequestTimestamp                        = null,
+                                       TimeSpan?                                               RequestTimeout                          = null,
+                                       EventTracking_Id?                                       EventTrackingId                         = null,
                                        CustomBinaryParserDelegate<BinaryDataTransferRequest>?  CustomBinaryDataTransferRequestParser   = null)
         {
 
@@ -317,9 +332,9 @@ public static Boolean TryParse(Byte[]
                                                     null, //signatures,
 
                                                     RequestId,
-                                                    null,
-                                                    null,
-                                                    null,
+                                                    RequestTimestamp,
+                                                    RequestTimeout,
+                                                    EventTrackingId,
                                                     NetworkPath
 
                                                 );

diff --git a/...etworkingNode/Messages/IncomingMessages/BinaryDataStreamsExtensions/BinaryDataTransfer.cs b/...etworkingNode/Messages/IncomingMessages/BinaryDataStreamsExtensions/BinaryDataTransfer.cs
diff --git a/WWCP_OCPPv2.1/NetworkingNode/Messages/IncomingMessages/DataTransfer.cs b/WWCP_OCPPv2.1/NetworkingNode/Messages/IncomingMessages/DataTransfer.cs
diff --git a/...etworkingNode/Messages/OutgoingMessages/BinaryDataStreamsExtensions/BinaryDataTransfer.cs b/...etworkingNode/Messages/OutgoingMessages/BinaryDataStreamsExtensions/BinaryDataTransfer.cs
diff --git a/WWCP_OCPPv2.1/NetworkingNode/Messages/OutgoingMessages/DataTransfer.cs b/WWCP_OCPPv2.1/NetworkingNode/Messages/OutgoingMessages/DataTransfer.cs
diff --git a/...rkingNode/OCPPAdapter/Forwarding/Common/BinaryDataStreamsExtensions/BinaryDataTransfer.cs b/...rkingNode/OCPPAdapter/Forwarding/Common/BinaryDataStreamsExtensions/BinaryDataTransfer.cs
@@ -94,6 +94,9 @@ public async Task<ForwardingDecision>
                                                     BinaryRequestMessage.NetworkPath,
                                                     out var request,
                                                     out var errorResponse,
+                                                    BinaryRequestMessage.RequestTimestamp,
+                                                    BinaryRequestMessage.RequestTimeout - Timestamp.Now,
+                                                    BinaryRequestMessage.EventTrackingId,
                                                     parentNetworkingNode.OCPP.CustomBinaryDataTransferRequestParser))
             {
                 return ForwardingDecision.REJECT(errorResponse);