Skip to content

Commit 8661e3e

Browse files
committed
Back-compatability fix
1 parent 4a22cf3 commit 8661e3e

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

yawaflua.WebSockets/Core/WebSocketRouter.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Net.WebSockets;
1+
using System.Diagnostics.CodeAnalysis;
2+
using System.Net.WebSockets;
23
using System.Reflection;
34
using System.Text;
45
using Microsoft.AspNetCore.Http;
@@ -11,18 +12,19 @@
1112

1213
namespace yawaflua.WebSockets.Core;
1314

15+
[SuppressMessage("ReSharper", "AsyncVoidLambda")]
1416
public class WebSocketRouter
1517
{
1618
internal static readonly Dictionary<string, Func<WebSocket, HttpContext, Task>> Routes = new();
1719
internal static readonly List<IWebSocketClient> Clients = new();
1820
private readonly IServiceProvider _serviceProvider;
1921
private readonly ILogger<WebSocketRouter> _logger;
20-
private readonly WebSocketConfig WebSocketConfig;
21-
public WebSocketRouter(IServiceProvider serviceProvider, ILogger<WebSocketRouter> logger, WebSocketConfig webSocketConfig)
22+
private readonly WebSocketConfig? _webSocketConfig;
23+
public WebSocketRouter(IServiceProvider serviceProvider, ILogger<WebSocketRouter> logger, WebSocketConfig? webSocketConfig = null)
2224
{
2325
_serviceProvider = serviceProvider;
24-
this._logger = logger;
25-
WebSocketConfig = webSocketConfig;
26+
_logger = logger;
27+
_webSocketConfig = webSocketConfig;
2628
DiscoverHandlers();
2729
Task.Run(() =>
2830
{
@@ -150,8 +152,8 @@ await Task.Run(async () =>
150152

151153
await Task.Run(async () =>
152154
{
153-
if (WebSocketConfig.OnOpenHandler != null)
154-
await WebSocketConfig.OnOpenHandler((webSocket as IWebSocket)!, context);
155+
if (_webSocketConfig?.OnOpenHandler != null)
156+
await _webSocketConfig.OnOpenHandler((webSocket as IWebSocket)!, context);
155157
}, cts);
156158

157159
var buffer = new byte[1024 * 4];

0 commit comments

Comments
 (0)