Merge branch 'develop'

Added dependents and MIT license badge to the readme.

Build/MQTTnet.Extensions.ManagedClient.nuspec

@@ -34,10 +34,9 @@
     <!-- .NET Framework -->
     <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net452\MQTTnet.Extensions.ManagedClient.*" target="lib\net452\"/>
 
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net461\"/>
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net462\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net461\MQTTnet.Extensions.Rpc.*" target="lib\net461\"/>
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net470\"/>
+
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net471\"/>
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net472\"/>
   </files>
 </package>

Build/MQTTnet.Extensions.Rpc.nuspec

@@ -34,10 +34,9 @@
     <!-- .NET Framework -->
     <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\net452\MQTTnet.Extensions.Rpc.*" target="lib\net452\"/>
 
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net461\"/>
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net462\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\net461\MQTTnet.Extensions.Rpc.*" target="lib\net461\"/>
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net470\"/>
+
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net471\"/>
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net472\"/>
   </files>
 </package>

Build/MQTTnet.Extensions.WebSocket4Net.nuspec

@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>MQTTnet.Extensions.WebSocket4Net</id>
+    <version>0.0.0</version>
+    <authors>Christian Kratky</authors>
+    <owners>Christian Kratky</owners>
+    <license type="file">LICENSE</license>
+    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>This is an extension library which allows using _WebSocket4Net_ as transport for MQTTnet clients.</description>
+    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
+    <copyright>Copyright Christian Kratky 2016-2019</copyright>
+    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 
+    <dependencies>
+      <dependency id="MQTTnet" version="$nugetVersion" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    <!-- License -->
+    <file src="..\LICENSE" />
+
+    <!-- .NET Standard 1.3 -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard1.3\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard1.3\"/>
+
+    <!-- .NET Standard 2.0 -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard2.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard2.0\"/>
+
+    <!-- Universal Windows -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\uap10.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\uap10.0\"/>
+
+    <!-- .NET Framework -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net452\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net452\"/>
+
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net461\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net461\"/>
+
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
+  </files>
+</package>

Build/MQTTnet.NETStandard.nuspec

@@ -9,7 +9,7 @@
     <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker). This package contains the .NET Standard version of the library only.</description>
+    <description>This package contains the .NET Standard version of MQTTnet only.</description>
     <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2019</copyright>
     <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 

Build/MQTTnet.nuspec

@@ -9,38 +9,10 @@
     <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker).</description>
+    <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</description>
     <releaseNotes>
-* [Core] Added support for MQTTv5 packages.
+* [Core] Fixed wrong versions in nuget packages.
-* [Core] Performance improvements.
+* [Server] The TCP address is now reused when starting which should prevent "port in used" error when restarting.
-* [Core] Removed obsolete methods.
-* [Core] Fixed a memory leak when processing lots of messages (thanks to @tschanko)
-* [Core] Added more overloads for MQTT factory.
-* [Core] The client password is now hidden from the logs (replaced with **** if set).
-* [Core] Fixed a memory leak when using SSL connections (thanks to @biovoid). 
-* [Client] Added validation of topics before publishing.
-* [Client] Added new MQTTv5 features to options builder.
-* [Client] Added uniform API across all supported MQTT versions (BREAKING CHANGE!)
-* [Client] The client will now avoid sending an ACK if an exception has been thrown in message handler (thanks to @ramonsmits).
-* [Client] Fixed issues in QoS 2 handling which leads to message loss.
-* [Client] Replaced all events with proper async compatible handlers (BREAKING CHANGE!).
-* [Client] Added more configuration values to TCP endpoint options.
-* [Client] Added used PacketIdentifier to publish result.
-* [ManagedClient] Replaced all events with proper async compatible handlers (BREAKING CHANGE!).
-* [ManagedClient] The log ID is now propagated to the internal client (thanks to @vbBerni).
-* [ManagedClient] Added validation of topics before publishing.
-* [ManagedClient] The internal MQTT client is now closed properly (thanks to @vbBerni).
-* [Server] Added support for MQTTv5 clients. The server will still return _success_ for all cases at the moment even if more granular codes are available.
-* [Server] Fixed issues in QoS 2 handling which leads to message loss.
-* [Server] Replaced all events with proper async compatible handlers (BREAKING CHANGE!).
-* [Server] The used logger instance is now propagated to the WebSocket server adapter.
-* [Server] Added the flag "IsSecureConnection" which is set to true when the connection is encrypted.
-* [Server] Fixed wrong will message behavior when stopping server (thanks to @JohBa)
-* [Server] Added validation of topics before publishing.
-* [Server] Added more configuration values to TCP endpoint options.
-* [MQTTnet Server] Added as first Alpha version of standalone cross platform MQTT server.
-
-* [Note] Due to MQTTv5 a lot of new classes were introduced. This required adding new namespaces as well. Most classes are backward compatible but new namespaces must be added.
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2019</copyright>
     <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 
@@ -60,10 +32,6 @@
       <group targetFramework="uap10.0">
         <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.8" />
       </group>
-      <group targetFramework="net452">
-      </group>
-      <group targetFramework="net461">
-      </group>
     </dependencies>
   </metadata>
 
@@ -83,10 +51,9 @@
     <!-- .NET Framework -->
     <file src="..\Source\MQTTnet\bin\Release\net452\MQTTnet.*" target="lib\net452\"/>
 
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net461\"/>
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net462\"/>
+    <file src="..\Source\MQTTnet\bin\Release\net461\MQTTnet.*" target="lib\net461\"/>
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net470\"/>
+
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net471\"/>
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net472\"/>
   </files>
 </package>

Build/build.ps1

@@ -36,17 +36,17 @@ Write-Host
 &$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
 &$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
 
-# Build MQTTnet.Server
+# Build the WebSocket4Net extension
-Remove-Item ..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2 -Recurse -Force -ErrorAction SilentlyContinue
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Server\MQTTnet.Server.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp2.2" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-$source = "..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-$destination = "..\Source\MQTTnet.Server\bin\MQTTnet.Server-Portable-v$nugetVersion.zip"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-If(Test-path $destination) {Remove-item $destination}
- Add-Type -assembly "system.io.compression.filesystem"
-[io.compression.zipfile]::CreateFromDirectory($source, $destination) 
 
 # Create NuGet packages.
+
+Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe"
+
 Remove-Item .\NuGet -Force -Recurse -ErrorAction SilentlyContinue
 
 Copy-Item MQTTnet.AspNetCore.nuspec -Destination MQTTnet.AspNetCore.nuspec.old -Force
@@ -55,6 +55,8 @@ Copy-Item MQTTnet.Extensions.Rpc.nuspec -Destination MQTTnet.Extensions.Rpc.nusp
 (Get-Content MQTTnet.Extensions.Rpc.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.Rpc.nuspec
 Copy-Item MQTTnet.Extensions.ManagedClient.nuspec -Destination MQTTnet.Extensions.ManagedClient.nuspec.old -Force
 (Get-Content MQTTnet.Extensions.ManagedClient.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.ManagedClient.nuspec
+Copy-Item MQTTnet.Extensions.WebSocket4Net.nuspec -Destination MQTTnet.Extensions.WebSocket4Net.nuspec.old -Force
+(Get-Content MQTTnet.Extensions.WebSocket4Net.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.WebSocket4Net.nuspec
 
 New-Item -ItemType Directory -Force -Path .\NuGet
 .\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
@@ -62,7 +64,57 @@ New-Item -ItemType Directory -Force -Path .\NuGet
 .\nuget.exe pack MQTTnet.AspNetCore.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
 .\nuget.exe pack MQTTnet.Extensions.Rpc.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
 .\nuget.exe pack MQTTnet.Extensions.ManagedClient.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
+.\nuget.exe pack MQTTnet.Extensions.WebSocket4Net.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
 
 Move-Item MQTTnet.AspNetCore.nuspec.old -Destination MQTTnet.AspNetCore.nuspec -Force
 Move-Item MQTTnet.Extensions.Rpc.nuspec.old -Destination MQTTnet.Extensions.Rpc.nuspec -Force
-Move-Item MQTTnet.Extensions.ManagedClient.nuspec.old -Destination MQTTnet.Extensions.ManagedClient.nuspec -Force
+Move-Item MQTTnet.Extensions.ManagedClient.nuspec.old -Destination MQTTnet.Extensions.ManagedClient.nuspec -Force
+Move-Item MQTTnet.Extensions.WebSocket4Net.nuspec.old -Destination MQTTnet.Extensions.WebSocket4Net.nuspec -Force
+
+Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue
+
+####################################################################
+
+# Build MQTTnet.Server Portable
+&dotnet publish ..\Source\MQTTnet.Server\MQTTnet.Server.csproj --configuration Release /p:FileVersion=$assemblyVersion /p:Version=$nugetVersion
+
+$source = "..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2\publish"
+$destination = "..\Source\MQTTnet.Server\bin\MQTTnet.Server-Portable-v$nugetVersion.zip"
+If(Test-path $destination) {Remove-item $destination}
+ Add-Type -assembly "system.io.compression.filesystem"
+[io.compression.zipfile]::CreateFromDirectory($source, $destination) 
+
+####################################################################
+
+# Build MQTTnet.Server Linux-x64
+&dotnet publish ..\Source\MQTTnet.Server\MQTTnet.Server.csproj --configuration Release /p:FileVersion=$assemblyVersion /p:Version=$nugetVersion --self-contained --runtime linux-x64 
+
+$source = "..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2\linux-x64\publish"
+$destination = "..\Source\MQTTnet.Server\bin\MQTTnet.Server-Linux-x64-v$nugetVersion.zip"
+If(Test-path $destination) {Remove-item $destination}
+ Add-Type -assembly "system.io.compression.filesystem"
+[io.compression.zipfile]::CreateFromDirectory($source, $destination) 
+
+####################################################################
+
+# Build MQTTnet.Server Linux-ARM
+&dotnet publish ..\Source\MQTTnet.Server\MQTTnet.Server.csproj --configuration Release /p:FileVersion=$assemblyVersion /p:Version=$nugetVersion --self-contained --runtime linux-arm 
+
+$source = "..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2\linux-ARM\publish"
+$destination = "..\Source\MQTTnet.Server\bin\MQTTnet.Server-Linux-ARM-v$nugetVersion.zip"
+If(Test-path $destination) {Remove-item $destination}
+ Add-Type -assembly "system.io.compression.filesystem"
+[io.compression.zipfile]::CreateFromDirectory($source, $destination) 
+
+####################################################################
+
+# Build MQTTnet.Server Windows-x64
+&dotnet publish ..\Source\MQTTnet.Server\MQTTnet.Server.csproj --configuration Release /p:FileVersion=$assemblyVersion /p:Version=$nugetVersion --self-contained --runtime win-x64
+
+$source = "..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2\win-x64\publish"
+$destination = "..\Source\MQTTnet.Server\bin\MQTTnet.Server-Windows-x64-v$nugetVersion.zip"
+If(Test-path $destination) {Remove-item $destination}
+ Add-Type -assembly "system.io.compression.filesystem"
+[io.compression.zipfile]::CreateFromDirectory($source, $destination) 
+
+####################################################################

Build/upload.ps1

@@ -1,9 +1,13 @@
 param([string]$apiKey)
 
+Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe"
+
 $files = Get-ChildItem -Path ".\NuGet" -Filter "*.nupkg"
 foreach ($file in $files)
 {
 	Write-Host "Uploading: " $file
 
 	.\nuget.exe push $file.Fullname $apiKey -NoSymbols -Source https://api.nuget.org/v3/index.json
-}
+}
+
+Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue

MQTTnet.noUWP.sln

@@ -47,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Tests", "Tests\MQTT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Server", "Source\MQTTnet.Server\MQTTnet.Server.csproj", "{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.WebSocket4Net", "Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj", "{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -219,6 +221,22 @@ Global
 		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|x64.Build.0 = Release|Any CPU
 		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|x86.ActiveCfg = Release|Any CPU
 		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|x86.Build.0 = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|ARM.Build.0 = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|x64.Build.0 = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -234,6 +252,7 @@ Global
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7} = {32A630A7-2598-41D7-B625-204CD906F5FB}
+		{9AE2F8DA-4178-470B-B8C4-88BE1DAE7D5F} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}

MQTTnet.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
+VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}"
 EndProject
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{67C28AC1
 		Build\MQTTnet.AspNetCore.nuspec = Build\MQTTnet.AspNetCore.nuspec
 		Build\MQTTnet.Extensions.ManagedClient.nuspec = Build\MQTTnet.Extensions.ManagedClient.nuspec
 		Build\MQTTnet.Extensions.Rpc.nuspec = Build\MQTTnet.Extensions.Rpc.nuspec
+		Build\MQTTnet.Extensions.WebSocket4Net.nuspec = Build\MQTTnet.Extensions.WebSocket4Net.nuspec
 		Build\MQTTnet.NETStandard.nuspec = Build\MQTTnet.NETStandard.nuspec
 		Build\MQTTnet.nuspec = Build\MQTTnet.nuspec
 		Build\upload.ps1 = Build\upload.ps1
@@ -50,6 +51,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Server", "Source\MQTTnet.Server\MQTTnet.Server.csproj", "{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.WebSocket4Net", "Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj", "{2BD01D53-4CA5-4142-BE8D-313876395E3E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -245,6 +248,22 @@ Global
 		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|x64.Build.0 = Release|Any CPU
 		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|x86.ActiveCfg = Release|Any CPU
 		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|x86.Build.0 = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x64.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x86.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|ARM.Build.0 = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x64.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x64.Build.0 = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -261,6 +280,7 @@ Global
 		{C400533A-8EBA-4F0B-BF4D-295C3708604B} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B} = {32A630A7-2598-41D7-B625-204CD906F5FB}
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}

README.md

@@ -8,7 +8,8 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/ycit86voxfevm2aa/branch/master?svg=true)](https://ci.appveyor.com/project/chkr1011/mqttnet)
 [![BCH compliance](https://bettercodehub.com/edge/badge/chkr1011/MQTTnet?branch=master)](https://bettercodehub.com/)
 [![OpenCollective](https://opencollective.com/mqttnet/backers/badge.svg)](https://opencollective.com/mqttnet) 
-[![OpenCollective](https://opencollective.com/mqttnet/sponsors/badge.svg)](https://opencollective.com/mqttnet)
+[![OpenCollective](https://opencollective.com/mqttnet/sponsors/badge.svg)](https://opencollective.com/mqttnet) [![Join the chat at https://gitter.im/MQTTnet/community](https://badges.gitter.im/MQTTnet/community.svg)](https://gitter.im/MQTTnet/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://raw.githubusercontent.com/chkr1011/MQTTnet/master/LICENSE)
 
 # MQTTnet
 
@@ -26,7 +27,7 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 * Uniform API across all supported versions of the MQTT protocol
 * Interfaces included for mocking and testing
 * Access to internal trace messages
-* Unit tested (~200 tests)
+* Unit tested (~210 tests)
 * No external dependencies
 
 \* Tested on local machine (Intel i7 8700K) with MQTTnet client and server running in the same process using the TCP channel. The app for verification is part of this repository and stored in _/Tests/MQTTnet.TestApp.NetCore_.
@@ -104,6 +105,8 @@ This library is used in the following projects:
 * MQTT Tester (MQTT client test app for [Android](https://play.google.com/store/apps/details?id=com.liveowl.mqtttester) and [iOS](https://itunes.apple.com/us/app/mqtt-tester/id1278621826?mt=8))
 * Wirehome.Core (Open Source Home Automation system for .NET Core, <https://github.com/chkr1011/Wirehome.Core>)
 
+Further projects using this project can be found under https://github.com/chkr1011/MQTTnet/network/dependents.
+
 If you use this library and want to see your project here please create a pull request.
 
 ## License

Source/MQTTnet.AspnetCore/MqttConnectionContext.cs

@@ -7,6 +7,7 @@ using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using System;
 using System.IO.Pipelines;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -48,6 +49,8 @@ namespace MQTTnet.AspNetCore
 
         public bool IsSecureConnection => Http?.HttpContext?.Request?.IsHttps ?? false;
 
+        public X509Certificate2 ClientCertificate => Http?.HttpContext?.Connection?.ClientCertificate;
+
         private IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();
 
         public ConnectionContext Connection { get; }
@@ -142,6 +145,12 @@ namespace MQTTnet.AspNetCore
             return null;
         }
 
+        public void ResetStatistics()
+        {
+            BytesReceived = 0;
+            BytesSent = 0;
+        }
+
         public async Task SendPacketAsync(MqttBasePacket packet, TimeSpan timeout, CancellationToken cancellationToken)
         {
             var formatter = PacketFormatterAdapter;

Source/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -40,19 +40,26 @@ namespace MQTTnet.AspNetCore
             var endpoint = $"{httpContext.Connection.RemoteIpAddress}:{httpContext.Connection.RemotePort}";
             
             var clientCertificate = await httpContext.Connection.GetClientCertificateAsync().ConfigureAwait(false);
-            var isSecureConnection = clientCertificate != null;
+            try
-            clientCertificate?.Dispose();
-
-            var clientHandler = ClientHandler;
-            if (clientHandler != null)
             {
-                var writer = new SpanBasedMqttPacketWriter();
+                var isSecureConnection = clientCertificate != null;
-                var formatter = new MqttPacketFormatterAdapter(writer);
+
-                var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection);
+                var clientHandler = ClientHandler;
-                using (var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger.CreateChildLogger(nameof(MqttWebSocketServerAdapter))))
+                if (clientHandler != null)
                 {
-                    await clientHandler(channelAdapter).ConfigureAwait(false);
+                    var writer = new SpanBasedMqttPacketWriter();
-                }   
+                    var formatter = new MqttPacketFormatterAdapter(writer);
+                    var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection, clientCertificate);
+
+                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger.CreateChildLogger(nameof(MqttWebSocketServerAdapter))))
+                    {
+                        await clientHandler(channelAdapter).ConfigureAwait(false);
+                    }
+                }
+            }
+            finally
+            {
+                clientCertificate?.Dispose();
             }
         }
 

Source/MQTTnet.AspnetCore/SpanBasedMqttPacketBodyReader.cs

@@ -9,6 +9,7 @@ namespace MQTTnet.AspNetCore
     public class SpanBasedMqttPacketBodyReader : IMqttPacketBodyReader
     {
         private ReadOnlyMemory<byte> _buffer;
+
         private int _offset;
         
         public void SetBuffer(ReadOnlyMemory<byte> buffer)
@@ -17,11 +18,11 @@ namespace MQTTnet.AspNetCore
             _offset = 0;
         }
 
-        public ulong Length => (ulong)_buffer.Length;
+        public int Length => _buffer.Length;
 
         public bool EndOfStream => _buffer.Length.Equals(_offset);
         
-        public ulong Offset => (ulong)_offset;
+        public int Offset => _offset;
 
         public byte ReadByte()
         {
@@ -116,9 +117,9 @@ namespace MQTTnet.AspNetCore
             throw new MqttProtocolViolationException("Boolean values can be 0 or 1 only.");
         }
 
-        public void Seek(ulong position)
+        public void Seek(int position)
         {
-            _offset = (int)position;
+            _offset = position;
         }
     }
 }

Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core'">$(TargetFrameworks);uap10.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
     <Product />
     <Company />
     <Authors />

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClient.cs

@@ -31,7 +31,7 @@ namespace MQTTnet.Extensions.ManagedClient
 
         private ManagedMqttClientStorageManager _storageManager;
 
-        private bool _disposed = false;
+        private bool _disposed;
         private bool _subscriptionsNotPushed;
 
         public ManagedMqttClient(IMqttClient mqttClient, IMqttNetChildLogger logger)
@@ -102,9 +102,8 @@ namespace MQTTnet.Extensions.ManagedClient
 
             _connectionCancellationToken = new CancellationTokenSource();
 
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
             _maintainConnectionTask = Task.Run(() => MaintainConnectionAsync(_connectionCancellationToken.Token), _connectionCancellationToken.Token);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            _maintainConnectionTask.Forget(_logger);
 
             _logger.Info("Started");
         }
@@ -333,20 +332,20 @@ namespace MQTTnet.Extensions.ManagedClient
             }
         }
 
-        private void PublishQueuedMessages(CancellationToken cancellationToken)
+        private async Task PublishQueuedMessagesAsync(CancellationToken cancellationToken)
         {
             try
             {
                 while (!cancellationToken.IsCancellationRequested && _mqttClient.IsConnected)
                 {
-                    //Peek at the message without dequeueing in order to prevent the
+                    // Peek at the message without dequeueing in order to prevent the
-                    //possibility of the queue growing beyond the configured cap.
+                    // possibility of the queue growing beyond the configured cap.
-                    //Previously, messages could be re-enqueued if there was an
+                    // Previously, messages could be re-enqueued if there was an
-                    //exception, and this re-enqueueing did not honor the cap.
+                    // exception, and this re-enqueueing did not honor the cap.
-                    //Furthermore, because re-enqueueing would shuffle the order
+                    // Furthermore, because re-enqueueing would shuffle the order
-                    //of the messages, the DropOldestQueuedMessage strategy would
+                    // of the messages, the DropOldestQueuedMessage strategy would
-                    //be unable to know which message is actually the oldest and would
+                    // be unable to know which message is actually the oldest and would
-                    //instead drop the first item in the queue.
+                    // instead drop the first item in the queue.
                     var message = _messageQueue.PeekAndWait();
                     if (message == null)
                     {
@@ -355,7 +354,7 @@ namespace MQTTnet.Extensions.ManagedClient
 
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    TryPublishQueuedMessage(message);
+                    await TryPublishQueuedMessageAsync(message).ConfigureAwait(false);
                 }
             }
             catch (OperationCanceledException)
@@ -371,23 +370,28 @@ namespace MQTTnet.Extensions.ManagedClient
             }
         }
 
