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

Partially fix UWP implementations

Browse Source
This commit is contained in:
Christian Kratky
2017-09-12 22:07:27 +02:00
parent 16bc9cb203
commit ff0b022357
4 changed files with 49 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frameworks/MQTTnet.NetStandard/Implementations/MqttWebSocketChannel.cs
+10 -9
View File
@@ -11,8 +11,8 @@ namespace MQTTnet.Implementations
public sealed class MqttWebSocketChannel : IMqttCommunicationChannel, IDisposable
{
private ClientWebSocket _webSocket = new ClientWebSocket();
private int WebSocketBufferSize;
private int WebSocketBufferOffset;
private int _bufferSize;
private int _bufferOffset;
public async Task ConnectAsync(MqttClientOptions options)
{
@@ -43,22 +43,22 @@ namespace MQTTnet.Implementations
{
await ReadToBufferAsync(length, buffer).ConfigureAwait(false);
var result = new ArraySegment<byte>(buffer, WebSocketBufferOffset, length);
WebSocketBufferSize -= length;
WebSocketBufferOffset += length;
var result = new ArraySegment<byte>(buffer, _bufferOffset, length);
_bufferSize -= length;
_bufferOffset += length;
return result;
}
private async Task ReadToBufferAsync(int length, byte[] buffer)
{
if (WebSocketBufferSize > 0)
if (_bufferSize > 0)
{
return;
}
var offset = 0;
while (_webSocket.State == WebSocketState.Open && WebSocketBufferSize < length)
while (_webSocket.State == WebSocketState.Open && _bufferSize < length)
{
WebSocketReceiveResult response;
do
@@ -67,7 +67,8 @@ namespace MQTTnet.Implementations
offset += response.Count;
} while (!response.EndOfMessage);
WebSocketBufferSize = response.Count;
_bufferSize = response.Count;
if (response.MessageType == WebSocketMessageType.Close)
{
await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).ConfigureAwait(false);
@@ -94,7 +95,7 @@ namespace MQTTnet.Implementations
public int Peek()
{
return WebSocketBufferSize;
return _bufferSize;
}
}
}
Frameworks/MQTTnet.UniversalWindows/Implementations/MqttTcpChannel.cs
+1 -1
View File
@@ -89,7 +89,7 @@ namespace MQTTnet.Implementations
public int Peek()
{
return 0;
}
public async Task<ArraySegment<byte>> ReadAsync(int length, byte[] buffer)
Frameworks/MQTTnet.UniversalWindows/Implementations/MqttWebSocketChannel.cs
+35 -43
View File
@@ -11,11 +11,8 @@ namespace MQTTnet.Implementations
public sealed class MqttWebSocketChannel : IMqttCommunicationChannel, IDisposable
{
private ClientWebSocket _webSocket = new ClientWebSocket();
private const int BufferSize = 4096;
private const int BufferAmplifier = 20;
private readonly byte[] WebSocketBuffer = new byte[BufferSize * BufferAmplifier];
private int WebSocketBufferSize;
private int WebSocketBufferOffset;
private int _bufferSize;
private int _bufferOffset;
public async Task ConnectAsync(MqttClientOptions options)
{
@@ -42,51 +39,41 @@ namespace MQTTnet.Implementations
_webSocket?.Dispose();
}
public Task ReadAsync(byte[] buffer)
public async Task<ArraySegment<byte>> ReadAsync(int length, byte[] buffer)
{
return Task.WhenAll(ReadToBufferAsync(buffer));
await ReadToBufferAsync(length, buffer).ConfigureAwait(false);
var result = new ArraySegment<byte>(buffer, _bufferOffset, length);
_bufferSize -= length;
_bufferOffset += length;
return result;
}
private async Task ReadToBufferAsync(byte[] buffer)
private async Task ReadToBufferAsync(int length, byte[] buffer)
{
var temporaryBuffer = new byte[BufferSize];
var offset = 0;
while (_webSocket.State == WebSocketState.Open)
if (_bufferSize > 0)
{
if (WebSocketBufferSize == 0)
{
WebSocketBufferOffset = 0;
WebSocketReceiveResult response;
do
{
response = await _webSocket.ReceiveAsync(new ArraySegment<byte>(temporaryBuffer), CancellationToken.None);
temporaryBuffer.CopyTo(WebSocketBuffer, offset);
offset += response.Count;
temporaryBuffer = new byte[BufferSize];
} while (!response.EndOfMessage);
WebSocketBufferSize = response.Count;
if (response.MessageType == WebSocketMessageType.Close)
{
await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
}
Buffer.BlockCopy(WebSocketBuffer, 0, buffer, 0, buffer.Length);
WebSocketBufferSize -= buffer.Length;
WebSocketBufferOffset += buffer.Length;
}
else
{
Buffer.BlockCopy(WebSocketBuffer, WebSocketBufferOffset, buffer, 0, buffer.Length);
WebSocketBufferSize -= buffer.Length;
WebSocketBufferOffset += buffer.Length;
}
return;
}
var offset = 0;
while (_webSocket.State == WebSocketState.Open && _bufferSize < length)
{
WebSocketReceiveResult response;
do
{
response = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer, offset, buffer.Length - offset), CancellationToken.None).ConfigureAwait(false);
offset += response.Count;
} while (!response.EndOfMessage);
_bufferSize = response.Count;
if (response.MessageType == WebSocketMessageType.Close)
{
await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).ConfigureAwait(false);
}
}
}
public async Task WriteAsync(byte[] buffer)
@@ -105,5 +92,10 @@ namespace MQTTnet.Implementations
throw new MqttCommunicationException(exception);
}
}
public int Peek()
{
return _bufferSize;
}
}
}
MQTTnet.Core/Channel/BufferedCommunicationChannel.cs
+3 -3
View File
@@ -6,9 +6,9 @@ namespace MQTTnet.Core.Channel
{
public class BufferedCommunicationChannel : IMqttCommunicationChannel
{
private IMqttCommunicationChannel _inner { get; }
private int _bufferSize = 0;
private int _bufferOffset = 0;
private readonly IMqttCommunicationChannel _inner;
private int _bufferSize;
private int _bufferOffset;
public BufferedCommunicationChannel(IMqttCommunicationChannel inner)
{