WiP

.vscode/launch.json

@@ -5,8 +5,8 @@
             "name": "Sample (console)",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "build",            
-            "program": "${workspaceFolder}/Samples/Mqtt.Sample/bin/Debug/net7.0/Mqtt.Sample.dll",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/Samples/Mqtt.Sample/bin/Debug/net8.0/Mqtt.Sample.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Samples/Mqtt.Sample",
             "console": "integratedTerminal",
@@ -18,4 +18,4 @@
             "request": "attach"
         }
     ]
-}
+}

Directory.Build.props

@@ -6,7 +6,7 @@
   <Import Project="$(ParentDirectoryBuildProps)" Condition="Exists('$(ParentDirectoryBuildProps)')"/>
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <AnalysisLevel>latest</AnalysisLevel>
@@ -41,8 +41,8 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2023.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.7.30" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2023.3.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="[17.8.14,)" />
     <PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
   </ItemGroup>

Samples/Directory.Build.props

@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Label="Files">

Samples/Mqtt.Sample/Controllers/TestController.cs

@@ -18,10 +18,10 @@ public TestController(ILogger<TestController> logger)
     [Topic("run/+user/+count")]
     public Task<bool> RunAsync(
         string user,
-        int count,
+        float count,
         CancellationToken cancellationToken)
     {
-        Logger.LogInformation("Running {User}: {Count} {Payload}", user, count, Encoding.ASCII.GetString(Request.Payload));
+        Logger.LogInformation("Running {User}: {Count} {Payload}", user, count, Encoding.UTF8.GetString(Request.Payload));
         cancellationToken.ThrowIfCancellationRequested();
         return Task.FromResult(true);
     }

Samples/Mqtt.Sample/GlobalUsings.cs

@@ -1,3 +1,4 @@
 // Global using directives
 
-global using JetBrains.Annotations;
+global using JetBrains.Annotations;
+global using Sholo.Mqtt;

Samples/Mqtt.Sample/Program.cs

@@ -6,9 +6,8 @@
 using Mqtt.Sample.Services;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using Sholo.Mqtt;
-using Sholo.Mqtt.Application.Builder;
 using Sholo.Mqtt.Hosting;
+using Sholo.Mqtt.Routing;
 using Sholo.Mqtt.TypeConverters.NewtonsoftJson;
 
 namespace Mqtt.Sample;
@@ -38,7 +37,7 @@ await Host.CreateDefaultBuilder(args)
                         };
                     });
 