-        private void TryPublishQueuedMessage(ManagedMqttApplicationMessage message)
+        private async Task TryPublishQueuedMessageAsync(ManagedMqttApplicationMessage message)
         {
             Exception transmitException = null;
             try
             {
-                _mqttClient.PublishAsync(message.ApplicationMessage).GetAwaiter().GetResult();
+                await _mqttClient.PublishAsync(message.ApplicationMessage).ConfigureAwait(false);
+
                 lock (_messageQueue) //lock to avoid conflict with this.PublishAsync
                 {
-                    //While publishing this message, this.PublishAsync could have booted this
+                    // While publishing this message, this.PublishAsync could have booted this
-                    //message off the queue to make room for another (when using a cap
+                    // message off the queue to make room for another (when using a cap
-                    //with the DropOldestQueuedMessage strategy).  If the first item
+                    // with the DropOldestQueuedMessage strategy).  If the first item
-                    //in the queue is equal to this message, then it's safe to remove
+                    // in the queue is equal to this message, then it's safe to remove
-                    //it from the queue.  If not, that means this.PublishAsync has already
+                    // it from the queue.  If not, that means this.PublishAsync has already
-                    //removed it, in which case we don't want to do anything.
+                    // removed it, in which case we don't want to do anything.
                     _messageQueue.RemoveFirst(i => i.Id.Equals(message.Id));
                 }
-                _storageManager?.RemoveAsync(message).GetAwaiter().GetResult();
+
+                if (_storageManager != null)
+                {
+                    await _storageManager.RemoveAsync(message).ConfigureAwait(false);
+                }
             }
             catch (MqttCommunicationException exception)
             {
@@ -408,6 +412,11 @@ namespace MQTTnet.Extensions.ManagedClient
                     {
                         _messageQueue.RemoveFirst(i => i.Id.Equals(message.Id));
                     }
+
+                    if (_storageManager != null)
+                    {
+                        await _storageManager.RemoveAsync(message).ConfigureAwait(false);
+                    }
                 }
             }
             catch (Exception exception)
@@ -417,7 +426,12 @@ namespace MQTTnet.Extensions.ManagedClient
             }
             finally
             {
-                ApplicationMessageProcessedHandler?.HandleApplicationMessageProcessedAsync(new ApplicationMessageProcessedEventArgs(message, transmitException)).GetAwaiter().GetResult();
+                var eventHandler = ApplicationMessageProcessedHandler;
+                if (eventHandler != null)
+                {
+                    var eventArguments = new ApplicationMessageProcessedEventArgs(message, transmitException);
+                    await eventHandler.HandleApplicationMessageProcessedAsync(eventArguments).ConfigureAwait(false);
+                }
             }
         }
 
@@ -502,7 +516,7 @@ namespace MQTTnet.Extensions.ManagedClient
             var cts = new CancellationTokenSource();
             _publishingCancellationToken = cts;
 
-            Task.Factory.StartNew(() => PublishQueuedMessages(cts.Token), cts.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+            Task.Run(() => PublishQueuedMessagesAsync(cts.Token), cts.Token).Forget(_logger);
         }
 
         private void StopPublishing()

Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core'">$(TargetFrameworks);uap10.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
     <Product />
     <Company />
     <Authors />

Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
+    <Product />
+    <Company />
+    <Authors />
+    <PackageId />
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+    <DefaultLanguage>en</DefaultLanguage>
+    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WebSocket4Net" Version="0.15.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+  </ItemGroup>
+
+</Project>

Source/MQTTnet.Extensions.WebSocket4Net/MqttFactoryExtensions.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace MQTTnet.Extensions.WebSocket4Net
+{
+    public static class MqttFactoryExtensions
+    {
+        public static IMqttFactory UseWebSocket4Net(this IMqttFactory mqttFactory)
+        {
+            if (mqttFactory == null) throw new ArgumentNullException(nameof(mqttFactory));
+
+            return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory());
+        }
+    }
+}

Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs

@@ -0,0 +1,233 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Channel;
+using MQTTnet.Client.Options;
+using MQTTnet.Exceptions;
+using MQTTnet.Internal;
+using SuperSocket.ClientEngine;
+using WebSocket4Net;
+
+namespace MQTTnet.Extensions.WebSocket4Net
+{
+    public class WebSocket4NetMqttChannel : IMqttChannel
+    {
+        private readonly BlockingCollection<byte> _receiveBuffer = new BlockingCollection<byte>();
+
+        private readonly IMqttClientOptions _clientOptions;
+        private readonly MqttClientWebSocketOptions _webSocketOptions;
+
+        private WebSocket _webSocket;
+
+        public WebSocket4NetMqttChannel(IMqttClientOptions clientOptions, MqttClientWebSocketOptions webSocketOptions)
+        {
+            _clientOptions = clientOptions ?? throw new ArgumentNullException(nameof(clientOptions));
+            _webSocketOptions = webSocketOptions ?? throw new ArgumentNullException(nameof(webSocketOptions));
+        }
+
+        public string Endpoint => _webSocketOptions.Uri;
+
+        public bool IsSecureConnection { get; private set; }
+
+        public X509Certificate2 ClientCertificate { get; }
+
+        public async Task ConnectAsync(CancellationToken cancellationToken)
+        {
+            var uri = _webSocketOptions.Uri;
+            if (!uri.StartsWith("ws://", StringComparison.OrdinalIgnoreCase) && !uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase))
+            {
+                if (_webSocketOptions.TlsOptions?.UseTls == false)
+                {
+                    uri = "ws://" + uri;
+                }
+                else
+                {
+                    uri = "wss://" + uri;
+                }
+            }
+
+            var sslProtocols = _webSocketOptions?.TlsOptions?.SslProtocol ?? SslProtocols.None;
+            var subProtocol = _webSocketOptions.SubProtocols.FirstOrDefault() ?? string.Empty;
+
+            var cookies = new List<KeyValuePair<string, string>>();
+            if (_webSocketOptions.CookieContainer != null)
+            {
+                throw new NotSupportedException("Cookies are not supported.");
+            }
+
+            List<KeyValuePair<string, string>> customHeaders = null;
+            if (_webSocketOptions.RequestHeaders != null)
+            {
+                customHeaders = _webSocketOptions.RequestHeaders.Select(i => new KeyValuePair<string, string>(i.Key, i.Value)).ToList();
+            }
+
+            EndPoint proxy = null;
+            if (_webSocketOptions.ProxyOptions != null)
+            {
+                throw new NotSupportedException("Proxies are not supported.");
+            }
+
+            // The user agent can be empty always because it is just added to the custom headers as "User-Agent".
+            var userAgent = string.Empty;
+
+            var origin = string.Empty;
+            var webSocketVersion = WebSocketVersion.None;
+            var receiveBufferSize = 0;
+
+            var certificates = new X509CertificateCollection();
+            if (_webSocketOptions?.TlsOptions?.Certificates != null)
+            {
+                foreach (var certificate in _webSocketOptions.TlsOptions.Certificates)
+                {
+                    certificates.Add(new X509Certificate(certificate));
+                }
+            }
+
+            _webSocket = new WebSocket(uri, subProtocol, cookies, customHeaders, userAgent, origin, webSocketVersion, proxy, sslProtocols, receiveBufferSize)
+            {
+                NoDelay = true,
+                Security =
+                {
+                    AllowUnstrustedCertificate = _webSocketOptions?.TlsOptions?.AllowUntrustedCertificates == true,
+                    AllowCertificateChainErrors = _webSocketOptions?.TlsOptions?.IgnoreCertificateChainErrors == true,
+                    Certificates = certificates
+                }
+            };
+
+            await ConnectInternalAsync(cancellationToken).ConfigureAwait(false);
+            
+            IsSecureConnection = uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public Task DisconnectAsync(CancellationToken cancellationToken)
+        {
+            if (_webSocket != null && _webSocket.State == WebSocketState.Open)
+            {
+                _webSocket.Close();
+            }
+            
+            return Task.FromResult(0);
+        }
+
+        public Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            var readBytes = 0;
+            while (count > 0 && !cancellationToken.IsCancellationRequested)
+            {
+                if (!_receiveBuffer.TryTake(out var @byte))
+                {
+                    if (readBytes == 0)
+                    {
+                        // Block until at least one byte was received.
+                        @byte = _receiveBuffer.Take(cancellationToken);
+                    }
+                    else
+                    {
+                        return Task.FromResult(readBytes);
+                    }
+                }
+
+                buffer[offset] = @byte;
+                offset++;
+                count--;
+                readBytes++;
+            }
+
+            return Task.FromResult(readBytes);
+        }
+
+        public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            _webSocket.Send(buffer, offset, count);
+            return Task.FromResult(0);
+        }
+
+        public void Dispose()
+        {
+            if (_webSocket == null)
+            {
+                return;
+            }
+
+            _webSocket.DataReceived -= OnDataReceived;
+            _webSocket.Error -= OnError;
+            _webSocket.Dispose();
+            _webSocket = null;
+        }
+
+        private void OnError(object sender, ErrorEventArgs e)
+        {
+            System.Diagnostics.Debug.Write(e.Exception.ToString());
+        }
+
+        private void OnDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            foreach (var @byte in e.Data)
+            {
+                _receiveBuffer.Add(@byte);
+            }
+        }
+
+        private async Task ConnectInternalAsync(CancellationToken cancellationToken)
+        {
+            _webSocket.Error += OnError;
+            _webSocket.DataReceived += OnDataReceived;
+
+            var taskCompletionSource = new TaskCompletionSource<Exception>();
+
+            void ErrorHandler(object sender, ErrorEventArgs e)
+            {
+                taskCompletionSource.TrySetResult(e.Exception);
+            }
+
+            void SuccessHandler(object sender, EventArgs e)
+            {
+                taskCompletionSource.TrySetResult(null);
+            }
+
+            try
+            {
+                _webSocket.Opened += SuccessHandler;
+                _webSocket.Error += ErrorHandler;
+
+                _webSocket.Open();
+
+                var exception = await MqttTaskTimeout.WaitAsync(c =>
+                {
+                    c.Register(() => taskCompletionSource.TrySetCanceled());
+                    return taskCompletionSource.Task;
+                }, _clientOptions.CommunicationTimeout, cancellationToken).ConfigureAwait(false);
+
+                if (exception != null)
+                {
+                    if (exception is AuthenticationException authenticationException)
+                    {
+                        throw new MqttCommunicationException(authenticationException.InnerException);
+                    }
+
+                    if (exception is OperationCanceledException)
+                    {
+                        throw new MqttCommunicationTimedOutException();
+                    }
+
+                    throw new MqttCommunicationException(exception);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw new MqttCommunicationTimedOutException();
+            }
+            finally
+            {
+                _webSocket.Opened -= SuccessHandler;
+                _webSocket.Error -= ErrorHandler;
+            }
+        }
+    }
+}

Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttClientAdapterFactory.cs

@@ -0,0 +1,36 @@
+using System;
+using MQTTnet.Adapter;
+using MQTTnet.Client.Options;
+using MQTTnet.Diagnostics;
+using MQTTnet.Formatter;
+using MQTTnet.Implementations;
+
+namespace MQTTnet.Extensions.WebSocket4Net
+{
+    public class WebSocket4NetMqttClientAdapterFactory : IMqttClientAdapterFactory
+    {
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetChildLogger logger)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
+
+            switch (options.ChannelOptions)
+            {
+                case MqttClientTcpOptions _:
+                {
+                    return new MqttChannelAdapter(new MqttTcpChannel(options), new MqttPacketFormatterAdapter(options.ProtocolVersion), logger);
+                }
+
+                case MqttClientWebSocketOptions webSocketOptions:
+                {
+                    return new MqttChannelAdapter(new WebSocket4NetMqttChannel(options, webSocketOptions), new MqttPacketFormatterAdapter(options.ProtocolVersion), logger);
+                }
+
+                default:
+                {
+                    throw new NotSupportedException();
+                }
+            }
+        }
+    }
+}

Source/MQTTnet.Server/Configuration/MqttSettingsModel.cs

@@ -1,9 +1,9 @@
 namespace MQTTnet.Server.Configuration
 {
     /// <summary>
-    /// Main Settings Model
+    /// MQTT settings Model
     /// </summary>
-    public class SettingsModel
+    public class MqttSettingsModel
     {
         /// <summary>
         /// Set default connection timeout in seconds

Source/MQTTnet.Server/Configuration/PathHelper.cs

@@ -0,0 +1,24 @@
+using System;
+using System.IO;
+
+namespace MQTTnet.Server.Configuration
+{
+    public static class PathHelper
+    {
+        public static string ExpandPath(string path)
+        {
+            if (path == null)
+            {
+                return null;
+            }
+
+            var uri = new Uri(path, UriKind.RelativeOrAbsolute);
+            if (!uri.IsAbsoluteUri)
+            {
+                return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path);
+            }
+
+            return path;
+        }
+    }
+}

Source/MQTTnet.Server/Configuration/RetainedApplicationMessagesModel.cs

@@ -6,6 +6,6 @@
 
         public int WriteInterval { get; set; } = 10;
 
-        public string Filename { get; set; } = "RetainedApplicationMessages.json";
+        public string Path { get; set; }
     }
 }

Source/MQTTnet.Server/Configuration/ScriptingSettingsModel.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace MQTTnet.Server.Configuration
+{
+    public class ScriptingSettingsModel
+    {
+        public string ScriptsPath { get; set; }
+
+        public List<string> IncludePaths { get; set; }
+    }
+}

Source/MQTTnet.Server/Controllers/ClientsController.cs

@@ -4,12 +4,14 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using System.Web;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MQTTnet.Server.Mqtt;
 using MQTTnet.Server.Status;
 
 namespace MQTTnet.Server.Controllers
 {
+    [Authorize]
     [ApiController]
     public class ClientsController : ControllerBase
     {
@@ -57,5 +59,21 @@ namespace MQTTnet.Server.Controllers
             await client.DisconnectAsync();
             return StatusCode((int)HttpStatusCode.NoContent);
         }
+
+        [Route("api/v1/clients/{clientId}/statistics")]
+        [HttpDelete]
+        public async Task<ActionResult> DeleteClientStatistics(string clientId)
+        {
+            clientId = HttpUtility.UrlDecode(clientId);
+
+            var client = (await _mqttServerService.GetClientStatusAsync()).FirstOrDefault(c => c.ClientId == clientId);
+            if (client == null)
+            {
+                return new StatusCodeResult((int)HttpStatusCode.NotFound);
+            }
+
+            client.ResetStatistics();
+            return StatusCode((int)HttpStatusCode.NoContent);
+        }
     }
 }

Source/MQTTnet.Server/Controllers/RetainedApplicationMessagesController.cs

