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

…err#26, FlareSolverr#27, FlareSolverr#29; change branch
Decimation · Nov 20, 2024 · 0df38d8 · 0df38d8
1 parent 9e7c3a1
commit 0df38d8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 22 deletions.
diff --git a/sample/FlareSolverrSharp.Sample/FlareSolverrSharp.Sample.csproj b/sample/FlareSolverrSharp.Sample/FlareSolverrSharp.Sample.csproj
@@ -8,6 +8,10 @@
     <Version>3.0.8</Version>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\FlareSolverrSharp\FlareSolverrSharp.csproj" />
   </ItemGroup>

diff --git a/sample/FlareSolverrSharp.Sample/Program.cs b/sample/FlareSolverrSharp.Sample/Program.cs
@@ -25,18 +25,18 @@ public static async Task Main()
 
 		var client = new HttpClient(handler);
 
-		var x = await client.GetAsync(Settings.ProtectedUri);
-
-		Console.WriteLine(x);
-		Console.WriteLine( ChallengeDetector.IsClearanceRequiredAsync(x));
-		/*foreach (KeyValuePair<string, IEnumerable<string>> pair in x.Headers) {
-			Console.WriteLine(pair);
-		}*/
-		foreach (var y in x.Headers.Server) {
-
-			Console.WriteLine(y.Product.Name);
-		}
-		// Assert.IsTrue(c.Message.Contains("Error connecting to FlareSolverr server"));
+		HttpRequestMessage[] rg =
+		[
+			new(HttpMethod.Get, "https://ascii2d.net/search/url/https://pomf2.lain.la/f/fy32pj5e.png"),
+			new(HttpMethod.Get, "https://ascii2d.net/search/url/https://i.redd.it/xixxli0axz7b1.jpg"),
+		];
+
+		await Parallel.ForEachAsync(rg, async (x, y) =>
+		{
+			var res = await client.SendAsync(x, y);
+			Console.WriteLine($"{x.RequestUri} -> {res.StatusCode}");
+			return;
+		});
 	}
 
 }
diff --git a/src/FlareSolverrSharp/FlareSolverrSharp.csproj b/src/FlareSolverrSharp/FlareSolverrSharp.csproj
@@ -5,7 +5,7 @@
     <PackageId>FlareSolverrSharp</PackageId>
     <RootNamespace>FlareSolverrSharp</RootNamespace>
     <LangVersion>latest</LangVersion>
-    <Version>3.0.8</Version>
+    <Version>3.0.9</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>
@@ -14,6 +14,11 @@
     <PackageLicenseUrl>https://github.com/ngosang/FlareSolverrSharp/blob/master/LICENSE</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <AssemblyName>FlareSolverrSharp</AssemblyName>
+    <DefineConstants>JETBRAINS_ANNOTATIONS;TRACE</DefineConstants>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+    <PublishSingleFile Condition="'$(Configuration)' == 'Release|AnyCPU'">true</PublishSingleFile>
+    <PublishTrimmed>True</PublishTrimmed>
+    <!-- <PublishSingleFile>true</PublishSingleFile> -->
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -26,7 +31,8 @@
 
   <ItemGroup>
     <PackageReference Include="Flurl.Http" Version="4.0.2" />
+    <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/FlareSolverrSharp/Solvers/FlareSolverr.cs b/src/FlareSolverrSharp/Solvers/FlareSolverr.cs
@@ -188,9 +188,13 @@ private async Task<T> SendFlareSolverrRequestInternalAsync<T>(HttpContent flareS
 		T result = default;
 
 		//https://github.com/FlareSolverr/FlareSolverrSharp/pull/27/files
+		await Func();
 
 		//todo: what is this "semaphore locker" for
-		await s_locker.LockAsync(async () =>
+		// await s_locker.LockAsync(Func);
+		return result;
+
+		async Task Func()
 		{
 			HttpResponseMessage response;
 
@@ -219,8 +223,7 @@ await s_locker.LockAsync(async () =>
 			}
 
 			// Don't try parsing if FlareSolverr hasn't returned 200 or 500
-			if (!AllowAnyStatusCode
-			    && (response.StatusCode is not (HttpStatusCode.OK or HttpStatusCode.InternalServerError))) {
+			if (!AllowAnyStatusCode && (response.StatusCode is not (HttpStatusCode.OK or HttpStatusCode.InternalServerError))) {
 				throw new FlareSolverrException($"Status code: {response.StatusCode}");
 			}
 
@@ -231,7 +234,7 @@ await s_locker.LockAsync(async () =>
 
 				// result  = await JsonSerializer.DeserializeAsync<FlareSolverrResponse>(resContent, options);
 
-				result = JsonSerializer.Deserialize<T>(resContent, typeInfo);
+				result = JsonSerializer.Deserialize(resContent, typeInfo);
 			}
 			catch (Exception) {
 				throw new FlareSolverrException($"Error parsing response, check FlareSolverr. Response: {resContent}");
@@ -273,10 +276,7 @@ await s_locker.LockAsync(async () =>
 			// return SendRequestAsync(flareSolverrRequest);*/
 
 
-		});
-		return result;
-
-
+		}
 	}
 
 

diff --git a/test/FlareSolverrSharp.Tests/FlareSolverrSharp.Tests.csproj b/test/FlareSolverrSharp.Tests/FlareSolverrSharp.Tests.csproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageReference Include="MSTest" Version="3.6.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
   </ItemGroup>