Add service panel and OBS drag and drop

CutOverlay/CutOverlay/App/OAuthOverlayApp.cs

@@ -17,8 +17,8 @@ public abstract class OAuthOverlayApp : OverlayApp
 
  private static readonly Random Random = new();
 
- private string? _clientId = "";
- private string? _clientSecret = "";
+ protected string? ClientId = "";
+ protected string? ClientSecret = "";
  private string _stateToken = "";
  private protected string? AccessToken;
 
@@ -37,8 +37,10 @@ private string RegenerateStateToken()
 
  private protected void SetupOAuth(string? clientId, string? clientSecret)
  {
- _clientId = clientId;
- _clientSecret = clientSecret;
+ Status = ServiceStatusType.Starting;
+
+ ClientId = clientId;
+ ClientSecret = clientSecret;
 
  AuthorizationTimer?.Stop();
  AuthorizationTimer = new Timer { Interval = 120000 };
@@ -54,7 +56,7 @@ private protected void SetupOAuth(string? clientId, string? clientSecret)
  "{0}?response_type={1}&client_id={2}&redirect_uri={3}&scope={4}&state={5}",
  AuthorizationAddress,
  ResponseType,
- _clientId,
+ ClientId,
  CallbackAddress,
  Scopes,
  state
@@ -80,8 +82,8 @@ private async Task UpdateAuthorizationAsync()
  {
  Content = new FormUrlEncodedContent(new[]
  {
- new KeyValuePair<string, string?>("client_id", _clientId),
- new KeyValuePair<string, string?>("client_secret", _clientSecret),
+ new KeyValuePair<string, string?>("client_id", ClientId),
+ new KeyValuePair<string, string?>("client_secret", ClientSecret),
  new KeyValuePair<string, string?>("grant_type", "authorization_code"),
  new KeyValuePair<string, string?>("code", AccessToken),
  new KeyValuePair<string, string?>("state", state),
@@ -92,16 +94,16 @@ private async Task UpdateAuthorizationAsync()
  request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
  Convert.ToBase64String(
  Encoding.UTF8.GetBytes(
- $"{_clientId}:{_clientSecret}")));
+ $"{ClientId}:{ClientSecret}")));
  }
  else
  {
  request = new HttpRequestMessage(HttpMethod.Post, AuthApiUri)
  {
  Content = new FormUrlEncodedContent(new[]
  {
- new KeyValuePair<string, string?>("client_id", _clientId),
- new KeyValuePair<string, string?>("client_secret", _clientSecret),
+ new KeyValuePair<string, string?>("client_id", ClientId),
+ new KeyValuePair<string, string?>("client_secret", ClientSecret),
  new KeyValuePair<string, string?>("grant_type", "refresh_token"),
  new KeyValuePair<string, string?>("state", state),
  new KeyValuePair<string, string?>("refresh_token", RefreshToken)
@@ -111,7 +113,7 @@ private async Task UpdateAuthorizationAsync()
  request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
  Convert.ToBase64String(
  Encoding.UTF8.GetBytes(
- $"{_clientId}:{_clientSecret}")));
+ $"{ClientId}:{ClientSecret}")));
  }
 
  HttpResponseMessage response = await HttpClient!.SendAsync(request);
@@ -120,28 +122,36 @@ private async Task UpdateAuthorizationAsync()
  if (!response.IsSuccessStatusCode)
  {
  Console.WriteLine($"ERROR: {content}");
+ Status = ServiceStatusType.Error;
  return;
  }
 
  SpotifyAuthenticationModel? authentication =
  JsonConvert.DeserializeObject<SpotifyAuthenticationModel>(content);
  AccessToken = authentication?.AccessToken;
  if (!string.IsNullOrEmpty(authentication?.RefreshToken))
- RefreshToken = authentication?.RefreshToken;
+ RefreshToken = authentication.RefreshToken;
+ Status = ServiceStatusType.Running;
  }
  catch (Exception ex)
  {
  Console.WriteLine($"ERROR: {ex}");
+ Status = ServiceStatusType.Error;
  }
  }
 
  public void AuthCallback(string code, string state)
  {
  if (string.IsNullOrEmpty(state) || !state.Equals(state, StringComparison.InvariantCulture))
+ {
+ Status = ServiceStatusType.Error;
  throw new Exception("Failed to verify the request");
+ }
 
  AccessToken = code;
 
+ Status = ServiceStatusType.Running;
+
  _ = UpdateAuthorizationAsync();
  }
 

CutOverlay/CutOverlay/App/OverlayApp.cs

