Refactor subscriptions manager

2026-10-26 08:02:59 +08:00 · 2018-05-03 22:22:07 +02:00
parent d14088512b
commit b22b02a0b6
12 changed files with 269 additions and 107 deletions
@@ -43,11 +43,30 @@ namespace MQTTnet.Core.Tests
            return Task.FromResult(0);
        }

-        public Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        public async Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken)
        {
            ThrowIfPartnerIsNull();

-            return Task.Run(() =>
+            if (timeout > TimeSpan.Zero)
+            {
+                using (var timeoutCts = new CancellationTokenSource(timeout))
+                using (var cts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken))
+                {
+                    return await Task.Run(() =>
+                    {
+                        try
+                        {
+                            return _incomingPackets.Take(cts.Token);
+                        }
+                        catch
+                        {
+                            return null;
+                        }
+                    }, cts.Token);
+                }
+            }
+
+            return await Task.Run(() =>
            {
                try
                {