add function to determine whether the device is online

fanliang11 · Dec 31, 2018 · bb1346c · bb1346c · fanliang11 · Dec 31, 2018
1 parent c3b3c82
commit bb1346c
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 221 deletions.
diff --git a/src/Surging.Core/Surging.Core.CPlatform/Logging/ConsoleLogger.cs b/src/Surging.Core/Surging.Core.CPlatform/Logging/ConsoleLogger.cs
diff --git a/src/Surging.Core/Surging.Core.CPlatform/Logging/ILogger.cs b/src/Surging.Core/Surging.Core.CPlatform/Logging/ILogger.cs
diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs
@@ -180,6 +180,16 @@ await _mqttRemoteInvokeService.InvokeAsync(new MqttRemoteInvokeContext
         public abstract Task UnSubscribe(string deviceId, params string[] topics);
 
         public abstract Task Publish(string deviceId, MqttWillMessage willMessage);
-
+
+        public ValueTask<SessionStatus?> GetDeviceStatus(string deviceId)
+        {
+            SessionStatus? result = null;
+            if (!string.IsNullOrEmpty(deviceId))
+            {
+                MqttChannels.TryGetValue(deviceId, out MqttChannel mqttChannel);
+                result = mqttChannel?.SessionStatus;
+            }
+            return new ValueTask<SessionStatus?>(result);
+        }
     }
 }
diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs
@@ -19,6 +19,7 @@ public interface IChannelService
         Task Publish(IChannel channel, PublishPacket mqttPublishMessage);
         Task Publish(string deviceId, MqttWillMessage willMessage);
         Task Close(string deviceId, bool isDisconnect);
+        ValueTask<SessionStatus?> GetDeviceStatus(string deviceId);
         Task SendWillMsg(MqttWillMessage willMeaasge);
         ValueTask<string> GetDeviceId(IChannel channel);
         Task UnSubscribe(string deviceId, params string[] topics);

diff --git a/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/MqttBehavior.cs b/src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/MqttBehavior.cs
@@ -1,5 +1,6 @@
 using Surging.Core.CPlatform.Ioc;
 using Surging.Core.CPlatform.Utilities;
+using Surging.Core.Protocol.Mqtt.Internal.Enums;
 using Surging.Core.Protocol.Mqtt.Internal.Messages;
 using System;
 using System.Collections.Generic;
@@ -12,7 +13,12 @@ public abstract class MqttBehavior: ServiceBase
     {
         public async Task Publish(string deviceId, MqttWillMessage willMessage)
         {
-           await ServiceLocator.GetService<IChannelService>().Publish(deviceId, willMessage);
+            await GetService<IChannelService>().Publish(deviceId, willMessage);
+        }
+
+        public async Task<SessionStatus?> GetDeviceStatus(string deviceId)
+        {
+           return  await this.GetService<IChannelService>().GetDeviceStatus(deviceId);
         }
 
         public abstract Task<bool> Authorized(string username, string password);

diff --git a/src/Surging.IModuleServices/Surging.IModuleServices.Common/IControllerService.cs b/src/Surging.IModuleServices/Surging.IModuleServices.Common/IControllerService.cs
@@ -16,5 +16,8 @@ public interface IControllerService : IServiceKey
     { 
         [Command(ShuntStrategy = AddressSelectorMode.HashAlgorithm)]
         Task Publish(string deviceId, WillMessage message);
+
+        [Command(ShuntStrategy = AddressSelectorMode.HashAlgorithm)]
+        Task<bool> IsOnline(string deviceId);
     }
 }
diff --git a/src/Surging.Modules/Surging.Modules.Common/Domain/ControllerService.cs b/src/Surging.Modules/Surging.Modules.Common/Domain/ControllerService.cs
@@ -1,4 +1,5 @@
-using Surging.Core.Protocol.Mqtt.Internal.Messages;
+using Surging.Core.Protocol.Mqtt.Internal.Enums;
+using Surging.Core.Protocol.Mqtt.Internal.Messages;
 using Surging.Core.Protocol.Mqtt.Internal.Services;
 using Surging.IModuleServices.Common;
 using Surging.IModuleServices.Common.Models;
@@ -19,9 +20,15 @@ public override async Task<bool> Authorized(string username, string password)
             return await Task.FromResult(result);
         }
 
+       public async Task<bool> IsOnline(string deviceId)
+        {
+            var status= await base.GetDeviceStatus(deviceId);
+            return status == SessionStatus.OPEN;
+        }
+
         public async Task Publish(string deviceId, WillMessage message)
         {
-              await base.Publish(deviceId, new MqttWillMessage
+            await Publish(deviceId, new MqttWillMessage
             {
                 WillMessage = message.Message,
                 Qos = message.Qos,