@@ -4,11 +4,13 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using System.Web;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MQTTnet.Server.Mqtt;
 
 namespace MQTTnet.Server.Controllers
 {
+    [Authorize]
     [ApiController]
     public class RetainedApplicationMessagesController : ControllerBase
     {

Source/MQTTnet.Server/Controllers/ScriptsController.cs

@@ -1,11 +1,65 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using MQTTnet.Server.Scripting;
+using MQTTnet.Server.Web;
 
 namespace MQTTnet.Server.Controllers
 {
-    public class ScriptsController
+    [Authorize]
+    [ApiController]
+    public class ScriptsController : Controller
     {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+
+        public ScriptsController(PythonScriptHostService pythonScriptHostService)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+        }
+
+        [Route("api/v1/scripts")]
+        [HttpGet]
+        public ActionResult<List<string>> GetScriptUids()
+        {
+            return _pythonScriptHostService.GetScriptUids();
+        }
+
+        [Route("api/v1/scripts/uid")]
+        [HttpGet]
+        public async Task<ActionResult<string>> GetScript(string uid)
+        {
+            var script = await _pythonScriptHostService.ReadScriptAsync(uid, HttpContext.RequestAborted);
+            if (script == null)
+            {
+                return NotFound();
+            }
+
+            return Content(script);
+        }
+
+        [Route("api/v1/scripts/uid")]
+        [HttpPost]
+        public Task PostScript(string uid)
+        {
+            var code = HttpContext.Request.ReadBodyAsString();
+            return _pythonScriptHostService.WriteScriptAsync(uid, code, CancellationToken.None);
+        }
+
+        [Route("api/v1/scripts/uid")]
+        [HttpDelete]
+        public Task DeleteScript(string uid)
+        {
+            return _pythonScriptHostService.DeleteScriptAsync(uid);
+        }
+        
+        [Route("api/v1/scripts/initialize")]
+        [HttpPost]
+        public Task PostInitializeScripts()
+        {
+            return _pythonScriptHostService.TryInitializeScriptsAsync();
+        }
     }
 }

Source/MQTTnet.Server/Controllers/SessionsController.cs

@@ -4,12 +4,14 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using System.Web;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MQTTnet.Server.Mqtt;
 using MQTTnet.Server.Status;
 
 namespace MQTTnet.Server.Controllers
 {
+    [Authorize]
     [ApiController]
     public class SessionsController : ControllerBase
     {

Source/MQTTnet.Server/LICENSE

@@ -1,6 +1,7 @@
+# MQTTnet
 MIT License
 
-Copyright (c) 2017 Christian Kratky
+Copyright (c) 2019 MQTTnet Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +20,78 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+# Swashbuckle
+Copyright (c) 2013, Richard Morris
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
+
+# IronPython
+Copyright (c) .NET Foundation and Contributors
+           All Rights Reserved
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/ 
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. 
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. 
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. 
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. 
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. 
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. 
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). 
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. 
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." 
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: 
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and 
+
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and 
+
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and 
+
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. 
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. 
+

Source/MQTTnet.Server/MQTTnet.Server.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
@@ -14,11 +14,13 @@
     <SignAssembly>false</SignAssembly>
     <DelaySign>false</DelaySign>
     <LangVersion>latest</LangVersion>
+    <Version>1.0.0</Version>
     <TypeScriptToolsVersion>3.3</TypeScriptToolsVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <StartupObject></StartupObject>
+    <UserSecretsId>c564f0de-28b4-45bf-b726-4d665d705653</UserSecretsId>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,6 +29,13 @@
     <NoWarn>1701;1702</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="wwwroot\**" />
+    <Content Remove="wwwroot\**" />
+    <EmbeddedResource Remove="wwwroot\**" />
+    <None Remove="wwwroot\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -53,22 +62,23 @@
     <None Update="LICENSE">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="run.sh">
+    <None Update="README.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="run.bat">
+    <None Update="Scripts\README.md">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Scripts\readme.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="Scripts\00_sample.py">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Web\authorization_handler.py">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <Folder Include="Properties\PublishProfiles\" />
+    <Folder Include="Web\wwwroot\" />
   </ItemGroup>
 
 </Project>

Source/MQTTnet.Server/Mqtt/CustomMqttFactory.cs

@@ -12,7 +12,7 @@ namespace MQTTnet.Server.Mqtt
     {
         private readonly MqttFactory _mqttFactory;
 
-        public CustomMqttFactory(SettingsModel settings, ILogger<MqttServer> logger)
+        public CustomMqttFactory(MqttSettingsModel settings, ILogger<MqttServer> logger)
         {
             if (settings == null) throw new ArgumentNullException(nameof(settings));
             if (logger == null) throw new ArgumentNullException(nameof(logger));

Source/MQTTnet.Server/Mqtt/MqttServerConnectionValidator.cs

@@ -7,12 +7,12 @@ using MQTTnet.Server.Scripting;
 
 namespace MQTTnet.Server.Mqtt
 {
-    public class MqttConnectionValidator : IMqttServerConnectionValidator
+    public class MqttServerConnectionValidator : IMqttServerConnectionValidator
     {
         private readonly PythonScriptHostService _pythonScriptHostService;
         private readonly ILogger _logger;
 
-        public MqttConnectionValidator(PythonScriptHostService pythonScriptHostService, ILogger<MqttConnectionValidator> logger)
+        public MqttServerConnectionValidator(PythonScriptHostService pythonScriptHostService, ILogger<MqttServerConnectionValidator> logger)
         {
             _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -24,21 +24,28 @@ namespace MQTTnet.Server.Mqtt
             {
                 var pythonContext = new PythonDictionary
                 {
-                    { "client_id", context.ClientId },
                     { "endpoint", context.Endpoint },
                     { "is_secure_connection", context.IsSecureConnection },
+                    { "client_id", context.ClientId },
                     { "username", context.Username },
                     { "password", context.Password },
-                    { "result", PythonConvert.Pythonfy(context.ReturnCode) }
+                    { "raw_password", new Bytes(context.RawPassword ?? new byte[0]) },
+                    { "clean_session", context.CleanSession},
+                    { "authentication_method", context.AuthenticationMethod},
+                    { "authentication_data", new Bytes(context.AuthenticationData ?? new byte[0]) },
+
+                    { "result", PythonConvert.Pythonfy(context.ReasonCode) }
                 };
 
                 _pythonScriptHostService.InvokeOptionalFunction("on_validate_client_connection", pythonContext);
 
-                context.ReturnCode = PythonConvert.ParseEnum<MqttConnectReturnCode>((string)pythonContext["result"]);
+                context.ReasonCode = PythonConvert.ParseEnum<MqttConnectReasonCode>((string)pythonContext["result"]);
             }
             catch (Exception exception)
             {
                 _logger.LogError(exception, "Error while validating client connection.");
+
+                context.ReasonCode = MqttConnectReasonCode.UnspecifiedError;
             }
 
             return Task.CompletedTask;

Source/MQTTnet.Server/Mqtt/MqttServerService.cs

@@ -23,34 +23,34 @@ namespace MQTTnet.Server.Mqtt
     {
         private readonly ILogger<MqttServerService> _logger;
 
-        private readonly SettingsModel _settings;
+        private readonly MqttSettingsModel _settings;
         private readonly MqttApplicationMessageInterceptor _mqttApplicationMessageInterceptor;
         private readonly MqttServerStorage _mqttServerStorage;
         private readonly MqttClientConnectedHandler _mqttClientConnectedHandler;
         private readonly MqttClientDisconnectedHandler _mqttClientDisconnectedHandler;
         private readonly MqttClientSubscribedTopicHandler _mqttClientSubscribedTopicHandler;
         private readonly MqttClientUnsubscribedTopicHandler _mqttClientUnsubscribedTopicHandler;
-        private readonly MqttConnectionValidator _mqttConnectionValidator;
+        private readonly MqttServerConnectionValidator _mqttConnectionValidator;
         private readonly IMqttServer _mqttServer;
         private readonly MqttSubscriptionInterceptor _mqttSubscriptionInterceptor;
         private readonly PythonScriptHostService _pythonScriptHostService;
         private readonly MqttWebSocketServerAdapter _webSocketServerAdapter;
 
         public MqttServerService(
-            SettingsModel settings,
+            MqttSettingsModel mqttSettings,
             CustomMqttFactory mqttFactory,
             MqttClientConnectedHandler mqttClientConnectedHandler,
             MqttClientDisconnectedHandler mqttClientDisconnectedHandler,
             MqttClientSubscribedTopicHandler mqttClientSubscribedTopicHandler,
             MqttClientUnsubscribedTopicHandler mqttClientUnsubscribedTopicHandler,
-            MqttConnectionValidator mqttConnectionValidator,
+            MqttServerConnectionValidator mqttConnectionValidator,
             MqttSubscriptionInterceptor mqttSubscriptionInterceptor,
             MqttApplicationMessageInterceptor mqttApplicationMessageInterceptor,
             MqttServerStorage mqttServerStorage,
             PythonScriptHostService pythonScriptHostService,            
             ILogger<MqttServerService> logger)
         {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            _settings = mqttSettings ?? throw new ArgumentNullException(nameof(mqttSettings));
             _mqttClientConnectedHandler = mqttClientConnectedHandler ?? throw new ArgumentNullException(nameof(mqttClientConnectedHandler));
             _mqttClientDisconnectedHandler = mqttClientDisconnectedHandler ?? throw new ArgumentNullException(nameof(mqttClientDisconnectedHandler));
             _mqttClientSubscribedTopicHandler = mqttClientSubscribedTopicHandler ?? throw new ArgumentNullException(nameof(mqttClientSubscribedTopicHandler));
@@ -66,7 +66,10 @@ namespace MQTTnet.Server.Mqtt
 
             var adapters = new List<IMqttServerAdapter>
             {
-                new MqttTcpServerAdapter(mqttFactory.Logger.CreateChildLogger()),
+                new MqttTcpServerAdapter(mqttFactory.Logger.CreateChildLogger())
+                {
+                    TreatSocketOpeningErrorAsWarning = true // Opening other ports than for HTTP is not allows in Azure App Services.
+                },
                 _webSocketServerAdapter
             };
 

Source/MQTTnet.Server/Mqtt/MqttServerStorage.cs

@@ -14,27 +14,28 @@ namespace MQTTnet.Server.Mqtt
     {
         private readonly List<MqttApplicationMessage> _messages = new List<MqttApplicationMessage>();
 
-        private readonly SettingsModel _settings;
+        private readonly MqttSettingsModel _mqttSettings;
         private readonly ILogger<MqttServerStorage> _logger;
 
-        private string _filename;
+        private string _path;
         private bool _messagesHaveChanged;
 
-        public MqttServerStorage(SettingsModel settings, ILogger<MqttServerStorage> logger)
+        public MqttServerStorage(MqttSettingsModel mqttSettings, ILogger<MqttServerStorage> logger)
         {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            _mqttSettings = mqttSettings ?? throw new ArgumentNullException(nameof(mqttSettings));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
         public void Configure()
         {
-            if (_settings.RetainedApplicationMessages?.Persist != true)
+            if (_mqttSettings.RetainedApplicationMessages?.Persist != true || 
+                string.IsNullOrEmpty(_mqttSettings.RetainedApplicationMessages.Path))
             {
                 _logger.LogInformation("Persisting of retained application messages is disabled.");
                 return;
             }
 
-            _filename = ExpandFilename();
+            _path = PathHelper.ExpandPath(_mqttSettings.RetainedApplicationMessages.Path);
 
             // The retained application messages are stored in a separate thread.
             // This is mandatory because writing them to a slow storage (like RaspberryPi SD card) 
@@ -61,7 +62,7 @@ namespace MQTTnet.Server.Mqtt
             {
                 try
                 {
-                    await Task.Delay(TimeSpan.FromSeconds(_settings.RetainedApplicationMessages.WriteInterval)).ConfigureAwait(false);
+                    await Task.Delay(TimeSpan.FromSeconds(_mqttSettings.RetainedApplicationMessages.WriteInterval)).ConfigureAwait(false);
 
                     List<MqttApplicationMessage> messages;
                     lock (_messages)
@@ -76,7 +77,7 @@ namespace MQTTnet.Server.Mqtt
                     }
 
                     var json = JsonConvert.SerializeObject(messages);
-                    await File.WriteAllTextAsync(_filename, json, Encoding.UTF8).ConfigureAwait(false);
+                    await File.WriteAllTextAsync(_path, json, Encoding.UTF8).ConfigureAwait(false);
                     
                     _logger.LogInformation($"{messages.Count} retained MQTT messages written.");
                 }
@@ -89,19 +90,19 @@ namespace MQTTnet.Server.Mqtt
 
         public async Task<IList<MqttApplicationMessage>> LoadRetainedMessagesAsync()
         {
-            if (_settings.RetainedApplicationMessages?.Persist != true)
+            if (_mqttSettings.RetainedApplicationMessages?.Persist != true)
             {
                 return null;
             }
 
-            if (!File.Exists(_filename))
+            if (!File.Exists(_path))
             {
                 return null;
             }
 
             try
             {
-                var json = await File.ReadAllTextAsync(_filename).ConfigureAwait(false);
+                var json = await File.ReadAllTextAsync(_path).ConfigureAwait(false);
                 var applicationMessages = JsonConvert.DeserializeObject<List<MqttApplicationMessage>>(json);
 
                 _logger.LogInformation($"{applicationMessages.Count} retained MQTT messages loaded.");
@@ -114,18 +115,5 @@ namespace MQTTnet.Server.Mqtt
                 return null;
             }
         }
-
-        private string ExpandFilename()
-        {
-            var filename = _settings.RetainedApplicationMessages.Filename;
-
-            var uri = new Uri(filename, UriKind.RelativeOrAbsolute);
-            if (!uri.IsAbsoluteUri)
-            {
-                filename = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filename);
-            }
-
-            return filename;
-        }
     }
 }

Source/MQTTnet.Server/Program.cs

@@ -2,6 +2,7 @@
 using System.Reflection;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using MQTTnet.Server.Web;
 
 namespace MQTTnet.Server
 {
@@ -27,45 +28,40 @@ namespace MQTTnet.Server
         private static void PrintLogo()
         {
             Console.ResetColor();
-            Console.ForegroundColor = ConsoleColor.White;
+            Console.ForegroundColor = ConsoleColor.Red;
-            Console.BackgroundColor = ConsoleColor.Red;
             const string LogoText =
-@"|                                                                                      |
+@"
-|      __  __  ____ _______ _______         _      _____                               |
+
-|     |  \/  |/ __ \__   __|__   __|       | |    / ____|                              |
+███╗   ███╗ ██████╗ ████████╗████████╗███╗   ██╗███████╗████████╗    ███████╗███████╗██████╗ ██╗   ██╗███████╗██████╗ 
-|     | \  / | |  | | | |     | |_ __   ___| |_  | (___   ___ _ ____   _____ _ __      |
+████╗ ████║██╔═══██╗╚══██╔══╝╚══██╔══╝████╗  ██║██╔════╝╚══██╔══╝    ██╔════╝██╔════╝██╔══██╗██║   ██║██╔════╝██╔══██╗
-|     | |\/| | |  | | | |     | | '_ \ / _ \ __|  \___ \ / _ \ '__\ \ / / _ \ '__|     |
+██╔████╔██║██║   ██║   ██║      ██║   ██╔██╗ ██║█████╗     ██║       ███████╗█████╗  ██████╔╝██║   ██║█████╗  ██████╔╝
-|     | |  | | |__| | | |     | | | | |  __/ |_   ____) |  __/ |   \ V /  __/ |        |
+██║╚██╔╝██║██║▄▄ ██║   ██║      ██║   ██║╚██╗██║██╔══╝     ██║       ╚════██║██╔══╝  ██╔══██╗╚██╗ ██╔╝██╔══╝  ██╔══██╗
-|     |_|  |_|\___\_\ |_|     |_|_| |_|\___|\__| |_____/ \___|_|    \_/ \___|_|        |
+██║ ╚═╝ ██║╚██████╔╝   ██║      ██║   ██║ ╚████║███████╗   ██║       ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
-|                                                                                      |
+╚═╝     ╚═╝ ╚══▀▀═╝    ╚═╝      ╚═╝   ╚═╝  ╚═══╝╚══════╝   ╚═╝       ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
-|                                                                                      |";
+                                                                                                                      
+";
 
             Console.WriteLine(LogoText);
             Console.ResetColor();
             Console.WriteLine();
             Console.ForegroundColor = ConsoleColor.White;
-            Console.WriteLine(@"
+            Console.WriteLine("The official MQTT server implementation of MQTTnet");
-          -- The official MQTT server implementation of MQTTnet --
+            Console.WriteLine("Copyright (c) 2017-2019 The MQTTnet Team");
-                 Copyright (c) 2017-2019 The MQTTnet Team");
+            Console.WriteLine(@"https://github.com/chkr1011/MQTTnet");
-
-            Console.ForegroundColor = ConsoleColor.Blue;
-            Console.WriteLine(@"
-                   https://github.com/chkr1011/MQTTnet");
 
             Console.ForegroundColor = ConsoleColor.White;
             Console.WriteLine($@"
- Version:    {Assembly.GetExecutingAssembly().GetName().Version}
+Version:    {Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion}
- License:    MIT (read LICENSE file)
+License:    MIT (read LICENSE file)
- Sponsoring: https://opencollective.com/mqttnet
+Sponsoring: https://opencollective.com/mqttnet
- Support:    https://github.com/chkr1011/MQTTnet/issues
+Support:    https://github.com/chkr1011/MQTTnet/issues
- Docs:       https://github.com/chkr1011/MQTTnet/wiki/MQTTnetServer
+Docs:       https://github.com/chkr1011/MQTTnet/wiki/MQTTnetServer
 ");
 
-            Console.BackgroundColor = ConsoleColor.White;
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine(" ! THIS IS AN ALPHA VERSION! IT IS NOT RECOMMENDED TO USE IT FOR ANY DIFFERENT PURPOSE THAN TESTING OR EVALUATING!");
-            Console.WriteLine();
             Console.ResetColor();
+            Console.WriteLine();
         }
     }
 }

Source/MQTTnet.Server/README.md

@@ -0,0 +1,10 @@
+# Starting portable version
+The portable version requires a local installation of the .net core runtime. With that runtime installed the server can be started via the following comand.
+
+dotnet .\MQTTnet.Server.dll
+
+# Starting self contained versions
+The self contained versions are fully portable versions including the .net core runtime. The server can be started using the contained executable files.
+
+Windows:    MQTTnet.Server.exe
+Linux:		MQTTnet.Server (must be set to _executable_ first)

Source/MQTTnet.Server/RetainedApplicationMessages.json

@@ -1 +0,0 @@
-[{"Topic":"a","Payload":"YWFzYXNhc2E=","QualityOfServiceLevel":0,"Retain":true,"UserProperties":[],"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifier":null},{"Topic":"fgdfgd","Payload":"YWFzYXNhc2E=","QualityOfServiceLevel":0,"Retain":true,"UserProperties":[],"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifier":null}]

Source/MQTTnet.Server/Scripting/PythonScriptHostService.cs

@@ -4,9 +4,12 @@ using System.Dynamic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Scripting;
 using Microsoft.Scripting.Hosting;
+using MQTTnet.Server.Configuration;
 
 namespace MQTTnet.Server.Scripting
 {
@@ -14,26 +17,27 @@ namespace MQTTnet.Server.Scripting
     {
         private readonly IDictionary<string, object> _proxyObjects = new ExpandoObject();
         private readonly List<PythonScriptInstance> _scriptInstances = new List<PythonScriptInstance>();
+        private readonly string _scriptsPath;
+        private readonly ScriptingSettingsModel _scriptingSettings;
         private readonly ILogger<PythonScriptHostService> _logger;
         private readonly ScriptEngine _scriptEngine;
         
-        public PythonScriptHostService(PythonIOStream pythonIOStream, ILogger<PythonScriptHostService> logger)
+        public PythonScriptHostService(ScriptingSettingsModel scriptingSettings, PythonIOStream pythonIOStream, ILogger<PythonScriptHostService> logger)
         {
+            _scriptingSettings = scriptingSettings ?? throw new ArgumentNullException(nameof(scriptingSettings));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
             _scriptEngine = IronPython.Hosting.Python.CreateEngine();
             _scriptEngine.Runtime.IO.SetOutput(pythonIOStream, Encoding.UTF8);
+
+            _scriptsPath = PathHelper.ExpandPath(scriptingSettings.ScriptsPath);
         }
 
         public void Configure()
         {
             AddSearchPaths(_scriptEngine);
 
-            var scriptsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Scripts");
+            TryInitializeScriptsAsync().GetAwaiter().GetResult();
-            foreach (var filename in Directory.GetFiles(scriptsDirectory, "*.py", SearchOption.AllDirectories).OrderBy(file => file))
-            {
-                TryInitializeScript(filename);
-            }
         }
 
         public void RegisterProxyObject(string name, object @object)
@@ -58,35 +62,109 @@ namespace MQTTnet.Server.Scripting
                     }
                     catch (Exception exception)
                     {
-                        _logger.LogError(exception, $"Error while invoking function '{name}' at script '{pythonScriptInstance.Name}'.");
+                        _logger.LogError(exception, $"Error while invoking function '{name}' at script '{pythonScriptInstance.Uid}'.");
                     }
                 }
             }
         }
 
-        private void TryInitializeScript(string filename)
+        public List<string> GetScriptUids()
         {
-            try
+            lock (_scriptInstances)
             {
-                var scriptName = new FileInfo(filename).Name;
+                return _scriptInstances.Select(si => si.Uid).ToList();
-
-                _logger.LogTrace($"Initializing Python script '{scriptName}'...");
-                var code = File.ReadAllText(filename);
-
-                var scriptInstance = CreateScriptInstance(scriptName, code);
-                scriptInstance.InvokeOptionalFunction("initialize");
-
-                _scriptInstances.Add(scriptInstance);
-
-                _logger.LogInformation($"Initialized script '{scriptName}'.");
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(exception, $"Error while initializing script '{new FileInfo(filename).Name}'.");
             }
         }
 
-        private PythonScriptInstance CreateScriptInstance(string name, string code)
+        public Task<string> ReadScriptAsync(string uid, CancellationToken cancellationToken)
+        {
+            if (uid == null) throw new ArgumentNullException(nameof(uid));
+
+            string path;
+
+            lock (_scriptInstances)
+            {
+                path = _scriptInstances.FirstOrDefault(si => si.Uid == uid)?.Path;
+            }
+
+            if (path == null || !File.Exists(path))
+            {
+                return null;
+            }
+
+            return File.ReadAllTextAsync(path, Encoding.UTF8, cancellationToken);
+        }
+
+        public async Task WriteScriptAsync(string uid, string code, CancellationToken cancellationToken)
+        {
+            var path = Path.Combine(_scriptsPath, uid + ".py");
+
+            await File.WriteAllTextAsync(path, code, Encoding.UTF8, cancellationToken).ConfigureAwait(false);
+            await TryInitializeScriptsAsync().ConfigureAwait(false);
+        }
+
+        public async Task DeleteScriptAsync(string uid)
+        {
+            var path = Path.Combine(_scriptsPath, uid + ".py");
+
+            if (File.Exists(path))
+            {
+                File.Delete(path);
+                await TryInitializeScriptsAsync().ConfigureAwait(false);
+            }
+        }
+
+        public async Task TryInitializeScriptsAsync()
+        {
+            lock (_scriptInstances)
+            {
+                foreach (var scriptInstance in _scriptInstances)
+                {
+                    try
+                    {
+                        scriptInstance.InvokeOptionalFunction("destroy");
+                    }
+                    catch (Exception exception)
+                    {
+                        _logger.LogWarning(exception, $"Error while unloading script '{scriptInstance.Uid}'.");
+                    }
+                }
+
+                _scriptInstances.Clear();
+            }
+
+            foreach (var path in Directory.GetFiles(_scriptsPath, "*.py", SearchOption.AllDirectories).OrderBy(file => file))
+            {
+                await TryInitializeScriptAsync(path).ConfigureAwait(false);
+            }
+        }
+
+        private async Task TryInitializeScriptAsync(string path)
+        {
+            var uid = new FileInfo(path).Name.Replace(".py", string.Empty, StringComparison.OrdinalIgnoreCase);
+
+            try
+            {
+                _logger.LogTrace($"Initializing Python script '{uid}'...");
+                var code = await File.ReadAllTextAsync(path).ConfigureAwait(false);
+
+                var scriptInstance = CreateScriptInstance(uid, path, code);
+                scriptInstance.InvokeOptionalFunction("initialize");
+
+                lock (_scriptInstances)
+                {
+                    _scriptInstances.Add(scriptInstance);
+                }
+                
+                _logger.LogInformation($"Initialized script '{uid}'.");
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, $"Error while initializing script '{uid}'.");
+            }
+        }
+
+        private PythonScriptInstance CreateScriptInstance(string uid, string path, string code)
         {
             var scriptScope = _scriptEngine.CreateScope();
 
@@ -96,31 +174,26 @@ namespace MQTTnet.Server.Scripting
             scriptScope.SetVariable("mqtt_net_server", _proxyObjects);
             compiledCode.Execute(scriptScope);
             
-            return new PythonScriptInstance(name, scriptScope);
+            return new PythonScriptInstance(uid, path, scriptScope);
         }
 
         private void AddSearchPaths(ScriptEngine scriptEngine)
         {
-            var paths = new List<string>
+            if (_scriptingSettings.IncludePaths?.Any() != true)
             {
-                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Lib"),
+                return;
-                "/usr/lib/python2.7",
+            }
-                @"C:\Python27\Lib"
-            };
-            
-            AddSearchPaths(scriptEngine, paths);
-        }
 
-        private void AddSearchPaths(ScriptEngine scriptEngine, IEnumerable<string> paths)
-        {
             var searchPaths = scriptEngine.GetSearchPaths();
 
-            foreach (var path in paths)
+            foreach (var path in _scriptingSettings.IncludePaths)
             {
-                if (Directory.Exists(path))
+                var effectivePath = PathHelper.ExpandPath(path);
+
+                if (Directory.Exists(effectivePath))
                 {
-                    searchPaths.Add(path);
+                    searchPaths.Add(effectivePath);
-                    _logger.LogInformation($"Added Python lib path: {path}");
+                    _logger.LogInformation($"Added Python lib path: {effectivePath}");
                 }
             }
 

Source/MQTTnet.Server/Scripting/PythonScriptInstance.cs

@@ -8,14 +8,17 @@ namespace MQTTnet.Server.Scripting
     {
         private readonly ScriptScope _scriptScope;
 
-        public PythonScriptInstance(string name, ScriptScope scriptScope)
+        public PythonScriptInstance(string uid, string path, ScriptScope scriptScope)
         {
-            _scriptScope = scriptScope;
+            Uid = uid;
+            Path = path;
 
-            Name = name;
+            _scriptScope = scriptScope;
         }
 
-        public string Name { get; }
+        public string Uid { get; }
+
+        public string Path { get; }
 
         public bool InvokeOptionalFunction(string name, params object[] parameters)
         {

Source/MQTTnet.Server/Scripts/00_sample.py

@@ -7,9 +7,17 @@ def initialize():
     It will be executed only one time.
     """
 
-    print("Hello World from Sample script.")
+    print("Hello World from sample script.")
    
 
+def destroy():
+    """
+    This function is invoked when the script is unloaded due to a script file update etc.
+    """
+
+    print("Bye from sample script.")
+
+    
 def on_validate_client_connection(context):
     """
     This function is invoked whenever a client wants to connect. It can be used to validate the connection.
@@ -17,20 +25,45 @@ def on_validate_client_connection(context):
     
     print(context)
 
+    # Access some custom data here which was inserted upon connect and may use it for validation.
     mqtt_net_server.write_shared_data(context["client_id"], {"custom_value_1": 1, "custom_value_2": True})
 
     return
+    
+    # Supported results:
+    # * success
+    # * unspecified_error
+    # * malformed_packet
+    # * protocol_error
+    # * implementation_specific_error
+    # * unsupported_protocol_version
+    # * client_identifier_not_valid
+    # * bad_user_name_or_password
+    # * not_authorized
+    # * server_unavailable
+    # * server_busy
+    # * banned
+    # * bad_authentication_method
+    # * topic_name_invalid
+    # * packet_too_large
+    # * quota_exceeded
+    # * payload_format_invalid
+    # * retain_not_supported
+    # * qos_not_supported
+    # * use_another_server
+    # * server_moved
+    # * connection_rate_exceeded
 
     if context["client_id"] != "test_client":
-        context["result"] = "connection_refused_not_authorized"
+        context["result"] = "bad_user_name_or_password"
         return
 
     if context["username"] != "bud spencer":
-        context["result"] = "connection_refused_not_authorized"
+        context["result"] = "bad_user_name_or_password"
         return
 
-    if context["password"] != "secret":
+    if context["password_string"] != "secret":
-        context["result"] = "connection_refused_not_authorized"
+        context["result"] = "bad_user_name_or_password"
 
     print(context)
 

Source/MQTTnet.Server/Scripts/readme.md

@@ -1,9 +1,11 @@
-This directory contains scripts which are loaded by the server and can be used to perform the following tasks.
+# MQTT Scripts
 
-1. Validation of client connections via credentials, client IDs etc.
+This directory contains scripts which are loaded by the server and can be used to perform the following tasks.
-2. Manipulation of every processed message.
+
-3. Validation of subscription attempts.
+* Validation of client connections via credentials, client IDs etc.
-4. Publishing of custom application messages.
+* Manipulation of every processed message.
+* Validation of subscription attempts.
+* Publishing of custom application messages.
 
 All scripts are loaded and _MQTTnet Server_ will invoke functions according to predefined naming conventions.
 If a function is implemented in multiple scripts the context will be moved throug all instances. This allows overriding of results or passing data to other (following) scripts.

Source/MQTTnet.Server/Web/BasicAuthenticationHandler.cs

@@ -0,0 +1,118 @@
+using System;
+using System.IO;
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+using Microsoft.Scripting;
+
+namespace MQTTnet.Server.Web
+{
+    public class AuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
+    {
+        private readonly ILogger<AuthenticationHandler> _logger;
+
+        public AuthenticationHandler(
+            IOptionsMonitor<AuthenticationSchemeOptions> options,
+            ILoggerFactory loggerFactory,
+            UrlEncoder encoder,
+            ISystemClock clock,
+            ILogger<AuthenticationHandler> logger)
+            : base(options, loggerFactory, encoder, clock)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            if (!Request.Headers.ContainsKey(HeaderNames.Authorization))
+            {
+                return AuthenticateResult.NoResult();
+            }
+
+            try
+            {
+                var headerValue = Request.Headers[HeaderNames.Authorization];
+                var parsedHeaderValue = AuthenticationHeaderValue.Parse(Request.Headers[HeaderNames.Authorization]);
+
+                var scheme = parsedHeaderValue.Scheme;
+                var parameter = parsedHeaderValue.Parameter;
+                string username = null;
+                string password = null;
+
+                if (scheme.Equals("Basic", StringComparison.OrdinalIgnoreCase))
+                {
+                    var credentialBytes = Convert.FromBase64String(parsedHeaderValue.Parameter);
+                    var credentials = Encoding.UTF8.GetString(credentialBytes).Split(':');
+                    username = credentials[0];
+                    password = credentials[1];
+                }
+
+                var context = new PythonDictionary
+                {
+                    ["header_value"] = headerValue,
+                    ["scheme"] = scheme,
+                    ["parameter"] = parameter,
+                    ["username"] = username,
+                    ["password"] = password,
+                    ["is_authenticated"] = false
+                };
+
+                if (!ValidateUser(context))
+                {
+                    return AuthenticateResult.Fail("Invalid credentials.");
+                }
+
+                var claims = new[]
+                {
+                    new Claim(ClaimTypes.NameIdentifier, context.get("username") as string ?? string.Empty)
+                };
+
+                var identity = new ClaimsIdentity(claims, Scheme.Name);
+                var principal = new ClaimsPrincipal(identity);
+                var ticket = new AuthenticationTicket(principal, Scheme.Name);
+
+                return AuthenticateResult.Success(ticket);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogWarning("Error while authenticating user.", exception);
+
+                return AuthenticateResult.Fail(exception);
+            }
+            finally
+            {
+                await Task.CompletedTask;
+            }
+        }
+
+        private bool ValidateUser(PythonDictionary context)
+        {
+            var handlerPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "authorization_handler.py");
+            if (!File.Exists(handlerPath))
+            {
+                return false;
+            }
+
+            var code = File.ReadAllText(handlerPath);
+
+            var scriptEngine = IronPython.Hosting.Python.CreateEngine();
+            //scriptEngine.Runtime.IO.SetOutput(new PythonIOStream(_logger.), Encoding.UTF8);
+
+            var scriptScope = scriptEngine.CreateScope();
+            var scriptSource = scriptScope.Engine.CreateScriptSourceFromString(code, SourceCodeKind.File);
+            var compiledCode = scriptSource.Compile();
+            compiledCode.Execute(scriptScope);
+            var function = scriptScope.Engine.Operations.GetMember<PythonFunction>(scriptScope, "handle_authenticate");
+            scriptScope.Engine.Operations.Invoke(function, context);
+
+            return context.get("is_authenticated", false) as bool? == true;
+        }
+    }
+}

Source/MQTTnet.Server/Web/Extensions.cs

@@ -0,0 +1,20 @@
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+
+namespace MQTTnet.Server.Web
+{
+    public static class Extensions
+    {
+        public static string ReadBodyAsString(this HttpRequest request)
+        {
+            if (request == null) throw new ArgumentNullException(nameof(request));
+
+            using (var reader = new StreamReader(request.Body, Encoding.UTF8))
+            {
+                return reader.ReadToEnd();
+            }
+        }
+    }
+}

Source/MQTTnet.Server/Web/Startup.cs

@@ -1,10 +1,14 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
 using Microsoft.OpenApi.Models;
 using Microsoft.Scripting.Utils;
 using MQTTnet.Server.Configuration;
@@ -14,7 +18,7 @@ using MQTTnet.Server.Scripting;
 using MQTTnet.Server.Scripting.DataSharing;
 using Swashbuckle.AspNetCore.SwaggerUI;
 
-namespace MQTTnet.Server
+namespace MQTTnet.Server.Web
 {
     public class Startup
     {
@@ -35,7 +39,7 @@ namespace MQTTnet.Server
             MqttServerService mqttServerService,
             PythonScriptHostService pythonScriptHostService,
             DataSharingService dataSharingService,
-            SettingsModel settings)
+            MqttSettingsModel mqttSettings)
         {
             if (environment.IsDevelopment())
             {
@@ -46,12 +50,20 @@ namespace MQTTnet.Server
                 application.UseHsts();
             }
 
+            application.UseCors(x => x
+                .AllowAnyOrigin()
+                .AllowAnyMethod()
+                .AllowAnyHeader()
+                .AllowCredentials());
+
+            application.UseAuthentication();
+
             application.UseStaticFiles();
 
             application.UseHttpsRedirection();
             application.UseMvc();
 
-            ConfigureWebSocketEndpoint(application, mqttServerService, settings);
+            ConfigureWebSocketEndpoint(application, mqttServerService, mqttSettings);
 
             dataSharingService.Configure();
             pythonScriptHostService.Configure();
@@ -73,6 +85,8 @@ namespace MQTTnet.Server
 
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddCors();
+
             services.AddMvc()
                 .SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
                 .AddJsonOptions(options =>
@@ -80,7 +94,7 @@ namespace MQTTnet.Server
                     options.SerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
                 });
 
-            services.AddSingleton(ReadSettings());
+            ReadMqttSettings(services);
 
             services.AddSingleton<PythonIOStream>();
             services.AddSingleton<PythonScriptHostService>();
@@ -95,13 +109,29 @@ namespace MQTTnet.Server
             services.AddSingleton<MqttClientDisconnectedHandler>();
             services.AddSingleton<MqttClientSubscribedTopicHandler>();
             services.AddSingleton<MqttClientUnsubscribedTopicHandler>();
-            services.AddSingleton<MqttConnectionValidator>();
+            services.AddSingleton<MqttServerConnectionValidator>();
             services.AddSingleton<MqttSubscriptionInterceptor>();
             services.AddSingleton<MqttApplicationMessageInterceptor>();
-            
+
             services.AddSwaggerGen(c =>
             {
                 c.DescribeAllEnumsAsStrings();
+                
+                var securityScheme = new OpenApiSecurityScheme
+                {
+                    Scheme = "Basic",
+                    Name = HeaderNames.Authorization,
+                    Type = SecuritySchemeType.Http,
+                    In = ParameterLocation.Header
+                };
+
+                c.AddSecurityDefinition("Swagger", securityScheme);
+
+                c.AddSecurityRequirement(new OpenApiSecurityRequirement
+                {
+                    [securityScheme] = new List<string>()
+                });
+
                 c.SwaggerDoc("v1", new OpenApiInfo
                 {
                     Title = "MQTTnet.Server API",
@@ -120,46 +150,54 @@ namespace MQTTnet.Server
                     },
                 });
             });
+
+            services.AddAuthentication("Basic")
+                .AddScheme<AuthenticationSchemeOptions, AuthenticationHandler>("Basic", null)
+                .AddCookie();
         }
 
-        private SettingsModel ReadSettings()
+        private void ReadMqttSettings(IServiceCollection services)
         {
-            var settings = new Configuration.SettingsModel();
+            var mqttSettings = new MqttSettingsModel();
-            Configuration.Bind("MQTT", settings);
+            Configuration.Bind("MQTT", mqttSettings);
-            return settings;
+            services.AddSingleton(mqttSettings);
+
+            var scriptingSettings = new ScriptingSettingsModel();
+            Configuration.Bind("Scripting", scriptingSettings);
+            services.AddSingleton(scriptingSettings);
         }
 
         private static void ConfigureWebSocketEndpoint(
             IApplicationBuilder application,
             MqttServerService mqttServerService,
-            SettingsModel settings)
+            MqttSettingsModel mqttSettings)
         {
-            if (settings?.WebSocketEndPoint?.Enabled != true)
+            if (mqttSettings?.WebSocketEndPoint?.Enabled != true)
             {
                 return;
             }
 
-            if (string.IsNullOrEmpty(settings.WebSocketEndPoint.Path))
+            if (string.IsNullOrEmpty(mqttSettings.WebSocketEndPoint.Path))
             {
                 return;
             }
 
             var webSocketOptions = new WebSocketOptions
             {
-                KeepAliveInterval = TimeSpan.FromSeconds(settings.WebSocketEndPoint.KeepAliveInterval),
+                KeepAliveInterval = TimeSpan.FromSeconds(mqttSettings.WebSocketEndPoint.KeepAliveInterval),
-                ReceiveBufferSize = settings.WebSocketEndPoint.ReceiveBufferSize
+                ReceiveBufferSize = mqttSettings.WebSocketEndPoint.ReceiveBufferSize
             };
 
-            if (settings.WebSocketEndPoint.AllowedOrigins?.Any() == true)
+            if (mqttSettings.WebSocketEndPoint.AllowedOrigins?.Any() == true)
             {
-                webSocketOptions.AllowedOrigins.AddRange(settings.WebSocketEndPoint.AllowedOrigins);
+                webSocketOptions.AllowedOrigins.AddRange(mqttSettings.WebSocketEndPoint.AllowedOrigins);
             }
-            
+
             application.UseWebSockets(webSocketOptions);
 
             application.Use(async (context, next) =>
             {
-                if (context.Request.Path == settings.WebSocketEndPoint.Path)
+                if (context.Request.Path == mqttSettings.WebSocketEndPoint.Path)
                 {
                     if (context.WebSockets.IsWebSocketRequest)
                     {
@@ -170,7 +208,7 @@ namespace MQTTnet.Server
                     }
                     else
                     {
-                        context.Response.StatusCode = 400;
+                        context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
                     }
                 }
                 else

Source/MQTTnet.Server/Web/authorization_handler.py

@@ -0,0 +1,20 @@
+def handle_authenticate(context):
+    """
+    This function is invoked whenever a user tries to access protected HTTP resources.
+    This function must exist and return a proper value. Otherwise the request is denied.
+    All authentication data must be sent via using the "Authorization" header. This header
+    will be parsed and all values will be exposed to the context. 
+    """
+    header_value = context["header_value"] # The untouched header value.
+
+    scheme = context["scheme"]
+    parameter = context["parameter"]
+
+    username = context["username"] # Only set if proper "Basic" authorization is used.
+    password = context["password"] # Only set if proper "Basic" authorization is used.
+    
+    context["is_authenticated"] = True # Change this to _False_ in case of invalid credentials.
+
+    # Example for an API key with proper format.
+    if header_value == "APIKey 123456":
+        context["is_authenticated"] = True

Source/MQTTnet.Server/appsettings.json

@@ -2,10 +2,10 @@
     "Kestrel": {
         "EndPoints": {
             "Http": {
-                "Url": "http://localhost:80"
+                "Url": "http://*:80"
             },
             "Https": {
-                "Url": "http://localhost:443"
+                "Url": "http://*:443"
             }
         }
     },
@@ -37,15 +37,23 @@
             "AllowedOrigins": [] // List of strings with URLs.
         },
         "CommunicationTimeout": 15, // In seconds.
-        "ConnectionBacklog": 0, /* Set 0 to disable */
+        "ConnectionBacklog": 10, // Set 0 to disable
-        "EnablePersistentSessions": false,
+        "EnablePersistentSessions": true,
         "MaxPendingMessagesPerClient": 250,
         "RetainedApplicationMessages": {
             "Persist": true,
-            "Filename": "RetainedApplicationMessages.json",
+            "Path": "RetainedApplicationMessages.json",
             "WriteInterval": 10 // In seconds.
         },
-        "EnableDebugLogging": true
+        "EnableDebugLogging": false
+    },
+    "Scripting": {
+        "ScriptsPath": "Scripts",
+        "IncludePaths": [
+            "Lib",
+            "/usr/lib/python2.7",
+            "C:\\Python27\\Lib"
+        ]
     },
     "Logging": {
         "LogLevel": {

Source/MQTTnet.Server/run.bat

@@ -1,2 +0,0 @@
-@echo off
-START "MQTTnet Server" dotnet .\MQTTnet.Server.dll

Source/MQTTnet.Server/run.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "Starting MQTTnet Server.."
-dotnet .\MQTTnet.Server.dll

Source/MQTTnet/Adapter/IMqttChannelAdapter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Formatter;
@@ -12,6 +13,8 @@ namespace MQTTnet.Adapter
 
         bool IsSecureConnection { get; }
 
+        X509Certificate2 ClientCertificate { get; }
+
         MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
 
         long BytesSent { get; }
@@ -29,5 +32,7 @@ namespace MQTTnet.Adapter
         Task SendPacketAsync(MqttBasePacket packet, TimeSpan timeout, CancellationToken cancellationToken);
 
         Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken);
+
+        void ResetStatistics();
     }
 }

Source/MQTTnet/Adapter/MqttChannelAdapter.cs

@@ -2,6 +2,7 @@ using System;
 using System.IO;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Channel;
@@ -47,6 +48,8 @@ namespace MQTTnet.Adapter
 
         public bool IsSecureConnection => _channel.IsSecureConnection;
 
+        public X509Certificate2 ClientCertificate => _channel.ClientCertificate;
+
         public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
 
         public long BytesSent => Interlocked.Read(ref _bytesSent);

Source/MQTTnet/Channel/IMqttChannel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -8,6 +9,7 @@ namespace MQTTnet.Channel
     {
         string Endpoint { get; }
         bool IsSecureConnection { get; }
+        X509Certificate2 ClientCertificate { get; }
 
         Task ConnectAsync(CancellationToken cancellationToken);
         Task DisconnectAsync(CancellationToken cancellationToken);

Source/MQTTnet/Client/Connecting/MqttClientAuthenticateResult.cs

@@ -1,9 +1,45 @@
-namespace MQTTnet.Client.Connecting
+using System.Collections.Generic;
+using MQTTnet.Packets;
+
+namespace MQTTnet.Client.Connecting
 {
+    // TODO: Consider renaming this to _MqttClientConnectResult_
     public class MqttClientAuthenticateResult
     {
+        public MqttClientConnectResultCode ResultCode { get; set; }
+
         public bool IsSessionPresent { get; set; }
 
-        public MqttClientConnectResultCode ResultCode { get; set; }
+        public bool? WildcardSubscriptionAvailable { get; set; }
+
+        public bool? RetainAvailable { get; set; }
+
+        public string AssignedClientIdentifier { get; set; }
+
+        public string AuthenticationMethod { get; set; }
+
+        public byte[] AuthenticationData { get; set; }
+
+        public uint? MaximumPacketSize { get; set; }
+
+        public string ReasonString { get; set; }
+
+        public ushort? ReceiveMaximum { get; set; }
+
+        public string ResponseInformation { get; set; }
+
+        public ushort? TopicAliasMaximum { get; set; }
+
+        public string ServerReference { get; set; }
+
+        public ushort? ServerKeepAlive { get; set; }
+
+        public uint? SessionExpiryInterval { get; set; }
+
+        public bool? SubscriptionIdentifiersAvailable { get; set; }
+
+        public bool? SharedSubscriptionAvailable { get; set; }
+
+        public List<MqttUserProperty> UserProperties { get; set; }
     }
 }

Source/MQTTnet/Client/Disconnecting/MqttClientDisconnectedEventArgs.cs

@@ -1,17 +1,21 @@
 using System;
+using MQTTnet.Client.Connecting;
 
 namespace MQTTnet.Client.Disconnecting
 {
     public class MqttClientDisconnectedEventArgs : EventArgs
     {
-        public MqttClientDisconnectedEventArgs(bool clientWasConnected, Exception exception)
+        public MqttClientDisconnectedEventArgs(bool clientWasConnected, Exception exception, MqttClientAuthenticateResult authenticateResult)
         {
             ClientWasConnected = clientWasConnected;
             Exception = exception;
+            AuthenticateResult = authenticateResult;
         }
 
         public bool ClientWasConnected { get; }
 
         public Exception Exception { get; }
+
+        public MqttClientAuthenticateResult AuthenticateResult { get; }
     }
 }

Source/MQTTnet/Client/ExtendedAuthenticationExchange/IMqttExtendedAuthenticationExchangeHandler.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MQTTnet.Client.ExtendedAuthenticationExchange
+{
+    public interface IMqttExtendedAuthenticationExchangeHandler
+    {
+        Task HandleRequestAsync(MqttExtendedAuthenticationExchangeContext context);
+    }
+}

Source/MQTTnet/Client/ExtendedAuthenticationExchange/MqttExtendedAuthenticationExchangeContext.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Client.ExtendedAuthenticationExchange
+{
+    public class MqttExtendedAuthenticationExchangeContext
+    {
+        public MqttExtendedAuthenticationExchangeContext(MqttAuthPacket authPacket, IMqttClient client)
+        {
+            if (authPacket == null) throw new ArgumentNullException(nameof(authPacket));
+
+            ReasonCode = authPacket.ReasonCode;
+            ReasonString = authPacket.Properties?.ReasonString;
+            AuthenticationMethod = authPacket.Properties?.AuthenticationMethod;
+            AuthenticationData = authPacket.Properties?.AuthenticationData;
+            UserProperties = authPacket.Properties?.UserProperties;
+
+            Client = client ?? throw new ArgumentNullException(nameof(client));
+        }
+
+        public MqttAuthenticateReasonCode ReasonCode { get; }
+
+        public string ReasonString { get; }
+
+        public string AuthenticationMethod { get; }
+
+        public byte[] AuthenticationData { get; }
+
+        public List<MqttUserProperty> UserProperties { get; }
+
+        public IMqttClient Client { get; }
+    }
+}

Source/MQTTnet/Client/ExtendedAuthenticationExchange/MqttExtendedAuthenticationExchangeData.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Client.ExtendedAuthenticationExchange
+{
+    public class MqttExtendedAuthenticationExchangeData
+    {
+        public MqttAuthenticateReasonCode ReasonCode { get; set; }
+
+        public string ReasonString { get; set; }
+
+        public byte[] AuthenticationData { get; set; }
+
+        public List<MqttUserProperty> UserProperties { get; }
+    }
+}

Source/MQTTnet/Client/IMqttClient.cs

@@ -3,6 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
+using MQTTnet.Client.ExtendedAuthenticationExchange;
 using MQTTnet.Client.Options;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
@@ -21,6 +22,7 @@ namespace MQTTnet.Client
         Task<MqttClientAuthenticateResult> ConnectAsync(IMqttClientOptions options, CancellationToken cancellationToken);
         Task DisconnectAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken);
 
+        Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken);
         Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken);
         Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken);
     }

Source/MQTTnet/Client/IMqttClientFactory.cs

@@ -5,6 +5,8 @@ namespace MQTTnet.Client
 {
     public interface IMqttClientFactory
     {
+        IMqttFactory UseClientAdapterFactory(IMqttClientAdapterFactory clientAdapterFactory);
+
         IMqttClient CreateMqttClient();
 
         IMqttClient CreateMqttClient(IMqttNetLogger logger);

Source/MQTTnet/Client/MqttClient.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using MQTTnet.Adapter;
 using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
+using MQTTnet.Client.ExtendedAuthenticationExchange;
 using MQTTnet.Client.Options;
 using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Receiving;
@@ -12,6 +13,7 @@ using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
+using MQTTnet.Internal;
 using MQTTnet.PacketDispatcher;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
@@ -61,6 +63,8 @@ namespace MQTTnet.Client
 
             ThrowIfConnected("It is not allowed to connect with a server after the connection is established.");
 
+            MqttClientAuthenticateResult authenticateResult = null;
+
             try
             {
                 Options = options;
@@ -81,7 +85,7 @@ namespace MQTTnet.Client
 
                 _packetReceiverTask = Task.Run(() => TryReceivePacketsAsync(backgroundCancellationToken), backgroundCancellationToken);
 
-                var authenticateResult = await AuthenticateAsync(adapter, options.WillMessage, cancellationToken).ConfigureAwait(false);
+                authenticateResult = await AuthenticateAsync(adapter, options.WillMessage, cancellationToken).ConfigureAwait(false);
 
                 _sendTracker.Restart();
 
@@ -108,7 +112,7 @@ namespace MQTTnet.Client
 
                 if (!DisconnectIsPending())
                 {
-                    await DisconnectInternalAsync(null, exception).ConfigureAwait(false);
+                    await DisconnectInternalAsync(null, exception, authenticateResult).ConfigureAwait(false);
                 }
 
                 throw;
@@ -131,11 +135,28 @@ namespace MQTTnet.Client
             {
                 if (!DisconnectIsPending())
                 {
-                    await DisconnectInternalAsync(null, null).ConfigureAwait(false);
+                    await DisconnectInternalAsync(null, null, null).ConfigureAwait(false);
                 }
             }
         }
 
+        public Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken)
+        {
+            if (data == null) throw new ArgumentNullException(nameof(data));
+
+            return SendAsync(new MqttAuthPacket
+            {
+                Properties = new MqttAuthPacketProperties
+                {
+                    // This must always be equal to the value from the CONNECT packet. So we use it here to ensure that.
+                    AuthenticationMethod = Options.AuthenticationMethod, 
+                    AuthenticationData = data.AuthenticationData,
+                    ReasonString = data.ReasonString,
+                    UserProperties = data.UserProperties
+                }
+            }, cancellationToken);
+        }
+
         public async Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
@@ -232,7 +253,7 @@ namespace MQTTnet.Client
             if (IsConnected) throw new MqttProtocolViolationException(message);
         }
 
-        private async Task DisconnectInternalAsync(Task sender, Exception exception)
+        private async Task DisconnectInternalAsync(Task sender, Exception exception, MqttClientAuthenticateResult authenticateResult)
         {
             var clientWasConnected = IsConnected;
 
@@ -267,7 +288,9 @@ namespace MQTTnet.Client
                 var disconnectedHandler = DisconnectedHandler;
                 if (disconnectedHandler != null)
                 {
-                    await disconnectedHandler.HandleDisconnectedAsync(new MqttClientDisconnectedEventArgs(clientWasConnected, exception)).ConfigureAwait(false);
+                    // This handler must be executed in a new thread because otherwise a dead lock may happen
+                    // when trying to reconnect in that handler etc.
+                    Task.Run(() => disconnectedHandler.HandleDisconnectedAsync(new MqttClientDisconnectedEventArgs(clientWasConnected, exception, authenticateResult))).Forget(_logger);
                 }
             }
         }
