YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-30 02:38:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix breaking changes.

Browse Source
This commit is contained in:
Christian
2022-07-31 11:10:38 +02:00
parent 5a21939e29
commit 29a9941d86
1 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Server/MqttServer.cs
+17 -19
View File
@@ -20,16 +20,16 @@ namespace MQTTnet.Server
{ {
public class MqttServer : Disposable public class MqttServer : Disposable
{ {
readonly MqttServerEventContainer _eventContainer = new MqttServerEventContainer();
readonly IDictionary _sessionItems = new ConcurrentDictionary<object, object>();
readonly ICollection<IMqttServerAdapter> _adapters; readonly ICollection<IMqttServerAdapter> _adapters;
readonly MqttClientSessionsManager _clientSessionsManager;
readonly MqttServerEventContainer _eventContainer = new MqttServerEventContainer();
readonly MqttServerKeepAliveMonitor _keepAliveMonitor;
readonly MqttNetSourceLogger _logger; readonly MqttNetSourceLogger _logger;
readonly MqttServerOptions _options; readonly MqttServerOptions _options;
readonly IMqttNetLogger _rootLogger;
readonly MqttRetainedMessagesManager _retainedMessagesManager; readonly MqttRetainedMessagesManager _retainedMessagesManager;
readonly MqttServerKeepAliveMonitor _keepAliveMonitor; readonly IMqttNetLogger _rootLogger;
readonly MqttClientSessionsManager _clientSessionsManager;
readonly IDictionary _sessionItems = new ConcurrentDictionary<object, object>();
CancellationTokenSource _cancellationTokenSource; CancellationTokenSource _cancellationTokenSource;
@@ -58,18 +58,18 @@ namespace MQTTnet.Server
remove => _eventContainer.ApplicationMessageNotConsumedEvent.RemoveHandler(value); remove => _eventContainer.ApplicationMessageNotConsumedEvent.RemoveHandler(value);
} }
public event Func<ClientConnectedEventArgs, Task> ClientConnectedAsync
{
add => _eventContainer.ClientConnectedEvent.AddHandler(value);
remove => _eventContainer.ClientConnectedEvent.RemoveHandler(value);
}
public event Func<ClientAcknowledgedPublishPacketEventArgs, Task> ClientAcknowledgedPublishPacketAsync public event Func<ClientAcknowledgedPublishPacketEventArgs, Task> ClientAcknowledgedPublishPacketAsync
{ {
add => _eventContainer.ClientAcknowledgedPublishPacketEvent.AddHandler(value); add => _eventContainer.ClientAcknowledgedPublishPacketEvent.AddHandler(value);
remove => _eventContainer.ClientAcknowledgedPublishPacketEvent.RemoveHandler(value); remove => _eventContainer.ClientAcknowledgedPublishPacketEvent.RemoveHandler(value);
} }
public event Func<ClientConnectedEventArgs, Task> ClientConnectedAsync
{
add => _eventContainer.ClientConnectedEvent.AddHandler(value);
remove => _eventContainer.ClientConnectedEvent.RemoveHandler(value);
}
public event Func<ClientDisconnectedEventArgs, Task> ClientDisconnectedAsync public event Func<ClientDisconnectedEventArgs, Task> ClientDisconnectedAsync
{ {
add => _eventContainer.ClientDisconnectedEvent.AddHandler(value); add => _eventContainer.ClientDisconnectedEvent.AddHandler(value);
@@ -229,13 +229,11 @@ namespace MQTTnet.Server
if (_eventContainer.InterceptingPublishEvent.HasHandlers) if (_eventContainer.InterceptingPublishEvent.HasHandlers)
{ {
var interceptingPublishEventArgs = new InterceptingPublishEventArgs var interceptingPublishEventArgs = new InterceptingPublishEventArgs(
{ applicationMessage,
ApplicationMessage = applicationMessage, _cancellationTokenSource.Token,
CancellationToken = _cancellationTokenSource.Token, injectedApplicationMessage.SenderClientId,
ClientId = injectedApplicationMessage.SenderClientId, _sessionItems);
SessionItems = _sessionItems
};
await _eventContainer.InterceptingPublishEvent.InvokeAsync(interceptingPublishEventArgs).ConfigureAwait(false); await _eventContainer.InterceptingPublishEvent.InvokeAsync(interceptingPublishEventArgs).ConfigureAwait(false);