We dont need to actually load the MangaConnector to know if two names match.

API/API.csproj

@@ -11,7 +11,6 @@
 
     <ItemGroup>
         <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
-        <PackageReference Include="FlareSolverrSharp" Version="3.0.7" />
         <PackageReference Include="HtmlAgilityPack" Version="1.12.0" />
         <PackageReference Include="log4net" Version="3.0.4" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.3" />

API/Controllers/SettingsController.cs

@@ -4,7 +4,6 @@ using API.Schema;
 using API.Schema.Contexts;
 using API.Schema.Jobs;
 using Asp.Versioning;
-using FlareSolverrSharp;
 using log4net;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -321,43 +320,18 @@ public class SettingsController(PgsqlContext context, ILog Log) : Controller
     }
 
     /// <summary>
-    /// 
+    /// Test FlareSolverr
     /// </summary>
     /// <response code="200">FlareSolverr is working!</response>
-    /// <response code="400">FlareSolverr URL is malformed</response>
     /// <response code="500">FlareSolverr is not working</response>
-    /// <response code="503">FlareSolverr could not be reached</response>
     [HttpPost("FlareSolverr/Test")]
     [ProducesResponseType(Status200OK)]
-    [ProducesResponseType(Status400BadRequest)]
     [ProducesResponseType(Status500InternalServerError)]
-    [ProducesResponseType(Status503ServiceUnavailable)]
     public IActionResult TestFlareSolverrReachable()
     {
         const string knownProtectedUrl = "https://prowlarr.servarr.com/v1/ping";
-        HttpClient client = new();
-        if (!Uri.TryCreate(new(TrangaSettings.flareSolverrUrl), "v1", out Uri? uri))
-            return BadRequest();
-        HttpRequestMessage request = new(HttpMethod.Post, uri);
-        JObject data = new()
-        {
-            ["cmd"] = "request.get",
-            ["url"] = knownProtectedUrl
-        };
-        request.Content = new StringContent(JsonConvert.SerializeObject(data));
-        request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
-        HttpResponseMessage response = client.Send(request);
-        if (!response.IsSuccessStatusCode)
-            return StatusCode(Status503ServiceUnavailable);
-        client = new(new ClearanceHandler(TrangaSettings.flareSolverrUrl));
-        try
-        {
-            client.GetStringAsync(knownProtectedUrl).Wait();
-            return Ok();
-        }
-        catch (Exception e)
-        {
-            return StatusCode(Status500InternalServerError);
-        }
+        FlareSolverrDownloadClient client = new();
+        RequestResult result = client.MakeRequestInternal(knownProtectedUrl);
+        return (int)result.statusCode >= 200 && (int)result.statusCode < 300 ? Ok() : StatusCode(500, result.statusCode); 
     }
 }

API/MangaDownloadClients/DownloadClient.cs

@@ -3,7 +3,7 @@ using log4net;
 
 namespace API.MangaDownloadClients;
 
