YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-18 10:26:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove async and framing from serializer

Browse Source
This commit is contained in:
Eggers Jan
2017-09-13 09:10:41 +02:00
parent 8fd3e5070d
commit c001897590
5 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MQTTnet.Core/Adapter/MqttChannelCommunicationAdapter.cs
+42 -4
View File
@@ -1,4 +1,5 @@
using System;
using System.IO;
using System.Threading.Tasks;
using MQTTnet.Core.Channel;
using MQTTnet.Core.Client;
@@ -35,21 +36,33 @@ namespace MQTTnet.Core.Adapter
{
MqttTrace.Information(nameof(MqttChannelCommunicationAdapter), "TX >>> {0} [Timeout={1}]", packet, timeout);
return ExecuteWithTimeoutAsync(PacketSerializer.SerializeAsync(packet, _channel), timeout);
var writeBuffer = PacketSerializer.Serialize(packet);
_sendTask = SendAsync( writeBuffer );
return ExecuteWithTimeoutAsync(_sendTask, timeout);
}
private Task _sendTask = Task.FromResult(0); // this task is used to prevent overlapping write
private async Task SendAsync(byte[] buffer)
{
await _sendTask.ConfigureAwait(false);
await _channel.Stream.WriteAsync(buffer, 0, buffer.Length).ConfigureAwait( false );
}
public async Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout)
{
MqttBasePacket packet;
Tuple<MqttPacketHeader, MemoryStream> tuple;
if (timeout > TimeSpan.Zero)
{
packet = await ExecuteWithTimeoutAsync(PacketSerializer.DeserializeAsync(_channel), timeout).ConfigureAwait(false);
tuple = await ExecuteWithTimeoutAsync(ReceiveAsync(), timeout).ConfigureAwait(false);
}
else
{
packet = await PacketSerializer.DeserializeAsync(_channel).ConfigureAwait(false);
tuple = await ReceiveAsync().ConfigureAwait(false);
}
var packet = PacketSerializer.Deserialize(tuple.Item1, tuple.Item2);
if (packet == null)
{
throw new MqttProtocolViolationException("Received malformed packet.");
@@ -59,6 +72,31 @@ namespace MQTTnet.Core.Adapter
return packet;
}
private async Task<Tuple<MqttPacketHeader, MemoryStream>> ReceiveAsync()
{
var header = MqttPacketReader.ReadHeaderFromSource(_channel.Stream);
MemoryStream body = null;
if (header.BodyLength > 0)
{
var totalRead = 0;
var readBuffer = new byte[header.BodyLength];
do
{
var read = await _channel.Stream.ReadAsync(readBuffer, totalRead, header.BodyLength - totalRead)
.ConfigureAwait( false );
totalRead += read;
} while (totalRead < header.BodyLength);
body = new MemoryStream(readBuffer, 0, header.BodyLength);
}
else
{
body = new MemoryStream();
}
return Tuple.Create(header, body);
}
private static async Task<TResult> ExecuteWithTimeoutAsync<TResult>(Task<TResult> task, TimeSpan timeout)
{
var timeoutTask = Task.Delay(timeout);