@@ -339,6 +362,7 @@ namespace MQTTnet.Client
 
                 while (!cancellationToken.IsCancellationRequested)
                 {
+                    // Values described here: [MQTT-3.1.2-24].
                     var keepAliveSendInterval = TimeSpan.FromSeconds(Options.KeepAlivePeriod.TotalSeconds * 0.75);
                     if (Options.KeepAliveSendInterval.HasValue)
                     {
@@ -376,7 +400,7 @@ namespace MQTTnet.Client
 
                 if (!DisconnectIsPending())
                 {
-                    await DisconnectInternalAsync(_keepAlivePacketsSenderTask, exception).ConfigureAwait(false);
+                    await DisconnectInternalAsync(_keepAlivePacketsSenderTask, exception, null).ConfigureAwait(false);
                 }
             }
             finally
@@ -404,7 +428,7 @@ namespace MQTTnet.Client
                     {
                         if (!DisconnectIsPending())
                         {
-                            await DisconnectInternalAsync(_packetReceiverTask, null).ConfigureAwait(false);
+                            await DisconnectInternalAsync(_packetReceiverTask, null, null).ConfigureAwait(false);
                         }
 
                         return;
@@ -436,7 +460,7 @@ namespace MQTTnet.Client
 
                 if (!DisconnectIsPending())
                 {
-                    await DisconnectInternalAsync(_packetReceiverTask, exception).ConfigureAwait(false);
+                    await DisconnectInternalAsync(_packetReceiverTask, exception, null).ConfigureAwait(false);
                 }
             }
             finally
@@ -467,8 +491,19 @@ namespace MQTTnet.Client
                 }
                 else if (packet is MqttDisconnectPacket)
                 {
+                    // Also dispatch disconnect to waiting threads to generate a proper exception.
+                    _packetDispatcher.Dispatch(packet);
+
                     await DisconnectAsync(null, cancellationToken).ConfigureAwait(false);
                 }