-internal abstract class DownloadClient
+public abstract class DownloadClient
 {
     private static readonly Dictionary<RequestType, DateTime> LastExecutedRateLimit = new();
     protected ILog Log { get; init; }

API/MangaDownloadClients/FlareSolverrDownloadClient.cs

@@ -0,0 +1,180 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Net;
+using System.Text;
+using System.Text.Json;
+using HtmlAgilityPack;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace API.MangaDownloadClients;
+
+public class FlareSolverrDownloadClient : DownloadClient
+{
+    
+    
+    internal override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
+    {
+        if (clickButton is not null)
+            Log.Warn("Client can not click button");
+        if(referrer is not null)
+            Log.Warn("Client can not set referrer");
+        if (TrangaSettings.flareSolverrUrl == string.Empty)
+        {
+            Log.Error("FlareSolverr URL is empty");
+            return new(HttpStatusCode.InternalServerError, null, Stream.Null);
+        }
+        
+        Uri flareSolverrUri = new (TrangaSettings.flareSolverrUrl);
+        if (flareSolverrUri.Segments.Last() != "v1")
+            flareSolverrUri = new UriBuilder(flareSolverrUri)
+            {
+                Path = "v1"
+            }.Uri;
+        
+        HttpClient client = new()
+        {
+            Timeout = TimeSpan.FromSeconds(10),
+            DefaultVersionPolicy = HttpVersionPolicy.RequestVersionOrHigher,
+            DefaultRequestHeaders = { { "User-Agent", TrangaSettings.userAgent } }
+        };
+
+        JObject requestObj = new()
+        {
+            ["cmd"] = "request.get",
+            ["url"] = url
+        };
+
+        HttpRequestMessage requestMessage = new(HttpMethod.Post, flareSolverrUri)
+        {
+            Content = new StringContent(JsonConvert.SerializeObject(requestObj)),
+        };
+        requestMessage.Content.Headers.ContentType = new ("application/json");
+        Log.Debug($"Requesting {url}");
+        
+        HttpResponseMessage? response;
+        try
+        {
+            response = client.Send(requestMessage);
+        }
+        catch (HttpRequestException e)
+        {
+            Log.Error(e);
+            return new (HttpStatusCode.Unused, null, Stream.Null);
+        }
+
+        if (!response.IsSuccessStatusCode)
+        {
+            Log.Debug($"Request returned status code {(int)response.StatusCode} {response.StatusCode}:\n" +
+                      $"=====\n" +
+                      $"Request:\n" +
+                      $"{requestMessage.Method} {requestMessage.RequestUri}\n" +
+                      $"{requestMessage.Version} {requestMessage.VersionPolicy}\n" +
+                      $"Headers:\n\t{string.Join("\n\t", requestMessage.Headers.Select(h => $"{h.Key}: <{string.Join(">, <", h.Value)}"))}>\n" +
+                      $"{requestMessage.Content?.ReadAsStringAsync().Result}" +
+                      $"=====\n" +
+                      $"Response:\n" +
+                      $"{response.Version}\n" +
+                      $"Headers:\n\t{string.Join("\n\t", response.Headers.Select(h => $"{h.Key}: <{string.Join(">, <", h.Value)}"))}>\n" +
+                      $"{response.Content.ReadAsStringAsync().Result}");
+            return new (response.StatusCode,  null, Stream.Null);
+        }
+
+        string responseString = response.Content.ReadAsStringAsync().Result;
+        JObject responseObj = JObject.Parse(responseString);
+        if (!IsInCorrectFormat(responseObj, out string? reason))
+        {
+            Log.Error($"Wrong format: {reason}");
+            return new(HttpStatusCode.Unused, null, Stream.Null);
+        }
+
+        string statusResponse = responseObj["status"]!.Value<string>()!;
+        if (statusResponse != "ok")
+        {
+            Log.Debug($"Status is not ok: {statusResponse}");
+            return new(HttpStatusCode.Unused, null, Stream.Null);
+        }
+        JObject solution = (responseObj["solution"] as JObject)!;
+
+        if (!Enum.TryParse(solution["status"]!.Value<int>().ToString(), out HttpStatusCode statusCode))
+        {
+            Log.Error($"Wrong format: Cant parse status code: {solution["status"]!.Value<int>()}");
+            return new(HttpStatusCode.Unused, null, Stream.Null);
+        }
+        if (statusCode < HttpStatusCode.OK || statusCode >= HttpStatusCode.MultipleChoices)
+        {
+            Log.Debug($"Status is: {statusCode}");
+            return new(statusCode, null, Stream.Null);
+        }
+
+        if (solution["response"]!.Value<string>() is not { } htmlString)
+        {
+            Log.Error("Wrong format: Cant find response in solution");
+            return new(HttpStatusCode.Unused, null, Stream.Null);
+        }
+
+        if (IsJson(htmlString, out HtmlDocument document, out string? json))
+        {
+            MemoryStream ms = new();
+            ms.Write(Encoding.UTF8.GetBytes(json));
+            ms.Position = 0;
+            return new(statusCode, document, ms);
+        }
+        else
+        {
+            MemoryStream ms = new();
+            ms.Write(Encoding.UTF8.GetBytes(htmlString));
+            ms.Position = 0;
+            return new(statusCode, document, ms);
+        }
+    }
+
+    private bool IsInCorrectFormat(JObject responseObj, [NotNullWhen(false)]out string? reason)
+    {
+        reason = null;
+        if (!responseObj.ContainsKey("status"))
+        {
+            reason = "Cant find status on response";
+            return false;
+        }
+
+        if (responseObj["solution"] is not JObject solution)
+        {
+            reason = "Cant find solution";
+            return false;
+        }
+
+        if (!solution.ContainsKey("status"))
+        {
+            reason = "Wrong format: Cant find status in solution";
+            return false;
+        }
+
+        if (!solution.ContainsKey("response"))
+        {
+
+            reason = "Wrong format: Cant find response in solution";
+            return false;
+        }
+
+        return true;
+    }
+
+    private bool IsJson(string htmlString, out HtmlDocument document, [NotNullWhen(true)]out string? jsonString)
+    {
+        jsonString = null;
+        document = new();
+        document.LoadHtml(htmlString);
+
+        HtmlNode pre = document.DocumentNode.SelectSingleNode("//pre");
+        try
+        {
+            using JsonDocument _ = JsonDocument.Parse(pre.InnerText);
+            jsonString = pre.InnerText;
+            return true;
+        }
+        catch (JsonReaderException)
+        {
+            return false;
+        }
+    }
+}

API/MangaDownloadClients/HttpDownloadClient.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using FlareSolverrSharp;
 using HtmlAgilityPack;
 
 namespace API.MangaDownloadClients;
@@ -10,9 +9,7 @@ internal class HttpDownloadClient : DownloadClient
     {
         if (clickButton is not null)
             Log.Warn("Client can not click button");
-        HttpClient client = TrangaSettings.flareSolverrUrl == string.Empty
-            ? new ()
-            : new (new ClearanceHandler(TrangaSettings.flareSolverrUrl));
+        HttpClient client = new();
         client.Timeout = TimeSpan.FromSeconds(10);
         client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionOrHigher;
         client.DefaultRequestHeaders.Add("User-Agent", TrangaSettings.userAgent);
@@ -34,19 +31,28 @@ internal class HttpDownloadClient : DownloadClient
 
         if (!response.IsSuccessStatusCode)
         {
-            Log.Debug($"Request returned status code {(int)response.StatusCode} {response.StatusCode}:\n" +
-                      $"=====\n" +
-                      $"Request:\n" +
-                      $"{requestMessage.Method} {requestMessage.RequestUri}\n" +
-                      $"{requestMessage.Version} {requestMessage.VersionPolicy}\n" +
-                      $"Headers:\n\t{string.Join("\n\t", requestMessage.Headers.Select(h => $"{h.Key}: <{string.Join(">, <", h.Value)}"))}>\n" +
-                      $"{requestMessage.Content?.ReadAsStringAsync().Result}" +
-                      $"=====\n" +
-                      $"Response:\n" +
-                      $"{response.Version}\n" +
-                      $"Headers:\n\t{string.Join("\n\t", response.Headers.Select(h => $"{h.Key}: <{string.Join(">, <", h.Value)}"))}>\n" +
-                      $"{response.Content.ReadAsStringAsync().Result}");
-            return new (response.StatusCode,  null, Stream.Null);
+            Log.Debug($"Request returned status code {(int)response.StatusCode} {response.StatusCode}");
+            if (response.Headers.Server.Any(s =>
+                    (s.Product?.Name ?? "").Contains("cloudflare", StringComparison.InvariantCultureIgnoreCase)))
+            {
+                Log.Debug("Retrying with FlareSolverr!");
+                return new FlareSolverrDownloadClient().MakeRequestInternal(url, referrer, clickButton);
+            }
+            else
+            {
+                Log.Debug($"Request returned status code {(int)response.StatusCode} {response.StatusCode}:\n" +
+                          $"=====\n" +
+                          $"Request:\n" +
+                          $"{requestMessage.Method} {requestMessage.RequestUri}\n" +
+                          $"{requestMessage.Version} {requestMessage.VersionPolicy}\n" +
+                          $"Headers:\n\t{string.Join("\n\t", requestMessage.Headers.Select(h => $"{h.Key}: <{string.Join(">, <", h.Value)}"))}>\n" +
+                          $"{requestMessage.Content?.ReadAsStringAsync().Result}" +
+                          $"=====\n" +
+                          $"Response:\n" +
+                          $"{response.Version}\n" +
+                          $"Headers:\n\t{string.Join("\n\t", response.Headers.Select(h => $"{h.Key}: <{string.Join(">, <", h.Value)}"))}>\n" +
+                          $"{response.Content.ReadAsStringAsync().Result}");
+            }
         }
 
         Stream stream;

API/Tranga.cs

@@ -137,12 +137,12 @@ public static class Tranga
             List<Job> dueJobs = waitingJobs.FilterDueJobs();
             List<Job> jobsWithoutDependencies = dueJobs.FilterJobDependencies();
 
-            List<Job> jobsWithoutDownloading = jobsWithoutDependencies.Where(j => GetJobConnector(j) is null).ToList();
+            List<Job> jobsWithoutDownloading = jobsWithoutDependencies.FilterJobsWithoutDownloading();
             
             //Match running and waiting jobs per Connector
-            Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> runningJobsPerConnector =
+            Dictionary<string, Dictionary<JobType, List<Job>>> runningJobsPerConnector =
                 runningJobs.GetJobsPerJobTypeAndConnector();
-            Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> waitingJobsPerConnector =
+            Dictionary<string, Dictionary<JobType, List<Job>>> waitingJobsPerConnector =
                 jobsWithoutDependencies.GetJobsPerJobTypeAndConnector();
             List<Job> jobsNotHeldBackByConnector =
                 MatchJobsRunningAndWaiting(runningJobsPerConnector, waitingJobsPerConnector);
@@ -195,32 +195,68 @@ public static class Tranga
             {
                 Log.Error("Failed saving Job changes.", e);
             }
-            Log.Debug($"Job-Cycle over! (took {DateTime.UtcNow.Subtract(cycleStart).TotalMilliseconds}ms)");
+            Log.Debug($"Job-Cycle over! (took {DateTime.UtcNow.Subtract(cycleStart).TotalMilliseconds}ms");
             Thread.Sleep(TrangaSettings.startNewJobTimeoutMs);
         }
     }
     
