Improve performance and drop support for old frameworks (#2068)

* Remove WebSocket4Net extension library * Remove UWP support * Drop support for all old frameworks * Update CI * Update CI * Update CI * Update CI * Remove obsolete code * Set default protocol version to 5.0.0 * Remove obsolete tests * Remove old dependencies * Reset release notes * Move server to dedicated project * Fix unit tests * Update and cleanup nuget packages * Fix unit tests Refactor code * No longer throw exception when receiving non success CONNACK * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable code signing * Enable code signing * Enable code signing * Fix client endpoint handling * Improve CI * Fix CI * Fix CI * Fix CI * Fix CI * Import changes from version 4 * Cleanup target frameworks and remove obsolete code * Drop support for dotnet7.0 * Remove managed client * Version5 auditmode (#2016) Added NuGet audit mode and some other settings to get informed about security issues. * Address warnings from analyzers * Support for ReadOnlySequence as payload (#2046) * use ReadOnlySequence as payload * fix build * fix build * skip sign in forks * remove unnecessary owner * tests and extensions * remove test * simplify WritePacketBuffer, remove unused helper * Adjust namespaces * Fix build errors * Import latest fixes from main branch * Adjust namespaces --------- Co-authored-by: SeppPenner <HansM2013@gmx.de> Co-authored-by: Martin Regen <mregen@microsoft.com>
2026-10-31 03:02:39 +08:00 · 2024-08-24 11:47:21 +02:00
parent e18a91a4b5
commit 980a5d0a6d
459 changed files with 12197 additions and 16662 deletions
@@ -7,60 +7,42 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
-using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Server;

-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore;
+
+public sealed class MqttHostedServer : MqttServer, IHostedService
 {
-    public sealed class MqttHostedServer : MqttServer, IHostedService
+    readonly IHostApplicationLifetime _hostApplicationLifetime;
+    readonly MqttServerFactory _mqttFactory;
+
+    public MqttHostedServer(
+        IHostApplicationLifetime hostApplicationLifetime,
+        MqttServerFactory mqttFactory,
+        MqttServerOptions options,
+        IEnumerable<IMqttServerAdapter> adapters,
+        IMqttNetLogger logger) : base(options, adapters, logger)
    {
-        readonly MqttFactory _mqttFactory;
-#if NETCOREAPP3_1_OR_GREATER
-        readonly IHostApplicationLifetime _hostApplicationLifetime;
-        public MqttHostedServer(IHostApplicationLifetime hostApplicationLifetime, MqttFactory mqttFactory,
-            MqttServerOptions options, IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) : base(
-            options,
-            adapters,
-            logger)
-        {
-            _mqttFactory = mqttFactory ?? throw new ArgumentNullException(nameof(mqttFactory));
-            _hostApplicationLifetime = hostApplicationLifetime;
-        }
-#else
-        public MqttHostedServer(MqttFactory mqttFactory,
-            MqttServerOptions options, IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) : base(
-            options,
-            adapters,
-            logger)
-        {
-            _mqttFactory = mqttFactory ?? throw new ArgumentNullException(nameof(mqttFactory));
-        }
-#endif
+        _mqttFactory = mqttFactory ?? throw new ArgumentNullException(nameof(mqttFactory));
+        _hostApplicationLifetime = hostApplicationLifetime;
+    }

+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        // The yield makes sure that the hosted service is considered up and running.
+        await Task.Yield();

-        public async Task StartAsync(CancellationToken cancellationToken)
-        {
-            // The yield makes sure that the hosted service is considered up and running.
-            await Task.Yield();
-#if NETCOREAPP3_1_OR_GREATER
-            _hostApplicationLifetime.ApplicationStarted.Register(OnStarted);
-#else
-            _ = StartAsync();
-#endif
+        _hostApplicationLifetime.ApplicationStarted.Register(OnStarted);
+    }

-        }
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        return StopAsync(_mqttFactory.CreateMqttServerStopOptionsBuilder().Build());
+    }

-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            return StopAsync(_mqttFactory.CreateMqttServerStopOptionsBuilder().Build());
-        }
-
-#if NETCOREAPP3_1_OR_GREATER
-        private void OnStarted()
-        {
-            _ = StartAsync();
-        }
-#endif
+    void OnStarted()
+    {
+        _ = StartAsync();
    }
 }