Refactor cookie handling & FlareSolverr

Author: Decimation

SmartImage.Lib/Engines/Impl/Search/Ascii2DEngine.cs

@@ -13,6 +13,7 @@
 using Flurl.Http;
 using Flurl.Http.Content;
 using Kantan.Net.Utilities;
+using Kantan.Net.Web;
 using SmartImage.Lib.Clients;
 using SmartImage.Lib.Images;
 using SmartImage.Lib.Results;
@@ -27,14 +28,14 @@ namespace SmartImage.Lib.Engines.Impl.Search;
 
 // todo
 
-public sealed class Ascii2DEngine : WebSearchEngine, ICookieReceiver
+public sealed class Ascii2DEngine : WebSearchEngine, ICookiesReceiver
 {
 
 	public Ascii2DEngine() : base("https://ascii2d.net/search/url/")
 	{
-		Timeout   = TimeSpan.FromSeconds(30);
-		MaxSize   = 10000000;
-		CookieJar = new CookieJar();
+		Timeout = TimeSpan.FromSeconds(30);
+		MaxSize = 10000000;
+		Jar     = new CookieJar();
 	}
 
 	protected override string NodesSelector => Serialization.S_Ascii2D_Images2;
@@ -85,7 +86,8 @@ protected override Url GetRawUrl(SearchQuery query)
 
 	public override void Dispose() { }
 
-	public CookieJar CookieJar { get; }
+	public CookieJar Jar { get; }
+
 
 	protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, SearchQuery query,
 	                                                          CancellationToken token = default)
@@ -122,7 +124,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 
 
 				foreach (FlareSolverrCookie cookie in cookies) {
-					CookieJar.AddOrReplace(new FlurlCookie(cookie.Name, cookie.Value, fsr.Solution.Url) { });
+					Jar.AddOrReplace(new FlurlCookie(cookie.Name, cookie.Value, fsr.Solution.Url) { });
 				}
 
 				var res = await Client.Request(newUrl)
@@ -131,7 +133,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 						          x.HttpVersion = "2.0";
 					          })
 					          .AllowAnyHttpStatus()
-					          .WithCookies(CookieJar)
+					          .WithCookies(Jar)
 					          .WithTimeout(Timeout)
 					          /*.OnError(s =>
 							          {
@@ -260,12 +262,12 @@ protected override ValueTask<SearchResultItem> ParseResultItem(INode nx, SearchR
 		return ValueTask.FromResult(sri);
 	}
 
-	public async ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, CancellationToken ct = default)
+	public async ValueTask<bool> ApplyCookiesAsync(ICookiesProvider provider, CancellationToken ct)
 	{
-		var ck = provider.Jar.Where(x => x.Domain.Contains("ascii2d"));
-
+		var ck = Jar.Where(static x => x.Domain.Contains("ascii2d"));
+		
 		foreach (var c in ck) {
-			CookieJar.AddOrReplace(c);
+			Jar.AddOrReplace(c);
 		}
 
 		return true;

SmartImage.Lib/Engines/Impl/Search/EHentaiEngine.cs

@@ -10,6 +10,7 @@
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
 using AngleSharp.XPath;
+using CliWrap;
 using Flurl.Http;
 using Flurl.Http.Content;
 using Kantan.Net;
@@ -26,7 +27,7 @@ namespace SmartImage.Lib.Engines.Impl.Search;
 ///     <see cref="SearchEngineOptions.EHentai" />
 /// </summary>
 /// <remarks>Handles both ExHentai and E-Hentai</remarks>
-public sealed class EHentaiEngine : WebSearchEngine, IConfigurable, ICookieReceiver, INotifyPropertyChanged
+public sealed class EHentaiEngine : WebSearchEngine, ISearchConfigReceiver, ICookiesReceiver, INotifyPropertyChanged
 {
 
 	private const string HOST_EH = ".e-hentai.org";
@@ -75,10 +76,12 @@ static EHentaiEngine() { }
 
 	public EHentaiEngine(bool useExHentai = true) : base(EHentaiBase)
 	{
-		m_client    = new HttpClient(m_clientHandler);
-		IsLoggedIn  = false;
+		m_client   = new HttpClient(m_clientHandler);
+		IsLoggedIn = false;
+
 		m_cookies   = new();
 		UseExHentai = useExHentai;
+		Jar         = new CookieJar() { };
 	}
 
 	/*
@@ -91,10 +94,10 @@ public EHentaiEngine(bool useExHentai = true) : base(EHentaiBase)
 	 * https://gitlab.com/NekoInverter/EhViewer/-/blob/master/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.java
 	 */
 
