Bonodere integration (#514)

ElectronicObserver.KancolleApi.Types/ApiReqRanking/Models/ApiList.cs

@@ -21,5 +21,5 @@ public class ApiList
 	public int ApiItslcqtmrxtf { get; set; }
 
 	[JsonPropertyName("api_wuhnhojjxmke")]
-	public long ApiWuhnhojjxmke { get; set; }
+	public decimal ApiWuhnhojjxmke { get; set; }
 }

ElectronicObserver/App.xaml.cs

@@ -13,6 +13,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using ElectronicObserver.Common;
 using ElectronicObserver.Data;
+using ElectronicObserver.Data.Bonodere;
 using ElectronicObserver.Database;
 using ElectronicObserver.Database.DataMigration;
 using ElectronicObserver.Dialogs;
@@ -72,6 +73,7 @@
 using ElectronicObserver.Window.Wpf;
 using ElectronicObserver.Window.Wpf.EquipmentUpgradePlanViewer;
 using ElectronicObserver.Window.Wpf.ExpeditionCheck;
+using ElectronicObserver.Window.Wpf.SenkaLeaderboard;
 using ElectronicObserver.Window.Wpf.ShipTrainingPlanner;
 using ElectronicObserverTypes.Data;
 using Jot;
@@ -308,6 +310,8 @@ private void ConfigureServices()
 			.AddSingleton<AlbumMasterEquipmentUpgradeTranslationViewModel>()
 			.AddSingleton<SortieDetailTranslationViewModel>()
 			.AddSingleton<ElectronicObserverApiTranslationViewModel>()
+			.AddSingleton<BonodereSubmissionTranslationViewModel>()
+			.AddSingleton<SenkaLeaderboardTranslationViewModel>()
 			// tools
 			.AddSingleton<ShipPickerViewModel>()
 			.AddSingleton<AutoRefreshViewModel>()
@@ -326,6 +330,8 @@ private void ConfigureServices()
 			.AddSingleton<ColorService>()
 			.AddSingleton<ElectronicObserverApiService>()
 			.AddSingleton<SortieRecordMigrationService>()
+			.AddSingleton<SenkaLeaderboardManager>()
+			.AddSingleton<BonodereSubmissionService>()
 			// issue reporter
 			.AddSingleton<DataAndTranslationIssueReporter>()
 			.AddSingleton<FitBonusIssueReporter>()
@@ -471,6 +477,12 @@ private static Tracker JotTracker()
 			.Property(w => w.ViewModel.DataGridViewModel.ColumnProperties)
 			.Property(w => w.ViewModel.DataGridViewModel.SortDescriptions);
 
+		tracker
+			.Configure<SenkaLeaderboardManager>()
+			.Property(w => w.CurrentCutoffData.DataGridViewModel.ColumnProperties)
+			.Property(w => w.CurrentCutoffData.DataGridViewModel.SortDescriptions)
+			.Property(w => w.CurrentCutoffData.PagingViewModel.ItemsPerPage);
+
 		return tracker;
 	}
 }

ElectronicObserver/Data/Bonodere/BonodereError.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace ElectronicObserver.Data.Bonodere;
+
+public class BonodereError
+{
+	[JsonPropertyName("message")]
+	public string Message { get; set; } = "";
+
+	[JsonPropertyName("code")]
+	public int Code { get; set; }
+}

ElectronicObserver/Data/Bonodere/BonodereHttpClient.cs

