Update MQTTnet.nuspec

Merge pull request #1338 from alvin1221/public_broker_test
Thank you, this is indeed a bug.
2026-10-15 00:15:15 +08:00 · 2022-01-27 20:22:51 +01:00 · 2022-01-12 17:57:33 +01:00 · 2022-01-12 11:29:15 +08:00 · 2022-01-08 15:36:35 +01:00 · 2022-01-08 15:35:47 +01:00
473 changed files with 18509 additions and 10850 deletions
@@ -0,0 +1,84 @@
+[*.cs]
+
+
+# CA1031: Do not catch general exception types
+
+# Microsoft .NET properties
+csharp_new_line_before_members_in_object_initializers = false
+csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
+csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+dotnet_naming_rule.constants_rule.severity = warning
+dotnet_naming_rule.constants_rule.style = upper_camel_case_style
+dotnet_naming_rule.constants_rule.symbols = constants_symbols
+dotnet_naming_rule.public_fields_rule.severity = warning
+dotnet_naming_rule.public_fields_rule.style = lower_camel_case_style
+dotnet_naming_rule.public_fields_rule.symbols = public_fields_symbols
+dotnet_naming_rule.static_readonly_rule.severity = warning
+dotnet_naming_rule.static_readonly_rule.style = upper_camel_case_style
+dotnet_naming_rule.static_readonly_rule.symbols = static_readonly_symbols
+dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
+dotnet_naming_style.lower_camel_case_style.required_prefix = _
+dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
+dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.constants_symbols.applicable_kinds = field
+dotnet_naming_symbols.constants_symbols.required_modifiers = const
+dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field
+dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field
+dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+
+# ReSharper properties
+resharper_autodetect_indent_settings = true
+resharper_default_private_modifier = implicit
+resharper_place_accessorholder_attribute_on_same_line = false
+resharper_use_indent_from_vs = false
+
+# ReSharper inspection severities
+resharper_arrange_redundant_parentheses_highlighting = hint
+resharper_arrange_this_qualifier_highlighting = hint
+resharper_built_in_type_reference_style_for_member_access_highlighting = hint
+resharper_built_in_type_reference_style_highlighting = hint
+resharper_redundant_base_qualifier_highlighting = warning
+resharper_suggest_var_or_type_built_in_types_highlighting = hint
+resharper_suggest_var_or_type_elsewhere_highlighting = hint
+resharper_suggest_var_or_type_simple_types_highlighting = hint
+resharper_web_config_module_not_resolved_highlighting = warning
+resharper_web_config_type_not_resolved_highlighting = warning
+resharper_web_config_wrong_module_highlighting = warning
+
+[*]
+charset = utf-8
+end_of_line = crlf
+trim_trailing_whitespace = false
+insert_final_newline = false
+indent_style = space
+indent_size = 4
+
+[{*.har,*.inputactions,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
+indent_style = space
+indent_size = 2
+
+[{*.yaml,*.yml}]
+indent_style = space
+indent_size = 2
+
+[{tsconfig.app.json,tsconfig.e2e.json,tsconfig.json,tsconfig.lib.json,tsconfig.spec.json}]
+indent_style = space
+indent_size = 2
+
+[*.{appxmanifest,asax,ascx,aspx,axaml,build,cg,cginc,compute,cs,cshtml,dtd,hlsl,hlsli,hlslinc,master,nuspec,paml,razor,resw,resx,shader,skin,usf,ush,vb,xaml,xamlx,xoml,xsd}]
+indent_style = space
+indent_size = 4
+tab_width = 4
@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Create a report to help us improve.
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+### Describe the bug
+A clear and concise description of what the bug is.
+
+### Which project is your bug related to?
+<!-- Remove the items which don't apply from the following list -->
+- Client
+- ManagedClient
+- MQTTnet.Server standalone
+- Server
+- Generic
+
+### To Reproduce
+Steps to reproduce the behavior:
+1. Using this version of MQTTnet '...'.
+2. Run this code '....'.
+3. With these arguments '....'.
+4. See error.
+
+### Expected behavior
+A clear and concise description of what you expected to happen.
+
+### Screenshots
+If applicable, add screenshots to help explain your problem.
+
+### Additional context / logging
+Add any other context about the problem here.
+Include debugging or logging information here:
+
+```batch
+\\ Put your logging output here.
+```
+### Code example
+ Please provide full code examples below where possible to make it easier for the developers to check your issues.
+ 
+```csharp
+\\ Put your code here.
+```
@@ -0,0 +1,19 @@
+---
+name: Custom issue template
+about: Do you have a question related to the project? Use this template.
+title: ''
+labels: 'question'
+assignees: ''
+
+---
+
+### Describe your question
+A clear and concise description of what you want to know.
+
+### Which project is your question related to?
+<!-- Remove the items which don't apply from the following list -->
+- Client
+- ManagedClient
+- MQTTnet.Server standalone
+- Server
+- Generic
@@ -0,0 +1,29 @@
+---
+name: Feature request
+about: Suggest an idea for this project.
+title: ''
+labels: 'feature-request'
+assignees: ''
+
+---
+
+### Describe the feature request
+Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem is. Example. I'm am trying to do [...] but [...]
+
+### Which project is your feature request related to?
+<!-- Remove the items which don't apply from the following list -->
+- Client
+- ManagedClient
+- MQTTnet.Server standalone
+- Server
+- Generic
+
+### Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+### Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+### Additional context
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,34 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        dotnet-version: ['6.0.x']
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: ${{ matrix.dotnet-version }}
+
+      - name: Build
+        shell: pwsh
+        run: |
+          Set-Location -Path "Build"
+          .\build.ps1 1.2.3 4.5.6-rc1
+
+
+#      - name: Install dependencies
+#        run: dotnet restore MQTTnet.sln
+#      - name: Build
+#        run: dotnet build --configuration Release --no-restore MQTTnet.sln
+#      - name: Test MQTTnet
+#        run: dotnet test --no-restore --verbosity normal Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj
+#      - name: Test AspNetCore
+#        run: dotnet test --no-restore --verbosity normal Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj
@@ -292,3 +292,7 @@ __pycache__/
 *.map

 /Tests/MQTTnet.TestApp.NetCore/RetainedMessages.json
+
+Build/NuGet/
+
+Build/nuget.exe
@@ -3,23 +3,30 @@
  <metadata>
    <id>MQTTnet.AspNetCore</id>
    <version>0.0.0</version>
-    <authors>Christian Kratky</authors>
+    <authors>The contributors of MQTTnet</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>
+    <icon>images\Logo_128x128.png</icon>
+    <requireLicenseAcceptance>true</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-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>
+    <copyright>Copyright Christian Kratky 2016-2021</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 Blazor</tags>
    <dependencies>
-      <dependency id="MQTTnet" version="$nugetVersion" />
+      <group targetFramework="netstandard2.0">
+        <dependency id="MQTTnet" version="$nugetVersion" />
+        <dependency id="Microsoft.AspNetCore.Http.Connections" version="1.0.0"  />
+      </group>

-      <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" />
+      <group targetFramework="netcoreapp3.1">
+        <dependency id="MQTTnet" version="$nugetVersion" />
+      </group>
+
+      <group targetFramework="net5.0">
+        <dependency id="MQTTnet" version="$nugetVersion" />
+      </group>
    </dependencies>
  </metadata>

@@ -27,7 +34,16 @@
    <!-- License -->
    <file src="..\LICENSE" />

+    <!-- Images -->
+    <file src="..\Images\Logo_128x128.png" target="images\" />
+
+    <!-- .NET 5.0 -->
+    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\net5.0\MQTTnet.AspNetCore.*" target="lib\net5.0\" />
+
    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\netstandard2.0\MQTTnet.AspNetCore.*" target="lib\netstandard2.0\"/>
+    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\netstandard2.0\MQTTnet.AspNetCore.*" target="lib\netstandard2.0\" />
+
+    <!-- .NET Core App 3.1 -->
+    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\netcoreapp3.1\MQTTnet.AspNetCore.*" target="lib\netcoreapp3.1\" />
  </files>
 </package>
@@ -3,16 +3,17 @@
  <metadata>
    <id>MQTTnet.Extensions.ManagedClient</id>
    <version>0.0.0</version>
-    <authors>Christian Kratky</authors>
+    <authors>The contributors of MQTTnet</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>
+    <icon>images\Logo_128x128.png</icon>
+    <requireLicenseAcceptance>true</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-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> 
+    <copyright>Copyright Christian Kratky 2016-2021</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 Blazor</tags>
    <dependencies>
      <dependency id="MQTTnet" version="$nugetVersion" />
    </dependencies>
@@ -22,20 +23,29 @@
    <!-- License -->
    <file src="..\LICENSE" />

+    <!-- Images -->
+    <file src="..\Images\Logo_128x128.png" target="images\" />
+
+    <!-- .NET 5.0 -->
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net5.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net5.0\" />
+
    <!-- .NET Standard 1.3 -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard1.3\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard1.3\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard1.3\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard1.3\" />

    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard2.0\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard2.0\" />
+
+    <!-- .NET Standard 2.1 -->
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.1\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard2.1\" />

    <!-- Universal Windows -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\uap10.0\MQTTnet.Extensions.ManagedClient.*" target="lib\uap10.0\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\uap10.0\MQTTnet.Extensions.ManagedClient.*" target="lib\uap10.0\" />

    <!-- .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\net452\MQTTnet.Extensions.ManagedClient.*" target="lib\net452\" />

    <!-- .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\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net461\MQTTnet.Extensions.ManagedClient.*" target="lib\net461\" />

    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
  </files>
@@ -3,16 +3,17 @@
  <metadata>
    <id>MQTTnet.Extensions.Rpc</id>
    <version>0.0.0</version>
-    <authors>Christian Kratky</authors>
+    <authors>The contributors of MQTTnet</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>
+    <icon>images\Logo_128x128.png</icon>
+    <requireLicenseAcceptance>true</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-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> 
+    <copyright>Copyright Christian Kratky 2016-2021</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 Blazor</tags>
    <dependencies>
      <dependency id="MQTTnet" version="$nugetVersion" />
    </dependencies>
@@ -22,20 +23,29 @@
    <!-- License -->
    <file src="..\LICENSE" />

+    <!-- Images -->
+    <file src="..\Images\Logo_128x128.png" target="images\" />
+
+    <!-- .NET 5.0 -->
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\net5.0\MQTTnet.Extensions.Rpc.*" target="lib\net5.0\" />
+
    <!-- .NET Standard 1.3 -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard1.3\MQTTnet.Extensions.Rpc.*" target="lib\netstandard1.3\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard1.3\MQTTnet.Extensions.Rpc.*" target="lib\netstandard1.3\" />

    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\netstandard2.0\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\netstandard2.0\" />
+
+    <!-- .NET Standard 2.1 -->
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.1\MQTTnet.Extensions.Rpc.*" target="lib\netstandard2.1\" />

    <!-- Universal Windows -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\uap10.0\MQTTnet.Extensions.Rpc.*" target="lib\uap10.0\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\uap10.0\MQTTnet.Extensions.Rpc.*" target="lib\uap10.0\" />

    <!-- .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\net452\MQTTnet.Extensions.Rpc.*" target="lib\net452\" />

    <!-- .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\"/>
+    <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>
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>MQTTnet.Extensions.WebSocket4Net</id>
+    <version>0.0.0</version>
+    <authors>The contributors of MQTTnet</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>
+    <icon>images\Logo_128x128.png</icon>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>This is an extension library which allows using _WebSocket4Net_ as transport for MQTTnet clients.</description>
+    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
+    <copyright>Copyright Christian Kratky 2016-2021</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 Blazor</tags>
+    <dependencies>
+      <dependency id="MQTTnet" version="$nugetVersion" />
+      <dependency id="WebSocket4Net" version="0.15.2" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    <!-- License -->
+    <file src="..\LICENSE" />
+
+    <!-- Images -->
+    <file src="..\Images\Logo_128x128.png" target="images\" />
+
+    <!-- .NET 5.0 -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net5.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net5.0\" />
+
+    <!-- .NET Standard 1.3 -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard1.3\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard1.3\" />
+
+    <!-- .NET Standard 2.0 -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard2.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard2.0\" />
+
+    <!-- .NET Standard 2.1 -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard2.1\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard2.1\" />
+
+    <!-- Universal Windows -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\uap10.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\uap10.0\" />
+
+    <!-- .NET Framework -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net452\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net452\" />
+
+    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
+    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net461\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net461\" />
+
+    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
+  </files>
+</package>
@@ -1,42 +0,0 @@
-<?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>
@@ -3,33 +3,39 @@
  <metadata>
    <id>MQTTnet</id>
    <version>0.0.0</version>
-    <authors>Christian Kratky</authors>
+    <authors>The contributors of MQTTnet</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).</description>
+    <icon>images\Logo_128x128.png</icon>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</description>
    <releaseNotes>
-* [Core] Fixed issues in MQTTv5 message encoding and decoding.
+* [Client] Increased delay for keep alive checks do decrease CPU load.
+* [Core] Decreased object allocations (#1324, thanks to @gfoidl).
+* [Core] Decreased object allocations when logging is not active (thanks to @gfoidl, @Tymoniden).
+* [Client] Fixed issue in _MqttApplicationMessageBuilder.WithPayload_ (#1322, thanks to @gfoidl).
+
+Git commit: $gitCommit
    </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> 
+    <copyright>Copyright Christian Kratky 2016-2021</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 Blazor</tags>
    <dependencies>
+      <group targetFramework="net452" />
+      <group targetFramework="net461" />
      <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="NETStandard.Library" version="1.6.1" />
        <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" />
+      <group targetFramework="netstandard2.1" />
+      <group targetFramework="netcoreapp3.1" />
+      <group targetFramework="net5.0" />
      <group targetFramework="uap10.0">
-        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.8" />
+        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.10" />
      </group>
    </dependencies>
  </metadata>
@@ -38,21 +44,33 @@
    <!-- License -->
    <file src="..\LICENSE" />

+    <!-- Images -->
+    <file src="..\Images\Logo_128x128.png" target="images\" />
+
+    <!-- .NET 5.0 -->
+    <file src="..\Source\MQTTnet\bin\Release\net5.0\MQTTnet.*" target="lib\net5.0\" />
+
    <!-- .NET Standard 1.3 -->
-    <file src="..\Source\MQTTnet\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.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\"/>
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\netstandard2.0\" />
+
+    <!-- .NET Standard 2.1 -->
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.1\MQTTnet.*" target="lib\netstandard2.1\" />
+
+    <!-- .NET Standard 3.1 -->
+    <file src="..\Source\MQTTnet\bin\Release\netcoreapp3.1\MQTTnet.*" target="lib\netcoreapp3.1\" />

    <!-- Universal Windows -->
-    <file src="..\Source\MQTTnet\bin\Release\uap10.0\MQTTnet.*" target="lib\uap10.0\"/>
+    <file src="..\Source\MQTTnet\bin\Release\uap10.0\MQTTnet.*" target="lib\uap10.0\" />

    <!-- .NET Framework -->
-    <file src="..\Source\MQTTnet\bin\Release\net452\MQTTnet.*" target="lib\net452\"/>
+    <file src="..\Source\MQTTnet\bin\Release\net452\MQTTnet.*" target="lib\net452\" />

    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet\bin\Release\net461\MQTTnet.*" target="lib\net461\"/>
+    <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>
+</package>
@@ -5,6 +5,7 @@ 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
+$vstest = &$vswhere -products * -latest -find **\TestWindow\**\vstest.console.exe

 Write-Host
 Write-Host "Assembly version = $assemblyVersion"
@@ -12,57 +13,87 @@ Write-Host "Nuget version    = $nugetVersion"
 Write-Host "MSBuild path     = $msbuild"
 Write-Host

+Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe"
+
+.\nuget.exe restore ..\MQTTnet.sln
+
+# Build and execute tests
+&$msbuild ..\Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /verbosity:m
+&$msbuild ..\Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /verbosity:m
+
+&$vstest ..\Tests\MQTTnet.Core.Tests\bin\Release\netcoreapp3.1\MQTTnet.Tests.dll
+&$vstest ..\Tests\MQTTnet.AspNetCore.Tests\bin\Release\netcoreapp3.1\MQTTnet.AspNetCore.Tests.dll
+
 # 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="netstandard2.1" /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="netcoreapp3.1" /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"
+&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.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"
+&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.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="netstandard2.1" /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"
+&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.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="netstandard2.1" /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"
+&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.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"
-
-$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) 
+# Build the WebSocket4Net extension
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"

 # Create NuGet packages.
+
 Remove-Item .\NuGet -Force -Recurse -ErrorAction SilentlyContinue

+$gitCommit = git log -1 --format=%h
+
+Copy-Item MQTTnet.nuspec -Destination MQTTnet.nuspec.old -Force
+(Get-Content MQTTnet.nuspec) -replace '\$gitCommit', $gitCommit | Set-Content MQTTnet.nuspec
 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
+Copy-Item MQTTnet.Extensions.WebSocket4Net.nuspec -Destination MQTTnet.Extensions.WebSocket4Net.nuspec.old -Force
+(Get-Content MQTTnet.Extensions.WebSocket4Net.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.WebSocket4Net.nuspec

 New-Item -ItemType Directory -Force -Path .\NuGet
-.\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
-.\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
+.\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
+.\nuget.exe pack MQTTnet.AspNetCore.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
+.\nuget.exe pack MQTTnet.Extensions.Rpc.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
+.\nuget.exe pack MQTTnet.Extensions.ManagedClient.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
+.\nuget.exe pack MQTTnet.Extensions.WebSocket4Net.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion

+Move-Item MQTTnet.nuspec.old -Destination MQTTnet.nuspec -Force
 Move-Item MQTTnet.AspNetCore.nuspec.old -Destination MQTTnet.AspNetCore.nuspec -Force
 Move-Item MQTTnet.Extensions.Rpc.nuspec.old -Destination MQTTnet.Extensions.Rpc.nuspec -Force
-Move-Item MQTTnet.Extensions.ManagedClient.nuspec.old -Destination MQTTnet.Extensions.ManagedClient.nuspec -Force
+Move-Item MQTTnet.Extensions.ManagedClient.nuspec.old -Destination MQTTnet.Extensions.ManagedClient.nuspec -Force
+Move-Item MQTTnet.Extensions.WebSocket4Net.nuspec.old -Destination MQTTnet.Extensions.WebSocket4Net.nuspec -Force
+
+Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue
@@ -1,9 +1,13 @@
 param([string]$apiKey)

+Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe"
+
 $files = Get-ChildItem -Path ".\NuGet" -Filter "*.nupkg"
 foreach ($file in $files)
 {
 	Write-Host "Uploading: " $file

-	.\nuget.exe push $file.Fullname $apiKey -NoSymbols -Source https://api.nuget.org/v3/index.json
-}
+	.\nuget.exe push $file.Fullname $apiKey -Source https://api.nuget.org/v3/index.json
+}
+
+Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue
@@ -0,0 +1,6 @@
+# Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant
+to clarify expected behavior in our community.
+
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
@@ -1,9 +1,9 @@
 # Import codeSigningKey.pfx
 In order to import the key for code signing on a new developer machine use the following command within the VS developer command line:

-> sn –i codeSigningKey.pfx VS_KEY_EFCA4C5B6DFD4B4F
+sn –i .\codeSigningKey.pfx VS_KEY_62CA73019ED23333

 The container name may be different.

 # Check if the assembly has a strong name
-> sn -vf MQTTnet.dll
+sn -vf MQTTnet.dll
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="MQTT.svg">
+  <defs
+     id="defs2">
+    <filter
+       inkscape:label="Blur Double"
+       inkscape:menu="Blurs"
+       inkscape:menu-tooltip="Overlays two copies with different blur amounts and modifiable blend and composite"
+       style="color-interpolation-filters:sRGB;"
+       id="filter3801">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="fbSourceGraphic"
+         id="feGaussianBlur3793" />
+      <feGaussianBlur
+         stdDeviation="0.01"
+         in="SourceGraphic"
+         result="result1"
+         id="feGaussianBlur3795" />
+      <feComposite
+         in2="result1"
+         operator="arithmetic"
+         in="fbSourceGraphic"
+         k2="0.5"
+         k3="0.5"
+         result="result2"
+         id="feComposite3797" />
+      <feBlend
+         in2="fbSourceGraphic"
+         mode="normal"
+         result="result3"
+         id="feBlend3799" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.24748737"
+     inkscape:cx="955.72999"
+     inkscape:cy="295.38958"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3840"
+     inkscape:window-height="2066"
+     inkscape:window-x="2989"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       ry="50"
+       rx="50"
+       style="fill:#000000;stroke-width:0.26458332;filter:url(#filter3801)"
+       y="92.501205"
+       x="56.367012"
+       height="512"
+       width="512"
+       id="rect3791"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <rect
+       id="rect3713"
+       width="512"
+       height="512"
+       x="53.721176"
+       y="88.797035"
+       style="fill:#aa0000;stroke-width:0.26458332"
+       rx="50"
+       ry="50"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <rect
+       style="fill:#ce0000;fill-opacity:0.60591131;stroke-width:0.28100395"
+       id="rect3806"
+       width="143.25298"
+       height="9.0714283"
+       x="270.81995"
+       y="554.02386"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4638"
+       d="m 494.14104,142.00092 -5.35736,41.28822 67.77684,374.38977 a 263.46279,229.17651 36.835702 0 1 4.98278,-0.4605 263.46279,229.17651 36.835702 0 1 7.77403,0.0471 z"
+       style="fill:#ce0000;fill-opacity:0.60591131;stroke-width:0.59952348"
+       inkscape:transform-center-x="-28.818481"
+       inkscape:transform-center-y="146.97441"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <path
+       style="fill:#d40000;stroke-width:1.76103246"
+       d="m 2138.1582,1411.377 a 995.76488,866.17897 0 0 0 -842.3984,854.3418 995.76488,866.17897 0 0 0 0.2988,5.0097 h 653.123 c 104.693,0 188.9766,-84.2836 188.9766,-188.9765 z"
+       transform="scale(0.26458333)"
+       id="path3715-5-8"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <ellipse
+       style="fill:#d40000;stroke-width:0.06901014"
+       id="path3715-5"
+       cx="492.58557"
+       cy="170.58017"
+       rx="39.021355"
+       ry="33.94323"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <path
+       style="fill:#ce0000;fill-opacity:0.60591131;stroke-width:2.26591563"
+       d="M 464.66602,532.89453 542.01562,669.92969 1595.373,1648.873 a 995.76487,866.17896 0 0 1 14.0293,-12.6835 995.76487,866.17896 0 0 1 23.6231,-17.4727 z"
+       id="rect3806-2"
+       inkscape:connector-curvature="0"
+       transform="scale(0.26458333)"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="102.34985"
+       y="320.75201"
+       id="text3774"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001"><tspan
+         sodipodi:role="line"
+         id="tspan3772"
+         x="102.34985"
+         y="320.75201"
+         style="font-size:141.1111145px;fill:#ffffff;stroke-width:0.26458332">MQTT</tspan></text>
+    <ellipse
+       ry="33.94323"
+       rx="39.021355"
+       cy="148.56271"
+       cx="124.47787"
+       id="ellipse3768"
+       style="fill:#d40000;stroke-width:0.06901014"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <ellipse
+       style="fill:#d40000;stroke-width:0.06901014"
+       id="ellipse3770"
+       cx="234.9953"
+       cy="556.91571"
+       rx="39.021355"
+       ry="33.94323"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001" />
+    <text
+       id="text3778"
+       y="474.73837"
+       x="194.57605"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       xml:space="preserve"
+       inkscape:export-xdpi="2.6500001"
+       inkscape:export-ydpi="2.6500001"><tspan
+         style="font-size:141.1111145px;fill:#ffffff;stroke-width:0.26458332"
+         y="474.73837"
+         x="194.57605"
+         id="tspan3776"
+         sodipodi:role="line">net</tspan></text>
+    <rect
+       ry="50"
+       rx="50"
+       style="fill:#aa0000;stroke-width:0.26458332"
+       y="97.349655"
+       x="-672.18286"
+       height="512"
+       width="512"
+       id="rect4642"
+       inkscape:export-xdpi="6.3499999"
+       inkscape:export-ydpi="6.3499999" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4648"
+       d="m -160.18302,381.97945 a 263.46279,229.17652 0 0 0 -222.88457,226.0446 263.46279,229.17652 0 0 0 0.0791,1.32549 h 172.80546 c 27.70002,0 50.00005,-22.30004 50.00005,-50.00004 z"
+       style="fill:#d40000;stroke-width:0.46593982"
+       inkscape:export-xdpi="6.3499999"
+       inkscape:export-ydpi="6.3499999" />
+    <text
+       id="text4656"
+       y="329.30466"
+       x="-639.42944"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       xml:space="preserve"
+       inkscape:export-xdpi="6.3499999"
+       inkscape:export-ydpi="6.3499999"><tspan
+         style="font-weight:bold;font-size:141.1111145px;fill:#ffffff;stroke-width:0.26458332"
+         y="329.30466"
+         x="-639.42944"
+         id="tspan4654"
+         sodipodi:role="line">MQTT</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="-550.90747"
+       y="482.23267"
+       id="text4664"
+       inkscape:export-xdpi="6.3499999"
+       inkscape:export-ydpi="6.3499999"><tspan
+         sodipodi:role="line"
+         id="tspan4662"
+         x="-550.90747"
+         y="482.23267"
+         style="font-weight:bold;font-size:141.1111145px;fill:#ffffff;stroke-width:0.26458332">net</tspan></text>
+  </g>
+</svg>
@@ -1,6 +1,6 @@
 MIT License

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

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
+VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}"
 EndProject
@@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9248C2E1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{32A630A7-2598-41D7-B625-204CD906F5FB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.TestApp.UniversalWindows", "Tests\MQTTnet.TestApp.UniversalWindows\MQTTnet.TestApp.UniversalWindows.csproj", "{FF1F72D6-9524-4422-9497-3CC0002216ED}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "Source\MQTTnet\MQTTnet.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{67C28AC1-BC3A-420A-BE9C-FA2401431CF9}"
@@ -19,7 +17,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.Extensions.WebSocket4Net.nuspec = Build\MQTTnet.Extensions.WebSocket4Net.nuspec
 		Build\MQTTnet.nuspec = Build\MQTTnet.nuspec
 		Build\upload.ps1 = Build\upload.ps1
 	EndProjectSection
@@ -27,6 +25,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3F60ECB-45BA-4C66-8903-8BB89CA67998}"
 	ProjectSection(SolutionItems) = preProject
 		.bettercodehub.yml = .bettercodehub.yml
+		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		LICENSE = LICENSE
 		README.md = README.md
@@ -48,7 +47,15 @@ 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.WebSocket4Net", "Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj", "{2BD01D53-4CA5-4142-BE8D-313876395E3E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Blazor", "Blazor", "{61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Test.BlazorApp.Server", "Tests\MQTTnet.Test.BlazorApp\Server\MQTTnet.Test.BlazorApp.Server.csproj", "{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Test.BlazorApp.Client", "Tests\MQTTnet.Test.BlazorApp\Client\MQTTnet.Test.BlazorApp.Client.csproj", "{D260D63D-7902-4C55-9665-84C5CACBBB24}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Test.BlazorApp.Shared", "Tests\MQTTnet.Test.BlazorApp\Shared\MQTTnet.Test.BlazorApp.Shared.csproj", "{DDB069BA-6E1A-48C7-B374-5D903B553CAD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -78,29 +85,6 @@ Global
 		{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
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|ARM.ActiveCfg = Debug|ARM
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|ARM.Build.0 = Debug|ARM
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|ARM.Deploy.0 = Debug|ARM
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|x64.ActiveCfg = Debug|x64
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|x64.Build.0 = Debug|x64
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|x64.Deploy.0 = Debug|x64
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|x86.ActiveCfg = Debug|x86
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|x86.Build.0 = Debug|x86
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|x86.Deploy.0 = Debug|x86
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|ARM.ActiveCfg = Release|ARM
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|ARM.Build.0 = Release|ARM
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|ARM.Deploy.0 = Release|ARM
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|x64.ActiveCfg = Release|x64
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|x64.Build.0 = Release|x64
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|x64.Deploy.0 = Release|x64
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|x86.ActiveCfg = Release|x86
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|x86.Build.0 = Release|x86
-		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Release|x86.Deploy.0 = Release|x86
 		{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
@@ -229,29 +213,76 @@ 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
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x64.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Debug|x86.Build.0 = Debug|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|ARM.Build.0 = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x64.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x64.Build.0 = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x86.Build.0 = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x64.Build.0 = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x86.Build.0 = Debug|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|ARM.Build.0 = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x64.ActiveCfg = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x64.Build.0 = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x86.ActiveCfg = Release|Any CPU
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x86.Build.0 = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x64.Build.0 = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x86.Build.0 = Debug|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|ARM.Build.0 = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x64.ActiveCfg = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x64.Build.0 = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x86.ActiveCfg = Release|Any CPU
+		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x86.Build.0 = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|ARM.Build.0 = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x64.Build.0 = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x86.Build.0 = Debug|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|ARM.Build.0 = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|x64.ActiveCfg = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|x64.Build.0 = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|x86.ActiveCfg = Release|Any CPU
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.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}
-		{FF1F72D6-9524-4422-9497-3CC0002216ED} = {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}
@@ -260,7 +291,11 @@ 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}
+		{2BD01D53-4CA5-4142-BE8D-313876395E3E} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
+		{61B165A0-5AA8-4E04-A53D-A22A84AA6EB7} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
+		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F} = {61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}
+		{D260D63D-7902-4C55-9665-84C5CACBBB24} = {61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}
+		{DDB069BA-6E1A-48C7-B374-5D903B553CAD} = {61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}
@@ -11,4 +11,6 @@
 	<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>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGREQ/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=unsub/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -1,14 +1,13 @@
 <p align="center">
-<img src="https://github.com/chkr1011/MQTTnet/blob/master/Images/Logo_128x128.png?raw=true" width="128">
+<img src="https://github.com/chkr1011/MQTTnet/blob/master/Images/icon_det_256.png?raw=true" width="196">
 <br/>
 <br/>
 </p>

 [![NuGet Badge](https://buildstats.info/nuget/MQTTnet)](https://www.nuget.org/packages/MQTTnet)
-[![Build status](https://ci.appveyor.com/api/projects/status/ycit86voxfevm2aa/branch/master?svg=true)](https://ci.appveyor.com/project/chkr1011/mqttnet)
 [![BCH compliance](https://bettercodehub.com/edge/badge/chkr1011/MQTTnet?branch=master)](https://bettercodehub.com/)
-[![OpenCollective](https://opencollective.com/mqttnet/backers/badge.svg)](https://opencollective.com/mqttnet) 
-[![OpenCollective](https://opencollective.com/mqttnet/sponsors/badge.svg)](https://opencollective.com/mqttnet)
+[![Join the chat at https://gitter.im/MQTTnet/community](https://badges.gitter.im/MQTTnet/community.svg)](https://gitter.im/MQTTnet/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://raw.githubusercontent.com/chkr1011/MQTTnet/master/LICENSE)

 # MQTTnet

@@ -19,14 +18,14 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 ### General

 * Async support
-* TLS 1.2 support for client and server (but not UWP servers)
+* TLS support for client and server (but not UWP servers)
 * Extensible communication channels (e.g. In-Memory, TCP, TCP+TLS, WS)
 * Lightweight (only the low level implementation of MQTT, no overhead)
 * Performance optimized (processing ~70.000 messages / second)*
 * Uniform API across all supported versions of the MQTT protocol
 * Interfaces included for mocking and testing
 * Access to internal trace messages
-* Unit tested (~200 tests)
+* Unit tested (~250 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_.
@@ -34,7 +33,7 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 ### Client

 * Communication via TCP (+TLS) or WS (WebSocket) supported
-* Included core _MqttClient_ with low level functionality
+* Included core _LowLevelMqttClient_ with low level functionality
 * Also included _ManagedMqttClient_ which maintains the connection and subscriptions automatically. Also application messages are queued and re-scheduled for higher QoS levels automatically.
 * Rx support (via another project)
 * Compatible with Microsoft Azure IoT Hub
@@ -56,7 +55,7 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov

 _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
+* Runs under 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)
@@ -64,14 +63,32 @@ _MQTTnet Server_ is a standalone cross platform MQTT server (like mosquitto) bas

 ## Supported frameworks

+* .NET 5.0+
 * .NET Standard 1.3+
 * .NET Core 1.1+
 * .NET Core App 1.1+
-* .NET Framework 4.5.2+ (x86, x64, AnyCPU)
+* .NET Framework 4.5.2+
 * Mono 5.2+
-* Universal Windows Platform (UWP) 10.0.10240+ (x86, x64, ARM, AnyCPU, Windows 10 IoT Core)
+* Universal Windows Platform (UWP) 10.0.10240+ (Windows 10 IoT Core)
 * Xamarin.Android 7.5+
 * Xamarin.iOS 10.14+
+* Blazor WebAssembly 3.2.0+
+
+## Supported platforms
+
+* x86
+* x64
+* AnyCPU
+* ARM
+
+## Supported OS
+
+* Windows
+* Windows 10 IoT Core
+* Linux (Ubuntu, Raspbian etc.)
+* macOS
+* Android
+* iOS

 ## Supported MQTT versions

@@ -92,17 +109,21 @@ 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, 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

 This library is used in the following projects:

-* Azure Functions MQTT Bindings, [CaseOnline.Azure.WebJobs.Extensions.Mqtt](https://github.com/keesschollaart81/CaseOnline.Azure.WebJobs.Extensions.Mqtt/)
+* Azure Functions MQTT Bindings, <https://github.com/keesschollaart81/CaseOnline.Azure.WebJobs.Extensions.Mqtt>)
 * HA4IoT (Open Source Home Automation system for .NET, <https://github.com/chkr1011/HA4IoT>)
 * MQTT Client Rx (Wrapper for Reactive Extensions, <https://github.com/1iveowl/MQTTClient.rx>)
+* MQTT Client Rx (Managed Client Wrapper for Reactive Extensions, <https://github.com/mmuecke/RxMQTTnet>)
 * MQTT Tester (MQTT client test app for [Android](https://play.google.com/store/apps/details?id=com.liveowl.mqtttester) and [iOS](https://itunes.apple.com/us/app/mqtt-tester/id1278621826?mt=8))
+* MQTTnet App (Cross platform client application for MQTT debugging, inspection etc., <https://github.com/chkr1011/MQTTnet.App>)
 * Wirehome.Core (Open Source Home Automation system for .NET Core, <https://github.com/chkr1011/Wirehome.Core>)
+* SparkplugNet (Sparkplug library for .Net, <https://github.com/SeppPenner/SparkplugNet>)
+* Silverback (Framework to build event-driven applications - support for MQTT, Kafka & RabbitMQ) <https://github.com/BEagle1984/silverback>
+
+Further projects using this project can be found under https://github.com/chkr1011/MQTTnet/network/dependents.

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

@@ -110,7 +131,7 @@ If you use this library and want to see your project here please create a pull r

 MIT License

-MQTTnet Copyright (c) 2016-2019 Christian Kratky
+MQTTnet Copyright (c) 2016-2021 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
@@ -1,17 +1,15 @@
-using System;
-using System.Net;
-using MQTTnet.Adapter;
+using MQTTnet.Adapter;
 using MQTTnet.AspNetCore.Client.Tcp;
-using MQTTnet.Client;
 using MQTTnet.Client.Options;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
+using System;
+using System.Net;

 namespace MQTTnet.AspNetCore.Client
 {
    public class MqttClientConnectionContextFactory : IMqttClientAdapterFactory
    {
-        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetChildLogger logger)
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options)
        {
            if (options == null) throw new ArgumentNullException(nameof(options));

@@ -1,13 +1,13 @@
-using System;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Http.Features;
+using MQTTnet.Exceptions;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Pipelines;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Connections;
-using Microsoft.AspNetCore.Http.Features;
-using MQTTnet.Exceptions;

 namespace MQTTnet.AspNetCore.Client.Tcp
 {
@@ -40,8 +40,11 @@ namespace MQTTnet.AspNetCore.Client.Tcp
            _sender = new SocketSender(_socket, PipeScheduler.ThreadPool);
            _receiver = new SocketReceiver(_socket, PipeScheduler.ThreadPool);
        }
-
+#if NETCOREAPP3_1 || NET5_0
+        public override ValueTask DisposeAsync()
+#else
        public Task DisposeAsync()
+#endif
        {
            IsConnected = false;

@@ -50,8 +53,15 @@ namespace MQTTnet.AspNetCore.Client.Tcp

            _socket?.Dispose();

+#if NETCOREAPP3_1 || NET5_0
+
+            return base.DisposeAsync();
+        }
+#else
+
            return Task.CompletedTask;
        }
+#endif

        public async Task StartAsync()
        {
@@ -1,14 +1,13 @@
 using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using System.Linq;
 using MQTTnet.Server;
-using System.Collections.Generic;

-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
    public static class ApplicationBuilderExtensions
    {
+        [Obsolete("This class is obsolete and will be removed in a future version. The recommended alternative is to use MapMqtt inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")]
        public static IApplicationBuilder UseMqttEndpoint(this IApplicationBuilder app, string path = "/mqtt")
        {
            app.UseWebSockets();
@@ -24,7 +23,7 @@ namespace MQTTnet.AspNetCore

                if (context.Request.Headers.TryGetValue("Sec-WebSocket-Protocol", out var requestedSubProtocolValues))
                {
-                    subProtocol = SelectSubProtocol(requestedSubProtocolValues);
+                    subProtocol = MqttSubProtocolSelector.SelectSubProtocol(requestedSubProtocolValues);
                }

                var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
@@ -37,14 +36,6 @@ namespace MQTTnet.AspNetCore
            return app;
        }

-        public static string SelectSubProtocol(IList<string> requestedSubProtocolValues)
-        {
-            // Order the protocols to also match "mqtt", "mqttv-3.1", "mqttv-3.11" etc.
-            return requestedSubProtocolValues
-                .OrderByDescending(p => p.Length)
-                .FirstOrDefault(p => p.ToLower().StartsWith("mqtt"));
-        }
-
        public static IApplicationBuilder UseMqttServer(this IApplicationBuilder app, Action<IMqttServer> configure)
        {
            var server = app.ApplicationServices.GetRequiredService<IMqttServer>();
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Connections;

-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
    public static class ConnectionBuilderExtensions
    {
@@ -0,0 +1,25 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Connections;
+
+#if NETCOREAPP3_1
+using System;
+#endif
+
+namespace MQTTnet.AspNetCore.Extensions
+{
+    public static class ConnectionRouteBuilderExtensions
+    {
+#if NETCOREAPP3_1
+        [Obsolete("This class is obsolete and will be removed in a future version. The recommended alternative is to use MapMqtt inside Microsoft.AspNetCore.Builder.UseEndpoints(...).")]
+#endif
+#if NETCOREAPP3_1 || NETCOREAPP2_1 || NETSTANDARD
+        public static void MapMqtt(this ConnectionsRouteBuilder connection, PathString path)
+        {
+            connection.MapConnectionHandler<MqttConnectionHandler>(path, options =>
+            {
+                options.WebSockets.SubProtocolSelector = MqttSubProtocolSelector.SelectSubProtocol;
+            });
+        }
+#endif
+    }
+}
@@ -0,0 +1,21 @@
+
+#if NETCOREAPP3_1 || NET5_0
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Routing;
+
+namespace MQTTnet.AspNetCore
+{
+    public static class EndpointRouterExtensions
+    {
+        public static void MapMqtt(this IEndpointRouteBuilder endpoints, string pattern) 
+        {
+            endpoints.MapConnectionHandler<MqttConnectionHandler>(pattern, options =>
+            {
+                options.WebSockets.SubProtocolSelector = MqttSubProtocolSelector.SelectSubProtocol;
+            });
+        }
+    }
+}
+
+#endif
@@ -5,7 +5,7 @@ using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;

-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
    public static class ReaderExtensions
    {
@@ -80,7 +80,7 @@ namespace MQTTnet.AspNetCore
            headerLength = 0;
            bodyLength = 0;
            
-            var temp = input.Slice(0, Math.Min(5, input.Length)).GetMemory();
+            var temp = input.Slice(0, Math.Min(5, input.Length)).GetMemory().Span;

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

                value += (byte)(encodedByte & 127) * multiplier;
@@ -3,17 +3,18 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
-using MQTTnet.Server;
+using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Implementations;
+using MQTTnet.Server;

-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore.Extensions
 {
    public static class ServiceCollectionExtensions
    {
        public static IServiceCollection AddHostedMqttServer(this IServiceCollection services, IMqttServerOptions options)
        {
            if (options == null) throw new ArgumentNullException(nameof(options));
-            
+
            services.AddSingleton(options);

            services.AddHostedMqttServer();
@@ -23,7 +24,8 @@ namespace MQTTnet.AspNetCore

        public static IServiceCollection AddHostedMqttServer(this IServiceCollection services, Action<MqttServerOptionsBuilder> configure)
        {
-            services.AddSingleton<IMqttServerOptions>(s => {
+            services.AddSingleton<IMqttServerOptions>(s =>
+            {
                var builder = new MqttServerOptionsBuilder();
                configure(builder);
                return builder.Build();
@@ -36,7 +38,8 @@ namespace MQTTnet.AspNetCore

        public static IServiceCollection AddHostedMqttServerWithServices(this IServiceCollection services, Action<AspNetMqttServerOptionsBuilder> configure)
        {
-            services.AddSingleton<IMqttServerOptions>(s => {
+            services.AddSingleton<IMqttServerOptions>(s =>
+            {
                var builder = new AspNetMqttServerOptionsBuilder(s);
                configure(builder);
                return builder.Build();
@@ -59,15 +62,13 @@ namespace MQTTnet.AspNetCore

        private static IServiceCollection AddHostedMqttServer(this IServiceCollection services)
        {
-            var logger = new MqttNetLogger();
-            var childLogger = logger.CreateChildLogger();
+            var logger = new MqttNetEventLogger();

            services.AddSingleton<IMqttNetLogger>(logger);
-            services.AddSingleton(childLogger);
            services.AddSingleton<MqttHostedServer>();
            services.AddSingleton<IHostedService>(s => s.GetService<MqttHostedServer>());
            services.AddSingleton<IMqttServer>(s => s.GetService<MqttHostedServer>());
-            
+
            return services;
        }

@@ -1,24 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
    <Product />
    <Company />
    <Authors />
    <PackageId />
    <LangVersion>7.2</LangVersion>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
  </PropertyGroup>

+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
    <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
  </PropertyGroup>

-  <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 Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' ">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+    
+  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' and '$(TargetFramework)' != 'net5.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.1.0" />
  </ItemGroup>

  <ItemGroup>
@@ -7,13 +7,22 @@ using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using System;
 using System.IO.Pipelines;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.AspNetCore.Extensions;
+using MQTTnet.Internal;

 namespace MQTTnet.AspNetCore
 {
-    public class MqttConnectionContext : IMqttChannelAdapter
+    public sealed class MqttConnectionContext : IMqttChannelAdapter
    {
+        readonly AsyncLock _writerLock = new AsyncLock();
+        readonly SpanBasedMqttPacketBodyReader _reader;
+        
+        PipeReader _input;
+        PipeWriter _output;
+        
        public MqttConnectionContext(MqttPacketFormatterAdapter packetFormatterAdapter, ConnectionContext connection)
        {
            PacketFormatterAdapter = packetFormatterAdapter ?? throw new ArgumentNullException(nameof(packetFormatterAdapter));
@@ -24,18 +33,20 @@ namespace MQTTnet.AspNetCore
                _input = Connection.Transport.Input;
                _output = Connection.Transport.Output;
            }
-            
+
            _reader = new SpanBasedMqttPacketBodyReader();
        }

-        private PipeReader _input;
-        private PipeWriter _output;
-        private readonly SpanBasedMqttPacketBodyReader _reader;
-
        public string Endpoint
        {
            get
            {
+#if NETCOREAPP3_1
+                if (Connection?.RemoteEndPoint != null)
+                {
+                    return Connection.RemoteEndPoint.ToString();
+                }
+#endif
                var connection = Http?.HttpContext?.Connection;
                if (connection == null)
                {
@@ -48,18 +59,19 @@ namespace MQTTnet.AspNetCore

        public bool IsSecureConnection => Http?.HttpContext?.Request?.IsHttps ?? false;

-        private IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();
+        public X509Certificate2 ClientCertificate => Http?.HttpContext?.Connection?.ClientCertificate;

        public ConnectionContext Connection { get; }
+        
        public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }

        public long BytesSent { get; set; }
+
        public long BytesReceived { get; set; }

-        public Action ReadingPacketStartedCallback { get; set; }
-        public Action ReadingPacketCompletedCallback { get; set; }
+        public bool IsReadingPacket { get; private set; }

-        private readonly SemaphoreSlim _writerSemaphore = new SemaphoreSlim(1, 1);
+        IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();

        public async Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
        {
@@ -80,7 +92,7 @@ namespace MQTTnet.AspNetCore
            return Task.CompletedTask;
        }

-        public async Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        public async Task<MqttBasePacket> ReceivePacketAsync(CancellationToken cancellationToken)
        {
            var input = Connection.Transport.Input;

@@ -116,7 +128,7 @@ namespace MQTTnet.AspNetCore
                            else
                            {
                                // we did receive something but the message is not yet complete
-                                ReadingPacketStartedCallback?.Invoke();
+                                IsReadingPacket = true;
                            }
                        }
                        else if (readResult.IsCompleted)
@@ -133,35 +145,43 @@ namespace MQTTnet.AspNetCore
                    }
                }
            }
+            catch (Exception e)
+            {
+                // completing the channel makes sure that there is no more data read after a protocol error
+                _input?.Complete(e);
+                _output?.Complete(e);
+                throw;
+            }
            finally
            {
-                ReadingPacketCompletedCallback?.Invoke();
+                IsReadingPacket = false;
            }

            cancellationToken.ThrowIfCancellationRequested();
            return null;
        }

-        public async Task SendPacketAsync(MqttBasePacket packet, TimeSpan timeout, CancellationToken cancellationToken)
+        public void ResetStatistics()
+        {
+            BytesReceived = 0;
+            BytesSent = 0;
+        }
+
+        public async Task SendPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken)
        {
            var formatter = PacketFormatterAdapter;
-
-
-            await _writerSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-            try
+            using (await _writerLock.WaitAsync(cancellationToken).ConfigureAwait(false))
            {
                var buffer = formatter.Encode(packet);
                var msg = buffer.AsMemory();
                var output = _output;
-                msg.CopyTo(output.GetMemory(msg.Length));
-                BytesSent += msg.Length;
+                var result = await output.WriteAsync(msg, cancellationToken).ConfigureAwait(false);
+                if (result.IsCompleted)
+                {
+                    BytesSent += msg.Length;
+                }
+
                PacketFormatterAdapter.FreeBuffer();
-                output.Advance(msg.Length);
-                await output.FlushAsync().ConfigureAwait(false);
-            }
-            finally
-            {
-                _writerSemaphore.Release();
            }
        }

@@ -4,24 +4,25 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Server;

 namespace MQTTnet.AspNetCore
 {
-    public class MqttHostedServer : MqttServer, IHostedService
+    public sealed class MqttHostedServer : MqttServer, IHostedService
    {
-        private readonly IMqttServerOptions _options;
+        readonly IMqttServerOptions _options;

        public MqttHostedServer(IMqttServerOptions options, IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) 
-            : base(adapters, logger.CreateChildLogger(nameof(MqttHostedServer)))
+            : base(adapters, logger)
        {
            _options = options ?? throw new ArgumentNullException(nameof(options));
        }

        public Task StartAsync(CancellationToken cancellationToken)
        {
-            return StartAsync(_options);
+            _ = StartAsync(_options);
+            return Task.CompletedTask;
        }

        public Task StopAsync(CancellationToken cancellationToken)
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+
+namespace MQTTnet.AspNetCore
+{
+    public static class MqttSubProtocolSelector
+    {
+        public static string SelectSubProtocol(HttpRequest request)
+        {
+            if (request == null) throw new ArgumentNullException(nameof(request));
+
+            string subProtocol = null;
+            if (request.Headers.TryGetValue("Sec-WebSocket-Protocol", out var requestedSubProtocolValues))
+            {
+                subProtocol = SelectSubProtocol(requestedSubProtocolValues);
+            }
+
+            return subProtocol;
+        }
+        
+        public static string SelectSubProtocol(IList<string> requestedSubProtocolValues)
+        {
+            if (requestedSubProtocolValues == null) throw new ArgumentNullException(nameof(requestedSubProtocolValues));
+
+            // Order the protocols to also match "mqtt", "mqttv-3.1", "mqttv-3.11" etc.
+            return requestedSubProtocolValues
+                .OrderByDescending(p => p.Length)
+                .FirstOrDefault(p => p.ToLower().StartsWith("mqtt"));
+        }
+    }
+}
@@ -1,24 +1,22 @@
-using System;
-using System.Net.WebSockets;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Implementations;
 using MQTTnet.Server;
+using System;
+using System.Net.WebSockets;
+using System.Threading.Tasks;
+using MQTTnet.Diagnostics.Logger;

 namespace MQTTnet.AspNetCore
 {
-    public class MqttWebSocketServerAdapter : IMqttServerAdapter
+    public sealed class MqttWebSocketServerAdapter : IMqttServerAdapter
    {
-        private readonly IMqttNetChildLogger _logger;
+        readonly IMqttNetLogger _rootLogger;

-        public MqttWebSocketServerAdapter(IMqttNetChildLogger logger)
+        public MqttWebSocketServerAdapter(IMqttNetLogger logger)
        {
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-
-            _logger = logger.CreateChildLogger(nameof(MqttTcpServerAdapter));
+            _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger));
        }

        public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }
@@ -38,21 +36,28 @@ namespace MQTTnet.AspNetCore
            if (webSocket == null) throw new ArgumentNullException(nameof(webSocket));

            var endpoint = $"{httpContext.Connection.RemoteIpAddress}:{httpContext.Connection.RemotePort}";
-            
-            var clientCertificate = await httpContext.Connection.GetClientCertificateAsync().ConfigureAwait(false);
-            var isSecureConnection = clientCertificate != null;
-            clientCertificate?.Dispose();

-            var clientHandler = ClientHandler;
-            if (clientHandler != null)
+            var clientCertificate = await httpContext.Connection.GetClientCertificateAsync().ConfigureAwait(false);
+            try
            {
-                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))))
+                var isSecureConnection = clientCertificate != null;
+
+                var clientHandler = ClientHandler;
+                if (clientHandler != null)
                {
-                    await clientHandler(channelAdapter).ConfigureAwait(false);
-                }   
+                    var writer = new SpanBasedMqttPacketWriter();
+                    var formatter = new MqttPacketFormatterAdapter(writer);
+                    var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection, clientCertificate);
+
+                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, null, _rootLogger))
+                    {
+                        await clientHandler(channelAdapter).ConfigureAwait(false);
+                    }
+                }
+            }
+            finally
+            {
+                clientCertificate?.Dispose();
            }
        }

@@ -8,8 +8,9 @@ namespace MQTTnet.AspNetCore
 {
    public class SpanBasedMqttPacketBodyReader : IMqttPacketBodyReader
    {
-        private ReadOnlyMemory<byte> _buffer;
-        private int _offset;
+        ReadOnlyMemory<byte> _buffer;
+
+        int _offset;
        
        public void SetBuffer(ReadOnlyMemory<byte> buffer)
        {
@@ -17,11 +18,11 @@ namespace MQTTnet.AspNetCore
            _offset = 0;
        }

-        public ulong Length => (ulong)_buffer.Length;
+        public int Length => _buffer.Length;

        public bool EndOfStream => _buffer.Length.Equals(_offset);
        
-        public ulong Offset => (ulong)_offset;
+        public int Offset => _offset;

        public byte ReadByte()
        {
@@ -37,16 +38,6 @@ namespace MQTTnet.AspNetCore
        {
            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()
        {
@@ -116,9 +107,23 @@ namespace MQTTnet.AspNetCore
            throw new MqttProtocolViolationException("Boolean values can be 0 or 1 only.");
        }

-        public void Seek(ulong position)
+        public void Seek(int position)
        {
-            _offset = (int)position;
+            _offset = position;
+        }
+
+        ReadOnlySpan<byte> ReadSegmentWithLengthPrefix()
+        {
+            var span = _buffer.Span;
+            var length = BinaryPrimitives.ReadUInt16BigEndian(span.Slice(_offset));
+
+            if (Length < _offset + length)
+            {
+                throw new MqttProtocolViolationException($"Expected at least {_offset + 2 + length} bytes but there are only {Length} bytes");
+            }
+            var result = span.Slice(_offset + 2, length);
+            _offset += 2 + length;
+            return result;
        }
    }
 }
@@ -8,16 +8,15 @@ namespace MQTTnet.AspNetCore
 {
    public class SpanBasedMqttPacketWriter : IMqttPacketWriter
    {
-        private readonly ArrayPool<byte> _pool;
+        readonly ArrayPool<byte> _pool = ArrayPool<byte>.Create();

        public SpanBasedMqttPacketWriter()
        {
-            _pool = ArrayPool<byte>.Create();
-            
+            Reset(0);
        }

-        private byte[] _buffer;
-        private int _position;
+        byte[] _buffer;
+        int _position;

        public int Length { get; set; }

@@ -64,7 +63,6 @@ namespace MQTTnet.AspNetCore

            GrowIfNeeded(propertyWriter.Length);
            Write(propertyWriter.GetBuffer(), 0, propertyWriter.Length);
-            Commit(propertyWriter.Length);
        }

        public void Write(byte[] payload, int start, int length)
@@ -113,7 +111,7 @@ namespace MQTTnet.AspNetCore
            Commit(payload.Length);
        }

-        private void Commit(int count)
+        void Commit(int count)
        {
            if (_position == Length)
            {
@@ -123,7 +121,7 @@ namespace MQTTnet.AspNetCore
            _position += count;
        }

-        private void GrowIfNeeded(int requiredAdditional) 
+        void GrowIfNeeded(int requiredAdditional) 
        {
            var requiredTotal = _position + requiredAdditional;
            if (_buffer.Length >= requiredTotal)
@@ -1,31 +1,49 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Client;

 namespace MQTTnet.Extensions.ManagedClient
 {
    public interface IManagedMqttClient : IApplicationMessageReceiver, IApplicationMessagePublisher, IDisposable
    {
-        bool IsStarted { get; }
-        bool IsConnected { get; }
-        int PendingApplicationMessagesCount { get; }
-        IManagedMqttClientOptions Options { get; }
+        /// <summary>
+        /// Gets the internally used MQTT client.
+        /// This property should be used with caution because manipulating the internal client might break the managed client.
+        /// </summary>
+        IMqttClient InternalClient { get; }

+        bool IsStarted { get; }
+        
+        bool IsConnected { get; }
+        
+        int PendingApplicationMessagesCount { get; }
+        
+        IManagedMqttClientOptions Options { get; }
+        
        IMqttClientConnectedHandler ConnectedHandler { get; set; }
+        
        IMqttClientDisconnectedHandler DisconnectedHandler { get; set; }

        IApplicationMessageProcessedHandler ApplicationMessageProcessedHandler { get; set; }
+        
        IApplicationMessageSkippedHandler ApplicationMessageSkippedHandler { get; set; }

        IConnectingFailedHandler ConnectingFailedHandler { get; set; }
-        ISynchronizingSubscriptionsFailedHandler SynchronizingSubscriptionsFailedHandler { get; set; }
        
-        Task StartAsync(IManagedMqttClientOptions options);
-        Task StopAsync();
+        ISynchronizingSubscriptionsFailedHandler SynchronizingSubscriptionsFailedHandler { get; set; }

-        Task SubscribeAsync(IEnumerable<TopicFilter> topicFilters);
+        Task StartAsync(IManagedMqttClientOptions options);
+        
+        Task StopAsync();
+        
+        Task PingAsync(CancellationToken cancellationToken);
+
+        Task SubscribeAsync(IEnumerable<MqttTopicFilter> topicFilters);
+        
        Task UnsubscribeAsync(IEnumerable<string> topics);

        Task PublishAsync(ManagedMqttApplicationMessage applicationMessages);
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MQTTnet.Client.Options;
 using MQTTnet.Server;

@@ -17,5 +17,11 @@ namespace MQTTnet.Extensions.ManagedClient
        int MaxPendingMessages { get; }

        MqttPendingMessagesOverflowStrategy PendingMessagesOverflowStrategy { get; }
+
+        /// <summary>
+        /// Defines the maximum amount of topic filters which will be sent in a SUBSCRIBE/UNSUBSCRIBE packet.
+        /// Amazon AWS limits this number to 8. The default is int.MaxValue.
+        /// </summary>
+        int MaxTopicFiltersInSubscribeUnsubscribePackets { get; }
    }
 }
@@ -1,20 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core'">$(TargetFrameworks);uap10.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
    <Product />
    <Company />
    <Authors />
    <PackageId />
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <SignAssembly>false</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
  </PropertyGroup>

  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
@@ -23,6 +29,10 @@
    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
  </PropertyGroup>

+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
  <ItemGroup>
    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
  </ItemGroup>
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using MQTTnet.Client;
 using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
@@ -13,56 +8,76 @@ using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Diagnostics.Logger;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public class ManagedMqttClient : IManagedMqttClient
+    public class ManagedMqttClient : Disposable, IManagedMqttClient
    {
-        private readonly BlockingQueue<ManagedMqttApplicationMessage> _messageQueue = new BlockingQueue<ManagedMqttApplicationMessage>();
-        private readonly Dictionary<string, MqttQualityOfServiceLevel> _subscriptions = new Dictionary<string, MqttQualityOfServiceLevel>();
-        private readonly HashSet<string> _unsubscriptions = new HashSet<string>();
+        readonly BlockingQueue<ManagedMqttApplicationMessage> _messageQueue = new BlockingQueue<ManagedMqttApplicationMessage>();

-        private readonly IMqttClient _mqttClient;
-        private readonly IMqttNetChildLogger _logger;
+        /// <summary>
+        /// The subscriptions are managed in 2 separate buckets:
+        /// <see cref="_subscriptions"/> and <see cref="_unsubscriptions"/> are processed during normal operation
+        /// and are moved to the <see cref="_reconnectSubscriptions"/> when they get processed. They can be accessed by
+        /// any thread and are therefore mutex'ed. <see cref="_reconnectSubscriptions"/> get sent to the broker
+        ///  at reconnect and are solely owned by <see cref="MaintainConnectionAsync"/>.
+        /// </summary>
+        readonly Dictionary<string, MqttQualityOfServiceLevel> _reconnectSubscriptions = new Dictionary<string, MqttQualityOfServiceLevel>();

-        private CancellationTokenSource _connectionCancellationToken;
-        private CancellationTokenSource _publishingCancellationToken;
-        private Task _maintainConnectionTask;
+        readonly Dictionary<string, MqttQualityOfServiceLevel> _subscriptions = new Dictionary<string, MqttQualityOfServiceLevel>();
+        readonly HashSet<string> _unsubscriptions = new HashSet<string>();
+        readonly SemaphoreSlim _subscriptionsQueuedSignal = new SemaphoreSlim(0);

-        private ManagedMqttClientStorageManager _storageManager;
+        readonly MqttNetSourceLogger _logger;

-        private bool _disposed = false;
-        private bool _subscriptionsNotPushed;
+        readonly AsyncLock _messageQueueLock = new AsyncLock();

-        public ManagedMqttClient(IMqttClient mqttClient, IMqttNetChildLogger logger)
+        CancellationTokenSource _connectionCancellationToken;
+        CancellationTokenSource _publishingCancellationToken;
+        Task _maintainConnectionTask;
+
+        ManagedMqttClientStorageManager _storageManager;
+
+        public ManagedMqttClient(IMqttClient mqttClient, IMqttNetLogger logger)
        {
-            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
+            InternalClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));

            if (logger == null) throw new ArgumentNullException(nameof(logger));
-            _logger = logger.CreateChildLogger(nameof(ManagedMqttClient));
+            _logger = logger.WithSource(nameof(ManagedMqttClient));
        }

-        public bool IsConnected => _mqttClient.IsConnected;
+        public bool IsConnected => InternalClient.IsConnected;
+
        public bool IsStarted => _connectionCancellationToken != null;
+
+        public IMqttClient InternalClient { get; }
+
        public int PendingApplicationMessagesCount => _messageQueue.Count;
+
        public IManagedMqttClientOptions Options { get; private set; }

        public IMqttClientConnectedHandler ConnectedHandler
        {
-            get => _mqttClient.ConnectedHandler;
-            set => _mqttClient.ConnectedHandler = value;
+            get => InternalClient.ConnectedHandler;
+            set => InternalClient.ConnectedHandler = value;
        }

        public IMqttClientDisconnectedHandler DisconnectedHandler
        {
-            get => _mqttClient.DisconnectedHandler;
-            set => _mqttClient.DisconnectedHandler = value;
+            get => InternalClient.DisconnectedHandler;
+            set => InternalClient.DisconnectedHandler = value;
        }

        public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler
        {
-            get => _mqttClient.ApplicationMessageReceivedHandler;
-            set => _mqttClient.ApplicationMessageReceivedHandler = value;
+            get => InternalClient.ApplicationMessageReceivedHandler;
+            set => InternalClient.ApplicationMessageReceivedHandler = value;
        }

        public IApplicationMessageProcessedHandler ApplicationMessageProcessedHandler { get; set; }
@@ -80,18 +95,13 @@ namespace MQTTnet.Extensions.ManagedClient
            if (options == null) throw new ArgumentNullException(nameof(options));
            if (options.ClientOptions == null) throw new ArgumentException("The client options are not set.", nameof(options));

-            if (!options.ClientOptions.CleanSession)
-            {
-                throw new NotSupportedException("The managed client does not support existing sessions.");
-            }
-
            if (!_maintainConnectionTask?.IsCompleted ?? false) throw new InvalidOperationException("The managed client is already started.");

            Options = options;

-            if (Options.Storage != null)
+            if (options.Storage != null)
            {
-                _storageManager = new ManagedMqttClientStorageManager(Options.Storage);
+                _storageManager = new ManagedMqttClientStorageManager(options.Storage);
                var messages = await _storageManager.LoadQueuedMessagesAsync().ConfigureAwait(false);

                foreach (var message in messages)
@@ -100,11 +110,12 @@ namespace MQTTnet.Extensions.ManagedClient
                }
            }

-            _connectionCancellationToken = new CancellationTokenSource();
+            var cancellationTokenSource = new CancellationTokenSource();
+            var cancellationToken = cancellationTokenSource.Token;
+            _connectionCancellationToken = cancellationTokenSource;

-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            _maintainConnectionTask = Task.Run(() => MaintainConnectionAsync(_connectionCancellationToken.Token), _connectionCancellationToken.Token);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            _maintainConnectionTask = Task.Run(() => MaintainConnectionAsync(cancellationToken), cancellationToken);
+            _maintainConnectionTask.RunInBackground(_logger);

            _logger.Info("Started");
        }
@@ -125,6 +136,11 @@ namespace MQTTnet.Extensions.ManagedClient
            }
        }

+        public Task PingAsync(CancellationToken cancellationToken)
+        {
+            return InternalClient.PingAsync(cancellationToken);
+        }
+
        public async Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken)
        {
            ThrowIfDisposed();
@@ -140,6 +156,7 @@ namespace MQTTnet.Extensions.ManagedClient
            ThrowIfDisposed();

            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
+            if (Options == null) throw new InvalidOperationException("call StartAsync before publishing messages");

            MqttTopicValidator.ThrowIfInvalid(applicationMessage.ApplicationMessage.Topic);

@@ -148,7 +165,7 @@ namespace MQTTnet.Extensions.ManagedClient

            try
            {
-                lock (_messageQueue)
+                using (await _messageQueueLock.WaitAsync(CancellationToken.None).ConfigureAwait(false))
                {
                    if (_messageQueue.Count >= Options.MaxPendingMessages)
                    {
@@ -168,6 +185,16 @@ namespace MQTTnet.Extensions.ManagedClient
                    }

                    _messageQueue.Enqueue(applicationMessage);
+
+                    if (_storageManager != null)
+                    {
+                        if (removedMessage != null)
+                        {
+                            await _storageManager.RemoveAsync(removedMessage).ConfigureAwait(false);
+                        }
+
+                        await _storageManager.AddAsync(applicationMessage).ConfigureAwait(false);
+                    }
                }
            }
            finally
@@ -180,35 +207,31 @@ namespace MQTTnet.Extensions.ManagedClient
                        await applicationMessageSkippedHandler.HandleApplicationMessageSkippedAsync(applicationMessageSkippedEventArgs).ConfigureAwait(false);
                    }
                }
-
-            }
-            
-            if (_storageManager != null)
-            {
-                if (removedMessage != null)
-                {
-                    await _storageManager.RemoveAsync(removedMessage).ConfigureAwait(false);
-                }
-
-                await _storageManager.AddAsync(applicationMessage).ConfigureAwait(false);
            }
        }

-        public Task SubscribeAsync(IEnumerable<TopicFilter> topicFilters)
+        public Task SubscribeAsync(IEnumerable<MqttTopicFilter> topicFilters)
        {
            ThrowIfDisposed();

            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));

+            foreach (var topicFilter in topicFilters)
+            {
+                MqttTopicValidator.ThrowIfInvalidSubscribe(topicFilter.Topic);
+            }
+
            lock (_subscriptions)
            {
                foreach (var topicFilter in topicFilters)
                {
                    _subscriptions[topicFilter.Topic] = topicFilter.QualityOfServiceLevel;
-                    _subscriptionsNotPushed = true;
+                    _unsubscriptions.Remove(topicFilter.Topic);
                }
            }

+            _subscriptionsQueuedSignal.Release();
+
            return Task.FromResult(0);
        }

@@ -222,47 +245,39 @@ namespace MQTTnet.Extensions.ManagedClient
            {
                foreach (var topic in topics)
                {
-                    if (_subscriptions.Remove(topic))
-                    {
-                        _unsubscriptions.Add(topic);
-                        _subscriptionsNotPushed = true;
-                    }
+                    _subscriptions.Remove(topic);
+                    _unsubscriptions.Add(topic);
                }
            }

+            _subscriptionsQueuedSignal.Release();
+
            return Task.FromResult(0);
        }

-        public void Dispose()
+        protected override void Dispose(bool disposing)
        {
-            if (_disposed)
+            if (disposing)
            {
-                return;
+                StopPublishing();
+                StopMaintainingConnection();
+
+                if (_maintainConnectionTask != null)
+                {
+                    _maintainConnectionTask.GetAwaiter().GetResult();
+                    _maintainConnectionTask = null;
+                }
+
+                _messageQueue.Dispose();
+                _messageQueueLock.Dispose();
+                InternalClient.Dispose();
+                _subscriptionsQueuedSignal.Dispose();
            }

-            _disposed = true;
-
-            StopPublishing();
-            StopMaintainingConnection();
-
-            if (_maintainConnectionTask != null)
-            {
-                Task.WaitAny(_maintainConnectionTask);
-                _maintainConnectionTask = null;
-            }
-
-            _mqttClient.Dispose();
+            base.Dispose(disposing);
        }

-        private void ThrowIfDisposed()
-        {
-            if (_disposed)
-            {
-                throw new ObjectDisposedException(nameof(ManagedMqttClient));
-            }
-        }
-
-        private async Task MaintainConnectionAsync(CancellationToken cancellationToken)
+        async Task MaintainConnectionAsync(CancellationToken cancellationToken)
        {
            try
            {
@@ -276,15 +291,22 @@ namespace MQTTnet.Extensions.ManagedClient
            }
            catch (Exception exception)
            {
-                _logger.Error(exception, "Unhandled exception while maintaining connection.");
+                _logger.Error(exception, "Error exception while maintaining connection.");
            }
            finally
            {
-                if (!_disposed)
+                if (!IsDisposed)
                {
                    try
                    {
-                        await _mqttClient.DisconnectAsync().ConfigureAwait(false);
+                        using (var disconnectTimeout = new CancellationTokenSource(Options.ClientOptions.CommunicationTimeout))
+                        {
+                            await InternalClient.DisconnectAsync(disconnectTimeout.Token).ConfigureAwait(false);
+                        }
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        _logger.Warning("Timeout while sending DISCONNECT packet.");
                    }
                    catch (Exception exception)
                    {
@@ -293,14 +315,22 @@ namespace MQTTnet.Extensions.ManagedClient

                    _logger.Info("Stopped");
                }
+
+                _reconnectSubscriptions.Clear();
+
+                lock (_subscriptions)
+                {
+                    _subscriptions.Clear();
+                    _unsubscriptions.Clear();
+                }
            }
        }

-        private async Task TryMaintainConnectionAsync(CancellationToken cancellationToken)
+        async Task TryMaintainConnectionAsync(CancellationToken cancellationToken)
        {
            try
            {
-                var connectionState = await ReconnectIfRequiredAsync().ConfigureAwait(false);
+                var connectionState = await ReconnectIfRequiredAsync(cancellationToken).ConfigureAwait(false);
                if (connectionState == ReconnectionResult.NotConnected)
                {
                    StopPublishing();
@@ -308,16 +338,22 @@ namespace MQTTnet.Extensions.ManagedClient
                    return;
                }

-                if (connectionState == ReconnectionResult.Reconnected || _subscriptionsNotPushed)
+                if (connectionState == ReconnectionResult.Reconnected)
+                {
+                    await PublishReconnectSubscriptionsAsync().ConfigureAwait(false);
+                    StartPublishing();
+                    return;
+                }
+
+                if (connectionState == ReconnectionResult.Recovered)
                {
-                    await SynchronizeSubscriptionsAsync().ConfigureAwait(false);
                    StartPublishing();
                    return;
                }

                if (connectionState == ReconnectionResult.StillConnected)
                {
-                    await Task.Delay(Options.ConnectionCheckInterval, cancellationToken).ConfigureAwait(false);
+                    await PublishSubscriptionsAsync(Options.ConnectionCheckInterval, cancellationToken).ConfigureAwait(false);
                }
            }
            catch (OperationCanceledException)
@@ -325,29 +361,29 @@ namespace MQTTnet.Extensions.ManagedClient
            }
            catch (MqttCommunicationException exception)
            {
-                _logger.Warning(exception, "Communication exception while maintaining connection.");
+                _logger.Warning(exception, "Communication error while maintaining connection.");
            }
            catch (Exception exception)
            {
-                _logger.Error(exception, "Unhandled exception while maintaining connection.");
+                _logger.Error(exception, "Error exception while maintaining connection.");
            }
        }

-        private void PublishQueuedMessages(CancellationToken cancellationToken)
+        async Task PublishQueuedMessagesAsync(CancellationToken cancellationToken)
        {
            try
            {
-                while (!cancellationToken.IsCancellationRequested && _mqttClient.IsConnected)
+                while (!cancellationToken.IsCancellationRequested && InternalClient.IsConnected)
                {
-                    //Peek at the message without dequeueing in order to prevent the
-                    //possibility of the queue growing beyond the configured cap.
-                    //Previously, messages could be re-enqueued if there was an
-                    //exception, and this re-enqueueing did not honor the cap.
-                    //Furthermore, because re-enqueueing would shuffle the order
-                    //of the messages, the DropOldestQueuedMessage strategy would
-                    //be unable to know which message is actually the oldest and would
-                    //instead drop the first item in the queue.
-                    var message = _messageQueue.PeekAndWait();
+                    // Peek at the message without dequeueing in order to prevent the
+                    // possibility of the queue growing beyond the configured cap.
+                    // Previously, messages could be re-enqueued if there was an
+                    // exception, and this re-enqueueing did not honor the cap.
+                    // Furthermore, because re-enqueueing would shuffle the order
+                    // of the messages, the DropOldestQueuedMessage strategy would
+                    // be unable to know which message is actually the oldest and would
+                    // instead drop the first item in the queue.
+                    var message = _messageQueue.PeekAndWait(cancellationToken);
                    if (message == null)
                    {
                        continue;
@@ -355,7 +391,7 @@ namespace MQTTnet.Extensions.ManagedClient

                    cancellationToken.ThrowIfCancellationRequested();

-                    TryPublishQueuedMessage(message);
+                    await TryPublishQueuedMessageAsync(message).ConfigureAwait(false);
                }
            }
            catch (OperationCanceledException)
@@ -363,7 +399,7 @@ namespace MQTTnet.Extensions.ManagedClient
            }
            catch (Exception exception)
            {
-                _logger.Error(exception, "Unhandled exception while publishing queued application messages.");
+                _logger.Error(exception, "Error while publishing queued application messages.");
            }
            finally
            {
@@ -371,29 +407,34 @@ namespace MQTTnet.Extensions.ManagedClient
            }
        }

-        private void TryPublishQueuedMessage(ManagedMqttApplicationMessage message)
+        async Task TryPublishQueuedMessageAsync(ManagedMqttApplicationMessage message)
        {
            Exception transmitException = null;
            try
            {
-                _mqttClient.PublishAsync(message.ApplicationMessage).GetAwaiter().GetResult();
-                lock (_messageQueue) //lock to avoid conflict with this.PublishAsync
+                await InternalClient.PublishAsync(message.ApplicationMessage).ConfigureAwait(false);
+
+                using (await _messageQueueLock.WaitAsync(CancellationToken.None).ConfigureAwait(false)) //lock to avoid conflict with this.PublishAsync
                {
-                    //While publishing this message, this.PublishAsync could have booted this
-                    //message off the queue to make room for another (when using a cap
-                    //with the DropOldestQueuedMessage strategy).  If the first item
-                    //in the queue is equal to this message, then it's safe to remove
-                    //it from the queue.  If not, that means this.PublishAsync has already
-                    //removed it, in which case we don't want to do anything.
+                    // While publishing this message, this.PublishAsync could have booted this
+                    // message off the queue to make room for another (when using a cap
+                    // with the DropOldestQueuedMessage strategy).  If the first item
+                    // in the queue is equal to this message, then it's safe to remove
+                    // it from the queue.  If not, that means this.PublishAsync has already
+                    // removed it, in which case we don't want to do anything.
                    _messageQueue.RemoveFirst(i => i.Id.Equals(message.Id));
+
+                    if (_storageManager != null)
+                    {
+                        await _storageManager.RemoveAsync(message).ConfigureAwait(false);
+                    }
                }
-                _storageManager?.RemoveAsync(message).GetAwaiter().GetResult();
            }
            catch (MqttCommunicationException exception)
            {
                transmitException = exception;

-                _logger.Warning(exception, $"Publishing application ({message.Id}) message failed.");
+                _logger.Warning(exception, "Publishing application message ({0}) failed.", message.Id);

                if (message.ApplicationMessage.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtMostOnce)
                {
@@ -404,81 +445,181 @@ namespace MQTTnet.Extensions.ManagedClient
                    //contradict the expected behavior of QoS 1 and 2, that's also true
                    //for the usage of a message queue cap, so it's still consistent
                    //with prior behavior in that way.
-                    lock (_messageQueue) //lock to avoid conflict with this.PublishAsync
+                    using (await _messageQueueLock.WaitAsync(CancellationToken.None).ConfigureAwait(false)) //lock to avoid conflict with this.PublishAsync
                    {
                        _messageQueue.RemoveFirst(i => i.Id.Equals(message.Id));
+
+                        if (_storageManager != null)
+                        {
+                            await _storageManager.RemoveAsync(message).ConfigureAwait(false);
+                        }
                    }
                }
            }
            catch (Exception exception)
            {
                transmitException = exception;
-                _logger.Error(exception, $"Unhandled exception while publishing application message ({message.Id}).");
+                _logger.Error(exception, "Error while publishing application message ({0}).", message.Id);
            }
            finally
            {
-                ApplicationMessageProcessedHandler?.HandleApplicationMessageProcessedAsync(new ApplicationMessageProcessedEventArgs(message, transmitException)).GetAwaiter().GetResult();
+                var eventHandler = ApplicationMessageProcessedHandler;
+                if (eventHandler != null)
+                {
+                    var eventArguments = new ApplicationMessageProcessedEventArgs(message, transmitException);
+                    await eventHandler.HandleApplicationMessageProcessedAsync(eventArguments).ConfigureAwait(false);
+                }
            }
        }

-        private async Task SynchronizeSubscriptionsAsync()
+        async Task PublishSubscriptionsAsync(TimeSpan timeout, CancellationToken cancellationToken)
        {
-            _logger.Info("Synchronizing subscriptions");
+            var endTime = DateTime.UtcNow + timeout;

-            List<TopicFilter> subscriptions;
-            HashSet<string> unsubscriptions;
-
-            lock (_subscriptions)
+            while (await _subscriptionsQueuedSignal.WaitAsync(GetRemainingTime(endTime), cancellationToken).ConfigureAwait(false))
            {
-                subscriptions = _subscriptions.Select(i => new TopicFilter { Topic = i.Key, QualityOfServiceLevel = i.Value }).ToList();
+                List<MqttTopicFilter> subscriptions;
+                HashSet<string> unsubscriptions;

-                unsubscriptions = new HashSet<string>(_unsubscriptions);
-                _unsubscriptions.Clear();
-
-                _subscriptionsNotPushed = false;
-            }
-
-            if (!subscriptions.Any() && !unsubscriptions.Any())
-            {
-                return;
-            }
-
-            try
-            {
-                if (unsubscriptions.Any())
+                lock (_subscriptions)
                {
-                    await _mqttClient.UnsubscribeAsync(unsubscriptions.ToArray()).ConfigureAwait(false);
+                    subscriptions = _subscriptions.Select(i => new MqttTopicFilter
+                    {
+                        Topic = i.Key, 
+                        QualityOfServiceLevel = i.Value
+                    }).ToList();
+                    
+                    _subscriptions.Clear();
+                    
+                    unsubscriptions = new HashSet<string>(_unsubscriptions);
+                    _unsubscriptions.Clear();
                }

-                if (subscriptions.Any())
+                if (!subscriptions.Any() && !unsubscriptions.Any())
                {
-                    await _mqttClient.SubscribeAsync(subscriptions.ToArray()).ConfigureAwait(false);
+                    continue;
+                }
+
+                _logger.Verbose("Publishing {0} added and {1} removed subscriptions", subscriptions.Count, unsubscriptions.Count);
+
+                foreach (var unsubscription in unsubscriptions)
+                {
+                    _reconnectSubscriptions.Remove(unsubscription);
+                }
+
+                foreach (var subscription in subscriptions)
+                {
+                    _reconnectSubscriptions[subscription.Topic] = subscription.QualityOfServiceLevel;
+                }
+
+                var addedTopicFilters = new List<MqttTopicFilter>();
+                foreach (var subscription in subscriptions)
+                {
+                    addedTopicFilters.Add(subscription);
+                    
+                    if (addedTopicFilters.Count == Options.MaxTopicFiltersInSubscribeUnsubscribePackets)
+                    {
+                        await SendSubscribeUnsubscribe(addedTopicFilters, null).ConfigureAwait(false);
+                        addedTopicFilters.Clear();
+                    }
+                }
+
+                await SendSubscribeUnsubscribe(addedTopicFilters, null).ConfigureAwait(false);
+
+                var removedTopicFilters = new List<string>();
+                foreach (var unSub in unsubscriptions)
+                {
+                    removedTopicFilters.Add(unSub);
+                    
+                    if (removedTopicFilters.Count == Options.MaxTopicFiltersInSubscribeUnsubscribePackets)
+                    {
+                        await SendSubscribeUnsubscribe(null, removedTopicFilters).ConfigureAwait(false);
+                        removedTopicFilters.Clear();
+                    }
+                }
+
+                await SendSubscribeUnsubscribe(null, removedTopicFilters).ConfigureAwait(false);
+            }
+        }
+
+        async Task SendSubscribeUnsubscribe(List<MqttTopicFilter> addedSubscriptions, List<string> removedSubscriptions)
+        {
+            try
+            {
+                if (removedSubscriptions != null && removedSubscriptions.Any())
+                {
+                    await InternalClient.UnsubscribeAsync(removedSubscriptions.ToArray()).ConfigureAwait(false);
+                }
+
+                if (addedSubscriptions != null && addedSubscriptions.Any())
+                {
+                    await InternalClient.SubscribeAsync(addedSubscriptions.ToArray()).ConfigureAwait(false);
                }
            }
            catch (Exception exception)
            {
-                _logger.Warning(exception, "Synchronizing subscriptions failed.");
-                _subscriptionsNotPushed = true;
-
-                var synchronizingSubscriptionsFailedHandler = SynchronizingSubscriptionsFailedHandler;
-                if (SynchronizingSubscriptionsFailedHandler != null)
-                {
-                    await synchronizingSubscriptionsFailedHandler.HandleSynchronizingSubscriptionsFailedAsync(new ManagedProcessFailedEventArgs(exception)).ConfigureAwait(false);
-                }
+                await HandleSubscriptionExceptionAsync(exception).ConfigureAwait(false);
            }
        }

-        private async Task<ReconnectionResult> ReconnectIfRequiredAsync()
+        async Task PublishReconnectSubscriptionsAsync()
        {
-            if (_mqttClient.IsConnected)
+            _logger.Info("Publishing subscriptions at reconnect");
+
+            try
+            {
+                if (_reconnectSubscriptions.Any())
+                {
+                    var subscriptions = _reconnectSubscriptions.Select(i => new MqttTopicFilter
+                    {
+                        Topic = i.Key, 
+                        QualityOfServiceLevel = i.Value
+                    });
+                    
+                    var topicFilters = new List<MqttTopicFilter>();
+                    
+                    foreach (var sub in subscriptions)
+                    {
+                        topicFilters.Add(sub);
+                        
+                        if (topicFilters.Count == Options.MaxTopicFiltersInSubscribeUnsubscribePackets)
+                        {
+                            await SendSubscribeUnsubscribe(topicFilters, null).ConfigureAwait(false);
+                            topicFilters.Clear();
+                        }
+                    }
+
+                    await SendSubscribeUnsubscribe(topicFilters, null).ConfigureAwait(false);
+                }
+            }
+            catch (Exception exception)
+            {
+                await HandleSubscriptionExceptionAsync(exception).ConfigureAwait(false);
+            }
+        }
+
+        async Task HandleSubscriptionExceptionAsync(Exception exception)
+        {
+            _logger.Warning(exception, "Synchronizing subscriptions failed.");
+
+            var synchronizingSubscriptionsFailedHandler = SynchronizingSubscriptionsFailedHandler;
+            if (SynchronizingSubscriptionsFailedHandler != null)
+            {
+                await synchronizingSubscriptionsFailedHandler.HandleSynchronizingSubscriptionsFailedAsync(new ManagedProcessFailedEventArgs(exception)).ConfigureAwait(false);
+            }
+        }
+
+        async Task<ReconnectionResult> ReconnectIfRequiredAsync(CancellationToken cancellationToken)
+        {
+            if (InternalClient.IsConnected)
            {
                return ReconnectionResult.StillConnected;
            }

            try
            {
-                await _mqttClient.ConnectAsync(Options.ClientOptions).ConfigureAwait(false);
-                return ReconnectionResult.Reconnected;
+                var result = await InternalClient.ConnectAsync(Options.ClientOptions, cancellationToken).ConfigureAwait(false);
+                return result.IsSessionPresent ? ReconnectionResult.Recovered : ReconnectionResult.Reconnected;
            }
            catch (Exception exception)
            {
@@ -491,32 +632,51 @@ namespace MQTTnet.Extensions.ManagedClient
                return ReconnectionResult.NotConnected;
            }
        }
-        
-        private void StartPublishing()
+
+        void StartPublishing()
        {
            if (_publishingCancellationToken != null)
            {
                StopPublishing();
            }

-            var cts = new CancellationTokenSource();
-            _publishingCancellationToken = cts;
+            var cancellationTokenSource = new CancellationTokenSource();
+            var cancellationToken = cancellationTokenSource.Token;
+            _publishingCancellationToken = cancellationTokenSource;

-            Task.Factory.StartNew(() => PublishQueuedMessages(cts.Token), cts.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+            Task.Run(() => PublishQueuedMessagesAsync(cancellationToken), cancellationToken).RunInBackground(_logger);
        }

-        private void StopPublishing()
+        void StopPublishing()
        {
-            _publishingCancellationToken?.Cancel(false);
-            _publishingCancellationToken?.Dispose();
-            _publishingCancellationToken = null;
+            try
+            {
+                _publishingCancellationToken?.Cancel(false);
+            }
+            finally
+            {
+                _publishingCancellationToken?.Dispose();
+                _publishingCancellationToken = null;
+            }
        }

-        private void StopMaintainingConnection()
+        void StopMaintainingConnection()
        {
-            _connectionCancellationToken?.Cancel(false);
-            _connectionCancellationToken?.Dispose();
-            _connectionCancellationToken = null;
+            try
+            {
+                _connectionCancellationToken?.Cancel(false);
+            }
+            finally
+            {
+                _connectionCancellationToken?.Dispose();
+                _connectionCancellationToken = null;
+            }
+        }
+
+        static TimeSpan GetRemainingTime(DateTime endTime)
+        {
+            var remainingTime = endTime - DateTime.UtcNow;
+            return remainingTime < TimeSpan.Zero ? TimeSpan.Zero : remainingTime;
        }
    }
 }
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
 using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Receiving;
 using MQTTnet.Protocol;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;

 namespace MQTTnet.Extensions.ManagedClient
 {
@@ -76,39 +76,42 @@ namespace MQTTnet.Extensions.ManagedClient
            return client;
        }

-        public static IManagedMqttClient UseApplicationMessageReceivedHandler(this IManagedMqttClient client, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
+        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
+            where TReceiver : IApplicationMessageReceiver
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (receiver == null) throw new ArgumentNullException(nameof(receiver));

            if (handler == null)
            {
-                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
+                return receiver.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
            }

-            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
+            return receiver.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
        }

-        public static IManagedMqttClient UseApplicationMessageReceivedHandler(this IManagedMqttClient client, Action<MqttApplicationMessageReceivedEventArgs> handler)
+        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, Action<MqttApplicationMessageReceivedEventArgs> handler)
+            where TReceiver : IApplicationMessageReceiver
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (receiver == null) throw new ArgumentNullException(nameof(receiver));

            if (handler == null)
            {
-                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
+                return receiver.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
            }

-            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
+            return receiver.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
        }

-        public static IManagedMqttClient UseApplicationMessageReceivedHandler(this IManagedMqttClient client, IMqttApplicationMessageReceivedHandler handler)
+        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, IMqttApplicationMessageReceivedHandler handler)
+            where TReceiver : IApplicationMessageReceiver
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (receiver == null) throw new ArgumentNullException(nameof(receiver));

-            client.ApplicationMessageReceivedHandler = handler;
-            return client;
+            receiver.ApplicationMessageReceivedHandler = handler;
+            return receiver;
        }

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

@@ -120,7 +123,7 @@ namespace MQTTnet.Extensions.ManagedClient
            if (client == null) throw new ArgumentNullException(nameof(client));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

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

        public static Task SubscribeAsync(this IManagedMqttClient client, string topic)
@@ -128,7 +131,7 @@ namespace MQTTnet.Extensions.ManagedClient
            if (client == null) throw new ArgumentNullException(nameof(client));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

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

        public static Task UnsubscribeAsync(this IManagedMqttClient client, params string[] topicFilters)
@@ -138,92 +141,92 @@ namespace MQTTnet.Extensions.ManagedClient
            return client.UnsubscribeAsync(topicFilters);
        }

-        public static async Task PublishAsync(this IManagedMqttClient client, IEnumerable<MqttApplicationMessage> applicationMessages)
+        public static async Task PublishAsync(this IApplicationMessagePublisher publisher, IEnumerable<MqttApplicationMessage> applicationMessages)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));

            foreach (var applicationMessage in applicationMessages)
            {
-                await client.PublishAsync(applicationMessage).ConfigureAwait(false);
+                await publisher.PublishAsync(applicationMessage).ConfigureAwait(false);
            }
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, MqttApplicationMessage applicationMessage)
+        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, MqttApplicationMessage applicationMessage)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

-            return client.PublishAsync(applicationMessage, CancellationToken.None);
+            return publisher.PublishAsync(applicationMessage, CancellationToken.None);
        }

-        public static async Task PublishAsync(this IManagedMqttClient client, params MqttApplicationMessage[] applicationMessages)
+        public static async Task PublishAsync(this IApplicationMessagePublisher publisher, params MqttApplicationMessage[] applicationMessages)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));

            foreach (var applicationMessage in applicationMessages)
            {
-                await client.PublishAsync(applicationMessage, CancellationToken.None).ConfigureAwait(false);
+                await publisher.PublishAsync(applicationMessage, CancellationToken.None).ConfigureAwait(false);
            }
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, string topic)
+        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

-            return client.PublishAsync(builder => builder
+            return publisher.PublishAsync(builder => builder
                .WithTopic(topic));
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, string topic, string payload)
+        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

-            return client.PublishAsync(builder => builder
+            return publisher.PublishAsync(builder => builder
                .WithTopic(topic)
                .WithPayload(payload));
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

-            return client.PublishAsync(builder => builder
+            return publisher.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)
+        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, bool retain)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));

-            return client.PublishAsync(builder => builder
+            return publisher.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)
+        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder, CancellationToken cancellationToken)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));

            var message = builder(new MqttApplicationMessageBuilder()).Build();
-            return client.PublishAsync(message, cancellationToken);
+            return publisher.PublishAsync(message, cancellationToken);
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IManagedMqttClient client, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder)
+        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder)
        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+            if (publisher == null) throw new ArgumentNullException(nameof(publisher));

            var message = builder(new MqttApplicationMessageBuilder()).Build();
-            return client.PublishAsync(message, CancellationToken.None);
+            return publisher.PublishAsync(message, CancellationToken.None);
        }
    }
 }
@@ -1,11 +1,10 @@
-using System;
-using MQTTnet.Client;
+using System;
 using MQTTnet.Client.Options;
 using MQTTnet.Server;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public class ManagedMqttClientOptions : IManagedMqttClientOptions
+    public sealed class ManagedMqttClientOptions : IManagedMqttClientOptions
    {
        public IMqttClientOptions ClientOptions { get; set; }

@@ -18,5 +17,7 @@ namespace MQTTnet.Extensions.ManagedClient
        public int MaxPendingMessages { get; set; } = int.MaxValue;

        public MqttPendingMessagesOverflowStrategy PendingMessagesOverflowStrategy { get; set; } = MqttPendingMessagesOverflowStrategy.DropNewMessage;
+
+        public int MaxTopicFiltersInSubscribeUnsubscribePackets { get; set; } = int.MaxValue;
    }
 }
