Fixed hosted services so they run in the background, added PubSubAuthToken configuration option

Author: csharpfritz

Fritz.StreamTools/Services/GitHubService.cs

@@ -15,6 +15,8 @@ public class GitHubService : IHostedService
 	{
 
 		public static DateTime LastUpdate = DateTime.MinValue;
+		private CancellationToken _Token;
+		private Task _RunningTask;
 
 		public GitHubService(IServiceProvider services, ILogger<GitHubService> logger)
 		{
@@ -27,22 +29,24 @@ public GitHubService(IServiceProvider services, ILogger<GitHubService> logger)
 
 		public Task StartAsync(CancellationToken cancellationToken)
 		{
-			return MonitorUpdates(cancellationToken);
+			_Token = cancellationToken;
+			_RunningTask = MonitorUpdates();
+			return Task.CompletedTask;
 		}
 
 		public Task StopAsync(CancellationToken cancellationToken)
 		{
 			return Task.CompletedTask;
 		}
 
-		private async Task MonitorUpdates(CancellationToken cancellationToken)
+		private async Task MonitorUpdates()
 		{
 			var lastRequest = DateTime.Now;
 		  using (var scope = Services.CreateScope())
 		  {
 			  var repo = scope.ServiceProvider.GetService(typeof(GitHubRepository)) as GitHubRepository;
 			  var mcGithubFaceClient = scope.ServiceProvider.GetService(typeof(GithubyMcGithubFaceClient)) as GithubyMcGithubFaceClient;
-				while (!cancellationToken.IsCancellationRequested)
+				while (!_Token.IsCancellationRequested)
 			  {
 				  if (repo != null)
 				  {
@@ -56,7 +60,7 @@ private async Task MonitorUpdates(CancellationToken cancellationToken)
 						  mcGithubFaceClient?.UpdateGitHub("", "", 0);
 					  }
 				  }
-				  await Task.Delay(500, cancellationToken);
+				  await Task.Delay(500, _Token);
 			  }
 		  }
 		}

Fritz.StreamTools/Services/TwitchPubSubService.cs

@@ -19,6 +19,8 @@ public class TwitchPubSubService : IHostedService
 	{
 
 		private IServiceProvider _ServiceProvider;
+		private CancellationToken _Token;
+		private Task _BackgroundTask;
 		private readonly Twitch.PubSub.Proxy _Proxy;
 		private readonly ConfigurationSettings _Configuration;
 
@@ -32,7 +34,9 @@ public TwitchPubSubService(IServiceProvider serviceProvider, Twitch.PubSub.Proxy
 		public Task StartAsync(CancellationToken cancellationToken)
 		{
 			_Proxy.OnChannelPointsRedeemed += _Proxy_OnChannelPointsRedeemed;
-			return _Proxy.StartAsync(new TwitchTopic[] { TwitchTopic.ChannelPoints(_Configuration.UserId) }, cancellationToken);
+			_Token = cancellationToken;
+			_BackgroundTask = _Proxy.StartAsync(new TwitchTopic[] { TwitchTopic.ChannelPoints(_Configuration.UserId) }, _Token);
+			return Task.CompletedTask;
 		}
 
 		private void _Proxy_OnChannelPointsRedeemed(object sender, ChannelRedemption e)

Fritz.StreamTools/Startup.cs

@@ -49,7 +49,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, IConfigurat
 			}
 
 			app.UseHsts();
-			app.UseHttpsRedirection();
+			//app.UseHttpsRedirection();
 
 			app.UseStaticFiles();
 
@@ -62,6 +62,8 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, IConfigurat
 				endpoints.MapHub<GithubyMcGithubFace>("/github");
 				endpoints.MapHub<AttentionHub>("/attentionhub");
 
+				endpoints.MapRazorPages();
+
 				endpoints.MapDefaultControllerRoute();
 
 			});

Fritz.StreamTools/StartupServices/ConfigureServices.cs

@@ -49,7 +49,7 @@ public static void Execute(IServiceCollection services, IConfiguration configura
 			// Add the SentimentSink
 			//services.AddSingleton<Fritz.Chatbot.Commands.SentimentSink>();
 
-			services.AddSingleton<IHostedService, FritzBot>();
+			services.AddHostedService<FritzBot>();
 
 			services.AddSingleton(new GitHubClient(new ProductHeaderValue("Fritz.StreamTools")));
 	  	FritzBot.RegisterCommands(services);
@@ -119,6 +119,7 @@ private static void AddStreamingServices(this IServiceCollection services, IConf
 				c => !bool.TryParse(c["StreamServices:Fake:Enabled"], out var enabled) || !enabled);			// Test to disable
 
 			services.AddSingleton<StreamService>();
+
 		}
 
 		/// <summary>
