add modules support for hub client (#79)

* add modules support for hub client * add module tests * upd trx to 2.2.2 Co-authored-by: ridomin <[email protected]>
iotmodels · Nov 4, 2022 · 9f0c80c · 9f0c80c
1 parent dd0240e
commit 9f0c80c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
 
     - name: Process trx reports with default
       if: always()
-      uses: im-open/[email protected].1
+      uses: im-open/[email protected].2
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubMqttClient.cs b/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubMqttClient.cs
@@ -8,7 +8,6 @@ namespace MQTTnet.Extensions.MultiCloud.AzureIoTClient
     public class HubMqttClient : IHubMqttClient
     {
         public IMqttClient Connection { get; set; }
-
         public string InitialState { get; set; } = String.Empty;
 
         private readonly TwinRequestResponseBinder twinOperationsBinder;
@@ -38,12 +37,17 @@ public Func<JsonNode, GenericPropertyAck> OnPropertyUpdateReceived
 
         public Task<string> GetTwinAsync(CancellationToken cancellationToken = default) => twinOperationsBinder.GetTwinAsync(cancellationToken);
         public Task<int> UpdateTwinAsync(object payload, CancellationToken cancellationToken = default) => twinOperationsBinder.UpdateTwinAsync(payload, cancellationToken);
-        public Task<MqttClientPublishResult> SendTelemetryAsync(object payload, CancellationToken t = default) =>
-            Connection.PublishBinaryAsync($"devices/{Connection.Options.ClientId}/messages/events/",
+        public async Task<MqttClientPublishResult> SendTelemetryAsync(object payload, CancellationToken t = default)
+        {
+            string clientSegment = Connection.Options.ClientId;
+            if (clientSegment.Contains("/")) //should be a module
+            {
+                clientSegment = clientSegment.Replace("/", "/modules/");
+            }
+            return await Connection.PublishBinaryAsync($"devices/{clientSegment}/messages/events/",
                 new UTF8JsonSerializer().ToBytes(payload),
                 Protocol.MqttQualityOfServiceLevel.AtLeastOnce,
                 false, t);
-
-
+        }
     }
 }
diff --git a/tests/MQTTnet.Extensions.MultiCloud.UnitTests/HubClient/HubTelemetryUTF8JsonFixture.cs b/tests/MQTTnet.Extensions.MultiCloud.UnitTests/HubClient/HubTelemetryUTF8JsonFixture.cs
@@ -15,5 +15,16 @@ public async Task SendTelemetry()
             Assert.Equal("devices/mock/messages/events/", mqttClient.topicRecceived);
             Assert.Equal("{\"temp\":2}", mqttClient.payloadReceived);
         }
+
+        [Fact]
+        public async Task SendTelemetryToModule()
+        {
+            var mqttClient = new MockMqttClient("mock/myModule");
+            var hubMqttClient = new HubMqttClient(mqttClient);
+            //var telemetryBinder = new Telemetry<int>(mqttClient, "temp");
+            await hubMqttClient.SendTelemetryAsync(new { temp = 2});
+            Assert.Equal("devices/mock/modules/myModule/messages/events/", mqttClient.topicRecceived);
+            Assert.Equal("{\"temp\":2}", mqttClient.payloadReceived);
+        }
     }
 }
diff --git a/tests/MQTTnet.Extensions.MultiCloud.UnitTests/MockMqttClient.cs b/tests/MQTTnet.Extensions.MultiCloud.UnitTests/MockMqttClient.cs
@@ -8,19 +8,28 @@
 
 namespace MQTTnet.Extensions.MultiCloud.UnitTests
 {
+
     internal class MockMqttClient : IMqttClient
     {
+        string _clientId = "";
+
+
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public MockMqttClient()
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         {
+            _clientId = "mock";
+        }
 
+        public MockMqttClient(string clientId)
+        {
+            _clientId = clientId;
         }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
         public bool IsConnected => throw new NotImplementedException();
 
 
-        public MqttClientOptions Options => new() { ClientId = "mock" };
+        public MqttClientOptions Options => new() { ClientId = _clientId };
 
         public string payloadReceived;
         public string topicRecceived;