-	public async ValueTask ApplyAsync(SearchConfig cfg)
+	public async ValueTask ApplyConfigAsync(SearchConfig cfg)
 	{
 		/*if (this is { IsLoggedIn: true }/* && !(Username != cfg.EhUsername && Password != cfg.EhPassword)#1#) {
-			Debug.WriteLine($"{Name} is already logged in", nameof(ApplyAsync));
+			Debug.WriteLine($"{Name} is already logged in", nameof(ApplyConfigAsync));
 
 			return;
 		}*/
@@ -108,7 +111,10 @@ public async ValueTask ApplyAsync(SearchConfig cfg)
 	 */
 
 
-	public async ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, CancellationToken ct = default)
+	public CookieJar Jar { get; }
+
+
+	public async ValueTask<bool> ApplyCookiesAsync(ICookiesProvider provider, CancellationToken ct = default)
 	{
 		Trace.WriteLine($"Applying cookies to {Name}");
 
@@ -119,11 +125,10 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, Cancell
 			return false;
 		}*/
 
-		var ok      = await provider.LoadCookiesAsync(Browser.Firefox, ct);
-		var cookies = provider.Jar;
+		var cookies = await provider.LoadCookiesAsync(ct);
 
-		var fcc = cookies.Where(x =>
-		{
+		foreach (var cookie in cookies) {
+			var  x = cookie.AsCookie();
 			bool a = false;
 
 			if (UseExHentai) {
@@ -136,14 +141,13 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, Cancell
 			// return b;
 			a |= b;
 
-			return a;
-		});
-
-		foreach (var cookie in fcc) {
-			m_cookies.Add(
-				new Cookie(cookie.Name, cookie.Value, cookie.Path, cookie.Domain) { });
+			if (a) {
+				// m_cookies.Add(new Cookie(x.Name, x.Value, x.Path, x.Domain) { });
+				Jar.AddOrReplace(new FlurlCookie(x.Name,x.Value, UseExHentai ? ExHentaiBase : EHentaiBase));
+			}
 		}
 
+
 		var res2 = await GetSessionAsync();
 
 		/*var res2 = await EHentaiBase.WithCookies(m_clientHandler.CookieContainer)
@@ -154,8 +158,11 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, Cancell
 			.WithAutoRedirect(true)
 			.GetAsync();*/
 
+		/*
 		m_clientHandler.CookieContainer.Add(m_cookies);
 		m_client.Timeout = Timeout;
+		*/
+
 
 		return IsLoggedIn = res2.ResponseMessage.IsSuccessStatusCode;
 
@@ -164,7 +171,8 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookieProvider provider, Cancell
 	private Task<IFlurlResponse> GetSessionAsync()
 	{
 		return (UseExHentai ? ExHentaiBase : EHentaiBase)
-			.WithCookies(m_cookies)
+			// .WithCookies(m_cookies)
+			.WithCookies(Jar)
 			.WithTimeout(Timeout)
 			.WithHeaders(new
 			{
@@ -227,17 +235,19 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 
 		Debug.WriteLine($"{LookupUrl}", nameof(GetDocumentAsync));
 
-		var req = new HttpRequestMessage(HttpMethod.Post, LookupUrl)
+		var req2 = new FlurlRequest(LookupUrl)
 		{
+			CookieJar = Jar,
+			Verb    = HttpMethod.Post,
 			Content = data,
 			Headers =
 			{
 				{ "User-Agent", HttpUtilities.UserAgent }
-			},
-
+			}
 		};
 
-		var res = await m_client.SendAsync(req, token);
+		var res1 = await Client.SendAsync(req2, cancellationToken: token);
+		var res  = res1.ResponseMessage;
 
 		// Debug.WriteLine($"{res.StatusCode}");
 
@@ -300,9 +310,9 @@ protected override ValueTask<SearchResultItem> ParseResultItem(INode n, SearchRe
 
 	public override void Dispose()
 	{
-		m_client.Dispose();
-		m_clientHandler.Dispose();
-		m_cookies.Clear();
+		// m_client.Dispose();
+		// m_clientHandler.Dispose();
+		Jar.Clear();
 
 		IsLoggedIn = false;
 	}

SmartImage.Lib/Engines/Impl/Search/SauceNaoEngine.cs

@@ -31,7 +31,7 @@
 
 namespace SmartImage.Lib.Engines.Impl.Search;
 
-public sealed class SauceNaoEngine : BaseSearchEngine, IConfigurable, IDisposable
+public sealed class SauceNaoEngine : BaseSearchEngine, ISearchConfigReceiver, IDisposable
 {
 
 	private const string URL_BASE = "https://saucenao.com/";
@@ -472,7 +472,7 @@ private async ValueTask GetAPIResultsAsync(SearchQuery url, SearchResult sr)
 		return;
 	}
 
-	public ValueTask ApplyAsync(SearchConfig cfg)
+	public ValueTask ApplyConfigAsync(SearchConfig cfg)
 	{
 		Authentication = cfg.SauceNaoKey;
 		return ValueTask.CompletedTask;

SmartImage.Lib/Images/ImageScanner.cs

@@ -62,7 +62,6 @@ static ImageScanner()
 
 		Cookies = new CookieJar();
 
-		
 
 	}
 
@@ -73,7 +72,7 @@ static ImageScanner()
 
 
 	/*
-	 * TODO: ImageScanner, SmartCookiesProvider, and FlareSolverrr
+	 * TODO: ImageScanner, AutoCookiesProvider, and FlareSolverrr
 	 */
 
 	/*public static IFlurlRequest BuildRequest(params object[] urlSeg)
@@ -322,33 +321,6 @@ public UniSimilarity(UniImage image, double similarity)
 
 	}
 
-	public static HttpMessageHandler GetMostInnerHandler(this HttpMessageHandler self)
-	{
-		return self is DelegatingHandler handler
-			       ? handler.InnerHandler.GetMostInnerHandler()
-			       : self;
-	}
-
-	public static IFlurlRequest AddChromeImpersonation(this IFlurlRequest req)
-	{
-		return req.WithHeaders(new
-		{
-			sec_ch_ua = "\"Chromium\";v=\"104\", \" Not A;Brand\";v=\"99\", \"Google Chrome\";v=\"104\"",
-			sec_ch_ua_mobile = "?0",
-			sec_ch_ua_platform = "Windows",
-			Upgrade_Insecure_Requests = "1",
-			User_Agent =
-				"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36",
-			Accept =
-				"text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
-			Sec_Fetch_Site  = "none",
-			Sec_Fetch_Mode  = "navigate",
-			Sec_Fetch_User  = "?1",
-			Sec_Fetch_Dest  = "document",
-			Accept_Encoding = "gzip, deflate, br",
-			Accept_Language = "en-US,en;q=0.9"
-		});
-	}
 
 	public static async Task<List<UniSimilarity>> Analyze(List<Task<UniImage>> tasks, SearchQuery query,
 	                                                      CancellationToken ct = default)