@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Threading.Tasks;
+using ElectronicObserver.Utility;
+using ElectronicObserver.Window.Wpf.SenkaLeaderboard;
+
+namespace ElectronicObserver.Data.Bonodere;
+
+public class BonodereHttpClient(BonodereSubmissionTranslationViewModel translations)
+{
+	private HttpClient? CurrentClient { get; set; }
+
+	public bool IsReady => CurrentClient is not null;
+
+	private BonodereSubmissionTranslationViewModel Translations { get; } = translations;
+
+	private static HttpClient MakeHttpClient() => new()
+	{
+		BaseAddress = new("https://bonodere.famluro.es/api/"),
+		DefaultRequestHeaders =
+		{
+			UserAgent =
+			{
+#if DEBUG
+				new ProductInfoHeaderValue($"ElectronicObserverEN-DEBUG", SoftwareInformation.VersionEnglish),
+#else
+				new ProductInfoHeaderValue($"ElectronicObserverEN", SoftwareInformation.VersionEnglish),
+#endif
+			},
+		},
+	};
+
+	public async Task<BonodereLoginResponse?> Login(string login, SecureString password)
+	{
+		CurrentClient = MakeHttpClient();
+
+		HttpResponseMessage response = await CurrentClient.PostAsJsonAsync("auth/login", new BonodereLoginRequest
+		{
+			Key = login,
+			Password = SecureStringToString(password),
+			Duration = 1500000000,
+		});
+
+		response.EnsureSuccessStatusCode();
+
+		BonodereLoginResponse? responseParsed = await response.Content.ReadFromJsonAsync<BonodereLoginResponse>();
+
+		if (responseParsed is null)
+		{
+			CurrentClient.Dispose();
+			CurrentClient = null;
+			return null;
+		}
+
+		CurrentClient = MakeHttpClient();
+		CurrentClient.DefaultRequestHeaders.Add("x-access-token", responseParsed.Token);
+
+		return responseParsed;
+	}
+
+	public async Task<BonodereUserDataResponse?> LoginFromToken(string token, string userId)
+	{
+		CurrentClient?.Dispose();
+		CurrentClient = null;
+
+		CurrentClient = MakeHttpClient();
+		CurrentClient.DefaultRequestHeaders.Add("x-access-token", token);
+
+		HttpResponseMessage response = await CurrentClient.GetAsync($"user/data/{userId}");
+
+		if (!response.IsSuccessStatusCode)
+		{
+			await HandleErrorResponse(response);
+			return null;
+		}
+
+		BonodereUserDataResponse? responseParsed = await response.Content.ReadFromJsonAsync<BonodereUserDataResponse>();
+
+		if (responseParsed is null)
+		{
+			CurrentClient.Dispose();
+			CurrentClient = null;
+			return null;
+		}
+
+		return responseParsed;
+	}
+
+	public async Task Logout()
+	{
+		if (CurrentClient is null) return;
+
+		HttpResponseMessage response = await CurrentClient.PostAsJsonAsync("auth/logout", new object());
+
+		if (!response.IsSuccessStatusCode)
+		{
+			await HandleErrorResponse(response);
+		}
+
+		CurrentClient.Dispose();
+		CurrentClient = null;
+	}
+
+	public async Task SubmitData(List<SenkaEntryModel> data)
+	{
+		if (CurrentClient is null) return;
+
+		HttpResponseMessage response = await CurrentClient.PostAsJsonAsync("senka/submit", new BonodereSubmissionRequest()
+		{
+			Data = data,
+		});
+
+		if (!response.IsSuccessStatusCode)
+		{
+			await HandleErrorResponse(response);
+		}
+		else
+		{
+			Logger.Add(2, Translations.Success);
+		}
+	}
+
+	private async Task HandleErrorResponse(HttpResponseMessage response)
+	{
+		BonodereError? errorData = await response.Content.ReadFromJsonAsync<BonodereError>();
+
+		if (errorData is not null && !string.IsNullOrEmpty(errorData.Message))
+		{
+			Logger.Add(2, errorData switch
+			{
+				{ Code: >0 } => $"{Translations.Error} : {errorData.Message} ({errorData.Code})",
+				 _ => $"{Translations.Error} : {errorData.Message}",
+			});
+		}
+		else
+		{
+			response.EnsureSuccessStatusCode();
+		}
+	}
+
+	private string SecureStringToString(SecureString value)
+	{
+		IntPtr valuePtr = IntPtr.Zero;
+
+		try
+		{
+			valuePtr = Marshal.SecureStringToGlobalAllocUnicode(value);
+			return Marshal.PtrToStringUni(valuePtr) ?? "";
+		}
+		finally
+		{
+			Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
+		}
+	}
+}

ElectronicObserver/Data/Bonodere/BonodereLoginRequest.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace ElectronicObserver.Data.Bonodere;
+
+public class BonodereLoginRequest
+{
+	[JsonPropertyName("key")]
+	public required string Key { get; set; }
+
+	[JsonPropertyName("password")]
+	public required string Password { get; set; }
+
+	[JsonPropertyName("duration")]
+	public required int Duration { get; set; }
+}

ElectronicObserver/Data/Bonodere/BonodereLoginResponse.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace ElectronicObserver.Data.Bonodere;
+
+public class BonodereLoginResponse
+{
+	[JsonPropertyName("token")]
+	public required string Token { get; set; }
+
+	[JsonPropertyName("user")] 
+	public required BonodereUser User { get; set; }
+}

ElectronicObserver/Data/Bonodere/BonodereSubmissionRequest.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using ElectronicObserver.Window.Wpf.SenkaLeaderboard;
+
+namespace ElectronicObserver.Data.Bonodere;
+
+public class BonodereSubmissionRequest
+{
+	[JsonPropertyName("data")]
+	public required List<SenkaEntryModel> Data { get; set; }
+}

ElectronicObserver/Data/Bonodere/BonodereSubmissionResources.en.resx

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="BonodereError" xml:space="preserve">
+    <value>Bonodere error</value>
+  </data>
+  <data name="BonodereSubmissionSuccess" xml:space="preserve">
+    <value>Bonodere submission : Success</value>
+  </data>
+  <data name="InconsistantDataDetected" xml:space="preserve">
+    <value>Inconsistant data detected</value>
+  </data>
+</root>