-    private static List<Job> GetRunningJobs(this IQueryable<Job> jobs) =>
-        jobs.Where(j => j.state == JobState.Running).ToList();
-    
-    private static List<Job> GetWaitingJobs(this IQueryable<Job> jobs) =>
-        jobs.Where(j => j.state == JobState.CompletedWaiting || j.state == JobState.FirstExecution)
-            .ToList();
-
-    private static List<Job> FilterDueJobs(this List<Job> jobs) =>
-        jobs.Where(j => j.NextExecution < DateTime.UtcNow)
-            .ToList();
-
-    private static List<Job> FilterJobDependencies(this List<Job> jobs) =>
-        jobs.Where(job => job.DependsOnJobs.All(j => j.IsCompleted))
-            .ToList();
-
-    private static Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> GetJobsPerJobTypeAndConnector(this List<Job> jobs)
+    private static List<Job> GetRunningJobs(this IQueryable<Job> jobs)
     {
-        Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> ret = new();
+        DateTime start = DateTime.UtcNow;
+        List<Job> ret = jobs.Where(j => j.state == JobState.Running).ToList();
+        DateTime end = DateTime.UtcNow;
+        Log.Debug($"Getting running Jobs took {end.Subtract(start).TotalMilliseconds}ms");
+        return ret;
+    }
+    
+    private static List<Job> GetWaitingJobs(this IQueryable<Job> jobs)
+    {
+        DateTime start = DateTime.UtcNow;
+        List<Job> ret = jobs.Where(j => j.state == JobState.CompletedWaiting || j.state == JobState.FirstExecution).ToList();
+        DateTime end = DateTime.UtcNow;
+        Log.Debug($"Getting waiting Jobs took {end.Subtract(start).TotalMilliseconds}ms");
+        return ret;
+    }
+        
+
+    private static List<Job> FilterDueJobs(this List<Job> jobs)
+    {
+        DateTime start = DateTime.UtcNow;
+        List<Job> ret = jobs.Where(j => j.NextExecution < DateTime.UtcNow).ToList();
+        DateTime end = DateTime.UtcNow;
+        Log.Debug($"Filtering Due Jobs took {end.Subtract(start).TotalMilliseconds}ms");
+        return ret;
+    }
+        
+
+    private static List<Job> FilterJobDependencies(this List<Job> jobs)
+    {
+        DateTime start = DateTime.UtcNow;
+        List<Job> ret = jobs.Where(job => job.DependsOnJobs.All(j => j.IsCompleted)).ToList();
+        DateTime end = DateTime.UtcNow;
+        Log.Debug($"Filtering Dependencies took {end.Subtract(start).TotalMilliseconds}ms");
+        return ret;
+    }
+    
+
+    private static List<Job> FilterJobsWithoutDownloading(this List<Job> jobs)
+    {
+        JobType[] types = [JobType.MoveFileOrFolderJob, JobType.MoveMangaLibraryJob, JobType.UpdateChaptersDownloadedJob];
+        DateTime start = DateTime.UtcNow;
+        List<Job> ret = jobs.Where(j => types.Contains(j.JobType)).ToList();
+        DateTime end = DateTime.UtcNow;
+        Log.Debug($"Filtering Jobs without Download took {end.Subtract(start).TotalMilliseconds}ms");
+        return ret;
+    }
+    
+
+    private static Dictionary<string, Dictionary<JobType, List<Job>>> GetJobsPerJobTypeAndConnector(this List<Job> jobs)
+    {
+        DateTime start = DateTime.UtcNow;
+        Dictionary<string, Dictionary<JobType, List<Job>>> ret = new();
         foreach (Job job in jobs)
         {
-            if(GetJobConnector(job) is not { } connector)
+            if(GetJobConnectorName(job) is not { } connector)
                 continue;
             if (!ret.ContainsKey(connector))
                 ret.Add(connector, new());
@@ -228,14 +264,17 @@ public static class Tranga
                 ret[connector].Add(job.JobType, new());
             ret[connector][job.JobType].Add(job);
         }
+        DateTime end = DateTime.UtcNow;
+        Log.Debug($"Fetching connector per Job for jobs took {end.Subtract(start).TotalMilliseconds}ms");
         return ret;
     }
 
