Addresses #122, alert to MQTT topic for SYNC and QUERY requests

Author: i8beef

src/HomeAutio.Mqtt.GoogleHome/IntentHandlers/ExecuteIntentHandler.cs

@@ -131,7 +131,7 @@ public Models.Response.ExecutionResponsePayload Handle(Models.Request.ExecuteInt
                 {
                     foreach (var execution in command.Execution)
                     {
-                        // Convert command to a event to publish now that its passed all verifications
+                        // Convert command to an event to publish now that its passed all verifications
                         var commandEvent = new DeviceCommandExecutionEvent { DeviceId = deviceId, Execution = execution };
                         _messageHub.Publish(commandEvent);
 

src/HomeAutio.Mqtt.GoogleHome/IntentHandlers/QueryIntentHandler.cs

@@ -61,6 +61,10 @@ public Models.Response.QueryResponsePayload Handle(Models.Request.QueryIntent in
                     .Select(group => group.First())
                     .Select(device => device.Id);
 
+            // Convert to an event to publish
+            var commandEvent = new QueryIntentReceivedEvent { Devices = intent.Payload.Devices, Time = DateTimeOffset.Now };
+            _messageHub.Publish(commandEvent);
+
             var devices = _deviceRepository.GetAll()
                 .Where(device => !device.Disabled)
                 .Where(device => distinctRequestDeviceIds.Contains(device.Id))

src/HomeAutio.Mqtt.GoogleHome/IntentHandlers/SyncIntentHandler.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Linq;
+using Easy.MessageHub;
+using HomeAutio.Mqtt.GoogleHome.Models.Events;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
@@ -12,21 +14,25 @@ public class SyncIntentHandler
     {
         private readonly ILogger<SyncIntentHandler> _log;
 
+        private readonly IMessageHub _messageHub;
         private readonly IConfiguration _config;
         private readonly IGoogleDeviceRepository _deviceRepository;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SyncIntentHandler"/> class.
         /// </summary>
         /// <param name="logger">Logging instance.</param>
+        /// <param name="messageHub">Message nhub.</param>
         /// <param name="configuration">Configuration.</param>
         /// <param name="deviceRepository">Device repository.</param>
         public SyncIntentHandler(
             ILogger<SyncIntentHandler> logger,
+            IMessageHub messageHub,
             IConfiguration configuration,
             IGoogleDeviceRepository deviceRepository)
         {
             _log = logger ?? throw new ArgumentException(nameof(logger));
+            _messageHub = messageHub ?? throw new ArgumentException(nameof(messageHub));
             _config = configuration ?? throw new ArgumentException(nameof(configuration));
             _deviceRepository = deviceRepository ?? throw new ArgumentException(nameof(deviceRepository));
         }
@@ -40,6 +46,10 @@ public Models.Response.SyncResponsePayload Handle(Models.Request.SyncIntent inte
         {
             _log.LogInformation("Received SYNC intent");
 
+            // Convert to an event to publish
+            var commandEvent = new SyncIntentReceivedEvent { Time = DateTimeOffset.Now };
+            _messageHub.Publish(commandEvent);
+
             var syncResponsePayload = new Models.Response.SyncResponsePayload
             {
                 AgentUserId = _config.GetValue<string>("googleHomeGraph:agentUserId"),

src/HomeAutio.Mqtt.GoogleHome/Models/Events/QueryIntentReceivedEvent.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace HomeAutio.Mqtt.GoogleHome.Models.Events
+{
+    /// <summary>
+    /// Query intent received event.
+    /// </summary>
+    public class QueryIntentReceivedEvent
+    {
+        /// <summary>
+        /// Devices.
+        /// </summary>
+        public IList<Models.Request.Device> Devices { get; set; }
+
+        /// <summary>
+        /// Time of event.
+        /// </summary>
+        public DateTimeOffset Time { get; set; }
+    }
+}

src/HomeAutio.Mqtt.GoogleHome/Models/Events/SyncIntentReceivedEvent.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace HomeAutio.Mqtt.GoogleHome.Models.Events
+{
+    /// <summary>
+    /// Sync intent received event.
+    /// </summary>
+    public class SyncIntentReceivedEvent
+    {
+        /// <summary>
+        /// Time of event.
+        /// </summary>
+        public DateTimeOffset Time { get; set; }
+    }
+}

src/HomeAutio.Mqtt.GoogleHome/Services/MqttService.cs

@@ -69,8 +69,10 @@ public MqttService(
         protected override Task StartServiceAsync(CancellationToken cancellationToken)
         {
             // Subscribe to event aggregator
-            _messageHubSubscriptions.Add(_messageHub.Subscribe<DeviceCommandExecutionEvent>((e) => HandleGoogleHomeCommand(e)));
             _messageHubSubscriptions.Add(_messageHub.Subscribe<ConfigSubscriptionChangeEvent>((e) => HandleConfigSubscriptionChange(e)));
+            _messageHubSubscriptions.Add(_messageHub.Subscribe<DeviceCommandExecutionEvent>((e) => HandleGoogleHomeCommand(e)));
+            _messageHubSubscriptions.Add(_messageHub.Subscribe<SyncIntentReceivedEvent>((e) => HandleGoogleHomeSyncIntent(e)));
+            _messageHubSubscriptions.Add(_messageHub.Subscribe<QueryIntentReceivedEvent>((e) => HandleGoogleHomeQueryIntent(e)));
 
             return Task.CompletedTask;
         }
@@ -174,7 +176,7 @@ await MqttClient.SubscribeAsync(
         }
 
         /// <summary>
-        /// Hanlder for Google Home commands.
+        /// Handler for Google Home commands.
         /// </summary>
         /// <param name="deviceCommandExecutionEvent">The device command to handle.</param>
         private async void HandleGoogleHomeCommand(DeviceCommandExecutionEvent deviceCommandExecutionEvent)
@@ -262,6 +264,40 @@ await MqttClient.PublishAsync(new MqttApplicationMessageBuilder()
             }
         }
 
+        /// <summary>
+        /// Handler for Google Home SYNC intent.
+        /// </summary>
+        /// <param name="syncIntentReceivedEvent">The SYNC intent to handle.</param>
+        private async void HandleGoogleHomeSyncIntent(SyncIntentReceivedEvent syncIntentReceivedEvent)
+        {
+            var delegateTopic = $"{TopicRoot}/sync/lastRequest";
+            var delegatePayload = syncIntentReceivedEvent.Time.ToString();
+
+            await MqttClient.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(delegateTopic)
+                .WithPayload(delegatePayload)
+                .WithAtLeastOnceQoS()
+                .Build())
+                .ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Handler for Google Home QUERY intent.
+        /// </summary>
+        /// <param name="queryIntentReceivedEvent">The QUERY intent to handle.</param>
+        private async void HandleGoogleHomeQueryIntent(QueryIntentReceivedEvent queryIntentReceivedEvent)
+        {
+            var delegateTopic = $"{TopicRoot}/query/lastRequest";
+            var delegatePayload = JsonConvert.SerializeObject(queryIntentReceivedEvent);
+
+            await MqttClient.PublishAsync(new MqttApplicationMessageBuilder()
+                .WithTopic(delegateTopic)
+                .WithPayload(delegatePayload)
+                .WithAtLeastOnceQoS()
+                .Build())
+                .ConfigureAwait(false);
+        }
+
         #endregion
 
         #region IDisposable Support