Accept multiple SubscriptionIdentifiers for PUBLISH packets.

Merge remote-tracking branch 'origin/master'
Fix issues in MQTTv5 packet encoding and decoding.
2026-10-15 17:00:03 +08:00 · 2019-05-12 17:26:36 +02:00 · 2019-05-12 00:18:54 +02:00 · 2019-05-12 00:18:48 +02:00 · 2019-05-11 09:50:41 +02:00 · 2019-05-11 09:47:31 +02:00
269 changed files with 10587 additions and 3909 deletions
@@ -235,6 +235,7 @@ FakesAssemblies/
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
 node_modules/
+/*/**/package-lock.json

 # Typescript v1 declaration files
 typings/
@@ -287,8 +288,6 @@ __pycache__/
 *.odx.cs
 *.xsd.cs

-
-Build/nuget.exe
 *.js
 *.map

@@ -5,24 +5,28 @@
    <version>0.0.0</version>
    <authors>Christian Kratky</authors>
    <owners>Christian Kratky</owners>
-    <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
+    <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 a support library to integrate MQTTnet into AspNetCore.</description>
    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2018</copyright>
+    <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" />

      <dependency id="Microsoft.AspNetCore.Connections.Abstractions" version="2.1.3" />
+      <dependency id="Microsoft.AspNetCore.Http.Connections" version="1.0.3"  />
      <dependency id="Microsoft.AspNetCore.WebSockets" version="2.1.1" />
      <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="2.1.1" />
    </dependencies>
  </metadata>

  <files>
+    <!-- License -->
+    <file src="..\LICENSE" />
+
    <!-- .NET Standard 2.0 -->
    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\netstandard2.0\MQTTnet.AspNetCore.*" target="lib\netstandard2.0\"/>
  </files>
@@ -5,13 +5,13 @@
    <version>0.0.0</version>
    <authors>Christian Kratky</authors>
    <owners>Christian Kratky</owners>
-    <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
+    <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 provides a managed MQTT client with additional features using MQTTnet.</description>
    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2018</copyright>
+    <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" />
@@ -19,6 +19,9 @@
  </metadata>

  <files>
+    <!-- License -->
+    <file src="..\LICENSE" />
+
    <!-- .NET Standard 1.3 -->
    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard1.3\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard1.3\"/>

@@ -31,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\"/>
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net462\"/>
-    <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\"/>
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net472\"/>
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net461\MQTTnet.Extensions.Rpc.*" target="lib\net461\"/>
+
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
  </files>
-</package>
+</package>
@@ -5,13 +5,13 @@
    <version>0.0.0</version>
    <authors>Christian Kratky</authors>
    <owners>Christian Kratky</owners>
-    <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
+    <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 executing synchronous device calls including a response using MQTTnet.</description>
    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2018</copyright>
+    <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" />
@@ -19,6 +19,9 @@
  </metadata>

  <files>
+    <!-- License -->
+    <file src="..\LICENSE" />
+
    <!-- .NET Standard 1.3 -->
    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard1.3\MQTTnet.Extensions.Rpc.*" target="lib\netstandard1.3\"/>

@@ -31,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\"/>
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net462\"/>
-    <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\"/>
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net472\"/>
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\net461\MQTTnet.Extensions.Rpc.*" target="lib\net461\"/>
+
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
  </files>
-</package>
+</package>
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>MQTTnet.NETStandard</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>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>
+    <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>
+      <group targetFramework="netstandard1.3">
+        <dependency id="NETStandard.Library" version="1.3.0" />
+        <dependency id="System.Net.Security" version="4.3.2" />
+        <dependency id="System.Net.WebSockets" version="4.3.0" />
+        <dependency id="System.Net.WebSockets.Client" version="4.3.2" />      
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="NETStandard.Library" version="2.0.0" />
+        <dependency id="System.Net.Security" version="4.3.2" />
+        <dependency id="System.Net.WebSockets" version="4.3.0" />
+        <dependency id="System.Net.WebSockets.Client" version="4.3.2" />
+      </group>
+    </dependencies>
+  </metadata>
+
+  <files>
+    <!-- License -->
+    <file src="..\LICENSE" />
+
+    <!-- .NET Standard 1.3 -->
+    <file src="..\Source\MQTTnet\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\"/>
+
+    <!-- .NET Standard 2.0 -->
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\netstandard2.0\"/>
+  </files>
+</package>
@@ -5,19 +5,15 @@
    <version>0.0.0</version>
    <authors>Christian Kratky</authors>
    <owners>Christian Kratky</owners>
-    <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
+    <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>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker).</description>
-    <releaseNotes> * [Core] Added support for MQTTv5 packages.
-* [Client] Added new MQTTv5 features to options builder.
-* [Client] Added uniform API across all supported MQTT versions (BREAKING CHANGE!)
-* [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.
-
-* [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>
+* [Core] Fixed issues in MQTTv5 message encoding and decoding.
    </releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2018</copyright>
+    <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>
      <group targetFramework="netstandard1.3">
@@ -33,16 +29,15 @@
        <dependency id="System.Net.WebSockets.Client" version="4.3.2" />
      </group>
      <group targetFramework="uap10.0">
-        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.1.9" />
-      </group>
-      <group targetFramework="net452">
-      </group>
-      <group targetFramework="net461">
+        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.8" />
      </group>
    </dependencies>
  </metadata>

  <files>
+    <!-- License -->
+    <file src="..\LICENSE" />
+
    <!-- .NET Standard 1.3 -->
    <file src="..\Source\MQTTnet\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\"/>
    
@@ -55,10 +50,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\"/>
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net462\"/>
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net470\"/>
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net471\"/>
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net472\"/>
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
+    <file src="..\Source\MQTTnet\bin\Release\net461\MQTTnet.*" target="lib\net461\"/>
+
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
  </files>
 </package>
@@ -3,49 +3,66 @@ param([string]$assemblyVersion, [string]$nugetVersion)
 if ([string]::IsNullOrEmpty($assemblyVersion)) {$assemblyVersion = "0.0.1"}
 if ([string]::IsNullOrEmpty($nugetVersion)) {$nugetVersion = "0.0.1"}

+$vswhere = ${Env:\ProgramFiles(x86)} + '\Microsoft Visual Studio\Installer\vswhere'
+$msbuild = &$vswhere -products * -requires Microsoft.Component.MSBuild -latest -find MSBuild\**\Bin\MSBuild.exe
+
+Write-Host
 Write-Host "Assembly version = $assemblyVersion"
 Write-Host "Nuget version    = $nugetVersion"
+Write-Host "MSBuild path     = $msbuild"
 Write-Host

-$vswhere = ${Env:\ProgramFiles(x86)} + '\Microsoft Visual Studio\Installer\vswhere'
+# Build the core library
+&$msbuild ..\Source\MQTTnet\MQTTnet.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\MQTTnet.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\MQTTnet.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"
+&$msbuild ..\Source\MQTTnet\MQTTnet.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\MQTTnet.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"

-$path = &$vswhere -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
-if ($path) {
-    $msbuild = join-path $path 'MSBuild\15.0\Bin\MSBuild.exe'
+# Build the ASP.NET Core 2.0 extension
+&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.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"

-	# Build the core library
-    &$msbuild ..\Source\MQTTnet\MQTTnet.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\MQTTnet.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\MQTTnet.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"
-    &$msbuild ..\Source\MQTTnet\MQTTnet.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\MQTTnet.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 the ASP.NET Core 2.0 extension
-	&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.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"
+# Build the RPC extension
+&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.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.Extensions.Rpc\MQTTnet.Extensions.Rpc.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.Rpc\MQTTnet.Extensions.Rpc.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"
+&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.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.Rpc\MQTTnet.Extensions.Rpc.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 the RPC extension
-	&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.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.Extensions.Rpc\MQTTnet.Extensions.Rpc.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.Rpc\MQTTnet.Extensions.Rpc.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"
-    &$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.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.Rpc\MQTTnet.Extensions.Rpc.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 the Managed Client extension
+&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.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.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.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.ManagedClient\MQTTnet.Extensions.ManagedClient.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"
+&$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 the Managed Client extension
-	&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.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.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.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.ManagedClient\MQTTnet.Extensions.ManagedClient.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"
-    &$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
+Remove-Item ..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2 -Recurse -Force -ErrorAction SilentlyContinue
+&$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"

-	Remove-Item .\NuGet -Force -Recurse -ErrorAction SilentlyContinue
+$source = "..\Source\MQTTnet.Server\bin\Release\netcoreapp2.2"
+$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) 

-	(Get-Content MQTTnet.AspNetCore.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.AspNetCore.nuspec
-	(Get-Content MQTTnet.Extensions.Rpc.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.Rpc.nuspec
-	(Get-Content MQTTnet.Extensions.ManagedClient.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.ManagedClient.nuspec
-	
-	New-Item -ItemType Directory -Force -Path .\NuGet
-    .\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
-    .\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
-}
+# Create NuGet packages.
+Remove-Item .\NuGet -Force -Recurse -ErrorAction SilentlyContinue
+
+Copy-Item MQTTnet.AspNetCore.nuspec -Destination MQTTnet.AspNetCore.nuspec.old -Force
+(Get-Content MQTTnet.AspNetCore.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.AspNetCore.nuspec
+Copy-Item MQTTnet.Extensions.Rpc.nuspec -Destination MQTTnet.Extensions.Rpc.nuspec.old -Force
+(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
+
+New-Item -ItemType Directory -Force -Path .\NuGet
+.\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
+.\nuget.exe pack MQTTnet.NETStandard.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
+.\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
+
+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
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2017 Christian Kratky
+MQTTnet Copyright (c) 2016-2019 Christian Kratky

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2010
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Core.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Core.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9248C2E1-B9D6-40BF-81EC-86004D7765B4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{32A630A7-2598-41D7-B625-204CD906F5FB}"
@@ -45,6 +43,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.ManagedC
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore.Tests", "Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj", "{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj", "{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Server", "Source\MQTTnet.Server\MQTTnet.Server.csproj", "{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -57,22 +59,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|x64.Build.0 = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Debug|x86.Build.0 = Debug|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|ARM.Build.0 = Release|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x64.ActiveCfg = Release|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x64.Build.0 = Release|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x86.ActiveCfg = Release|Any CPU
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x86.Build.0 = Release|Any CPU
 		{3587E506-55A2-4EB3-99C7-DC01E42D25D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3587E506-55A2-4EB3-99C7-DC01E42D25D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3587E506-55A2-4EB3-99C7-DC01E42D25D2}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -201,12 +187,43 @@ Global
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x64.Build.0 = Release|Any CPU
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x86.ActiveCfg = Release|Any CPU
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x86.Build.0 = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|ARM.Build.0 = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|x64.Build.0 = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C7106CA-96B8-4ABE-B3B4-9357AB8ACB41}.Release|x86.Build.0 = Release|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|x64.Build.0 = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Debug|x86.Build.0 = Debug|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|ARM.Build.0 = Release|Any CPU
+		{DADEA836-5CC3-474C-A2D8-4D0F31118CD7}.Release|x64.ActiveCfg = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{3587E506-55A2-4EB3-99C7-DC01E42D25D2} = {32A630A7-2598-41D7-B625-204CD906F5FB}
 		{3D283AAD-AAA8-4339-8394-52F80B6304DB} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{C6FF8AEA-0855-41EC-A1F3-AC262225BAB9} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
@@ -215,6 +232,8 @@ Global
 		{998D04DD-7CB0-45F5-A393-E2495C16399E} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{C400533A-8EBA-4F0B-BF4D-295C3708604B} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 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.NETStandard.nuspec = Build\MQTTnet.NETStandard.nuspec
 		Build\MQTTnet.nuspec = Build\MQTTnet.nuspec
 		Build\upload.ps1 = Build\upload.ps1
 	EndProjectSection
@@ -47,6 +48,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.ManagedC
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore.Tests", "Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj", "{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Server", "Source\MQTTnet.Server\MQTTnet.Server.csproj", "{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -226,6 +229,22 @@ Global
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x64.Build.0 = Release|Any CPU
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x86.ActiveCfg = Release|Any CPU
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x86.Build.0 = Release|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|x64.Build.0 = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Debug|x86.Build.0 = Debug|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|ARM.Build.0 = Release|Any CPU
+		{5699FB8C-838C-4AB0-80A5-9CA809F9B65B}.Release|x64.ActiveCfg = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -241,6 +260,7 @@ Global
 		{998D04DD-7CB0-45F5-A393-E2495C16399E} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}
@@ -7,6 +7,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
@@ -26,7 +26,8 @@ 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 (~120 tests)
+* Unit tested (~200 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_.

@@ -51,6 +52,16 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 * Validate subscriptions and deny subscribing of certain topics depending on requesting clients
 * Connect clients with different protocol versions at the same time.

+## MQTTnet Server
+
+_MQTTnet Server_ is a standalone cross platform MQTT server (like mosquitto) basing on this library. It has the following features.
+* Running portable (no installation required)
+* Runs und Windows, Linux, macOS, Raspberry Pi
+* Python scripting support for manipulating messages, validation of clients, building business logic etc.
+* Supports WebSocket and TCP (with and without TLS) connections
+* Provides a HTTP based API (including Swagger endpoint)
+* Extensive configuration parameters and customization supported
+
 ## Supported frameworks

 * .NET Standard 1.3+
@@ -81,7 +92,7 @@ Please find examples and the documentation at the Wiki of this repository (<http
 If you want to contribute to this project just create a pull request. But only pull requests which are matching the code style of this library will be accepted. Before creating a pull request please have a look at the library to get an overview of the required style.
 Also additions and updates in the Wiki are welcome.

-This project also listed at Open Collective (https://opencollective.com/mqttnet).
+**This project, like all projects requires time and money.  If you feel compelled to support the development team, you can do so through Open Collective (https://opencollective.com/mqttnet)**.

 ## References

@@ -95,9 +106,11 @@ This library is used in the following projects:

 If you use this library and want to see your project here please create a pull request.

-## MIT License
+## License

-Copyright (c) 2017-2019 Christian Kratky
+MIT License
+
+MQTTnet Copyright (c) 2016-2019 Christian Kratky

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,10 +28,9 @@ namespace MQTTnet.AspNetCore
                }

                var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
-                using (var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol))
+                using (var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol).ConfigureAwait(false))
                {
-                    var endpoint = $"{context.Connection.RemoteIpAddress}:{context.Connection.RemotePort}";
-                    await adapter.RunWebSocketConnectionAsync(webSocket, endpoint);
+                    await adapter.RunWebSocketConnectionAsync(webSocket, context);
                }
            });

@@ -21,7 +21,10 @@ namespace MQTTnet.AspNetCore.Client
                    {
                        var endpoint = new DnsEndPoint(tcpOptions.Server, tcpOptions.GetPort());
                        var tcpConnection = new TcpConnection(endpoint);
-                        return new MqttConnectionContext(new MqttPacketFormatterAdapter(options.ProtocolVersion), tcpConnection);
+
+                        var writer = new SpanBasedMqttPacketWriter();
+                        var formatter = new MqttPacketFormatterAdapter(options.ProtocolVersion, writer);
+                        return new MqttConnectionContext(formatter, tcpConnection);
                    }
                default:
                    {
@@ -5,6 +5,10 @@ using System.Diagnostics;
 using System.IO.Pipelines;
 using System.Net.Sockets;

+#if NETCOREAPP2_1
+using System.Runtime.InteropServices;
+#endif
+
 namespace MQTTnet.AspNetCore.Client.Tcp
 {
    public class SocketSender
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
    <Product />
    <Company />
    <Authors />
    <PackageId />
    <LangVersion>7.2</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -15,6 +16,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.0.3" />
    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
  </ItemGroup>
@@ -1,13 +1,14 @@
 using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Http.Connections.Features;
 using MQTTnet.Adapter;
 using MQTTnet.AspNetCore.Client.Tcp;
 using MQTTnet.Exceptions;
+using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using System;
 using System.IO.Pipelines;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Formatter;

 namespace MQTTnet.AspNetCore
 {
@@ -17,29 +18,64 @@ namespace MQTTnet.AspNetCore
        {
            PacketFormatterAdapter = packetFormatterAdapter ?? throw new ArgumentNullException(nameof(packetFormatterAdapter));
            Connection = connection ?? throw new ArgumentNullException(nameof(connection));
+
+            if (Connection.Transport != null)
+            {
+                _input = Connection.Transport.Input;
+                _output = Connection.Transport.Output;
+            }
+            
+            _reader = new SpanBasedMqttPacketBodyReader();
        }

-        public string Endpoint => Connection.ConnectionId;
+        private PipeReader _input;
+        private PipeWriter _output;
+        private readonly SpanBasedMqttPacketBodyReader _reader;
+
+        public string Endpoint
+        {
+            get
+            {
+                var connection = Http?.HttpContext?.Connection;
+                if (connection == null)
+                {
+                    return Connection.ConnectionId;
+                }
+
+                return $"{connection.RemoteIpAddress}:{connection.RemotePort}";
+            }
+        }
+
+        public bool IsSecureConnection => Http?.HttpContext?.Request?.IsHttps ?? false;
+
+        private IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();
+
        public ConnectionContext Connection { get; }
        public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
-        public event EventHandler ReadingPacketStarted;
-        public event EventHandler ReadingPacketCompleted;
+
+        public long BytesSent { get; set; }
+        public long BytesReceived { get; set; }
+
+        public Action ReadingPacketStartedCallback { get; set; }
+        public Action ReadingPacketCompletedCallback { get; set; }

        private readonly SemaphoreSlim _writerSemaphore = new SemaphoreSlim(1, 1);

-        public Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        public async Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
        {
            if (Connection is TcpConnection tcp && !tcp.IsConnected)
            {
-                return tcp.StartAsync();
+                await tcp.StartAsync().ConfigureAwait(false);
            }
-            return Task.CompletedTask;
+
+            _input = Connection.Transport.Input;
+            _output = Connection.Transport.Output;
        }

        public Task DisconnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
        {
-            Connection.Transport.Input.Complete();
-            Connection.Transport.Output.Complete();
+            _input?.Complete();
+            _output?.Complete();

            return Task.CompletedTask;
        }
@@ -72,14 +108,15 @@ namespace MQTTnet.AspNetCore
                    {
                        if (!buffer.IsEmpty)
                        {
-                            if (PacketFormatterAdapter.TryDecode(buffer, out var packet, out consumed, out observed))
+                            if (PacketFormatterAdapter.TryDecode(_reader, buffer, out var packet, out consumed, out observed, out var received))
                            {
+                                BytesReceived += received;
                                return packet;
                            }
                            else
                            {
                                // we did receive something but the message is not yet complete
-                                ReadingPacketStarted?.Invoke(this, EventArgs.Empty);
+                                ReadingPacketStartedCallback?.Invoke();
                            }
                        }
                        else if (readResult.IsCompleted)
@@ -98,22 +135,29 @@ namespace MQTTnet.AspNetCore
            }
            finally
            {
-                ReadingPacketCompleted?.Invoke(this, EventArgs.Empty);
+                ReadingPacketCompletedCallback?.Invoke();
            }

            cancellationToken.ThrowIfCancellationRequested();
            return null;
        }

-        public async Task SendPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken)
+        public async Task SendPacketAsync(MqttBasePacket packet, TimeSpan timeout, CancellationToken cancellationToken)
        {
-            var buffer = PacketFormatterAdapter.Encode(packet).AsMemory();
-            var output = Connection.Transport.Output;
+            var formatter = PacketFormatterAdapter;
+

            await _writerSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
            try
            {
-                await output.WriteAsync(buffer, cancellationToken).ConfigureAwait(false);
+                var buffer = formatter.Encode(packet);
+                var msg = buffer.AsMemory();
+                var output = _output;
+                msg.CopyTo(output.GetMemory(msg.Length));
+                BytesSent += msg.Length;
+                PacketFormatterAdapter.FreeBuffer();
+                output.Advance(msg.Length);
+                await output.FlushAsync().ConfigureAwait(false);
            }
            finally
            {
@@ -10,7 +10,7 @@ namespace MQTTnet.AspNetCore
 {
    public class MqttConnectionHandler : ConnectionHandler, IMqttServerAdapter
    {
-        public event EventHandler<MqttServerAdapterClientAcceptedEventArgs> ClientAccepted;
+        public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }

        public override async Task OnConnectedAsync(ConnectionContext connection)
        {
@@ -21,12 +21,15 @@ namespace MQTTnet.AspNetCore
                transferFormatFeature.ActiveFormat = TransferFormat.Binary;
            }

-            using (var adapter = new MqttConnectionContext(new MqttPacketFormatterAdapter(), connection))
+            var writer = new SpanBasedMqttPacketWriter();
+            var formatter = new MqttPacketFormatterAdapter(writer);
+            using (var adapter = new MqttConnectionContext(formatter, connection))
            {
-                var args = new MqttServerAdapterClientAcceptedEventArgs(adapter);
-                ClientAccepted?.Invoke(this, args);
-
-                await args.SessionTask;
+                var clientHandler = ClientHandler;
+                if (clientHandler != null)
+                {
+                    await clientHandler(adapter).ConfigureAwait(false);
+                }
            }
        }

@@ -1,6 +1,7 @@
 using System;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
@@ -11,7 +12,16 @@ namespace MQTTnet.AspNetCore
 {
    public class MqttWebSocketServerAdapter : IMqttServerAdapter
    {
-        public event EventHandler<MqttServerAdapterClientAcceptedEventArgs> ClientAccepted;
+        private readonly IMqttNetChildLogger _logger;
+
+        public MqttWebSocketServerAdapter(IMqttNetChildLogger logger)
+        {
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
+
+            _logger = logger.CreateChildLogger(nameof(MqttTcpServerAdapter));
+        }
+
+        public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }

        public Task StartAsync(IMqttServerOptions options)
        {
@@ -23,24 +33,31 @@ namespace MQTTnet.AspNetCore
            return Task.CompletedTask;
        }

-        public async Task RunWebSocketConnectionAsync(WebSocket webSocket, string endpoint)
+        public async Task RunWebSocketConnectionAsync(WebSocket webSocket, HttpContext httpContext)
        {
            if (webSocket == null) throw new ArgumentNullException(nameof(webSocket));

-            var clientAdapter = new MqttChannelAdapter(new MqttWebSocketChannel(webSocket, endpoint), new MqttPacketFormatterAdapter(), new MqttNetLogger().CreateChildLogger(nameof(MqttWebSocketServerAdapter)));
+            var endpoint = $"{httpContext.Connection.RemoteIpAddress}:{httpContext.Connection.RemotePort}";
+            
+            var clientCertificate = await httpContext.Connection.GetClientCertificateAsync().ConfigureAwait(false);
+            var isSecureConnection = clientCertificate != null;
+            clientCertificate?.Dispose();

-            var eventArgs = new MqttServerAdapterClientAcceptedEventArgs(clientAdapter);
-            ClientAccepted?.Invoke(this, eventArgs);
-
-            if (eventArgs.SessionTask != null)
+            var clientHandler = ClientHandler;
+            if (clientHandler != null)
            {
-                await eventArgs.SessionTask.ConfigureAwait(false);
+                var writer = new SpanBasedMqttPacketWriter();
+                var formatter = new MqttPacketFormatterAdapter(writer);
+                var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection);
+                using (var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger.CreateChildLogger(nameof(MqttWebSocketServerAdapter))))
+                {
+                    await clientHandler(channelAdapter).ConfigureAwait(false);
+                }   
            }
        }

        public void Dispose()
        {
-            StopAsync().GetAwaiter().GetResult();
        }
    }
 }
@@ -9,13 +9,20 @@ namespace MQTTnet.AspNetCore
 {
    public static class ReaderExtensions
    {
-        public static bool TryDecode(this MqttPacketFormatterAdapter formatter, in ReadOnlySequence<byte> input, out MqttBasePacket packet, out SequencePosition consumed, out SequencePosition observed)
+        public static bool TryDecode(this MqttPacketFormatterAdapter formatter, 
+            SpanBasedMqttPacketBodyReader reader, 
+            in ReadOnlySequence<byte> input, 
+            out MqttBasePacket packet, 
+            out SequencePosition consumed, 
+            out SequencePosition observed,
+            out int bytesRead)
        {
            if (formatter == null) throw new ArgumentNullException(nameof(formatter));

            packet = null;
            consumed = input.Start;
            observed = input.End;
+            bytesRead = 0;
            var copy = input;

            if (copy.Length < 2)
@@ -24,7 +31,7 @@ namespace MQTTnet.AspNetCore
            }

            var fixedheader = copy.First.Span[0];
-            if (!TryReadBodyLength(ref copy, out var bodyLength))
+            if (!TryReadBodyLength(ref copy, out int headerLength, out var bodyLength))
            {
                return false;
            }
@@ -35,34 +42,45 @@ namespace MQTTnet.AspNetCore
            }

            var bodySlice = copy.Slice(0, bodyLength);
-            var buffer = bodySlice.GetArray();
-            packet = formatter.Decode(new ReceivedMqttPacket(fixedheader, new MqttPacketBodyReader(buffer, 0, buffer.Length), buffer.Length + 2));
+            var buffer = bodySlice.GetMemory();
+            reader.SetBuffer(buffer);
+
+            var receivedMqttPacket = new ReceivedMqttPacket(fixedheader, reader, buffer.Length + 2);
+
+            if (formatter.ProtocolVersion == MqttProtocolVersion.Unknown)
+            {
+                formatter.DetectProtocolVersion(receivedMqttPacket);
+            }
+
+            packet = formatter.Decode(receivedMqttPacket);
            consumed = bodySlice.End;
            observed = bodySlice.End;
+            bytesRead = headerLength + bodyLength;
            return true;
        }

-        private static byte[] GetArray(this in ReadOnlySequence<byte> input)
+        private static ReadOnlyMemory<byte> GetMemory(this in ReadOnlySequence<byte> input)
        {
            if (input.IsSingleSegment)
            {
-                return input.First.Span.ToArray();
+                return input.First;
            }

            // Should be rare
            return input.ToArray();
        }

-        private static bool TryReadBodyLength(ref ReadOnlySequence<byte> input, out int result)
+        private static bool TryReadBodyLength(ref ReadOnlySequence<byte> input, out int headerLength, out int bodyLength)
        {
            // Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
            var multiplier = 1;
            var value = 0;
            byte encodedByte;
            var index = 1;
-            result = 0;
-
-            var temp = input.Slice(0, Math.Min(5, input.Length)).GetArray();
+            headerLength = 0;
+            bodyLength = 0;
+            
+            var temp = input.Slice(0, Math.Min(5, input.Length)).GetMemory();

            do
            {
@@ -70,13 +88,13 @@ namespace MQTTnet.AspNetCore
                {
                    return false;
                }
-                encodedByte = temp[index];
+                encodedByte = temp.Span[index];
                index++;

                value += (byte)(encodedByte & 127) * multiplier;
                if (multiplier > 128 * 128 * 128)
                {
-                    throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", temp.AsSpan(1, index).ToArray())}).");
+                    throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", temp.Slice(1, index).ToArray())}).");
                }

                multiplier *= 128;
@@ -84,7 +102,8 @@ namespace MQTTnet.AspNetCore

            input = input.Slice(index);

-            result = value;
+            headerLength = index;
+            bodyLength = value;
            return true;
        }
    }
@@ -0,0 +1,124 @@
+using MQTTnet.Exceptions;
+using MQTTnet.Formatter;
+using System;
+using System.Buffers.Binary;
+using System.Text;
+
+namespace MQTTnet.AspNetCore
+{
+    public class SpanBasedMqttPacketBodyReader : IMqttPacketBodyReader
+    {
+        private ReadOnlyMemory<byte> _buffer;
+        private int _offset;
+        
+        public void SetBuffer(ReadOnlyMemory<byte> buffer)
+        {
+            _buffer = buffer;
+            _offset = 0;
+        }
+
+        public ulong Length => (ulong)_buffer.Length;
+
+        public bool EndOfStream => _buffer.Length.Equals(_offset);
+        
+        public ulong Offset => (ulong)_offset;
+
+        public byte ReadByte()
+        {
+            return _buffer.Span[_offset++];
+        }
+
+        public byte[] ReadRemainingData()
+        {
+            return _buffer.Slice(_offset).ToArray();
+        }
+
+        public byte[] ReadWithLengthPrefix()
+        {
+            return ReadSegmentWithLengthPrefix().ToArray();
+        }
+
+        private ReadOnlySpan<byte> ReadSegmentWithLengthPrefix()
+        {
+            var span = _buffer.Span;
+            var length = BinaryPrimitives.ReadUInt16BigEndian(span.Slice(_offset));
+
+            var result = span.Slice(_offset+2, length);
+            _offset += 2 + length;
+            return result;
+        }
+        
+        public unsafe string ReadStringWithLengthPrefix()
+        {
+            var buffer = ReadSegmentWithLengthPrefix();
+            if (buffer.Length == 0)
+            {
+                return string.Empty;
+            }
+
+            fixed (byte* bytes = &buffer.GetPinnableReference())
+            {
+                var result = Encoding.UTF8.GetString(bytes, buffer.Length);
+                return result;
+            }
+        }
+
+        public ushort ReadTwoByteInteger()
+        {
+            var result = BinaryPrimitives.ReadUInt16BigEndian(_buffer.Span.Slice(_offset));
+            _offset += 2;
+            return result;
+        }
+
+        public uint ReadFourByteInteger()
+        {
+            var result = BinaryPrimitives.ReadUInt32BigEndian(_buffer.Span.Slice(_offset));
+            _offset += 4;
+            return result;
+        }
+
+        public uint ReadVariableLengthInteger()
+        {
+            var multiplier = 1;
+            var value = 0U;
+            byte encodedByte;
+
+            do
+            {
+                encodedByte = ReadByte();
+                value += (uint)((encodedByte & 127) * multiplier);
+
+                if (multiplier > 2097152)
+                {
+                    throw new MqttProtocolViolationException("Variable length integer is invalid.");
+                }
+
+                multiplier *= 128;
+            } while ((encodedByte & 128) != 0);
+
+            return value;
+        }
+
+        public bool ReadBoolean()
+        {
+            var buffer = ReadByte();
+
+            if (buffer == 0)
+            {
+                return false;
+            }
+
+            if (buffer == 1)
+            {
+                return true;
+            }
+
+            throw new MqttProtocolViolationException("Boolean values can be 0 or 1 only.");
+        }
+
+        public void Seek(ulong position)
+        {
+            _offset = (int)position;
+        }
+    }
+}
@@ -0,0 +1,146 @@
+using MQTTnet.Formatter;
+using System;
+using System.Buffers;
+using System.Buffers.Binary;
+using System.Text;
+
+namespace MQTTnet.AspNetCore
+{
+    public class SpanBasedMqttPacketWriter : IMqttPacketWriter
+    {
+        private readonly ArrayPool<byte> _pool;
+
+        public SpanBasedMqttPacketWriter()
+        {
+            _pool = ArrayPool<byte>.Create();
+            
+        }
+
+        private byte[] _buffer;
+        private int _position;
+
+        public int Length { get; set; }
+
+        public void FreeBuffer()
+        {
+            _pool.Return(_buffer);
+        }
+
+        public byte[] GetBuffer()
+        {
+            return _buffer;
+        }
+
+        public void Reset(int v)
+        {
+            _buffer = _pool.Rent(1500);
+            Length = v;
+            _position = v;
+        }
+
+        public void Seek(int v)
+        {
+            _position = v;
+        }
+
+        public void Write(byte value)
+        {
+            GrowIfNeeded(1);
+            _buffer[_position] = value;
+            Commit(1);
+        }
+
+        public void Write(ushort value)
+        {
+            GrowIfNeeded(2);
+
+            BinaryPrimitives.WriteUInt16BigEndian(_buffer.AsSpan(_position), value);
+            Commit(2);
+        }
+
+        public void Write(IMqttPacketWriter propertyWriter)
+        {
+            if (propertyWriter == null) throw new ArgumentNullException(nameof(propertyWriter));
+
+            GrowIfNeeded(propertyWriter.Length);
+            Write(propertyWriter.GetBuffer(), 0, propertyWriter.Length);
+            Commit(propertyWriter.Length);
+        }
+
+        public void Write(byte[] payload, int start, int length)
+        {
+            GrowIfNeeded(length);
+
+            payload.AsSpan(start, length).CopyTo(_buffer.AsSpan(_position));
+            Commit(length);
+        }
+
+        public void WriteVariableLengthInteger(uint value)
+        {
+            GrowIfNeeded(4);
+            
+            var x = value;
+            do
+            {
+                var encodedByte = x % 128;
+                x = x / 128;
+                if (x > 0)
+                {
+                    encodedByte = encodedByte | 128;
+                }
+
+                _buffer[_position] = (byte)encodedByte;
+                Commit(1);
+            } while (x > 0);
+        }
+
+        public void WriteWithLengthPrefix(string value)
+        {
+            var bytesLength = Encoding.UTF8.GetByteCount(value ?? string.Empty);
+            GrowIfNeeded(bytesLength + 2);
+
+            Write((ushort)bytesLength);
+            Encoding.UTF8.GetBytes(value ?? string.Empty, 0, value?.Length ?? 0, _buffer, _position);
+            Commit(bytesLength);
+        }
+
+        public void WriteWithLengthPrefix(byte[] payload)
+        {
+            GrowIfNeeded(payload.Length + 2);
+            
+            Write((ushort)payload.Length);
+            payload.CopyTo(_buffer, _position);
+            Commit(payload.Length);
+        }
+
+        private void Commit(int count)
+        {
+            if (_position == Length)
+            {
+                Length += count;
+            }
+
+            _position += count;
+        }
+
+        private void GrowIfNeeded(int requiredAdditional) 
+        {
+            var requiredTotal = _position + requiredAdditional;
+            if (_buffer.Length >= requiredTotal)
+            {
+                return;
+            }
+
+            var newBufferLength = _buffer.Length;
+            while (newBufferLength < requiredTotal)
+            {
+                newBufferLength *= 2;
+            }
+
+            var newBuffer = _pool.Rent(newBufferLength);
+            Array.Copy(_buffer, newBuffer, _buffer.Length);
+            _pool.Return(_buffer);
+            _buffer = newBuffer;
+        }
+    }
+}
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public class ApplicationMessageProcessedHandlerDelegate : IApplicationMessageProcessedHandler
+    {
+        private readonly Func<ApplicationMessageProcessedEventArgs, Task> _handler;
+
+        public ApplicationMessageProcessedHandlerDelegate(Action<ApplicationMessageProcessedEventArgs> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            _handler = context =>
+            {
+                handler(context);
+                return Task.FromResult(0);
+            };
+        }
+
+        public ApplicationMessageProcessedHandlerDelegate(Func<ApplicationMessageProcessedEventArgs, Task> handler)
+        {
+            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public Task HandleApplicationMessageProcessedAsync(ApplicationMessageProcessedEventArgs eventArgs)
+        {
+            return _handler(eventArgs);
+        }
+    }
+}
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public class ApplicationMessageSkippedHandlerDelegate : IApplicationMessageSkippedHandler
+    {
+        private readonly Func<ApplicationMessageSkippedEventArgs, Task> _handler;
+
+        public ApplicationMessageSkippedHandlerDelegate(Action<ApplicationMessageSkippedEventArgs> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            _handler = eventArgs =>
+            {
+                handler(eventArgs);
+                return Task.FromResult(0);
+            };
+        }
+
+        public ApplicationMessageSkippedHandlerDelegate(Func<ApplicationMessageSkippedEventArgs, Task> handler)
+        {
+            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public Task HandleApplicationMessageSkippedAsync(ApplicationMessageSkippedEventArgs eventArgs)
+        {
+            return _handler(eventArgs);
+        }
+    }
+}
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public class ConnectingFailedHandlerDelegate : IConnectingFailedHandler
+    {
+        private readonly Func<ManagedProcessFailedEventArgs, Task> _handler;
+
+        public ConnectingFailedHandlerDelegate(Action<ManagedProcessFailedEventArgs> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            _handler = eventArgs =>
+            {
+                handler(eventArgs);
+                return Task.FromResult(0);
+            };
+        }
+
+        public ConnectingFailedHandlerDelegate(Func<ManagedProcessFailedEventArgs, Task> handler)
+        {
+            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public Task HandleConnectingFailedAsync(ManagedProcessFailedEventArgs eventArgs)
+        {
+            return _handler(eventArgs);
+        }
+    }
+}
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public interface IApplicationMessageProcessedHandler
+    {
+        Task HandleApplicationMessageProcessedAsync(ApplicationMessageProcessedEventArgs eventArgs);
+    }
+}
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public interface IApplicationMessageSkippedHandler
+    {
+        Task HandleApplicationMessageSkippedAsync(ApplicationMessageSkippedEventArgs eventArgs);
+    }
+}
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public interface IConnectingFailedHandler
+    {
+        Task HandleConnectingFailedAsync(ManagedProcessFailedEventArgs eventArgs);
+    }
+}
@@ -13,14 +13,14 @@ namespace MQTTnet.Extensions.ManagedClient
        int PendingApplicationMessagesCount { get; }
        IManagedMqttClientOptions Options { get; }

-        event EventHandler<MqttClientConnectedEventArgs> Connected;
-        event EventHandler<MqttClientDisconnectedEventArgs> Disconnected;
+        IMqttClientConnectedHandler ConnectedHandler { get; set; }
+        IMqttClientDisconnectedHandler DisconnectedHandler { get; set; }

-        event EventHandler<ApplicationMessageProcessedEventArgs> ApplicationMessageProcessed;
-        event EventHandler<ApplicationMessageSkippedEventArgs> ApplicationMessageSkipped;
+        IApplicationMessageProcessedHandler ApplicationMessageProcessedHandler { get; set; }
+        IApplicationMessageSkippedHandler ApplicationMessageSkippedHandler { get; set; }

-        event EventHandler<MqttManagedProcessFailedEventArgs> ConnectingFailed;
-        event EventHandler<MqttManagedProcessFailedEventArgs> SynchronizingSubscriptionsFailed;
+        IConnectingFailedHandler ConnectingFailedHandler { get; set; }
+        ISynchronizingSubscriptionsFailedHandler SynchronizingSubscriptionsFailedHandler { get; set; }
        
        Task StartAsync(IManagedMqttClientOptions options);
        Task StopAsync();
@@ -1,5 +1,4 @@
 using System;
-using MQTTnet.Client;
 using MQTTnet.Client.Options;
 using MQTTnet.Server;

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public interface ISynchronizingSubscriptionsFailedHandler
+    {
+        Task HandleSynchronizingSubscriptionsFailedAsync(ManagedProcessFailedEventArgs eventArgs);
+    }
+}
@@ -4,14 +4,15 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Client;
+using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Disconnecting;
 using MQTTnet.Client.Publishing;
+using MQTTnet.Client.Receiving;
 using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
-using MqttClientConnectedEventArgs = MQTTnet.Client.Connecting.MqttClientConnectedEventArgs;
-using MqttClientDisconnectedEventArgs = MQTTnet.Client.Disconnecting.MqttClientDisconnectedEventArgs;

 namespace MQTTnet.Extensions.ManagedClient
 {
@@ -26,21 +27,18 @@ namespace MQTTnet.Extensions.ManagedClient

        private CancellationTokenSource _connectionCancellationToken;
        private CancellationTokenSource _publishingCancellationToken;
+        private Task _maintainConnectionTask;

        private ManagedMqttClientStorageManager _storageManager;

+        private bool _disposed = false;
        private bool _subscriptionsNotPushed;

        public ManagedMqttClient(IMqttClient mqttClient, IMqttNetChildLogger logger)
        {
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-
            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));

-            _mqttClient.Connected += OnConnected;
-            _mqttClient.Disconnected += OnDisconnected;
-            _mqttClient.ApplicationMessageReceived += OnApplicationMessageReceived;
-
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
            _logger = logger.CreateChildLogger(nameof(ManagedMqttClient));
        }

@@ -49,18 +47,36 @@ namespace MQTTnet.Extensions.ManagedClient
        public int PendingApplicationMessagesCount => _messageQueue.Count;
        public IManagedMqttClientOptions Options { get; private set; }

-        public event EventHandler<MqttClientConnectedEventArgs> Connected;
-        public event EventHandler<MqttClientDisconnectedEventArgs> Disconnected;
+        public IMqttClientConnectedHandler ConnectedHandler
+        {
+            get => _mqttClient.ConnectedHandler;
+            set => _mqttClient.ConnectedHandler = value;
+        }

-        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
-        public event EventHandler<ApplicationMessageProcessedEventArgs> ApplicationMessageProcessed;
-        public event EventHandler<ApplicationMessageSkippedEventArgs> ApplicationMessageSkipped;
+        public IMqttClientDisconnectedHandler DisconnectedHandler
+        {
+            get => _mqttClient.DisconnectedHandler;
+            set => _mqttClient.DisconnectedHandler = value;
+        }

-        public event EventHandler<MqttManagedProcessFailedEventArgs> ConnectingFailed;
-        public event EventHandler<MqttManagedProcessFailedEventArgs> SynchronizingSubscriptionsFailed;
+        public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler
+        {
+            get => _mqttClient.ApplicationMessageReceivedHandler;
+            set => _mqttClient.ApplicationMessageReceivedHandler = value;
+        }
+
+        public IApplicationMessageProcessedHandler ApplicationMessageProcessedHandler { get; set; }
+
+        public IApplicationMessageSkippedHandler ApplicationMessageSkippedHandler { get; set; }
+
+        public IConnectingFailedHandler ConnectingFailedHandler { get; set; }
+
+        public ISynchronizingSubscriptionsFailedHandler SynchronizingSubscriptionsFailedHandler { get; set; }

        public async Task StartAsync(IManagedMqttClientOptions options)
        {
+            ThrowIfDisposed();
+
            if (options == null) throw new ArgumentNullException(nameof(options));
            if (options.ClientOptions == null) throw new ArgumentException("The client options are not set.", nameof(options));

@@ -69,7 +85,7 @@ namespace MQTTnet.Extensions.ManagedClient
                throw new NotSupportedException("The managed client does not support existing sessions.");
            }

-            if (_connectionCancellationToken != null) throw new InvalidOperationException("The managed client is already started.");
+            if (!_maintainConnectionTask?.IsCompleted ?? false) throw new InvalidOperationException("The managed client is already started.");

            Options = options;

@@ -87,24 +103,32 @@ 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
-            Task.Run(() => MaintainConnectionAsync(_connectionCancellationToken.Token), _connectionCancellationToken.Token);
+            _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

            _logger.Info("Started");
        }