-                services.AddHostedService<FakeClientService>();
+                services.AddHostedService<ClientService>();
             })
             .ConfigureMqttHost(app =>
             {

Samples/Mqtt.Sample/Services/ClientService.cs

@@ -0,0 +1,121 @@
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using MQTTnet;
+using MQTTnet.Extensions.ManagedClient;
+using MQTTnet.Protocol;
+
+namespace Mqtt.Sample.Services;
+
+internal sealed class ClientService : BackgroundService
+{
+    private SortedDictionary<char, MenuItem> Items { get; }
+    private IManagedMqttClient MqttClient { get; }
+    private ILogger Logger { get; }
+
+    public ClientService(
+        IManagedMqttClient mqttClient,
+        ILogger<ClientService> logger
+    )
+    {
+        MqttClient = mqttClient;
+        Logger = logger;
+
+        Items = new SortedDictionary<char, MenuItem>(Comparer<char>.Create((a, b) => char.ToLowerInvariant(a).CompareTo(char.ToLowerInvariant(b))))
+        {
+            ['0'] = new("Send a message", ct => SendMessage(
+                b => b
+                    .WithTopic("test/run/scott/26.2")
+                    .WithQualityOfServiceLevel(MqttQualityOfServiceLevel.AtMostOnce)
+                    .WithPayload("this is a test")
+                    .WithRetainFlag(false),
+                ct
+            )),
+            ['1'] = new("Send a message", ct => SendMessage(
+                b => b
+                    .WithTopic("test/run/scott/25/2")
+                    .WithQualityOfServiceLevel(MqttQualityOfServiceLevel.AtMostOnce)
+                    .WithPayload("{\"hello\":\"world\",\"test\":\"123\"}"u8.ToArray())
+                    .WithRetainFlag(false),
+                ct
+            )),
+        };
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        using var cts = CancellationTokenSource.CreateLinkedTokenSource(stoppingToken);
+
+        async Task Quit(CancellationTokenSource c)
+        {
+            await c.CancelAsync();
+        }
+
+        await WriteMenu(false);
+
+        var cancellationToken = cts.Token;
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            Console.WriteLine("Choose an option (? for menu, q to quit):");
+            var c = Console.ReadKey(true);
+            var lc = char.ToLowerInvariant(c.KeyChar);
+
+            var task = lc switch
+            {
+                '?' => WriteMenu(false),
+                'q' => Quit(cts),
+                _ => Items.TryGetValue(lc, out var item) ? item.Action.Invoke(cancellationToken) : WriteMenu(true)
+            };
+
+            await task;
+        }
+    }
+
+    private async Task SendMessage(Action<MqttApplicationMessageBuilder> configuration, CancellationToken cancellationToken)
+    {
+        Logger.LogInformation("Sending a message");
+
+        var mqttApplicationMessageBuilder = new MqttApplicationMessageBuilder();
+
+        configuration.Invoke(mqttApplicationMessageBuilder);
+
+        var mqttApplicationMessage = mqttApplicationMessageBuilder.Build();
+
+        await MqttClient.InternalClient.PublishAsync(mqttApplicationMessage, cancellationToken);
+    }
+
+    private Task WriteMenu(bool showErrorMessage)
+    {
+        if (showErrorMessage)
+        {
+            Console.WriteLine("Invalid option");
+            Console.WriteLine();
+        }
+
+        foreach (var (c, item) in Items)
+        {
+            if (c is '?' or 'q')
+            {
+                throw new InvalidOperationException("? and q are reserved");
+            }
+
+            Console.WriteLine($"  {c}  {item.Description}");
+        }
+
+        Console.WriteLine("  ?  Help");
+        Console.WriteLine("  q  Quit");
+
+        return Task.CompletedTask;
+    }
+
+    private sealed class MenuItem
+    {
+        public string Description { get; }
+        public Func<CancellationToken, Task> Action { get; }
+
+        public MenuItem(string description, Func<CancellationToken, Task> action)
+        {
+            Description = description;
+            Action = action;
+        }
+    }
+}

Samples/Mqtt.Sample/appsettings.json

@@ -1,6 +1,6 @@
 {
   "mqtt": {
-    "host": "mosquitto",
+    "host": "localhost",
     "port": 1883
   }
 }

Source/Directory.Build.props

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Label="Files">

Source/Sholo.Mqtt.Sandbox/Topics/PatternPropertyConfigurationBuilder/MqttTopicPatternPropertyConfigurationBuilder.cs

@@ -16,7 +16,7 @@ public MqttTopicPatternPropertyConfigurationBuilder(string initialParameterName,
         ParameterName = initialParameterName;
         ValueSetter = valueSetter;
 
-        if (DefaultTypeConverters.TryGetStringTypeConverter(parameterType, out var typeConverter))
+        if (DefaultTypeConverter.TryGetStringTypeConverter(parameterType, out var typeConverter))
         {
             TypeConverter = typeConverter!;
         }

Source/Sholo.Mqtt.TypeConverters.NewtonsoftJson/NewtonsoftJsonPayloadTypeConverter.cs

@@ -25,7 +25,7 @@ ILogger<NewtonsoftJsonPayloadTypeConverter> logger
         Serializer = JsonSerializer.Create(options.Value.SerializerSettings);
     }
 
-    public bool TryConvertPayload(ArraySegment<byte> payloadData, Type targetType, out object result) => TryConvert(payloadData, targetType, out result);
+    public bool TryConvertPayload(ArraySegment<byte> payload, Type targetType, out object result) => TryConvert(payload, targetType, out result);
 
     private bool TryConvert(ArraySegment<byte> data, Type targetType, out object result)
     {

Source/Sholo.Mqtt/Application/Builder/MqttApplicationBuilder.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Sholo.Mqtt.Internal;
@@ -50,7 +49,7 @@ public IMqttApplication Build()
 
         var routeProvider = ApplicationServices.GetRequiredService<IRouteProvider>();
 
-        var topicFilters = routeProvider.Endpoints.Select(x => x.TopicFilter);
+        var topicFilters = routeProvider.TopicFilters;
 
         return new MqttApplication(topicFilters, app);
     }

Source/Sholo.Mqtt/Application/Provider/MqttApplicationProvider.cs

@@ -17,7 +17,7 @@ public IMqttApplication? Current
         get => _current;
         private set
         {
-            var previous = _current ?? throw new InvalidOperationException();
+            var previous = _current;
             _current = value;
 
             OnApplicationChanged(previous, _current!);