-    private static List<Job> MatchJobsRunningAndWaiting(Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> running,
-        Dictionary<MangaConnector, Dictionary<JobType, List<Job>>> waiting)
+    private static List<Job> MatchJobsRunningAndWaiting(Dictionary<string, Dictionary<JobType, List<Job>>> running,
+        Dictionary<string, Dictionary<JobType, List<Job>>> waiting)
     {
+        DateTime start = DateTime.UtcNow;
         List<Job> ret = new();
-        foreach ((MangaConnector connector, Dictionary<JobType, List<Job>> jobTypeJobsWaiting) in waiting)
+        foreach ((string connector, Dictionary<JobType, List<Job>> jobTypeJobsWaiting) in waiting)
         {
             if (running.TryGetValue(connector, out Dictionary<JobType, List<Job>>? jobTypeJobsRunning))
             {   //MangaConnector has running Jobs
@@ -266,20 +305,22 @@ public static class Tranga
                 }
             }
         }
-
+        DateTime end = DateTime.UtcNow;
+        Log.Debug($"Getting eligible jobs (not held back by Connector) took {end.Subtract(start).TotalMilliseconds}ms");
         return ret;
     }
-
-    private static MangaConnector? GetJobConnector(Job job)
+    
+    
+    private static string? GetJobConnectorName(Job job)
     {
         if (job is DownloadAvailableChaptersJob dacj)
-            return dacj.Manga.MangaConnector;
+            return dacj.Manga.MangaConnectorName;
         if (job is DownloadMangaCoverJob dmcj)
-            return  dmcj.Manga.MangaConnector;
+            return  dmcj.Manga.MangaConnectorName;
         if (job is DownloadSingleChapterJob dscj)
-            return  dscj.Chapter.ParentManga.MangaConnector;
+            return  dscj.Chapter.ParentManga.MangaConnectorName;
         if (job is RetrieveChaptersJob rcj)
-            return rcj.Manga.MangaConnector;
+            return rcj.Manga.MangaConnectorName;
         return null;
     }
 }