+                else if (packet is MqttAuthPacket authPacket)
+                {
+                    var extendedAuthenticationExchangeHandler = Options.ExtendedAuthenticationExchangeHandler;
+                    if (extendedAuthenticationExchangeHandler != null)
+                    {
+                        await extendedAuthenticationExchangeHandler.HandleRequestAsync(new MqttExtendedAuthenticationExchangeContext(authPacket, this)).ConfigureAwait(false);
+                    }
+                }
                 else
                 {
                     _packetDispatcher.Dispatch(packet);
@@ -497,7 +532,7 @@ namespace MQTTnet.Client
 
                 if (!DisconnectIsPending())
                 {
-                    await DisconnectInternalAsync(_packetReceiverTask, exception).ConfigureAwait(false);
+                    await DisconnectInternalAsync(_packetReceiverTask, exception, null).ConfigureAwait(false);
                 }
             }
         }
@@ -617,4 +652,4 @@ namespace MQTTnet.Client
             return Interlocked.CompareExchange(ref _disconnectGate, 1, 0) != 0;
         }
     }
-}
+}

Source/MQTTnet/Client/MqttClientExtensions.cs

@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
+using MQTTnet.Client.ExtendedAuthenticationExchange;
 using MQTTnet.Client.Options;
 using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Receiving;
@@ -170,21 +171,36 @@ namespace MQTTnet.Client
 
         public static Task<MqttClientAuthenticateResult> ConnectAsync(this IMqttClient client, IMqttClientOptions options)
         {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
             return client.ConnectAsync(options, CancellationToken.None);
         }
 
         public static Task DisconnectAsync(this IMqttClient client, MqttClientDisconnectOptions options)
         {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
             return client.DisconnectAsync(options, CancellationToken.None);
         }
 
+        public static Task SendExtendedAuthenticationExchangeDataAsync(this IMqttClient client, MqttExtendedAuthenticationExchangeData data)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            return client.SendExtendedAuthenticationExchangeDataAsync(data, CancellationToken.None);
+        }
+
         public static Task<MqttClientSubscribeResult> SubscribeAsync(this IMqttClient client, MqttClientSubscribeOptions options)
         {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
             return client.SubscribeAsync(options, CancellationToken.None);
         }
 
         public static Task<MqttClientUnsubscribeResult> UnsubscribeAsync(this IMqttClient client, MqttClientUnsubscribeOptions options)
         {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
             return client.UnsubscribeAsync(options, CancellationToken.None);
         }
 

Source/MQTTnet/Client/Options/IMqttClientCredentials.cs

@@ -2,7 +2,7 @@
 {
     public interface IMqttClientCredentials
     {
-        string Password { get; }
         string Username { get; }
+        byte[] Password { get; }
     }
 }

Source/MQTTnet/Client/Options/IMqttClientOptions.cs

@@ -1,4 +1,5 @@
 using System;
+using MQTTnet.Client.ExtendedAuthenticationExchange;
 using MQTTnet.Formatter;
 
 namespace MQTTnet.Client.Options
@@ -8,6 +9,7 @@ namespace MQTTnet.Client.Options
         string ClientId { get; }
         bool CleanSession { get; }
         IMqttClientCredentials Credentials { get; }
+        IMqttExtendedAuthenticationExchangeHandler ExtendedAuthenticationExchangeHandler { get; }
         MqttProtocolVersion ProtocolVersion { get; }
         IMqttClientChannelOptions ChannelOptions { get; }
         

Source/MQTTnet/Client/Options/MqttClientCredentials.cs

@@ -4,6 +4,6 @@
     {
         public string Username { get; set; }
 
-        public string Password { get; set; }
+        public byte[] Password { get; set; }
     }
 }

Source/MQTTnet/Client/Options/MqttClientOptions.cs

@@ -1,4 +1,5 @@
 using System;
+using MQTTnet.Client.ExtendedAuthenticationExchange;
 using MQTTnet.Formatter;
 
 namespace MQTTnet.Client.Options
@@ -8,6 +9,7 @@ namespace MQTTnet.Client.Options
         public string ClientId { get; set; } = Guid.NewGuid().ToString("N");
         public bool CleanSession { get; set; } = true;
         public IMqttClientCredentials Credentials { get; set; }
+        public IMqttExtendedAuthenticationExchangeHandler ExtendedAuthenticationExchangeHandler { get; set; }
         public MqttProtocolVersion ProtocolVersion { get; set; } = MqttProtocolVersion.V311;
 
         public IMqttClientChannelOptions ChannelOptions { get; set; }

Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Linq;
+using System.Text;
+using MQTTnet.Client.ExtendedAuthenticationExchange;
 using MQTTnet.Formatter;
 
 namespace MQTTnet.Client.Options
@@ -115,6 +117,18 @@ namespace MQTTnet.Client.Options
         }
 
         public MqttClientOptionsBuilder WithCredentials(string username, string password = null)
+        {
+            byte[] passwordBuffer = null;
+
+            if (password != null)
+            {
+                passwordBuffer = Encoding.UTF8.GetBytes(password);
+            }
+
+            return WithCredentials(username, passwordBuffer);
+        }
+
+        public MqttClientOptionsBuilder WithCredentials(string username, byte[] password = null)
         {
             _options.Credentials = new MqttClientCredentials
             {
@@ -125,6 +139,12 @@ namespace MQTTnet.Client.Options
             return this;
         }
 
+        public MqttClientOptionsBuilder WithExtendedAuthenticationExchangeHandler(IMqttExtendedAuthenticationExchangeHandler handler)
+        {
+            _options.ExtendedAuthenticationExchangeHandler = handler;
+            return this;
+        }
+
         public MqttClientOptionsBuilder WithTcpServer(string server, int? port = null)
         {
             _tcpOptions = new MqttClientTcpOptions
@@ -136,6 +156,17 @@ namespace MQTTnet.Client.Options
             return this;
         }
 
+        // TODO: Consider creating _MqttClientTcpOptionsBuilder_ as overload.
+        public MqttClientOptionsBuilder WithTcpServer(Action<MqttClientTcpOptions> optionsBuilder)
+        {
+            if (optionsBuilder == null) throw new ArgumentNullException(nameof(optionsBuilder));
+
+            _tcpOptions = new MqttClientTcpOptions();
+            optionsBuilder.Invoke(_tcpOptions);
+
+            return this;
+        }
+
         public MqttClientOptionsBuilder WithProxy(string address, string username = null, string password = null, string domain = null, bool bypassOnLocal = false, string[] bypassList = null)
         {
             _proxyOptions = new MqttClientWebSocketProxyOptions
@@ -151,6 +182,15 @@ namespace MQTTnet.Client.Options
             return this;
         }
 
+        public MqttClientOptionsBuilder WithProxy(Action<MqttClientWebSocketProxyOptions> optionsBuilder)
+        {
+            if (optionsBuilder == null) throw new ArgumentNullException(nameof(optionsBuilder));
+
+            _proxyOptions = new MqttClientWebSocketProxyOptions();
+            optionsBuilder(_proxyOptions);
+            return this;
+        }
+
         public MqttClientOptionsBuilder WithWebSocketServer(string uri, MqttClientOptionsBuilderWebSocketParameters parameters = null)
         {
             _webSocketOptions = new MqttClientWebSocketOptions
@@ -163,9 +203,19 @@ namespace MQTTnet.Client.Options
             return this;
         }
 
+        public MqttClientOptionsBuilder WithWebSocketServer(Action<MqttClientWebSocketOptions> optionsBuilder)
+        {
+            if (optionsBuilder == null) throw new ArgumentNullException(nameof(optionsBuilder));
+
+            _webSocketOptions = new MqttClientWebSocketOptions();
+            optionsBuilder.Invoke(_webSocketOptions);
+
+            return this;
+        }
+
         public MqttClientOptionsBuilder WithTls(MqttClientOptionsBuilderTlsParameters parameters)
         {
-            _tlsParameters = parameters ?? throw new ArgumentNullException(nameof(parameters));
+            _tlsParameters = parameters;
             return this;
         }
 
@@ -174,6 +224,15 @@ namespace MQTTnet.Client.Options
             return WithTls(new MqttClientOptionsBuilderTlsParameters { UseTls = true });
         }
 
+        public MqttClientOptionsBuilder WithTls(Action<MqttClientOptionsBuilderTlsParameters> optionsBuilder)
+        {
+            if (optionsBuilder == null) throw new ArgumentNullException(nameof(optionsBuilder));
+
+            _tlsParameters = new MqttClientOptionsBuilderTlsParameters();
+            optionsBuilder(_tlsParameters);
+            return this;
+        }
+
         public IMqttClientOptions Build()
         {
             if (_tcpOptions == null && _webSocketOptions == null)

Source/MQTTnet/Client/Options/MqttClientTcpOptions.cs

@@ -10,7 +10,7 @@ namespace MQTTnet.Client.Options
 
         public int BufferSize { get; set; } = 65536;
 
-        public bool DualMode { get; set; } = true;
+        public bool? DualMode { get; set; }
 
         public bool NoDelay { get; set; } = true;
 

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeOptions.cs

@@ -7,6 +7,8 @@ namespace MQTTnet.Client.Subscribing
     {
         public List<TopicFilter> TopicFilters { get; set; } = new List<TopicFilter>();
 
-        public List<MqttUserProperty> UserProperties { get; set; } = new List<MqttUserProperty>();
+        public uint? SubscriptionIdentifier { get; set; }
+
+        public List<MqttUserProperty> UserProperties { get; set; }
     }
 }

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeOptionsBuilder.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Client.Subscribing
+{
+    public class MqttClientSubscribeOptionsBuilder
+    {
+        private readonly MqttClientSubscribeOptions _subscribeOptions = new MqttClientSubscribeOptions();
+
+        public MqttClientSubscribeOptionsBuilder WithUserProperty(string name, string value)
+        {
+            if (name == null) throw new ArgumentNullException(nameof(name));
+            if (value == null) throw new ArgumentNullException(nameof(value));
+
+            if (_subscribeOptions.UserProperties == null)
+            {
+                _subscribeOptions.UserProperties = new List<MqttUserProperty>();
+            }
+
+            _subscribeOptions.UserProperties.Add(new MqttUserProperty(name, value));
+
+            return this;
+        }
+
+        public MqttClientSubscribeOptionsBuilder WithSubscriptionIdentifier(uint? subscriptionIdentifier)
+        {
+            _subscribeOptions.SubscriptionIdentifier = subscriptionIdentifier;
+
+            return this;
+        }
+
+        public MqttClientSubscribeOptionsBuilder WithTopicFilter(
+            string topic,
+            MqttQualityOfServiceLevel qualityOfServiceLevel = MqttQualityOfServiceLevel.AtMostOnce,
+            bool? noLocal = null,
+            bool? retainAsPublished = null,
+            MqttRetainHandling? retainHandling = null)
+        {
+            return WithTopicFilter(new TopicFilter
+            {
+                Topic = topic,
+                QualityOfServiceLevel = qualityOfServiceLevel,
+                NoLocal = noLocal,
+                RetainAsPublished = retainAsPublished,
+                RetainHandling = retainHandling
+            });
+        }
+
+        public MqttClientSubscribeOptionsBuilder WithTopicFilter(Action<TopicFilterBuilder> topicFilterBuilder)
+        {
+            if (topicFilterBuilder == null) throw new ArgumentNullException(nameof(topicFilterBuilder));
+
+            var internalTopicFilterBuilder = new TopicFilterBuilder();
+            topicFilterBuilder(internalTopicFilterBuilder);
+
+            return WithTopicFilter(internalTopicFilterBuilder);
+        }
+
+        public MqttClientSubscribeOptionsBuilder WithTopicFilter(TopicFilterBuilder topicFilterBuilder)
+        {
+            if (topicFilterBuilder == null) throw new ArgumentNullException(nameof(topicFilterBuilder));
+
+            return WithTopicFilter(topicFilterBuilder.Build());
+        }
+
+        public MqttClientSubscribeOptionsBuilder WithTopicFilter(TopicFilter topicFilter)
+        {
+            if (topicFilter == null) throw new ArgumentNullException(nameof(topicFilter));
+
+            if (_subscribeOptions.TopicFilters == null)
+            {
+                _subscribeOptions.TopicFilters = new List<TopicFilter>();
+            }
+
+            _subscribeOptions.TopicFilters.Add(topicFilter);
+
+            return this;
+        }
+
+        public MqttClientSubscribeOptions Build()
+        {
+            return _subscribeOptions;
+        }
+    }
+}

Source/MQTTnet/Exceptions/MqttUnexpectedDisconnectReceivedException.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Exceptions
+{
+    public class MqttUnexpectedDisconnectReceivedException : MqttCommunicationException
+    {
+        public MqttUnexpectedDisconnectReceivedException(MqttDisconnectPacket disconnectPacket) 
+            : base($"Unexpected DISCONNECT (Reason code={disconnectPacket.ReasonCode}) received.")
+        {
+            ReasonCode = disconnectPacket.ReasonCode;
+            SessionExpiryInterval = disconnectPacket.Properties?.SessionExpiryInterval;
+            ReasonString = disconnectPacket.Properties?.ReasonString;
+            ServerReference = disconnectPacket.Properties?.ServerReference;
+            UserProperties = disconnectPacket.Properties?.UserProperties;
+        }
+
+        public MqttDisconnectReasonCode? ReasonCode { get; }
+
+        public uint? SessionExpiryInterval { get; }
+
+        public string ReasonString { get; }
+
+        public List<MqttUserProperty> UserProperties { get; }
+
+        public string ServerReference { get; }
+    }
+}

Source/MQTTnet/Formatter/IMqttDataConverter.cs