-        public Task StopAsync()
+        public async Task StopAsync()
        {
+            ThrowIfDisposed();
+
            StopPublishing();
            StopMaintainingConnection();

            _messageQueue.Clear();

-            return Task.FromResult(0);
+            if (_maintainConnectionTask != null)
+            {
+                await Task.WhenAny(_maintainConnectionTask);
+                _maintainConnectionTask = null;
+            }
        }

-        public async Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage)
+        public async Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken)
        {
+            ThrowIfDisposed();
+
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

            await PublishAsync(new ManagedMqttApplicationMessageBuilder().WithApplicationMessage(applicationMessage).Build()).ConfigureAwait(false);
@@ -113,31 +137,52 @@ namespace MQTTnet.Extensions.ManagedClient

        public async Task PublishAsync(ManagedMqttApplicationMessage applicationMessage)
        {
+            ThrowIfDisposed();
+
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

+            MqttTopicValidator.ThrowIfInvalid(applicationMessage.ApplicationMessage.Topic);
+
            ManagedMqttApplicationMessage removedMessage = null;
-            lock (_messageQueue)
+            ApplicationMessageSkippedEventArgs applicationMessageSkippedEventArgs = null;
+
+            try
            {
-                if (_messageQueue.Count >= Options.MaxPendingMessages)
+                lock (_messageQueue)
                {
-                    if (Options.PendingMessagesOverflowStrategy == MqttPendingMessagesOverflowStrategy.DropNewMessage)
+                    if (_messageQueue.Count >= Options.MaxPendingMessages)
                    {
-                        _logger.Verbose("Skipping publish of new application message because internal queue is full.");
-                        ApplicationMessageSkipped?.Invoke(this, new ApplicationMessageSkippedEventArgs(applicationMessage));
-                        return;
+                        if (Options.PendingMessagesOverflowStrategy == MqttPendingMessagesOverflowStrategy.DropNewMessage)
+                        {
+                            _logger.Verbose("Skipping publish of new application message because internal queue is full.");
+                            applicationMessageSkippedEventArgs = new ApplicationMessageSkippedEventArgs(applicationMessage);
+                            return;
+                        }
+
+                        if (Options.PendingMessagesOverflowStrategy == MqttPendingMessagesOverflowStrategy.DropOldestQueuedMessage)
+                        {
+                            removedMessage = _messageQueue.RemoveFirst();
+                            _logger.Verbose("Removed oldest application message from internal queue because it is full.");
+                            applicationMessageSkippedEventArgs = new ApplicationMessageSkippedEventArgs(removedMessage);
+                        }
                    }

-                    if (Options.PendingMessagesOverflowStrategy == MqttPendingMessagesOverflowStrategy.DropOldestQueuedMessage)
+                    _messageQueue.Enqueue(applicationMessage);
+                }
+            }
+            finally
+            {
+                if (applicationMessageSkippedEventArgs != null)
+                {
+                    var applicationMessageSkippedHandler = ApplicationMessageSkippedHandler;
+                    if (applicationMessageSkippedHandler != null)
                    {
-                        removedMessage = _messageQueue.RemoveFirst();
-                        _logger.Verbose("Removed oldest application message from internal queue because it is full.");
-                        ApplicationMessageSkipped?.Invoke(this, new ApplicationMessageSkippedEventArgs(removedMessage));
+                        await applicationMessageSkippedHandler.HandleApplicationMessageSkippedAsync(applicationMessageSkippedEventArgs).ConfigureAwait(false);
                    }
                }

-                _messageQueue.Enqueue(applicationMessage);
            }
-
+            
            if (_storageManager != null)
            {
                if (removedMessage != null)
@@ -151,6 +196,8 @@ namespace MQTTnet.Extensions.ManagedClient

        public Task SubscribeAsync(IEnumerable<TopicFilter> topicFilters)
        {
+            ThrowIfDisposed();
+
            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));

            lock (_subscriptions)
@@ -167,6 +214,8 @@ namespace MQTTnet.Extensions.ManagedClient

        public Task UnsubscribeAsync(IEnumerable<string> topics)
        {
+            ThrowIfDisposed();
+
            if (topics == null) throw new ArgumentNullException(nameof(topics));

            lock (_subscriptions)
@@ -186,8 +235,31 @@ namespace MQTTnet.Extensions.ManagedClient

        public void Dispose()
        {
-            _connectionCancellationToken?.Dispose();
-            _publishingCancellationToken?.Dispose();
+            if (_disposed)
+            {
+                return;
+            }
+
+            _disposed = true;
+
+            StopPublishing();
+            StopMaintainingConnection();
+
+            if (_maintainConnectionTask != null)
+            {
+                Task.WaitAny(_maintainConnectionTask);
+                _maintainConnectionTask = null;
+            }
+
+            _mqttClient.Dispose();
+        }
+
+        private void ThrowIfDisposed()
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(ManagedMqttClient));
+            }
        }

        private async Task MaintainConnectionAsync(CancellationToken cancellationToken)
@@ -208,16 +280,19 @@ namespace MQTTnet.Extensions.ManagedClient
            }
            finally
            {
-                try
+                if (!_disposed)
                {
-                    await _mqttClient.DisconnectAsync().ConfigureAwait(false);
-                }
-                catch (Exception exception)
-                {
-                    _logger.Error(exception, "Error while disconnecting.");
-                }
+                    try
+                    {
+                        await _mqttClient.DisconnectAsync().ConfigureAwait(false);
+                    }
+                    catch (Exception exception)
+                    {
+                        _logger.Error(exception, "Error while disconnecting.");
+                    }

-                _logger.Info("Stopped");
+                    _logger.Info("Stopped");
+                }
            }
        }

@@ -342,13 +417,13 @@ namespace MQTTnet.Extensions.ManagedClient
            }
            finally
            {
-                ApplicationMessageProcessed?.Invoke(this, new ApplicationMessageProcessedEventArgs(message, transmitException));
+                ApplicationMessageProcessedHandler?.HandleApplicationMessageProcessedAsync(new ApplicationMessageProcessedEventArgs(message, transmitException)).GetAwaiter().GetResult();
            }
        }

        private async Task SynchronizeSubscriptionsAsync()
        {
-            _logger.Info(nameof(ManagedMqttClient), "Synchronizing subscriptions");
+            _logger.Info("Synchronizing subscriptions");

            List<TopicFilter> subscriptions;
            HashSet<string> unsubscriptions;
@@ -372,12 +447,12 @@ namespace MQTTnet.Extensions.ManagedClient
            {
                if (unsubscriptions.Any())
                {
-                    await _mqttClient.UnsubscribeAsync(unsubscriptions).ConfigureAwait(false);
+                    await _mqttClient.UnsubscribeAsync(unsubscriptions.ToArray()).ConfigureAwait(false);
                }

                if (subscriptions.Any())
                {
-                    await _mqttClient.SubscribeAsync(subscriptions).ConfigureAwait(false);
+                    await _mqttClient.SubscribeAsync(subscriptions.ToArray()).ConfigureAwait(false);
                }
            }
            catch (Exception exception)
@@ -385,7 +460,11 @@ namespace MQTTnet.Extensions.ManagedClient
                _logger.Warning(exception, "Synchronizing subscriptions failed.");
                _subscriptionsNotPushed = true;

-                SynchronizingSubscriptionsFailed?.Invoke(this, new MqttManagedProcessFailedEventArgs(exception));
+                var synchronizingSubscriptionsFailedHandler = SynchronizingSubscriptionsFailedHandler;
+                if (SynchronizingSubscriptionsFailedHandler != null)
+                {
+                    await synchronizingSubscriptionsFailedHandler.HandleSynchronizingSubscriptionsFailedAsync(new ManagedProcessFailedEventArgs(exception)).ConfigureAwait(false);
+                }
            }
        }