@@ -133,7 +134,7 @@ private static void AddStreamService<TStreamService>(this IServiceCollection ser
 			IConfiguration configuration,
 			Func<IConfiguration, ILoggerFactory, TStreamService> factory,
 			Func<IConfiguration, bool> isDisabled)
-			where TStreamService : class, IStreamService
+			where TStreamService : class, IStreamService, IHostedService
 		{
 
 			// Don't configure this service if it is disabled
@@ -174,6 +175,8 @@ private static void AddAspNetFeatures(this IServiceCollection services)
 
 			}).AddMessagePackProtocol();
 
+			services.AddRazorPages();
+
 			services.AddMvc()
 				.SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
 
@@ -182,7 +185,9 @@ private static void AddAspNetFeatures(this IServiceCollection services)
 		private static void RegisterTwitchPubSub(this IServiceCollection services) {
 
 			services.AddSingleton<Twitch.PubSub.Proxy>();
+
 			services.AddHostedService<TwitchPubSubService>();
+
 			//var provider = services.BuildServiceProvider();
 
 			//var pubSub = new TwitchPubSubService(

Fritz.StreamTools/appsettings.json

@@ -17,6 +17,7 @@
 			"ClientId": "",
 			"UserId": "",
 			"ChatToken": "",
+			"PubSubAuthToken": "",
 			"ChatBotName": "FritzBot_"
 		},
 		"Mixer": {

Fritz.Twitch/ConfigurationSettings.cs

@@ -17,6 +17,8 @@ public class ConfigurationSettings
 
 		public virtual string OAuthToken { get; set; }
 
+		public virtual string PubSubAuthToken { get; set; }
+
 		[Obsolete]
 		public string Channel { get => ChannelName; set => ChannelName = value; }
 

Fritz.Twitch/PubSub/Proxy.cs

@@ -23,10 +23,15 @@ public class Proxy : IDisposable
 		private ClientWebSocket _Socket;
 		private System.Timers.Timer _PingTimer;
 		private System.Timers.Timer _PongTimer;
+		private System.Timers.Timer _ReconnectTimer = new System.Timers.Timer();
 		private ConfigurationSettings _Configuration;
 		private ILogger _Logger;
 		private static bool _Reconnect;
 
+		private static readonly TimeSpan[] _ReconnectTimeouts = new TimeSpan[] {
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(30), TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(5)
+		};
+
 		public Proxy(IOptions<ConfigurationSettings> settings, ILoggerFactory loggerFactory)
 		{
 
@@ -41,6 +46,7 @@ public async Task StartAsync(IEnumerable<TwitchTopic> topics, CancellationToken
 		{
 
 			_Topics = topics;
+			_Reconnect = false;
 
 			// Start a timer to manage the connection over the websocket
 			_PingTimer = new System.Timers.Timer(TimeSpan.FromSeconds(30).TotalMilliseconds);
@@ -83,12 +89,34 @@ public async Task StartAsync(IEnumerable<TwitchTopic> topics, CancellationToken
 				}
 
 				if (_Reconnect) {
+					if (!_ReconnectTimeouts.Any(t => t.TotalMilliseconds == _ReconnectTimer.Interval)) {
+						_ReconnectTimer.Interval = _ReconnectTimeouts[0].TotalMilliseconds;
+						_Logger.LogError($"Unable to connect to Twitch PubSub.  Reconnecting in {_ReconnectTimeouts[0].TotalSeconds} seconds");
+					}
+					else if (_ReconnectTimeouts.Last().TotalMilliseconds == _ReconnectTimer.Interval) {
+						_Reconnect = false;
+						_Logger.LogError("Unable to connect to Twitch PubSub.  Ceasing attempting to connect");
+					} else {
+
+						for (var i=0; i<_ReconnectTimeouts.Length; i++) {
+							if (_ReconnectTimeouts[i].TotalMilliseconds == _ReconnectTimer.Interval) {
+								_Logger.LogError($"Unable to connect to Twitch PubSub.  Reconnecting in {_ReconnectTimeouts[i + 1].TotalSeconds} seconds");
+								_ReconnectTimer.Interval = _ReconnectTimeouts[i + 1].TotalMilliseconds;
+								break;
+							}
+						}
+
+
+					}
+
+					await Task.Delay((int)_ReconnectTimer.Interval);
 					break;
+
 				}
 
 			}
 
-			if (_Reconnect) _ = Task.Run(() => StartAsync(topics, token));
+			// if (_Reconnect) _ = Task.Run(() => StartAsync(topics, token));
 
 		}
 
@@ -126,7 +154,7 @@ private async Task StartListening(IEnumerable<TwitchTopic> topics)
 			{
 				data = new PubSubListen.PubSubListenData
 				{
-					auth_token = _Configuration.OAuthToken,
+					auth_token = _Configuration.PubSubAuthToken,
 					topics = topics.Select(t => t.TopicString).ToArray()
 				}
 			};