@@ -5,6 +5,8 @@ using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Packets;
+using MQTTnet.Server;
+using MqttClientSubscribeResult = MQTTnet.Client.Subscribing.MqttClientSubscribeResult;
 
 namespace MQTTnet.Formatter
 {
@@ -20,6 +22,8 @@ namespace MQTTnet.Formatter
 
         MqttConnectPacket CreateConnectPacket(MqttApplicationMessage willApplicationMessage, IMqttClientOptions options);
 
+        MqttConnAckPacket CreateConnAckPacket(MqttConnectionValidatorContext connectionValidatorContext);
+
         MqttClientSubscribeResult CreateClientSubscribeResult(MqttSubscribePacket subscribePacket, MqttSubAckPacket subAckPacket);
 
         MqttClientUnsubscribeResult CreateClientUnsubscribeResult(MqttUnsubscribePacket unsubscribePacket, MqttUnsubAckPacket unsubAckPacket);

Source/MQTTnet/Formatter/IMqttPacketBodyReader.cs

@@ -4,9 +4,9 @@ namespace MQTTnet.Formatter
 {
     public interface IMqttPacketBodyReader
     {
-        ulong Length { get; }
+        int Length { get; }
 
-        ulong Offset { get; }
+        int Offset { get; }
 
         bool EndOfStream { get; }
 
@@ -26,6 +26,6 @@ namespace MQTTnet.Formatter
 
         bool ReadBoolean();
 
-        void Seek(ulong position);
+        void Seek(int position);
     }
 }

Source/MQTTnet/Formatter/IMqttPacketWriter.cs

@@ -8,7 +8,6 @@
         void Write(byte returnCode);
         void WriteWithLengthPrefix(byte[] payload);
         void Write(ushort keepAlivePeriod);
-
         void Write(IMqttPacketWriter propertyWriter);
         void WriteVariableLengthInteger(uint length);
         void Write(byte[] payload, int v, int length);

Source/MQTTnet/Formatter/MqttPacketBodyReader.cs

@@ -9,52 +9,42 @@ namespace MQTTnet.Formatter
     public class MqttPacketBodyReader : IMqttPacketBodyReader
     {
         private readonly byte[] _buffer;
-        private readonly ulong _initialOffset;
+        private readonly int _initialOffset;
-        private readonly ulong _length;
+        private readonly int _length;
+
+        private int _offset;
 
         public MqttPacketBodyReader(byte[] buffer, int offset, int length)
-         : this(buffer, (ulong)offset, (ulong)length)
-        {
-        }
-
-        public MqttPacketBodyReader(byte[] buffer, ulong offset, ulong length)
         {
             _buffer = buffer;
             _initialOffset = offset;
-            Offset = offset;
+            _offset = offset;
             _length = length;
         }
 
-        public ulong Offset { get; private set; }
+        public int Offset => _offset;
 
-        public ulong Length => _length - Offset;
+        public int Length => _length - _offset;
 
-        public bool EndOfStream => Offset == _length;
+        public bool EndOfStream => _offset == _length;
 
-        public void Seek(ulong position)
+        public void Seek(int position)
         {
-            Offset = _initialOffset + position;
+            _offset = _initialOffset + position;
-        }
-
-        public ArraySegment<byte> Read(uint length)
-        {
-            ValidateReceiveBuffer(length);
-
-            var buffer = new ArraySegment<byte>(_buffer, (int)Offset, (int)length);
-            Offset += length;
-            return buffer;
         }
 
         public byte ReadByte()
         {
             ValidateReceiveBuffer(1);
-            return _buffer[Offset++];
-        }
 
+            return _buffer[_offset++];
+        }
+        
         public bool ReadBoolean()
         {
             ValidateReceiveBuffer(1);
-            var buffer = _buffer[Offset++];
+
+            var buffer = _buffer[_offset++];
 
             if (buffer == 0)
             {
@@ -71,15 +61,19 @@ namespace MQTTnet.Formatter
 
         public byte[] ReadRemainingData()
         {
-            return new ArraySegment<byte>(_buffer, (int)Offset, (int)(_length - Offset)).ToArray();
+            var bufferLength = _length - _offset;
+            var buffer = new byte[bufferLength];
+            Array.Copy(_buffer, _offset, buffer, 0, bufferLength);
+
+            return buffer;
         }
 
         public ushort ReadTwoByteInteger()
         {
             ValidateReceiveBuffer(2);
 
-            var msb = _buffer[Offset++];
+            var msb = _buffer[_offset++];
-            var lsb = _buffer[Offset++];
+            var lsb = _buffer[_offset++];
             
             return (ushort)(msb << 8 | lsb);
         }
@@ -88,31 +82,14 @@ namespace MQTTnet.Formatter
         {
             ValidateReceiveBuffer(4);
 
-            var byte0 = _buffer[Offset++];
+            var byte0 = _buffer[_offset++];
-            var byte1 = _buffer[Offset++];
+            var byte1 = _buffer[_offset++];
-            var byte2 = _buffer[Offset++];
+            var byte2 = _buffer[_offset++];
-            var byte3 = _buffer[Offset++];
+            var byte3 = _buffer[_offset++];
 
             return (uint)(byte0 << 24 | byte1 << 16 | byte2 << 8 | byte3);
         }
 
-        public byte[] ReadWithLengthPrefix()
-        {
-            return ReadSegmentWithLengthPrefix().ToArray();
-        }
-
-        private ArraySegment<byte> ReadSegmentWithLengthPrefix()
-        {
-            var length = ReadTwoByteInteger();
-
-            ValidateReceiveBuffer(length);
-
-            var result = new ArraySegment<byte>(_buffer, (int)Offset, length);
-            Offset += length;
-
-            return result;
-        }
-
         public uint ReadVariableLengthInteger()
         {
             var multiplier = 1;
@@ -134,13 +111,30 @@ namespace MQTTnet.Formatter
 
             return value;
         }
+        
+        public byte[] ReadWithLengthPrefix()
+        {
+            return ReadSegmentWithLengthPrefix().ToArray();
+        }
+
+        private ArraySegment<byte> ReadSegmentWithLengthPrefix()
+        {
+            var length = ReadTwoByteInteger();
+
+            ValidateReceiveBuffer(length);
+
+            var result = new ArraySegment<byte>(_buffer, _offset, length);
+            _offset += length;
+
+            return result;
+        }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ValidateReceiveBuffer(uint length)
+        private void ValidateReceiveBuffer(int length)
         {
-            if (_length < Offset + length)
+            if (_length < _offset + length)
             {
-                throw new ArgumentOutOfRangeException(nameof(_buffer), $"Expected at least {Offset + length} bytes but there are only {_length} bytes");
+                throw new ArgumentOutOfRangeException(nameof(_buffer), $"Expected at least {_offset + length} bytes but there are only {_length} bytes");
             }
         }
 

Source/MQTTnet/Formatter/V3/MqttV310DataConverter.cs

@@ -9,6 +9,8 @@ using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
+using MQTTnet.Server;
+using MqttClientSubscribeResult = MQTTnet.Client.Subscribing.MqttClientSubscribeResult;
 
 namespace MQTTnet.Formatter.V3
 {
@@ -124,6 +126,16 @@ namespace MQTTnet.Formatter.V3
             };
         }
 
+        public MqttConnAckPacket CreateConnAckPacket(MqttConnectionValidatorContext connectionValidatorContext)
+        {
+            if (connectionValidatorContext == null) throw new ArgumentNullException(nameof(connectionValidatorContext));
+
+            return new MqttConnAckPacket
+            {
+                ReturnCode = new MqttConnectReasonCodeConverter().ToConnectReturnCode(connectionValidatorContext.ReasonCode)
+            };
+        }
+
         public MqttClientSubscribeResult CreateClientSubscribeResult(MqttSubscribePacket subscribePacket, MqttSubAckPacket subAckPacket)
         {
             if (subscribePacket == null) throw new ArgumentNullException(nameof(subscribePacket));
@@ -216,6 +228,7 @@ namespace MQTTnet.Formatter.V3
 
             return new MqttClientPublishResult
             {
+                PacketIdentifier = pubCompPacket.PacketIdentifier,
                 ReasonCode = MqttClientPublishReasonCode.Success
             };
         }

Source/MQTTnet/Formatter/V3/MqttV310PacketFormatter.cs

@@ -10,7 +10,11 @@ namespace MQTTnet.Formatter.V3
     public class MqttV310PacketFormatter : IMqttPacketFormatter
     {
         private const int FixedHeaderSize = 1;
-        
+
+        private static readonly MqttPingReqPacket PingReqPacket = new MqttPingReqPacket();
+        private static readonly MqttPingRespPacket PingRespPacket = new MqttPingRespPacket();
+        private static readonly MqttDisconnectPacket DisconnectPacket = new MqttDisconnectPacket();
+
         private readonly IMqttPacketWriter _packetWriter;
 
         public MqttV310PacketFormatter()
@@ -67,14 +71,14 @@ namespace MQTTnet.Formatter.V3
             {
                 case MqttControlPacketType.Connect: return DecodeConnectPacket(receivedMqttPacket.Body);
                 case MqttControlPacketType.ConnAck: return DecodeConnAckPacket(receivedMqttPacket.Body);
-                case MqttControlPacketType.Disconnect: return new MqttDisconnectPacket();
+                case MqttControlPacketType.Disconnect: return DisconnectPacket;
                 case MqttControlPacketType.Publish: return DecodePublishPacket(receivedMqttPacket);
                 case MqttControlPacketType.PubAck: return DecodePubAckPacket(receivedMqttPacket.Body);
                 case MqttControlPacketType.PubRec: return DecodePubRecPacket(receivedMqttPacket.Body);
                 case MqttControlPacketType.PubRel: return DecodePubRelPacket(receivedMqttPacket.Body);
                 case MqttControlPacketType.PubComp: return DecodePubCompPacket(receivedMqttPacket.Body);
-                case MqttControlPacketType.PingReq: return new MqttPingReqPacket();
+                case MqttControlPacketType.PingReq: return PingReqPacket;
-                case MqttControlPacketType.PingResp: return new MqttPingRespPacket();
+                case MqttControlPacketType.PingResp: return PingRespPacket;
                 case MqttControlPacketType.Subscribe: return DecodeSubscribePacket(receivedMqttPacket.Body);
                 case MqttControlPacketType.SubAck: return DecodeSubAckPacket(receivedMqttPacket.Body);
                 case MqttControlPacketType.Unsubscibe: return DecodeUnsubscribePacket(receivedMqttPacket.Body);
@@ -229,7 +233,7 @@ namespace MQTTnet.Formatter.V3
 
             if (!receivedMqttPacket.Body.EndOfStream)
             {
-                packet.Payload = receivedMqttPacket.Body.ReadRemainingData().ToArray();
+                packet.Payload = receivedMqttPacket.Body.ReadRemainingData();
             }
 
             return packet;
@@ -289,7 +293,7 @@ namespace MQTTnet.Formatter.V3
 
             if (passwordFlag)
             {
-                packet.Password = body.ReadStringWithLengthPrefix();
+                packet.Password = body.ReadWithLengthPrefix();
             }
 
             ValidateConnectPacket(packet);

Source/MQTTnet/Formatter/V5/MqttV500DataConverter.cs

@@ -10,6 +10,9 @@ using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
+using MQTTnet.Server;
+
+using MqttClientSubscribeResult = MQTTnet.Client.Subscribing.MqttClientSubscribeResult;
 
 namespace MQTTnet.Formatter.V5
 {
@@ -33,13 +36,14 @@ namespace MQTTnet.Formatter.V5
                     MessageExpiryInterval = applicationMessage.MessageExpiryInterval,
                     PayloadFormatIndicator = applicationMessage.PayloadFormatIndicator,
                     ResponseTopic = applicationMessage.ResponseTopic,
-                    SubscriptionIdentifier = applicationMessage.SubscriptionIdentifier,
+                    SubscriptionIdentifiers = applicationMessage.SubscriptionIdentifiers,
                     TopicAlias = applicationMessage.TopicAlias
                 }
             };
 
             if (applicationMessage.UserProperties != null)
             {
+                packet.Properties.UserProperties = new List<MqttUserProperty>();
                 packet.Properties.UserProperties.AddRange(applicationMessage.UserProperties);
             }
 
@@ -63,6 +67,13 @@ namespace MQTTnet.Formatter.V5
                 Payload = publishPacket.Payload,
                 QualityOfServiceLevel = publishPacket.QualityOfServiceLevel,
                 Retain = publishPacket.Retain,
+                ResponseTopic = publishPacket.Properties?.ResponseTopic,
+                ContentType = publishPacket.Properties?.ContentType,
+                CorrelationData = publishPacket.Properties?.CorrelationData,
+                MessageExpiryInterval = publishPacket.Properties?.MessageExpiryInterval,
+                SubscriptionIdentifiers = publishPacket.Properties?.SubscriptionIdentifiers,
+                TopicAlias = publishPacket.Properties?.TopicAlias,
+                PayloadFormatIndicator = publishPacket.Properties?.PayloadFormatIndicator,
                 UserProperties = publishPacket.Properties?.UserProperties ?? new List<MqttUserProperty>()
             };
         }
@@ -74,7 +85,23 @@ namespace MQTTnet.Formatter.V5
             return new MqttClientAuthenticateResult
             {
                 IsSessionPresent = connAckPacket.IsSessionPresent,
-                ResultCode = (MqttClientConnectResultCode)connAckPacket.ReasonCode.Value
+                ResultCode = (MqttClientConnectResultCode)connAckPacket.ReasonCode.Value,
+                WildcardSubscriptionAvailable = connAckPacket.Properties?.WildcardSubscriptionAvailable,
+                RetainAvailable = connAckPacket.Properties?.RetainAvailable,
+                AssignedClientIdentifier = connAckPacket.Properties?.AssignedClientIdentifier,
+                AuthenticationMethod = connAckPacket.Properties?.AuthenticationMethod,
+                AuthenticationData = connAckPacket.Properties?.AuthenticationData,
+                MaximumPacketSize = connAckPacket.Properties?.MaximumPacketSize,
+                ReasonString = connAckPacket.Properties?.ReasonString,
+                ReceiveMaximum = connAckPacket.Properties?.ReceiveMaximum,
+                ResponseInformation = connAckPacket.Properties?.ResponseInformation,
+                TopicAliasMaximum = connAckPacket.Properties?.TopicAliasMaximum,
+                ServerReference = connAckPacket.Properties?.ServerReference,
+                ServerKeepAlive = connAckPacket.Properties?.ServerKeepAlive,
+                SessionExpiryInterval = connAckPacket.Properties?.SessionExpiryInterval,
+                SubscriptionIdentifiersAvailable = connAckPacket.Properties?.SubscriptionIdentifiersAvailable,
+                SharedSubscriptionAvailable = connAckPacket.Properties?.SharedSubscriptionAvailable,
+                UserProperties = connAckPacket.Properties?.UserProperties
             };
         }
 
@@ -105,6 +132,22 @@ namespace MQTTnet.Formatter.V5
             };
         }
 
+        public MqttConnAckPacket CreateConnAckPacket(MqttConnectionValidatorContext connectionValidatorContext)
+        {
+            return new MqttConnAckPacket
+            {
+                ReasonCode = connectionValidatorContext.ReasonCode,
+                Properties = new MqttConnAckPacketProperties
+                {
+                    UserProperties = connectionValidatorContext.UserProperties,
+                    AuthenticationMethod = connectionValidatorContext.AuthenticationMethod,
+                    AuthenticationData = connectionValidatorContext.ResponseAuthenticationData,
+                    AssignedClientIdentifier = connectionValidatorContext.AssignedClientIdentifier,
+                    ReasonString = connectionValidatorContext.ReasonString
+                }
+            };
+        }
+
         public MqttClientSubscribeResult CreateClientSubscribeResult(MqttSubscribePacket subscribePacket, MqttSubAckPacket subAckPacket)
         {
             if (subscribePacket == null) throw new ArgumentNullException(nameof(subscribePacket));
@@ -151,7 +194,8 @@ namespace MQTTnet.Formatter.V5
             };
 
             packet.TopicFilters.AddRange(options.TopicFilters);
-            packet.Properties.UserProperties.AddRange(options.UserProperties);
+            packet.Properties.SubscriptionIdentifier = options.SubscriptionIdentifier;
+            packet.Properties.UserProperties = options.UserProperties;
 
             return packet;
         }
@@ -166,7 +210,7 @@ namespace MQTTnet.Formatter.V5
             };
 
             packet.TopicFilters.AddRange(options.TopicFilters);
-            packet.Properties.UserProperties.AddRange(options.UserProperties);
+            packet.Properties.UserProperties = options.UserProperties;
 
             return packet;
         }
@@ -223,6 +267,7 @@ namespace MQTTnet.Formatter.V5
             {
                 return new MqttClientPublishResult
                 {
+                    PacketIdentifier = pubCompPacket.PacketIdentifier,
                     ReasonCode = MqttClientPublishReasonCode.UnspecifiedError,
                     ReasonString = pubCompPacket.Properties?.ReasonString,
                     UserProperties = pubCompPacket.Properties?.UserProperties
@@ -231,6 +276,7 @@ namespace MQTTnet.Formatter.V5
 
             var result = new MqttClientPublishResult
             {
+                PacketIdentifier = pubCompPacket.PacketIdentifier,
                 ReasonCode = MqttClientPublishReasonCode.Success,
                 ReasonString = pubCompPacket.Properties?.ReasonString,
                 UserProperties = pubCompPacket.Properties?.UserProperties

Source/MQTTnet/Formatter/V5/MqttV500PacketDecoder.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using MQTTnet.Adapter;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
@@ -9,6 +9,10 @@ namespace MQTTnet.Formatter.V5
 {
     public class MqttV500PacketDecoder
     {
+        private static readonly MqttPingReqPacket PingReqPacket = new MqttPingReqPacket();
+
+        private static readonly MqttPingRespPacket PingRespPacket = new MqttPingRespPacket();
+
         public MqttBasePacket Decode(ReceivedMqttPacket receivedMqttPacket)
         {
             if (receivedMqttPacket == null) throw new ArgumentNullException(nameof(receivedMqttPacket));
@@ -45,10 +49,7 @@ namespace MQTTnet.Formatter.V5
         {
             ThrowIfBodyIsEmpty(body);
 
-            var packet = new MqttConnectPacket
+            var packet = new MqttConnectPacket();
-            {
-                Properties = new MqttConnectPacketProperties()
-            };
 
             var protocolName = body.ReadStringWithLengthPrefix();
             var protocolVersion = body.ReadByte();
@@ -83,6 +84,11 @@ namespace MQTTnet.Formatter.V5
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttConnectPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.SessionExpiryInterval)
                 {
                     packet.Properties.SessionExpiryInterval = propertiesReader.ReadSessionExpiryInterval();
@@ -91,10 +97,6 @@ namespace MQTTnet.Formatter.V5
                 {
                     packet.Properties.AuthenticationMethod = propertiesReader.ReadAuthenticationMethod();
                 }
-                else if (propertiesReader.CurrentPropertyId == MqttPropertyId.WillDelayInterval)
-                {
-                    packet.Properties.WillDelayInterval = propertiesReader.ReadWillDelayInterval();
-                }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.AuthenticationData)
                 {
                     packet.Properties.AuthenticationData = propertiesReader.ReadAuthenticationData();
@@ -121,11 +123,16 @@ namespace MQTTnet.Formatter.V5
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
-                    propertiesReader.ThrowInvalidPropertyIdException(typeof(MqttConnAckPacket));
+                    propertiesReader.ThrowInvalidPropertyIdException(typeof(MqttConnectPacket));
                 }
             }
 
@@ -133,6 +140,63 @@ namespace MQTTnet.Formatter.V5
 
             if (packet.WillMessage != null)
             {
+                var willPropertiesReader = new MqttV500PropertiesReader(body);
+
+                while (willPropertiesReader.MoveNext())
+                {
+                    if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.PayloadFormatIndicator)
+                    {
+                        packet.WillMessage.PayloadFormatIndicator = propertiesReader.ReadPayloadFormatIndicator();
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.MessageExpiryInterval)
+                    {
+                        packet.WillMessage.MessageExpiryInterval = propertiesReader.ReadMessageExpiryInterval();
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.TopicAlias)
+                    {
+                        packet.WillMessage.TopicAlias = propertiesReader.ReadTopicAlias();
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.ResponseTopic)
+                    {
+                        packet.WillMessage.ResponseTopic = propertiesReader.ReadResponseTopic();
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.CorrelationData)
+                    {
+                        packet.WillMessage.CorrelationData = propertiesReader.ReadCorrelationData();
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.SubscriptionIdentifier)
+                    {
+                        if (packet.WillMessage.SubscriptionIdentifiers == null)
+                        {
+                            packet.WillMessage.SubscriptionIdentifiers = new List<uint>();
+                        }
+
+                        packet.WillMessage.SubscriptionIdentifiers.Add(propertiesReader.ReadSubscriptionIdentifier());
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.ContentType)
+                    {
+                        packet.WillMessage.ContentType = propertiesReader.ReadContentType();
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.WillDelayInterval)
+                    {
+                        // This is a special case!
+                        packet.Properties.WillDelayInterval = propertiesReader.ReadWillDelayInterval();
+                    }
+                    else if (willPropertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
+                    {
+                        if (packet.WillMessage.UserProperties == null)
+                        {
+                            packet.WillMessage.UserProperties = new List<MqttUserProperty>();
+                        }
+
+                        propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
+                    }
+                    else
+                    {
+                        propertiesReader.ThrowInvalidPropertyIdException(typeof(MqttPublishPacket));
+                    }
+                }
+
                 packet.WillMessage.Topic = body.ReadStringWithLengthPrefix();
                 packet.WillMessage.Payload = body.ReadWithLengthPrefix();
             }
@@ -144,7 +208,7 @@ namespace MQTTnet.Formatter.V5
 
             if (passwordFlag)
             {
-                packet.Password = body.ReadStringWithLengthPrefix();
+                packet.Password = body.ReadWithLengthPrefix();
             }
 
             return packet;
@@ -159,13 +223,17 @@ namespace MQTTnet.Formatter.V5
             var packet = new MqttConnAckPacket
             {
                 IsSessionPresent = (acknowledgeFlags & 0x1) > 0,
-                ReasonCode = (MqttConnectReasonCode)body.ReadByte(),
+                ReasonCode = (MqttConnectReasonCode)body.ReadByte()
-                Properties = new MqttConnAckPacketProperties()
             };
 
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttConnAckPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.SessionExpiryInterval)
                 {
                     packet.Properties.SessionExpiryInterval = propertiesReader.ReadSessionExpiryInterval();
@@ -186,7 +254,7 @@ namespace MQTTnet.Formatter.V5
                 {
                     packet.Properties.ReceiveMaximum = propertiesReader.ReadReceiveMaximum();
                 }
-                else if (propertiesReader.CurrentPropertyId == MqttPropertyId.AssignedClientIdentifer)
+                else if (propertiesReader.CurrentPropertyId == MqttPropertyId.AssignedClientIdentifier)
                 {
                     packet.Properties.AssignedClientIdentifier = propertiesReader.ReadAssignedClientIdentifier();
                 }
@@ -228,7 +296,12 @@ namespace MQTTnet.Formatter.V5
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -245,13 +318,17 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttDisconnectPacket
             {
-                ReasonCode = (MqttDisconnectReasonCode)body.ReadByte(),
+                ReasonCode = (MqttDisconnectReasonCode)body.ReadByte()
-                Properties = new MqttDisconnectPacketProperties()
             };
 
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttDisconnectPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.SessionExpiryInterval)
                 {
                     packet.Properties.SessionExpiryInterval = propertiesReader.ReadSessionExpiryInterval();
@@ -266,7 +343,12 @@ namespace MQTTnet.Formatter.V5
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -283,20 +365,29 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttSubscribePacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttSubscribePacketProperties()
             };
 
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttSubscribePacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.SubscriptionIdentifier)
                 {
                     packet.Properties.SubscriptionIdentifier = propertiesReader.ReadSubscriptionIdentifier();
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -333,20 +424,29 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttSubAckPacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttSubAckPacketProperties()
             };
 
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttSubAckPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.ReasonString)
                 {
                     packet.Properties.ReasonString = propertiesReader.ReadReasonString();
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -369,16 +469,25 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttUnsubscribePacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttUnsubscribePacketProperties()
             };
 
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttUnsubscribePacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -400,20 +509,29 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttUnsubAckPacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttUnsubAckPacketProperties()
             };
 
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttUnsubAckPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.ReasonString)
                 {
                     packet.Properties.ReasonString = propertiesReader.ReadReasonString();
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -432,12 +550,12 @@ namespace MQTTnet.Formatter.V5
 
         private static MqttBasePacket DecodePingReqPacket()
         {
-            return new MqttPingReqPacket();
+            return PingReqPacket;
         }
 
         private static MqttBasePacket DecodePingRespPacket()
         {
-            return new MqttPingRespPacket();
+            return PingRespPacket;
         }
 
         private static MqttBasePacket DecodePublishPacket(byte header, IMqttPacketBodyReader body)
@@ -453,8 +571,7 @@ namespace MQTTnet.Formatter.V5
                 Topic = body.ReadStringWithLengthPrefix(),
                 Retain = retain,
                 QualityOfServiceLevel = qos,
-                Dup = dup,
+                Dup = dup
-                Properties = new MqttPublishPacketProperties()
             };
 
             if (qos > 0)
@@ -465,6 +582,11 @@ namespace MQTTnet.Formatter.V5
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttPublishPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.PayloadFormatIndicator)
                 {
                     packet.Properties.PayloadFormatIndicator = propertiesReader.ReadPayloadFormatIndicator();
@@ -487,7 +609,12 @@ namespace MQTTnet.Formatter.V5
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.SubscriptionIdentifier)
                 {
-                    packet.Properties.SubscriptionIdentifier = propertiesReader.ReadSubscriptionIdentifier();
+                    if (packet.Properties.SubscriptionIdentifiers == null)
+                    {
+                        packet.Properties.SubscriptionIdentifiers = new List<uint>();
+                    }
+
+                    packet.Properties.SubscriptionIdentifiers.Add(propertiesReader.ReadSubscriptionIdentifier());
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.ContentType)
                 {
@@ -495,7 +622,12 @@ namespace MQTTnet.Formatter.V5
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -505,7 +637,7 @@ namespace MQTTnet.Formatter.V5
 
             if (!body.EndOfStream)
             {
-                packet.Payload = body.ReadRemainingData().ToArray();
+                packet.Payload = body.ReadRemainingData();
             }
 
             return packet;
@@ -517,8 +649,7 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttPubAckPacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttPubAckPacketProperties()
             };
 
             if (body.EndOfStream)