@@ -3,11 +3,19 @@
 public abstract class OverlayApp : IDisposable
 {
  private protected HttpClient? HttpClient = null;
+ private protected ServiceStatusType Status = ServiceStatusType.Stopped;
 
  public void Dispose()
  {
  Unload();
  }
 
  public abstract void Unload();
+
+ public abstract ServiceStatusType GetStatus();
+}
+
+public enum ServiceStatusType
+{
+ Running, Starting, Stopping, Stopped, Error
 }

CutOverlay/CutOverlay/Controllers/ConfigurationController.cs

@@ -16,7 +16,7 @@ public class ConfigurationController : ControllerBase
  private readonly Pulsoid _pulsoid;
  private readonly Spotify _spotify;
  private readonly Twitch _twitch;
-
+ 
  public ConfigurationController(IConfiguration configuration, Spotify spotify, Twitch twitch, Pulsoid pulsoid)
  {
  _spotify = spotify;
@@ -83,36 +83,10 @@ public async Task<IActionResult> SaveConfig([FromBody] Dictionary<string, string
  {
  EncryptAndSaveConfig(config);
  DecryptAndReadConfig();
-
+ 
  await _spotify.RefreshConfigurationsAsync();
  await _twitch.RefreshConfigurationsAsync();
  await _pulsoid.RefreshConfigurationsAsync();
- /*if (spotifySettingsRefresh)
- {
- Spotify.Instance?.Unload();
- Spotify.Instance?.Dispose();
- Spotify.Instance = null;
- _ = new Spotify();
- await Spotify.Instance?.Start(Configurations)!;
- }
-
- if (twitchSettingsRefresh)
- {
- Twitch.Instance?.Unload();
- Twitch.Instance?.Dispose();
- Twitch.Instance = null;
- _ = new Twitch();
- await Twitch.Instance?.Start(Configurations)!;
- }
-
- if (pulsoidSettingsRefresh)
- {
- Pulsoid.Instance?.Unload();
- Pulsoid.Instance?.Dispose();
- Pulsoid.Instance = null;
- _ = new Pulsoid();
- await Pulsoid.Instance?.Start(Configurations)!;
- }*/
 
  return Ok();
  }

CutOverlay/CutOverlay/Controllers/SpotifyController.cs

@@ -25,7 +25,7 @@ public IActionResult SpotifyCallback([FromQuery(Name = "code")] string accessTok
  return new ContentResult
  {
  Content =
- "<div>Authorization successful! This tab can now be closed.</div><script>setTimeout(() => {close();},3000);</script>",
+ "<div>Authorization successful! This tab can now be closed.</div><script>setTimeout(() => {close();},100);</script>",
  ContentType = "text/html",
  StatusCode = 200
  };

CutOverlay/CutOverlay/Controllers/StatusController.cs

@@ -1,16 +1,26 @@
 using CutOverlay.Services;
 using Microsoft.AspNetCore.Mvc;
+using CutOverlay.App;
+using CutOverlay.Models;
+using Newtonsoft.Json;
 
 namespace CutOverlay.Controllers;
 
 [Route("status")]
 [ApiController]
 public class StatusController : ControllerBase
 {
- public StatusController(Spotify spotify, BeatSaberPlus beatSaberPlus)
+ private readonly Spotify _spotify;
+ private readonly BeatSaberPlus _beatSaberPlus;
+ private readonly Twitch _twitch;
+ private readonly Pulsoid _pulsoid;
+
+ public StatusController(Spotify spotify, BeatSaberPlus beatSaberPlus, Twitch twitch, Pulsoid pulsoid)
  {
- _ = spotify;
- _ = beatSaberPlus;
+ _spotify = spotify;
+ _beatSaberPlus = beatSaberPlus;
+ _twitch = twitch;
+ _pulsoid = pulsoid;
  }
 
  [HttpGet("get")]
@@ -40,4 +50,144 @@ public IActionResult Image()
  return BadRequest(ex.Message);
  }
  }
+
+ [HttpGet("service/twitch")]
+ public IActionResult ServiceTwitch()
+ {
+ try
+ {
+ ServiceStatusType status = _twitch.GetStatus();
+ ServiceStatusModel statusModel = new()
+ {
+ Color = status switch
+ {
+ ServiceStatusType.Running => "greenyellow",
+ ServiceStatusType.Stopped => "grey",
+ ServiceStatusType.Stopping => "coral",
+ ServiceStatusType.Starting => "darkorange",
+ ServiceStatusType.Error => "crimson",
+ _ => throw new ArgumentOutOfRangeException()
+ },
+ Status = status switch
+ {
+ ServiceStatusType.Running => "Running",
+ ServiceStatusType.Stopped => "Stopped",
+ ServiceStatusType.Stopping => "Stopping",
+ ServiceStatusType.Starting => "Starting",
+ ServiceStatusType.Error => "Error",
+ _ => throw new ArgumentOutOfRangeException()
+ }
+ };
+ return Ok(JsonConvert.SerializeObject(statusModel));
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(ex.Message);
+ }
+ }
+
+ [HttpGet("service/spotify")]
+ public IActionResult ServiceSpotify()
+ {
+ try
+ {
+ ServiceStatusType status = _spotify.GetStatus();
+ ServiceStatusModel statusModel = new()
+ {
+ Color = status switch
+ {
+ ServiceStatusType.Running => "greenyellow",
+ ServiceStatusType.Stopped => "grey",
+ ServiceStatusType.Stopping => "coral",
+ ServiceStatusType.Starting => "darkorange",
+ ServiceStatusType.Error => "crimson",
+ _ => throw new ArgumentOutOfRangeException()
+ },
+ Status = status switch
+ {
+ ServiceStatusType.Running => "Running",
+ ServiceStatusType.Stopped => "Stopped",
+ ServiceStatusType.Stopping => "Stopping",
+ ServiceStatusType.Starting => "Starting",
+ ServiceStatusType.Error => "Error",
+ _ => throw new ArgumentOutOfRangeException()
+ }
+ };
+ return Ok(JsonConvert.SerializeObject(statusModel));
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(ex.Message);
+ }
+ }
+
+ [HttpGet("service/bsp")]
+ public IActionResult ServiceBsp()
+ {
+ try
+ {
+ ServiceStatusType status = _beatSaberPlus.GetStatus();
+ ServiceStatusModel statusModel = new()
+ {
+ Color = status switch
+ {
+ ServiceStatusType.Running => "greenyellow",
+ ServiceStatusType.Stopped => "grey",
+ ServiceStatusType.Stopping => "coral",
+ ServiceStatusType.Starting => "darkorange",
+ ServiceStatusType.Error => "crimson",
+ _ => throw new ArgumentOutOfRangeException()
+ },
+ Status = status switch
+ {
+ ServiceStatusType.Running => "Running",
+ ServiceStatusType.Stopped => "Stopped",
+ ServiceStatusType.Stopping => "Stopping",
+ ServiceStatusType.Starting => "Starting",
+ ServiceStatusType.Error => "Error",
+ _ => throw new ArgumentOutOfRangeException()
+ }
+ };
+ return Ok(JsonConvert.SerializeObject(statusModel));
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(ex.Message);
+ }
+ }
+
+ [HttpGet("service/pulsoid")]
+ public IActionResult ServicePulsoid()
+ {
+ try
+ {
+ ServiceStatusType status = _pulsoid.GetStatus();
+ ServiceStatusModel statusModel = new()
+ {
+ Color = status switch
+ {
+ ServiceStatusType.Running => "greenyellow",
+ ServiceStatusType.Stopped => "grey",
+ ServiceStatusType.Stopping => "coral",
+ ServiceStatusType.Starting => "darkorange",
+ ServiceStatusType.Error => "crimson",
+ _ => throw new ArgumentOutOfRangeException()
+ },
+ Status = status switch
+ {
+ ServiceStatusType.Running => "Running",
+ ServiceStatusType.Stopped => "Stopped",
+ ServiceStatusType.Stopping => "Stopping",
+ ServiceStatusType.Starting => "Starting",
+ ServiceStatusType.Error => "Error",
+ _ => throw new ArgumentOutOfRangeException()
+ }
+ };
+ return Ok(JsonConvert.SerializeObject(statusModel));
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(ex.Message);
+ }
+ }
 }

CutOverlay/CutOverlay/Controllers/TwitchController.cs

@@ -30,22 +30,7 @@ public IActionResult ApiConnectionCallback()
  return BadRequest(ex.Message);
  }
  }
-
- [HttpGet("chat/debug")]
- public IActionResult ChatDebugCallback()
- {
- try
- {
- // TODO: Debug
- //_twitch.DebugMessages();
- return Ok();
- }
- catch (Exception ex)
- {
- return BadRequest(ex.Message);
- }
- }
-
+
  [HttpGet("callback")]
  public IActionResult TwitchCallback()
  {
@@ -68,7 +53,7 @@ public async Task<IActionResult> TwitchCallbackQuery([FromQuery(Name = "access_t
  return new ContentResult
  {
  Content =
- "<div>Authorization successful! This tab can now be closed.</div><script>setTimeout(() => {close();},3000);</script>",
+ "<div>Authorization successful! This tab can now be closed.</div><script>setTimeout(() => {close();},100);</script>",
  ContentType = "text/html",
  StatusCode = 200
  };