Centralize send logic

Author: ShortDevelopment

lib/ShortDev.Microsoft.ConnectedDevices/CdpSession.cs

@@ -8,6 +8,7 @@
 using ShortDev.Microsoft.ConnectedDevices.Session.Connection;
 using ShortDev.Microsoft.ConnectedDevices.Transports;
 using System.Collections.Concurrent;
+using System.ComponentModel;
 
 namespace ShortDev.Microsoft.ConnectedDevices;
 
@@ -96,6 +97,36 @@ internal static async Task<CdpSession> ConnectClientAsync(ConnectedDevicesPlatfo
     uint _sequenceNumber = 0;
     ulong _requestId = 0;
     internal CdpCryptor? Cryptor { get; set; }
+
+    public void SendMessage<TMessageHeader, TMessage>(
+        CdpSocket socket,
+        CommonHeader header, in TMessageHeader messageHeader, in TMessage message,
+        bool supplyRequestId = false
+    ) where TMessageHeader : IBinaryWritable where TMessage : IBinaryWritable
+    {
+        SendMessage(socket, ref header, messageHeader, message, supplyRequestId: supplyRequestId);
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public void SendMessage<TMessageHeader, TMessage>(
+        CdpSocket socket,
+        ref CommonHeader header, in TMessageHeader messageHeader, in TMessage message,
+        bool supplyRequestId = false
+    ) where TMessageHeader : IBinaryWritable where TMessage : IBinaryWritable
+    {
+        var writer = EndianWriter.Create(Endianness.BigEndian, ConnectedDevicesPlatform.MemoryPool);
+        try
+        {
+            messageHeader.Write(ref writer);
+            message.Write(ref writer);
+            SendMessage(socket, header, writer.Stream.WrittenSpan, supplyRequestId);
+        }
+        finally
+        {
+            writer.Dispose();
+        }
+    }
+
     public void SendMessage(CdpSocket socket, CommonHeader header, ReadOnlySpan<byte> payload, bool supplyRequestId = false)
     {
         if (header.Type == MessageType.Session && Cryptor == null)

lib/ShortDev.Microsoft.ConnectedDevices/Messages/AdditionalHeader.cs

@@ -10,7 +10,7 @@ namespace ShortDev.Microsoft.ConnectedDevices.Messages;
 /// </summary>
 /// <param name="Type"></param>
 /// <param name="Value"></param>
-public record AdditionalHeader(AdditionalHeaderType Type, ReadOnlyMemory<byte> Value)
+public readonly record struct AdditionalHeader(AdditionalHeaderType Type, ReadOnlyMemory<byte> Value)
 {
     public static AdditionalHeader CreateCorrelationHeader()
         => FromCorrelationVector(new CorrelationVectorV1());

lib/ShortDev.Microsoft.ConnectedDevices/Messages/CommonHeaders.cs

@@ -247,6 +247,6 @@ public void SetReplyToId(ulong requestId)
         if (header == null)
             return null;
 
-        return BinaryPrimitives.ReadUInt64LittleEndian(header.Value.Span);
+        return BinaryPrimitives.ReadUInt64LittleEndian(header.Value.Value.Span);
     }
 }

lib/ShortDev.Microsoft.ConnectedDevices/Messages/Connection/Authentication/AuthenticationPayload.cs

@@ -9,10 +9,8 @@ namespace ShortDev.Microsoft.ConnectedDevices.Messages.Connection.Authentication
 /// <summary>
 /// For all authentication, devices send their device / user certificate, which is self-signed.
 /// </summary>
-public sealed class AuthenticationPayload : IBinaryWritable, IBinaryParsable<AuthenticationPayload>
+public readonly record struct AuthenticationPayload : IBinaryWritable, IBinaryParsable<AuthenticationPayload>
 {
-    private AuthenticationPayload() { }
-
     public static AuthenticationPayload Parse<TReader>(ref TReader reader) where TReader : struct, IEndianReader, allows ref struct
         => new()
         {

lib/ShortDev.Microsoft.ConnectedDevices/Messages/Connection/ConnectionHeader.cs

@@ -3,17 +3,17 @@
 /// <summary>
 /// The <see cref="ConnectionHeader"/> is common for all Connection Messages.
 /// </summary>
-public sealed class ConnectionHeader : IBinaryWritable, IBinaryParsable<ConnectionHeader>
+public readonly record struct ConnectionHeader : IBinaryWritable, IBinaryParsable<ConnectionHeader>
 {
     /// <summary>
     /// Indicates the current connection type.
     /// </summary>
-    public required ConnectionType MessageType { get; set; }
+    public required ConnectionType MessageType { get; init; }
 
     /// <summary>
     /// Displays the types of available connections.
     /// </summary>
-    public required ConnectionMode ConnectionMode { get; set; }
+    public required ConnectionMode ConnectionMode { get; init; }
 
     public static ConnectionHeader Parse<TReader>(ref TReader reader) where TReader : struct, IEndianReader, allows ref struct
     {

lib/ShortDev.Microsoft.ConnectedDevices/Messages/Connection/ConnectionRequest.cs

@@ -6,37 +6,37 @@ namespace ShortDev.Microsoft.ConnectedDevices.Messages.Connection;
 /// <summary>
 /// Client initiates a connection request with a host device.
 /// </summary>
-public sealed class ConnectionRequest : IBinaryWritable, IBinaryParsable<ConnectionRequest>
+public readonly record struct ConnectionRequest : IBinaryWritable, IBinaryParsable<ConnectionRequest>
 {
     /// <summary>
     /// The type of elliptical curve used.
     /// </summary>
-    public required CurveType CurveType { get; set; }
+    public required CurveType CurveType { get; init; }
     /// <summary>
     /// The expected size of HMAC.
     /// </summary>
-    public required ushort HmacSize { get; set; }
+    public required ushort HmacSize { get; init; }
     /// <summary>
     /// Random values
     /// </summary>
-    public required CdpNonce Nonce { get; set; }
+    public required CdpNonce Nonce { get; init; }
     /// <summary>
     /// The maximum size of a single message fragment. <br/>
     /// (Fixed Value of <see cref="MessageFragmenter.DefaultMessageFragmentSize"/>).
     /// </summary>
-    public required uint MessageFragmentSize { get; set; }
+    public required uint MessageFragmentSize { get; init; }
     /// <summary>
     /// A fixed-length key.
     /// This is the X component of the key. <br/>
     /// (See <see cref="System.Security.Cryptography.ECPoint.X"/>)
     /// </summary>
-    public required ReadOnlyMemory<byte> PublicKeyX { get; set; }
+    public required ReadOnlyMemory<byte> PublicKeyX { get; init; }
     /// <summary>
     /// A fixed-length key.
     /// This is the Y component of the key. <br/>
     /// (See <see cref="System.Security.Cryptography.ECPoint.Y"/>)
     /// </summary>
-    public required ReadOnlyMemory<byte> PublicKeyY { get; set; }
+    public required ReadOnlyMemory<byte> PublicKeyY { get; init; }
 
     public static ConnectionRequest Parse<TReader>(ref TReader reader) where TReader : struct, IEndianReader, allows ref struct
         => new()

lib/ShortDev.Microsoft.ConnectedDevices/Messages/Connection/ConnectionResponse.cs

@@ -7,37 +7,37 @@ namespace ShortDev.Microsoft.ConnectedDevices.Messages.Connection;
 /// The host responds with a connection response message including device information. <br/>
 /// Only the Result is sent if the Result is anything other than <see cref="ConnectionResult.Pending"/>.
 /// </summary>
-public sealed class ConnectionResponse : IBinaryWritable, IBinaryParsable<ConnectionResponse>
+public readonly record struct ConnectionResponse : IBinaryWritable, IBinaryParsable<ConnectionResponse>
 {
     /// <summary>
     /// The result of the connection request.
     /// </summary>
-    public required ConnectionResult Result { get; set; }
+    public required ConnectionResult Result { get; init; }
     /// <summary>
     /// The expected size of HMAC.
     /// </summary>
-    public required ushort HmacSize { get; set; }
+    public required ushort HmacSize { get; init; }
     /// <summary>
     /// Random values.
     /// </summary>
-    public required CdpNonce Nonce { get; set; }
+    public required CdpNonce Nonce { get; init; }
     /// <summary>
     /// The maximum size of a single message fragment. <br/>
     /// (Fixed Value of <see cref="MessageFragmenter.DefaultMessageFragmentSize"/>).
     /// </summary>
-    public required uint MessageFragmentSize { get; set; }
+    public required uint MessageFragmentSize { get; init; }
     /// <summary>
     /// A fixed-length key that is based on the <see cref="CurveType"/> from <see cref="ConnectionRequest"/>, which is sent only if the connection is successful. <br/>
     /// This is the X component of the key. <br/>
     /// (See <see cref="System.Security.Cryptography.ECPoint.X"/>)
     /// </summary>
-    public required ReadOnlyMemory<byte> PublicKeyX { get; set; }
+    public required ReadOnlyMemory<byte> PublicKeyX { get; init; }
     /// <summary>
     /// A fixed-length key that is based on the <see cref="CurveType"/> from <see cref="ConnectionRequest"/>, which is sent only if the connection is successful. <br/>
     /// This is the Y component of the key.
     /// (See <see cref="System.Security.Cryptography.ECPoint.Y"/>)
     /// </summary>
-    public required ReadOnlyMemory<byte> PublicKeyY { get; set; }
+    public required ReadOnlyMemory<byte> PublicKeyY { get; init; }
 
     public static ConnectionResponse Parse<TReader>(ref TReader reader) where TReader : struct, IEndianReader, allows ref struct
     {

lib/ShortDev.Microsoft.ConnectedDevices/Messages/Connection/DeviceInfo/DeviceInfoMessage.cs

@@ -6,7 +6,7 @@ namespace ShortDev.Microsoft.ConnectedDevices.Messages.Connection.DeviceInfo;
 /// <summary>
 /// This message requests information from the device.
 /// </summary>
-public sealed class DeviceInfoMessage : IBinaryWritable, IBinaryParsable<DeviceInfoMessage>
+public readonly record struct DeviceInfoMessage : IBinaryWritable, IBinaryParsable<DeviceInfoMessage>
 {
     public static DeviceInfoMessage Parse<TReader>(ref TReader reader) where TReader : struct, IEndianReader, allows ref struct
         => new()

lib/ShortDev.Microsoft.ConnectedDevices/Messages/Connection/TransportUpgrade/EndpointMetadata.cs

@@ -2,7 +2,7 @@
 
 namespace ShortDev.Microsoft.ConnectedDevices.Messages.Connection.TransportUpgrade;
 
-public record class EndpointMetadata(CdpTransportType Type, byte[] Data) : IBinaryWritable, IBinaryParsable<EndpointMetadata>
+public readonly record struct EndpointMetadata(CdpTransportType Type, byte[] Data) : IBinaryWritable, IBinaryParsable<EndpointMetadata>
 {
     public static EndpointMetadata Tcp { get; } = new(CdpTransportType.Tcp, []);
     public static EndpointMetadata WifiDirect { get; } = new(CdpTransportType.WifiDirect, []);
@@ -40,3 +40,11 @@ public static void WriteArray<TWriter>(ref TWriter writer, IReadOnlyList<Endpoin
             endpoint.Write(ref writer);
     }
 }
+
+public readonly record struct EndpointMetadataArray(IReadOnlyList<EndpointMetadata> Endpoints) : IBinaryWritable, IBinaryParsable<EndpointMetadataArray>
+{
+    public void Write<TWriter>(ref TWriter writer) where TWriter : struct, IEndianWriter, allows ref struct
+        => EndpointMetadata.WriteArray(ref writer, Endpoints);
+    public static EndpointMetadataArray Parse<TReader>(ref TReader reader) where TReader : struct, IEndianReader, allows ref struct
+        => new(EndpointMetadata.ParseArray(ref reader));
+}

lib/ShortDev.Microsoft.ConnectedDevices/Messages/Connection/TransportUpgrade/UpgradeIdPayload.cs

@@ -4,7 +4,7 @@
 /// This message transports the details of the upgrade. <br/>
 /// (See <see cref="ConnectionType.TransportRequest"/> and <see cref="ConnectionType.TransportConfirmation"/>)
 /// </summary>
-public sealed class UpgradeIdPayload : IBinaryWritable, IBinaryParsable<UpgradeIdPayload>
+public readonly record struct UpgradeIdPayload : IBinaryWritable, IBinaryParsable<UpgradeIdPayload>
 {
     public required Guid UpgradeId { get; init; }