Work on FlareSolverr; TinEye; etc

Author: Decimation

SmartImage.Lib/Clients/FlareSolverr.cs renamed to SmartImage.Lib/Clients/FlareSolverrClient.cs

@@ -1,10 +1,124 @@
 // Root myDeserializedClass = JsonSerializer.Deserialize<Root>(myJsonResponse);
 
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Flurl.Http;
+using Flurl.Http.Configuration;
 
 namespace SmartImage.Lib.Clients;
 
+public class FlareSolverrClient : IDisposable
+{
+
+	public const string CMD_REQUEST_GET  = "request.get";
+	public const string CMD_REQUEST_POST = "request.post";
+
+	public const int DEFAULT_MAX_TIMEOUT = 60000;
+
+	private static readonly JsonSerializerOptions s_jsonSerializerOptions = new(JsonSerializerOptions.Default)
+	{
+		DefaultIgnoreCondition =
+			JsonIgnoreCondition.WhenWritingDefault
+	};
+
+	private static readonly DefaultJsonSerializer s_settingsJsonSerializer = new(s_jsonSerializerOptions)
+		{ };
+
+	// TODO: FlareSolverrSharp doesn't work 10/8/24
+
+	public FlurlClient Client { get; }
+
+	public string BaseUrl { get; }
+
+	public FlareSolverrClient(string baseUrl)
+	{
+		BaseUrl = baseUrl;
+
+		Client = (FlurlClient) FlurlHttp.Clients.GetOrAdd(nameof(FlareSolverrClient), BaseUrl, builder =>
+		{
+			builder.AllowAnyHttpStatus();
+
+			builder.Settings.JsonSerializer = s_settingsJsonSerializer;
+		});
+
+	}
+
+	public async ValueTask<bool> IsConnectedAsync(int maxTimeout = DEFAULT_MAX_TIMEOUT)
+	{
+		try {
+			using var res = await SendAsync("https://nowsecure.nl/", CMD_REQUEST_GET, maxTimeout);
+
+			if (res == null) {
+				return false;
+			}
+
+			var obj = await res.GetJsonAsync<FlareSolverrRoot>();
+			return obj.Status == "ok";
+		}
+		catch {
+			return false;
+		}
+		finally { }
+
+
+	}
+
+	public static readonly FlareSolverrClient Instance = new("http://localhost:8191/v1");
+
+	public Task<IFlurlResponse> SendAsync(FlareSolverrRequest request)
+	{
+		var resp = Client.Request()
+			.PostJsonAsync(request);
+
+		return resp;
+	}
+
+	public Task<IFlurlResponse> SendAsync(string url, string cmd, int maxTimeout = DEFAULT_MAX_TIMEOUT)
+	{
+
+		return SendAsync(new FlareSolverrRequest() { Url = url, Command = cmd, MaxTimeout = maxTimeout });
+
+	}
+
+	public void Dispose()
+	{
+		Client?.Dispose();
+	}
+
+}
+
+#region API Objects
+
+public record FlareSolverrRequest
+{
+
+	// todo
+
+	[JsonPropertyName("cmd")]
+	public string Command { get; set; }
+
+	public List<FlareSolverrCookie> Cookies { get; set; }
+
+	public int MaxTimeout { get; set; }
+
+	public Dictionary<string, object> Proxy { get; set; } //todo
+
+	public string Session { get; set; }
+
+	[JsonPropertyName("session_ttl_minutes")]
+	public int SessionTtl { get; set; }
+
+	public string Url { get; set; }
+
+	public string PostData { get; set; }
+
+	public bool ReturnOnlyCookies { get; set; }
+
+
+	public FlareSolverrRequest() { }
+
+}
+
 public class FlareSolverrCookie
 {
 
@@ -130,43 +244,4 @@ public class FlareSolverrSolution
 
 }
 
-public class FlareSolverrClient : IDisposable
-{
-
-	// TODO: FlareSolverrSharp doesn't work 10/8/24
-
-	public FlurlClient Client { get; }
-
-	public string BaseUrl { get; }
-
-	public FlareSolverrClient(string baseUrl)
-	{
-		BaseUrl    = baseUrl;
-		Client = new FlurlClient(BaseUrl);
-	}
-
-	public static readonly FlareSolverrClient Instance = new("http://localhost:8191/v1");
-
-	public Task<IFlurlResponse> Get(string url, string cmd, int maxTimeout = 60000)
-	{
-		var body = new
-		{
-			cmd        = cmd,
-			url        = url,
-			maxTimeout = maxTimeout
-		};
-
-		var resp = Client.Request()
-			.WithHeader("Accept","text/html; charset=utf-8")
-			.PostJsonAsync(body);
-
-		return resp;
-
-	}
-
-	public void Dispose()
-	{
-		Client?.Dispose();
-	}
-
-}
+#endregion

SmartImage.Lib/Clients/HydrusClient.cs

@@ -201,6 +201,8 @@ public static string HyEncode(object o)
 
 }
 
+#region API Objects
+
 public sealed class HydrusQuery
 {
 
@@ -316,4 +318,6 @@ public static Dictionary<string, HydrusFileRelationship> Deserialize(JsonValue v
 		return re;
 	}
 
-}
+}
+
+#endregion

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -10,6 +10,7 @@
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
 using Flurl.Http;
+using Flurl.Http.Configuration;
 using Kantan.Diagnostics;
 using Kantan.Net.Utilities;
 using Kantan.Net.Web;
@@ -94,6 +95,8 @@ static BaseSearchEngine()
 		Client = (FlurlClient) FlurlHttp.Clients.GetOrAdd(nameof(BaseSearchEngine), null, builder =>
 		{
 			builder.Headers.AddOrReplace("User-Agent", HttpUtilities.UserAgent);
+			
+			// builder.Settings.JsonSerializer = new DefaultJsonSerializer();
 
 			builder.Settings.AllowedHttpStatusRange = "*";
 			builder.OnError(f=>

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

@@ -88,7 +88,8 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 
 			var origin = sr.RawUrl;
 
-			var res = await FlareSolverrClient.Instance.Get(origin, "request.get", Timeout.Milliseconds);
+			var res = await FlareSolverrClient.Instance.SendAsync(origin, 
+			                                                     FlareSolverrClient.CMD_REQUEST_GET, Timeout.Milliseconds);
 
 			string str;