@@ -532,13 +663,23 @@ namespace MQTTnet.Formatter.V5
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttPubAckPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.ReasonString)
                 {
                     packet.Properties.ReasonString = propertiesReader.ReadReasonString();
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -555,8 +696,7 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttPubRecPacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttPubRecPacketProperties()
             };
 
             if (body.EndOfStream)
@@ -570,13 +710,23 @@ namespace MQTTnet.Formatter.V5
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttPubRecPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.ReasonString)
                 {
                     packet.Properties.ReasonString = propertiesReader.ReadReasonString();
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -593,8 +743,7 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttPubRelPacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttPubRelPacketProperties()
             };
 
             if (body.EndOfStream)
@@ -608,13 +757,23 @@ namespace MQTTnet.Formatter.V5
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttPubRelPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.ReasonString)
                 {
                     packet.Properties.ReasonString = propertiesReader.ReadReasonString();
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -631,8 +790,7 @@ namespace MQTTnet.Formatter.V5
 
             var packet = new MqttPubCompPacket
             {
-                PacketIdentifier = body.ReadTwoByteInteger(),
+                PacketIdentifier = body.ReadTwoByteInteger()
-                Properties = new MqttPubCompPacketProperties()
             };
 
             if (body.EndOfStream)
@@ -646,13 +804,23 @@ namespace MQTTnet.Formatter.V5
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttPubCompPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.ReasonString)
                 {
                     packet.Properties.ReasonString = propertiesReader.ReadReasonString();
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {
@@ -667,10 +835,7 @@ namespace MQTTnet.Formatter.V5
         {
             ThrowIfBodyIsEmpty(body);
 
-            var packet = new MqttAuthPacket
+            var packet = new MqttAuthPacket();
-            {
-                Properties = new MqttAuthPacketProperties()
-            };
 
             if (body.EndOfStream)
             {
@@ -683,6 +848,11 @@ namespace MQTTnet.Formatter.V5
             var propertiesReader = new MqttV500PropertiesReader(body);
             while (propertiesReader.MoveNext())
             {
+                if (packet.Properties == null)
+                {
+                    packet.Properties = new MqttAuthPacketProperties();
+                }
+
                 if (propertiesReader.CurrentPropertyId == MqttPropertyId.AuthenticationMethod)
                 {
                     packet.Properties.AuthenticationMethod = propertiesReader.ReadAuthenticationMethod();
@@ -697,7 +867,12 @@ namespace MQTTnet.Formatter.V5
                 }
                 else if (propertiesReader.CurrentPropertyId == MqttPropertyId.UserProperty)
                 {
-                    propertiesReader.FillUserProperties(packet.Properties.UserProperties);
+                    if (packet.Properties.UserProperties == null)
+                    {
+                        packet.Properties.UserProperties = new List<MqttUserProperty>();
+                    }
+
+                    propertiesReader.AddUserPropertyTo(packet.Properties.UserProperties);
                 }
                 else
                 {

Source/MQTTnet/Formatter/V5/MqttV500PacketEncoder.cs

@@ -127,24 +127,38 @@ namespace MQTTnet.Formatter.V5
             var propertiesWriter = new MqttV500PropertiesWriter();
             if (packet.Properties != null)
             {
-                propertiesWriter.WriteWillDelayInterval(packet.Properties.WillDelayInterval);
                 propertiesWriter.WriteSessionExpiryInterval(packet.Properties.SessionExpiryInterval);
                 propertiesWriter.WriteAuthenticationMethod(packet.Properties.AuthenticationMethod);
                 propertiesWriter.WriteAuthenticationData(packet.Properties.AuthenticationData);
                 propertiesWriter.WriteRequestProblemInformation(packet.Properties.RequestProblemInformation);
                 propertiesWriter.WriteRequestResponseInformation(packet.Properties.RequestResponseInformation);
                 propertiesWriter.WriteReceiveMaximum(packet.Properties.ReceiveMaximum);
-                propertiesWriter.WriteTopicAlias(packet.Properties.TopicAliasMaximum);
+                propertiesWriter.WriteTopicAliasMaximum(packet.Properties.TopicAliasMaximum);
                 propertiesWriter.WriteMaximumPacketSize(packet.Properties.MaximumPacketSize);
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             packetWriter.WriteWithLengthPrefix(packet.ClientId);
-
+            
             if (packet.WillMessage != null)
             {
+                var willPropertiesWriter = new MqttV500PropertiesWriter();
+                willPropertiesWriter.WritePayloadFormatIndicator(packet.WillMessage.PayloadFormatIndicator);
+                willPropertiesWriter.WriteMessageExpiryInterval(packet.WillMessage.MessageExpiryInterval);
+                willPropertiesWriter.WriteTopicAlias(packet.WillMessage.TopicAlias);
+                willPropertiesWriter.WriteResponseTopic(packet.WillMessage.ResponseTopic);
+                willPropertiesWriter.WriteCorrelationData(packet.WillMessage.CorrelationData);
+                willPropertiesWriter.WriteSubscriptionIdentifiers(packet.WillMessage.SubscriptionIdentifiers);
+                willPropertiesWriter.WriteContentType(packet.WillMessage.ContentType);
+                willPropertiesWriter.WriteUserProperties(packet.WillMessage.UserProperties);
+                
+                // This is a special case!
+                willPropertiesWriter.WriteWillDelayInterval(packet.Properties?.WillDelayInterval);
+
+                willPropertiesWriter.WriteTo(packetWriter);
+
                 packetWriter.WriteWithLengthPrefix(packet.WillMessage.Topic);
                 packetWriter.WriteWithLengthPrefix(packet.WillMessage.Payload);
             }
@@ -202,7 +216,7 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.ConnAck);
         }
@@ -244,12 +258,12 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteTopicAlias(packet.Properties.TopicAlias);
                 propertiesWriter.WriteResponseTopic(packet.Properties.ResponseTopic);
                 propertiesWriter.WriteCorrelationData(packet.Properties.CorrelationData);
-                propertiesWriter.WriteSubscriptionIdentifier(packet.Properties.SubscriptionIdentifier);
+                propertiesWriter.WriteSubscriptionIdentifiers(packet.Properties.SubscriptionIdentifiers);
                 propertiesWriter.WriteContentType(packet.Properties.ContentType);
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             if (packet.Payload?.Length > 0)
             {
@@ -300,7 +314,7 @@ namespace MQTTnet.Formatter.V5
             if (packetWriter.Length > 0 || packet.ReasonCode.Value != MqttPubAckReasonCode.Success)
             {
                 packetWriter.Write((byte)packet.ReasonCode.Value);
-                propertiesWriter.WriteToPacket(packetWriter);
+                propertiesWriter.WriteTo(packetWriter);
             }
             
             return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubAck);
@@ -328,7 +342,7 @@ namespace MQTTnet.Formatter.V5
             if (packetWriter.Length > 0 || packet.ReasonCode.Value != MqttPubRecReasonCode.Success)
             {
                 packetWriter.Write((byte)packet.ReasonCode.Value);
-                propertiesWriter.WriteToPacket(packetWriter);
+                propertiesWriter.WriteTo(packetWriter);
             }
 
             return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubRec);
@@ -343,9 +357,6 @@ namespace MQTTnet.Formatter.V5
                 ThrowReasonCodeNotSetException();
             }
 
-            packetWriter.Write(packet.PacketIdentifier.Value);
-            packetWriter.Write((byte)packet.ReasonCode.Value);
-
             var propertiesWriter = new MqttV500PropertiesWriter();
             if (packet.Properties != null)
             {
@@ -353,10 +364,12 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            if (packetWriter.Length > 0 || packet.ReasonCode.Value != MqttPubRelReasonCode.Success)
+            packetWriter.Write(packet.PacketIdentifier.Value);
+            
+            if (propertiesWriter.Length > 0 || packet.ReasonCode.Value != MqttPubRelReasonCode.Success)
             {
                 packetWriter.Write((byte)packet.ReasonCode.Value);
-                propertiesWriter.WriteToPacket(packetWriter);
+                propertiesWriter.WriteTo(packetWriter);
             }
 
             return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubRel, 0x02);
@@ -372,8 +385,7 @@ namespace MQTTnet.Formatter.V5
             }
 
             packetWriter.Write(packet.PacketIdentifier.Value);
-            packetWriter.Write((byte)packet.ReasonCode.Value);
+            
-
             var propertiesWriter = new MqttV500PropertiesWriter();
             if (packet.Properties != null)
             {
@@ -381,10 +393,10 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            if (packetWriter.Length > 0 || packet.ReasonCode.Value != MqttPubCompReasonCode.Success)
+            if (propertiesWriter.Length > 0 || packet.ReasonCode.Value != MqttPubCompReasonCode.Success)
             {
                 packetWriter.Write((byte)packet.ReasonCode.Value);
-                propertiesWriter.WriteToPacket(packetWriter);
+                propertiesWriter.WriteTo(packetWriter);
             }
 
             return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubComp);
@@ -405,7 +417,7 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             if (packet.TopicFilters?.Count > 0)
             {
@@ -452,7 +464,7 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             foreach (var reasonCode in packet.ReasonCodes)
             {
@@ -476,7 +488,7 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             foreach (var topicFilter in packet.TopicFilters)
             {
@@ -501,7 +513,7 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             foreach (var reasonCode in packet.ReasonCodes)
             {
@@ -529,7 +541,7 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.Disconnect);
         }
@@ -557,7 +569,7 @@ namespace MQTTnet.Formatter.V5
                 propertiesWriter.WriteUserProperties(packet.Properties.UserProperties);
             }
 
-            propertiesWriter.WriteToPacket(packetWriter);
+            propertiesWriter.WriteTo(packetWriter);
 
             return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.Auth);
         }

Source/MQTTnet/Formatter/V5/MqttV500PropertiesReader.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
@@ -10,8 +9,8 @@ namespace MQTTnet.Formatter.V5
     public class MqttV500PropertiesReader
     {
         private readonly IMqttPacketBodyReader _body;
-        private readonly uint _length;
+        private readonly int _length;
-        private readonly ulong _targetOffset;
+        private readonly int _targetOffset;
 
         public MqttV500PropertiesReader(IMqttPacketBodyReader body)
         {
@@ -19,7 +18,7 @@ namespace MQTTnet.Formatter.V5
 
             if (!body.EndOfStream)
             {
-                _length = body.ReadVariableLengthInteger();
+                _length = (int)body.ReadVariableLengthInteger();
             }
 
             _targetOffset = body.Offset + _length;
@@ -43,24 +42,14 @@ namespace MQTTnet.Formatter.V5
             return true;
         }
 
-        public void FillUserProperties(List<MqttUserProperty> userProperties)
+        public void AddUserPropertyTo(List<MqttUserProperty> userProperties)
         {
             if (userProperties == null) throw new ArgumentNullException(nameof(userProperties));
 
-            var userPropertiesLength = _body.ReadVariableLengthInteger();
+            var name = _body.ReadStringWithLengthPrefix();
-            if (userPropertiesLength == 0)
+            var value = _body.ReadStringWithLengthPrefix();
-            {
-                return;
-            }
 
-            var targetPosition = _body.Offset + userPropertiesLength;
+            userProperties.Add(new MqttUserProperty(name, value));
-            while (_body.Offset < targetPosition)
-            {
-                var name = _body.ReadStringWithLengthPrefix();
-                var value = _body.ReadStringWithLengthPrefix();
-
-                userProperties.Add(new MqttUserProperty(name, value));
-            }
         }
 
         public string ReadReasonString()
@@ -78,17 +67,17 @@ namespace MQTTnet.Formatter.V5
             return _body.ReadWithLengthPrefix();
         }
 
-        public bool? ReadRetainAvailable()
+        public bool ReadRetainAvailable()
         {
             return _body.ReadBoolean();
         }
 
-        public uint? ReadSessionExpiryInterval()
+        public uint ReadSessionExpiryInterval()
         {
             return _body.ReadFourByteInteger();
         }
 
-        public ushort? ReadReceiveMaximum()
+        public ushort ReadReceiveMaximum()
         {
             return _body.ReadTwoByteInteger();
         }
@@ -103,17 +92,17 @@ namespace MQTTnet.Formatter.V5
             return _body.ReadStringWithLengthPrefix();
         }
 
-        public ushort? ReadTopicAliasMaximum()
+        public ushort ReadTopicAliasMaximum()
         {
             return _body.ReadTwoByteInteger();
         }
 
-        public uint? ReadMaximumPacketSize()
+        public uint ReadMaximumPacketSize()
         {
             return _body.ReadFourByteInteger();
         }
 
-        public ushort? ReadServerKeepAlive()
+        public ushort ReadServerKeepAlive()
         {
             return _body.ReadTwoByteInteger();
         }
@@ -123,22 +112,22 @@ namespace MQTTnet.Formatter.V5
             return _body.ReadStringWithLengthPrefix();
         }
 
-        public bool? ReadSharedSubscriptionAvailable()
+        public bool ReadSharedSubscriptionAvailable()
         {
             return _body.ReadBoolean();
         }
 
-        public bool? ReadSubscriptionIdentifiersAvailable()
+        public bool ReadSubscriptionIdentifiersAvailable()
         {
             return _body.ReadBoolean();
         }
 
-        public bool? ReadWildcardSubscriptionAvailable()
+        public bool ReadWildcardSubscriptionAvailable()
         {
             return _body.ReadBoolean();
         }
 
-        public uint? ReadSubscriptionIdentifier()
+        public uint ReadSubscriptionIdentifier()
         {
             return _body.ReadVariableLengthInteger();
         }
@@ -148,12 +137,12 @@ namespace MQTTnet.Formatter.V5
             return (MqttPayloadFormatIndicator)_body.ReadByte();
         }
 
-        public uint? ReadMessageExpiryInterval()
+        public uint ReadMessageExpiryInterval()
         {
             return _body.ReadFourByteInteger();
         }
 
-        public ushort? ReadTopicAlias()
+        public ushort ReadTopicAlias()
         {
             return _body.ReadTwoByteInteger();
         }
@@ -173,17 +162,17 @@ namespace MQTTnet.Formatter.V5
             return _body.ReadStringWithLengthPrefix();
         }
 
-        public uint? ReadWillDelayInterval()
+        public uint ReadWillDelayInterval()
         {
             return _body.ReadFourByteInteger();
         }
 
-        public bool? RequestResponseInformation()
+        public bool RequestResponseInformation()
         {
             return _body.ReadBoolean();
         }
 
-        public bool? RequestProblemInformation()
+        public bool RequestProblemInformation()
         {
             return _body.ReadBoolean();
         }

Source/MQTTnet/Formatter/V5/MqttV500PropertiesWriter.cs

@@ -7,8 +7,11 @@ namespace MQTTnet.Formatter.V5
 {
     public class MqttV500PropertiesWriter
     {
+        // TODO: Consider lazy init on first write to avoid useless allocations.
         private readonly MqttPacketWriter _packetWriter = new MqttPacketWriter();
 
+        public int Length => _packetWriter.Length;
+
         public void WriteUserProperties(List<MqttUserProperty> userProperties)
         {
             if (userProperties == null || userProperties.Count == 0)
@@ -16,16 +19,12 @@ namespace MQTTnet.Formatter.V5
                 return;
             }
 
-            var propertyWriter = new MqttPacketWriter();
             foreach (var property in userProperties)
             {
-                propertyWriter.WriteWithLengthPrefix(property.Name);
+                _packetWriter.Write((byte)MqttPropertyId.UserProperty);
-                propertyWriter.WriteWithLengthPrefix(property.Value);
+                _packetWriter.WriteWithLengthPrefix(property.Name);
+                _packetWriter.WriteWithLengthPrefix(property.Value);
             }
-
-            _packetWriter.Write((byte)MqttPropertyId.UserProperty);
-            _packetWriter.WriteVariableLengthInteger((uint)propertyWriter.Length);
-            _packetWriter.Write(propertyWriter);
         }
 
         public void WriteCorrelationData(byte[] value)
@@ -63,7 +62,7 @@ namespace MQTTnet.Formatter.V5
             Write(MqttPropertyId.AuthenticationMethod, value);
         }
 
-        public void WriteToPacket(IMqttPacketWriter packetWriter)
+        public void WriteTo(IMqttPacketWriter packetWriter)
         {
             if (packetWriter == null) throw new ArgumentNullException(nameof(packetWriter));
 
@@ -81,6 +80,19 @@ namespace MQTTnet.Formatter.V5
             WriteAsVariableLengthInteger(MqttPropertyId.SubscriptionIdentifier, value);
         }
 
+        public void WriteSubscriptionIdentifiers(IEnumerable<uint> value)
+        {
+            if (value == null)
+            {
+                return;
+            }
+
+            foreach (var subscriptionIdentifier in value)
+            {
+                WriteAsVariableLengthInteger(MqttPropertyId.SubscriptionIdentifier, subscriptionIdentifier);
+            }
+        }
+
         public void WriteTopicAlias(ushort? value)
         {
             Write(MqttPropertyId.TopicAlias, value);
@@ -118,7 +130,7 @@ namespace MQTTnet.Formatter.V5
 
         public void WriteReceiveMaximum(ushort? value)
         {
-            Write(MqttPropertyId.RequestResponseInformation, value);
+            Write(MqttPropertyId.ReceiveMaximum, value);
         }
 
         public void WriteMaximumPacketSize(uint? value)
@@ -133,7 +145,7 @@ namespace MQTTnet.Formatter.V5
 
         public void WriteAssignedClientIdentifier(string value)
         {
-            Write(MqttPropertyId.AssignedClientIdentifer, value);
+            Write(MqttPropertyId.AssignedClientIdentifier, value);
         }
 
         public void WriteTopicAliasMaximum(ushort? value)
@@ -177,6 +189,17 @@ namespace MQTTnet.Formatter.V5
             _packetWriter.Write(value.Value ? (byte)0x1 : (byte)0x0);
         }
 
+        private void Write(MqttPropertyId id, byte? value)
+        {
+            if (!value.HasValue)
+            {
+                return;
+            }
+
+            _packetWriter.Write((byte)id);
+            _packetWriter.Write(value.Value);
+        }
+
         private void Write(MqttPropertyId id, ushort? value)
         {
             if (!value.HasValue)

Source/MQTTnet/Implementations/MqttTcpChannel.Uwp.cs

@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Networking;
@@ -31,7 +32,7 @@ namespace MQTTnet.Implementations
             _bufferSize = _options.BufferSize;
         }
 
-        public MqttTcpChannel(StreamSocket socket, IMqttServerOptions serverOptions)
+        public MqttTcpChannel(StreamSocket socket, X509Certificate2 clientCertificate, IMqttServerOptions serverOptions)
         {
             _socket = socket ?? throw new ArgumentNullException(nameof(socket));
             _bufferSize = serverOptions.DefaultEndpointOptions.BufferSize;
@@ -39,6 +40,7 @@ namespace MQTTnet.Implementations
             CreateStreams();
 
             IsSecureConnection = socket.Information.ProtectionLevel >= SocketProtectionLevel.Tls12;
+            ClientCertificate = clientCertificate;
 
             Endpoint = _socket.Information.RemoteAddress + ":" + _socket.Information.RemotePort;
         }
@@ -49,6 +51,8 @@ namespace MQTTnet.Implementations
 
         public bool IsSecureConnection { get; }
 
+        public X509Certificate2 ClientCertificate { get; }
+
         public async Task ConnectAsync(CancellationToken cancellationToken)
         {
             if (_socket == null)

Source/MQTTnet/Implementations/MqttTcpChannel.cs

@@ -28,18 +28,22 @@ namespace MQTTnet.Implementations
             IsSecureConnection = clientOptions.ChannelOptions?.TlsOptions?.UseTls == true;
         }
 
-        public MqttTcpChannel(Stream stream, string endpoint)
+        public MqttTcpChannel(Stream stream, string endpoint, X509Certificate2 clientCertificate)
         {
             _stream = stream ?? throw new ArgumentNullException(nameof(stream));
 
-            IsSecureConnection = stream is SslStream;
             Endpoint = endpoint;
+
+            IsSecureConnection = stream is SslStream;
+            ClientCertificate = clientCertificate;
         }
 
         public string Endpoint { get; private set; }
 
         public bool IsSecureConnection { get; }
 
