diff --git a/Directory.Build.props b/Directory.Build.props index f49be507..c6146e2b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,9 +1,58 @@ + + net8.0 + MQTTnet + The contributors of MQTTnet + The contributors of MQTTnet + Copyright (c) .NET Foundation and Contributors - - true - true - true - + false + false + true + false + enable - \ No newline at end of file + en-US + true + 1591;NETSDK1138;NU1803;NU1901;NU1902 + + all + true + low + + true + latest + recommended + default + + true + true + true + + + + true + + + + LICENSE + nuget.png + https://github.com/dotnet/MQTTnet + https://github.com/dotnet/MQTTnet.git + git + true + snupkg + true + true + + + + + + + + + + + + diff --git a/MQTTnet.sln b/MQTTnet.sln index 15a0d232..2c1fcd71 100644 --- a/MQTTnet.sln +++ b/MQTTnet.sln @@ -7,11 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "Source\MQTTnet\M EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3F60ECB-45BA-4C66-8903-8BB89CA67998}" ProjectSection(SolutionItems) = preProject + .github\workflows\ci.yml = .github\workflows\ci.yml CODE-OF-CONDUCT.md = CODE-OF-CONDUCT.md + Directory.Build.props = Directory.Build.props LICENSE = LICENSE README.md = README.md Source\ReleaseNotes.md = Source\ReleaseNotes.md - .github\workflows\ci.yml = .github\workflows\ci.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore", "Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj", "{F10C4060-F7EE-4A83-919F-FF723E72F94A}" @@ -85,6 +86,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894} EndGlobalSection - GlobalSection(NestedProjects) = preSolution - EndGlobalSection EndGlobal diff --git a/Samples/Client/Client_Connection_Samples.cs b/Samples/Client/Client_Connection_Samples.cs index 32a8784c..c68c9d69 100644 --- a/Samples/Client/Client_Connection_Samples.cs +++ b/Samples/Client/Client_Connection_Samples.cs @@ -490,7 +490,7 @@ m/XriWr/Cq4h/JfB7NTsezVslgkBaoU= } } - class SampleClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler + sealed class SampleClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler { public async Task HandleEnhancedAuthenticationAsync(MqttEnhancedAuthenticationEventArgs eventArgs) { diff --git a/Samples/Client/Client_Subscribe_Samples.cs b/Samples/Client/Client_Subscribe_Samples.cs index 058d3ff9..6f1f4adc 100644 --- a/Samples/Client/Client_Subscribe_Samples.cs +++ b/Samples/Client/Client_Subscribe_Samples.cs @@ -142,7 +142,7 @@ public static class Client_Subscribe_Samples response.DumpToConsole(); } - static void ConcurrentProcessingDisableAutoAcknowledge(CancellationToken shutdownToken, IMqttClient mqttClient) + static void ConcurrentProcessingDisableAutoAcknowledge(IMqttClient mqttClient, CancellationToken shutdownToken) { /* * This sample shows how to achieve concurrent processing and not have message AutoAcknowledged @@ -170,7 +170,7 @@ public static class Client_Subscribe_Samples }; } - static void ConcurrentProcessingWithLimit(CancellationToken shutdownToken, IMqttClient mqttClient) + static void ConcurrentProcessingWithLimit(IMqttClient mqttClient, CancellationToken shutdownToken) { /* * This sample shows how to achieve concurrent processing, with: diff --git a/Samples/Diagnostics/Logger_Samples.cs b/Samples/Diagnostics/Logger_Samples.cs index 1e6d9b2d..6cd19587 100644 --- a/Samples/Diagnostics/Logger_Samples.cs +++ b/Samples/Diagnostics/Logger_Samples.cs @@ -6,6 +6,7 @@ // ReSharper disable UnusedMember.Global // ReSharper disable InconsistentNaming +using System.Globalization; using System.Text; using MQTTnet.Diagnostics.Logger; @@ -51,7 +52,7 @@ public static class Logger_Samples mqttEventLogger.LogMessagePublished += (_, args) => { var output = new StringBuilder(); - output.AppendLine($">> [{args.LogMessage.Timestamp:O}] [{args.LogMessage.ThreadId}] [{args.LogMessage.Source}] [{args.LogMessage.Level}]: {args.LogMessage.Message}"); + output.AppendLine(CultureInfo.InvariantCulture, $">> [{args.LogMessage.Timestamp:O}] [{args.LogMessage.ThreadId}] [{args.LogMessage.Source}] [{args.LogMessage.Level}]: {args.LogMessage.Message}"); if (args.LogMessage.Exception != null) { output.AppendLine(args.LogMessage.Exception.ToString()); diff --git a/Samples/Helpers/ObjectExtensions.cs b/Samples/Helpers/ObjectExtensions.cs index 4384fa92..c87c146e 100644 --- a/Samples/Helpers/ObjectExtensions.cs +++ b/Samples/Helpers/ObjectExtensions.cs @@ -8,17 +8,19 @@ namespace MQTTnet.Samples.Helpers; internal static class ObjectExtensions { + static readonly JsonSerializerOptions SerializerOptions = new() + { + WriteIndented = true + }; + public static TObject DumpToConsole(this TObject @object) { var output = "NULL"; if (@object != null) { - output = JsonSerializer.Serialize(@object, new JsonSerializerOptions - { - WriteIndented = true - }); + output = JsonSerializer.Serialize(@object, SerializerOptions); } - + Console.WriteLine($"[{@object?.GetType().Name}]:\r\n{output}"); return @object; } diff --git a/Samples/MQTTnet.Samples.csproj b/Samples/MQTTnet.Samples.csproj index 5fe84d38..3de761aa 100644 --- a/Samples/MQTTnet.Samples.csproj +++ b/Samples/MQTTnet.Samples.csproj @@ -2,19 +2,10 @@ Exe - net8.0 enable enable false - true - false - false - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended + $(NoWarn);CA1707 diff --git a/Samples/Program.cs b/Samples/Program.cs index 9cf199a2..44e019ee 100644 --- a/Samples/Program.cs +++ b/Samples/Program.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Globalization; using System.Reflection; Console.BackgroundColor = ConsoleColor.White; @@ -28,7 +29,7 @@ Console.Write("Please choose sample class (press Enter to continue): "); Console.ResetColor(); var input = Console.ReadLine(); -var selectedIndex = int.Parse(input ?? "0"); +var selectedIndex = int.Parse(input ?? "0", CultureInfo.InvariantCulture); var selectedSampleClass = sampleClasses[selectedIndex]; var sampleMethods = selectedSampleClass.GetMethods(BindingFlags.Static | BindingFlags.Public).OrderBy(m => m.Name).ToList(); @@ -45,7 +46,7 @@ Console.Write("Please choose sample (press Enter to continue): "); Console.ResetColor(); input = Console.ReadLine(); -selectedIndex = int.Parse(input ?? "0"); +selectedIndex = int.Parse(input ?? "0", CultureInfo.InvariantCulture); var selectedSampleMethod = sampleMethods[selectedIndex]; Console.WriteLine(); @@ -58,7 +59,7 @@ try { if (selectedSampleMethod.Invoke(null, null) is Task task) { - await task; + await task; } } catch (Exception exception) diff --git a/Samples/Server/Server_ASP_NET_Samples.cs b/Samples/Server/Server_ASP_NET_Samples.cs index 9247093e..8f52d114 100644 --- a/Samples/Server/Server_ASP_NET_Samples.cs +++ b/Samples/Server/Server_ASP_NET_Samples.cs @@ -8,6 +8,7 @@ // ReSharper disable EmptyConstructor // ReSharper disable MemberCanBeMadeStatic.Local +using System.Diagnostics.CodeAnalysis; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -52,14 +53,14 @@ public static class Server_ASP_NET_Samples // Inject other services via constructor. } - public Task OnClientConnected(ClientConnectedEventArgs eventArgs) + public static Task OnClientConnected(ClientConnectedEventArgs eventArgs) { Console.WriteLine($"Client '{eventArgs.ClientId}' connected."); return Task.CompletedTask; } - public Task ValidateConnection(ValidatingConnectionEventArgs eventArgs) + public static Task ValidateConnection(ValidatingConnectionEventArgs eventArgs) { Console.WriteLine($"Client '{eventArgs.ClientId}' wants to connect. Accepting!"); return Task.CompletedTask; @@ -68,6 +69,7 @@ public static class Server_ASP_NET_Samples sealed class Startup { + [SuppressMessage("Performance", "CA1822:Mark members as static")] public void Configure(IApplicationBuilder app, IWebHostEnvironment environment, MqttController mqttController) { app.UseRouting(); @@ -88,11 +90,12 @@ public static class Server_ASP_NET_Samples * Attach event handlers etc. if required. */ - server.ValidatingConnectionAsync += mqttController.ValidateConnection; - server.ClientConnectedAsync += mqttController.OnClientConnected; + server.ValidatingConnectionAsync += MqttController.ValidateConnection; + server.ClientConnectedAsync += MqttController.OnClientConnected; }); } + [SuppressMessage("Performance", "CA1822:Mark members as static")] public void ConfigureServices(IServiceCollection services) { services.AddHostedMqttServer( diff --git a/Samples/Server/Server_Simple_Samples.cs b/Samples/Server/Server_Simple_Samples.cs index 06eb9e86..95e167fe 100644 --- a/Samples/Server/Server_Simple_Samples.cs +++ b/Samples/Server/Server_Simple_Samples.cs @@ -6,6 +6,7 @@ // ReSharper disable UnusedMember.Global // ReSharper disable InconsistentNaming +using System.Globalization; using MQTTnet.Diagnostics.Logger; using MQTTnet.Protocol; using MQTTnet.Server; @@ -161,7 +162,7 @@ public static class Server_Simple_Samples return server; } - class ConsoleLogger : IMqttNetLogger + sealed class ConsoleLogger : IMqttNetLogger { readonly object _consoleSyncRoot = new(); @@ -191,7 +192,7 @@ public static class Server_Simple_Samples if (parameters?.Length > 0) { - message = string.Format(message, parameters); + message = string.Format(CultureInfo.InvariantCulture, message, parameters); } lock (_consoleSyncRoot) diff --git a/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj b/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj index 254069b6..9566c7d8 100644 --- a/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj +++ b/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj @@ -1,19 +1,10 @@ - net8.0 enable enable false - true - false - false - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended + $(NoWarn);CA1707 diff --git a/Source/MQTTnet.AspTestApp/Pages/Index.cshtml.cs b/Source/MQTTnet.AspTestApp/Pages/Index.cshtml.cs index e7293992..8b284325 100644 --- a/Source/MQTTnet.AspTestApp/Pages/Index.cshtml.cs +++ b/Source/MQTTnet.AspTestApp/Pages/Index.cshtml.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; namespace MQTTnet.AspTestApp.Pages; -public class IndexModel : PageModel +public partial class IndexModel : PageModel { readonly ILogger _logger; @@ -17,6 +17,9 @@ public class IndexModel : PageModel public void OnGet() { - _logger.LogDebug("OnGet"); + LogOnGet(); } + + [LoggerMessage(Level = LogLevel.Information, Message = "OnGet")] + private partial void LogOnGet(); } \ No newline at end of file diff --git a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj index ae4708a2..59646a45 100644 --- a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj +++ b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj @@ -1,59 +1,23 @@ - net8.0 MQTTnet.AspNetCore MQTTnet.AspNetCore - True - The contributors of MQTTnet - MQTTnet - MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. - The contributors of MQTTnet - MQTTnet.AspNetCore - false - false - true - true - snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git - MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - false - false - nuget.png - true - true - LICENSE - For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). - true - true - true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - low - latest-Recommended true + + true + MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. + MQTTnet.AspNetCore + MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor + For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). + + true - - - - - - - - - diff --git a/Source/MQTTnet.AspnetCore/MqttClientConnectionContextFactory.cs b/Source/MQTTnet.AspnetCore/MqttClientConnectionContextFactory.cs index fadf9065..3c751cb4 100644 --- a/Source/MQTTnet.AspnetCore/MqttClientConnectionContextFactory.cs +++ b/Source/MQTTnet.AspnetCore/MqttClientConnectionContextFactory.cs @@ -13,7 +13,7 @@ public sealed class MqttClientConnectionContextFactory : IMqttClientAdapterFacto { public IMqttChannelAdapter CreateClientAdapter(MqttClientOptions options, MqttPacketInspector packetInspector, IMqttNetLogger logger) { - if (options == null) throw new ArgumentNullException(nameof(options)); + ArgumentNullException.ThrowIfNull(options); switch (options.ChannelOptions) { diff --git a/Source/MQTTnet.AspnetCore/MqttSubProtocolSelector.cs b/Source/MQTTnet.AspnetCore/MqttSubProtocolSelector.cs index c6acdfa8..6044f8d4 100644 --- a/Source/MQTTnet.AspnetCore/MqttSubProtocolSelector.cs +++ b/Source/MQTTnet.AspnetCore/MqttSubProtocolSelector.cs @@ -29,6 +29,6 @@ public static class MqttSubProtocolSelector ArgumentNullException.ThrowIfNull(requestedSubProtocolValues); // Order the protocols to also match "mqtt", "mqttv-3.1", "mqttv-3.11" etc. - return requestedSubProtocolValues.OrderByDescending(p => p.Length).FirstOrDefault(p => p.ToLower().StartsWith("mqtt")); + return requestedSubProtocolValues.OrderByDescending(p => p.Length).FirstOrDefault(p => p.ToLowerInvariant().StartsWith("mqtt", StringComparison.InvariantCulture)); } } \ No newline at end of file diff --git a/Source/MQTTnet.AspnetCore/SocketConnection.cs b/Source/MQTTnet.AspnetCore/SocketConnection.cs index ee5f1cb3..7bc2d9e9 100644 --- a/Source/MQTTnet.AspnetCore/SocketConnection.cs +++ b/Source/MQTTnet.AspnetCore/SocketConnection.cs @@ -81,7 +81,7 @@ public sealed class SocketConnection : ConnectionContext IsConnected = true; } - static Exception ConnectionAborted() + static MqttCommunicationException ConnectionAborted() { return new MqttCommunicationException("Connection Aborted"); } @@ -218,12 +218,16 @@ public sealed class SocketConnection : ConnectionContext var flushTask = _application.Output.FlushAsync(); + FlushResult result; if (!flushTask.IsCompleted) { - await flushTask; + result = await flushTask; + } + else + { + result = flushTask.GetAwaiter().GetResult(); } - var result = flushTask.GetAwaiter().GetResult(); if (result.IsCompleted) { // Pipe consumer is shut down, do we stop writing diff --git a/Source/MQTTnet.AspnetCore/SocketReceiver.cs b/Source/MQTTnet.AspnetCore/SocketReceiver.cs index f8b628fb..f0888e01 100644 --- a/Source/MQTTnet.AspnetCore/SocketReceiver.cs +++ b/Source/MQTTnet.AspnetCore/SocketReceiver.cs @@ -8,7 +8,7 @@ using System.Net.Sockets; namespace MQTTnet.AspNetCore; -public sealed class SocketReceiver +public sealed class SocketReceiver : IDisposable { readonly SocketAwaitable _awaitable; readonly SocketAsyncEventArgs _eventArgs = new(); @@ -33,4 +33,9 @@ public sealed class SocketReceiver return _awaitable; } + + public void Dispose() + { + _eventArgs.Dispose(); + } } \ No newline at end of file diff --git a/Source/MQTTnet.AspnetCore/SocketSender.cs b/Source/MQTTnet.AspnetCore/SocketSender.cs index fc06ea6c..1c4725c1 100644 --- a/Source/MQTTnet.AspnetCore/SocketSender.cs +++ b/Source/MQTTnet.AspnetCore/SocketSender.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; namespace MQTTnet.AspNetCore; -public sealed class SocketSender +public sealed class SocketSender : IDisposable { readonly SocketAwaitable _awaitable; readonly SocketAsyncEventArgs _eventArgs = new(); @@ -28,6 +28,11 @@ public sealed class SocketSender _eventArgs.Completed += (_, e) => ((SocketAwaitable)e.UserToken).Complete(e.BytesTransferred, e.SocketError); } + public void Dispose() + { + _eventArgs.Dispose(); + } + public SocketAwaitable SendAsync(in ReadOnlySequence buffers) { if (buffers.IsSingleSegment) diff --git a/Source/MQTTnet.Benchmarks/AsyncLockBenchmark.cs b/Source/MQTTnet.Benchmarks/AsyncLockBenchmark.cs index 4912fcf4..af7224e8 100644 --- a/Source/MQTTnet.Benchmarks/AsyncLockBenchmark.cs +++ b/Source/MQTTnet.Benchmarks/AsyncLockBenchmark.cs @@ -43,7 +43,7 @@ public class AsyncLockBenchmark : BaseBenchmark if (globalI != tasksCount) { - throw new Exception($"Code is broken ({globalI})!"); + throw new InvalidOperationException($"Code is broken ({globalI})!"); } } diff --git a/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs b/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs index 7942cee5..fdc7ddbc 100644 --- a/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs +++ b/Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs @@ -15,7 +15,7 @@ using MQTTnet.Tests.Mockups; namespace MQTTnet.Benchmarks; [MemoryDiagnoser] -public sealed class ChannelAdapterBenchmark : BaseBenchmark +public sealed class ChannelAdapterBenchmark : BaseBenchmark, IDisposable { MqttChannelAdapter _channelAdapter; int _iterations; @@ -86,4 +86,10 @@ public sealed class ChannelAdapterBenchmark : BaseBenchmark return buffer.ToArray(); } + + public void Dispose() + { + _channelAdapter?.Dispose(); + _stream?.Dispose(); + } } \ No newline at end of file diff --git a/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj b/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj index 1b551ac1..4f1dbbaf 100644 --- a/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj +++ b/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj @@ -1,20 +1,11 @@ - true Exe Full - net8.0 false - false - false - true - 1591;NETSDK1138;NU1803;NU1901;NU1902;CS8892 + $(NoWarn);CS8892;CA1707;CA1051;CA1822 false - all - true - low - latest-Recommended diff --git a/Source/MQTTnet.Benchmarks/MessageDeliveryBenchmark.cs b/Source/MQTTnet.Benchmarks/MessageDeliveryBenchmark.cs index bca65529..66f8bfcf 100644 --- a/Source/MQTTnet.Benchmarks/MessageDeliveryBenchmark.cs +++ b/Source/MQTTnet.Benchmarks/MessageDeliveryBenchmark.cs @@ -2,10 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using MQTTnet.Packets; using MQTTnet.Server; @@ -13,7 +9,7 @@ using MQTTnet.Server; namespace MQTTnet.Benchmarks; [MemoryDiagnoser] -public class MessageDeliveryBenchmark : BaseBenchmark +public sealed class MessageDeliveryBenchmark : BaseBenchmark, IDisposable { List _allSubscribedTopics; // Keep track of the subset of topics that are subscribed CancellationTokenSource _cancellationTokenSource; @@ -99,10 +95,16 @@ public class MessageDeliveryBenchmark : BaseBenchmark if (_messagesReceivedCount < _messagesExpectedCount) { - throw new Exception($"Messages Received Count mismatch, expected {_messagesExpectedCount}, received {_messagesReceivedCount}"); + throw new InvalidOperationException($"Messages Received Count mismatch, expected {_messagesExpectedCount}, received {_messagesReceivedCount}"); } } + public void Dispose() + { + _cancellationTokenSource?.Dispose(); + _mqttServer?.Dispose(); + } + [GlobalSetup] public void Setup() { @@ -173,7 +175,7 @@ public class MessageDeliveryBenchmark : BaseBenchmark var topicIndexStep = totalNumTopics / (_numSubscribedTopicsPerSubscriber * _numSubscribers); if (topicIndexStep * _numSubscribedTopicsPerSubscriber * _numSubscribers != totalNumTopics) { - throw new Exception( + throw new InvalidOperationException( $"The total number of topics must be divisible by the number of subscribed topics across all subscribers. Total number of topics: {totalNumTopics}, topic step: {topicIndexStep}"); } diff --git a/Source/MQTTnet.Benchmarks/MqttTcpChannelBenchmark.cs b/Source/MQTTnet.Benchmarks/MqttTcpChannelBenchmark.cs index fce8cf1e..f0bce147 100644 --- a/Source/MQTTnet.Benchmarks/MqttTcpChannelBenchmark.cs +++ b/Source/MQTTnet.Benchmarks/MqttTcpChannelBenchmark.cs @@ -4,8 +4,6 @@ using System.Buffers; using System.Reflection; -using System.Threading; -using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Jobs; using MQTTnet.Channel; @@ -18,9 +16,9 @@ namespace MQTTnet.Benchmarks; [SimpleJob(RuntimeMoniker.Net60)] [MemoryDiagnoser] -public class MqttTcpChannelBenchmark : BaseBenchmark +public sealed class MqttTcpChannelBenchmark : BaseBenchmark, IDisposable { - IMqttChannel _clientChannel; + MqttTcpChannel _clientChannel; MqttServer _mqttServer; IMqttChannel _serverChannel; @@ -84,4 +82,11 @@ public class MqttTcpChannelBenchmark : BaseBenchmark await _serverChannel.WriteAsync(buffer, true, CancellationToken.None).ConfigureAwait(false); } } + + public void Dispose() + { + _clientChannel?.Dispose(); + _mqttServer?.Dispose(); + _serverChannel?.Dispose(); + } } \ No newline at end of file diff --git a/Source/MQTTnet.Benchmarks/Program.cs b/Source/MQTTnet.Benchmarks/Program.cs index 481f87fa..64dddfde 100644 --- a/Source/MQTTnet.Benchmarks/Program.cs +++ b/Source/MQTTnet.Benchmarks/Program.cs @@ -92,7 +92,7 @@ public static class Program return; } - _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0])); + _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0], StringComparison.Ordinal)); if (_selectedBenchmarkIndex < 0) { diff --git a/Source/MQTTnet.Benchmarks/ReaderExtensionsBenchmark.cs b/Source/MQTTnet.Benchmarks/ReaderExtensionsBenchmark.cs index 1779a57d..d4f86955 100644 --- a/Source/MQTTnet.Benchmarks/ReaderExtensionsBenchmark.cs +++ b/Source/MQTTnet.Benchmarks/ReaderExtensionsBenchmark.cs @@ -13,7 +13,7 @@ namespace MQTTnet.Benchmarks; [SimpleJob(RuntimeMoniker.Net60)] [RPlotExporter, RankColumn] [MemoryDiagnoser] -public class ReaderExtensionsBenchmark +public sealed class ReaderExtensionsBenchmark : IDisposable, IAsyncDisposable { MqttPacketFormatterAdapter _mqttPacketFormatter; MemoryStream _stream; @@ -83,4 +83,17 @@ public class ReaderExtensionsBenchmark } } } + + public void Dispose() + { + _stream?.Dispose(); + } + + public async ValueTask DisposeAsync() + { + if (_stream != null) + { + await _stream.DisposeAsync(); + } + } } \ No newline at end of file diff --git a/Source/MQTTnet.Benchmarks/SendPacketAsyncBenchmark.cs b/Source/MQTTnet.Benchmarks/SendPacketAsyncBenchmark.cs index 82f14553..8b46d787 100644 --- a/Source/MQTTnet.Benchmarks/SendPacketAsyncBenchmark.cs +++ b/Source/MQTTnet.Benchmarks/SendPacketAsyncBenchmark.cs @@ -1,39 +1,19 @@ +using System.Buffers; +using System.IO.Pipelines; using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Jobs; using MQTTnet.Formatter; -using System; -using System.Buffers; -using System.IO; -using System.IO.Pipelines; -using System.Threading.Tasks; namespace MQTTnet.Benchmarks; [SimpleJob(RuntimeMoniker.Net60)] -[RPlotExporter, RankColumn] +[RPlotExporter] +[RankColumn] [MemoryDiagnoser] -public class SendPacketAsyncBenchmark : BaseBenchmark +public sealed class SendPacketAsyncBenchmark : BaseBenchmark, IDisposable, IAsyncDisposable { - MemoryStream _stream; MqttPacketBuffer _buffer; - - [GlobalSetup] - public void GlobalSetup() - { - _stream = new MemoryStream(1024); - var packet = new ArraySegment(new byte[10]); - _buffer = new MqttPacketBuffer(packet); - } - - [Benchmark(Baseline = true)] - public async ValueTask Before() - { - _stream.Position = 0; - var output = PipeWriter.Create(_stream); - - WritePacketBuffer(output, _buffer); - await output.FlushAsync(); - } + MemoryStream _stream; [Benchmark] public async ValueTask After() @@ -52,6 +32,37 @@ public class SendPacketAsyncBenchmark : BaseBenchmark } } + [Benchmark(Baseline = true)] + public async ValueTask Before() + { + _stream.Position = 0; + var output = PipeWriter.Create(_stream); + + WritePacketBuffer(output, _buffer); + await output.FlushAsync(); + } + + public void Dispose() + { + _stream?.Dispose(); + } + + public async ValueTask DisposeAsync() + { + if (_stream != null) + { + await _stream.DisposeAsync(); + } + } + + [GlobalSetup] + public void GlobalSetup() + { + _stream = new MemoryStream(1024); + var packet = new ArraySegment(new byte[10]); + _buffer = new MqttPacketBuffer(packet); + } + static void WritePacketBuffer(PipeWriter output, MqttPacketBuffer buffer) { // copy MqttPacketBuffer's Packet and Payload to the same buffer block of PipeWriter diff --git a/Source/MQTTnet.Benchmarks/SerializerBenchmark.cs b/Source/MQTTnet.Benchmarks/SerializerBenchmark.cs index 721f2c0b..d11d955a 100644 --- a/Source/MQTTnet.Benchmarks/SerializerBenchmark.cs +++ b/Source/MQTTnet.Benchmarks/SerializerBenchmark.cs @@ -26,7 +26,7 @@ public class SerializerBenchmark : BaseBenchmark { MqttPacket _packet; ArraySegment _serializedPacket; - IMqttPacketFormatter _serializer; + MqttV3PacketFormatter _serializer; MqttBufferWriter _bufferWriter; [GlobalSetup] @@ -43,7 +43,7 @@ public class SerializerBenchmark : BaseBenchmark } [Benchmark] - public void Serialize_10000_Messages() + public void Serialize10000Messages() { for (var i = 0; i < 10000; i++) { @@ -53,7 +53,7 @@ public class SerializerBenchmark : BaseBenchmark } [Benchmark] - public void Deserialize_10000_Messages() + public void Deserialize10000Messages() { var channel = new BenchmarkMqttChannel(_serializedPacket); var reader = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(new MqttBufferWriter(4096, 65535)), new MqttNetEventLogger()); @@ -66,7 +66,7 @@ public class SerializerBenchmark : BaseBenchmark } } - class BenchmarkMqttChannel : IMqttChannel + sealed class BenchmarkMqttChannel : IMqttChannel { readonly ArraySegment _buffer; int _position; @@ -81,7 +81,7 @@ public class SerializerBenchmark : BaseBenchmark public EndPoint LocalEndPoint { get; set; } - public bool IsSecureConnection { get; } = false; + public bool IsSecureConnection { get; } public X509Certificate2 ClientCertificate { get; set; } diff --git a/Source/MQTTnet.Extensions.Rpc/DefaultMqttRpcClientTopicGenerationStrategy.cs b/Source/MQTTnet.Extensions.Rpc/DefaultMqttRpcClientTopicGenerationStrategy.cs index 13d78958..1d3c4305 100644 --- a/Source/MQTTnet.Extensions.Rpc/DefaultMqttRpcClientTopicGenerationStrategy.cs +++ b/Source/MQTTnet.Extensions.Rpc/DefaultMqttRpcClientTopicGenerationStrategy.cs @@ -12,7 +12,7 @@ public sealed class DefaultMqttRpcClientTopicGenerationStrategy : IMqttRpcClient { ArgumentNullException.ThrowIfNull(context); - if (context.MethodName.Contains("/") || context.MethodName.Contains("+") || context.MethodName.Contains("#")) + if (context.MethodName.Contains('/') || context.MethodName.Contains('+') || context.MethodName.Contains('#')) { throw new ArgumentException("The method name cannot contain /, + or #."); } diff --git a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj index 41a84f4e..d300ebc9 100644 --- a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj +++ b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj @@ -1,53 +1,19 @@ - net8.0 MQTTnet.Extensions.Rpc MQTTnet.Extensions.Rpc - True - The contributors of MQTTnet - MQTTnet - This is an extension library which allows executing synchronous device calls including a response using MQTTnet. - The contributors of MQTTnet - MQTTnet.Extensions.Rpc - false - false - true - true - snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git - MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - false - false - nuget.png - true - true - LICENSE - For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). - true - true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended true + + True + This is an extension library which allows executing synchronous device calls including a response using MQTTnet. + MQTTnet.Extensions.Rpc + MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor + true + For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). + true - - - - - - - - - diff --git a/Source/MQTTnet.Extensions.Rpc/MqttRpcClientExtensions.cs b/Source/MQTTnet.Extensions.Rpc/MqttRpcClientExtensions.cs index bde8aefc..8e0e42a5 100644 --- a/Source/MQTTnet.Extensions.Rpc/MqttRpcClientExtensions.cs +++ b/Source/MQTTnet.Extensions.Rpc/MqttRpcClientExtensions.cs @@ -14,7 +14,7 @@ public static class MqttRpcClientExtensions { public static Task ExecuteAsync(this IMqttRpcClient client, TimeSpan timeout, string methodName, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, IDictionary parameters = null) { - if (client == null) throw new ArgumentNullException(nameof(client)); + ArgumentNullException.ThrowIfNull(client); var buffer = Encoding.UTF8.GetBytes(payload ?? string.Empty); diff --git a/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj b/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj index cef08d80..e0c4f296 100644 --- a/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj +++ b/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj @@ -1,54 +1,24 @@ - net8.0 MQTTnet.Extensions.TopicTemplate MQTTnet.Extensions.TopicTemplate + true + True - The contributors of MQTTnet - MQTTnet Provides mqtt topic templating logic to support dispatch, routing and similar functionality based on the well known moustache syntax (AsyncAPI compatible). README.md - The contributors of MQTTnet MQTTnet.Extensions.TopicTemplate - false - false - true - true - snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git MQTT Message Queue Telemetry MQTTClient Messaging Routing AsyncAPI Template - en-US - nuget.png - true - true - LICENSE For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). true - 1591;NETSDK1138 - true + - - True - \ - - - - - - - - - - diff --git a/Source/MQTTnet.Extensions.TopicTemplate/MqttTopicTemplate.cs b/Source/MQTTnet.Extensions.TopicTemplate/MqttTopicTemplate.cs index 30dbf6e5..029a9d54 100644 --- a/Source/MQTTnet.Extensions.TopicTemplate/MqttTopicTemplate.cs +++ b/Source/MQTTnet.Extensions.TopicTemplate/MqttTopicTemplate.cs @@ -84,13 +84,13 @@ public sealed class MqttTopicTemplate : IEquatable { var filter = TopicFilter; // append slash if neccessary - if (filter.Length > 0 && !filter.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString()) && !filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard.ToString())) + if (filter.Length > 0 && !filter.EndsWith(MqttTopicFilterComparer.LevelSeparator) && !filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard)) { filter += MqttTopicFilterComparer.LevelSeparator; } // append hash if neccessary - if (!filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard.ToString())) + if (!filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard)) { filter += MqttTopicFilterComparer.MultiLevelWildcard; } @@ -161,12 +161,12 @@ public sealed class MqttTopicTemplate : IEquatable return new MqttTopicTemplate(MqttTopicFilterComparer.MultiLevelWildcard.ToString()); } - if (root.Contains(MqttTopicFilterComparer.LevelSeparator) && !root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString()) && !root.EndsWith("}")) + if (root.Contains(MqttTopicFilterComparer.LevelSeparator) && !root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString(), StringComparison.InvariantCulture) && !root.EndsWith('}')) { root = root.Substring(0, root.LastIndexOf(MqttTopicFilterComparer.LevelSeparator) + 1); } - if (root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString())) + if (root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString(), StringComparison.InvariantCulture)) { root += MqttTopicFilterComparer.SingleLevelWildcard; } diff --git a/Source/MQTTnet.Server/EnhancedAuthentication/ExchangeEnhancedAuthenticationOptionsFactory.cs b/Source/MQTTnet.Server/EnhancedAuthentication/ExchangeEnhancedAuthenticationOptionsFactory.cs index 1b55e3b4..5396d3f6 100644 --- a/Source/MQTTnet.Server/EnhancedAuthentication/ExchangeEnhancedAuthenticationOptionsFactory.cs +++ b/Source/MQTTnet.Server/EnhancedAuthentication/ExchangeEnhancedAuthenticationOptionsFactory.cs @@ -53,10 +53,7 @@ public sealed class ExchangeEnhancedAuthenticationOptionsFactory public ExchangeEnhancedAuthenticationOptionsFactory WithUserProperty(string name, string value) { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } + ArgumentNullException.ThrowIfNull(name); if (_options.UserProperties == null) { diff --git a/Source/MQTTnet.Server/Events/InterceptingPacketEventArgs.cs b/Source/MQTTnet.Server/Events/InterceptingPacketEventArgs.cs index d266d1a2..65b4dbbd 100644 --- a/Source/MQTTnet.Server/Events/InterceptingPacketEventArgs.cs +++ b/Source/MQTTnet.Server/Events/InterceptingPacketEventArgs.cs @@ -10,7 +10,7 @@ namespace MQTTnet.Server; public sealed class InterceptingPacketEventArgs : EventArgs { - public InterceptingPacketEventArgs(CancellationToken cancellationToken, string clientId, string userName, EndPoint remoteEndPoint, MqttPacket packet, IDictionary sessionItems) + public InterceptingPacketEventArgs(string clientId, string userName, EndPoint remoteEndPoint, MqttPacket packet, IDictionary sessionItems, CancellationToken cancellationToken) { CancellationToken = cancellationToken; ClientId = clientId ?? throw new ArgumentNullException(nameof(clientId)); diff --git a/Source/MQTTnet.Server/Events/InterceptingPublishEventArgs.cs b/Source/MQTTnet.Server/Events/InterceptingPublishEventArgs.cs index 9b93112a..44cd7e17 100644 --- a/Source/MQTTnet.Server/Events/InterceptingPublishEventArgs.cs +++ b/Source/MQTTnet.Server/Events/InterceptingPublishEventArgs.cs @@ -8,7 +8,7 @@ namespace MQTTnet.Server; public sealed class InterceptingPublishEventArgs : EventArgs { - public InterceptingPublishEventArgs(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken, string clientId, string userName, IDictionary sessionItems) + public InterceptingPublishEventArgs(MqttApplicationMessage applicationMessage, string clientId, string userName, IDictionary sessionItems, CancellationToken cancellationToken) { ApplicationMessage = applicationMessage ?? throw new ArgumentNullException(nameof(applicationMessage)); CancellationToken = cancellationToken; @@ -30,11 +30,6 @@ public sealed class InterceptingPublishEventArgs : EventArgs /// public string ClientId { get; } - /// - /// Gets the user name of the client. - /// - public string UserName { get; } - public bool CloseConnection { get; set; } /// @@ -45,10 +40,15 @@ public sealed class InterceptingPublishEventArgs : EventArgs /// /// Gets the response which will be sent to the client via the PUBACK etc. packets. /// - public PublishResponse Response { get; } = new PublishResponse(); + public PublishResponse Response { get; } = new(); /// /// Gets or sets a key/value collection that can be used to share data within the scope of this session. /// public IDictionary SessionItems { get; } + + /// + /// Gets the user name of the client. + /// + public string UserName { get; } } \ No newline at end of file diff --git a/Source/MQTTnet.Server/Events/InterceptingSubscriptionEventArgs.cs b/Source/MQTTnet.Server/Events/InterceptingSubscriptionEventArgs.cs index 69c532c9..4bfd3ec0 100644 --- a/Source/MQTTnet.Server/Events/InterceptingSubscriptionEventArgs.cs +++ b/Source/MQTTnet.Server/Events/InterceptingSubscriptionEventArgs.cs @@ -10,12 +10,12 @@ namespace MQTTnet.Server; public sealed class InterceptingSubscriptionEventArgs : EventArgs { public InterceptingSubscriptionEventArgs( - CancellationToken cancellationToken, string clientId, string userName, MqttSessionStatus session, MqttTopicFilter topicFilter, - List userProperties) + List userProperties, + CancellationToken cancellationToken) { CancellationToken = cancellationToken; ClientId = clientId; @@ -36,11 +36,6 @@ public sealed class InterceptingSubscriptionEventArgs : EventArgs /// public string ClientId { get; } - /// - /// Gets the user name of the client. - /// - public string UserName { get; } - /// /// Gets or sets whether the broker should close the client connection. /// @@ -61,7 +56,7 @@ public sealed class InterceptingSubscriptionEventArgs : EventArgs /// /// Gets the response which will be sent to the client via the SUBACK packet. /// - public SubscribeResponse Response { get; } = new SubscribeResponse(); + public SubscribeResponse Response { get; } = new(); /// /// Gets the current client session. @@ -79,6 +74,11 @@ public sealed class InterceptingSubscriptionEventArgs : EventArgs /// public MqttTopicFilter TopicFilter { get; set; } + /// + /// Gets the user name of the client. + /// + public string UserName { get; } + /// /// Gets or sets the user properties. /// MQTT 5.0.0+ feature. diff --git a/Source/MQTTnet.Server/Events/InterceptingUnsubscriptionEventArgs.cs b/Source/MQTTnet.Server/Events/InterceptingUnsubscriptionEventArgs.cs index 053fdbb4..0400108d 100644 --- a/Source/MQTTnet.Server/Events/InterceptingUnsubscriptionEventArgs.cs +++ b/Source/MQTTnet.Server/Events/InterceptingUnsubscriptionEventArgs.cs @@ -9,7 +9,7 @@ namespace MQTTnet.Server; public sealed class InterceptingUnsubscriptionEventArgs : EventArgs { - public InterceptingUnsubscriptionEventArgs(CancellationToken cancellationToken, string clientId, string userName, IDictionary sessionItems, string topic, List userProperties) + public InterceptingUnsubscriptionEventArgs(string clientId, string userName, IDictionary sessionItems, string topic, List userProperties, CancellationToken cancellationToken) { CancellationToken = cancellationToken; ClientId = clientId; diff --git a/Source/MQTTnet.Server/Internal/MqttClientSessionsManager.cs b/Source/MQTTnet.Server/Internal/MqttClientSessionsManager.cs index b4985bd2..9ea01734 100644 --- a/Source/MQTTnet.Server/Internal/MqttClientSessionsManager.cs +++ b/Source/MQTTnet.Server/Internal/MqttClientSessionsManager.cs @@ -131,7 +131,7 @@ public sealed class MqttClientSessionsManager : ISubscriptionChangedNotification // Allow the user to intercept application message... if (_eventContainer.InterceptingPublishEvent.HasHandlers) { - var interceptingPublishEventArgs = new InterceptingPublishEventArgs(applicationMessage, cancellationToken, senderId, senderUserName, senderSessionItems); + var interceptingPublishEventArgs = new InterceptingPublishEventArgs(applicationMessage, senderId, senderUserName, senderSessionItems, cancellationToken); if (string.IsNullOrEmpty(interceptingPublishEventArgs.ApplicationMessage.Topic)) { // This can happen if a topic alias us used but the topic is @@ -437,7 +437,7 @@ public sealed class MqttClientSessionsManager : ISubscriptionChangedNotification } } - public void OnSubscriptionsAdded(MqttSession clientSession, List topics) + public void OnSubscriptionsAdded(MqttSession clientSession, List subscriptionsTopics) { _sessionsManagementLock.EnterWriteLock(); try @@ -448,7 +448,7 @@ public sealed class MqttClientSessionsManager : ISubscriptionChangedNotification _subscriberSessions.Add(clientSession); } - foreach (var topic in topics) + foreach (var topic in subscriptionsTopics) { clientSession.AddSubscribedTopic(topic); } diff --git a/Source/MQTTnet.Server/Internal/MqttClientSubscriptionsManager.cs b/Source/MQTTnet.Server/Internal/MqttClientSubscriptionsManager.cs index 381a155e..df290fb4 100644 --- a/Source/MQTTnet.Server/Internal/MqttClientSubscriptionsManager.cs +++ b/Source/MQTTnet.Server/Internal/MqttClientSubscriptionsManager.cs @@ -81,7 +81,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable return CheckSubscriptionsResult.NotSubscribed; } - var senderIsReceiver = string.Equals(senderId, _session.Id); + var senderIsReceiver = string.Equals(senderId, _session.Id, StringComparison.Ordinal); var maxQoSLevel = -1; // Not subscribed. HashSet subscriptionIdentifiers = null; @@ -460,7 +460,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable List userProperties, CancellationToken cancellationToken) { - var eventArgs = new InterceptingSubscriptionEventArgs(cancellationToken, _session.Id, _session.UserName, new MqttSessionStatus(_session), topicFilter, userProperties); + var eventArgs = new InterceptingSubscriptionEventArgs(_session.Id, _session.UserName, new MqttSessionStatus(_session), topicFilter, userProperties, cancellationToken); if (topicFilter.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtMostOnce) { @@ -475,7 +475,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable eventArgs.Response.ReasonCode = MqttSubscribeReasonCode.GrantedQoS2; } - if (topicFilter.Topic.StartsWith("$share/")) + if (topicFilter.Topic.StartsWith("$share/", StringComparison.InvariantCulture)) { eventArgs.Response.ReasonCode = MqttSubscribeReasonCode.SharedSubscriptionsNotSupported; } @@ -493,7 +493,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable List userProperties, CancellationToken cancellationToken) { - var clientUnsubscribingTopicEventArgs = new InterceptingUnsubscriptionEventArgs(cancellationToken, _session.Id, _session.UserName, _session.Items, topicFilter, userProperties) + var clientUnsubscribingTopicEventArgs = new InterceptingUnsubscriptionEventArgs(_session.Id, _session.UserName, _session.Items, topicFilter, userProperties, cancellationToken) { Response = { diff --git a/Source/MQTTnet.Server/Internal/MqttConnectedClient.cs b/Source/MQTTnet.Server/Internal/MqttConnectedClient.cs index cb765f1e..48e6bd2c 100644 --- a/Source/MQTTnet.Server/Internal/MqttConnectedClient.cs +++ b/Source/MQTTnet.Server/Internal/MqttConnectedClient.cs @@ -156,7 +156,7 @@ public sealed class MqttConnectedClient : IDisposable // TODO: Maybe adding a configuration option is requested in the future. if (disconnectOptions != null) { - if (disconnectOptions.ReasonCode != MqttDisconnectReasonCode.NormalDisconnection || disconnectOptions.UserProperties?.Any() == true || + if (disconnectOptions.ReasonCode != MqttDisconnectReasonCode.NormalDisconnection || disconnectOptions.UserProperties?.Count > 0 || !string.IsNullOrEmpty(disconnectOptions.ReasonString) || !string.IsNullOrEmpty(disconnectOptions.ServerReference)) { // It is very important to send the DISCONNECT packet here BEFORE cancelling the @@ -349,7 +349,7 @@ public sealed class MqttConnectedClient : IDisposable return packet; } - var interceptingPacketEventArgs = new InterceptingPacketEventArgs(cancellationToken, Id, UserName, RemoteEndPoint, packet, Session.Items); + var interceptingPacketEventArgs = new InterceptingPacketEventArgs(Id, UserName, RemoteEndPoint, packet, Session.Items, cancellationToken); await _eventContainer.InterceptingOutboundPacketEvent.InvokeAsync(interceptingPacketEventArgs).ConfigureAwait(false); if (!interceptingPacketEventArgs.ProcessPacket || packet == null) @@ -395,7 +395,7 @@ public sealed class MqttConnectedClient : IDisposable if (_eventContainer.InterceptingInboundPacketEvent.HasHandlers) { - var interceptingPacketEventArgs = new InterceptingPacketEventArgs(cancellationToken, Id, UserName, RemoteEndPoint, currentPacket, Session.Items); + var interceptingPacketEventArgs = new InterceptingPacketEventArgs(Id, UserName, RemoteEndPoint, currentPacket, Session.Items, cancellationToken); await _eventContainer.InterceptingInboundPacketEvent.InvokeAsync(interceptingPacketEventArgs).ConfigureAwait(false); currentPacket = interceptingPacketEventArgs.Packet; processPacket = interceptingPacketEventArgs.ProcessPacket; diff --git a/Source/MQTTnet.Server/Internal/MqttRetainedMessagesManager.cs b/Source/MQTTnet.Server/Internal/MqttRetainedMessagesManager.cs index 1c86489e..8b5a41c3 100644 --- a/Source/MQTTnet.Server/Internal/MqttRetainedMessagesManager.cs +++ b/Source/MQTTnet.Server/Internal/MqttRetainedMessagesManager.cs @@ -7,13 +7,12 @@ using MQTTnet.Internal; namespace MQTTnet.Server.Internal; -public sealed class MqttRetainedMessagesManager +public sealed class MqttRetainedMessagesManager : IDisposable { - readonly Dictionary _messages = new(4096); - readonly AsyncLock _storageAccessLock = new(); - readonly MqttServerEventContainer _eventContainer; readonly MqttNetSourceLogger _logger; + readonly Dictionary _messages = new(4096); + readonly AsyncLock _storageAccessLock = new(); public MqttRetainedMessagesManager(MqttServerEventContainer eventContainer, IMqttNetLogger logger) { @@ -24,6 +23,46 @@ public sealed class MqttRetainedMessagesManager _logger = logger.WithSource(nameof(MqttRetainedMessagesManager)); } + public async Task ClearMessages() + { + lock (_messages) + { + _messages.Clear(); + } + + using (await _storageAccessLock.EnterAsync().ConfigureAwait(false)) + { + await _eventContainer.RetainedMessagesClearedEvent.InvokeAsync(EventArgs.Empty).ConfigureAwait(false); + } + } + + public void Dispose() + { + _storageAccessLock.Dispose(); + } + + public Task GetMessage(string topic) + { + lock (_messages) + { + if (_messages.TryGetValue(topic, out var message)) + { + return Task.FromResult(message); + } + } + + return Task.FromResult(null); + } + + public Task> GetMessages() + { + lock (_messages) + { + var result = new List(_messages.Values); + return Task.FromResult((IList)result); + } + } + public async Task Start() { try @@ -79,8 +118,7 @@ public sealed class MqttRetainedMessagesManager } else { - if (existingMessage.QualityOfServiceLevel != applicationMessage.QualityOfServiceLevel || - !MqttMemoryHelper.SequenceEqual(existingMessage.Payload, payload)) + if (existingMessage.QualityOfServiceLevel != applicationMessage.QualityOfServiceLevel || !MqttMemoryHelper.SequenceEqual(existingMessage.Payload, payload)) { _messages[applicationMessage.Topic] = applicationMessage; saveIsRequired = true; @@ -113,39 +151,4 @@ public sealed class MqttRetainedMessagesManager _logger.Error(exception, "Unhandled exception while handling retained messages."); } } - - public Task> GetMessages() - { - lock (_messages) - { - var result = new List(_messages.Values); - return Task.FromResult((IList)result); - } - } - - public Task GetMessage(string topic) - { - lock (_messages) - { - if (_messages.TryGetValue(topic, out var message)) - { - return Task.FromResult(message); - } - } - - return Task.FromResult(null); - } - - public async Task ClearMessages() - { - lock (_messages) - { - _messages.Clear(); - } - - using (await _storageAccessLock.EnterAsync().ConfigureAwait(false)) - { - await _eventContainer.RetainedMessagesClearedEvent.InvokeAsync(EventArgs.Empty).ConfigureAwait(false); - } - } } \ No newline at end of file diff --git a/Source/MQTTnet.Server/MQTTnet.Server.csproj b/Source/MQTTnet.Server/MQTTnet.Server.csproj index b9cd0ca2..32c8ba01 100644 --- a/Source/MQTTnet.Server/MQTTnet.Server.csproj +++ b/Source/MQTTnet.Server/MQTTnet.Server.csproj @@ -1,56 +1,19 @@ - net8.0 MQTTnet.Server MQTTnet.Server + true + True - The contributors of MQTTnet - MQTTnet true This is the server implementation of MQTTnet. - The contributors of MQTTnet MQTTnet.Server - false - false - true - true - snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - false - false - nuget.png - true - true - LICENSE - true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - enable - disable - latest-Recommended - true - - - - - - - - - diff --git a/Source/MQTTnet.Server/MqttServerFactory.cs b/Source/MQTTnet.Server/MqttServerFactory.cs index 9971c5a4..35f6bafe 100644 --- a/Source/MQTTnet.Server/MqttServerFactory.cs +++ b/Source/MQTTnet.Server/MqttServerFactory.cs @@ -2,12 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System.Diagnostics.CodeAnalysis; using MQTTnet.Diagnostics.Logger; using MQTTnet.Server.EnhancedAuthentication; using MQTTnet.Server.Internal.Adapter; namespace MQTTnet.Server; +[SuppressMessage("Performance", "CA1822:Mark members as static")] public sealed class MqttServerFactory { public MqttServerFactory() : this(new MqttNetNullLogger()) diff --git a/Source/MQTTnet.TestApp/AsyncLockTest.cs b/Source/MQTTnet.TestApp/AsyncLockTest.cs index 65c12826..594cd869 100644 --- a/Source/MQTTnet.TestApp/AsyncLockTest.cs +++ b/Source/MQTTnet.TestApp/AsyncLockTest.cs @@ -11,7 +11,7 @@ namespace MQTTnet.TestApp; public sealed class AsyncLockTest { - public async Task Run() + public static async Task Run() { try { diff --git a/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj b/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj index 68fc336b..a4227da0 100644 --- a/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj +++ b/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj @@ -3,17 +3,7 @@ Exe Full - net8.0 false - false - false - true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended diff --git a/Source/MQTTnet.TestApp/MessageThroughputTest.cs b/Source/MQTTnet.TestApp/MessageThroughputTest.cs index 4a813c9e..619e9299 100644 --- a/Source/MQTTnet.TestApp/MessageThroughputTest.cs +++ b/Source/MQTTnet.TestApp/MessageThroughputTest.cs @@ -14,7 +14,7 @@ namespace MQTTnet.TestApp; /// the number of messages per second that can be exchanged between publishers and subscriber. /// Measurements are performed for subscriptions containing no wildcard, a single wildcard or multiple wildcards. /// -public class MessageThroughputTest +public sealed class MessageThroughputTest : IDisposable { // Change these constants to suit const int NumPublishers = 5000; @@ -55,9 +55,9 @@ public class MessageThroughputTest await Setup(); - await Subscribe_to_No_Wildcard_Topics(); - await Subscribe_to_Single_Wildcard_Topics(); - await Subscribe_to_Multi_Wildcard_Topics(); + await SubscribeToNoWildcardTopics(); + await SubscribeToSingleWildcardTopics(); + await SubscribeToMultiWildcardTopics(); Console.WriteLine(); Console.WriteLine("End message throughput test"); @@ -74,7 +74,7 @@ public class MessageThroughputTest public async Task Setup() { - new TopicGenerator().Generate(NumPublishers, NumTopicsPerPublisher, out _topicsByPublisher, out _singleWildcardTopicsByPublisher, out _multiWildcardTopicsByPublisher); + TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out _topicsByPublisher, out _singleWildcardTopicsByPublisher, out _multiWildcardTopicsByPublisher); var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build(); var mqttClientFactory = new MqttClientFactory(); @@ -152,7 +152,7 @@ public class MessageThroughputTest /// /// Measure no-wildcard topic subscription message exchange performance /// - public Task Subscribe_to_No_Wildcard_Topics() + public Task SubscribeToNoWildcardTopics() { return ProcessMessages(_topicsByPublisher, "no wildcards"); } @@ -160,7 +160,7 @@ public class MessageThroughputTest /// /// Measure single-wildcard topic subscription message exchange performance /// - public Task Subscribe_to_Single_Wildcard_Topics() + public Task SubscribeToSingleWildcardTopics() { return ProcessMessages(_singleWildcardTopicsByPublisher, "single wildcard"); } @@ -168,7 +168,7 @@ public class MessageThroughputTest /// /// Measure multi-wildcard topic subscription message exchange performance /// - public Task Subscribe_to_Multi_Wildcard_Topics() + public Task SubscribeToMultiWildcardTopics() { return ProcessMessages(_multiWildcardTopicsByPublisher, "multi wildcard"); } @@ -342,4 +342,8 @@ public class MessageThroughputTest Console.ResetColor(); } + public void Dispose() + { + _cancellationTokenSource.Dispose(); + } } \ No newline at end of file diff --git a/Source/MQTTnet.TestApp/MqttNetConsoleLogger.cs b/Source/MQTTnet.TestApp/MqttNetConsoleLogger.cs index 30a153e5..a97151f1 100644 --- a/Source/MQTTnet.TestApp/MqttNetConsoleLogger.cs +++ b/Source/MQTTnet.TestApp/MqttNetConsoleLogger.cs @@ -34,7 +34,9 @@ public static class MqttNetConsoleLogger static void PrintToConsole(object sender, MqttNetLogMessagePublishedEventArgs e) { var output = new StringBuilder(); +#pragma warning disable CA1305 output.AppendLine($">> [{e.LogMessage.Timestamp:O}] [{e.LogMessage.ThreadId}] [{e.LogMessage.Source}] [{e.LogMessage.Level}]: {e.LogMessage.Message}"); +#pragma warning restore CA1305 if (e.LogMessage.Exception != null) { output.AppendLine(e.LogMessage.Exception.ToString()); diff --git a/Source/MQTTnet.TestApp/PerformanceTest.cs b/Source/MQTTnet.TestApp/PerformanceTest.cs index 472d2c40..bcf6728e 100644 --- a/Source/MQTTnet.TestApp/PerformanceTest.cs +++ b/Source/MQTTnet.TestApp/PerformanceTest.cs @@ -204,7 +204,7 @@ public static class PerformanceTest }; } - static Task PublishSingleMessage(IMqttClient client, MqttApplicationMessage applicationMessage, ref int count) + static Task PublishSingleMessage(IMqttClient client, MqttApplicationMessage applicationMessage, ref int count) { Interlocked.Increment(ref count); return Task.Run(() => client.PublishAsync(applicationMessage)); diff --git a/Source/MQTTnet.TestApp/Program.cs b/Source/MQTTnet.TestApp/Program.cs index 1ee1c8fd..46fb25cf 100644 --- a/Source/MQTTnet.TestApp/Program.cs +++ b/Source/MQTTnet.TestApp/Program.cs @@ -85,7 +85,7 @@ public static class Program } else if (pressedKey.KeyChar == 'f') { - Task.Run(new AsyncLockTest().Run); + Task.Run(AsyncLockTest.Run); } Thread.Sleep(Timeout.Infinite); diff --git a/Source/MQTTnet.TestApp/PublicBrokerTest.cs b/Source/MQTTnet.TestApp/PublicBrokerTest.cs index 21c55fdc..f8279727 100644 --- a/Source/MQTTnet.TestApp/PublicBrokerTest.cs +++ b/Source/MQTTnet.TestApp/PublicBrokerTest.cs @@ -157,7 +157,7 @@ public static class PublicBrokerTest if (receivedMessage?.Topic != topic || receivedMessage?.ConvertPayloadToString() != "Hello_World") { - throw new Exception("Message invalid."); + throw new InvalidOperationException("Message invalid."); } await client.UnsubscribeAsync(topic).ConfigureAwait(false); diff --git a/Source/MQTTnet.TestApp/ServerTest.cs b/Source/MQTTnet.TestApp/ServerTest.cs index ae0e0975..c22ec2cd 100644 --- a/Source/MQTTnet.TestApp/ServerTest.cs +++ b/Source/MQTTnet.TestApp/ServerTest.cs @@ -129,12 +129,12 @@ public static class ServerTest mqttServer.InterceptingSubscriptionAsync += e => { - if (e.TopicFilter.Topic.StartsWith("admin/foo/bar") && e.ClientId != "theAdmin") + if (e.TopicFilter.Topic.StartsWith("admin/foo/bar", StringComparison.InvariantCulture) && e.ClientId != "theAdmin") { e.Response.ReasonCode = MqttSubscribeReasonCode.ImplementationSpecificError; } - if (e.TopicFilter.Topic.StartsWith("the/secret/stuff") && e.ClientId != "Imperator") + if (e.TopicFilter.Topic.StartsWith("the/secret/stuff", StringComparison.InvariantCulture) && e.ClientId != "Imperator") { e.Response.ReasonCode = MqttSubscribeReasonCode.ImplementationSpecificError; e.CloseConnection = true; diff --git a/Source/MQTTnet.TestApp/TopicGenerator.cs b/Source/MQTTnet.TestApp/TopicGenerator.cs index 76ba1a61..5e3e1303 100644 --- a/Source/MQTTnet.TestApp/TopicGenerator.cs +++ b/Source/MQTTnet.TestApp/TopicGenerator.cs @@ -6,7 +6,7 @@ namespace MQTTnet.TestApp; public class TopicGenerator { - public void Generate( + public static void Generate( int numPublishers, int numTopicsPerPublisher, out Dictionary> topicsByPublisher, out Dictionary> singleWildcardTopicsByPublisher, @@ -84,14 +84,14 @@ public class TopicGenerator } } - void AddPublisherTopic(string publisherName, string topic, Dictionary> topicsByPublisher) + static void AddPublisherTopic(string publisherName, string topic, Dictionary> topicsByPublisher) { - List topicList; - if (!topicsByPublisher.TryGetValue(publisherName, out topicList)) + if (!topicsByPublisher.TryGetValue(publisherName, out var topicList)) { topicList = new List(); topicsByPublisher.Add(publisherName, topicList); } + topicList.Add(topic); } } \ No newline at end of file diff --git a/Source/MQTTnet.Tests/ASP/MqttConnectionContextTest.cs b/Source/MQTTnet.Tests/ASP/MqttConnectionContextTest.cs index b067a236..6f58952d 100644 --- a/Source/MQTTnet.Tests/ASP/MqttConnectionContextTest.cs +++ b/Source/MQTTnet.Tests/ASP/MqttConnectionContextTest.cs @@ -119,9 +119,11 @@ public class MqttConnectionContextTest await Assert.ThrowsExactlyAsync(() => ctx.ReceivePacketAsync(CancellationToken.None)).ConfigureAwait(false); } - class Startup + sealed class Startup { +#pragma warning disable CA1822 public void Configure(IApplicationBuilder app) +#pragma warning restore CA1822 { } } diff --git a/Source/MQTTnet.Tests/BaseTestClass.cs b/Source/MQTTnet.Tests/BaseTestClass.cs index b7088157..198421c2 100644 --- a/Source/MQTTnet.Tests/BaseTestClass.cs +++ b/Source/MQTTnet.Tests/BaseTestClass.cs @@ -20,12 +20,12 @@ public abstract class BaseTestClass return new TestEnvironment(TestContext, protocolVersion, trackUnobservedTaskException); } - protected Task LongTestDelay() + public static Task LongTestDelay() { return Task.Delay(TimeSpan.FromSeconds(1)); } - protected Task MediumTestDelay() + public static Task MediumTestDelay() { return Task.Delay(TimeSpan.FromSeconds(0.5)); } diff --git a/Source/MQTTnet.Tests/Clients/LowLevelMqttClient/LowLevelMqttClient_Tests.cs b/Source/MQTTnet.Tests/Clients/LowLevelMqttClient/LowLevelMqttClient_Tests.cs index 907f97b7..18fdafa8 100644 --- a/Source/MQTTnet.Tests/Clients/LowLevelMqttClient/LowLevelMqttClient_Tests.cs +++ b/Source/MQTTnet.Tests/Clients/LowLevelMqttClient/LowLevelMqttClient_Tests.cs @@ -188,7 +188,7 @@ public sealed class LowLevelMqttClient_Tests : BaseTestClass return await client.ReceiveAsync(CancellationToken.None) as MqttConnAckPacket; } - async Task Subscribe(ILowLevelMqttClient client, string topic) + static async Task Subscribe(ILowLevelMqttClient client, string topic) { await client.SendAsync( new MqttSubscribePacket diff --git a/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Connection_Tests.cs b/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Connection_Tests.cs index 24bb6b1b..60376271 100644 --- a/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Connection_Tests.cs +++ b/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Connection_Tests.cs @@ -73,7 +73,7 @@ public sealed class MqttClient_Connection_Tests : BaseTestClass catch (Exception exception) { Assert.IsNotNull(exception); - Assert.IsInstanceOfType(exception, typeof(MqttCommunicationException)); + Assert.IsInstanceOfType(exception); } await LongTestDelay(); // disconnected handler is called async @@ -161,7 +161,7 @@ public sealed class MqttClient_Connection_Tests : BaseTestClass Assert.AreEqual("test_value", eventArgs.UserProperties[0].Value); } - class TestClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler + sealed class TestClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler { public async Task HandleEnhancedAuthenticationAsync(MqttEnhancedAuthenticationEventArgs eventArgs) { diff --git a/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Tests.cs b/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Tests.cs index 19398460..6a085e86 100644 --- a/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Tests.cs +++ b/Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Tests.cs @@ -6,6 +6,7 @@ using System; using System.Buffers; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.Linq; using System.Net.Sockets; using System.Text; @@ -122,8 +123,8 @@ public sealed class MqttClient_Tests : BaseTestClass await Task.Delay(500); Assert.IsNotNull(ex); - Assert.IsInstanceOfType(ex, typeof(MqttCommunicationException)); - Assert.IsInstanceOfType(ex.InnerException, typeof(SocketException)); + Assert.IsInstanceOfType(ex); + Assert.IsInstanceOfType(ex.InnerException); } [TestMethod] @@ -245,8 +246,8 @@ public sealed class MqttClient_Tests : BaseTestClass catch (Exception exception) { Assert.IsNotNull(exception); - Assert.IsInstanceOfType(exception, typeof(MqttCommunicationException)); - Assert.IsInstanceOfType(exception.InnerException, typeof(SocketException)); + Assert.IsInstanceOfType(exception); + Assert.IsInstanceOfType(exception.InnerException); } } @@ -355,7 +356,7 @@ public sealed class MqttClient_Tests : BaseTestClass async Task Handler1(MqttApplicationMessageReceivedEventArgs eventArgs) { - var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString()); + var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString(), CultureInfo.InvariantCulture); await Task.Delay(value); lock (receivedValues) @@ -369,7 +370,7 @@ public sealed class MqttClient_Tests : BaseTestClass var client2 = await testEnvironment.ConnectClient(); for (var i = MessagesCount; i > 0; i--) { - await client2.PublishStringAsync("x", i.ToString()); + await client2.PublishStringAsync("x", i.ToString(CultureInfo.InvariantCulture)); } await Task.Delay(5000); @@ -401,7 +402,7 @@ public sealed class MqttClient_Tests : BaseTestClass var client2 = await testEnvironment.ConnectClient(); for (var i = MessagesCount; i > 0; i--) { - await client2.PublishStringAsync("x", i.ToString(), MqttQualityOfServiceLevel.ExactlyOnce); + await client2.PublishStringAsync("x", i.ToString(CultureInfo.InvariantCulture), MqttQualityOfServiceLevel.ExactlyOnce); } await Task.Delay(5000); @@ -415,7 +416,7 @@ public sealed class MqttClient_Tests : BaseTestClass Task Handler1(MqttApplicationMessageReceivedEventArgs eventArgs) { - var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString()); + var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString(), CultureInfo.InvariantCulture); eventArgs.AutoAcknowledge = false; Task.Delay(value).ContinueWith(_ => eventArgs.AcknowledgeAsync(CancellationToken.None)); diff --git a/Source/MQTTnet.Tests/Extensions/Rpc_Tests.cs b/Source/MQTTnet.Tests/Extensions/Rpc_Tests.cs index ca39646f..acf9c916 100644 --- a/Source/MQTTnet.Tests/Extensions/Rpc_Tests.cs +++ b/Source/MQTTnet.Tests/Extensions/Rpc_Tests.cs @@ -220,7 +220,7 @@ public sealed class Rpc_Tests : BaseTestClass Assert.AreEqual("pong", Encoding.UTF8.GetString(response)); } - class TestTopicStrategy : IMqttRpcClientTopicGenerationStrategy + sealed class TestTopicStrategy : IMqttRpcClientTopicGenerationStrategy { public MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context) { @@ -232,7 +232,7 @@ public sealed class Rpc_Tests : BaseTestClass } } - class TestParametersTopicGenerationStrategy : IMqttRpcClientTopicGenerationStrategy + sealed class TestParametersTopicGenerationStrategy : IMqttRpcClientTopicGenerationStrategy { internal const string ExpectedParamName = "test_param_name"; diff --git a/Source/MQTTnet.Tests/Formatter/MqttBufferReader_Tests.cs b/Source/MQTTnet.Tests/Formatter/MqttBufferReader_Tests.cs index 0ced1b0b..d449d476 100644 --- a/Source/MQTTnet.Tests/Formatter/MqttBufferReader_Tests.cs +++ b/Source/MQTTnet.Tests/Formatter/MqttBufferReader_Tests.cs @@ -287,7 +287,7 @@ public sealed class MqttBufferReader_Tests // Helper class to build up a reference to elements of various types in a buffer - class ElementReference + sealed class ElementReference { public enum BufferElementType { diff --git a/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs b/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs index a83404b5..e9c95062 100644 --- a/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs +++ b/Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs @@ -551,7 +551,7 @@ public sealed class MqttPacketSerialization_V3_Binary_Tests } - void DeserializeAndCompare(MqttPacket packet, string expectedBase64Value, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311) + static void DeserializeAndCompare(MqttPacket packet, string expectedBase64Value, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311) { var writer = WriterFactory(); diff --git a/Source/MQTTnet.Tests/Internal/MqttPacketBus_Tests.cs b/Source/MQTTnet.Tests/Internal/MqttPacketBus_Tests.cs index 9152682d..dfd78bc2 100644 --- a/Source/MQTTnet.Tests/Internal/MqttPacketBus_Tests.cs +++ b/Source/MQTTnet.Tests/Internal/MqttPacketBus_Tests.cs @@ -35,15 +35,15 @@ public sealed class MqttPacketBus_Tests Assert.AreEqual(9, bus.TotalItemsCount); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket)); - Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket)); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); + Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet); Assert.AreEqual(0, bus.TotalItemsCount); } diff --git a/Source/MQTTnet.Tests/MQTTnet.Tests.csproj b/Source/MQTTnet.Tests/MQTTnet.Tests.csproj index 419c0493..84542954 100644 --- a/Source/MQTTnet.Tests/MQTTnet.Tests.csproj +++ b/Source/MQTTnet.Tests/MQTTnet.Tests.csproj @@ -3,19 +3,10 @@ Exe - net8.0 false - false - false - true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended default disable + $(NoWarn);CA1707 @@ -23,7 +14,6 @@ - diff --git a/Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs b/Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs index 1c9e3269..6093c788 100644 --- a/Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs +++ b/Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs @@ -31,7 +31,7 @@ public sealed class MemoryMqttChannel : IMqttChannel public EndPoint LocalEndPoint { get; set; } - public bool IsSecureConnection { get; } = false; + public bool IsSecureConnection { get; } public X509Certificate2 ClientCertificate { get; set; } @@ -60,5 +60,6 @@ public sealed class MemoryMqttChannel : IMqttChannel public void Dispose() { + _stream.Dispose(); } } \ No newline at end of file diff --git a/Source/MQTTnet.Tests/Mockups/TestEnvironment.cs b/Source/MQTTnet.Tests/Mockups/TestEnvironment.cs index c0083f93..23cd8f64 100644 --- a/Source/MQTTnet.Tests/Mockups/TestEnvironment.cs +++ b/Source/MQTTnet.Tests/Mockups/TestEnvironment.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; @@ -182,7 +181,9 @@ public sealed class TestEnvironment : IDisposable return new MqttRpcClient(await ConnectClient(), options); } +#pragma warning disable CA1822 public TestApplicationMessageReceivedHandler CreateApplicationMessageHandler(IMqttClient mqttClient) +#pragma warning restore CA1822 { return new TestApplicationMessageReceivedHandler(mqttClient); } @@ -199,7 +200,7 @@ public sealed class TestEnvironment : IDisposable { var clientOptions = e.ClientOptions; var existingClientId = clientOptions.ClientId; - if (existingClientId != null && !existingClientId.StartsWith(TestContext.TestName)) + if (existingClientId != null && !existingClientId.StartsWith(TestContext.TestName, StringComparison.InvariantCulture)) { clientOptions.ClientId = TestContext.TestName + "_" + existingClientId; } @@ -257,7 +258,7 @@ public sealed class TestEnvironment : IDisposable if (TestContext != null) { // Null is used when the client id is assigned from the server! - if (!string.IsNullOrEmpty(e.ClientId) && !e.ClientId.StartsWith(TestContext.TestName)) + if (!string.IsNullOrEmpty(e.ClientId) && !e.ClientId.StartsWith(TestContext.TestName, StringComparison.InvariantCulture)) { TrackException(new InvalidOperationException($"Invalid client ID used ({e.ClientId}). It must start with UnitTest name.")); e.ReasonCode = MqttConnectReasonCode.ClientIdentifierNotValid; @@ -326,10 +327,10 @@ public sealed class TestEnvironment : IDisposable GC.WaitForFullGCComplete(); GC.WaitForPendingFinalizers(); - if (_exceptions.Any()) + if (_exceptions.Count > 0) { // ReSharper disable once ThrowExceptionInUnexpectedLocation - throw new Exception($"{_exceptions.Count} exceptions tracked.\r\n" + string.Join(Environment.NewLine, _exceptions)); + throw new InvalidOperationException($"{_exceptions.Count} exceptions tracked.\r\n" + string.Join(Environment.NewLine, _exceptions)); } } finally @@ -387,7 +388,7 @@ public sealed class TestEnvironment : IDisposable { var message = $"Server had {_serverErrors.Count} errors (${string.Join(Environment.NewLine, _serverErrors)})."; Console.WriteLine(message); - throw new Exception(message); + throw new InvalidOperationException(message); } } } @@ -400,7 +401,7 @@ public sealed class TestEnvironment : IDisposable { var message = $"Client(s) had {_clientErrors.Count} errors (${string.Join(Environment.NewLine, _clientErrors)})"; Console.WriteLine(message); - throw new Exception(message); + throw new InvalidOperationException(message); } } } diff --git a/Source/MQTTnet.Tests/Mockups/TestLogger.cs b/Source/MQTTnet.Tests/Mockups/TestLogger.cs index ab2d535c..7cfe1d98 100644 --- a/Source/MQTTnet.Tests/Mockups/TestLogger.cs +++ b/Source/MQTTnet.Tests/Mockups/TestLogger.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Globalization; using MQTTnet.Diagnostics.Logger; namespace MQTTnet.Tests.Mockups; @@ -13,12 +14,12 @@ public sealed class TestLogger : IMqttNetLogger public bool IsEnabled { get; } = true; - public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception) + public void Publish(MqttNetLogLevel level, string source, string message, object[] parameters, Exception exception) { LogMessagePublished?.Invoke(this, new MqttNetLogMessagePublishedEventArgs(new MqttNetLogMessage { - Level = logLevel, - Message = string.Format(message, parameters), + Level = level, + Message = string.Format(CultureInfo.InvariantCulture, message, parameters), Exception = exception })); } diff --git a/Source/MQTTnet.Tests/MqttTcpChannel_Tests.cs b/Source/MQTTnet.Tests/MqttTcpChannel_Tests.cs index bc65a0c7..d0e46818 100644 --- a/Source/MQTTnet.Tests/MqttTcpChannel_Tests.cs +++ b/Source/MQTTnet.Tests/MqttTcpChannel_Tests.cs @@ -71,7 +71,7 @@ public class MqttTcpChannel_Tests } catch (Exception exception) { - Assert.IsInstanceOfType(exception, typeof(SocketException)); + Assert.IsInstanceOfType(exception); Assert.AreEqual(SocketError.OperationAborted, ((SocketException)exception).SocketErrorCode); } } diff --git a/Source/MQTTnet.Tests/RoundtripTime_Tests.cs b/Source/MQTTnet.Tests/RoundtripTime_Tests.cs index d3d99f0e..36ac91fd 100644 --- a/Source/MQTTnet.Tests/RoundtripTime_Tests.cs +++ b/Source/MQTTnet.Tests/RoundtripTime_Tests.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using MQTTnet.Internal; @@ -45,7 +46,7 @@ public class RoundtripTime_Tests for (var i = 0; i < 100; i++) { response = new TaskCompletionSource(); - await senderClient.PublishStringAsync("test", DateTime.UtcNow.Ticks.ToString()); + await senderClient.PublishStringAsync("test", DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture)); if (!response.Task.Wait(TimeSpan.FromSeconds(5))) { throw new TimeoutException(); diff --git a/Source/MQTTnet.Tests/Server/General.cs b/Source/MQTTnet.Tests/Server/General.cs index 42905426..12955cf9 100644 --- a/Source/MQTTnet.Tests/Server/General.cs +++ b/Source/MQTTnet.Tests/Server/General.cs @@ -350,7 +350,7 @@ public class General_Tests : BaseTestClass var isIntercepted = false; c2.ApplicationMessageReceivedAsync += e => { - isIntercepted = string.Compare("extended", Encoding.UTF8.GetString(e.ApplicationMessage.Payload), StringComparison.Ordinal) == 0; + isIntercepted = string.Equals("extended", Encoding.UTF8.GetString(e.ApplicationMessage.Payload), StringComparison.Ordinal); return CompletedTask.Instance; }; diff --git a/Source/MQTTnet.Tests/Server/HotSwapCerts_Tests.cs b/Source/MQTTnet.Tests/Server/HotSwapCerts_Tests.cs index 74b69551..71195afa 100644 --- a/Source/MQTTnet.Tests/Server/HotSwapCerts_Tests.cs +++ b/Source/MQTTnet.Tests/Server/HotSwapCerts_Tests.cs @@ -295,10 +295,10 @@ public sealed class HotSwapCerts_Tests } } - class HotSwappableClientCertProvider : IMqttClientCertificatesProvider, IDisposable + sealed class HotSwappableClientCertProvider : IMqttClientCertificatesProvider, IDisposable { X509Certificate2Collection _certificates; - ConcurrentBag _serverCerts = new ConcurrentBag(); + ConcurrentBag _serverCerts = new(); public HotSwappableClientCertProvider() { diff --git a/Source/MQTTnet.Tests/Server/MqttSubscriptionsManager_Tests.cs b/Source/MQTTnet.Tests/Server/MqttSubscriptionsManager_Tests.cs index 6f3c9ebc..c8291cdd 100644 --- a/Source/MQTTnet.Tests/Server/MqttSubscriptionsManager_Tests.cs +++ b/Source/MQTTnet.Tests/Server/MqttSubscriptionsManager_Tests.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; @@ -16,10 +17,15 @@ namespace MQTTnet.Tests.Server; // ReSharper disable InconsistentNaming [TestClass] -public sealed class MqttSubscriptionsManager_Tests : BaseTestClass +public sealed class MqttSubscriptionsManager_Tests : BaseTestClass, IDisposable { MqttClientSubscriptionsManager _subscriptionsManager; + public void Dispose() + { + _subscriptionsManager?.Dispose(); + } + [TestMethod] public async Task MqttSubscriptionsManager_SubscribeAndUnsubscribeSingle() { @@ -46,7 +52,7 @@ public sealed class MqttSubscriptionsManager_Tests : BaseTestClass { TopicFilters = [ - new() { Topic = "A/B/C", QualityOfServiceLevel = MqttQualityOfServiceLevel.AtMostOnce } + new MqttTopicFilter { Topic = "A/B/C", QualityOfServiceLevel = MqttQualityOfServiceLevel.AtMostOnce } ] }; @@ -178,6 +184,48 @@ public sealed class MqttSubscriptionsManager_Tests : BaseTestClass CheckIsNotSubscribed("house/2/room/bed"); } + [TestInitialize] + public void TestInitialize() + { + var logger = new TestLogger(); + var options = new MqttServerOptions(); + var retainedMessagesManager = new MqttRetainedMessagesManager(new MqttServerEventContainer(), logger); + var eventContainer = new MqttServerEventContainer(); + var clientSessionManager = new MqttClientSessionsManager(options, retainedMessagesManager, eventContainer, logger); + + var session = new MqttSession( + new MqttConnectPacket + { + ClientId = "" + }, + new ConcurrentDictionary(), + options, + eventContainer, + retainedMessagesManager, + clientSessionManager); + + _subscriptionsManager = new MqttClientSubscriptionsManager(session, new MqttServerEventContainer(), retainedMessagesManager, clientSessionManager); + } + + void CheckIsNotSubscribed(string topic) + { + var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, ""); + Assert.IsFalse(result.IsSubscribed); + } + + void CheckIsSubscribed(string topic) + { + var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, ""); + Assert.IsTrue(result.IsSubscribed); + Assert.AreEqual(MqttQualityOfServiceLevel.AtMostOnce, result.QualityOfServiceLevel); + } + + CheckSubscriptionsResult CheckSubscriptions(string topic, MqttQualityOfServiceLevel applicationMessageQoSLevel, string senderClientId) + { + MqttTopicHash.Calculate(topic, out var topicHash, out _, out _); + return _subscriptionsManager.CheckSubscriptions(topic, topicHash, applicationMessageQoSLevel, senderClientId); + } + async Task SubscribeToTopic(string topic) { var sp = new MqttSubscribePacket @@ -190,40 +238,4 @@ public sealed class MqttSubscriptionsManager_Tests : BaseTestClass await _subscriptionsManager.Subscribe(sp, CancellationToken.None); } - - void CheckIsSubscribed(string topic) - { - var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, ""); - Assert.IsTrue(result.IsSubscribed); - Assert.AreEqual(MqttQualityOfServiceLevel.AtMostOnce, result.QualityOfServiceLevel); - } - - void CheckIsNotSubscribed(string topic) - { - var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, ""); - Assert.IsFalse(result.IsSubscribed); - } - - [TestInitialize] - public void TestInitialize() - { - var logger = new TestLogger(); - var options = new MqttServerOptions(); - var retainedMessagesManager = new MqttRetainedMessagesManager(new MqttServerEventContainer(), logger); - var eventContainer = new MqttServerEventContainer(); - var clientSessionManager = new MqttClientSessionsManager(options, retainedMessagesManager, eventContainer, logger); - - var session = new MqttSession(new MqttConnectPacket - { - ClientId = "" - }, new ConcurrentDictionary(), options, eventContainer, retainedMessagesManager, clientSessionManager); - - _subscriptionsManager = new MqttClientSubscriptionsManager(session, new MqttServerEventContainer(), retainedMessagesManager, clientSessionManager); - } - - CheckSubscriptionsResult CheckSubscriptions(string topic, MqttQualityOfServiceLevel applicationMessageQoSLevel, string senderClientId) - { - MqttTopicHash.Calculate(topic, out var topicHash, out _, out _); - return _subscriptionsManager.CheckSubscriptions(topic, topicHash, applicationMessageQoSLevel, senderClientId); - } } \ No newline at end of file diff --git a/Source/MQTTnet.Tests/Server/Retained_Messages_Tests.cs b/Source/MQTTnet.Tests/Server/Retained_Messages_Tests.cs index 0354a7bb..422a2bdc 100644 --- a/Source/MQTTnet.Tests/Server/Retained_Messages_Tests.cs +++ b/Source/MQTTnet.Tests/Server/Retained_Messages_Tests.cs @@ -24,7 +24,7 @@ public class Retained_Messages_Tests : BaseTestClass var c1 = await testEnvironment.ConnectClient(); await c1.PublishAsync(new MqttApplicationMessageBuilder().WithTopic("retained").WithPayload(new byte[3]).WithRetainFlag().Build()); - await c1.PublishAsync(new MqttApplicationMessageBuilder().WithTopic("retained").WithPayload(new byte[0]).WithRetainFlag().Build()); + await c1.PublishAsync(new MqttApplicationMessageBuilder().WithTopic("retained").WithPayload([]).WithRetainFlag().Build()); await c1.DisconnectAsync(); diff --git a/Source/MQTTnet.Tests/Server/Security_Tests.cs b/Source/MQTTnet.Tests/Server/Security_Tests.cs index e27aff86..24db3638 100644 --- a/Source/MQTTnet.Tests/Server/Security_Tests.cs +++ b/Source/MQTTnet.Tests/Server/Security_Tests.cs @@ -144,7 +144,7 @@ public class Security_Tests : BaseTestClass var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1", testEnvironment.ServerPort).WithCredentials(username, password).Build(); var ex = await Assert.ThrowsExactlyAsync(async () => await client.ConnectAsync(clientOptions)); - Assert.IsInstanceOfType(ex.InnerException, typeof(MqttProtocolViolationException)); + Assert.IsInstanceOfType(ex.InnerException); Assert.AreEqual("Error while authenticating. If the User Name Flag is set to 0, the Password Flag MUST be set to 0 [MQTT-3.1.2-22].", ex.Message, false); } diff --git a/Source/MQTTnet.Tests/Server/Subscribe_Tests.cs b/Source/MQTTnet.Tests/Server/Subscribe_Tests.cs index 8030a531..97c2f9a1 100644 --- a/Source/MQTTnet.Tests/Server/Subscribe_Tests.cs +++ b/Source/MQTTnet.Tests/Server/Subscribe_Tests.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Globalization; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -222,7 +223,7 @@ public sealed class Subscribe_Tests : BaseTestClass for (var i = 0; i < 500; i++) { - var so = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(i.ToString()).Build(); + var so = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(i.ToString(CultureInfo.InvariantCulture)).Build(); await c1.SubscribeAsync(so); @@ -234,7 +235,7 @@ public sealed class Subscribe_Tests : BaseTestClass var messageBuilder = new MqttApplicationMessageBuilder(); for (var i = 0; i < 500; i++) { - messageBuilder.WithTopic(i.ToString()); + messageBuilder.WithTopic(i.ToString(CultureInfo.InvariantCulture)); await c2.PublishAsync(messageBuilder.Build()); @@ -264,7 +265,7 @@ public sealed class Subscribe_Tests : BaseTestClass var optionsBuilder = new MqttClientSubscribeOptionsBuilder(); for (var i = 0; i < 500; i++) { - optionsBuilder.WithTopicFilter(i.ToString()); + optionsBuilder.WithTopicFilter(i.ToString(CultureInfo.InvariantCulture)); } await c1.SubscribeAsync(optionsBuilder.Build()); @@ -274,7 +275,7 @@ public sealed class Subscribe_Tests : BaseTestClass var messageBuilder = new MqttApplicationMessageBuilder(); for (var i = 0; i < 500; i++) { - messageBuilder.WithTopic(i.ToString()); + messageBuilder.WithTopic(i.ToString(CultureInfo.InvariantCulture)); await c2.PublishAsync(messageBuilder.Build()); } diff --git a/Source/MQTTnet.Tests/Server/Subscription_TopicHash_Tests.cs b/Source/MQTTnet.Tests/Server/Subscription_TopicHash_Tests.cs index 2a6003ce..a455c140 100644 --- a/Source/MQTTnet.Tests/Server/Subscription_TopicHash_Tests.cs +++ b/Source/MQTTnet.Tests/Server/Subscription_TopicHash_Tests.cs @@ -14,7 +14,7 @@ using MQTTnet.Tests.Mockups; namespace MQTTnet.Tests.Server; [TestClass] -public sealed class SubscriptionTopicHashTests +public sealed class SubscriptionTopicHashTests : IDisposable { MqttSession _clientSession; @@ -84,6 +84,11 @@ public sealed class SubscriptionTopicHashTests CheckTopicHash("client1/+/level1/#", 0x65004A0000000000, 0xFF00FF0000000000); } + public void Dispose() + { + _clientSession?.Dispose(); + } + /// /// Test long topic name with last level being # /// @@ -414,7 +419,7 @@ public sealed class SubscriptionTopicHashTests foreach (var t in topics) { // replace last letter with x - topicsToFind.Add(t.Substring(0, t.Length - 1) + "x"); + topicsToFind.Add(string.Concat(t.AsSpan(0, t.Length - 1), "x")); } matchCount = CheckTopicSubscriptions(_clientSession, topicsToFind, "No Wildcard No Match (Replace X)"); @@ -468,7 +473,7 @@ public sealed class SubscriptionTopicHashTests Assert.AreEqual(0xff, hashMaskBytes[7], "mask 7 mismatch"); } - void CheckTopicHash(string topic, ulong expectedHash, ulong expectedHashMask) + static void CheckTopicHash(string topic, ulong expectedHash, ulong expectedHashMask) { MqttTopicHash.Calculate(topic, out var topicHash, out var hashMask, out _); @@ -481,7 +486,7 @@ public sealed class SubscriptionTopicHashTests Assert.AreEqual(expectedHashMask, hashMask, "Topic hash mask not as expected"); } - int CheckTopicSubscriptions(MqttSession clientSession, List topicsToFind, string subject) + static int CheckTopicSubscriptions(MqttSession clientSession, List topicsToFind, string subject) { var matchCount = 0; @@ -517,7 +522,7 @@ public sealed class SubscriptionTopicHashTests return matchCount; } - byte[] GetBytes(ulong value) + static byte[] GetBytes(ulong value) { var bytes = BitConverter.GetBytes(value); // Ensure that highest byte comes first for comparison left to right diff --git a/Source/MQTTnet.Tests/Server/Topic_Alias_Tests.cs b/Source/MQTTnet.Tests/Server/Topic_Alias_Tests.cs index 5ea83e01..8b57058a 100644 --- a/Source/MQTTnet.Tests/Server/Topic_Alias_Tests.cs +++ b/Source/MQTTnet.Tests/Server/Topic_Alias_Tests.cs @@ -71,6 +71,6 @@ public sealed class Topic_Alias_Tests : BaseTestClass Assert.HasCount(3, receivedTopics); CollectionAssert.AllItemsAreNotNull(receivedTopics); - Assert.IsTrue(receivedTopics.All(t => t.Equals("this_is_the_topic"))); + Assert.IsTrue(receivedTopics.All(t => t.Equals("this_is_the_topic", System.StringComparison.Ordinal))); } } \ No newline at end of file diff --git a/Source/MQTTnet/MQTTnet.csproj b/Source/MQTTnet/MQTTnet.csproj index af4b7ca4..87b4e139 100644 --- a/Source/MQTTnet/MQTTnet.csproj +++ b/Source/MQTTnet/MQTTnet.csproj @@ -10,42 +10,15 @@ - net8.0 MQTTnet MQTTnet - True - The contributors of MQTTnet - MQTTnet + true + + true true MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. - The contributors of MQTTnet MQTTnet - false - false - true - true - snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - true - false - nuget.png - true - true - LICENSE - true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - true - all - true - low - latest-Recommended - true @@ -54,14 +27,4 @@ - - - - - - - - - - \ No newline at end of file