@@ -1,5 +1,4 @@
-using System;
-using MQTTnet.Client;
+using System;
 using MQTTnet.Client.Options;
 using MQTTnet.Server;

@@ -7,8 +6,8 @@ namespace MQTTnet.Extensions.ManagedClient
 {
    public class ManagedMqttClientOptionsBuilder
    {
-        private readonly ManagedMqttClientOptions _options = new ManagedMqttClientOptions();
-        private MqttClientOptionsBuilder _clientOptionsBuilder;
+        readonly ManagedMqttClientOptions _options = new ManagedMqttClientOptions();
+        MqttClientOptionsBuilder _clientOptionsBuilder;

        public ManagedMqttClientOptionsBuilder WithMaxPendingMessages(int value)
        {
@@ -70,6 +69,12 @@ namespace MQTTnet.Extensions.ManagedClient
            return this;
        }

+        public ManagedMqttClientOptionsBuilder WithMaxTopicFiltersInSubscribeUnsubscribePackets(int value)
+        {
+            _options.MaxTopicFiltersInSubscribeUnsubscribePackets = value;
+            return this;
+        }
+
        public ManagedMqttClientOptions Build()
        {
            if (_clientOptionsBuilder != null)
@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;

 namespace MQTTnet.Extensions.ManagedClient
 {
@@ -9,7 +9,7 @@ namespace MQTTnet.Extensions.ManagedClient
        {
            if (factory == null) throw new ArgumentNullException(nameof(factory));

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

        public static IManagedMqttClient CreateManagedMqttClient(this IMqttFactory factory, IMqttNetLogger logger)
@@ -17,7 +17,7 @@ namespace MQTTnet.Extensions.ManagedClient
            if (factory == null) throw new ArgumentNullException(nameof(factory));
            if (logger == null) throw new ArgumentNullException(nameof(logger));

-            return new ManagedMqttClient(factory.CreateMqttClient(logger), logger.CreateChildLogger());
+            return new ManagedMqttClient(factory.CreateMqttClient(logger), logger);
        }
    }
 }
@@ -4,6 +4,7 @@
    {
        StillConnected,
        Reconnected,
+        Recovered,
        NotConnected
    }
 }
@@ -0,0 +1,14 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Extensions.Rpc
+{
+    public interface IMqttRpcClient : IDisposable
+    {
+        Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel);
+
+        Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken);
+    }
+}
@@ -1,20 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core'">$(TargetFrameworks);uap10.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
    <Product />
    <Company />
    <Authors />
    <PackageId />
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <SignAssembly>false</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
  </PropertyGroup>

  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