@@ -403,26 +482,16 @@ namespace MQTTnet.Extensions.ManagedClient
            }
            catch (Exception exception)
            {
-                ConnectingFailed?.Invoke(this, new MqttManagedProcessFailedEventArgs(exception));
+                var connectingFailedHandler = ConnectingFailedHandler;
+                if (connectingFailedHandler != null)
+                {
+                    await connectingFailedHandler.HandleConnectingFailedAsync(new ManagedProcessFailedEventArgs(exception)).ConfigureAwait(false);
+                }
+
                return ReconnectionResult.NotConnected;
            }
        }
-
-        private void OnApplicationMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs eventArgs)
-        {
-            ApplicationMessageReceived?.Invoke(this, eventArgs);
-        }
-
-        private void OnDisconnected(object sender, MqttClientDisconnectedEventArgs eventArgs)
-        {
-            Disconnected?.Invoke(this, eventArgs);
-        }
-
-        private void OnConnected(object sender, MqttClientConnectedEventArgs eventArgs)
-        {
-            Connected?.Invoke(this, eventArgs);
-        }
-
+        
        private void StartPublishing()
        {
            if (_publishingCancellationToken != null)
@@ -450,4 +519,4 @@ namespace MQTTnet.Extensions.ManagedClient
            _connectionCancellationToken = null;
        }
    }
-}
+}
@@ -1,39 +1,229 @@
 using System;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Disconnecting;
+using MQTTnet.Client.Publishing;
+using MQTTnet.Client.Receiving;
 using MQTTnet.Protocol;

 namespace MQTTnet.Extensions.ManagedClient
 {
    public static class ManagedMqttClientExtensions
    {
-        public static Task SubscribeAsync(this IManagedMqttClient managedClient, params TopicFilter[] topicFilters)
+        public static IManagedMqttClient UseConnectedHandler(this IManagedMqttClient client, Func<MqttClientConnectedEventArgs, Task> handler)
        {
-            if (managedClient == null) throw new ArgumentNullException(nameof(managedClient));
+            if (client == null) throw new ArgumentNullException(nameof(client));

-            return managedClient.SubscribeAsync(topicFilters);
+            if (handler == null)
+            {
+                return client.UseConnectedHandler((IMqttClientConnectedHandler)null);
+            }
+
+            return client.UseConnectedHandler(new MqttClientConnectedHandlerDelegate(handler));
        }

-        public static Task SubscribeAsync(this IManagedMqttClient managedClient, string topic, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        public static IManagedMqttClient UseConnectedHandler(this IManagedMqttClient client, Action<MqttClientConnectedEventArgs> handler)
        {
-            if (managedClient == null) throw new ArgumentNullException(nameof(managedClient));
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseConnectedHandler((IMqttClientConnectedHandler)null);
+            }
+
+            return client.UseConnectedHandler(new MqttClientConnectedHandlerDelegate(handler));
+        }
+
+        public static IManagedMqttClient UseConnectedHandler(this IManagedMqttClient client, IMqttClientConnectedHandler handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            client.ConnectedHandler = handler;
+            return client;
+        }
+
+        public static IManagedMqttClient UseDisconnectedHandler(this IManagedMqttClient client, Func<MqttClientDisconnectedEventArgs, Task> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseDisconnectedHandler((IMqttClientDisconnectedHandler)null);
+            }
+
+            return client.UseDisconnectedHandler(new MqttClientDisconnectedHandlerDelegate(handler));
+        }
+
+        public static IManagedMqttClient UseDisconnectedHandler(this IManagedMqttClient client, Action<MqttClientDisconnectedEventArgs> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseDisconnectedHandler((IMqttClientDisconnectedHandler)null);
+            }
+
+            return client.UseDisconnectedHandler(new MqttClientDisconnectedHandlerDelegate(handler));
+        }
+
+        public static IManagedMqttClient UseDisconnectedHandler(this IManagedMqttClient client, IMqttClientDisconnectedHandler handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            client.DisconnectedHandler = handler;
+            return client;
+        }
+
+        public static IManagedMqttClient UseApplicationMessageReceivedHandler(this IManagedMqttClient client, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
+            }
+
+            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
+        }
+
+        public static IManagedMqttClient UseApplicationMessageReceivedHandler(this IManagedMqttClient client, Action<MqttApplicationMessageReceivedEventArgs> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
+            }
+
+            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
+        }
+
+        public static IManagedMqttClient UseApplicationMessageReceivedHandler(this IManagedMqttClient client, IMqttApplicationMessageReceivedHandler handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            client.ApplicationMessageReceivedHandler = handler;
+            return client;
+        }
+
+        public static Task SubscribeAsync(this IManagedMqttClient client, params TopicFilter[] topicFilters)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            return client.SubscribeAsync(topicFilters);
+        }
+
+        public static Task SubscribeAsync(this IManagedMqttClient client, string topic, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

-            return managedClient.SubscribeAsync(new TopicFilterBuilder().WithTopic(topic).WithQualityOfServiceLevel(qualityOfServiceLevel).Build());
+            return client.SubscribeAsync(new TopicFilterBuilder().WithTopic(topic).WithQualityOfServiceLevel(qualityOfServiceLevel).Build());
        }

-        public static Task SubscribeAsync(this IManagedMqttClient managedClient, string topic)
+        public static Task SubscribeAsync(this IManagedMqttClient client, string topic)
        {
-            if (managedClient == null) throw new ArgumentNullException(nameof(managedClient));
+            if (client == null) throw new ArgumentNullException(nameof(client));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

-            return managedClient.SubscribeAsync(new TopicFilterBuilder().WithTopic(topic).Build());
+            return client.SubscribeAsync(new TopicFilterBuilder().WithTopic(topic).Build());
        }

-        public static Task UnsubscribeAsync(this IManagedMqttClient managedClient, params string[] topicFilters)
+        public static Task UnsubscribeAsync(this IManagedMqttClient client, params string[] topicFilters)
        {
-            if (managedClient == null) throw new ArgumentNullException(nameof(managedClient));
+            if (client == null) throw new ArgumentNullException(nameof(client));

-            return managedClient.UnsubscribeAsync(topicFilters);
+            return client.UnsubscribeAsync(topicFilters);
+        }
+
+        public static async Task PublishAsync(this IManagedMqttClient client, IEnumerable<MqttApplicationMessage> applicationMessages)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
+
+            foreach (var applicationMessage in applicationMessages)
+            {
+                await client.PublishAsync(applicationMessage).ConfigureAwait(false);
+            }
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, MqttApplicationMessage applicationMessage)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
+
+            return client.PublishAsync(applicationMessage, CancellationToken.None);
+        }
+
+        public static async Task PublishAsync(this IManagedMqttClient client, params MqttApplicationMessage[] applicationMessages)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
+
+            foreach (var applicationMessage in applicationMessages)
+            {
+                await client.PublishAsync(applicationMessage, CancellationToken.None).ConfigureAwait(false);
+            }
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, string topic)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(builder => builder
+                .WithTopic(topic));
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, string topic, string payload)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(builder => builder
+                .WithTopic(topic)
+                .WithPayload(payload));
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(builder => builder
+                .WithTopic(topic)
+                .WithPayload(payload)
+                .WithQualityOfServiceLevel(qualityOfServiceLevel));
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, bool retain)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(builder => builder
+                .WithTopic(topic)
+                .WithPayload(payload)
+                .WithQualityOfServiceLevel(qualityOfServiceLevel)
+                .WithRetainFlag(retain));
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder, CancellationToken cancellationToken)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            var message = builder(new MqttApplicationMessageBuilder()).Build();
+            return client.PublishAsync(message, cancellationToken);
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            var message = builder(new MqttApplicationMessageBuilder()).Build();
+            return client.PublishAsync(message, CancellationToken.None);
        }
    }
 }
@@ -30,7 +30,7 @@ namespace MQTTnet.Extensions.ManagedClient
        {
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

-            using (await _messagesLock.LockAsync(CancellationToken.None).ConfigureAwait(false))
+            using (await _messagesLock.WaitAsync(CancellationToken.None).ConfigureAwait(false))
            {
                _messages.Add(applicationMessage);
                await SaveAsync().ConfigureAwait(false);
@@ -41,7 +41,7 @@ namespace MQTTnet.Extensions.ManagedClient
        {
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

-            using (await _messagesLock.LockAsync(CancellationToken.None).ConfigureAwait(false))
+            using (await _messagesLock.WaitAsync(CancellationToken.None).ConfigureAwait(false))
            {
                var index = _messages.IndexOf(applicationMessage);
                if (index == -1)
@@ -0,0 +1,14 @@
+using System;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public class ManagedProcessFailedEventArgs : EventArgs
+    {
+        public ManagedProcessFailedEventArgs(Exception exception)
+        {
+            Exception = exception ?? throw new ArgumentNullException(nameof(exception));
+        }
+
+        public Exception Exception { get; }
+    }
+}
@@ -1,24 +1,23 @@
 using System;
-using MQTTnet.Client;
 using MQTTnet.Diagnostics;

 namespace MQTTnet.Extensions.ManagedClient
 {
    public static class MqttFactoryExtensions
    {
-        public static IManagedMqttClient CreateManagedMqttClient(this IMqttClientFactory factory)
+        public static IManagedMqttClient CreateManagedMqttClient(this IMqttFactory factory)
        {
            if (factory == null) throw new ArgumentNullException(nameof(factory));

-            return new ManagedMqttClient(factory.CreateMqttClient(), new MqttNetLogger().CreateChildLogger());
+            return new ManagedMqttClient(factory.CreateMqttClient(), factory.DefaultLogger.CreateChildLogger());
        }

-        public static IManagedMqttClient CreateManagedMqttClient(this IMqttClientFactory factory, IMqttNetLogger logger)
+        public static IManagedMqttClient CreateManagedMqttClient(this IMqttFactory factory, IMqttNetLogger logger)
        {
            if (factory == null) throw new ArgumentNullException(nameof(factory));
            if (logger == null) throw new ArgumentNullException(nameof(logger));

-            return new ManagedMqttClient(factory.CreateMqttClient(), logger.CreateChildLogger());
+            return new ManagedMqttClient(factory.CreateMqttClient(logger), logger.CreateChildLogger());
        }
    }
-}
+}
@@ -1,14 +0,0 @@
-using System;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public class MqttManagedProcessFailedEventArgs : EventArgs
-    {
-        public MqttManagedProcessFailedEventArgs(Exception exception)
-        {
-            Exception = exception;
-        }
-
-        public Exception Exception { get; }
-    }
-}
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+
+namespace MQTTnet.Extensions.ManagedClient
+{
+    public class SynchronizingSubscriptionsFailedHandlerDelegate : ISynchronizingSubscriptionsFailedHandler
+    {
+        private readonly Func<ManagedProcessFailedEventArgs, Task> _handler;
+
+        public SynchronizingSubscriptionsFailedHandlerDelegate(Action<ManagedProcessFailedEventArgs> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            _handler = context =>
+            {
+                handler(context);
+                return Task.FromResult(0);
+            };
+        }
+
+        public SynchronizingSubscriptionsFailedHandlerDelegate(Func<ManagedProcessFailedEventArgs, Task> handler)
+        {
+            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public Task HandleSynchronizingSubscriptionsFailedAsync(ManagedProcessFailedEventArgs eventArgs)
+        {
+            return _handler(eventArgs);
+        }
+    }
+}
@@ -13,12 +13,17 @@ namespace MQTTnet.Extensions.Rpc
    {
        private readonly ConcurrentDictionary<string, TaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, TaskCompletionSource<byte[]>>();
        private readonly IMqttClient _mqttClient;
+        private readonly RpcAwareApplicationMessageReceivedHandler _applicationMessageReceivedHandler;

        public MqttRpcClient(IMqttClient mqttClient)
        {
            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));

-            _mqttClient.ApplicationMessageReceived += OnApplicationMessageReceived;
+            _applicationMessageReceivedHandler = new RpcAwareApplicationMessageReceivedHandler(
+                mqttClient.ApplicationMessageReceivedHandler,
+                HandleApplicationMessageReceivedAsync);
+
+            _mqttClient.ApplicationMessageReceivedHandler = _applicationMessageReceivedHandler;
        }

        public Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
@@ -45,6 +50,11 @@ namespace MQTTnet.Extensions.Rpc
                throw new ArgumentException("The method name cannot contain /, + or #.");
            }

+            if (!(_mqttClient.ApplicationMessageReceivedHandler is RpcAwareApplicationMessageReceivedHandler))
+            {
+                throw new InvalidOperationException("The application message received handler was modified.");
+            }
+
            var requestTopic = $"MQTTnet.RPC/{Guid.NewGuid():N}/{methodName}";
            var responseTopic = requestTopic + "/response";

@@ -102,26 +112,25 @@ namespace MQTTnet.Extensions.Rpc
            }
        }

