Refactoring

MQTTnet.Core/Server/IMqttServer.cs

@@ -1,18 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using MQTTnet.Core.Client;
 
 namespace MQTTnet.Core.Server
 {
-    public interface IMqttServer
+    public interface IMqttServer : IApplicationMessageReceiver, IApplicationMessagePublisher
     {
         event EventHandler<MqttClientConnectedEventArgs> ClientConnected;
         event EventHandler<MqttClientDisconnectedEventArgs> ClientDisconnected;
 
-        event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
-
         IList<ConnectedMqttClient> GetConnectedClients();
-        void Publish(MqttApplicationMessage applicationMessage);
 
         Task StartAsync();
         Task StopAsync();

MQTTnet.Core/Server/MqttApplicationMessageReceivedEventArgs.cs

@@ -1,17 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttApplicationMessageReceivedEventArgs : EventArgs
-    {
-        public MqttApplicationMessageReceivedEventArgs(string clientId, MqttApplicationMessage applicationMessage)
-        {
-            ClientId = clientId;
-            ApplicationMessage = applicationMessage ?? throw new ArgumentNullException(nameof(applicationMessage));
-        }
-
-        public string ClientId { get; }
-
-        public MqttApplicationMessage ApplicationMessage { get; }
-    }
-}

MQTTnet.Core/Server/MqttClientSessionsManager.cs

@@ -11,6 +11,7 @@ using MQTTnet.Core.Protocol;
 using MQTTnet.Core.Serializer;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using MQTTnet.Core.Client;
 
 namespace MQTTnet.Core.Server
 {
@@ -28,9 +29,9 @@ namespace MQTTnet.Core.Server
             _mqttClientSesssionFactory = mqttClientSesssionFactory ?? throw new ArgumentNullException(nameof(mqttClientSesssionFactory));
         }
 
-        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
         public event EventHandler<MqttClientConnectedEventArgs> ClientConnected;
         public event EventHandler<MqttClientDisconnectedEventArgs> ClientDisconnected;
+        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
 
         public MqttClientRetainedMessagesManager RetainedMessagesManager { get; }
         public MqttServerOptions Options { get; }

MQTTnet.Core/Server/MqttServer.cs

@@ -6,6 +6,7 @@ using MQTTnet.Core.Adapter;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Linq;
+using MQTTnet.Core.Client;
 
 namespace MQTTnet.Core.Server
 {
@@ -45,12 +46,22 @@ namespace MQTTnet.Core.Server
         public event EventHandler<MqttClientDisconnectedEventArgs> ClientDisconnected;
         public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
 
-        public void Publish(MqttApplicationMessage applicationMessage)
+        public Task PublishAsync(IEnumerable<MqttApplicationMessage> applicationMessages)
         {
-            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
+            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
 
-            _options.ApplicationMessageInterceptor?.Invoke(applicationMessage);
-            _clientSessionsManager.DispatchApplicationMessage(null, applicationMessage);
+            if (_cancellationTokenSource == null)
+            {
+                throw new InvalidOperationException("The server is not started.");
+            }
+
+            foreach (var applicationMessage in applicationMessages)
+            {
+                _options.ApplicationMessageInterceptor?.Invoke(applicationMessage);
+                _clientSessionsManager.DispatchApplicationMessage(null, applicationMessage);
+            }
+            
+            return Task.FromResult(0);
         }
 
         public async Task StartAsync()

MQTTnet.Core/Server/MqttServerOptions.cs

@@ -4,7 +4,7 @@ using MQTTnet.Core.Protocol;
 
 namespace MQTTnet.Core.Server
 {
-    public sealed class MqttServerOptions
+    public class MqttServerOptions
     {
         public MqttServerDefaultEndpointOptions DefaultEndpointOptions { get; } = new MqttServerDefaultEndpointOptions();