@@ -23,6 +29,10 @@
    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
  </PropertyGroup>

+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
  <ItemGroup>
    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
  </ItemGroup>
@@ -1,23 +1,33 @@
-using System;
-using System.Collections.Concurrent;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using MQTTnet.Client;
 using MQTTnet.Exceptions;
+using MQTTnet.Extensions.Rpc.Options;
+using MQTTnet.Extensions.Rpc.Options.TopicGeneration;
 using MQTTnet.Protocol;
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Client.Subscribing;
+using MQTTnet.Implementations;

 namespace MQTTnet.Extensions.Rpc
 {
-    public class MqttRpcClient : IDisposable
+    public sealed class MqttRpcClient : IMqttRpcClient
    {
-        private readonly ConcurrentDictionary<string, TaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, TaskCompletionSource<byte[]>>();
-        private readonly IMqttClient _mqttClient;
-        private readonly RpcAwareApplicationMessageReceivedHandler _applicationMessageReceivedHandler;
+        readonly ConcurrentDictionary<string, TaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, TaskCompletionSource<byte[]>>();
+        readonly IMqttClient _mqttClient;
+        readonly IMqttRpcClientOptions _options;
+        readonly RpcAwareApplicationMessageReceivedHandler _applicationMessageReceivedHandler;

-        public MqttRpcClient(IMqttClient mqttClient)
+        [Obsolete("Use MqttRpcClient(IMqttClient mqttClient, IMqttRpcClientOptions options).")]
+        public MqttRpcClient(IMqttClient mqttClient) : this(mqttClient, new MqttRpcClientOptions())
+        {
+        }
+
+        public MqttRpcClient(IMqttClient mqttClient, IMqttRpcClientOptions options)
        {
            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
+            _options = options ?? throw new ArgumentNullException(nameof(options));

            _applicationMessageReceivedHandler = new RpcAwareApplicationMessageReceivedHandler(
                mqttClient.ApplicationMessageReceivedHandler,
@@ -26,102 +36,113 @@ namespace MQTTnet.Extensions.Rpc
            _mqttClient.ApplicationMessageReceivedHandler = _applicationMessageReceivedHandler;
        }

-        public Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
        {
-            return ExecuteAsync(timeout, methodName, Encoding.UTF8.GetBytes(payload), qualityOfServiceLevel, CancellationToken.None);
+            using (var timeoutToken = new CancellationTokenSource(timeout))
+            {
+                try
+                {
+                    return await ExecuteAsync(methodName, payload, qualityOfServiceLevel, timeoutToken.Token).ConfigureAwait(false);
+                }
+                catch (OperationCanceledException exception)
+                {
+                    if (timeoutToken.IsCancellationRequested)
+                    {
+                        throw new MqttCommunicationTimedOutException(exception);
+                    }
+
+                    throw;
+                }
+            }
        }

-        public Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken)
-        {
-            return ExecuteAsync(timeout, methodName, Encoding.UTF8.GetBytes(payload), qualityOfServiceLevel, cancellationToken);
-        }
-
-        public Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
-        {
-            return ExecuteAsync(timeout, methodName, payload, qualityOfServiceLevel, CancellationToken.None);
-        }
-
-        public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken)
+        public async Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken)
        {
            if (methodName == null) throw new ArgumentNullException(nameof(methodName));

-            if (methodName.Contains("/") || methodName.Contains("+") || methodName.Contains("#"))
-            {
-                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";
+            var topicNames = _options.TopicGenerationStrategy.CreateRpcTopics(new TopicGenerationContext
+            {
+                MethodName = methodName,
+                QualityOfServiceLevel = qualityOfServiceLevel,
+                MqttClient = _mqttClient,
+                Options = _options
+            });
+
+            var requestTopic = topicNames.RequestTopic;
+            var responseTopic = topicNames.ResponseTopic;
+
+            if (string.IsNullOrWhiteSpace(requestTopic))
+            {
+                throw new MqttProtocolViolationException("RPC request topic is empty.");
+            }
+
+            if (string.IsNullOrWhiteSpace(responseTopic))
+            {
+                throw new MqttProtocolViolationException("RPC response topic is empty.");
+            }

            var requestMessage = new MqttApplicationMessageBuilder()
                .WithTopic(requestTopic)
                .WithPayload(payload)
                .WithQualityOfServiceLevel(qualityOfServiceLevel)
+                .WithResponseTopic(responseTopic)
                .Build();

            try
            {
-                var tcs = new TaskCompletionSource<byte[]>();
-                if (!_waitingCalls.TryAdd(responseTopic, tcs))
+#if NET452
+                var awaitable = new TaskCompletionSource<byte[]>();
+#else
+                var awaitable = new TaskCompletionSource<byte[]>(TaskCreationOptions.RunContinuationsAsynchronously);
+#endif
+
+                if (!_waitingCalls.TryAdd(responseTopic, awaitable))
                {
                    throw new InvalidOperationException();
                }

-                await _mqttClient.SubscribeAsync(responseTopic, qualityOfServiceLevel).ConfigureAwait(false);
-                await _mqttClient.PublishAsync(requestMessage).ConfigureAwait(false);
-                
-                using (var timeoutCts = new CancellationTokenSource(timeout))
-                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token))
-                {
-                    linkedCts.Token.Register(() =>
-                    {
-                        if (!tcs.Task.IsCompleted && !tcs.Task.IsFaulted && !tcs.Task.IsCanceled)
-                        {
-                            tcs.TrySetCanceled();
-                        }
-                    });
+                var subscribeOptions = new MqttClientSubscribeOptionsBuilder()
+                    .WithTopicFilter(responseTopic, qualityOfServiceLevel)
+                    .Build();

-                    try
-                    {
-                        var result = await tcs.Task.ConfigureAwait(false);
-                        timeoutCts.Cancel(false);
-                        return result;
-                    }
-                    catch (OperationCanceledException exception)
-                    {
-                        if (timeoutCts.IsCancellationRequested && !cancellationToken.IsCancellationRequested)
-                        {
-                            throw new MqttCommunicationTimedOutException(exception);
-                        }
-                        else
-                        {
-                            throw;
-                        }
-                    }
+                await _mqttClient.SubscribeAsync(subscribeOptions, cancellationToken).ConfigureAwait(false);
+                await _mqttClient.PublishAsync(requestMessage, cancellationToken).ConfigureAwait(false);
+
+                using (cancellationToken.Register(() => { awaitable.TrySetCanceled(); }))
+                {
+                    return await awaitable.Task.ConfigureAwait(false);
                }
            }
            finally
            {
                _waitingCalls.TryRemove(responseTopic, out _);
+
                await _mqttClient.UnsubscribeAsync(responseTopic).ConfigureAwait(false);
            }
        }

