Merge branch 'feature/server-project-bootstrap' of https://github.com/chkr1011/MQTTnet into feature/server-project-bootstrap

Source/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs

@@ -30,8 +30,7 @@ namespace MQTTnet.AspNetCore
                 var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
                 using (var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol))
                 {
-                    var endpoint = $"{context.Connection.RemoteIpAddress}:{context.Connection.RemotePort}";
+                    await adapter.RunWebSocketConnectionAsync(webSocket, context);
-                    await adapter.RunWebSocketConnectionAsync(webSocket, endpoint);
                 }
             });
 

Source/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
@@ -11,6 +12,15 @@ namespace MQTTnet.AspNetCore
 {
     public class MqttWebSocketServerAdapter : IMqttServerAdapter
     {
+        private readonly IMqttNetChildLogger _logger;
+
+        public MqttWebSocketServerAdapter(IMqttNetChildLogger logger)
+        {
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
+
+            _logger = logger.CreateChildLogger(nameof(MqttTcpServerAdapter));
+        }
+
         public Action<MqttServerAdapterClientAcceptedEventArgs> ClientAcceptedHandler { get; set; }
 
         public Task StartAsync(IMqttServerOptions options)
@@ -23,11 +33,17 @@ namespace MQTTnet.AspNetCore
             return Task.CompletedTask;
         }
 
-        public async Task RunWebSocketConnectionAsync(WebSocket webSocket, string endpoint)
+        public async Task RunWebSocketConnectionAsync(WebSocket webSocket, HttpContext httpContext)
         {
             if (webSocket == null) throw new ArgumentNullException(nameof(webSocket));
 
-            var clientAdapter = new MqttChannelAdapter(new MqttWebSocketChannel(webSocket, endpoint), new MqttPacketFormatterAdapter(), new MqttNetLogger().CreateChildLogger(nameof(MqttWebSocketServerAdapter)));
+            var endpoint = $"{httpContext.Connection.RemoteIpAddress}:{httpContext.Connection.RemotePort}";
+            var channel = new MqttWebSocketChannel(webSocket, endpoint);
+            var clientAdapter = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(), _logger.CreateChildLogger(nameof(MqttWebSocketServerAdapter)));
+
+            var clientCertificate = await httpContext.Connection.GetClientCertificateAsync().ConfigureAwait(false);
+            var isSecureConnection = clientCertificate != null;
+            clientCertificate?.Dispose();
 
             var eventArgs = new MqttServerAdapterClientAcceptedEventArgs(clientAdapter);
             ClientAcceptedHandler?.Invoke(eventArgs);

Source/MQTTnet.Server/MQTTnet.Server.csproj

@@ -36,13 +36,13 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Update="wwwroot\app\app.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Content>
     <Content Update="wwwroot\app\app.js.map">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Content>
     <Content Update="wwwroot\Index.html">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
@@ -76,7 +76,7 @@
 
   <ItemGroup>
     <TypeScriptCompile Include="wwwroot\app\app.ts">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </TypeScriptCompile>
   </ItemGroup>
 

Source/MQTTnet.Server/Mqtt/MqttServerService.cs

@@ -30,7 +30,6 @@ namespace MQTTnet.Server.Mqtt
         public MqttServerService(
             Configuration.SettingsModel settings,
             CustomMqttFactory mqttFactory,
-            MqttWebSocketServerAdapter webSocketServerAdapter,
             MqttClientConnectedHandler mqttClientConnectedHandler,
             MqttClientDisconnectedHandler mqttClientDisconnectedHandler,
             MqttClientSubscribedTopicHandler mqttClientSubscribedTopicHandler,
@@ -52,15 +51,19 @@ namespace MQTTnet.Server.Mqtt
             _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
+            WebSocketServerAdapter = new MqttWebSocketServerAdapter(mqttFactory.Logger.CreateChildLogger());
+
             var adapters = new List<IMqttServerAdapter>
             {
-                new MqttTcpServerAdapter(mqttFactory.Logger.CreateChildLogger(nameof(MqttTcpServerAdapter))),
+                new MqttTcpServerAdapter(mqttFactory.Logger.CreateChildLogger()),
-                webSocketServerAdapter
+                WebSocketServerAdapter
             };
 
             _mqttServer = mqttFactory.CreateMqttServer(adapters);
         }
 
+        public MqttWebSocketServerAdapter WebSocketServerAdapter { get; }
+
         public void Configure()
         {
             _pythonScriptHostService.RegisterProxyObject("publish", new Action<PythonDictionary>(Publish));

Source/MQTTnet.Server/Startup.cs

@@ -1,11 +1,9 @@
 using System;
-using System.Net.WebSockets;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using MQTTnet.AspNetCore;
 using MQTTnet.Server.Logging;
 using MQTTnet.Server.Mqtt;
 using MQTTnet.Server.Scripting;
@@ -31,8 +29,7 @@ namespace MQTTnet.Server
             IHostingEnvironment environment, 
             MqttServerService mqttServerService,
             PythonScriptHostService pythonScriptHostService,
-            DataSharingService dataSharingService,
+            DataSharingService dataSharingService)
-            MqttWebSocketServerAdapter mqttWebSocketServerAdapter)
         {
             if (environment.IsDevelopment())
             {
@@ -64,8 +61,7 @@ namespace MQTTnet.Server
                     {
                         using (var webSocket = await context.WebSockets.AcceptWebSocketAsync().ConfigureAwait(false))
                         {
-                            await mqttWebSocketServerAdapter.RunWebSocketConnectionAsync(webSocket,
+                            await mqttServerService.WebSocketServerAdapter.RunWebSocketConnectionAsync(webSocket, context).ConfigureAwait(false);
-                                $"{context.Connection.RemoteIpAddress}:{context.Connection.RemotePort}").ConfigureAwait(false);
                         }
                     }
                     else
@@ -99,7 +95,6 @@ namespace MQTTnet.Server
             services.AddSingleton<DataSharingService>();
 
             services.AddSingleton<MqttNetLoggerWrapper>();
-            services.AddSingleton<MqttWebSocketServerAdapter>();
             services.AddSingleton<CustomMqttFactory>();
             services.AddSingleton<MqttServerService>();