API/TrangaSettings.cs

@@ -42,8 +42,8 @@ public static class TrangaSettings
     {
         {RequestType.MangaInfo, 60},
         {RequestType.MangaDexFeed, 60},
-        {RequestType.MangaDexImage, 40},
-        {RequestType.MangaImage, 60},
+        {RequestType.MangaDexImage, 60},
+        {RequestType.MangaImage, 240},
         {RequestType.MangaCover, 60},
         {RequestType.Default, 60}
     };

README.md

@@ -92,7 +92,6 @@ Endpoints are documented in Swagger. Just spin up an instance, and go to `http:/
 - [Ngpsql](https://github.com/npgsql/npgsql/blob/main/LICENSE)
 - [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md)
 - [PuppeteerSharp](https://github.com/hardkoded/puppeteer-sharp/blob/master/LICENSE)
-- [FlareSolverrSharp](https://github.com/FlareSolverr/FlareSolverrSharp)
 - [Html Agility Pack (HAP)](https://github.com/zzzprojects/html-agility-pack/blob/master/LICENSE)
 - [Soenneker.Utils.String.NeedlemanWunsch](https://github.com/soenneker/soenneker.utils.string.needlemanwunsch/blob/main/LICENSE)
 - [Sixlabors.ImageSharp](https://docs-v2.sixlabors.com/articles/imagesharp/index.html#license)