Update pkgs. Better AI logs

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
 		"args": { 
 			// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
 			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0-bullseye",
+			"VARIANT": "7.0-bullseye",
 			// Options
 			"NODE_VERSION": "none"
 		}
@@ -56,6 +56,7 @@
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
 	"features": {
-		"azure-cli": "latest"
+		"azure-cli": "latest",
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {}
 	}
 }

.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

.github/workflows/samples2docker.yml

@@ -9,19 +9,34 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       packages: write
       contents: read
     steps:
+
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: 7.0.x
+
+    - name: mqtt-connection docker
+      run: dotnet publish samples/mqtt-connection -c Release --os linux --arch x64 /t:PublishContainer /p:ContainerImageName=ghcr.io/iotmodels/mqtt-connection /p:ContainerImageTag=latest
+
+    - name: mqtt-connection push
+      run: docker push ghcr.io/iotmodels/mqtt-connection:latest
+
     - name: memmon docker
       run: docker build . --file samples/memmon/Dockerfile --tag ghcr.io/iotmodels/memmon:x64
 
@@ -34,6 +49,12 @@ jobs:
     - name: pi-sense docker push 
       run: docker push ghcr.io/iotmodels/pi-sense-device:x64
 
+    - name: grpc docker
+      run: docker build -f samples/mqtt-grpc-device/Dockerfile . -t ghcr.io/iotmodels/mqtt-grpc-device:latest
+
+    - name: grpc push
+      run: docker push ghcr.io/iotmodels/mqtt-grpc-device:latest
+
 
     #- name: Build the Docker image ARM
     #  run: docker build . --file samples/memmon/Dockerfile.pi --tag ghcr.io/ridomin/memmon:arm

MQTTnet.Extensions.MultiCloud.sln