-        private Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
+        Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
        {
-            if (!_waitingCalls.TryRemove(eventArgs.ApplicationMessage.Topic, out var tcs))
+            if (!_waitingCalls.TryRemove(eventArgs.ApplicationMessage.Topic, out var awaitable))
            {
-                return Task.FromResult(0);
+                return PlatformAbstractionLayer.CompletedTask;
            }

-            tcs.TrySetResult(eventArgs.ApplicationMessage.Payload);
+#if NET452
+            Task.Run(() => awaitable.TrySetResult(eventArgs.ApplicationMessage.Payload));
+#else
+            awaitable.TrySetResult(eventArgs.ApplicationMessage.Payload);
+#endif

-            return Task.FromResult(0);
+            // Set this message to handled to that other code can avoid execution etc.
+            eventArgs.IsHandled = true;
+
+            return PlatformAbstractionLayer.CompletedTask;
        }

        public void Dispose()
@@ -136,4 +157,4 @@ namespace MQTTnet.Extensions.Rpc
            _waitingCalls.Clear();
        }
    }
-}
+}
@@ -0,0 +1,19 @@
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Extensions.Rpc
+{
+    public static class MqttRpcClientExtensions
+    {
+        public static Task<byte[]> ExecuteAsync(this IMqttRpcClient client, TimeSpan timeout, string methodName, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));
+
+            var buffer = Encoding.UTF8.GetBytes(payload ?? string.Empty);
+
+            return client.ExecuteAsync(timeout, methodName, buffer, qualityOfServiceLevel);
+        }
+    }
+}
@@ -0,0 +1,9 @@
+using MQTTnet.Extensions.Rpc.Options.TopicGeneration;
+
+namespace MQTTnet.Extensions.Rpc.Options
+{
+    public interface IMqttRpcClientOptions
+    {
+        IMqttRpcClientTopicGenerationStrategy TopicGenerationStrategy { get; set; }
+    }
+}
@@ -0,0 +1,9 @@
+using MQTTnet.Extensions.Rpc.Options.TopicGeneration;
+
+namespace MQTTnet.Extensions.Rpc.Options
+{
+    public sealed class MqttRpcClientOptions : IMqttRpcClientOptions
+    {
+        public IMqttRpcClientTopicGenerationStrategy TopicGenerationStrategy { get; set; } = new DefaultMqttRpcClientTopicGenerationStrategy();
+    }
+}
@@ -0,0 +1,25 @@
+using MQTTnet.Extensions.Rpc.Options.TopicGeneration;
+using System;
+
+namespace MQTTnet.Extensions.Rpc.Options
+{
+    public sealed class MqttRpcClientOptionsBuilder
+    {
+        IMqttRpcClientTopicGenerationStrategy _topicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy();
+
+        public MqttRpcClientOptionsBuilder WithTopicGenerationStrategy(IMqttRpcClientTopicGenerationStrategy value)
+        {
+            _topicGenerationStrategy = value ?? throw new ArgumentNullException(nameof(value));
+
+            return this;
+        }
+
+        public IMqttRpcClientOptions Build()
+        {
+            return new MqttRpcClientOptions
+            {
+                TopicGenerationStrategy = _topicGenerationStrategy
+            };
+        }
+    }
+}
@@ -0,0 +1,9 @@
+namespace MQTTnet.Extensions.Rpc.Options
+{
+    public sealed class MqttRpcTopicPair
+    {
+        public string RequestTopic { get; set; }
+
+        public string ResponseTopic { get; set; }
+    }
+}
@@ -0,0 +1,24 @@
+using System;
+
+namespace MQTTnet.Extensions.Rpc.Options.TopicGeneration
+{
+    public sealed class DefaultMqttRpcClientTopicGenerationStrategy : IMqttRpcClientTopicGenerationStrategy
+    {
+        public MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context)
+        {
+            if (context.MethodName.Contains("/") || context.MethodName.Contains("+") || context.MethodName.Contains("#"))
+            {
+                throw new ArgumentException("The method name cannot contain /, + or #.");
+            }
+            
+            var requestTopic = $"MQTTnet.RPC/{Guid.NewGuid():N}/{context.MethodName}";
+            var responseTopic = requestTopic + "/response";
+
+            return new MqttRpcTopicPair
+            {
+                RequestTopic = requestTopic,
+                ResponseTopic = responseTopic
+            };
+        }
+    }
+}
@@ -0,0 +1,7 @@
+namespace MQTTnet.Extensions.Rpc.Options.TopicGeneration
+{
+    public interface IMqttRpcClientTopicGenerationStrategy
+    {
+        MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context);
+    }
+}
@@ -0,0 +1,24 @@
+using MQTTnet.Client;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Extensions.Rpc.Options.TopicGeneration
+{
+    public sealed class TopicGenerationContext
+    {
+        public string MethodName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the quality of service level.
+        /// The Quality of Service (QoS) level is an agreement between the sender of a message and the receiver of a message that defines the guarantee of delivery for a specific message.
+        /// There are 3 QoS levels in MQTT:
+        /// - At most once  (0): Message gets delivered no time, once or multiple times.
+        /// - At least once (1): Message gets delivered at least once (one time or more often).
+        /// - Exactly once  (2): Message gets delivered exactly once (It's ensured that the message only comes once).
+        /// </summary>
+        public MqttQualityOfServiceLevel QualityOfServiceLevel { get; set; }
+
+        public IMqttClient MqttClient { get; set; }
+
+        public IMqttRpcClientOptions Options { get; set; }
+    }
+}
@@ -4,9 +4,9 @@ using MQTTnet.Client.Receiving;

 namespace MQTTnet.Extensions.Rpc
 {
-    public class RpcAwareApplicationMessageReceivedHandler : IMqttApplicationMessageReceivedHandler
+    public sealed class RpcAwareApplicationMessageReceivedHandler : IMqttApplicationMessageReceivedHandler
    {
-        private readonly Func<MqttApplicationMessageReceivedEventArgs, Task> _handleReceivedApplicationMessageAsync;
+        readonly Func<MqttApplicationMessageReceivedEventArgs, Task> _handleReceivedApplicationMessageAsync;

        public RpcAwareApplicationMessageReceivedHandler(
            IMqttApplicationMessageReceivedHandler originalHandler,
@@ -20,12 +20,13 @@ namespace MQTTnet.Extensions.Rpc

        public async Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
        {
+            // First try to check if there is a pending RPC call! 
+            await _handleReceivedApplicationMessageAsync(eventArgs).ConfigureAwait(false);
+            
            if (OriginalHandler != null)
            {
                await OriginalHandler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
            }
-
-            await _handleReceivedApplicationMessageAsync(eventArgs).ConfigureAwait(false);
        }
    }
 }
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
+    <Product />
+    <Company />
+    <Authors />
+    <PackageId />
+    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <SignAssembly>false</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+    <DefaultLanguage>en</DefaultLanguage>
+    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WebSocket4Net" Version="0.15.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,14 @@
+using System;
+
+namespace MQTTnet.Extensions.WebSocket4Net
+{
+    public static class MqttFactoryExtensions
+    {
+        public static IMqttFactory UseWebSocket4Net(this IMqttFactory mqttFactory)
+        {
+            if (mqttFactory == null) throw new ArgumentNullException(nameof(mqttFactory));
+
+            return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory(mqttFactory.DefaultLogger));
+        }
+    }
+}
@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Channel;
+using MQTTnet.Client.Options;
+using MQTTnet.Exceptions;
+using MQTTnet.Internal;
+using SuperSocket.ClientEngine;
+using WebSocket4Net;
+
+namespace MQTTnet.Extensions.WebSocket4Net
+{
+    public sealed class WebSocket4NetMqttChannel : IMqttChannel
+    {
+        readonly BlockingCollection<byte> _receiveBuffer = new BlockingCollection<byte>();
+
+        readonly IMqttClientOptions _clientOptions;
+        readonly MqttClientWebSocketOptions _webSocketOptions;
+
+        WebSocket _webSocket;
+
+        public WebSocket4NetMqttChannel(IMqttClientOptions clientOptions, MqttClientWebSocketOptions webSocketOptions)
+        {
+            _clientOptions = clientOptions ?? throw new ArgumentNullException(nameof(clientOptions));
+            _webSocketOptions = webSocketOptions ?? throw new ArgumentNullException(nameof(webSocketOptions));
+        }
+
+        public string Endpoint => _webSocketOptions.Uri;
+
+        public bool IsSecureConnection { get; private set; }
+
+        public X509Certificate2 ClientCertificate { get; }
+
+        public async Task ConnectAsync(CancellationToken cancellationToken)
+        {
+            var uri = _webSocketOptions.Uri;
+            if (!uri.StartsWith("ws://", StringComparison.OrdinalIgnoreCase) && !uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase))
+            {
+                if (_webSocketOptions.TlsOptions?.UseTls == false)
+                {
+                    uri = "ws://" + uri;
+                }
+                else
+                {
+                    uri = "wss://" + uri;
+                }
+            }
+
+            var sslProtocols = _webSocketOptions?.TlsOptions?.SslProtocol ?? SslProtocols.None;
+            var subProtocol = _webSocketOptions.SubProtocols.FirstOrDefault() ?? string.Empty;
+
+            var cookies = new List<KeyValuePair<string, string>>();
+            if (_webSocketOptions.CookieContainer != null)
+            {
+                throw new NotSupportedException("Cookies are not supported.");
+            }
+
+            List<KeyValuePair<string, string>> customHeaders = null;
+            if (_webSocketOptions.RequestHeaders != null)
+            {
+                customHeaders = _webSocketOptions.RequestHeaders.Select(i => new KeyValuePair<string, string>(i.Key, i.Value)).ToList();
+            }
+
+            EndPoint proxy = null;
+            if (_webSocketOptions.ProxyOptions != null)
+            {
+                throw new NotSupportedException("Proxies are not supported.");
+            }
+
+            // The user agent can be empty always because it is just added to the custom headers as "User-Agent".
+            var userAgent = string.Empty;
+
+            var origin = string.Empty;
+            var webSocketVersion = WebSocketVersion.None;
+            var receiveBufferSize = 0;
+
+            var certificates = new X509CertificateCollection();
+            if (_webSocketOptions?.TlsOptions?.Certificates != null)
+            {
+                foreach (var certificate in _webSocketOptions.TlsOptions.Certificates)
+                {
+#if WINDOWS_UWP
+                    certificates.Add(new X509Certificate(certificate));
+#else
+                    certificates.Add(certificate);
+#endif
+                    
+                }
+            }
+
+            _webSocket = new WebSocket(uri, subProtocol, cookies, customHeaders, userAgent, origin, webSocketVersion, proxy, sslProtocols, receiveBufferSize)
+            {
+                NoDelay = true,
+                Security =
+                {
+                    AllowUnstrustedCertificate = _webSocketOptions?.TlsOptions?.AllowUntrustedCertificates == true,
+                    AllowCertificateChainErrors = _webSocketOptions?.TlsOptions?.IgnoreCertificateChainErrors == true,
+                    Certificates = certificates
+                }
+            };
+
+            await ConnectInternalAsync(cancellationToken).ConfigureAwait(false);
+            
+            IsSecureConnection = uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public Task DisconnectAsync(CancellationToken cancellationToken)
+        {
+            if (_webSocket != null && _webSocket.State == WebSocketState.Open)
+            {
+                _webSocket.Close();
+            }
+            
+            return Task.FromResult(0);
+        }
+
+        public Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            var readBytes = 0;
+            while (count > 0 && !cancellationToken.IsCancellationRequested)
+            {
+                if (!_receiveBuffer.TryTake(out var @byte))
+                {
+                    if (readBytes == 0)
+                    {
+                        // Block until at least one byte was received.
+                        @byte = _receiveBuffer.Take(cancellationToken);
+                    }
+                    else
+                    {
+                        return Task.FromResult(readBytes);
+                    }
+                }
+
+                buffer[offset] = @byte;
+                offset++;
+                count--;
+                readBytes++;
+            }
+
+            return Task.FromResult(readBytes);
+        }
+
+        public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            _webSocket.Send(buffer, offset, count);
+            return Task.FromResult(0);
+        }
+
+        public void Dispose()
+        {
+            if (_webSocket == null)
+            {
+                return;
+            }
+
+            _webSocket.DataReceived -= OnDataReceived;
+            _webSocket.Error -= OnError;
+            _webSocket.Dispose();
+            _webSocket = null;
+        }
+
+        static void OnError(object sender, ErrorEventArgs e)
+        {
+            System.Diagnostics.Debug.Write(e.Exception.ToString());
+        }
+
+        void OnDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            foreach (var @byte in e.Data)
+            {
+                _receiveBuffer.Add(@byte);
+            }
+        }
+
+        async Task ConnectInternalAsync(CancellationToken cancellationToken)
+        {
+            _webSocket.Error += OnError;
+            _webSocket.DataReceived += OnDataReceived;
+
+            var taskCompletionSource = new TaskCompletionSource<Exception>();
+
+            void ErrorHandler(object sender, ErrorEventArgs e)
+            {
+                taskCompletionSource.TrySetResult(e.Exception);
+            }
+
+            void SuccessHandler(object sender, EventArgs e)
+            {
+                taskCompletionSource.TrySetResult(null);
+            }
+
+            try
+            {
+                _webSocket.Opened += SuccessHandler;
+                _webSocket.Error += ErrorHandler;
+
+#pragma warning disable AsyncFixer02 // Long-running or blocking operations inside an async method
+                _webSocket.Open();
+#pragma warning restore AsyncFixer02 // Long-running or blocking operations inside an async method
+
+                var exception = await MqttTaskTimeout.WaitAsync(c =>
+                {
+                    c.Register(() => taskCompletionSource.TrySetCanceled());
+                    return taskCompletionSource.Task;
+                }, _clientOptions.CommunicationTimeout, cancellationToken).ConfigureAwait(false);
+
+                if (exception != null)
+                {
+                    if (exception is AuthenticationException authenticationException)
+                    {
+                        throw new MqttCommunicationException(authenticationException.InnerException);
+                    }
+
+                    if (exception is OperationCanceledException)
+                    {
+                        throw new MqttCommunicationTimedOutException();
+                    }
+
+                    throw new MqttCommunicationException(exception);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                throw new MqttCommunicationTimedOutException();
+            }
+            finally
+            {
+                _webSocket.Opened -= SuccessHandler;
+                _webSocket.Error -= ErrorHandler;
+            }
+        }
+    }
+}
@@ -0,0 +1,51 @@
+using MQTTnet.Adapter;
+using MQTTnet.Client.Options;
+using MQTTnet.Diagnostics;
+using MQTTnet.Formatter;
+using MQTTnet.Implementations;
+using System;
+using MQTTnet.Diagnostics.Logger;
+
+namespace MQTTnet.Extensions.WebSocket4Net
+{
+    public sealed class WebSocket4NetMqttClientAdapterFactory : IMqttClientAdapterFactory
+    {
+        readonly IMqttNetLogger _logger;
+
+        public WebSocket4NetMqttClientAdapterFactory(IMqttNetLogger logger)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+
+            switch (options.ChannelOptions)
+            {
+                case MqttClientTcpOptions _:
+                {
+                    return new MqttChannelAdapter(
+                        new MqttTcpChannel(options),
+                        new MqttPacketFormatterAdapter(options.ProtocolVersion),
+                        options.PacketInspector,
+                        _logger);
+                }
+
+                case MqttClientWebSocketOptions webSocketOptions:
+                {
+                    return new MqttChannelAdapter(
+                        new WebSocket4NetMqttChannel(options, webSocketOptions),
+                        new MqttPacketFormatterAdapter(options.ProtocolVersion), 
+                        options.PacketInspector,
+                        _logger);
+                }
+
+                default:
+                    {
+                        throw new NotSupportedException();
+                    }
+            }
+        }
+    }
+}
@@ -1,134 +0,0 @@
-using MQTTnet.Client;
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using System.Security.Authentication;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Adapter;
-using MQTTnet.Channel;
-using MQTTnet.Diagnostics;
-using MQTTnet.Serializer;
-using WebSocket4Net;
-
-namespace MQTTnet.TestApp.NetCore
-{
-    public class WebSocket4NetMqttClientAdapterFactory : IMqttClientAdapterFactory
-    {
-        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetChildLogger logger)
-        {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-
-            if (!(options.ChannelOptions is MqttClientWebSocketOptions))
-            {
-                throw new NotSupportedException("Only WebSocket connections are supported.");
-            }
-
-            return new MqttChannelAdapter(new WebSocket4NetMqttChannel(options), new MqttPacketSerializer(), logger);
-        }
-
-        private class WebSocket4NetMqttChannel : IMqttChannel
-        {
-            private readonly BlockingCollection<byte> _receiveBuffer = new BlockingCollection<byte>();
-
-            private readonly IMqttClientOptions _clientOptions;
-            private WebSocket4Net.WebSocket _webSocket;
-
-            public WebSocket4NetMqttChannel(IMqttClientOptions clientOptions)
-            {
-                _clientOptions = clientOptions ?? throw new ArgumentNullException(nameof(clientOptions));
-            }
-
-            public string Endpoint { get; } = "";
-
-            public Task ConnectAsync(CancellationToken cancellationToken)
-            {
-                var channelOptions = (MqttClientWebSocketOptions)_clientOptions.ChannelOptions;
-
-                var uri = "ws://" + channelOptions.Uri;
-                var sslProtocols = SslProtocols.None;
-
-                if (channelOptions.TlsOptions.UseTls)
-                {
-                    uri = "wss://" + channelOptions.Uri;
-                    sslProtocols = SslProtocols.Tls12;
-                }
-
-                var subProtocol = channelOptions.SubProtocols.FirstOrDefault() ?? string.Empty;
-
-                _webSocket = new WebSocket4Net.WebSocket(uri, subProtocol, sslProtocols: sslProtocols);
-                _webSocket.DataReceived += OnDataReceived;
-                _webSocket.Open();
-                SpinWait.SpinUntil(() => _webSocket.State == WebSocketState.Open, _clientOptions.CommunicationTimeout);
-
-                return Task.FromResult(0);
-            }
-
-            public Task DisconnectAsync()
-            {
-                if (_webSocket != null)
-                {
-                    _webSocket.DataReceived -= OnDataReceived;
-                    _webSocket.Close();
-                    SpinWait.SpinUntil(() => _webSocket.State == WebSocketState.Closed, _clientOptions.CommunicationTimeout);
-                }
-
-                _webSocket = null;
-
-                return Task.FromResult(0);
-            }
-
-            public Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-            {
-                var readBytes = 0;
-                while (count > 0 && !cancellationToken.IsCancellationRequested)
-                {
-                    byte @byte;
-                    if (readBytes == 0)
-                    {
-                        // Block until at lease one byte was received.
-                        @byte = _receiveBuffer.Take(cancellationToken);
-                    }
-                    else
-                    {
-                        if (!_receiveBuffer.TryTake(out @byte))
-                        {
-                            return Task.FromResult(readBytes);
-                        }
-                    }
-                    
-                    buffer[offset] = @byte;
-                    offset++;
-                    count--;
-                    readBytes++;
-                }
-
-                return Task.FromResult(readBytes);
-            }
-
-            public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-            {
-                _webSocket.Send(buffer, offset, count);
-                return Task.FromResult(0);
-            }
-
-            public void Dispose()
-            {
-                if (_webSocket != null)
-                {
-                    _webSocket.DataReceived -= OnDataReceived;
-                    _webSocket.Dispose();
-                }
-            }
-
-            private void OnDataReceived(object sender, WebSocket4Net.DataReceivedEventArgs e)
-            {
-                foreach (var @byte in e.Data)
-                {
-                    _receiveBuffer.Add(@byte);
-                }
-            }
-        }
-    }
-}
@@ -1,11 +0,0 @@
-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";
-    }
-}
@@ -1,53 +0,0 @@
-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;
-    }
-}
@@ -1,121 +0,0 @@
-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}");
-        }
-    }
-}
@@ -1,18 +0,0 @@
-
-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; }
-    }
-}
@@ -1,61 +0,0 @@
-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);
-        }
-    }
-}
@@ -1,62 +0,0 @@
-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);
-        }
-    }
-}
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Server.Controllers
-{
-    public class ScriptsController
-    {
-    }
-}
@@ -1,77 +0,0 @@
-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);
-        }
-    }
-}
@@ -1,43 +0,0 @@
-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);
-        }
-    }
-}
@@ -1,50 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,74 +0,0 @@
-<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>
@@ -1,48 +0,0 @@
-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);
-        }
-    }
-}
@@ -1,50 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,39 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,40 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,41 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,40 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,47 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,246 +0,0 @@
-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();
-        }
-    }
-}
@@ -1,131 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,47 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,71 +0,0 @@
-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();
-        }
-    }
-}
@@ -1 +0,0 @@
-[{"Topic":"a","Payload":"YWFzYXNhc2E=","QualityOfServiceLevel":0,"Retain":true,"UserProperties":[],"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifier":null},{"Topic":"fgdfgd","Payload":"YWFzYXNhc2E=","QualityOfServiceLevel":0,"Retain":true,"UserProperties":[],"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifier":null}]
@@ -1,47 +0,0 @@
-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;
-            }
-        }
-    }
-}
@@ -1,88 +0,0 @@
-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);
-        }
-    }
-}
@@ -1,66 +0,0 @@
-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();
-        }
-    }
-}
@@ -1,130 +0,0 @@
-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);
-        }
-    }
-}
@@ -1,57 +0,0 @@
-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);
-                }
-            }
-        }
-    }
-}
@@ -1,107 +0,0 @@
-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"]))
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				[{"Topic":"a","Payload":"YWFzYXNhc2E=","QualityOfServiceLevel":0,"Retain":true,"UserProperties":[],"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifier":null},{"Topic":"fgdfgd","Payload":"YWFzYXNhc2E=","QualityOfServiceLevel":0,"Retain":true,"UserProperties":[],"ContentType":null,"ResponseTopic":null,"PayloadFormatIndicator":null,"MessageExpiryInterval":null,"TopicAlias":null,"CorrelationData":null,"SubscriptionIdentifier":null}]