-        private void OnApplicationMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs eventArgs)
+        private Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
        {
            if (!_waitingCalls.TryRemove(eventArgs.ApplicationMessage.Topic, out var tcs))
            {
-                return;
-            }
-
-            if (tcs.Task.IsCompleted || tcs.Task.IsCanceled)
-            {
-                return;
+                return Task.FromResult(0);
            }

            tcs.TrySetResult(eventArgs.ApplicationMessage.Payload);
+
+            return Task.FromResult(0);
        }

        public void Dispose()
        {
+            _mqttClient.ApplicationMessageReceivedHandler = _applicationMessageReceivedHandler.OriginalHandler;
+
            foreach (var tcs in _waitingCalls)
            {
-                tcs.Value.SetCanceled();
+                tcs.Value.TrySetCanceled();
            }

            _waitingCalls.Clear();
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+using MQTTnet.Client.Receiving;
+
+namespace MQTTnet.Extensions.Rpc
+{
+    public class RpcAwareApplicationMessageReceivedHandler : IMqttApplicationMessageReceivedHandler
+    {
+        private readonly Func<MqttApplicationMessageReceivedEventArgs, Task> _handleReceivedApplicationMessageAsync;
+
+        public RpcAwareApplicationMessageReceivedHandler(
+            IMqttApplicationMessageReceivedHandler originalHandler,
+            Func<MqttApplicationMessageReceivedEventArgs, Task> handleReceivedApplicationMessageAsync)
+        {
+            OriginalHandler = originalHandler;
+            _handleReceivedApplicationMessageAsync = handleReceivedApplicationMessageAsync ?? throw new ArgumentNullException(nameof(handleReceivedApplicationMessageAsync));
+        }
+
+        public IMqttApplicationMessageReceivedHandler OriginalHandler { get; }
+
+        public async Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
+        {
+            if (OriginalHandler != null)
+            {
+                await OriginalHandler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
+            }
+
+            await _handleReceivedApplicationMessageAsync(eventArgs).ConfigureAwait(false);
+        }
+    }
+}
@@ -0,0 +1,11 @@
+namespace MQTTnet.Server.Configuration
+{
+    public class RetainedApplicationMessagesModel
+    {
+        public bool Persist { get; set; } = false;
+
+        public int WriteInterval { get; set; } = 10;
+
+        public string Filename { get; set; } = "RetainedApplicationMessages.json";
+    }
+}
@@ -0,0 +1,53 @@
+namespace MQTTnet.Server.Configuration
+{
+    /// <summary>
+    /// Main Settings Model
+    /// </summary>
+    public class SettingsModel
+    {
+        /// <summary>
+        /// Set default connection timeout in seconds
+        /// </summary>
+        public int CommunicationTimeout { get; set; } = 15;
+
+        /// <summary>
+        /// Set 0 to disable connection backlogging
+        /// </summary>
+        public int ConnectionBacklog { get; set; }
+
+        /// <summary>
+        /// Enable support for persistent sessions
+        /// </summary>
+        public bool EnablePersistentSessions { get; set; } = false;
+
+        /// <summary>
+        /// Listen Settings
+        /// </summary>
+        public TcpEndPointModel TcpEndPoint { get; set; } = new TcpEndPointModel();
+
+        /// <summary>
+        /// Encryption Listen Settings
+        /// </summary>
+        public TcpEndPointModel EncryptedTcpEndPoint { get; set; } = new TcpEndPointModel();
+
+        /// <summary>
+        /// Settings for the Web Socket endpoint.
+        /// </summary>
+        public WebSocketEndPointModel WebSocketEndPoint { get; set; } = new WebSocketEndPointModel();
+
+        /// <summary>
+        /// Set limit for max pending messages per client
+        /// </summary>
+        public int MaxPendingMessagesPerClient { get; set; } = 250;
+
+        /// <summary>
+        /// The settings for retained messages.
+        /// </summary>
+        public RetainedApplicationMessagesModel RetainedApplicationMessages { get; set; } = new RetainedApplicationMessagesModel();
+
+        /// <summary>
+        /// Enables or disables the MQTTnet internal logging.
+        /// </summary>
+        public bool EnableDebugLogging { get; set; } = false;
+    }
+}
@@ -0,0 +1,121 @@
+using System.IO;
+using System.Net;
+
+namespace MQTTnet.Server.Configuration
+{
+    /// <summary>
+    /// Listen Entry Settings Model
+    /// </summary>
+    public class TcpEndPointModel
+    {
+        /// <summary>
+        /// Path to Certificate
+        /// </summary>
+        public string CertificatePath { get; set; }
+
+        /// <summary>
+        /// Enabled / Disable
+        /// </summary>
+        public bool Enabled { get; set; } = true;
+
+        /// <summary>
+        /// Listen Address
+        /// </summary>
+        public string IPv4 { get; set; }
+
+        /// <summary>
+        /// Listen Address
+        /// </summary>
+        public string IPv6 { get; set; }
+
+        /// <summary>
+        /// Listen Port
+        /// </summary>
+        public int Port { get; set; } = 1883;
+
+        /// <summary>
+        /// Read Certificate file
+        /// </summary>
+        /// <returns></returns>
+        public byte[] ReadCertificate()
+        {
+            if (string.IsNullOrEmpty(CertificatePath) || string.IsNullOrWhiteSpace(CertificatePath))
+            {
+                throw new FileNotFoundException("No path set");
+            }
+
+            if (!File.Exists(CertificatePath))
+            {
+                throw new FileNotFoundException($"Could not find Certificate in path: {CertificatePath}");
+            }
+
+            return File.ReadAllBytes(CertificatePath);
+        }
+
+        /// <summary>
+        /// Read IPv4
+        /// </summary>
+        /// <returns></returns>
+        public bool TryReadIPv4(out IPAddress address)
+        {
+            if (IPv4 == "*")
+            {
+                address = IPAddress.Any;
+                return true;
+            }
+
+            if (IPv4 == "localhost")
+            {
+                address = IPAddress.Loopback;
+                return true;
+            }
+
+            if (IPv4 == "disable")
+            {
+                address = IPAddress.None;
+                return true;
+            }
+
+            if (IPAddress.TryParse(IPv4, out var ip))
+            {
+                address = ip;
+                return true;
+            }
+
+            throw new System.Exception($"Could not parse IPv4 address: {IPv4}");
+        }
+
+        /// <summary>
+        /// Read IPv6
+        /// </summary>
+        /// <returns></returns>
+        public bool TryReadIPv6(out IPAddress address)
+        {
+            if (IPv6 == "*")
+            {
+                address = IPAddress.IPv6Any;
+                return true;
+            }
+
+            if (IPv6 == "localhost")
+            {
+                address = IPAddress.IPv6Loopback;
+                return true;
+            }
+
+            if (IPv6 == "disable")
+            {
+                address = IPAddress.None;
+                return true;
+            }
+
+            if (IPAddress.TryParse(IPv6, out var ip))
+            {
+                address = ip;
+                return true;
+            }
+
+            throw new System.Exception($"Could not parse IPv6 address: {IPv6}");
+        }
+    }
+}
@@ -0,0 +1,18 @@
+
+using System.Collections.Generic;
+
+namespace MQTTnet.Server.Configuration
+{
+    public class WebSocketEndPointModel
+    {
+        public bool Enabled { get; set; } = true;
+
+        public string Path { get; set; } = "/mqtt";
+
+        public int ReceiveBufferSize { get; set; } = 4096;
+
+        public int KeepAliveInterval { get; set; } = 120;
+
+        public List<string> AllowedOrigins { get; set; }
+    }
+}
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using System.Web;
+using Microsoft.AspNetCore.Mvc;
+using MQTTnet.Server.Mqtt;
+using MQTTnet.Server.Status;
+
+namespace MQTTnet.Server.Controllers
+{
+    [ApiController]
+    public class ClientsController : ControllerBase
+    {
+        private readonly MqttServerService _mqttServerService;
+
+        public ClientsController(MqttServerService mqttServerService)
+        {
+            _mqttServerService = mqttServerService ?? throw new ArgumentNullException(nameof(mqttServerService));
+        }
+
+        [Route("api/v1/clients")]
+        [HttpGet]
+        public async Task<ActionResult<IList<IMqttClientStatus>>> GetClients()
+        {
+            return new ObjectResult(await _mqttServerService.GetClientStatusAsync());
+        }
+
+        [Route("api/v1/clients/{clientId}")]
+        [HttpGet]
+        public async Task<ActionResult<IMqttClientStatus>> GetClient(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);
+            }
+
+            return new ObjectResult(client);
+        }
+
+        [Route("api/v1/clients/{clientId}")]
+        [HttpDelete]
+        public async Task<ActionResult> DeleteClient(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);
+            }
+
+            await client.DisconnectAsync();
+            return StatusCode((int)HttpStatusCode.NoContent);
+        }
+    }
+}
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using System.Web;
+using Microsoft.AspNetCore.Mvc;
+using MQTTnet.Server.Mqtt;
+
+namespace MQTTnet.Server.Controllers
+{
+    [ApiController]
+    public class RetainedApplicationMessagesController : ControllerBase
+    {
+        private readonly MqttServerService _mqttServerService;
+
+        public RetainedApplicationMessagesController(MqttServerService mqttServerService)
+        {
+            _mqttServerService = mqttServerService ?? throw new ArgumentNullException(nameof(mqttServerService));
+        }
+
+        [Route("api/v1/retainedApplicationMessages")]
+        [HttpGet]
+        public async Task<ActionResult<IList<MqttApplicationMessage>>> GetRetainedApplicationMessages()
+        {
+            return new ObjectResult(await _mqttServerService.GetRetainedApplicationMessagesAsync());
+        }
+
+        [Route("api/v1/retainedApplicationMessages/{topic}")]
+        [HttpGet]
+        public async Task<ActionResult<MqttApplicationMessage>> GetRetainedApplicationMessage(string topic)
+        {
+            topic = HttpUtility.UrlDecode(topic);
+
+            var applicationMessage = (await _mqttServerService.GetRetainedApplicationMessagesAsync()).FirstOrDefault(c => c.Topic == topic);
+            if (applicationMessage == null)
+            {
+                return new StatusCodeResult((int)HttpStatusCode.NotFound);
+            }
+
+            return new ObjectResult(applicationMessage);
+        }
+
+        [Route("api/v1/retainedApplicationMessages")]
+        [HttpDelete]
+        public async Task<ActionResult> DeleteRetainedApplicationMessages()
+        {
+            await _mqttServerService.ClearRetainedApplicationMessagesAsync();
+            return StatusCode((int)HttpStatusCode.NoContent);
+        }
+
+        [Route("api/v1/retainedApplicationMessages/{topic}")]
+        [HttpDelete]
+        public async Task<ActionResult> DeleteRetainedApplicationMessage(string topic)
+        {
+            topic = HttpUtility.UrlDecode(topic);
+
+            await _mqttServerService.PublishAsync(new MqttApplicationMessageBuilder().WithTopic(topic).WithRetainFlag().Build());
+            return StatusCode((int)HttpStatusCode.NoContent);
+        }
+    }
+}
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MQTTnet.Server.Controllers
+{
+    public class ScriptsController
+    {
+    }
+}
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using System.Web;
+using Microsoft.AspNetCore.Mvc;
+using MQTTnet.Server.Mqtt;
+using MQTTnet.Server.Status;
+
+namespace MQTTnet.Server.Controllers
+{
+    [ApiController]
+    public class SessionsController : ControllerBase
+    {
+        private readonly MqttServerService _mqttServerService;
+
+        public SessionsController(MqttServerService mqttServerService)
+        {
+            _mqttServerService = mqttServerService ?? throw new ArgumentNullException(nameof(mqttServerService));
+        }
+
+        [Route("api/v1/sessions")]
+        [HttpGet]
+        public async Task<ActionResult<IList<IMqttSessionStatus>>> GetSessions()
+        {
+            return new ObjectResult(await _mqttServerService.GetSessionStatusAsync());
+        }
+
+        [Route("api/v1/sessions/{clientId}")]
+        [HttpGet]
+        public async Task<ActionResult<IMqttClientStatus>> GetSession(string clientId)
+        {
+            clientId = HttpUtility.UrlDecode(clientId);
+
+            var session = (await _mqttServerService.GetSessionStatusAsync()).FirstOrDefault(c => c.ClientId == clientId);
+            if (session == null)
+            {
+                return new StatusCodeResult((int)HttpStatusCode.NotFound);
+            }
+
+            return new ObjectResult(session);
+        }
+
+        [Route("api/v1/sessions/{clientId}")]
+        [HttpDelete]
+        public async Task<ActionResult> DeleteSession(string clientId)
+        {
+            clientId = HttpUtility.UrlDecode(clientId);
+
+            var session = (await _mqttServerService.GetSessionStatusAsync()).FirstOrDefault(c => c.ClientId == clientId);
+            if (session == null)
+            {
+                return new StatusCodeResult((int)HttpStatusCode.NotFound);
+            }
+
+            await session.DeleteAsync();
+            return StatusCode((int)HttpStatusCode.NoContent);
+        }
+
+        [Route("api/v1/sessions/{clientId}/pendingApplicationMessages")]
+        [HttpDelete]
+        public async Task<ActionResult> DeletePendingApplicationMessages(string clientId)
+        {
+            clientId = HttpUtility.UrlDecode(clientId);
+
+            var session = (await _mqttServerService.GetSessionStatusAsync()).FirstOrDefault(c => c.ClientId == clientId);
+            if (session == null)
+            {
+                return new StatusCodeResult((int)HttpStatusCode.NotFound);
+            }
+
+            await session.ClearPendingApplicationMessagesAsync();
+            return StatusCode((int)HttpStatusCode.NoContent);
+        }
+    }
+}
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Christian Kratky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+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.
@@ -0,0 +1,43 @@
+using System;
+using MQTTnet.Diagnostics;
+
+namespace MQTTnet.Server.Logging
+{
+    public class MqttNetChildLoggerWrapper : IMqttNetChildLogger
+    {
+        private readonly MqttNetLoggerWrapper _logger;
+        private readonly string _source;
+
+        public MqttNetChildLoggerWrapper(string source, MqttNetLoggerWrapper logger)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+
+            _source = source;
+        }
+
+        public IMqttNetChildLogger CreateChildLogger(string source = null)
+        {
+            return _logger.CreateChildLogger(source);
+        }
+
+        public void Verbose(string message, params object[] parameters)
+        {
+            _logger.Publish(MqttNetLogLevel.Verbose, _source, message, parameters, null);
+        }
+
+        public void Info(string message, params object[] parameters)
+        {
+            _logger.Publish(MqttNetLogLevel.Info, _source, message, parameters, null);
+        }
+
+        public void Warning(Exception exception, string message, params object[] parameters)
+        {
+            _logger.Publish(MqttNetLogLevel.Warning, _source, message, parameters, exception);
+        }
+
+        public void Error(Exception exception, string message, params object[] parameters)
+        {
+            _logger.Publish(MqttNetLogLevel.Error, _source, message, parameters, exception);
+        }
+    }
+}
@@ -0,0 +1,50 @@
+using System;
+using System.Threading;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Diagnostics;
+
+namespace MQTTnet.Server.Logging
+{
+    public class MqttNetLoggerWrapper : IMqttNetLogger
+    {
+        private readonly ILogger<MqttServer> _logger;
+
+        public MqttNetLoggerWrapper(ILogger<MqttServer> logger)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public event EventHandler<MqttNetLogMessagePublishedEventArgs> LogMessagePublished;
+
+        public IMqttNetChildLogger CreateChildLogger(string source = null)
+        {
+            return new MqttNetChildLoggerWrapper(source, this);
+        }
+
+        public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
+        {
+            var convertedLogLevel = ConvertLogLevel(logLevel);
+            _logger.Log(convertedLogLevel, exception, message, parameters);
+
+            var logMessagePublishedEvent = LogMessagePublished;
+            if (logMessagePublishedEvent != null)
+            {
+                var logMessage = new MqttNetLogMessage(null, DateTime.UtcNow, Thread.CurrentThread.ManagedThreadId, source, logLevel, message, exception);
+                logMessagePublishedEvent.Invoke(this, new MqttNetLogMessagePublishedEventArgs(logMessage));
+            }
+        }
+        
+        private static LogLevel ConvertLogLevel(MqttNetLogLevel logLevel)
+        {
+            switch (logLevel)
+            {
+                case MqttNetLogLevel.Error: return LogLevel.Error;
+                case MqttNetLogLevel.Warning: return LogLevel.Warning;
+                case MqttNetLogLevel.Info: return LogLevel.Information;
+                case MqttNetLogLevel.Verbose: return LogLevel.Debug;
+            }
+
+            return LogLevel.Debug;
+        }
+    }
+}
@@ -0,0 +1,74 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <AssemblyName>MQTTnet.Server</AssemblyName>
+    <RootNamespace>MQTTnet.Server</RootNamespace>
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <Company />
+    <Product>MQTTnet</Product>
+    <Description />
+    <Authors />
+    <PackageId />
+    <SignAssembly>false</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <LangVersion>latest</LangVersion>
+    <TypeScriptToolsVersion>3.3</TypeScriptToolsVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <StartupObject></StartupObject>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile></DocumentationFile>
+    <WarningsAsErrors>NU1605</WarningsAsErrors>
+    <NoWarn>1701;1702</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="IronPython" Version="2.7.9" />
+    <PackageReference Include="IronPython.StdLib" Version="2.7.9" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.0.0-rc2" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0-rc2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
+    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="LICENSE">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="run.sh">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="run.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Scripts\readme.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Scripts\00_sample.py">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Adapter;
+using MQTTnet.Diagnostics;
+using MQTTnet.Server.Configuration;
+using MQTTnet.Server.Logging;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class CustomMqttFactory
+    {
+        private readonly MqttFactory _mqttFactory;
+
+        public CustomMqttFactory(SettingsModel settings, ILogger<MqttServer> logger)
+        {
+            if (settings == null) throw new ArgumentNullException(nameof(settings));
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
+            
+            // It is important to avoid injecting the logger wrapper to ensure that no
+            // unused log messages are generated by the MQTTnet library. Debug logging
+            // has a huge performance impact.
+            if (settings.EnableDebugLogging)
+            {
+                var mqttNetLogger = new MqttNetLoggerWrapper(logger);
+                _mqttFactory = new MqttFactory(mqttNetLogger);
+
+                logger.LogWarning("Debug logging is enabled. Performance of MQTTnet Server is decreased!");
+            }
+            else
+            {
+                _mqttFactory = new MqttFactory();
+            }
+
+            Logger = _mqttFactory.DefaultLogger;
+
+        }
+        
+        public IMqttNetLogger Logger { get; }
+
+        public IMqttServer CreateMqttServer(List<IMqttServerAdapter> adapters)
+        {
+            if (adapters == null) throw new ArgumentNullException(nameof(adapters));
+
+            return _mqttFactory.CreateMqttServer(adapters);
+        }
+    }
+}
@@ -0,0 +1,50 @@
+using System;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Protocol;
+using MQTTnet.Server.Scripting;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttApplicationMessageInterceptor : IMqttServerApplicationMessageInterceptor
+    {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger _logger;
+
+        public MqttApplicationMessageInterceptor(PythonScriptHostService pythonScriptHostService, ILogger<MqttApplicationMessageInterceptor> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public Task InterceptApplicationMessagePublishAsync(MqttApplicationMessageInterceptorContext context)
+        {
+            try
+            {
+                var pythonContext = new PythonDictionary
+                {
+                    { "accept_publish", context.AcceptPublish },
+                    { "close_connection", context.CloseConnection },
+                    { "client_id", context.ClientId },
+                    { "topic", context.ApplicationMessage.Topic },
+                    { "qos", (int)context.ApplicationMessage.QualityOfServiceLevel },
+                    { "retain", context.ApplicationMessage.Retain }
+                };
+                
+                _pythonScriptHostService.InvokeOptionalFunction("on_intercept_application_message", pythonContext);
+
+                context.AcceptPublish = (bool)pythonContext.get("accept_publish", context.AcceptPublish);
+                context.CloseConnection = (bool)pythonContext.get("close_connection", context.CloseConnection);
+                context.ApplicationMessage.Topic = (string)pythonContext.get("topic", context.ApplicationMessage.Topic);
+                context.ApplicationMessage.QualityOfServiceLevel = (MqttQualityOfServiceLevel)(int)pythonContext.get("qos", (int)context.ApplicationMessage.QualityOfServiceLevel);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while intercepting application message.");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
@@ -0,0 +1,39 @@
+using System;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Server.Scripting;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttClientConnectedHandler : IMqttServerClientConnectedHandler
+    {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger _logger;
+
+        public MqttClientConnectedHandler(PythonScriptHostService pythonScriptHostService, ILogger<MqttClientConnectedHandler> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public Task HandleClientConnectedAsync(MqttServerClientConnectedEventArgs eventArgs)
+        {
+            try
+            {
+                var pythonEventArgs = new PythonDictionary
+                {
+                    { "client_id", eventArgs.ClientId }
+                };
+
+                _pythonScriptHostService.InvokeOptionalFunction("on_client_connected", pythonEventArgs);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while handling client connected event.");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Server.Scripting;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttClientDisconnectedHandler : IMqttServerClientDisconnectedHandler
+    {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger _logger;
+
+        public MqttClientDisconnectedHandler(PythonScriptHostService pythonScriptHostService, ILogger<MqttClientDisconnectedHandler> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public Task HandleClientDisconnectedAsync(MqttServerClientDisconnectedEventArgs eventArgs)
+        {
+            try
+            {
+                var pythonEventArgs = new PythonDictionary
+                {
+                    { "client_id", eventArgs.ClientId },
+                    { "type", PythonConvert.Pythonfy(eventArgs.DisconnectType) }
+                };
+
+                _pythonScriptHostService.InvokeOptionalFunction("on_client_disconnected", pythonEventArgs);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while handling client disconnected event.");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
@@ -0,0 +1,41 @@
+using System;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Server.Scripting;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttClientSubscribedTopicHandler : IMqttServerClientSubscribedTopicHandler
+    {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger _logger;
+
+        public MqttClientSubscribedTopicHandler(PythonScriptHostService pythonScriptHostService, ILogger<MqttClientSubscribedTopicHandler> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public Task HandleClientSubscribedTopicAsync(MqttServerClientSubscribedTopicEventArgs eventArgs)
+        {
+            try
+            {
+                var pythonEventArgs = new PythonDictionary
+                {
+                    { "client_id", eventArgs.ClientId },
+                    { "topic", eventArgs.TopicFilter.Topic },
+                    { "qos", (int)eventArgs.TopicFilter.QualityOfServiceLevel }
+                };
+
+                _pythonScriptHostService.InvokeOptionalFunction("on_client_subscribed_topic", pythonEventArgs);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while handling client subscribed topic event.");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Server.Scripting;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttClientUnsubscribedTopicHandler : IMqttServerClientUnsubscribedTopicHandler
+    {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger _logger;
+
+        public MqttClientUnsubscribedTopicHandler(PythonScriptHostService pythonScriptHostService, ILogger<MqttClientUnsubscribedTopicHandler> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public Task HandleClientUnsubscribedTopicAsync(MqttServerClientUnsubscribedTopicEventArgs eventArgs)
+        {
+            try
+            {
+                var pythonEventArgs = new PythonDictionary
+                {
+                    { "client_id", eventArgs.ClientId },
+                    { "topic", eventArgs.TopicFilter }
+                };
+
+                _pythonScriptHostService.InvokeOptionalFunction("on_client_unsubscribed_topic", pythonEventArgs);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while handling client unsubscribed topic event.");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
@@ -0,0 +1,47 @@
+using System;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Protocol;
+using MQTTnet.Server.Scripting;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttConnectionValidator : IMqttServerConnectionValidator
+    {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger _logger;
+
+        public MqttConnectionValidator(PythonScriptHostService pythonScriptHostService, ILogger<MqttConnectionValidator> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public Task ValidateConnectionAsync(MqttConnectionValidatorContext context)
+        {
+            try
+            {
+                var pythonContext = new PythonDictionary
+                {
+                    { "client_id", context.ClientId },
+                    { "endpoint", context.Endpoint },
+                    { "is_secure_connection", context.IsSecureConnection },
+                    { "username", context.Username },
+                    { "password", context.Password },
+                    { "result", PythonConvert.Pythonfy(context.ReturnCode) }
+                };
+
+                _pythonScriptHostService.InvokeOptionalFunction("on_validate_client_connection", pythonContext);
+
+                context.ReturnCode = PythonConvert.ParseEnum<MqttConnectReturnCode>((string)pythonContext["result"]);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while validating client connection.");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.WebSockets;
+using System.Security.Authentication;
+using System.Text;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Adapter;
+using MQTTnet.AspNetCore;
+using MQTTnet.Client.Publishing;
+using MQTTnet.Implementations;
+using MQTTnet.Protocol;
+using MQTTnet.Server.Configuration;
+using MQTTnet.Server.Scripting;
+using MQTTnet.Server.Status;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttServerService
+    {
+        private readonly ILogger<MqttServerService> _logger;
+
+        private readonly SettingsModel _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 IMqttServer _mqttServer;
+        private readonly MqttSubscriptionInterceptor _mqttSubscriptionInterceptor;
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly MqttWebSocketServerAdapter _webSocketServerAdapter;
+
+        public MqttServerService(
+            SettingsModel settings,
+            CustomMqttFactory mqttFactory,
+            MqttClientConnectedHandler mqttClientConnectedHandler,
+            MqttClientDisconnectedHandler mqttClientDisconnectedHandler,
+            MqttClientSubscribedTopicHandler mqttClientSubscribedTopicHandler,
+            MqttClientUnsubscribedTopicHandler mqttClientUnsubscribedTopicHandler,
+            MqttConnectionValidator mqttConnectionValidator,
+            MqttSubscriptionInterceptor mqttSubscriptionInterceptor,
+            MqttApplicationMessageInterceptor mqttApplicationMessageInterceptor,
+            MqttServerStorage mqttServerStorage,
+            PythonScriptHostService pythonScriptHostService,            
+            ILogger<MqttServerService> logger)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            _mqttClientConnectedHandler = mqttClientConnectedHandler ?? throw new ArgumentNullException(nameof(mqttClientConnectedHandler));
+            _mqttClientDisconnectedHandler = mqttClientDisconnectedHandler ?? throw new ArgumentNullException(nameof(mqttClientDisconnectedHandler));
+            _mqttClientSubscribedTopicHandler = mqttClientSubscribedTopicHandler ?? throw new ArgumentNullException(nameof(mqttClientSubscribedTopicHandler));
+            _mqttClientUnsubscribedTopicHandler = mqttClientUnsubscribedTopicHandler ?? throw new ArgumentNullException(nameof(mqttClientUnsubscribedTopicHandler));
+            _mqttConnectionValidator = mqttConnectionValidator ?? throw new ArgumentNullException(nameof(mqttConnectionValidator));
+            _mqttSubscriptionInterceptor = mqttSubscriptionInterceptor ?? throw new ArgumentNullException(nameof(mqttSubscriptionInterceptor));
+            _mqttApplicationMessageInterceptor = mqttApplicationMessageInterceptor ?? throw new ArgumentNullException(nameof(mqttApplicationMessageInterceptor));
+            _mqttServerStorage = mqttServerStorage ?? throw new ArgumentNullException(nameof(mqttServerStorage));
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+
+            _webSocketServerAdapter = new MqttWebSocketServerAdapter(mqttFactory.Logger.CreateChildLogger());
+
+            var adapters = new List<IMqttServerAdapter>
+            {
+                new MqttTcpServerAdapter(mqttFactory.Logger.CreateChildLogger()),
+                _webSocketServerAdapter
+            };
+
+            _mqttServer = mqttFactory.CreateMqttServer(adapters);
+        }
+
+        public void Configure()
+        {
+            _pythonScriptHostService.RegisterProxyObject("publish", new Action<PythonDictionary>(Publish));
+
+            _mqttServerStorage.Configure();
+
+            _mqttServer.ClientConnectedHandler = _mqttClientConnectedHandler;
+            _mqttServer.ClientDisconnectedHandler = _mqttClientDisconnectedHandler;
+            _mqttServer.ClientSubscribedTopicHandler = _mqttClientSubscribedTopicHandler;
+            _mqttServer.ClientUnsubscribedTopicHandler = _mqttClientUnsubscribedTopicHandler;
+
+            _mqttServer.StartAsync(CreateMqttServerOptions()).GetAwaiter().GetResult();
+
+            _logger.LogInformation("MQTT server started.");
+        }
+
+        public Task RunWebSocketConnectionAsync(WebSocket webSocket, HttpContext httpContext)
+        {
+            return _webSocketServerAdapter.RunWebSocketConnectionAsync(webSocket, httpContext);
+        }
+
+        public Task<IList<IMqttClientStatus>> GetClientStatusAsync()
+        {
+            return _mqttServer.GetClientStatusAsync();
+        }
+
+        public Task<IList<IMqttSessionStatus>> GetSessionStatusAsync()
+        {
+            return _mqttServer.GetSessionStatusAsync();
+        }
+
+        public Task ClearRetainedApplicationMessagesAsync()
+        {
+            return _mqttServer.ClearRetainedApplicationMessagesAsync();
+        }
+
+        public Task<IList<MqttApplicationMessage>> GetRetainedApplicationMessagesAsync()
+        {
+            return _mqttServer.GetRetainedApplicationMessagesAsync();
+        }
+
+        public Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage)
+        {
+            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
+
+            return _mqttServer.PublishAsync(applicationMessage);
+        }
+
+        private void Publish(PythonDictionary parameters)
+        {
+            try
+            {
+                var applicationMessageBuilder = new MqttApplicationMessageBuilder()
+                    .WithTopic((string)parameters.get("topic", null))
+                    .WithRetainFlag((bool)parameters.get("retain", false))
+                    .WithQualityOfServiceLevel((MqttQualityOfServiceLevel)(int)parameters.get("qos", 0));
+
+                var payload = parameters.get("payload", null);
+                byte[] binaryPayload;
+
+                if (payload == null)
+                {
+                    binaryPayload = new byte[0];
+                }
+                else if (payload is string stringPayload)
+                {
+                    binaryPayload = Encoding.UTF8.GetBytes(stringPayload);
+                }
+                else if (payload is ByteArray byteArray)
+                {
+                    binaryPayload = byteArray.ToArray();
+                }
+                else if (payload is IEnumerable<int> intArray)
+                {
+                    binaryPayload = intArray.Select(Convert.ToByte).ToArray();
+                }
+                else
+                {
+                    throw new NotSupportedException("Payload type not supported.");
+                }
+
+                applicationMessageBuilder = applicationMessageBuilder
+                    .WithPayload(binaryPayload);
+
+                var applicationMessage = applicationMessageBuilder.Build();
+
+                _mqttServer.PublishAsync(applicationMessage).GetAwaiter().GetResult();
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while publishing application message from server.");
+            }
+        }
+
+        private IMqttServerOptions CreateMqttServerOptions()
+        {
+            var options = new MqttServerOptionsBuilder()
+                .WithMaxPendingMessagesPerClient(_settings.MaxPendingMessagesPerClient)
+                .WithDefaultCommunicationTimeout(TimeSpan.FromSeconds(_settings.CommunicationTimeout))
+                .WithConnectionValidator(_mqttConnectionValidator)
+                .WithApplicationMessageInterceptor(_mqttApplicationMessageInterceptor)
+                .WithSubscriptionInterceptor(_mqttSubscriptionInterceptor)
+                .WithStorage(_mqttServerStorage);
+            
+            // Configure unencrypted connections
+            if (_settings.TcpEndPoint.Enabled)
+            {
+                options.WithDefaultEndpoint();
+
+                if (_settings.TcpEndPoint.TryReadIPv4(out var address4))
+                {
+                    options.WithDefaultEndpointBoundIPAddress(address4);
+                }
+
+                if (_settings.TcpEndPoint.TryReadIPv6(out var address6))
+                {
+                    options.WithDefaultEndpointBoundIPV6Address(address6);
+                }
+
+                if (_settings.TcpEndPoint.Port > 0)
+                {
+                    options.WithDefaultEndpointPort(_settings.TcpEndPoint.Port);
+                }
+            }
+            else
+            {
+                options.WithoutDefaultEndpoint();
+            }
+
+            // Configure encrypted connections
+            if (_settings.EncryptedTcpEndPoint.Enabled)
+            {
+                options
+                    .WithEncryptedEndpoint()
+                    .WithEncryptionSslProtocol(SslProtocols.Tls12)
+                    .WithEncryptionCertificate(_settings.EncryptedTcpEndPoint.ReadCertificate());
+
+                if (_settings.EncryptedTcpEndPoint.TryReadIPv4(out var address4))
+                {
+                    options.WithEncryptedEndpointBoundIPAddress(address4);
+                }
+
+                if (_settings.EncryptedTcpEndPoint.TryReadIPv6(out var address6))
+                {
+                    options.WithEncryptedEndpointBoundIPV6Address(address6);
+                }
+
+                if (_settings.EncryptedTcpEndPoint.Port > 0)
+                {
+                    options.WithEncryptedEndpointPort(_settings.EncryptedTcpEndPoint.Port);
+                }
+            }
+            else
+            {
+                options.WithoutEncryptedEndpoint();
+            }
+
+            if (_settings.ConnectionBacklog > 0)
+            {
+                options.WithConnectionBacklog(_settings.ConnectionBacklog);
+            }
+
+            if (_settings.EnablePersistentSessions)
+            {
+                options.WithPersistentSessions();
+            }
+
+            return options.Build();
+        }
+    }
+}
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Server.Configuration;
+using Newtonsoft.Json;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttServerStorage : IMqttServerStorage
+    {
+        private readonly List<MqttApplicationMessage> _messages = new List<MqttApplicationMessage>();
+
+        private readonly SettingsModel _settings;
+        private readonly ILogger<MqttServerStorage> _logger;
+
+        private string _filename;
+        private bool _messagesHaveChanged;
+
+        public MqttServerStorage(SettingsModel settings, ILogger<MqttServerStorage> logger)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public void Configure()
+        {
+            if (_settings.RetainedApplicationMessages?.Persist != true)
+            {
+                _logger.LogInformation("Persisting of retained application messages is disabled.");
+                return;
+            }
+
+            _filename = ExpandFilename();
+
+            // The retained application messages are stored in a separate thread.
+            // This is mandatory because writing them to a slow storage (like RaspberryPi SD card) 
+            // will slow down the whole message processing speed.
+            Task.Run(SaveRetainedMessagesInternalAsync, CancellationToken.None);
+        }
+
+        public Task SaveRetainedMessagesAsync(IList<MqttApplicationMessage> messages)
+        {
+            lock (_messages)
+            {
+                _messages.Clear();
+                _messages.AddRange(messages);
+
+                _messagesHaveChanged = true;
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private async Task SaveRetainedMessagesInternalAsync()
+        {
+            while (true)
+            {
+                try
+                {
+                    await Task.Delay(TimeSpan.FromSeconds(_settings.RetainedApplicationMessages.WriteInterval)).ConfigureAwait(false);
+
+                    List<MqttApplicationMessage> messages;
+                    lock (_messages)
+                    {
+                        if (!_messagesHaveChanged)
+                        {
+                            continue;
+                        }
+
+                        messages = new List<MqttApplicationMessage>(_messages);
+                        _messagesHaveChanged = false;
+                    }
+
+                    var json = JsonConvert.SerializeObject(messages);
+                    await File.WriteAllTextAsync(_filename, json, Encoding.UTF8).ConfigureAwait(false);
+                    
+                    _logger.LogInformation($"{messages.Count} retained MQTT messages written.");
+                }
+                catch (Exception exception)
+                {
+                    _logger.LogError(exception, "Error while writing retained MQTT messages.");
+                }
+            }
+        }
+
+        public async Task<IList<MqttApplicationMessage>> LoadRetainedMessagesAsync()
+        {
+            if (_settings.RetainedApplicationMessages?.Persist != true)
+            {
+                return null;
+            }
+
+            if (!File.Exists(_filename))
+            {
+                return null;
+            }
+
+            try
+            {
+                var json = await File.ReadAllTextAsync(_filename).ConfigureAwait(false);
+                var applicationMessages = JsonConvert.DeserializeObject<List<MqttApplicationMessage>>(json);
+
+                _logger.LogInformation($"{applicationMessages.Count} retained MQTT messages loaded.");
+
+                return applicationMessages;
+            }
+            catch (Exception exception)
+            {
+                _logger.LogWarning(exception, "Error while loading persisted retained application messages.");
+                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;
+        }
+    }
+}
@@ -0,0 +1,47 @@
+using System;
+using System.Threading.Tasks;
+using IronPython.Runtime;
+using Microsoft.Extensions.Logging;
+using MQTTnet.Server.Scripting;
+
+namespace MQTTnet.Server.Mqtt
+{
+    public class MqttSubscriptionInterceptor : IMqttServerSubscriptionInterceptor
+    {
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger _logger;
+
+        public MqttSubscriptionInterceptor(PythonScriptHostService pythonScriptHostService, ILogger<MqttSubscriptionInterceptor> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public Task InterceptSubscriptionAsync(MqttSubscriptionInterceptorContext context)
+        {
+            try
+            {
+                var pythonContext = new PythonDictionary
+                {
+                    { "accept_subscription", context.AcceptSubscription },
+                    { "close_connection", context.CloseConnection },
+
+                    { "client_id", context.ClientId },
+                    { "topic", context.TopicFilter.Topic },
+                    { "qos", (int)context.TopicFilter.QualityOfServiceLevel }
+                };
+
+                _pythonScriptHostService.InvokeOptionalFunction("on_intercept_subscription", pythonContext);
+
+                context.AcceptSubscription = (bool)pythonContext["accept_subscription"];
+                context.CloseConnection = (bool)pythonContext["close_connection"];
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "Error while intercepting subscription.");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
@@ -0,0 +1,71 @@
+using System;
+using System.Reflection;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+
+namespace MQTTnet.Server
+{
+    public static class Program
+    {
+        public static int Main(string[] args)
+        {
+            try
+            {
+                PrintLogo();
+
+                WebHost.CreateDefaultBuilder(args).UseStartup<Startup>().Build().Run();
+
+                return 0;
+            }
+            catch (Exception exception)
+            {
+                Console.WriteLine(exception);
+                return -1;
+            }
+        }
+
+        private static void PrintLogo()
+        {
+            Console.ResetColor();
+            Console.ForegroundColor = ConsoleColor.White;
+            Console.BackgroundColor = ConsoleColor.Red;
+            const string LogoText =
+@"|                                                                                      |
+|      __  __  ____ _______ _______         _      _____                               |
+|     |  \/  |/ __ \__   __|__   __|       | |    / ____|                              |
+|     | \  / | |  | | | |     | |_ __   ___| |_  | (___   ___ _ ____   _____ _ __      |
+|     | |\/| | |  | | | |     | | '_ \ / _ \ __|  \___ \ / _ \ '__\ \ / / _ \ '__|     |
+|     | |  | | |__| | | |     | | | | |  __/ |_   ____) |  __/ |   \ V /  __/ |        |
+|     |_|  |_|\___\_\ |_|     |_|_| |_|\___|\__| |_____/ \___|_|    \_/ \___|_|        |
+|                                                                                      |
+|                                                                                      |";
+
+            Console.WriteLine(LogoText);
+            Console.ResetColor();
+            Console.WriteLine();
+            Console.ForegroundColor = ConsoleColor.White;
+            Console.WriteLine(@"
+          -- The official MQTT server implementation of MQTTnet --
+                 Copyright (c) 2017-2019 The MQTTnet Team");
+
+            Console.ForegroundColor = ConsoleColor.Blue;
+            Console.WriteLine(@"
+                   https://github.com/chkr1011/MQTTnet");
+
+            Console.ForegroundColor = ConsoleColor.White;
+            Console.WriteLine($@"
+ Version:    {Assembly.GetExecutingAssembly().GetName().Version}
+ License:    MIT (read LICENSE file)
+ Sponsoring: https://opencollective.com/mqttnet
+ Support:    https://github.com/chkr1011/MQTTnet/issues
+ 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();
+        }
+    }
+}
@@ -0,0 +1 @@
+[{"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}]
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+
+namespace MQTTnet.Server.Scripting.DataSharing
+{
+    public class DataSharingService
+    {
+        private readonly Dictionary<string, object> _storage = new Dictionary<string, object>();
+        private readonly PythonScriptHostService _pythonScriptHostService;
+        private readonly ILogger<DataSharingService> _logger;
+
+        public DataSharingService(PythonScriptHostService pythonScriptHostService, ILogger<DataSharingService> logger)
+        {
+            _pythonScriptHostService = pythonScriptHostService ?? throw new ArgumentNullException(nameof(pythonScriptHostService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public void Configure()
+        {
+            _pythonScriptHostService.RegisterProxyObject("write_shared_data", new Action<string, object>(Write));
+            _pythonScriptHostService.RegisterProxyObject("read_shared_data", new Func<string, object, object>(Read));
+        }
+
+        public void Write(string key, object value)
+        {
+            lock (_storage)
+            {
+                _storage[key] = value;
+                _logger.LogInformation($"Shared data with key '{key}' updated.");
+            }
+        }
+
+        public object Read(string key, object defaultValue)
+        {
+            lock (_storage)
+            {
+                if (!_storage.TryGetValue(key, out var value))
+                {
+                    return defaultValue;
+                }
+
+                return value;
+            }
+        }
+    }
+}
@@ -0,0 +1,88 @@
+using System;
+using System.Collections;
+using System.Text;
+using IronPython.Runtime;
+
+namespace MQTTnet.Server.Scripting
+{
+    public static class PythonConvert
+    {
+        public static object ToPython(object value)
+        {
+            if (value is PythonDictionary)
+            {
+                return value;
+            }
+
+            if (value is string)
+            {
+                return value;
+            }
+
+            if (value is int)
+            {
+                return value;
+            }
+
+            if (value is float)
+            {
+                return value;
+            }
+
+            if (value is bool)
+            {
+                return value;
+            }
+
+            if (value is IDictionary dictionary)
+            {
+                var pythonDictionary = new PythonDictionary();
+                foreach (DictionaryEntry dictionaryEntry in dictionary)
+                {
+                    pythonDictionary.Add(dictionaryEntry.Key, ToPython(dictionaryEntry.Value));
+                }
+
+                return pythonDictionary;
+            }
+
+            if (value is IEnumerable enumerable)
+            {
+                var pythonList = new List();
+                foreach (var item in enumerable)
+                {
+                    pythonList.Add(ToPython(item));
+                }
+
+                return pythonList;
+            }
+
+            return value;
+        }
+
+        public static string Pythonfy(Enum value)
+        {
+            return Pythonfy(value.ToString());
+        }
+
+        public static string Pythonfy(string value)
+        {
+            var result = new StringBuilder();
+            foreach (var @char in value)
+            {
+                if (char.IsUpper(@char) && result.Length > 0)
+                {
+                    result.Append('_');
+                }
+
+                result.Append(char.ToLowerInvariant(@char));
+            }
+
+            return result.ToString();
+        }
+
+        public static TEnum ParseEnum<TEnum>(string value) where TEnum : Enum
+        {
+            return (TEnum)Enum.Parse(typeof(TEnum), value.Replace("_", string.Empty), true);
+        }
+    }
+}
@@ -0,0 +1,66 @@
+using System;
+using System.IO;
+using System.Text;
+using Microsoft.Extensions.Logging;
+
+namespace MQTTnet.Server.Scripting
+{
+    public class PythonIOStream : Stream
+    {
+        private readonly ILogger _logger;
+        private readonly Encoding _encoder = Encoding.UTF8;
+
+        public PythonIOStream(ILogger<PythonIOStream> logger)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public override void Flush()
+        {
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            if (buffer == null) throw new ArgumentNullException(nameof(buffer));
+
+            if (count == 0)
+            {
+                return;
+            }
+
+            var text = _encoder.GetString(buffer, offset, count);
+            if (text.Equals(Environment.NewLine))
+            {
+                return;
+            }
+
+            _logger.LogDebug(text);
+        }
+
+        public override bool CanRead { get; } = false;
+        public override bool CanSeek { get; } = false;
+        public override bool CanWrite { get; } = true;
+        public override long Length { get; } = 0L;
+
+        public override long Position
+        {
+            get => throw new NotSupportedException();
+            set => throw new NotSupportedException();
+        }
+    }
+}
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.Extensions.Logging;
+using Microsoft.Scripting;
+using Microsoft.Scripting.Hosting;
+
+namespace MQTTnet.Server.Scripting
+{
+    public class PythonScriptHostService
+    {
+        private readonly IDictionary<string, object> _proxyObjects = new ExpandoObject();
+        private readonly List<PythonScriptInstance> _scriptInstances = new List<PythonScriptInstance>();
+        private readonly ILogger<PythonScriptHostService> _logger;
+        private readonly ScriptEngine _scriptEngine;
+        
+        public PythonScriptHostService(PythonIOStream pythonIOStream, ILogger<PythonScriptHostService> logger)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+
+            _scriptEngine = IronPython.Hosting.Python.CreateEngine();
+            _scriptEngine.Runtime.IO.SetOutput(pythonIOStream, Encoding.UTF8);
+        }
+
+        public void Configure()
+        {
+            AddSearchPaths(_scriptEngine);
+
+            var scriptsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Scripts");
+            foreach (var filename in Directory.GetFiles(scriptsDirectory, "*.py", SearchOption.AllDirectories).OrderBy(file => file))
+            {
+                TryInitializeScript(filename);
+            }
+        }
+
+        public void RegisterProxyObject(string name, object @object)
+        {
+            if (name == null) throw new ArgumentNullException(nameof(name));
+            if (@object == null) throw new ArgumentNullException(nameof(@object));
+
+            _proxyObjects.Add(name, @object);
+        }
+
+        public void InvokeOptionalFunction(string name, object parameters)
+        {
+            if (name == null) throw new ArgumentNullException(nameof(name));
+
+            lock (_scriptInstances)
+            {
+                foreach (var pythonScriptInstance in _scriptInstances)
+                {
+                    try
+                    {
+                        pythonScriptInstance.InvokeOptionalFunction(name, parameters);
+                    }
+                    catch (Exception exception)
+                    {
+                        _logger.LogError(exception, $"Error while invoking function '{name}' at script '{pythonScriptInstance.Name}'.");
+                    }
+                }
+            }
+        }
+
+        private void TryInitializeScript(string filename)
+        {
+            try
+            {
+                var scriptName = new FileInfo(filename).Name;
+
+                _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)
+        {
+            var scriptScope = _scriptEngine.CreateScope();
+
+            var source = scriptScope.Engine.CreateScriptSourceFromString(code, SourceCodeKind.File);
+            var compiledCode = source.Compile();
+
+            scriptScope.SetVariable("mqtt_net_server", _proxyObjects);
+            compiledCode.Execute(scriptScope);
+            
+            return new PythonScriptInstance(name, scriptScope);
+        }
+
+        private void AddSearchPaths(ScriptEngine scriptEngine)
+        {
+            var paths = new List<string>
+            {
+                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Lib"),
+                "/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)
+            {
+                if (Directory.Exists(path))
+                {
+                    searchPaths.Add(path);
+                    _logger.LogInformation($"Added Python lib path: {path}");
+                }
+            }
+
+            scriptEngine.SetSearchPaths(searchPaths);
+        }
+    }
+}
@@ -0,0 +1,57 @@
+using System;
+using IronPython.Runtime;
+using Microsoft.Scripting.Hosting;
+
+namespace MQTTnet.Server.Scripting
+{
+    public class PythonScriptInstance
+    {
+        private readonly ScriptScope _scriptScope;
+
+        public PythonScriptInstance(string name, ScriptScope scriptScope)
+        {
+            _scriptScope = scriptScope;
+
+            Name = name;
+        }
+
+        public string Name { get; }
+
+        public bool InvokeOptionalFunction(string name, params object[] parameters)
+        {
+            return InvokeOptionalFunction(name, parameters, out _);
+        }
+
+        public bool InvokeOptionalFunction(string name, object[] parameters, out object result)
+        {
+            if (name == null) throw new ArgumentNullException(nameof(name));
+
+            lock (_scriptScope)
+            {
+                if (!_scriptScope.Engine.Operations.TryGetMember(_scriptScope, name, out var member))
+                {
+                    result = null;
+                    return false;
+                }
+
+                if (!(member is PythonFunction function))
+                {
+                    throw new Exception($"Member '{name}' is no Python function.");
+                }
+
+                try
+                {
+                    result = _scriptScope.Engine.Operations.Invoke(function, parameters);
+                    return true;
+                }
+                catch (Exception exception)
+                {
+                    var details = _scriptScope.Engine.GetService<ExceptionOperations>().FormatException(exception);
+                    var message = $"Error while invoking function '{name}'. " + Environment.NewLine + details;
+
+                    throw new Exception(message, exception);
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,107 @@
+import json
+
+
+def initialize():
+    """
+    This function is invoked after the script file has been loaded.
+    It will be executed only one time.
+    """
+
+    print("Hello World 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.
+    """
+    
+    print(context)
+
+    mqtt_net_server.write_shared_data(context["client_id"], {"custom_value_1": 1, "custom_value_2": True})
+
+    return
+
+    if context["client_id"] != "test_client":
+        context["result"] = "connection_refused_not_authorized"
+        return
+
+    if context["username"] != "bud spencer":
+        context["result"] = "connection_refused_not_authorized"
+        return
+
+    if context["password"] != "secret":
+        context["result"] = "connection_refused_not_authorized"
+
+    print(context)
+
+
+def on_intercept_subscription(context):
+    """
+    This function is invoked whenever a client wants to subscribe to a topic.
+    """
+    
+    print("Client '{client_id}' want's to subscribe to topic '{topic}'.".format(client_id=context["client_id"], topic=context["topic"]))
+
+
+def on_intercept_application_message(context):
+    """
+    This function is invoked for every processed application message. It also allows modifying
+    the message or cancel processing at all.
+    """
+
+    client_id = context["client_id"]
+
+    if client_id != None:
+        shared_data = mqtt_net_server.read_shared_data(context["client_id"], {})
+        print(shared_data)
+
+    if context["topic"] == "topic_with_response":
+
+        json_payload = {
+            "hello": "world",
+            "x": 1,
+            "y": True,
+            "z": None
+        }
+
+        application_message = {
+            "retain": False,
+            "topic": "reply",
+            "payload": json.dumps(json_payload)
+            }
+
+        mqtt_net_server.publish(application_message)
+
+    print("Client '{client_id}' published topic '{topic}'.".format(client_id=context["client_id"], topic=context["topic"]))
+
+
+def on_client_connected(event_args):
+    """
+    This function is called whenever a client has passed the validation is connected.
+    """
+
+    print("Client '{client_id}' is now connected.".format(client_id=event_args["client_id"]))
+
+
+def on_client_disconnected(event_args):
+    """
+    This function is called whenever a client has disconnected.
+    """
+
+    print("Client '{client_id}' is now disconnected (type = {type}).".format(client_id=event_args["client_id"], type=event_args["type"]))
+
+
+def on_client_subscribed_topic(event_args):
+    """
+    This function is called whenever a client has subscribed to a topic (when allowed).
+    """
+
+    print("Client '{client_id}' has subscribed to '{topic}'.".format(client_id=event_args["client_id"], topic=event_args["topic"]))
+
+
+def on_client_unsubscribed_topic(event_args):
+    """
+    This function is called whenever a client has unsubscribed from a topic.
+    """
+
+    print("Client '{client_id}' has unsubscribed from '{topic}'.".format(client_id=event_args["client_id"], topic=event_args["topic"]))
@@ -0,0 +1,19 @@
+This directory contains scripts which are loaded by the server and can be used to perform the following tasks.
+
+1. Validation of client connections via credentials, client IDs etc.
+2. Manipulation of every processed message.
+3. Validation of subscription attempts.
+4. 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.
+
+The Python starndard library ships with _MQTTnet Server_. But it is possible to add custom paths with Python libraries.
+
+```
+import sys
+sys.path.append(PATH_TO_LIBRARY)
+```
+
+* All scripts must have the file extension _.py_. 
+* All scripts are sorted alphabetically (A to Z) before being loaded and parsed.
@@ -0,0 +1,183 @@
+using System;
+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.OpenApi.Models;
+using Microsoft.Scripting.Utils;
+using MQTTnet.Server.Configuration;
+using MQTTnet.Server.Logging;
+using MQTTnet.Server.Mqtt;
+using MQTTnet.Server.Scripting;
+using MQTTnet.Server.Scripting.DataSharing;
+using Swashbuckle.AspNetCore.SwaggerUI;
+
+namespace MQTTnet.Server
+{
+    public class Startup
+    {
+        public Startup(IConfiguration configuration)
+        {
+            var builder = new ConfigurationBuilder()
+                .AddJsonFile("appsettings.json")
+                .AddEnvironmentVariables();
+
+            Configuration = builder.Build();
+        }
+
+        public IConfigurationRoot Configuration { get; }
+
+        public void Configure(
+            IApplicationBuilder application,
+            IHostingEnvironment environment,
+            MqttServerService mqttServerService,
+            PythonScriptHostService pythonScriptHostService,
+            DataSharingService dataSharingService,
+            SettingsModel settings)
+        {
+            if (environment.IsDevelopment())
+            {
+                application.UseDeveloperExceptionPage();
+            }
+            else
+            {
+                application.UseHsts();
+            }
+
+            application.UseStaticFiles();
+
+            application.UseHttpsRedirection();
+            application.UseMvc();
+
+            ConfigureWebSocketEndpoint(application, mqttServerService, settings);
+
+            dataSharingService.Configure();
+            pythonScriptHostService.Configure();
+
+            mqttServerService.Configure();
+
+            application.UseSwagger(o => o.RouteTemplate = "/api/{documentName}/swagger.json");
+
+            application.UseSwaggerUI(o =>
+            {
+                o.RoutePrefix = "api";
+                o.DocumentTitle = "MQTTnet.Server API";
+                o.SwaggerEndpoint("/api/v1/swagger.json", "MQTTnet.Server API v1");
+                o.DisplayRequestDuration();
+                o.DocExpansion(DocExpansion.List);
+                o.DefaultModelRendering(ModelRendering.Model);
+            });
+        }
+
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc()
+                .SetCompatibilityVersion(CompatibilityVersion.Version_2_2)
+                .AddJsonOptions(options =>
+                {
+                    options.SerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+                });
+
+            services.AddSingleton(ReadSettings());
+
+            services.AddSingleton<PythonIOStream>();
+            services.AddSingleton<PythonScriptHostService>();
+            services.AddSingleton<DataSharingService>();
+
+            services.AddSingleton<MqttNetLoggerWrapper>();
+            services.AddSingleton<CustomMqttFactory>();
+            services.AddSingleton<MqttServerService>();
+            services.AddSingleton<MqttServerStorage>();
+
+            services.AddSingleton<MqttClientConnectedHandler>();
+            services.AddSingleton<MqttClientDisconnectedHandler>();
+            services.AddSingleton<MqttClientSubscribedTopicHandler>();
+            services.AddSingleton<MqttClientUnsubscribedTopicHandler>();
+            services.AddSingleton<MqttConnectionValidator>();
+            services.AddSingleton<MqttSubscriptionInterceptor>();
+            services.AddSingleton<MqttApplicationMessageInterceptor>();
+            
+            services.AddSwaggerGen(c =>
+            {
+                c.DescribeAllEnumsAsStrings();
+                c.SwaggerDoc("v1", new OpenApiInfo
+                {
+                    Title = "MQTTnet.Server API",
+                    Version = "v1",
+                    Description = "The public API for the MQTT broker MQTTnet.Server.",
+                    License = new OpenApiLicense
+                    {
+                        Name = "MIT",
+                        Url = new Uri("https://github.com/chkr1011/MQTTnet/blob/master/README.md")
+                    },
+                    Contact = new OpenApiContact
+                    {
+                        Name = "MQTTnet.Server",
+                        Email = string.Empty,
+                        Url = new Uri("https://github.com/chkr1011/MQTTnet")
+                    },
+                });
+            });
+        }
+
+        private SettingsModel ReadSettings()
+        {
+            var settings = new Configuration.SettingsModel();
+            Configuration.Bind("MQTT", settings);
+            return settings;
+        }
+
+        private static void ConfigureWebSocketEndpoint(
+            IApplicationBuilder application,
+            MqttServerService mqttServerService,
+            SettingsModel settings)
+        {
+            if (settings?.WebSocketEndPoint?.Enabled != true)
+            {
+                return;
+            }
+
+            if (string.IsNullOrEmpty(settings.WebSocketEndPoint.Path))
+            {
+                return;
+            }
+
+            var webSocketOptions = new WebSocketOptions
+            {
+                KeepAliveInterval = TimeSpan.FromSeconds(settings.WebSocketEndPoint.KeepAliveInterval),
+                ReceiveBufferSize = settings.WebSocketEndPoint.ReceiveBufferSize
+            };
+
+            if (settings.WebSocketEndPoint.AllowedOrigins?.Any() == true)
+            {
+                webSocketOptions.AllowedOrigins.AddRange(settings.WebSocketEndPoint.AllowedOrigins);
+            }
+            
+            application.UseWebSockets(webSocketOptions);
+
+            application.Use(async (context, next) =>
+            {
+                if (context.Request.Path == settings.WebSocketEndPoint.Path)
+                {
+                    if (context.WebSockets.IsWebSocketRequest)
+                    {
+                        using (var webSocket = await context.WebSockets.AcceptWebSocketAsync().ConfigureAwait(false))
+                        {
+                            await mqttServerService.RunWebSocketConnectionAsync(webSocket, context).ConfigureAwait(false);
+                        }
+                    }
+                    else
+                    {
+                        context.Response.StatusCode = 400;
+                    }
+                }
+                else
+                {
+                    await next().ConfigureAwait(false);
+                }
+            });
+        }
+    }
+}
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
@@ -0,0 +1,58 @@
+{
+    "Kestrel": {
+        "EndPoints": {
+            "Http": {
+                "Url": "http://localhost:80"
+            },
+            "Https": {
+                "Url": "http://localhost:443"
+            }
+        }
+    },
+    "MQTT": {
+        /*
+         Wildcard Addresses:
+          *             - All local IP addresses
+          localhost     - Localhost only
+          disable       - Skip address assignment
+        */
+        "TcpEndPoint": {
+            "Enabled": true,
+            "IPv4": "*",
+            "IPv6": "*",
+            "Port": 1883
+        },
+        "EncryptedTcpEndPoint": {
+            "Enabled": false,
+            "IPv4": "*",
+            "IPv6": "*",
+            "Port": 8883,
+            "CertificatePath": "/absolute/path/to/pfx"
+        },
+        "WebSocketEndPoint": {
+            "Enabled": true,
+            "Path": "/mqtt",
+            "KeepAliveInterval": 120, // In seconds.
+            "ReceiveBufferSize": 4096,
+            "AllowedOrigins": [] // List of strings with URLs.
+        },
+        "CommunicationTimeout": 15, // In seconds.
+        "ConnectionBacklog": 0, /* Set 0 to disable */
+        "EnablePersistentSessions": false,
+        "MaxPendingMessagesPerClient": 250,
+        "RetainedApplicationMessages": {
+            "Persist": true,
+            "Filename": "RetainedApplicationMessages.json",
+            "WriteInterval": 10 // In seconds.
+        },
+        "EnableDebugLogging": true
+    },
+    "Logging": {
+        "LogLevel": {
+            "Default": "Debug",
+            "System": "Information",
+            "Microsoft": "Information"
+        }
+    },
+    "AllowedHosts": "*"
+}
@@ -0,0 +1,12 @@
+{
+  "version": "1.0.0",
+  "name": "mqtt.test",
+  "private": true,
+  "devDependencies": {},
+  "dependencies": {
+    "@types/node": "^8.0.46",
+    "mqtt": "^2.15.1",
+    "systemjs": "^0.20.19",
+    "typescript": "^2.3.4"
+  }
+}
@@ -0,0 +1,2 @@
+@echo off
+START "MQTTnet Server" dotnet .\MQTTnet.Server.dll
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "Starting MQTTnet Server.."
+dotnet .\MQTTnet.Server.dll
@@ -10,17 +10,23 @@ namespace MQTTnet.Adapter
    {
        string Endpoint { get; }

-        MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
-        
-        event EventHandler ReadingPacketStarted;
+        bool IsSecureConnection { get; }

-        event EventHandler ReadingPacketCompleted;
+        MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
+
+        long BytesSent { get; }
+
+        long BytesReceived { get; }
+
+        Action ReadingPacketStartedCallback { get; set; }
+
+        Action ReadingPacketCompletedCallback { get; set; }

        Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken);

        Task DisconnectAsync(TimeSpan timeout, CancellationToken cancellationToken);

-        Task SendPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken);
+        Task SendPacketAsync(MqttBasePacket packet, TimeSpan timeout, CancellationToken cancellationToken);

        Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken);
    }
@@ -6,7 +6,7 @@ namespace MQTTnet.Adapter
 {
    public interface IMqttServerAdapter : IDisposable
    {
-        event EventHandler<MqttServerAdapterClientAcceptedEventArgs> ClientAccepted;
+        Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }

        Task StartAsync(IMqttServerOptions options);
        Task StopAsync();
@@ -25,16 +25,19 @@ namespace MQTTnet.Adapter
        private readonly MqttPacketReader _packetReader;

        private readonly byte[] _fixedHeaderBuffer = new byte[2];
-       
+
        private bool _isDisposed;

+        private long _bytesReceived;
+        private long _bytesSent;
+
        public MqttChannelAdapter(IMqttChannel channel, MqttPacketFormatterAdapter packetFormatterAdapter, IMqttNetChildLogger logger)
        {
            if (logger == null) throw new ArgumentNullException(nameof(logger));

            _channel = channel ?? throw new ArgumentNullException(nameof(channel));
            PacketFormatterAdapter = packetFormatterAdapter ?? throw new ArgumentNullException(nameof(packetFormatterAdapter));
-            
+
            _packetReader = new MqttPacketReader(_channel);

            _logger = logger.CreateChildLogger(nameof(MqttChannelAdapter));
@@ -42,22 +45,30 @@ namespace MQTTnet.Adapter

        public string Endpoint => _channel.Endpoint;

+        public bool IsSecureConnection => _channel.IsSecureConnection;
+
        public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }

-        public event EventHandler ReadingPacketStarted;
-        public event EventHandler ReadingPacketCompleted;
+        public long BytesSent => Interlocked.Read(ref _bytesSent);
+        public long BytesReceived => Interlocked.Read(ref _bytesReceived);

+        public Action ReadingPacketStartedCallback { get; set; }
+        public Action ReadingPacketCompletedCallback { get; set; }
+            
        public async Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
        {
            ThrowIfDisposed();

            try
            {
-                _logger.Verbose("Connecting [Timeout={0}]", timeout);
-
-                await Internal.TaskExtensions
-                    .TimeoutAfterAsync(ct => _channel.ConnectAsync(ct), timeout, cancellationToken)
-                    .ConfigureAwait(false);
+                if (timeout == TimeSpan.Zero)
+                {
+                    await _channel.ConnectAsync(cancellationToken).ConfigureAwait(false);
+                }
+                else
+                {
+                    await MqttTaskTimeout.WaitAsync(t => _channel.ConnectAsync(t), timeout, cancellationToken).ConfigureAwait(false);
+                }
            }
            catch (Exception exception)
            {
@@ -76,11 +87,15 @@ namespace MQTTnet.Adapter

            try
            {
-                _logger.Verbose("Disconnecting [Timeout={0}]", timeout);
-
-                await Internal.TaskExtensions
-                    .TimeoutAfterAsync(ct => _channel.DisconnectAsync(), timeout, cancellationToken)
-                    .ConfigureAwait(false);
+                if (timeout == TimeSpan.Zero)
+                {
+                    await _channel.DisconnectAsync(cancellationToken).ConfigureAwait(false);
+                }
+                else
+                {
+                    await MqttTaskTimeout.WaitAsync(
+                        t => _channel.DisconnectAsync(t), timeout, cancellationToken).ConfigureAwait(false);
+                }
            }
            catch (Exception exception)
            {
@@ -92,14 +107,26 @@ namespace MQTTnet.Adapter
                WrapException(exception);
            }
        }
-        
-        public async Task SendPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken)
+
+        public async Task SendPacketAsync(MqttBasePacket packet, TimeSpan timeout, CancellationToken cancellationToken)
        {
            await _writerSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
            try
            {
                var packetData = PacketFormatterAdapter.Encode(packet);
-                await _channel.WriteAsync(packetData.Array, packetData.Offset, packetData.Count, cancellationToken).ConfigureAwait(false);
+
+                if (timeout == TimeSpan.Zero)
+                {
+                    await _channel.WriteAsync(packetData.Array, packetData.Offset, packetData.Count, cancellationToken).ConfigureAwait(false);
+                }
+                else
+                {
+                    await MqttTaskTimeout.WaitAsync(
+                        t => _channel.WriteAsync(packetData.Array, packetData.Offset, packetData.Count, t), timeout, cancellationToken).ConfigureAwait(false);
+                }
+
+                Interlocked.Add(ref _bytesReceived, packetData.Count);
+
                PacketFormatterAdapter.FreeBuffer();

                _logger.Verbose("TX ({0} bytes) >>> {1}", packetData.Count, packet);
@@ -126,14 +153,13 @@ namespace MQTTnet.Adapter
            try
            {
                ReceivedMqttPacket receivedMqttPacket;
-
-                if (timeout > TimeSpan.Zero)
+                if (timeout == TimeSpan.Zero)
                {
-                    receivedMqttPacket = await Internal.TaskExtensions.TimeoutAfterAsync(ReceiveAsync, timeout, cancellationToken).ConfigureAwait(false);
+                    receivedMqttPacket = await ReceiveAsync(cancellationToken).ConfigureAwait(false);
                }
                else
                {
-                    receivedMqttPacket = await ReceiveAsync(cancellationToken).ConfigureAwait(false);
+                    receivedMqttPacket = await MqttTaskTimeout.WaitAsync(ReceiveAsync, timeout, cancellationToken).ConfigureAwait(false);
                }

                if (receivedMqttPacket == null || cancellationToken.IsCancellationRequested)
@@ -141,7 +167,9 @@ namespace MQTTnet.Adapter
                    return null;
                }

-                if (!PacketFormatterAdapter.ProtocolVersion.HasValue)
+                Interlocked.Add(ref _bytesSent, receivedMqttPacket.TotalLength);
+
+                if (PacketFormatterAdapter.ProtocolVersion == MqttProtocolVersion.Unknown)
                {
                    PacketFormatterAdapter.DetectProtocolVersion(receivedMqttPacket);
                }
@@ -172,14 +200,31 @@ namespace MQTTnet.Adapter
            return null;
        }

+        public void ResetStatistics()
+        {
+            Interlocked.Exchange(ref _bytesReceived, 0L);
+            Interlocked.Exchange(ref _bytesSent, 0L);
+        }
+
        private async Task<ReceivedMqttPacket> ReceiveAsync(CancellationToken cancellationToken)
        {
-            var fixedHeader = await _packetReader.ReadFixedHeaderAsync(_fixedHeaderBuffer, cancellationToken).ConfigureAwait(false);
+            var readFixedHeaderResult = await _packetReader.ReadFixedHeaderAsync(_fixedHeaderBuffer, cancellationToken).ConfigureAwait(false);
+
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return null;
+            }

            try
            {
-                ReadingPacketStarted?.Invoke(this, EventArgs.Empty);
+                if (readFixedHeaderResult.ConnectionClosed)
+                {
+                    return null;
+                }

+                ReadingPacketStartedCallback?.Invoke();
+
+                var fixedHeader = readFixedHeaderResult.FixedHeader;
                if (fixedHeader.RemainingLength == 0)
                {
                    return new ReceivedMqttPacket(fixedHeader.Flags, null, 2);
@@ -197,16 +242,17 @@ namespace MQTTnet.Adapter
                        chunkSize = bytesLeft;
                    }

-#if WINDOWS_UWP
-                    var readBytes = await _channel.ReadAsync(body, bodyOffset, (int)chunkSize, cancellationToken).ConfigureAwait(false);
-#else
-                    // async/await is not used to avoid the overhead of context switches. We assume that the remaining data
-                    // has been sent from the sender directly after the initial bytes.
-                    var readBytes = _channel.ReadAsync(body, bodyOffset, chunkSize, cancellationToken).ConfigureAwait(false).GetAwaiter().GetResult();
-#endif
+                    var readBytes = await _channel.ReadAsync(body, bodyOffset, chunkSize, cancellationToken).ConfigureAwait(false);

-                    cancellationToken.ThrowIfCancellationRequested();
-                    ExceptionHelper.ThrowIfGracefulSocketClose(readBytes);
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        return null;
+                    }
+
+                    if (readBytes == 0)
+                    {
+                        return null;
+                    }

                    bodyOffset += readBytes;
                } while (bodyOffset < body.Length);
@@ -216,7 +262,7 @@ namespace MQTTnet.Adapter
            }
            finally
            {
-                ReadingPacketCompleted?.Invoke(this, EventArgs.Empty);
+                ReadingPacketCompletedCallback?.Invoke();
            }
        }

@@ -237,15 +283,19 @@ namespace MQTTnet.Adapter

        private static bool IsWrappedException(Exception exception)
        {
-            return exception is TaskCanceledException ||
-                   exception is OperationCanceledException ||
+            return exception is OperationCanceledException ||
                   exception is MqttCommunicationTimedOutException ||
                   exception is MqttCommunicationException;
        }

        private static void WrapException(Exception exception)
        {
-            if (exception is IOException && exception.InnerException is SocketException socketException)
+            if (exception is IOException && exception.InnerException is SocketException innerException)
+            {
+                exception = innerException;
+            }
+
+            if (exception is SocketException socketException)
            {
                if (socketException.SocketErrorCode == SocketError.ConnectionAborted ||
                    socketException.SocketErrorCode == SocketError.OperationAborted)
@@ -1,17 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Adapter
-{
-    public class MqttServerAdapterClientAcceptedEventArgs : EventArgs
-    {
-        public MqttServerAdapterClientAcceptedEventArgs(IMqttChannelAdapter client)
-        {
-            Client = client ?? throw new ArgumentNullException(nameof(client));
-        }
-
-        public IMqttChannelAdapter Client { get; }
-
-        public Task SessionTask { get; set; }
-    }
-}
@@ -4,16 +4,16 @@ namespace MQTTnet.Adapter
 {
    public class ReceivedMqttPacket
    {
-        public ReceivedMqttPacket(byte fixedHeader, MqttPacketBodyReader body, int totalLength)
+        public ReceivedMqttPacket(byte fixedHeader, IMqttPacketBodyReader body, int totalLength)
        {
            FixedHeader = fixedHeader;
            Body = body;
            TotalLength = totalLength;
        }

-        public byte FixedHeader { get; }
+        public byte FixedHeader { get; set; }

-        public MqttPacketBodyReader Body { get; }
+        public IMqttPacketBodyReader Body { get; }

        public int TotalLength { get; }
    }
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Protocol;
-
-namespace MQTTnet
-{
-    public static class ApplicationMessagePublisherExtensions
-    {
-        public static async Task PublishAsync(this IApplicationMessagePublisher publisher, IEnumerable<MqttApplicationMessage> applicationMessages)
-        {
-            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
-
-            foreach (var applicationMessage in applicationMessages)
-            {
-                await publisher.PublishAsync(applicationMessage).ConfigureAwait(false);
-            }
-        }
-
-        public static async Task PublishAsync(this IApplicationMessagePublisher publisher, params MqttApplicationMessage[] applicationMessages)
-        {
-            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
-
-            foreach (var applicationMessage in applicationMessages)
-            {
-                await publisher.PublishAsync(applicationMessage).ConfigureAwait(false);
-            }
-        }
-
-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic)
-        {
-            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-            if (topic == null) throw new ArgumentNullException(nameof(topic));
-
-            return publisher.PublishAsync(builder => builder
-                .WithTopic(topic));
-        }
-
-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload)
-        {
-            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-            if (topic == null) throw new ArgumentNullException(nameof(topic));
-
-            return publisher.PublishAsync(builder => builder
-                .WithTopic(topic)
-                .WithPayload(payload));
-        }
-
-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
-        {
-            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-            if (topic == null) throw new ArgumentNullException(nameof(topic));
-
-            return publisher.PublishAsync(builder => builder
-                .WithTopic(topic)
-                .WithPayload(payload)
-                .WithQualityOfServiceLevel(qualityOfServiceLevel));
-        }
-
-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, bool retain)
-        {
-            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-            if (topic == null) throw new ArgumentNullException(nameof(topic));
-
-            return publisher.PublishAsync(builder => builder
-                .WithTopic(topic)
-                .WithPayload(payload)
-                .WithQualityOfServiceLevel(qualityOfServiceLevel)
-                .WithRetainFlag(retain));
-        }
-
-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder)
-        {
-            var message = builder(new MqttApplicationMessageBuilder()).Build();
-            return publisher.PublishAsync(message);
-        }
-    }
-}
@@ -7,9 +7,10 @@ namespace MQTTnet.Channel
    public interface IMqttChannel : IDisposable
    {
        string Endpoint { get; }
+        bool IsSecureConnection { get; }

        Task ConnectAsync(CancellationToken cancellationToken);
-        Task DisconnectAsync();
+        Task DisconnectAsync(CancellationToken cancellationToken);

        Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken);
        Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken);
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MQTTnet.Client.Connecting
+{
+    public interface IMqttClientConnectedHandler
+    {
+        Task HandleConnectedAsync(MqttClientConnectedEventArgs eventArgs);
+    }
+}
@@ -1,6 +1,6 @@
 namespace MQTTnet.Client.Connecting
 {
-    public class MqttClientConnectResult
+    public class MqttClientAuthenticateResult
    {
        public bool IsSessionPresent { get; set; }

@@ -4,11 +4,11 @@ namespace MQTTnet.Client.Connecting
 {
    public class MqttClientConnectedEventArgs : EventArgs
    {
-        public MqttClientConnectedEventArgs(MqttClientConnectResult connectResult)
+        public MqttClientConnectedEventArgs(MqttClientAuthenticateResult authenticateResult)
        {
-            ConnectResult = connectResult ?? throw new ArgumentNullException(nameof(connectResult));
+            AuthenticateResult = authenticateResult ?? throw new ArgumentNullException(nameof(authenticateResult));
        }

-        public MqttClientConnectResult ConnectResult { get; }
+        public MqttClientAuthenticateResult AuthenticateResult { get; }
    }
 }
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+
+namespace MQTTnet.Client.Connecting
+{
+    public class MqttClientConnectedHandlerDelegate : IMqttClientConnectedHandler
+    {
+        private readonly Func<MqttClientConnectedEventArgs, Task> _handler;
+
+        public MqttClientConnectedHandlerDelegate(Action<MqttClientConnectedEventArgs> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            _handler = context =>
+            {
+                handler(context);
+                return Task.FromResult(0);
+            };
+        }
+
+        public MqttClientConnectedHandlerDelegate(Func<MqttClientConnectedEventArgs, Task> handler)
+        {
+            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public Task HandleConnectedAsync(MqttClientConnectedEventArgs eventArgs)
+        {
+            return _handler(eventArgs);
+        }
+    }
+}
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MQTTnet.Client.Disconnecting
+{
+    public interface IMqttClientDisconnectedHandler
+    {
+        Task HandleDisconnectedAsync(MqttClientDisconnectedEventArgs eventArgs);
+    }
+}
@@ -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; }
    }
 }
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+
+namespace MQTTnet.Client.Disconnecting
+{
+    public class MqttClientDisconnectedHandlerDelegate : IMqttClientDisconnectedHandler
+    {
+        private readonly Func<MqttClientDisconnectedEventArgs, Task> _handler;
+
+        public MqttClientDisconnectedHandlerDelegate(Action<MqttClientDisconnectedEventArgs> handler)
+        {
+            if (handler == null) throw new ArgumentNullException(nameof(handler));
+
+            _handler = context =>
+            {
+                handler(context);
+                return Task.FromResult(0);
+            };
+        }
+
+        public MqttClientDisconnectedHandlerDelegate(Func<MqttClientDisconnectedEventArgs, Task> handler)
+        {
+            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        public Task HandleDisconnectedAsync(MqttClientDisconnectedEventArgs eventArgs)
+        {
+            return _handler(eventArgs);
+        }
+    }
+}
@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
@@ -14,13 +14,14 @@ namespace MQTTnet.Client
        bool IsConnected { get; }
        IMqttClientOptions Options { get; }

-        event EventHandler<MqttClientConnectedEventArgs> Connected;
-        event EventHandler<MqttClientDisconnectedEventArgs> Disconnected;
+        IMqttClientConnectedHandler ConnectedHandler { get; set; }
+        
+        IMqttClientDisconnectedHandler DisconnectedHandler { get; set; }
+        
+        Task<MqttClientAuthenticateResult> ConnectAsync(IMqttClientOptions options, CancellationToken cancellationToken);
+        Task DisconnectAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken);

-        Task<MqttClientConnectResult> ConnectAsync(IMqttClientOptions options);
-        Task DisconnectAsync(MqttClientDisconnectOptions options);
-
-        Task<MqttClientSubscribeResult> SubscribeAsync(IEnumerable<TopicFilter> topicFilters);
-        Task<MqttClientUnsubscribeResult> UnsubscribeAsync(IEnumerable<string> topics);
+        Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken);
+        Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken);
    }
 }
@@ -1,20 +1,18 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Adapter;
 using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
 using MQTTnet.Client.Options;
-using MQTTnet.Client.PacketDispatcher;
 using MQTTnet.Client.Publishing;
+using MQTTnet.Client.Receiving;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
-using MQTTnet.Formatter;
+using MQTTnet.PacketDispatcher;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

@@ -23,16 +21,17 @@ namespace MQTTnet.Client
    public class MqttClient : IMqttClient
    {
        private readonly MqttPacketIdentifierProvider _packetIdentifierProvider = new MqttPacketIdentifierProvider();
+        private readonly MqttPacketDispatcher _packetDispatcher = new MqttPacketDispatcher();
        private readonly Stopwatch _sendTracker = new Stopwatch();
        private readonly object _disconnectLock = new object();
-        private readonly MqttPacketDispatcher _packetDispatcher = new MqttPacketDispatcher();

        private readonly IMqttClientAdapterFactory _adapterFactory;
        private readonly IMqttNetChildLogger _logger;

-        private CancellationTokenSource _cancellationTokenSource;
-        internal Task _packetReceiverTask;
-        internal Task _keepAliveMessageSenderTask;
+        private CancellationTokenSource _backgroundCancellationTokenSource;
+        private Task _packetReceiverTask;
+        private Task _keepAlivePacketsSenderTask;
+
        private IMqttChannelAdapter _adapter;
        private bool _cleanDisconnectInitiated;
        private long _disconnectGate;
@@ -45,20 +44,25 @@ namespace MQTTnet.Client
            _logger = logger.CreateChildLogger(nameof(MqttClient));
        }

-        public event EventHandler<MqttClientConnectedEventArgs> Connected;
-        public event EventHandler<MqttClientDisconnectedEventArgs> Disconnected;
-        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
+        public IMqttClientConnectedHandler ConnectedHandler { get; set; }
+
+        public IMqttClientDisconnectedHandler DisconnectedHandler { get; set; }
+
+        public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler { get; set; }

        public bool IsConnected { get; private set; }
+
        public IMqttClientOptions Options { get; private set; }

-        public async Task<MqttClientConnectResult> ConnectAsync(IMqttClientOptions options)
+        public async Task<MqttClientAuthenticateResult> ConnectAsync(IMqttClientOptions options, CancellationToken cancellationToken)
        {
            if (options == null) throw new ArgumentNullException(nameof(options));
            if (options.ChannelOptions == null) throw new ArgumentException("ChannelOptions are not set.");

            ThrowIfConnected("It is not allowed to connect with a server after the connection is established.");

+            MqttClientAuthenticateResult authenticateResult = null;
+
            try
            {
                Options = options;
@@ -66,32 +70,39 @@ namespace MQTTnet.Client
                _packetIdentifierProvider.Reset();
                _packetDispatcher.Reset();

-                _cancellationTokenSource = new CancellationTokenSource();
-                _disconnectGate = 0;
-                _adapter = _adapterFactory.CreateClientAdapter(options, _logger);
+                _backgroundCancellationTokenSource = new CancellationTokenSource();
+                var backgroundCancellationToken = _backgroundCancellationTokenSource.Token;

-                _logger.Verbose($"Trying to connect with server ({Options.ChannelOptions}).");
-                await _adapter.ConnectAsync(Options.CommunicationTimeout, _cancellationTokenSource.Token).ConfigureAwait(false);
+                _disconnectGate = 0;
+                var adapter = _adapterFactory.CreateClientAdapter(options, _logger);
+                _adapter = adapter;
+
+                _logger.Verbose($"Trying to connect with server '{options.ChannelOptions}' (Timeout={options.CommunicationTimeout}).");
+                await _adapter.ConnectAsync(options.CommunicationTimeout, cancellationToken).ConfigureAwait(false);
                _logger.Verbose("Connection with server established.");

-                StartReceivingPackets(_cancellationTokenSource.Token);
+                _packetReceiverTask = Task.Run(() => TryReceivePacketsAsync(backgroundCancellationToken), backgroundCancellationToken);

-                var connectResult = await AuthenticateAsync(options.WillMessage, _cancellationTokenSource.Token).ConfigureAwait(false);
-                _logger.Verbose("MQTT connection with server established.");
+                authenticateResult = await AuthenticateAsync(adapter, options.WillMessage, cancellationToken).ConfigureAwait(false);

                _sendTracker.Restart();

                if (Options.KeepAlivePeriod != TimeSpan.Zero)
                {
-                    StartSendingKeepAliveMessages(_cancellationTokenSource.Token);
+                    _keepAlivePacketsSenderTask = Task.Run(() => TrySendKeepAliveMessagesAsync(backgroundCancellationToken), backgroundCancellationToken);
                }

                IsConnected = true;
-                Connected?.Invoke(this, new MqttClientConnectedEventArgs(connectResult));

                _logger.Info("Connected.");

-                return connectResult;
+                var connectedHandler = ConnectedHandler;
+                if (connectedHandler != null)
+                {
+                    await connectedHandler.HandleConnectedAsync(new MqttClientConnectedEventArgs(authenticateResult)).ConfigureAwait(false);
+                }
+
+                return authenticateResult;
            }
            catch (Exception exception)
            {
@@ -99,72 +110,66 @@ namespace MQTTnet.Client

                if (!DisconnectIsPending())
                {
-                    await DisconnectInternalAsync(null, exception).ConfigureAwait(false);
+                    await DisconnectInternalAsync(null, exception, authenticateResult).ConfigureAwait(false);
                }

                throw;
            }
        }

-        public async Task DisconnectAsync(MqttClientDisconnectOptions options)
+        public async Task DisconnectAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken)
        {
            try
            {
                _cleanDisconnectInitiated = true;

-                if (IsConnected && !_cancellationTokenSource.IsCancellationRequested)
+                if (IsConnected)
                {
-                    var disconnectPacket = CreateDisconnectPacket(options);
-                    await SendAsync(disconnectPacket, _cancellationTokenSource.Token).ConfigureAwait(false);
+                    var disconnectPacket = _adapter.PacketFormatterAdapter.DataConverter.CreateDisconnectPacket(options);
+                    await SendAsync(disconnectPacket, cancellationToken).ConfigureAwait(false);
                }
            }
            finally
            {
                if (!DisconnectIsPending())
                {
-                    await DisconnectInternalAsync(null, null).ConfigureAwait(false);
+                    await DisconnectInternalAsync(null, null, null).ConfigureAwait(false);
                }
            }
        }

-        public async Task<MqttClientSubscribeResult> SubscribeAsync(IEnumerable<TopicFilter> topicFilters)
+        public async Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken)
        {
-            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
+            if (options == null) throw new ArgumentNullException(nameof(options));

            ThrowIfNotConnected();

-            var subscribePacket = new MqttSubscribePacket
-            {
-                PacketIdentifier = _packetIdentifierProvider.GetNewPacketIdentifier()
-            };
+            var subscribePacket = _adapter.PacketFormatterAdapter.DataConverter.CreateSubscribePacket(options);
+            subscribePacket.PacketIdentifier = _packetIdentifierProvider.GetNextPacketIdentifier();

-            subscribePacket.TopicFilters.AddRange(topicFilters);
-
-            var subAckPacket = await SendAndReceiveAsync<MqttSubAckPacket>(subscribePacket, _cancellationTokenSource.Token).ConfigureAwait(false);
+            var subAckPacket = await SendAndReceiveAsync<MqttSubAckPacket>(subscribePacket, cancellationToken).ConfigureAwait(false);
            return _adapter.PacketFormatterAdapter.DataConverter.CreateClientSubscribeResult(subscribePacket, subAckPacket);
        }

-        public async Task<MqttClientUnsubscribeResult> UnsubscribeAsync(IEnumerable<string> topicFilters)
+        public async Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken)
        {
-            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
+            if (options == null) throw new ArgumentNullException(nameof(options));

            ThrowIfNotConnected();

-            var unsubscribePacket = new MqttUnsubscribePacket
-            {
-                PacketIdentifier = _packetIdentifierProvider.GetNewPacketIdentifier()
-            };
+            var unsubscribePacket = _adapter.PacketFormatterAdapter.DataConverter.CreateUnsubscribePacket(options);
+            unsubscribePacket.PacketIdentifier = _packetIdentifierProvider.GetNextPacketIdentifier();

-            unsubscribePacket.TopicFilters.AddRange(topicFilters);
-
-            var unsubAckPacket = await SendAndReceiveAsync<MqttUnsubAckPacket>(unsubscribePacket, _cancellationTokenSource.Token).ConfigureAwait(false);
+            var unsubAckPacket = await SendAndReceiveAsync<MqttUnsubAckPacket>(unsubscribePacket, cancellationToken).ConfigureAwait(false);
            return _adapter.PacketFormatterAdapter.DataConverter.CreateClientUnsubscribeResult(unsubscribePacket, unsubAckPacket);
        }

-        public async Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage)
+        public Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken)
        {
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

+            MqttTopicValidator.ThrowIfInvalid(applicationMessage.Topic);
+
            ThrowIfNotConnected();

            var publishPacket = _adapter.PacketFormatterAdapter.DataConverter.CreatePublishPacket(applicationMessage);
@@ -173,26 +178,15 @@ namespace MQTTnet.Client
            {
                case MqttQualityOfServiceLevel.AtMostOnce:
                    {
-                        // No packet identifier is used for QoS 0 [3.3.2.2 Packet Identifier]
-                        await SendAsync(publishPacket, _cancellationTokenSource.Token).ConfigureAwait(false);
-                        return new MqttClientPublishResult();
+                        return PublishAtMostOnce(publishPacket, cancellationToken);
                    }
                case MqttQualityOfServiceLevel.AtLeastOnce:
                    {
-                        publishPacket.PacketIdentifier = _packetIdentifierProvider.GetNewPacketIdentifier();
-                        var response = await SendAndReceiveAsync<MqttPubAckPacket>(publishPacket, _cancellationTokenSource.Token).ConfigureAwait(false);
-
-                        var result = new MqttClientPublishResult();
-                        if (response.ReasonCode != null)
-                        {
-                            result.ReasonCode = (MqttClientPublishReasonCode)response.ReasonCode;
-                        }
-
-                        return result;
+                        return PublishAtLeastOnceAsync(publishPacket, cancellationToken);
                    }
                case MqttQualityOfServiceLevel.ExactlyOnce:
                    {
-                        return await PublishExactlyOnceAsync(publishPacket, _cancellationTokenSource.Token).ConfigureAwait(false);
+                        return PublishExactlyOnceAsync(publishPacket, cancellationToken);
                    }
                default:
                    {
@@ -203,29 +197,30 @@ namespace MQTTnet.Client

        public void Dispose()
        {
-            _cancellationTokenSource?.Cancel(false);
-            _cancellationTokenSource?.Dispose();
-            _cancellationTokenSource = null;
+            _backgroundCancellationTokenSource?.Cancel(false);
+            _backgroundCancellationTokenSource?.Dispose();
+            _backgroundCancellationTokenSource = null;

            _adapter?.Dispose();
            _adapter = null;
        }

-        private async Task<MqttClientConnectResult> AuthenticateAsync(MqttApplicationMessage willApplicationMessage, CancellationToken cancellationToken)
+        private async Task<MqttClientAuthenticateResult> AuthenticateAsync(IMqttChannelAdapter channelAdapter, MqttApplicationMessage willApplicationMessage, CancellationToken cancellationToken)
        {
-            var connectPacket = _adapter.PacketFormatterAdapter.DataConverter.CreateConnectPacket(
+            var connectPacket = channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnectPacket(
                willApplicationMessage,
                Options);

            var connAckPacket = await SendAndReceiveAsync<MqttConnAckPacket>(connectPacket, cancellationToken).ConfigureAwait(false);
-
-            var result = _adapter.PacketFormatterAdapter.DataConverter.CreateClientConnectResult(connAckPacket);
+            var result = channelAdapter.PacketFormatterAdapter.DataConverter.CreateClientConnectResult(connAckPacket);

            if (result.ResultCode != MqttClientConnectResultCode.Success)
            {
                throw new MqttConnectingFailedException(result.ResultCode);
            }

+            _logger.Verbose("Authenticated MQTT connection with server established.");
+
            return result;
        }

@@ -239,7 +234,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;

@@ -251,11 +246,12 @@ namespace MQTTnet.Client
            {
                if (_adapter != null)
                {
+                    _logger.Verbose("Disconnecting [Timeout={0}]", Options.CommunicationTimeout);
                    await _adapter.DisconnectAsync(Options.CommunicationTimeout, CancellationToken.None).ConfigureAwait(false);
                }

                await WaitForTaskAsync(_packetReceiverTask, sender).ConfigureAwait(false);
-                await WaitForTaskAsync(_keepAliveMessageSenderTask, sender).ConfigureAwait(false);
+                await WaitForTaskAsync(_keepAlivePacketsSenderTask, sender).ConfigureAwait(false);

                _logger.Verbose("Disconnected from adapter.");
            }
@@ -269,7 +265,12 @@ namespace MQTTnet.Client
                _cleanDisconnectInitiated = false;

                _logger.Info("Disconnected.");
-                Disconnected?.Invoke(this, new MqttClientDisconnectedEventArgs(clientWasConnected, exception));
+
+                var disconnectedHandler = DisconnectedHandler;
+                if (disconnectedHandler != null)
+                {
+                    await disconnectedHandler.HandleDisconnectedAsync(new MqttClientDisconnectedEventArgs(clientWasConnected, exception, authenticateResult)).ConfigureAwait(false);
+                }
            }
        }

@@ -279,12 +280,12 @@ namespace MQTTnet.Client
            {
                try
                {
-                    if (_cancellationTokenSource?.IsCancellationRequested == true)
+                    if (_backgroundCancellationTokenSource?.IsCancellationRequested == true)
                    {
                        return;
                    }

-                    _cancellationTokenSource?.Cancel(false);
+                    _backgroundCancellationTokenSource?.Cancel(false);
                }
                catch (Exception exception)
                {
@@ -295,11 +296,14 @@ namespace MQTTnet.Client

        private Task SendAsync(MqttBasePacket packet, CancellationToken cancellationToken)
        {
-            cancellationToken.ThrowIfCancellationRequested();
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromResult(0);
+            }

            _sendTracker.Restart();

-            return _adapter.SendPacketAsync(packet, cancellationToken);
+            return _adapter.SendPacketAsync(packet, Options.CommunicationTimeout, cancellationToken);
        }

        private async Task<TResponsePacket> SendAndReceiveAsync<TResponsePacket>(MqttBasePacket requestPacket, CancellationToken cancellationToken) where TResponsePacket : MqttBasePacket
@@ -314,26 +318,22 @@ namespace MQTTnet.Client
                identifier = packetWithIdentifier.PacketIdentifier.Value;
            }

-            var packetAwaiter = _packetDispatcher.AddPacketAwaiter<TResponsePacket>(identifier);
-            try
+            using (var packetAwaiter = _packetDispatcher.AddPacketAwaiter<TResponsePacket>(identifier))
            {
-                await _adapter.SendPacketAsync(requestPacket, cancellationToken).ConfigureAwait(false);
-                return await packetAwaiter.WaitOneAsync(Options.CommunicationTimeout);
-
-                //return (TResponsePacket)await Internal.TaskExtensions.TimeoutAfterAsync(ct => packetAwaiter.Task, Options.CommunicationTimeout, cancellationToken).ConfigureAwait(false);
-            }
-            catch (MqttCommunicationTimedOutException)
-            {
-                _logger.Warning(null, "Timeout while waiting for packet of type '{0}'.", typeof(TResponsePacket).Namespace);
-                throw;
-            }
-            finally
-            {
-                _packetDispatcher.RemovePacketAwaiter<TResponsePacket>(identifier);
+                try
+                {
+                    await _adapter.SendPacketAsync(requestPacket, Options.CommunicationTimeout, cancellationToken).ConfigureAwait(false);
+                    return await packetAwaiter.WaitOneAsync(Options.CommunicationTimeout).ConfigureAwait(false);
+                }
+                catch (MqttCommunicationTimedOutException)
+                {
+                    _logger.Warning(null, "Timeout while waiting for packet of type '{0}'.", typeof(TResponsePacket).Name);
+                    throw;
+                }
            }
        }

-        private async Task SendKeepAliveMessagesAsync(CancellationToken cancellationToken)
+        private async Task TrySendKeepAliveMessagesAsync(CancellationToken cancellationToken)
        {
            try
            {
@@ -378,7 +378,7 @@ namespace MQTTnet.Client

                if (!DisconnectIsPending())
                {
-                    await DisconnectInternalAsync(_keepAliveMessageSenderTask, exception).ConfigureAwait(false);
+                    await DisconnectInternalAsync(_keepAlivePacketsSenderTask, exception, null).ConfigureAwait(false);
                }
            }
            finally
@@ -387,7 +387,7 @@ namespace MQTTnet.Client
            }
        }

-        private async Task ReceivePacketsAsync(CancellationToken cancellationToken)
+        private async Task TryReceivePacketsAsync(CancellationToken cancellationToken)
        {
            try
            {
@@ -397,10 +397,22 @@ namespace MQTTnet.Client
                {
                    var packet = await _adapter.ReceivePacketAsync(TimeSpan.Zero, cancellationToken).ConfigureAwait(false);

-                    if (packet != null && !cancellationToken.IsCancellationRequested)
+                    if (cancellationToken.IsCancellationRequested)
                    {
-                        await ProcessReceivedPacketAsync(packet, cancellationToken).ConfigureAwait(false);
+                        return;
                    }
+
+                    if (packet == null)
+                    {
+                        if (!DisconnectIsPending())
+                        {
+                            await DisconnectInternalAsync(_packetReceiverTask, null, null).ConfigureAwait(false);
+                        }
+
+                        return;
+                    }
+
+                    await TryProcessReceivedPacketAsync(packet, cancellationToken).ConfigureAwait(false);
                }
            }
            catch (Exception exception)
@@ -426,7 +438,7 @@ namespace MQTTnet.Client

                if (!DisconnectIsPending())
                {
-                    await DisconnectInternalAsync(_packetReceiverTask, exception).ConfigureAwait(false);
+                    await DisconnectInternalAsync(_packetReceiverTask, exception, null).ConfigureAwait(false);
                }
            }
            finally
@@ -435,113 +447,102 @@ namespace MQTTnet.Client
            }
        }

-        private Task ProcessReceivedPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken)
-        {
-            if (packet is MqttPublishPacket publishPacket)
-            {
-                return ProcessReceivedPublishPacketAsync(publishPacket, cancellationToken);
-            }
-
-            if (packet is MqttPingReqPacket)
-            {
-                return SendAsync(new MqttPingRespPacket(), cancellationToken);
-            }
-
-            if (packet is MqttDisconnectPacket)
-            {
-                return DisconnectAsync(null);
-            }
-
-            if (packet is MqttPubRelPacket pubRelPacket)
-            {
-                return ProcessReceivedPubRelPacket(pubRelPacket, cancellationToken);
-            }
-
-            _packetDispatcher.Dispatch(packet);
-            return Task.FromResult(0);
-        }
-
-        private Task ProcessReceivedPublishPacketAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
-        {
-            if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtMostOnce)
-            {
-                FireApplicationMessageReceivedEvent(publishPacket);
-                return Task.FromResult(0);
-            }
-
-            if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtLeastOnce)
-            {
-                FireApplicationMessageReceivedEvent(publishPacket);
-                return SendAsync(new MqttPubAckPacket { PacketIdentifier = publishPacket.PacketIdentifier, ReasonCode = MqttPubAckReasonCode.Success }, cancellationToken);
-            }
-
-            if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.ExactlyOnce)
-            {
-                // QoS 2 is implement as method "B" (4.3.3 QoS 2: Exactly once delivery)
-                FireApplicationMessageReceivedEvent(publishPacket);
-                return SendAsync(new MqttPubRecPacket { PacketIdentifier = publishPacket.PacketIdentifier, ReasonCode = MqttPubRecReasonCode.Success }, cancellationToken);
-            }
-
-            throw new MqttCommunicationException("Received a not supported QoS level.");
-        }
-
-        private Task ProcessReceivedPubRelPacket(MqttPubRelPacket pubRelPacket, CancellationToken cancellationToken)
-        {
-            var response = new MqttPubCompPacket
-            {
-                PacketIdentifier = pubRelPacket.PacketIdentifier,
-                ReasonCode = MqttPubCompReasonCode.Success
-            };
-
-            return SendAsync(response, cancellationToken);
-        }
-
-        private async Task<MqttClientPublishResult> PublishExactlyOnceAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
-        {
-            publishPacket.PacketIdentifier = _packetIdentifierProvider.GetNewPacketIdentifier();
-
-            var pubRecPacket = await SendAndReceiveAsync<MqttPubRecPacket>(publishPacket, cancellationToken).ConfigureAwait(false);
-            var pubRelPacket = new MqttPubRelPacket
-            {
-                PacketIdentifier = pubRecPacket.PacketIdentifier,
-                ReasonCode = MqttPubRelReasonCode.Success
-            };
-
-            var pubCompPacket = await SendAndReceiveAsync<MqttPubCompPacket>(pubRelPacket, cancellationToken).ConfigureAwait(false);
-            var result = new MqttClientPublishResult();
-
-            if (pubRecPacket.ReasonCode != null)
-            {
-                result.ReasonCode = (MqttClientPublishReasonCode)pubRecPacket.ReasonCode;
-            }
-
-            return result;
-        }
-
-        private void StartReceivingPackets(CancellationToken cancellationToken)
-        {
-            _packetReceiverTask = Task.Factory.StartNew(
-                () => ReceivePacketsAsync(cancellationToken),
-                cancellationToken,
-                TaskCreationOptions.LongRunning,
-                TaskScheduler.Default).Unwrap();
-        }
-
-        private void StartSendingKeepAliveMessages(CancellationToken cancellationToken)
-        {
-            _keepAliveMessageSenderTask = Task.Factory.StartNew(
-                () => SendKeepAliveMessagesAsync(cancellationToken),
-                cancellationToken,
-                TaskCreationOptions.LongRunning,
-                TaskScheduler.Default).Unwrap();
-        }
-
-        private void FireApplicationMessageReceivedEvent(MqttPublishPacket publishPacket)
+        private async Task TryProcessReceivedPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken)
        {
            try
            {
-                var applicationMessage = _adapter.PacketFormatterAdapter.DataConverter.CreateApplicationMessage(publishPacket);
-                ApplicationMessageReceived?.Invoke(this, new MqttApplicationMessageReceivedEventArgs(Options.ClientId, applicationMessage));
+                if (packet is MqttPublishPacket publishPacket)
+                {
+                    await TryProcessReceivedPublishPacketAsync(publishPacket, cancellationToken).ConfigureAwait(false);
+                }
+                else if (packet is MqttPubRelPacket pubRelPacket)
+                {
+                    await SendAsync(new MqttPubCompPacket
+                    {
+                        PacketIdentifier = pubRelPacket.PacketIdentifier,
+                        ReasonCode = MqttPubCompReasonCode.Success
+                    }, cancellationToken).ConfigureAwait(false);
+                }
+                else if (packet is MqttPingReqPacket)
+                {
+                    await SendAsync(new MqttPingRespPacket(), cancellationToken).ConfigureAwait(false);
+                }
+                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
+                {
+                    _packetDispatcher.Dispatch(packet);
+                }
+            }
+            catch (Exception exception)
+            {
+                if (_cleanDisconnectInitiated)
+                {
+                    return;
+                }
+
+                if (exception is OperationCanceledException)
+                {
+                }
+                else if (exception is MqttCommunicationException)
+                {
+                    _logger.Warning(exception, "MQTT communication exception while receiving packets.");
+                }
+                else
+                {
+                    _logger.Error(exception, "Unhandled exception while receiving packets.");
+                }
+
+                _packetDispatcher.Dispatch(exception);
+
+                if (!DisconnectIsPending())
+                {
+                    await DisconnectInternalAsync(_packetReceiverTask, exception, null).ConfigureAwait(false);
+                }
+            }
+        }
+
+        private async Task TryProcessReceivedPublishPacketAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
+        {
+            try
+            {
+                if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtMostOnce)
+                {
+                    await HandleReceivedApplicationMessageAsync(publishPacket).ConfigureAwait(false);
+                }
+                else if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtLeastOnce)
+                {
+                    if (await HandleReceivedApplicationMessageAsync(publishPacket).ConfigureAwait(false))
+                    {
+                        await SendAsync(new MqttPubAckPacket
+                        {
+                            PacketIdentifier = publishPacket.PacketIdentifier,
+                            ReasonCode = MqttPubAckReasonCode.Success
+                        }, cancellationToken).ConfigureAwait(false);
+                    }
+                }
+                else if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.ExactlyOnce)
+                {
+                    if (await HandleReceivedApplicationMessageAsync(publishPacket).ConfigureAwait(false))
+                    {
+                        var pubRecPacket = new MqttPubRecPacket
+                        {
+                            PacketIdentifier = publishPacket.PacketIdentifier,
+                            ReasonCode = MqttPubRecReasonCode.Success
+                        };
+
+                        await SendAsync(pubRecPacket, cancellationToken).ConfigureAwait(false);
+                    }                    
+                }
+                else
+                {
+                    throw new MqttProtocolViolationException("Received a not supported QoS level.");
+                }
            }
            catch (Exception exception)
            {
@@ -549,6 +550,52 @@ namespace MQTTnet.Client
            }
        }

+        private async Task<MqttClientPublishResult> PublishAtMostOnce(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
+        {
+            // No packet identifier is used for QoS 0 [3.3.2.2 Packet Identifier]
+            await SendAsync(publishPacket, cancellationToken).ConfigureAwait(false);
+            return _adapter.PacketFormatterAdapter.DataConverter.CreatePublishResult(null);
+        }
+
+        private async Task<MqttClientPublishResult> PublishAtLeastOnceAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
+        {
+            publishPacket.PacketIdentifier = _packetIdentifierProvider.GetNextPacketIdentifier();
+            var response = await SendAndReceiveAsync<MqttPubAckPacket>(publishPacket, cancellationToken).ConfigureAwait(false);
+            return _adapter.PacketFormatterAdapter.DataConverter.CreatePublishResult(response);
+        }
+
+        private async Task<MqttClientPublishResult> PublishExactlyOnceAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
+        {
+            publishPacket.PacketIdentifier = _packetIdentifierProvider.GetNextPacketIdentifier();
+
+            var pubRecPacket = await SendAndReceiveAsync<MqttPubRecPacket>(publishPacket, cancellationToken).ConfigureAwait(false);
+
+            var pubRelPacket = new MqttPubRelPacket
+            {
+                PacketIdentifier = publishPacket.PacketIdentifier,
+                ReasonCode = MqttPubRelReasonCode.Success
+            };
+
+            var pubCompPacket = await SendAndReceiveAsync<MqttPubCompPacket>(pubRelPacket, cancellationToken).ConfigureAwait(false);
+
+            return _adapter.PacketFormatterAdapter.DataConverter.CreatePublishResult(pubRecPacket, pubCompPacket);
+        }
+
+        private async Task<bool> HandleReceivedApplicationMessageAsync(MqttPublishPacket publishPacket)
+        {
+            var applicationMessage = _adapter.PacketFormatterAdapter.DataConverter.CreateApplicationMessage(publishPacket);
+
+            var handler = ApplicationMessageReceivedHandler;
+            if (handler != null)
+            {
+                var eventArgs = new MqttApplicationMessageReceivedEventArgs(Options.ClientId, applicationMessage);
+                await handler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
+                return !eventArgs.ProcessingFailed;
+            }
+
+            return true;
+        }
+
        private static async Task WaitForTaskAsync(Task task, Task sender)
        {
            if (task == sender || task == null)
@@ -574,31 +621,5 @@ namespace MQTTnet.Client
        {
            return Interlocked.CompareExchange(ref _disconnectGate, 1, 0) != 0;
        }
-
-        private MqttDisconnectPacket CreateDisconnectPacket(MqttClientDisconnectOptions options)
-        {
-            var packet = new MqttDisconnectPacket();
-
-            if (_adapter.PacketFormatterAdapter.ProtocolVersion == MqttProtocolVersion.V500)
-            {
-                if (options == null)
-                {
-                    packet.ReasonCode = MqttDisconnectReasonCode.NormalDisconnection;
-                }
-                else
-                {
-                    packet.ReasonCode = (MqttDisconnectReasonCode)options.ReasonCode;
-                }
-            }
-            else
-            {
-                if (options != null)
-                {
-                    throw new MqttProtocolViolationException("Reason codes for disconnect are only supported for MQTTv5.");
-                }
-            }
-
-            return packet;
-        }
    }
 }
@@ -1,6 +1,12 @@
 using System;
-using System.Linq;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Disconnecting;
+using MQTTnet.Client.Options;
+using MQTTnet.Client.Publishing;
+using MQTTnet.Client.Receiving;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Protocol;
@@ -9,6 +15,114 @@ namespace MQTTnet.Client
 {
    public static class MqttClientExtensions
    {
+        public static IMqttClient UseConnectedHandler(this IMqttClient client, Func<MqttClientConnectedEventArgs, Task> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseConnectedHandler((IMqttClientConnectedHandler)null);
+            }
+
+            return client.UseConnectedHandler(new MqttClientConnectedHandlerDelegate(handler));
+        }
+
+        public static IMqttClient UseConnectedHandler(this IMqttClient client, Action<MqttClientConnectedEventArgs> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseConnectedHandler((IMqttClientConnectedHandler)null);
+            }
+
+            return client.UseConnectedHandler(new MqttClientConnectedHandlerDelegate(handler));
+        }
+
+        public static IMqttClient UseConnectedHandler(this IMqttClient client, IMqttClientConnectedHandler handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            client.ConnectedHandler = handler;
+            return client;
+        }
+
+        public static IMqttClient UseDisconnectedHandler(this IMqttClient client, Func<MqttClientDisconnectedEventArgs, Task> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseDisconnectedHandler((IMqttClientDisconnectedHandler)null);
+            }
+
+            return client.UseDisconnectedHandler(new MqttClientDisconnectedHandlerDelegate(handler));
+        }
+
+        public static IMqttClient UseDisconnectedHandler(this IMqttClient client, Action<MqttClientDisconnectedEventArgs> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseDisconnectedHandler((IMqttClientDisconnectedHandler)null);
+            }
+
+            return client.UseDisconnectedHandler(new MqttClientDisconnectedHandlerDelegate(handler));
+        }
+
+        public static IMqttClient UseDisconnectedHandler(this IMqttClient client, IMqttClientDisconnectedHandler handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            client.DisconnectedHandler = handler;
+            return client;
+        }
+
+        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
+            }
+
+            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
+        }
+
+        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, Action<MqttApplicationMessageReceivedEventArgs> handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (handler == null)
+            {
+                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
+            }
+
+            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
+        }
+
+        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, IMqttApplicationMessageReceivedHandler handler)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            client.ApplicationMessageReceivedHandler = handler;
+            return client;
+        }
+
+        public static Task ReconnectAsync(this IMqttClient client)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            if (client.Options == null)
+            {
+                throw new InvalidOperationException("_ReconnectAsync_ can be used only if _ConnectAsync_ was called before.");
+            }
+
+            return client.ConnectAsync(client.Options);
+        }
+
        public static Task DisconnectAsync(this IMqttClient client)
        {
            if (client == null) throw new ArgumentNullException(nameof(client));
@@ -21,7 +135,10 @@ namespace MQTTnet.Client
            if (client == null) throw new ArgumentNullException(nameof(client));
            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));

-            return client.SubscribeAsync(topicFilters.ToList());
+            var options = new MqttClientSubscribeOptions();
+            options.TopicFilters.AddRange(topicFilters);
+
+            return client.SubscribeAsync(options);
        }

        public static Task<MqttClientSubscribeResult> SubscribeAsync(this IMqttClient client, string topic, MqttQualityOfServiceLevel qualityOfServiceLevel)
@@ -45,7 +162,118 @@ namespace MQTTnet.Client
            if (client == null) throw new ArgumentNullException(nameof(client));
            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));

-            return client.UnsubscribeAsync(topicFilters.ToList());
+            var options = new MqttClientUnsubscribeOptions();
+            options.TopicFilters.AddRange(topicFilters);
+
+            return client.UnsubscribeAsync(options);
+        }
+
+        public static Task<MqttClientAuthenticateResult> ConnectAsync(this IMqttClient client, IMqttClientOptions options)
+        {
+            return client.ConnectAsync(options, CancellationToken.None);
+        }
+
+        public static Task DisconnectAsync(this IMqttClient client, MqttClientDisconnectOptions options)
+        {
+            return client.DisconnectAsync(options, CancellationToken.None);
+        }
+
+        public static Task<MqttClientSubscribeResult> SubscribeAsync(this IMqttClient client, MqttClientSubscribeOptions options)
+        {
+            return client.SubscribeAsync(options, CancellationToken.None);
+        }
+
+        public static Task<MqttClientUnsubscribeResult> UnsubscribeAsync(this IMqttClient client, MqttClientUnsubscribeOptions options)
+        {
+            return client.UnsubscribeAsync(options, CancellationToken.None);
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, MqttApplicationMessage applicationMessage)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
+
+            return client.PublishAsync(applicationMessage, CancellationToken.None);
+        }
+
+        public static async Task PublishAsync(this IMqttClient client, IEnumerable<MqttApplicationMessage> applicationMessages)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
+
+            foreach (var applicationMessage in applicationMessages)
+            {
+                await client.PublishAsync(applicationMessage).ConfigureAwait(false);
+            }
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, string topic)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(topic)
+                .Build());
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, string topic, IEnumerable<byte> payload)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(topic)
+                .WithPayload(payload)
+                .Build());
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, string topic, string payload)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(topic)
+                .WithPayload(payload)
+                .Build());
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(topic)
+                .WithPayload(payload)
+                .WithQualityOfServiceLevel(qualityOfServiceLevel)
+                .Build());
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, bool retain)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(topic)
+                .WithPayload(payload)
+                .WithQualityOfServiceLevel(qualityOfServiceLevel)
+                .WithRetainFlag(retain)
+                .Build());
+        }
+
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, string topic, string payload, bool retain)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (topic == null) throw new ArgumentNullException(nameof(topic));
+
+            return client.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(topic)
+                .WithPayload(payload)
+                .WithRetainFlag(retain)
+                .Build());
        }
    }
 }
@@ -13,7 +13,7 @@
            }
        }

-        public ushort GetNewPacketIdentifier()
+        public ushort GetNextPacketIdentifier()
        {
            lock (_syncRoot)
            {
@@ -7,7 +7,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; } = new MqttClientCredentials();
+        public IMqttClientCredentials Credentials { get; set; }
        public MqttProtocolVersion ProtocolVersion { get; set; } = MqttProtocolVersion.V311;

        public IMqttClientChannelOptions ChannelOptions { get; set; }
@@ -15,6 +15,11 @@ namespace MQTTnet.Client.Options

        public MqttClientOptionsBuilder WithProtocolVersion(MqttProtocolVersion value)
        {
+            if (value == MqttProtocolVersion.Unknown)
+            {
+                throw new ArgumentException("Protocol version is invalid.");
+            }
+
            _options.ProtocolVersion = value;
            return this;
        }
@@ -31,6 +36,11 @@ namespace MQTTnet.Client.Options
            return this;
        }

+        public MqttClientOptionsBuilder WithNoKeepAlive()
+        {
+            return WithKeepAlivePeriod(TimeSpan.Zero);
+        }
+
        public MqttClientOptionsBuilder WithKeepAlivePeriod(TimeSpan value)
        {
            _options.KeepAlivePeriod = value;
@@ -126,6 +136,16 @@ namespace MQTTnet.Client.Options
            return this;
        }

+        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
@@ -141,6 +161,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
@@ -153,9 +182,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;
        }

@@ -164,22 +203,12 @@ namespace MQTTnet.Client.Options
            return WithTls(new MqttClientOptionsBuilderTlsParameters { UseTls = true });
        }

-        [Obsolete("Use method _WithTls_ which accepts the _MqttClientOptionsBuilderTlsParameters_.")]
-        public MqttClientOptionsBuilder WithTls(
-            bool allowUntrustedCertificates = false,
-            bool ignoreCertificateChainErrors = false,
-            bool ignoreCertificateRevocationErrors = false,
-            params byte[][] certificates)
+        public MqttClientOptionsBuilder WithTls(Action<MqttClientOptionsBuilderTlsParameters> optionsBuilder)
        {
-            _tlsParameters = new MqttClientOptionsBuilderTlsParameters
-            {
-                UseTls = true,
-                AllowUntrustedCertificates = allowUntrustedCertificates,
-                IgnoreCertificateChainErrors = ignoreCertificateChainErrors,
-                IgnoreCertificateRevocationErrors = ignoreCertificateRevocationErrors,
-                Certificates = certificates?.ToList()
-            };
+            if (optionsBuilder == null) throw new ArgumentNullException(nameof(optionsBuilder));

+            _tlsParameters = new MqttClientOptionsBuilderTlsParameters();
+            optionsBuilder(_tlsParameters);
            return this;
        }

@@ -1,4 +1,6 @@
-namespace MQTTnet.Client.Options
+using System.Net.Sockets;
+
+namespace MQTTnet.Client.Options
 {
    public class MqttClientTcpOptions : IMqttClientChannelOptions
    {
@@ -6,7 +8,13 @@

        public int? Port { get; set; }

-        public int BufferSize { get; set; } = 4096;
+        public int BufferSize { get; set; } = 65536;
+
+        public bool DualMode { get; set; } = true;
+
+        public bool NoDelay { get; set; } = true;
+
+        public AddressFamily AddressFamily { get; set; } = AddressFamily.Unspecified;

        public MqttClientTlsOptions TlsOptions { get; set; } = new MqttClientTlsOptions();

@@ -1,37 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Packets;
-
-namespace MQTTnet.Client.PacketDispatcher
-{
-    public sealed class MqttPacketAwaiter<TPacket> : IMqttPacketAwaiter where TPacket : MqttBasePacket
-    {
-        private readonly TaskCompletionSource<MqttBasePacket> _packet = new TaskCompletionSource<MqttBasePacket>();
-
-        public async Task<TPacket> WaitOneAsync(TimeSpan timeout)
-        {
-            using (var timeoutToken = new CancellationTokenSource(timeout))
-            {
-                timeoutToken.Token.Register(() => _packet.TrySetCanceled());
-
-                var packet = await _packet.Task.ConfigureAwait(false);
-                return (TPacket)packet;
-            }
-        }
-
-        public void Complete(MqttBasePacket packet)
-        {
-            if (packet == null) throw new ArgumentNullException(nameof(packet));
-
-            _packet.TrySetResult(packet);
-        }
-
-        public void Fail(Exception exception)
-        {
-            if (exception == null) throw new ArgumentNullException(nameof(exception));
-
-            _packet.TrySetException(exception);
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christian Kratky	c22b6033e3	Accept multiple SubscriptionIdentifiers for PUBLISH packets.	2019-05-12 17:26:36 +02:00
Christian Kratky	27476a9194	Merge remote-tracking branch 'origin/master'	2019-05-12 00:18:54 +02:00
Christian Kratky	12973a4179	Fix issues in MQTTv5 packet encoding and decoding.	2019-05-12 00:18:48 +02:00
Christian	01b437dc08	Set theme jekyll-theme-hacker	2019-05-11 09:50:41 +02:00
Christian Kratky	ac88f0a05a	Merge branch 'develop'	2019-05-11 09:47:31 +02:00
Christian Kratky	b02f30844c	Add new options for _MqttClientOptionsBuilder_.	2019-05-10 21:55:46 +02:00
Christian Kratky	1a8bcae47c	Add authentication result to disconnected handler.	2019-05-09 22:08:56 +02:00
Christian Kratky	664549ab93	Fix message encoding bugs.	2019-05-08 00:12:27 +02:00
Christian	914d2b641f	Update appveyor.yml	2019-05-06 21:14:51 +02:00
Christian	0cc0fcf5d9	Update appveyor.yml	2019-05-06 21:07:46 +02:00
Christian Kratky	5980cbd944	Fix build scripts to use 4.6 binaries.	2019-05-06 20:27:33 +02:00
Christian Kratky	3ef7f60a18	Fix wrong IsSessionPresent flag.	2019-05-06 20:27:24 +02:00
Christian Kratky	efef23e3f5	Merge branch 'develop'	2019-05-06 20:24:12 +02:00
Christian Kratky	53ab2ac140	Add Wiki Code.	2019-05-06 20:22:41 +02:00
Christian Kratky	2ecbd83d06	Add UnitTests.	2019-05-06 20:22:20 +02:00
Christian Kratky	a278b6189b	Refactor empty payload detection for retained messages.	2019-05-01 19:41:34 +02:00
Christian Kratky	cdbdfdec6d	Add UnitTests.	2019-05-01 19:39:10 +02:00
Christian Kratky	808c2da5f6	Add PacketIdentifier for QoS 2.	2019-04-28 23:03:54 +02:00
Christian Kratky	6ed3b0cedd	Add ClientId for application messages published by the server.	2019-04-24 21:37:29 +02:00
Christian Kratky	9da3377aa7	Fix credential generation.	2019-04-24 20:19:55 +02:00
Christian Kratky	0cac2aa1bc	Fix broken log message.	2019-04-24 20:19:46 +02:00
Christian Kratky	2d59b5c1ac	Refactoring.	2019-04-23 14:49:19 +02:00
Christian Kratky	9dfa0b32e4	Add extension methods for server.	2019-04-23 14:49:12 +02:00
Christian Kratky	20a7579156	Fix issues in ApplicationMessageInterceptor.	2019-04-23 14:48:51 +02:00
Christian Kratky	c7409c2ff4	Fix missing endpoint in client status.	2019-04-23 14:48:38 +02:00
Christian Kratky	d4c6fb44c9	Expose PacketIdentifier in PublishResult.	2019-04-23 14:47:42 +02:00
Christian Kratky	e6cf23aebd	Add API controllers for MQTTnet.Server.	2019-04-23 14:46:13 +02:00
Christian Kratky	0fec860b25	Add UnitTests.	2019-04-23 14:46:02 +02:00
Christian Kratky	2c927c5995	Cleanup.	2019-04-22 10:59:39 +02:00
Christian Kratky	6399172582	Improve connection disposal.	2019-04-22 10:50:47 +02:00
Christian Kratky	5c903e6fbf	Improve connection handling.	2019-04-20 21:12:30 +02:00
Christian Kratky	f60bbf7dd7	MQTTnet.Server startup cleanup.	2019-04-20 20:59:28 +02:00
Christian Kratky	519bb05aac	Fix broken code.	2019-04-18 00:09:19 +02:00
Christian Kratky	a8434d1b58	Expose results of publish operations for MQTTv5.	2019-04-18 00:01:22 +02:00
Christian Kratky	420b35e37d	Merge remote-tracking branch 'origin/develop' into develop	2019-04-17 21:44:12 +02:00
Christian Kratky	a25c8cd4c7	Fix some minor TODOs.	2019-04-17 21:44:09 +02:00
Christian	8ac77558af	Merge pull request #593 from JanEggers/fixTodo fixed todo in MqttConnectionContext	2019-04-17 19:14:00 +02:00
JanEggers	953578eba2	fixed todo in MqttConnectionContext	2019-04-17 09:47:17 +02:00
Christian	527713ccf8	Merge pull request #592 from JanEggers/spanV2 performance improvements span based serializers	2019-04-16 19:28:38 +02:00
JanEggers	477e2d23ab	added benchmark option to compare netfx and core runtime	2019-04-15 15:52:51 +02:00
JanEggers	03c61ad82c	fixed tests and added testcase for user property serialization	2019-04-15 15:37:15 +02:00
JanEggers	9475ccd0d8	revert accidential change	2019-04-15 15:31:31 +02:00
JanEggers	73b051d159	reuse reader	2019-04-15 15:00:09 +02:00
JanEggers	a9944def68	added span based writer	2019-04-15 14:43:49 +02:00
JanEggers	aee10ba6fa	added netcore 2.1 build	2019-04-15 14:24:27 +02:00
JanEggers	cfc1b27950	fixed build and added implementations for new read functions	2019-04-15 14:14:32 +02:00
JanEggers	149d01e173	added tests	2019-04-15 14:09:22 +02:00
JanEggers	888e1797d7	fixed cherry pick	2019-04-15 14:04:21 +02:00
JanEggers	f8ade2daf4	slight improvements	2019-04-15 14:04:06 +02:00
JanEggers	a85792c392	fixed another issue	2019-04-15 14:00:22 +02:00
JanEggers	fbca8a6dc1	span based reader	2019-04-15 14:00:00 +02:00
Christian Kratky	732ea84caa	Update build script.	2019-04-13 00:09:10 +02:00
Christian Kratky	65896269da	Improve protocol version detection.	2019-04-11 20:13:30 +02:00
Christian Kratky	631f660d5c	Add MQTTnet.Server to build script.	2019-04-11 20:13:08 +02:00
Christian Kratky	7f08371532	Update tests.	2019-04-08 22:29:52 +02:00
Christian Kratky	1afd59325f	Add validations for client options builder.	2019-04-08 22:29:46 +02:00
Christian Kratky	45c033f401	Improve payload handling and allocation.	2019-04-08 22:29:29 +02:00
Christian Kratky	7855eccb78	Update solution files.	2019-04-07 20:54:16 +02:00
Christian Kratky	d51300d32d	Update build process.	2019-04-07 20:45:16 +02:00
Christian Kratky	61b10a8b56	Add extension methods.	2019-04-07 19:58:01 +02:00
Christian Kratky	dbee941dcc	Update nuget packages.	2019-04-04 22:00:40 +02:00
Christian Kratky	fd7c98d0d1	Update docs.	2019-04-03 23:46:32 +02:00
Christian Kratky	c911797f1b	Fix broken config in MQTTnet.Server.	2019-04-03 23:46:26 +02:00
Christian Kratky	b5a1d3a69f	Add more config values for TCP connections.	2019-04-03 23:46:13 +02:00
Christian Kratky	cdeb073bb0	Fix disposal of SSL streams.	2019-04-03 23:45:53 +02:00
Christian Kratky	a8db0dd3d6	Rename tests.	2019-04-03 23:44:48 +02:00
Christian Kratky	2267770a72	Make internal message of server async.	2019-04-02 21:51:26 +02:00
Christian Kratky	35ee732045	Remove obsolete files from MQTTnet.Server.	2019-04-02 21:50:49 +02:00
Christian Kratky	ad5834dd1f	Add long runnings tests for all QoS levels.	2019-04-02 21:50:16 +02:00
Christian Kratky	a7204234f6	Update docs.	2019-03-24 10:40:59 +01:00
Christian Kratky	e8c33077b7	Update build script.	2019-03-24 10:35:42 +01:00
Christian Kratky	bd86dae8a9	Update build script.	2019-03-24 10:19:43 +01:00
Christian Kratky	7188aaf79d	Merge branch 'master' into develop	2019-03-24 10:06:09 +01:00
Christian Kratky	bafcc81672	Update nuspecs.	2019-03-24 10:05:45 +01:00
Christian Kratky	d0f1659eec	Remove obsolete methods.	2019-03-24 10:05:38 +01:00
Christian Kratky	11a5b5a080	Add queue with async support to free up threads.	2019-03-22 23:12:37 +01:00
Christian Kratky	7ed5580352	Fix breaking changes.	2019-03-22 21:08:38 +01:00
Christian Kratky	efc6f124b4	Merge remote-tracking branch 'origin/develop' into develop	2019-03-22 20:37:16 +01:00
Christian Kratky	7c3d88f62d	Add validation for topics before publishing.	2019-03-22 20:37:14 +01:00
Christian	b383a54416	Merge pull request #547 from vbBerni/develop Fix Managed Client should dispose inner mqtt client #527	2019-03-22 20:31:24 +01:00
Christian Kratky	673fc5e20c	Add windows startup script.	2019-03-16 09:55:45 +01:00
Christian Kratky	f2b9642712	Add linuc startup script.	2019-03-16 09:55:15 +01:00
Christian	4f03f22afb	Update README.md	2019-03-13 21:22:24 +01:00
Christian	27a4af6070	Update README.md	2019-03-13 21:20:09 +01:00
Christian	0184ce400c	Update README.md	2019-03-13 21:19:55 +01:00
Christian Kratky	653ea8a102	Add MQTTnet debug logging.	2019-03-11 21:32:36 +01:00
Christian Kratky	3450889e84	Refactor settings.	2019-03-11 21:15:02 +01:00
Christian Kratky	1311535eed	Added support for persisted retained messages.	2019-03-11 20:15:12 +01:00
Christian Kratky	e1799ea6a3	Extend configuration.	2019-03-11 18:43:39 +01:00
Christian Kratky	cd76f434e3	Fix breaking changes.	2019-03-10 20:12:04 +01:00
Christian Kratky	fd91170aee	Merge branch 'master' into develop	2019-03-10 20:00:49 +01:00
Christian Kratky	cd1bfc3a10	Auto stash before merge of "develop" and "feature/server-project-bootstrap"	2019-03-10 19:58:02 +01:00
Christian Kratky	f074e9ed04	Merge branch 'feature/server-project-bootstrap' into develop	2019-03-10 19:57:32 +01:00
Christian Kratky	562a5304f6	Add flag for secure connections.	2019-03-10 19:52:55 +01:00
Kiarash	1e697a94a1	Add Kesterl Settings into appsettings	2019-03-10 17:18:20 +01:00
Kiarash	0e2c3abd05	Add missing method for setting encrpted IPv6 address. * Clean up	2019-03-10 16:34:18 +01:00
Kiarash	7321774c45	Merge branch 'feature/server-project-bootstrap' of https://github.com/chkr1011/MQTTnet into feature/server-project-bootstrap	2019-03-10 16:02:45 +01:00
Kiarash	4a65cab769	Merge branch 'feature/server-project-bootstrap' of https://github.com/chkr1011/MQTTnet into feature/server-project-bootstrap	2019-03-10 15:59:35 +01:00
Christian Kratky	510c3bd0bf	Move logger into WebSocketServerAdapter instead of creating a new instance.	2019-03-10 15:58:55 +01:00
Kiarash	0c056b511e	Fix and clean up	2019-03-10 15:56:11 +01:00
Christian Kratky	2ca6866c5e	Remove obsolete code.	2019-03-10 14:55:17 +01:00
Kiarash	ebcce9b8be	Merge branch 'feature/server-project-bootstrap' of https://github.com/chkr1011/MQTTnet into feature/server-project-bootstrap	2019-03-10 13:58:37 +01:00
Kiarash	9e7c70e649	Add new configuartion model Added new models for review	2019-03-10 13:58:18 +01:00
Christian Kratky	bef0860e53	Add support for WebSocket connections.	2019-03-10 12:10:11 +01:00
Christian Kratky	67c9177731	Merge branch 'master' of https://github.com/chkr1011/MQTTnet	2019-03-10 10:12:26 +01:00
Christian Kratky	007991f073	Update docs.	2019-03-10 10:11:43 +01:00
Christian	532dddeb6c	Merge pull request #526 from JohBa/patch-2 Don't cancel token before stop session manager	2019-03-10 10:08:46 +01:00
Christian Kratky	9070087fad	Add flag for indicating if application message processing has failed.	2019-03-10 09:51:49 +01:00
Christian Kratky	de8bcb7f37	Update docs.	2019-03-09 19:24:04 +01:00
Christian	5090cfb411	Fix memory leak in AsyncAutoResetEvent.	2019-03-09 19:20:34 +01:00
Christian Kratky	6e64d653c5	Hide connect password from logs.	2019-03-08 23:48:49 +01:00
Christian Kratky	461bc6e594	Add MQTTnet.Server to NoUWP solution.	2019-03-08 23:48:28 +01:00
Christian Kratky	0d95dc563c	Update documents.	2019-03-08 23:48:07 +01:00
Christian Kratky	03bfc5f00b	Refactor event handler namings.	2019-03-08 23:47:51 +01:00
Christian Kratky	8708609498	Add more function mappings for MQTTnet Server.	2019-03-06 22:42:00 +01:00
Christian	dffc27c1f4	Migrate events in server to async handlers.	2019-03-05 21:37:30 +01:00
Christian	6f5f507323	Extend MQTTnet.Server application.	2019-03-05 21:37:00 +01:00
Christian	26d6d817cd	Fix memory leak in AsyncAutoResetEvent.	2019-03-05 07:47:31 +01:00
Kiarash Ghiaseddin	b68247f56d	WIP First draft for MQTTnetServer project * Basic support for settings * Nasty code for setting up kestrel from appsettings.json	2019-03-04 21:13:22 +01:00
Christian	3b02a5f6aa	Fix NullRefException when cancelling the server.	2019-02-23 10:40:17 +01:00
Christian	09718a00e7	Add handlers to variable before using to avoid NullRefExceptions.	2019-02-23 10:13:12 +01:00
Christian	ecc2cd5f0c	Merge pull request #555 from BennyM/develop When no handlers are configured the client should not blow up	2019-02-23 10:07:24 +01:00
Christian	618580dc15	Merge pull request #553 from dpsenner/feature/MqttClient-add-missing-async-extensions Add extension methods that provide a simpler api for IMqttClient and IManagedMqttClient	2019-02-22 20:28:53 +01:00
BennyM	4860cec6c7	When no handlers are configured the client should not blow up	2019-02-19 21:40:11 +01:00
Dominik Psenner	b9e0dbf150	Add extension methods that provide a simpler api for IMqttClient and IManagedMqttClient connect/disconnect when the handlers do not need async/await	2019-02-18 08:02:09 +01:00
vbBerni	2a4eb460da	StopAsync now waits until the managed client is stoped and more typical disposing of internal client	2019-02-16 22:23:45 +01:00
Christian	087c622122	Merge pull request #551 from dpsenner/feature/add-async-handlers-for-connected-and-disconnected Add async handler interfaces for connected and disconnected to allow async code on connect	2019-02-16 19:04:06 +01:00
Dominik Psenner	2000de15e7	Add async handlers for connect and disconnect, too .. this allows a client to properly async publish on connect.	2019-02-15 17:02:33 +01:00
Dominik Psenner	5e6b902430	Add convenience extensions to the managed client	2019-02-15 16:55:52 +01:00
Dominik Psenner	a1f414a06d	Add async handler interfaces for connected and disconnected to allow async code to execute on connect	2019-02-15 15:02:15 +01:00
Berni	de3a39bdc2	Fix Managed Client should dispose inner mqtt client #527	2019-02-07 16:46:58 +01:00
Christian	6c5c9e5bf2	Merge pull request #540 from vbBerni/develop fix logger logId not used in ManagedMqttClient	2019-01-31 19:57:09 +01:00
Berni	506873ed5b	fix logger logId not used in ManagedMqttClient	2019-01-31 15:50:01 +01:00
Christian Kratky	6a2bded181	Refactor session and connection handling in server. Fix QoS level 2 issues.	2019-01-27 11:15:32 +01:00
Christian Kratky	ebf0e91ab8	Refactor subscribe and unsubscribe to support MQTTv5.	2019-01-21 21:38:39 +01:00
Johannes Bäurle	107e96ff7d	Don't cancel token before stop session manager	2019-01-07 11:54:10 +01:00
Christian Kratky	0d6e244f84	Refactor UnitTests.	2019-01-06 13:31:27 +01:00
Christian Kratky	96a67579e2	Improve session handling.	2019-01-01 19:18:54 +01:00
Christian Kratky	4cba814716	Cleanup.	2018-12-27 23:10:52 +01:00
Christian Kratky	b527059b72	Fix session takeover.	2018-12-27 23:05:57 +01:00
Christian Kratky	c0507fcc55	Refactor interceptors etc. to support async.	2018-12-27 22:41:41 +01:00
Christian	4fed80c2d0	Update appveyor.yml	2018-12-20 21:08:07 +01:00
				`@@ -0,0 +1 @@`
				[{"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}]