Un-async AniDB and use a lock, which supports recursion. Async apparently makes that extremely difficult, and I'm not rewriting the entire pipeline right now

Author: da3dsoul

Shoko.Server/API/v1/Implementations/ShokoServiceImplementation/ShokoServiceImplementation.cs

@@ -649,7 +649,7 @@ public string TestAniDBConnection()
                 settings.AniDb.UDPServerPort, settings.AniDb.ClientPort);
 
             log += "Login..." + Environment.NewLine;
-            if (handler.Login().Result)
+            if (handler.Login())
             {
                 log += "Login Success!" + Environment.NewLine;
                 log += "Logout..." + Environment.NewLine;

Shoko.Server/API/v2/Modules/Core.cs

@@ -206,13 +206,13 @@ public async Task<ActionResult> TestAniDB()
     {
         var handler = HttpContext.RequestServices.GetRequiredService<IUDPConnectionHandler>();
         handler.ForceLogout();
-        await handler.CloseConnections();
+        handler.CloseConnections();
 
-        await handler.Init(_settings.AniDb.Username, _settings.AniDb.Password,
+        handler.Init(_settings.AniDb.Username, _settings.AniDb.Password,
             _settings.AniDb.UDPServerAddress,
             _settings.AniDb.UDPServerPort, _settings.AniDb.ClientPort);
 
-        if (await handler.Login())
+        if (handler.Login())
         {
             handler.ForceLogout();
             return APIStatus.OK();

Shoko.Server/API/v2/Modules/Init.cs

@@ -278,15 +278,15 @@ public async Task<ActionResult> TestAniDB()
     {
         var handler = HttpContext.RequestServices.GetRequiredService<IUDPConnectionHandler>();
         handler.ForceLogout();
-        await handler.CloseConnections();
+        handler.CloseConnections();
 
         Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(_settings.Culture);
 
-        await handler.Init(_settings.AniDb.Username, _settings.AniDb.Password,
+        handler.Init(_settings.AniDb.Username, _settings.AniDb.Password,
             _settings.AniDb.UDPServerAddress,
             _settings.AniDb.UDPServerPort, _settings.AniDb.ClientPort);
 
-        if (!await handler.Login()) return APIStatus.BadRequest("Failed to log in");
+        if (!handler.Login()) return APIStatus.BadRequest("Failed to log in");
         handler.ForceLogout();
 
         return APIStatus.OK();

Shoko.Server/API/v3/Controllers/DebugController.cs

@@ -109,22 +109,22 @@ public async Task<ActionResult> FetchAniDBMessage(int id)
     /// <param name="request">The AniDB UDP Request to make.</param>
     /// <returns>An AniDB UDP Response.</returns>
     [HttpPost("AniDB/UDP/Call")]
-    public async Task<AnidbUdpResponse> CallAniDB([FromBody] AnidbUdpRequest request)
+    public AnidbUdpResponse CallAniDB([FromBody] AnidbUdpRequest request)
     {
         try
         {
             var token = HttpContext.RequestAborted;
             _logger.LogDebug("Got command {Command}", request.Command);
             if (request.NeedAuth)
             {
-                if (string.IsNullOrEmpty(_udpHandler.SessionID) && !await _udpHandler.Login())
+                if (string.IsNullOrEmpty(_udpHandler.SessionID) && !_udpHandler.Login())
                     return new() { Code = UDPReturnCode.NOT_LOGGED_IN };
                 request.Payload.Add("s", _udpHandler.SessionID);
             }
 
             var fullResponse = request.Unsafe ?
-                await _udpHandler.SendDirectly(request.Command, isPing: request.IsPing, isLogout: request.IsLogout, token: token) :
-                await _udpHandler.Send(request.Command, token: token);
+                _udpHandler.SendDirectly(request.Command, isPing: request.IsPing, isLogout: request.IsLogout) :
+                _udpHandler.Send(request.Command);
             var decodedParts = fullResponse.Split('\n');
             var decodedResponse = string.Join('\n',
                 fullResponse.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)

Shoko.Server/API/v3/Controllers/SettingsController.cs

@@ -70,7 +70,7 @@ public ActionResult SetSettings([FromBody] JsonPatchDocument<ServerSettings> set
     /// <param name="credentials">POST the body as a <see cref="Credentials"/> object</param>
     /// <returns></returns>
     [HttpPost("AniDB/TestLogin")]
-    public async Task<ActionResult> TestAniDB([FromBody] Credentials credentials)
+    public ActionResult TestAniDB([FromBody] Credentials credentials)
     {
         _logger.LogInformation("Testing AniDB Login and Connection");
         if (string.IsNullOrWhiteSpace(credentials.Username))
@@ -87,10 +87,10 @@ public async Task<ActionResult> TestAniDB([FromBody] Credentials credentials)
 
         var settings = SettingsProvider.GetSettings();
         if (!_udpHandler.IsAlive)
-            await _udpHandler.Init(credentials.Username, credentials.Password, settings.AniDb.UDPServerAddress, settings.AniDb.UDPServerPort, settings.AniDb.ClientPort);
+            _udpHandler.Init(credentials.Username, credentials.Password, settings.AniDb.UDPServerAddress, settings.AniDb.UDPServerPort, settings.AniDb.ClientPort);
         else _udpHandler.ForceLogout();
 
-        if (!await _udpHandler.TestLogin(credentials.Username, credentials.Password))
+        if (!_udpHandler.TestLogin(credentials.Username, credentials.Password))
         {
             _logger.LogInformation("Failed AniDB Login and Connection");
             return ValidationProblem("Failed to log in.", "Connection");

Shoko.Server/Providers/AniDB/AniDBRateLimiter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Shoko.Plugin.Abstractions;
 using Shoko.Plugin.Abstractions.Events;
@@ -15,8 +14,7 @@ namespace Shoko.Server.Providers.AniDB;
 public abstract class AniDBRateLimiter
 {
     private readonly ILogger _logger;
-
-    private readonly SemaphoreSlim _lock = new(1, 1);
+    private readonly object _lock = new();
 
     private readonly object _settingsLock = new();
 
@@ -140,9 +138,9 @@ private void ResetRate()
         _logger.LogTrace("Rate is reset. Active time was {Time} ms", elapsedTime);
     }
 
-    public async Task<T> EnsureRateAsync<T>(Func<Task<T>> action, bool forceShortDelay = false)
+    public T EnsureRate<T>(Func<T> action, bool forceShortDelay = false)
     {
-        await _lock.WaitAsync();
+        lock (_lock)
         try
         {
             var delay = _requestWatch.ElapsedMilliseconds;
@@ -153,22 +151,21 @@ public async Task<T> EnsureRateAsync<T>(Func<Task<T>> action, bool forceShortDel
             {
                 _logger.LogTrace("Time since last request is {Delay} ms, not throttling", delay);
                 _logger.LogTrace("Sending AniDB command");
-                return await action();
+                return action();
             }
 
             // add 50ms for good measure
             var waitTime = currentDelay - (int)delay + 50;
 
-            _logger.LogTrace("Time since last request is {Delay} ms, throttling for {Time}", delay, waitTime);
-            await Task.Delay(waitTime);
+            _logger.LogTrace("Time since last request is {Delay} ms, throttling for {Time}ms", delay, waitTime);
+            Thread.Sleep(waitTime);
 
             _logger.LogTrace("Sending AniDB command");
-            return await action();
+            return action();
         }
         finally
         {
             _requestWatch.Restart();
-            _lock.Release();
         }
     }
 }

Shoko.Server/Providers/AniDB/HTTP/AniDBHttpConnectionHandler.cs

@@ -35,14 +35,7 @@ public AniDBHttpConnectionHandler(ILoggerFactory loggerFactory, HttpRateLimiter
         _httpClient.BaseAddress = new Uri(Utils.SettingsProvider.GetSettings().AniDb.HTTPServerUrl);
     }
 
-    public async Task<HttpResponse<string>> GetHttp(string url)
-    {
-        var response = await GetHttpDirectly(url);
-
-        return response;
-    }
-
-    public async Task<HttpResponse<string>> GetHttpDirectly(string url)
+    public HttpResponse<string> GetHttp(string url)
     {
         if (IsBanned)
         {
@@ -53,12 +46,12 @@ public async Task<HttpResponse<string>> GetHttpDirectly(string url)
             };
         }
 
-        var response = await RateLimiter.EnsureRateAsync(async () =>
+        var response = RateLimiter.EnsureRate(() =>
         {
-            using var response = await _httpClient.GetAsync(url);
+            using var response = _httpClient.GetAsync(url).Result;
             response.EnsureSuccessStatusCode();
 
-            var output = await response.Content.ReadAsStringAsync();
+            var output = response.Content.ReadAsStringAsync().Result;
 
             if (CheckForBan(output))
             {

Shoko.Server/Providers/AniDB/HTTP/HttpRequest.cs

@@ -27,7 +27,7 @@ protected HttpRequest(IHttpConnectionHandler handler, ILoggerFactory loggerFacto
     public virtual HttpResponse<T> Send()
     {
         Command = BaseCommand.Trim();
-        var rawResponse = _handler.GetHttp(Command).ConfigureAwait(true).GetAwaiter().GetResult();
+        var rawResponse = _handler.GetHttp(Command);
         var response = ParseResponse(rawResponse).Result;
         PostExecute(response);
         return response;

Shoko.Server/Providers/AniDB/Interfaces/IHttpConnectionHandler.cs

@@ -5,5 +5,5 @@ namespace Shoko.Server.Providers.AniDB.Interfaces;
 
 public interface IHttpConnectionHandler : IConnectionHandler
 {
-    Task<HttpResponse<string>> GetHttp(string url);
+    HttpResponse<string> GetHttp(string url);
 }

Shoko.Server/Providers/AniDB/Interfaces/IUDPConnectionHandler.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Shoko.Server.Providers.AniDB.Interfaces;
 
@@ -13,17 +11,17 @@ public interface IUDPConnectionHandler : IConnectionHandler
     event EventHandler LoginFailed;
     bool SetCredentials(string username, string password);
     bool ValidAniDBCredentials(string user, string pass);
-    Task<bool> Login();
+    bool Login();
     void ForceLogout();
     void ClearSession();
-    Task CloseConnections();
-    Task ForceReconnection();
+    void CloseConnections();
+    void ForceReconnection();
     void StartBackoffTimer(int time, string message);
-    Task<bool> Init();
-    Task<bool> Init(string username, string password, string serverName, ushort serverPort, ushort clientPort);
-    Task<bool> TestLogin(string username, string password);
+    bool Init();
+    bool Init(string username, string password, string serverName, ushort serverPort, ushort clientPort);
+    bool TestLogin(string username, string password);
 
-    Task<string> SendDirectly(string command, bool needsUnicode = true, bool isPing = false, bool isLogout = false, CancellationToken token = new());
+    string SendDirectly(string command, bool needsUnicode = true, bool isPing = false, bool isLogout = false);
 
-    Task<string> Send(string command, bool needsUnicode = true, CancellationToken token = new());
+    string Send(string command, bool needsUnicode = true);
 }