+        public X509Certificate2 ClientCertificate { get; }
+
         public async Task ConnectAsync(CancellationToken cancellationToken)
         {
             Socket socket;
@@ -55,9 +59,16 @@ namespace MQTTnet.Implementations
 
             socket.ReceiveBufferSize = _options.BufferSize;
             socket.SendBufferSize = _options.BufferSize;
-            socket.DualMode = _options.DualMode;
             socket.NoDelay = _options.NoDelay;
 
+            if (_options.DualMode.HasValue)
+            {
+                // It is important to avoid setting the flag if no specific value is set by the user
+                // because on IPv4 only networks the setter will always throw an exception. Regardless
+                // of the actual value.
+                socket.DualMode = _options.DualMode.Value;
+            }
+            
             // Workaround for: workaround for https://github.com/dotnet/corefx/issues/24430
             using (cancellationToken.Register(() => socket.Dispose()))
             {

Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs

@@ -1,11 +1,13 @@
 #if WINDOWS_UWP
-using System;
-using System.Threading.Tasks;
 using Windows.Networking.Sockets;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Server;
+using System;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
 
 namespace MQTTnet.Implementations
 {
@@ -73,7 +75,21 @@ namespace MQTTnet.Implementations
                 var clientHandler = ClientHandler;
                 if (clientHandler != null)
                 {
-                    using (var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(args.Socket, _options), new MqttPacketFormatterAdapter(), _logger))
+                    X509Certificate2 clientCertificate = null;
+
+                    if (args.Socket.Control.ClientCertificate != null)
+                    {
+                        try
+                        {
+                            clientCertificate = new X509Certificate2(args.Socket.Control.ClientCertificate.GetCertificateBlob().ToArray());
+                        }
+                        catch (Exception exception)
+                        {
+                            _logger.Warning(exception, "Unable to convert UWP certificate to X509Certificate2.");
+                        }
+                    }
+                    
+                    using (var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(args.Socket, clientCertificate, _options), new MqttPacketFormatterAdapter(), _logger))
                     {
                         await clientHandler(clientAdapter).ConfigureAwait(false);
                     }

Source/MQTTnet/Implementations/MqttTcpServerAdapter.cs

@@ -28,6 +28,8 @@ namespace MQTTnet.Implementations
 
         public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }
 
+        public bool TreatSocketOpeningErrorAsWarning { get; set; }
+
         public Task StartAsync(IMqttServerOptions options)
         {
             if (_cancellationTokenSource != null) throw new InvalidOperationException("Server is already started.");
@@ -36,7 +38,7 @@ namespace MQTTnet.Implementations
 
             if (options.DefaultEndpointOptions.IsEnabled)
             {
-                RegisterListeners(options.DefaultEndpointOptions, null);
+                RegisterListeners(options.DefaultEndpointOptions, null, _cancellationTokenSource.Token);
             }
 
             if (options.TlsEndpointOptions.IsEnabled)
@@ -52,7 +54,7 @@ namespace MQTTnet.Implementations
                     throw new InvalidOperationException("The certificate for TLS encryption must contain the private key.");
                 }
 
-                RegisterListeners(options.TlsEndpointOptions, tlsCertificate);
+                RegisterListeners(options.TlsEndpointOptions, tlsCertificate, _cancellationTokenSource.Token);
             }
 
             return Task.FromResult(0);
@@ -78,7 +80,7 @@ namespace MQTTnet.Implementations
             _listeners.Clear();
         }
 
-        private void RegisterListeners(MqttServerTcpEndpointBaseOptions options, X509Certificate2 tlsCertificate)
+        private void RegisterListeners(MqttServerTcpEndpointBaseOptions options, X509Certificate2 tlsCertificate, CancellationToken cancellationToken)
         {
             if (!options.BoundInterNetworkAddress.Equals(IPAddress.None))
             {
@@ -86,14 +88,15 @@ namespace MQTTnet.Implementations
                     AddressFamily.InterNetwork,
                     options,
                     tlsCertificate,
-                    _cancellationTokenSource.Token,
                     _logger)
                 {
                     ClientHandler = OnClientAcceptedAsync
                 };
 
-                listenerV4.Start();
+                if (listenerV4.Start(TreatSocketOpeningErrorAsWarning, cancellationToken))
-                _listeners.Add(listenerV4);
+                {
+                    _listeners.Add(listenerV4);
+                }
             }
 
             if (!options.BoundInterNetworkV6Address.Equals(IPAddress.None))
@@ -102,14 +105,15 @@ namespace MQTTnet.Implementations
                     AddressFamily.InterNetworkV6,
                     options,
                     tlsCertificate,
-                    _cancellationTokenSource.Token,
                     _logger)
                 {
                     ClientHandler = OnClientAcceptedAsync
                 };
 
-                listenerV6.Start();
+                if (listenerV6.Start(TreatSocketOpeningErrorAsWarning, cancellationToken))
-                _listeners.Add(listenerV6);
+                {
+                    _listeners.Add(listenerV6);
+                }
             }
         }
 

Source/MQTTnet/Implementations/MqttTcpServerListener.cs

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
+using MQTTnet.Internal;
 using MQTTnet.Server;
 
 namespace MQTTnet.Implementations
@@ -17,24 +18,23 @@ namespace MQTTnet.Implementations
     public class MqttTcpServerListener : IDisposable
     {
         private readonly IMqttNetChildLogger _logger;
-        private readonly CancellationToken _cancellationToken;
         private readonly AddressFamily _addressFamily;
         private readonly MqttServerTcpEndpointBaseOptions _options;
         private readonly MqttServerTlsTcpEndpointOptions _tlsOptions;
         private readonly X509Certificate2 _tlsCertificate;
+
         private Socket _socket;
+        private IPEndPoint _localEndPoint;
 
         public MqttTcpServerListener(
             AddressFamily addressFamily,
             MqttServerTcpEndpointBaseOptions options,
             X509Certificate2 tlsCertificate,
-            CancellationToken cancellationToken,
             IMqttNetChildLogger logger)
         {
             _addressFamily = addressFamily;
             _options = options;
             _tlsCertificate = tlsCertificate;
-            _cancellationToken = cancellationToken;
             _logger = logger.CreateChildLogger(nameof(MqttTcpServerListener));
 
             if (_options is MqttServerTlsTcpEndpointOptions tlsOptions)
@@ -45,21 +45,40 @@ namespace MQTTnet.Implementations
 
         public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }
 
-        public void Start()
+        public bool Start(bool treatErrorsAsWarning, CancellationToken cancellationToken)
         {
-            var boundIp = _options.BoundInterNetworkAddress;
+            try
-            if (_addressFamily == AddressFamily.InterNetworkV6)
             {
-                boundIp = _options.BoundInterNetworkV6Address;
+                var boundIp = _options.BoundInterNetworkAddress;
+                if (_addressFamily == AddressFamily.InterNetworkV6)
+                {
+                    boundIp = _options.BoundInterNetworkV6Address;
+                }
+
+                _localEndPoint = new IPEndPoint(boundIp, _options.Port);
+
+                _logger.Info($"Starting TCP listener for {_localEndPoint} TLS={_tlsCertificate != null}.");
+
+                _socket = new Socket(_addressFamily, SocketType.Stream, ProtocolType.Tcp);
+                _socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+                _socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.NoDelay, true);
+                _socket.Bind(_localEndPoint);
+                _socket.Listen(_options.ConnectionBacklog);
+
+                Task.Run(() => AcceptClientConnectionsAsync(cancellationToken), cancellationToken).Forget(_logger);
+
+                return true;
             }
+            catch (Exception exception)
+            {
+                if (!treatErrorsAsWarning)
+                {
+                    throw;
+                }
 
-            _socket = new Socket(_addressFamily, SocketType.Stream, ProtocolType.Tcp);
+                _logger.Warning(exception,"Error while creating listener socket for local end point '{0}'.", _localEndPoint);
-            _socket.Bind(new IPEndPoint(boundIp, _options.Port));
+                return false;
-
+            }
-            _logger.Info($"Starting TCP listener for {_socket.LocalEndPoint} TLS={_tlsCertificate != null}.");
-
-            _socket.Listen(_options.ConnectionBacklog);
-            Task.Run(() => AcceptClientConnectionsAsync(_cancellationToken), _cancellationToken);
         }
 
         public void Dispose()
@@ -82,13 +101,29 @@ namespace MQTTnet.Implementations
 #else
                     var clientSocket = await _socket.AcceptAsync().ConfigureAwait(false);
 #endif
-#pragma warning disable 4014
+
-                    Task.Run(() => TryHandleClientConnectionAsync(clientSocket), cancellationToken);
+                    if (clientSocket == null)
-#pragma warning restore 4014
+                    {
+                        continue;
+                    }
+
+                    Task.Run(() => TryHandleClientConnectionAsync(clientSocket), cancellationToken).Forget(_logger);
+                }
+                catch (OperationCanceledException)
+                {  
                 }
                 catch (Exception exception)
                 {
-                    _logger.Error(exception, $"Error while accepting connection at TCP listener {_socket.LocalEndPoint} TLS={_tlsCertificate != null}.");
+                    if (exception is SocketException socketException)
+                    {
+                        if (socketException.SocketErrorCode == SocketError.ConnectionAborted ||
+                            socketException.SocketErrorCode == SocketError.OperationAborted)
+                        {
+                            continue;
+                        }
+                    }
+                   
+                    _logger.Error(exception, $"Error while accepting connection at TCP listener {_localEndPoint} TLS={_tlsCertificate != null}.");
                     await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
                 }
             }
@@ -105,24 +140,34 @@ namespace MQTTnet.Implementations
 
                 _logger.Verbose("Client '{0}' accepted by TCP listener '{1}, {2}'.",
                     remoteEndPoint,
-                    _socket.LocalEndPoint,
+                    _localEndPoint,
                     _addressFamily == AddressFamily.InterNetwork ? "ipv4" : "ipv6");
 
                 clientSocket.NoDelay = _options.NoDelay;
 
                 stream = new NetworkStream(clientSocket, true);
 
+                X509Certificate2 clientCertificate = null;
+
                 if (_tlsCertificate != null)
                 {
                     var sslStream = new SslStream(stream, false);
-                    await sslStream.AuthenticateAsServerAsync(_tlsCertificate, false, _tlsOptions.SslProtocol, false).ConfigureAwait(false);
+
+                    await sslStream.AuthenticateAsServerAsync(
+                        _tlsCertificate, 
+                        _tlsOptions.ClientCertificateRequired, 
+                        _tlsOptions.SslProtocol, 
+                        _tlsOptions.CheckCertificateRevocation).ConfigureAwait(false);
+
                     stream = sslStream;
+
+                    clientCertificate = sslStream.RemoteCertificate as X509Certificate2;
                 }
 
                 var clientHandler = ClientHandler;
                 if (clientHandler != null)
                 {
-                    using (var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(stream, remoteEndPoint), new MqttPacketFormatterAdapter(), _logger))
+                    using (var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(stream, remoteEndPoint, clientCertificate), new MqttPacketFormatterAdapter(), _logger))
                     {
                         await clientHandler(clientAdapter).ConfigureAwait(false);
                     }
@@ -153,7 +198,7 @@ namespace MQTTnet.Implementations
 
                     _logger.Verbose("Client '{0}' disconnected at TCP listener '{1}, {2}'.",
                         remoteEndPoint,
-                        _socket.LocalEndPoint,
+                        _localEndPoint,
                         _addressFamily == AddressFamily.InterNetwork ? "ipv4" : "ipv6");
                 }
                 catch (Exception disposeException)

Source/MQTTnet/Implementations/MqttWebSocketChannel.cs

@@ -11,9 +11,9 @@ namespace MQTTnet.Implementations
 {
     public class MqttWebSocketChannel : IMqttChannel
     {
-        private readonly SemaphoreSlim _sendLock = new SemaphoreSlim(1, 1);
         private readonly MqttClientWebSocketOptions _options;
 
+        private SemaphoreSlim _sendLock = new SemaphoreSlim(1, 1);
         private WebSocket _webSocket;
 
         public MqttWebSocketChannel(MqttClientWebSocketOptions options)
@@ -21,18 +21,21 @@ namespace MQTTnet.Implementations
             _options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
-        public MqttWebSocketChannel(WebSocket webSocket, string endpoint, bool isSecureConnection)
+        public MqttWebSocketChannel(WebSocket webSocket, string endpoint, bool isSecureConnection, X509Certificate2 clientCertificate)
         {
             _webSocket = webSocket ?? throw new ArgumentNullException(nameof(webSocket));
 
             Endpoint = endpoint;
             IsSecureConnection = isSecureConnection;
+            ClientCertificate = clientCertificate;
         }
 
         public string Endpoint { get; }
 
         public bool IsSecureConnection { get; private set; }
 
+        public X509Certificate2 ClientCertificate { get; private set; }
+
         public async Task ConnectAsync(CancellationToken cancellationToken)
         {
             var uri = _options.Uri;
@@ -114,9 +117,14 @@ namespace MQTTnet.Implementations
 
         public async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
-            // This lock is required because the client will throw an exception if _SendAsync_ is 
+            // The lock is required because the client will throw an exception if _SendAsync_ is 
             // called from multiple threads at the same time. But this issue only happens with several
             // framework versions.
+            if (_sendLock == null)
+            {
+                return;
+            }
+
             await _sendLock.WaitAsync(cancellationToken).ConfigureAwait(false);
             try
             {
@@ -124,13 +132,14 @@ namespace MQTTnet.Implementations
             }
             finally
             {
-                _sendLock.Release();
+                _sendLock?.Release();
             }
         }
 
         public void Dispose()
         {
             _sendLock?.Dispose();
+            _sendLock = null;
 
             try
             {

Source/MQTTnet/Internal/TaskExtensions.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using MQTTnet.Diagnostics;
+
+namespace MQTTnet.Internal
+{
+    public static class TaskExtensions
+    {
+        public static void Forget(this Task task, IMqttNetChildLogger logger)
+        {
+            task?.ContinueWith(t =>
+                {
+                    logger.Error(t.Exception, "Unhandled exception.");
+                },
+                TaskContinuationOptions.OnlyOnFaulted);
+        }
+    }
+}

Source/MQTTnet/Internal/TestMqttChannel.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Channel;
@@ -18,6 +19,8 @@ namespace MQTTnet.Internal
 
         public bool IsSecureConnection { get; } = false;
 
+        public X509Certificate2 ClientCertificate { get; }
+
         public Task ConnectAsync(CancellationToken cancellationToken)
         {
             return Task.FromResult(0);

Source/MQTTnet/MQTTnet.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core'">$(TargetFrameworks);uap10.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
     <AssemblyName>MQTTnet</AssemblyName>
     <RootNamespace>MQTTnet</RootNamespace>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

Source/MQTTnet/MqttApplicationMessage.cs

@@ -28,6 +28,6 @@ namespace MQTTnet
 
         public byte[] CorrelationData { get; set; }
 
-        public uint? SubscriptionIdentifier { get; set; }
+        public List<uint> SubscriptionIdentifiers { get; set; }
     }
 }

Source/MQTTnet/MqttApplicationMessageBuilder.cs

@@ -18,7 +18,7 @@ namespace MQTTnet
         private string _responseTopic;
         private byte[] _correlationData;
         private ushort? _topicAlias;
-        private uint? _subscriptionIdentifier;
+        private List<uint> _subscriptionIdentifiers;
         private uint? _messageExpiryInterval;
         private MqttPayloadFormatIndicator? _payloadFormatIndicator;
         private List<MqttUserProperty> _userProperties;
@@ -29,6 +29,12 @@ namespace MQTTnet
             return this;
         }
 
+        public MqttApplicationMessageBuilder WithPayload(byte[] payload)
+        {
+            _payload = payload;
+            return this;
+        }
+
         public MqttApplicationMessageBuilder WithPayload(IEnumerable<byte> payload)
         {
             if (payload == null)
@@ -43,7 +49,7 @@ namespace MQTTnet
             {
                 _payload = payload.ToArray();
             }
-            
+
             return this;
         }
 
@@ -176,7 +182,12 @@ namespace MQTTnet
         /// </summary>
         public MqttApplicationMessageBuilder WithSubscriptionIdentifier(uint subscriptionIdentifier)
         {
-            _subscriptionIdentifier = subscriptionIdentifier;
+            if (_subscriptionIdentifiers == null)
+            {
+                _subscriptionIdentifiers = new List<uint>();
+            }
+
+            _subscriptionIdentifiers.Add(subscriptionIdentifier);
             return this;
         }
 
@@ -215,16 +226,12 @@ namespace MQTTnet
                 ResponseTopic = _responseTopic,
                 CorrelationData = _correlationData,
                 TopicAlias = _topicAlias,
-                SubscriptionIdentifier = _subscriptionIdentifier,
+                SubscriptionIdentifiers = _subscriptionIdentifiers,
                 MessageExpiryInterval = _messageExpiryInterval,
-                PayloadFormatIndicator = _payloadFormatIndicator
+                PayloadFormatIndicator = _payloadFormatIndicator,
+                UserProperties = _userProperties
             };
 
-            if (_userProperties?.Any() == true)
-            {
-                applicationMessage.UserProperties = _userProperties;
-            }
-            
             return applicationMessage;
         }
     }

Source/MQTTnet/MqttFactory.cs

@@ -10,6 +10,8 @@ namespace MQTTnet
 {
     public class MqttFactory : IMqttFactory
     {
+        private IMqttClientAdapterFactory _clientAdapterFactory = new MqttClientAdapterFactory();
+
         public MqttFactory() : this(new MqttNetLogger())
         {
         }
@@ -21,6 +23,12 @@ namespace MQTTnet
 
         public IMqttNetLogger DefaultLogger { get; }
 
+        public IMqttFactory UseClientAdapterFactory(IMqttClientAdapterFactory clientAdapterFactory)
+        {
+            _clientAdapterFactory = clientAdapterFactory ?? throw new ArgumentNullException(nameof(clientAdapterFactory));
+            return this;
+        }
+
         public IMqttClient CreateMqttClient()
         {
             return CreateMqttClient(DefaultLogger);
@@ -30,22 +38,22 @@ namespace MQTTnet
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return new MqttClient(new MqttClientAdapterFactory(), logger);
+            return new MqttClient(_clientAdapterFactory, logger);
         }
 
-        public IMqttClient CreateMqttClient(IMqttClientAdapterFactory adapterFactory)
+        public IMqttClient CreateMqttClient(IMqttClientAdapterFactory clientAdapterFactory)
         {
-            if (adapterFactory == null) throw new ArgumentNullException(nameof(adapterFactory));
+            if (clientAdapterFactory == null) throw new ArgumentNullException(nameof(clientAdapterFactory));
 
-            return new MqttClient(adapterFactory, DefaultLogger);
+            return new MqttClient(clientAdapterFactory, DefaultLogger);
         }
 
-        public IMqttClient CreateMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory adapterFactory)
+        public IMqttClient CreateMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactory)
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
-            if (adapterFactory == null) throw new ArgumentNullException(nameof(adapterFactory));
+            if (clientAdapterFactory == null) throw new ArgumentNullException(nameof(clientAdapterFactory));
 
-            return new MqttClient(adapterFactory, logger);
+            return new MqttClient(clientAdapterFactory, logger);
         }
 
         public IMqttServer CreateMqttServer()
@@ -60,19 +68,19 @@ namespace MQTTnet
             return CreateMqttServer(new List<IMqttServerAdapter> { new MqttTcpServerAdapter(logger.CreateChildLogger()) }, logger);
         }
 
-        public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger)
+        public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> serverAdapters, IMqttNetLogger logger)
         {
-            if (adapters == null) throw new ArgumentNullException(nameof(adapters));
+            if (serverAdapters == null) throw new ArgumentNullException(nameof(serverAdapters));
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return new MqttServer(adapters, logger.CreateChildLogger());
+            return new MqttServer(serverAdapters, logger.CreateChildLogger());
         }
 
-        public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> adapters)
+        public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> serverAdapters)
         {
-            if (adapters == null) throw new ArgumentNullException(nameof(adapters));
+            if (serverAdapters == null) throw new ArgumentNullException(nameof(serverAdapters));
             
-            return new MqttServer(adapters, DefaultLogger.CreateChildLogger());
+            return new MqttServer(serverAdapters, DefaultLogger.CreateChildLogger());
         }
     }
 }

Source/MQTTnet/PacketDispatcher/MqttPacketDispatcher.cs

@@ -23,6 +23,16 @@ namespace MQTTnet.PacketDispatcher
         {
             if (packet == null) throw new ArgumentNullException(nameof(packet));
 
+            if (packet is MqttDisconnectPacket disconnectPacket)
+            {
+                foreach (var packetAwaiter in _packetAwaiters)
+                {
+                    packetAwaiter.Value.Fail(new MqttUnexpectedDisconnectReceivedException(disconnectPacket));
+                }
+
+                return;
+            }
+
             ushort identifier = 0;
             if (packet is IMqttPacketWithIdentifier packetWithIdentifier && packetWithIdentifier.PacketIdentifier.HasValue)
             {

Source/MQTTnet/Packets/MqttAuthPacketProperties.cs

@@ -10,6 +10,6 @@ namespace MQTTnet.Packets
 
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+        public List<MqttUserProperty> UserProperties { get; set; }
     }
 }

Source/MQTTnet/Packets/MqttConnAckPacketProperties.cs

@@ -18,7 +18,7 @@ namespace MQTTnet.Packets
 
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+        public List<MqttUserProperty> UserProperties { get; set; }
 
         public bool? WildcardSubscriptionAvailable { get; set; }
 

Source/MQTTnet/Packets/MqttConnectPacket.cs

@@ -6,7 +6,7 @@
 
         public string Username { get; set; }
 
-        public string Password { get; set; }
+        public byte[] Password { get; set; }
 
         public ushort KeepAlivePeriod { get; set; }
 
@@ -23,13 +23,14 @@
 
         public override string ToString()
         {
-            var password = Password;
+            var passwordText = string.Empty;
-            if (!string.IsNullOrEmpty(password))
+
+            if (Password != null)
             {
-                password = "****";
+                passwordText = "****";
             }
 
-            return string.Concat("Connect: [ClientId=", ClientId, "] [Username=", Username, "] [Password=", password, "] [KeepAlivePeriod=", KeepAlivePeriod, "] [CleanSession=", CleanSession, "]");
+            return string.Concat("Connect: [ClientId=", ClientId, "] [Username=", Username, "] [Password=", passwordText, "] [KeepAlivePeriod=", KeepAlivePeriod, "] [CleanSession=", CleanSession, "]");
         }
     }
 }

Source/MQTTnet/Packets/MqttConnectPacketProperties.cs

@@ -22,6 +22,6 @@ namespace MQTTnet.Packets
 
         public uint? MaximumPacketSize { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+        public List<MqttUserProperty> UserProperties { get; set; }
     }
 }

Source/MQTTnet/Packets/MqttDisconnectPacketProperties.cs

@@ -8,7 +8,7 @@ namespace MQTTnet.Packets
 
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+        public List<MqttUserProperty> UserProperties { get; set; }
 
         public string ServerReference { get; set; }
     }

Source/MQTTnet/Packets/MqttPubAckPacketProperties.cs

@@ -6,6 +6,6 @@ namespace MQTTnet.Packets
     {
         public string ReasonString { get; set; }
 
-        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+        public List<MqttUserProperty> UserProperties { get; set; }
     }
 }