Avoid to call MqttPacketBuffer.Join() when SendPacketAsync

dotnet · Nov 24, 2022 · a2127c6 · a2127c6
1 parent e88b280
commit a2127c6
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/Source/MQTTnet.AspnetCore/MqttConnectionContext.cs b/Source/MQTTnet.AspnetCore/MqttConnectionContext.cs
@@ -8,23 +8,23 @@
 using MQTTnet.AspNetCore.Client.Tcp;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
+using MQTTnet.Internal;
 using MQTTnet.Packets;
 using System;
 using System.IO.Pipelines;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Internal;
 
 namespace MQTTnet.AspNetCore
 {
     public sealed class MqttConnectionContext : IMqttChannelAdapter
     {
         readonly AsyncLock _writerLock = new AsyncLock();
-        
+
         PipeReader _input;
         PipeWriter _output;
-        
+
         public MqttConnectionContext(MqttPacketFormatterAdapter packetFormatterAdapter, ConnectionContext connection)
         {
             PacketFormatterAdapter = packetFormatterAdapter ?? throw new ArgumentNullException(nameof(packetFormatterAdapter));
@@ -62,7 +62,7 @@ public string Endpoint
         public X509Certificate2 ClientCertificate => Http?.HttpContext?.Connection?.ClientCertificate;
 
         public ConnectionContext Connection { get; }
-        
+
         public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
 
         public long BytesSent { get; set; }
@@ -169,19 +169,17 @@ public void ResetStatistics()
 
         public async Task SendPacketAsync(MqttPacket packet, CancellationToken cancellationToken)
         {
-            var formatter = PacketFormatterAdapter;
-
             using (await _writerLock.EnterAsync(cancellationToken).ConfigureAwait(false))
             {
-                var buffer = formatter.Encode(packet);
-                var msg = buffer.Join().AsMemory();
-                var output = _output;
-                var result = await output.WriteAsync(msg, cancellationToken).ConfigureAwait(false);
-                if (result.IsCompleted)
+                var buffer = PacketFormatterAdapter.Encode(packet);
+                await _output.WriteAsync(buffer.Packet, cancellationToken).ConfigureAwait(false);
+
+                if (buffer.Payload.Count > 0)
                 {
-                    BytesSent += msg.Length;
+                    await _output.WriteAsync(buffer.Payload, cancellationToken).ConfigureAwait(false);
                 }
 
+                BytesSent += buffer.Length;
                 PacketFormatterAdapter.Cleanup();
             }
         }