@@ -57,16 +57,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pi-sense-device", "samples\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iothub-sample", "samples\iothub-sample\iothub-sample.csproj", "{CF342B46-3B96-4270-8881-70FF105DE8E4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mqtt-device", "samples\mqtt-device\mqtt-device.csproj", "{F0DE9E2F-0E87-4C2C-875B-79547FD957D6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mqtt-grpc-device", "samples\mqtt-grpc-device\mqtt-grpc-device.csproj", "{AF019503-8813-4967-B858-0DDAE43C2073}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "payload-size", "samples\payload-size\payload-size.csproj", "{DF590535-2FDC-4A0A-9EE4-7C9BF818C7B4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "memmon-protobuff", "samples\memmon-protobuff\memmon-protobuff.csproj", "{20B75646-CBD2-4E72-8C56-22887A519FA3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aws-sample", "samples\aws-sample\aws-sample.csproj", "{713F4937-160C-4CA3-9F9B-91DD91E7F5AC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mqtt-connection", "samples\mqtt-connection\mqtt-connection.csproj", "{E1B90E61-2564-4FCE-8CED-F6D175DFBF4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlApp", "samples\ControlApp\ControlApp.csproj", "{55CBDD98-6C1B-442F-B37C-B13599363FD3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mqtt-commands", "samples\mqtt-commands\mqtt-commands.csproj", "{72206AF8-D6A4-4098-9FC3-320402EF9E85}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -109,18 +111,10 @@ Global
 		{CF342B46-3B96-4270-8881-70FF105DE8E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CF342B46-3B96-4270-8881-70FF105DE8E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF342B46-3B96-4270-8881-70FF105DE8E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0DE9E2F-0E87-4C2C-875B-79547FD957D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0DE9E2F-0E87-4C2C-875B-79547FD957D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0DE9E2F-0E87-4C2C-875B-79547FD957D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0DE9E2F-0E87-4C2C-875B-79547FD957D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF019503-8813-4967-B858-0DDAE43C2073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF019503-8813-4967-B858-0DDAE43C2073}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF019503-8813-4967-B858-0DDAE43C2073}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF019503-8813-4967-B858-0DDAE43C2073}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF590535-2FDC-4A0A-9EE4-7C9BF818C7B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF590535-2FDC-4A0A-9EE4-7C9BF818C7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF590535-2FDC-4A0A-9EE4-7C9BF818C7B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF590535-2FDC-4A0A-9EE4-7C9BF818C7B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20B75646-CBD2-4E72-8C56-22887A519FA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20B75646-CBD2-4E72-8C56-22887A519FA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{20B75646-CBD2-4E72-8C56-22887A519FA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -129,6 +123,18 @@ Global
 		{713F4937-160C-4CA3-9F9B-91DD91E7F5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{713F4937-160C-4CA3-9F9B-91DD91E7F5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{713F4937-160C-4CA3-9F9B-91DD91E7F5AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1B90E61-2564-4FCE-8CED-F6D175DFBF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1B90E61-2564-4FCE-8CED-F6D175DFBF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1B90E61-2564-4FCE-8CED-F6D175DFBF4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1B90E61-2564-4FCE-8CED-F6D175DFBF4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55CBDD98-6C1B-442F-B37C-B13599363FD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55CBDD98-6C1B-442F-B37C-B13599363FD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55CBDD98-6C1B-442F-B37C-B13599363FD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55CBDD98-6C1B-442F-B37C-B13599363FD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72206AF8-D6A4-4098-9FC3-320402EF9E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72206AF8-D6A4-4098-9FC3-320402EF9E85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72206AF8-D6A4-4098-9FC3-320402EF9E85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72206AF8-D6A4-4098-9FC3-320402EF9E85}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,11 +145,12 @@ Global
 		{0685EACE-A84C-48DE-A69F-0899651ECEDC} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
 		{0E96AC9D-28FF-4E49-A518-E3DEE2E9DA77} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
 		{CF342B46-3B96-4270-8881-70FF105DE8E4} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
-		{F0DE9E2F-0E87-4C2C-875B-79547FD957D6} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
 		{AF019503-8813-4967-B858-0DDAE43C2073} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
-		{DF590535-2FDC-4A0A-9EE4-7C9BF818C7B4} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
 		{20B75646-CBD2-4E72-8C56-22887A519FA3} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
 		{713F4937-160C-4CA3-9F9B-91DD91E7F5AC} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
+		{E1B90E61-2564-4FCE-8CED-F6D175DFBF4F} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
+		{55CBDD98-6C1B-442F-B37C-B13599363FD3} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
+		{72206AF8-D6A4-4098-9FC3-320402EF9E85} = {F5E59EDE-6E77-484C-AB93-C4651F43B9A7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {09914DD8-50B2-48E3-B9AB-7764AE36AD6B}

docs/ConnectionSettings.md

@@ -18,7 +18,8 @@ Connection settings can be established using the API or parsing a connection str
 - `TcpPort` Sets the TCP port for the MQTT connection, defaults to `8883`
 - `UseTls` Enable/Disable Server TLS connection, defaults to `true`
 - `CaFile` Path to the CA certificate required to stablish the TLS session
-- `GatewayHostName` Allos to connect to IoT Hub through a IoTEdge ($edgeHub) gateway (aka Transparent Gateway)
+- `GatewayHostName` Allows to connect to IoT Hub through a IoTEdge ($edgeHub) gateway (aka Transparent Gateway)
+- `MqttVersion` Sets the MqttProtocolVersion, allowed values are 5 and 3 (will use 3.1.1)
 
 ## Sample Connection Strings
 

samples/ControlApp/ControlApp.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>dotnet-ControlApp-8834a165-c677-427f-a11c-bc8d11a84a46</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\MQTTnet.Extensions.MultiCloud.BrokerIoTClient\MQTTnet.Extensions.MultiCloud.BrokerIoTClient.csproj" />
+  </ItemGroup>
+</Project>

samples/ControlApp/Program.cs

@@ -0,0 +1,10 @@
+using ControlApp;
+
+IHost host = Host.CreateDefaultBuilder(args)
+    .ConfigureServices(services =>
+    {
+        services.AddHostedService<Worker>();
+    })
+    .Build();
+
+host.Run();

samples/ControlApp/Worker.cs

@@ -0,0 +1,34 @@
+using MQTTnet.Extensions.MultiCloud.BrokerIoTClient;
+
+namespace ControlApp
+{
+    public class Worker : BackgroundService
+    {
+        private readonly ILogger<Worker> _logger;
+        private readonly IConfiguration _configuration;
+
+        public Worker(ILogger<Worker> logger, IConfiguration configuration)
+        {
+            _logger = logger;
+            _configuration = configuration;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            var mqttClient = await BrokerClientFactory.CreateFromConnectionSettingsAsync(_configuration.GetConnectionString("cs")!, false, stoppingToken);
+            TelemetryClient<double> telClient = new(mqttClient, "workingSet");
+            CommandClient<string, string> cmdClient = new(mqttClient, "echo");
+
+            var res = await cmdClient.InvokeAsync("mqtt-command-device", "hello3", stoppingToken);
+
+            _logger.LogInformation("Command response {r}", res);
+
+            await telClient.StartAsync("+");
+
+            telClient.OnTelemetry = (id,m) =>
+            {
+                _logger.LogInformation("Telemetry from {id} workingSet {m}", id, m);
+            };
+        }
+    }
+}

samples/ControlAppDebug.sln

@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33516.290
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlApp", "ControlApp\ControlApp.csproj", "{DA9074C9-219F-464D-8A1D-622EC206CFFA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.MultiCloud.BrokerIoTClient", "..\src\MQTTnet.Extensions.MultiCloud.BrokerIoTClient\MQTTnet.Extensions.MultiCloud.BrokerIoTClient.csproj", "{9A7F4B31-58B1-4D16-9C62-37136F716F6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.MultiCloud", "..\src\MQTTnet.Extensions.MultiCloud\MQTTnet.Extensions.MultiCloud.csproj", "{E0725F33-BA7C-4407-AF96-4EACF9AAB9CA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DA9074C9-219F-464D-8A1D-622EC206CFFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA9074C9-219F-464D-8A1D-622EC206CFFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA9074C9-219F-464D-8A1D-622EC206CFFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA9074C9-219F-464D-8A1D-622EC206CFFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A7F4B31-58B1-4D16-9C62-37136F716F6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A7F4B31-58B1-4D16-9C62-37136F716F6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A7F4B31-58B1-4D16-9C62-37136F716F6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A7F4B31-58B1-4D16-9C62-37136F716F6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0725F33-BA7C-4407-AF96-4EACF9AAB9CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0725F33-BA7C-4407-AF96-4EACF9AAB9CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0725F33-BA7C-4407-AF96-4EACF9AAB9CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0725F33-BA7C-4407-AF96-4EACF9AAB9CA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BF1136C9-5DC3-499F-91BA-7C9549764A11}
+	EndGlobalSection
+EndGlobal

samples/aws-sample/Device.cs

@@ -17,7 +17,7 @@ public Device(ILogger<Device> logger, IConfiguration configuration)
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
-            ConnectionSettings cs =  new (_configuration.GetConnectionString("cs"));
+            ConnectionSettings cs =  new (_configuration.GetConnectionString("cs")!);
             var mqtt = await AwsClientFactory.CreateFromConnectionSettingsAsync(cs, false, stoppingToken);
             Console.WriteLine(mqtt.IsConnected);
             Console.WriteLine(AwsClientFactory.ComputedSettings);

samples/aws-sample/aws-sample.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

samples/iothub-sample/Device.cs

@@ -23,13 +23,14 @@ public Device(ILogger<Device> logger, IConfiguration configuration)
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        var connectionSettings = new ConnectionSettings(_configuration.GetConnectionString("cs"));
+        var connectionSettings = new ConnectionSettings(_configuration.GetConnectionString("cs1"));
         _logger.LogWarning("Connecting to: {connectionSettings}", connectionSettings);
 
         var client = new HubMqttClient(await HubDpsFactory.CreateFromConnectionSettingsAsync(connectionSettings, stoppingToken));
         client.Connection.DisconnectedAsync += async d => await Task.Run(() => _logger.LogError("MQTT client disconnected {reason}", d.Reason));
+        var t0 = await client.GetTwinAsync(stoppingToken);
         var v = await client.UpdateTwinAsync(new { started = DateTime.Now }, stoppingToken);
-        _logger.LogInformation("Updated Twin to verison: {v}", v);
+        _logger.LogInformation("Updated Twin to version: {v}", v);
         var twin = await client.GetTwinAsync(stoppingToken);
         Console.WriteLine(twin);
 

samples/iothub-sample/Program.cs

@@ -9,10 +9,10 @@ public class Program
         public static void Main(string[] args)
         {
 
-            //using (var consoleListener = new ConsoleTraceListener())
-            //{
-            //    Trace.Listeners.Add(consoleListener);
-            //}
+            using (var consoleListener = new ConsoleTraceListener())
+            {
+                Trace.Listeners.Add(consoleListener);
+            }
 
             CreateHostBuilder(args).Build().Run();
         }

samples/iothub-sample/iothub-sample.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

samples/memmon-protobuff/Device.cs

@@ -41,7 +41,7 @@ public Device(ILogger<Device> logger, IConfiguration configuration, TelemetryCli
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        var cs = new ConnectionSettings(_configuration.GetConnectionString("cs")) { ModelId = MemmonClient.ModelId };
+        var cs = new ConnectionSettings(_configuration.GetConnectionString("cs")!) { ModelId = MemmonClient.ModelId };
         _logger.LogWarning("Connecting to..{cs}", cs);
         var mqtt = await BrokerClientFactory.CreateFromConnectionSettingsAsync(cs, true, stoppingToken);
         connectionSettings = cs;

samples/memmon-protobuff/memmon-protobuff.csproj

@@ -10,14 +10,14 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.21.9" />
-		<PackageReference Include="Grpc.Tools" Version="2.50.0">
+		<PackageReference Include="Google.Protobuf" Version="3.22.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.52.0">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Humanizer.Core" Version="2.14.1" />
 		<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
 	</ItemGroup>