Now using HubContext for triggering the Attention command #211

Author: csharpfritz

Fritz.Chatbot/AttentionHub.cs

@@ -0,0 +1,31 @@
+using Fritz.StreamLib.Core;
+using Microsoft.AspNetCore.SignalR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Fritz.StreamTools.Hubs
+{
+	public interface IAttentionHubClient
+	{
+
+		// Cheer 200 parithon 12/18/2018
+		// Cheer 500 pharewings 12/18/2018
+		Task AlertFritz();
+		Task ClientConnected(string connectionId);
+	}
+
+	public class AttentionHub : Hub<IAttentionHubClient>, IAttentionClient
+	{
+		public override Task OnConnectedAsync()
+		{
+			return this.Clients.Others.ClientConnected(this.Context.ConnectionId);
+		}
+
+		public Task AlertFritz()
+		{
+			return this.Clients.Others.AlertFritz();
+		}
+	}
+}

Fritz.Chatbot/Commands/AttentionCommand.cs

@@ -2,56 +2,59 @@
 using System.Text;
 using System.Threading.Tasks;
 using Fritz.StreamLib.Core;
+using Fritz.StreamTools.Hubs;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace Fritz.Chatbot.Commands
 {
-	public class AttentionCommand : IBasicCommand, IDisposable
+	public class AttentionCommand : IBasicCommand
 	{
 		private readonly IConfiguration Configuration;
 
 		public ILogger Logger { get; }
+		public IHubContext<AttentionHub, IAttentionHubClient> HubContext { get; }
 
-		public AttentionCommand(IConfiguration configuration, ILoggerFactory loggerFactory)
+		public AttentionCommand(IConfiguration configuration, IHubContext<AttentionHub, IAttentionHubClient> hubContext, ILoggerFactory loggerFactory)
 		{
 			this.Configuration = configuration;
 			this.Logger = loggerFactory.CreateLogger("AttentionCommand");
 
-			var thisUri = new Uri(configuration["FritzBot:ServerUrl"], UriKind.Absolute);
-			var attentionUri = new Uri(thisUri, "attentionhub");
+			this.HubContext = hubContext;
 
-			Logger.LogTrace($"Connecting AttentionCommand to: {attentionUri}");
+			//var thisUri = new Uri(configuration["FritzBot:ServerUrl"], UriKind.Absolute);
+			//var attentionUri = new Uri(thisUri, "attentionhub");
 
-			this.Client = new HubConnectionBuilder().WithUrl(attentionUri.ToString()).Build();
+			//Logger.LogTrace($"Connecting AttentionCommand to: {attentionUri}");
+
+			//this.Client = new HubConnectionBuilder().WithUrl(attentionUri.ToString()).Build();
 
 		}
 
-		protected HubConnection Client { get; }
+		//protected HubConnection Client { get; }
 
 		public string Trigger => "attention";
 
 		public string Description => "Play audio queue to divert attention to chat";
 
+#if DEBUG
+		public TimeSpan? Cooldown => TimeSpan.FromSeconds(10);
+#else
 	public TimeSpan? Cooldown => TimeSpan.Parse(Configuration["FritzBot:AttentionCommand:Cooldown"]);
+#endif
 
 		public async Task Execute(IChatService chatService, string userName, ReadOnlyMemory<char> rhs)
 		{
 
-			await this.Client.StartAsync();
-
-			await this.Client.InvokeAsync("AlertFritz");
+			await this.HubContext.Clients.All.AlertFritz();
 
 			var attentionText = Configuration["FritzBot:AttentionCommand:TemplateText"];
 
 			await chatService.SendMessageAsync(string.Format(attentionText, userName));
 		}
 
-		public void Dispose()
-		{
-			Client.DisposeAsync();
-		}
 	}
 }

Fritz.Chatbot/Fritz.Chatbot.csproj

@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />

Fritz.Chatbot/FritzBot.cs

@@ -214,15 +214,15 @@ bool CommandsTooFast(string namedCommand, TimeSpan? cooldown = null)
 			{
 				Debug.Assert(user != null);
 
-#if !DEBUG
 				if (e.IsModerator || e.IsOwner)
 					return false;
-#endif
 
 				// Check per user cooldown
 				if (DateTime.UtcNow - user.LastCommandTime < CooldownTime)
 				{
 					_logger.LogWarning("Ignoring command {0} from {1} on {2}. Cooldown active", namedCommand, e.UserName, e.ServiceName);
+					var remain = cooldown.GetValueOrDefault() - (DateTime.UtcNow - user.LastCommandTime);
+					chatService.SendMessageAsync($"Ignoring command {namedCommand} from {e.UserName}.  Cooldown is active for {e.UserName} for {remain.TotalSeconds}");
 					return true;
 				}
 
@@ -235,6 +235,7 @@ bool CommandsTooFast(string namedCommand, TimeSpan? cooldown = null)
 						var remain = cooldown.GetValueOrDefault() - (now - dt);
 						_logger.LogWarning("Ignoring command {0} from {1} on {2}. In cooldown for {3} more secs", namedCommand, e.UserName, e.ServiceName,
 							(int) remain.TotalSeconds);
+						chatService.SendMessageAsync($"Ignoring command {namedCommand} from {e.UserName}.  Cooldown is active for {e.UserName} for {remain.TotalSeconds}");
 						return true;
 					}
 				}

Fritz.StreamTools/Fritz.StreamTools.csproj

@@ -11,6 +11,9 @@
 		<EmbeddedResource Remove="ClientApp\**" />
 		<None Remove="ClientApp\**" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Compile Remove="Hubs\AttentionHub.cs" />
+	</ItemGroup>
 	<ItemGroup>
 	  <Content Remove="wwwroot\hey_listen.wav" />
 	</ItemGroup>

Fritz.StreamTools/Hubs/AttentionHub.cs

@@ -16,7 +16,7 @@ public interface IAttentionHubClient
 		Task ClientConnected(string connectionId);
 	}
 
-	public class AttentionHub : Hub<IAttentionHubClient>, IAttentionClient
+	public class AttentionHub : Hub<IAttentionHubClient>
 	{
 		public override Task OnConnectedAsync()
 		{

Fritz.StreamTools/Views/Attention/Index.cshtml

@@ -11,6 +11,7 @@
 <body>	
 	<script src="~/lib/signalr/signalr-client.js"></script>
 	<script src="~/js/attentionhub.js"></script>
+
 	<script>
 		var audio = new Audio('@Url.Content(@"~/contents/hey_listen.wav")');