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

Fix RPC issue #1093 by calling both message handlers.

Browse Source
This commit is contained in:
Christian
2021-02-18 18:56:15 +01:00
parent fda4272611
commit 120b7fb7d1
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet.Extensions.Rpc/MqttRpcClient.cs
+13 -9
View File
@@ -8,6 +8,7 @@ using System.Collections.Concurrent;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Implementations;
namespace MQTTnet.Extensions.Rpc namespace MQTTnet.Extensions.Rpc
{ {
@@ -88,8 +89,8 @@ namespace MQTTnet.Extensions.Rpc
try try
{ {
var tcs = new TaskCompletionSource<byte[]>(); var promise = new TaskCompletionSource<byte[]>();
if (!_waitingCalls.TryAdd(responseTopic, tcs)) if (!_waitingCalls.TryAdd(responseTopic, promise))
{ {
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
@@ -102,15 +103,15 @@ namespace MQTTnet.Extensions.Rpc
{ {
linkedCts.Token.Register(() => linkedCts.Token.Register(() =>
{ {
if (!tcs.Task.IsCompleted && !tcs.Task.IsFaulted && !tcs.Task.IsCanceled) if (!promise.Task.IsCompleted && !promise.Task.IsFaulted && !promise.Task.IsCanceled)
{ {
tcs.TrySetCanceled(); promise.TrySetCanceled();
} }
}); });
try try
{ {
var result = await tcs.Task.ConfigureAwait(false); var result = await promise.Task.ConfigureAwait(false);
timeoutCts.Cancel(false); timeoutCts.Cancel(false);
return result; return result;
} }
@@ -136,14 +137,17 @@ namespace MQTTnet.Extensions.Rpc
Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs) Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
{ {
if (!_waitingCalls.TryRemove(eventArgs.ApplicationMessage.Topic, out var tcs)) if (!_waitingCalls.TryRemove(eventArgs.ApplicationMessage.Topic, out var promise))
{ {
return Task.FromResult(0); return PlatformAbstractionLayer.CompletedTask;
} }
tcs.TrySetResult(eventArgs.ApplicationMessage.Payload); promise.TrySetResult(eventArgs.ApplicationMessage.Payload);
return Task.FromResult(0); // Set this message to handled to that other code can avoid execution etc.
eventArgs.IsHandled = true;
return PlatformAbstractionLayer.CompletedTask;
} }
public void Dispose() public void Dispose()
Source/MQTTnet.Extensions.Rpc/RpcAwareApplicationMessageReceivedHandler.cs
+5 -4
View File
@@ -18,14 +18,15 @@ namespace MQTTnet.Extensions.Rpc
public IMqttApplicationMessageReceivedHandler OriginalHandler { get; } public IMqttApplicationMessageReceivedHandler OriginalHandler { get; }
public Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs) public async Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
{ {
// First try to check if there is a pending RPC call!
await _handleReceivedApplicationMessageAsync(eventArgs).ConfigureAwait(false);
if (OriginalHandler != null) if (OriginalHandler != null)
{ {
return OriginalHandler.HandleApplicationMessageReceivedAsync(eventArgs); await OriginalHandler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
} }
return _handleReceivedApplicationMessageAsync(eventArgs);
} }
} }
} }
Source/MQTTnet/MqttApplicationMessageReceivedEventArgs.cs
+8
View File
@@ -21,5 +21,13 @@ namespace MQTTnet
public bool ProcessingFailed { get; set; } public bool ProcessingFailed { get; set; }
public MqttApplicationMessageReceivedReasonCode ReasonCode { get; set; } = MqttApplicationMessageReceivedReasonCode.Success; public MqttApplicationMessageReceivedReasonCode ReasonCode { get; set; } = MqttApplicationMessageReceivedReasonCode.Success;
/// <summary>
/// Gets or sets whether this message was handled.
/// This value can be used in user code for custom control flow.
/// </summary>
public bool IsHandled { get; set; }
public object Tag { get; set; }
} }
} }