统一topic

952795 · Mar 20, 2022 · caef717 · caef717
1 parent ea5cda1
commit caef717
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/MQTTClient.cs b/IoTSharp.SDKs/IoTSharp.Sdk.MQTT/MQTTClient.cs
@@ -46,8 +46,8 @@ public async Task<bool> ConnectAsync(Uri uri, string username, string password)
                         .Build();
                 Client.ApplicationMessageReceivedAsync +=  Client_ApplicationMessageReceived;
                 Client.ConnectedAsync += e => {
-                    Client.SubscribeAsync($"/devices/{DeviceId}/rpc/request/+/+");
-                    Client.SubscribeAsync($"/devices/{DeviceId}/attributes/update/", MqttQualityOfServiceLevel.ExactlyOnce);
+                    Client.SubscribeAsync($"devices/{DeviceId}/rpc/request/+/+");
+                    Client.SubscribeAsync($"devices/{DeviceId}/attributes/update/", MqttQualityOfServiceLevel.ExactlyOnce);
                     LogInformation?.Invoke($"CONNECTED WITH SERVER ");
                     return Task.CompletedTask;
                 };
@@ -90,11 +90,11 @@ private Task Client_ApplicationMessageReceived( MqttApplicationMessageReceivedEv
            LogDebug?.Invoke($"ApplicationMessageReceived Topic {e.ApplicationMessage.Topic}  QualityOfServiceLevel:{e.ApplicationMessage.QualityOfServiceLevel} Retain:{e.ApplicationMessage.Retain} ");
             try
             {
-                if (e.ApplicationMessage.Topic.StartsWith($"/devices/") && e.ApplicationMessage.Topic.Contains("/response/"))
+                if (e.ApplicationMessage.Topic.StartsWith($"devices/") && e.ApplicationMessage.Topic.Contains("/response/"))
                 {
                     ReceiveAttributes(e);
                 }
-                else if (e.ApplicationMessage.Topic.StartsWith($"/devices/") && e.ApplicationMessage.Topic.Contains("/rpc/request/"))
+                else if (e.ApplicationMessage.Topic.StartsWith($"devices/") && e.ApplicationMessage.Topic.Contains("/rpc/request/"))
                 {
                     var tps = e.ApplicationMessage.Topic.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
                     var rpcmethodname = tps[4];
@@ -165,7 +165,7 @@ public Task UploadTelemetryDataAsync(string _devicename, object obj)
         public Task ResponseExecommand(RpcResponse rpcResult)
         {
             ///IoTSharp/Clients/RpcClient.cs#L65     var responseTopic = $"/devices/{deviceid}/rpc/response/{methodName}/{rpcid}";
-            string topic = $"/devices/{rpcResult.DeviceId}/rpc/response/{rpcResult.Method.ToString()}/{rpcResult.ResponseId}";
+            string topic = $"devices/{rpcResult.DeviceId}/rpc/response/{rpcResult.Method.ToString()}/{rpcResult.ResponseId}";
             return Client.PublishAsync(new MqttApplicationMessageBuilder().WithTopic( topic).WithPayload( rpcResult.Data.ToString()).WithQualityOfServiceLevel( MqttQualityOfServiceLevel.ExactlyOnce).Build());
         }
         public Task RequestAttributes(params string[] args) => RequestAttributes("me", false, args);
@@ -178,7 +178,7 @@ public Task RequestAttributes(string _device, bool anySide  , params string[] ar
             string topic = $"devices/{_device}/attributes/request/{id}";
             Dictionary<string, string> keys = new Dictionary<string, string>();
             keys.Add(anySide ? "anySide" : "server", string.Join(",", args));
-            Client.SubscribeAsync($"/devices/{_device}/attributes/response/{id}", MqttQualityOfServiceLevel.ExactlyOnce);
+            Client.SubscribeAsync($"devices/{_device}/attributes/response/{id}", MqttQualityOfServiceLevel.ExactlyOnce);
             return Client.PublishStringAsync(topic, Newtonsoft.Json.JsonConvert.SerializeObject(keys), MqttQualityOfServiceLevel.ExactlyOnce);
         }
     }

diff --git a/IoTSharp/Clients/RpcClient.cs b/IoTSharp/Clients/RpcClient.cs
@@ -64,8 +64,8 @@ public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string deviceid, string
                 throw new ArgumentException("The method name cannot contain /, + or #.");
             }
             string rpcid = $"{Guid.NewGuid():N}";
-            var requestTopic = $"/devices/{deviceid}/rpc/request/{methodName}/{rpcid}";
-            var responseTopic = $"/devices/{deviceid}/rpc/response/{methodName}/{rpcid}";
+            var requestTopic = $"devices/{deviceid}/rpc/request/{methodName}/{rpcid}";
+            var responseTopic = $"devices/{deviceid}/rpc/response/{methodName}/{rpcid}";
 
             var requestMessage = new MqttApplicationMessageBuilder()
                 .WithTopic(requestTopic)

diff --git a/IoTSharp/Handlers/MQTTServerHandler.cs b/IoTSharp/Handlers/MQTTServerHandler.cs
@@ -296,13 +296,13 @@ private async Task RequestAttributes(string[] tpary, string senderClientId, Dict
                 {
                     var qf = from at in _dbContext.AttributeLatest where at.Type == DataType.XML && at.KeyName == tpary[5] select at;
                     await qf.LoadAsync();
-                    await _serverEx.PublishAsync(senderClientId,  $"/devices/me/attributes/response/{tpary[5]}", qf.FirstOrDefault()?.Value_XML);
+                    await _serverEx.PublishAsync(senderClientId,  $"devices/me/attributes/response/{tpary[5]}", qf.FirstOrDefault()?.Value_XML);
                 }
                 else if (tpary.Length > 5 && tpary[4] == "binary")
                 {
                     var qf = from at in _dbContext.AttributeLatest where at.Type == DataType.Binary && at.KeyName == tpary[5] select at;
                     await qf.LoadAsync();
-                    await _serverEx.PublishAsync(senderClientId, $"/devices/me/attributes/response/{tpary[5]}", qf.FirstOrDefault()?.Value_Binary );
+                    await _serverEx.PublishAsync(senderClientId, $"devices/me/attributes/response/{tpary[5]}", qf.FirstOrDefault()?.Value_Binary );
                 }
                 else
                 {
@@ -365,6 +365,8 @@ private async Task RequestAttributes(string[] tpary, string senderClientId, Dict
                                 break;
                         }
                     }
+
+                    await _serverEx.PublishAsync(senderClientId, $"devices/me/attributes/response/{tpary[4]}", reps);
                 }
             }
 
@@ -413,7 +415,7 @@ internal    Task Server_ClientSubscribedTopic( ClientSubscribedTopicEventArgs e)
 
 
             }
-            if (e.TopicFilter.Topic.ToLower().StartsWith("/devices/telemetry"))
+            if (e.TopicFilter.Topic.ToLower().StartsWith("devices/telemetry"))
             {