Fixes; refactoring; updates; integrates PR FlareSolverr#22, FlareSolv…

…err#26, FlareSolverr#27, FlareSolverr#29

sample/FlareSolverrSharp.Sample/FlareSolverrSharp.Sample.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>FlareSolverrSharp.Sample</RootNamespace>
     <AssemblyName>FlareSolverrSharp.Sample</AssemblyName>
-    <Version>3.0.7</Version>
+    <Version>3.0.8</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/FlareSolverrSharp/ClearanceHandler.cs

@@ -44,18 +44,18 @@ public class ClearanceHandler : DelegatingHandler
 
 	public bool CookieCapacity { get; set; }
 
-	private readonly IFlaresolverrResponseStorage _responseStorage;
+	private readonly IFlareSolverrResponseStorage _responseStorage;
 
 	/// <summary>
 	/// Creates a new instance of the <see cref="ClearanceHandler"/>.
 	/// </summary>
 	/// <param name="flareSolverrApiUrl">FlareSolverr API URL. If null or empty it will detect the challenges, but
 	/// they will not be solved. Example: "http://localhost:8191/"</param>
 	public ClearanceHandler(string api)
-		: this(new FlareSolverr(api), new DefaultFlaresolverrResponseStorage()) { }
+		: this(new FlareSolverr(api), new DefaultFlareSolverrResponseStorage()) { }
 
 
-	public ClearanceHandler(FlareSolverr solverr, IFlaresolverrResponseStorage storage)
+	public ClearanceHandler(FlareSolverr solverr, IFlareSolverrResponseStorage storage)
 		: base(new HttpClientHandler())
 	{
 		m_client = new HttpClient(new HttpClientHandler

src/FlareSolverrSharp/FlareSolverrSharp.csproj

@@ -5,7 +5,7 @@
     <PackageId>FlareSolverrSharp</PackageId>
     <RootNamespace>FlareSolverrSharp</RootNamespace>
     <LangVersion>latest</LangVersion>
-    <Version>3.0.7</Version>
+    <Version>3.0.8</Version>
     <Authors>Diego Heras (ngosang)</Authors>
     <Description>FlareSolverr .Net / Proxy server to bypass Cloudflare protection.</Description>
     <PackageTags>flaresolverr, flaresolver, cloudflare, solver, bypass, protection, solving, library, cloudflaresolver, delegatinghandler, recaptcha, captcha, javascript, challenge, utilities</PackageTags>

src/FlareSolverrSharp/Solvers/FlareSolverr.cs

@@ -40,14 +40,15 @@ public class FlareSolverr : INotifyPropertyChanged
 			JsonIgnoreCondition.WhenWritingDefault,
 	};
 
-	private static readonly SemaphoreLocker s_locker = new SemaphoreLocker();
+	private static readonly SemaphoreLocker s_locker = new();
 
-	private /*readonly*/ HttpClient m_httpClient;
+	private readonly HttpClient m_httpClient;
 
 	public Uri FlareSolverrApi { get; }
 
-	private readonly Uri _flareSolverrIndexUri;
-	private          int m_maxTimeout;
+	public Uri FlareSolverrIndexUri { get; }
+
+	private int m_maxTimeout;
 
 	public int MaxTimeout
 	{
@@ -77,7 +78,7 @@ public FlareSolverr(string flareSolverrApiUrl)
 		}
 
 		FlareSolverrApi = new Uri($"{apiUrl}v1");
-
+		FlareSolverrIndexUri = new Uri(apiUrl);
 		m_httpClient = new HttpClient()
 		{
 			// Timeout = AdjustHttpClientTimeout()
@@ -200,7 +201,7 @@ await s_locker.LockAsync(async () =>
 				// m_httpClient.Timeout = TimeSpan.FromMilliseconds(MaxTimeout + 5000);
 
 				if (flareSolverrRequest == null) {
-					response = await m_httpClient.GetAsync(_flareSolverrIndexUri);
+					response = await m_httpClient.GetAsync(FlareSolverrIndexUri);
 				}
 				else {
 					response = await m_httpClient.PostAsync(FlareSolverrApi, flareSolverrRequest);

src/FlareSolverrSharp/Types/FlareSolverrRequestProxy.cs

@@ -6,13 +6,13 @@ public class FlareSolverrRequestProxy
 {
 
 	[JsonPropertyName("url")]
-	public string Url {get;set;}
+	public string Url { get; set; }
 
 	[JsonPropertyName("username")]
-	public string Username{get;set;}
+	public string Username { get; set; }
 
 	[JsonPropertyName("password")]
-	public string Password{get;set;}
+	public string Password { get; set; }
 
 	public FlareSolverrRequestProxy() { }
 

src/FlareSolverrSharp/Types/FlareSolverrResponse.cs

@@ -3,36 +3,13 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Net;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
 // ReSharper disable UnusedMember.Global
 // ReSharper disable UnassignedField.Global
 // ReSharper disable ClassNeverInstantiated.Global
 namespace FlareSolverrSharp.Types;
 
-public class StringOrNumberConverter : JsonConverter<string>
-{
-
-	public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType == JsonTokenType.Number) {
-			return reader.GetInt32().ToString();
-		}
-		else if (reader.TokenType == JsonTokenType.String) {
-			return reader.GetString();
-		}
-
-		throw new JsonException("Unexpected token type");
-	}
-
-	public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
-	{
-		writer.WriteStringValue(value);
-	}
-
-}
-
 public class FlareSolverrResponse
 {
 

src/FlareSolverrSharp/Types/IFlaresolverrResponseStorage.cs

@@ -1,11 +1,11 @@
-// Author: Deci | Project: FlareSolverrSharp | Name: IFlaresolverrResponseStorage.cs
+// Author: Deci | Project: FlareSolverrSharp | Name: IFlareSolverrResponseStorage.cs
 // Date: 2024/10/23 @ 17:10:02
 
 using System.Threading.Tasks;
 
 namespace FlareSolverrSharp.Types;
 
-public interface IFlaresolverrResponseStorage
+public interface IFlareSolverrResponseStorage
 {
 
 	Task SaveAsync(FlareSolverrResponse result);
@@ -14,7 +14,7 @@ public interface IFlaresolverrResponseStorage
 
 }
 
-public class DefaultFlaresolverrResponseStorage : IFlaresolverrResponseStorage
+public class DefaultFlareSolverrResponseStorage : IFlareSolverrResponseStorage
 {
 
 	public Task<FlareSolverrResponse?> LoadAsync()

test/FlareSolverrSharp.Tests/FlareSolverrSharp.Tests.csproj

@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
     <AssemblyName>FlareSolverrSharp.Tests</AssemblyName>
     <RootNamespace>FlareSolverrSharp.Tests</RootNamespace>
-    <Version>3.0.7</Version>
+    <Version>3.0.8</Version>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 

test/FlareSolverrSharp.Tests/FlareSolverrTests.cs

@@ -43,7 +43,7 @@ public async Task SolveOk()
 	[TestMethod]
 	public async Task SolveOk2()
 	{
-		var uri          = new Uri("https://ascii2d.net/search/url/https://pomf2.lain.la/f/m2otcpa1.jpeg");
+		var uri          = new Uri("https://ascii2d.net/search/url/https://www.reddit.com/media?url=https%3A%2F%2Fi.redd.it%2Fxixxli0axz7b1.jpg");
 		var flareSolverr = new FlareSolverr(Settings.FlareSolverrApiUrl);
 		var request      = new HttpRequestMessage(HttpMethod.Get, uri);
 
@@ -60,7 +60,26 @@ public async Task SolveOk2()
 		Assert.IsTrue(!string.IsNullOrWhiteSpace(firstCookie.Name));
 		Assert.IsTrue(!string.IsNullOrWhiteSpace(firstCookie.Value));
 	}
+	[TestMethod]
+	public async Task SolveOk3()
+	{
+		var uri          = new Uri("https://ascii2d.net/search/url/https://www.reddit.com/media?url=https%3A%2F%2Fi.redd.it%2Fxixxli0axz7b1.jpg");
+		var flareSolverr = new FlareSolverr(Settings.FlareSolverrApiUrl);
+		var request      = new HttpRequestMessage(HttpMethod.Get, uri);
 
+		var flareSolverrResponse = await flareSolverr.SolveAsync(request);
+		Assert.AreEqual("ok", flareSolverrResponse.Status);
+
+		// Assert.AreEqual("", flareSolverrResponse.Message);
+		Assert.IsTrue(flareSolverrResponse.StartTimestamp > 0);
+		Assert.IsTrue(flareSolverrResponse.EndTimestamp   > flareSolverrResponse.StartTimestamp);
+		Assert.IsTrue(flareSolverrResponse.Version.Major  >= 2);
+
+
+		var firstCookie = flareSolverrResponse.Solution.Cookies.First();
+		Assert.IsTrue(!string.IsNullOrWhiteSpace(firstCookie.Name));
+		Assert.IsTrue(!string.IsNullOrWhiteSpace(firstCookie.Value));
+	}
 	[TestMethod]
 	public async Task SolveOkUserAgent()
 	{