Merge pull request #24 from seionmoya/basic-persistance

Basic persistance
project-fika · Sep 2, 2024 · 564f299 · 564f299
2 parents feb4b73 + 92c8aaa
commit 564f299
Show file tree

Hide file tree

Showing 42 changed files with 899 additions and 212 deletions.
diff --git a/Fuyu.Launcher/Fuyu.Launcher.csproj b/Fuyu.Launcher/Fuyu.Launcher.csproj
@@ -21,6 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="../Fuyu.Platform.Common/Fuyu.Platform.Common.csproj" />
     <ProjectReference Include="../Fuyu.Platform.Launcher/Fuyu.Platform.Launcher.csproj" />
   </ItemGroup>
 

diff --git a/Fuyu.Launcher/Layout/MainLayout.razor b/Fuyu.Launcher/Layout/MainLayout.razor
@@ -7,9 +7,9 @@
 
 <FluentDesignTheme Mode="DesignThemeModes.Dark"></FluentDesignTheme>
 
-<FluentStack Orientation="Orientation.Horizontal" Width="100%">
-	<FluentNavMenu Width="250" Collapsible="false" Class="height-100vh nav-bg">
-		<FluentNavLink Href="/account">Account</FluentNavLink>
+<FluentStack Orientation="Orientation.Horizontal" Width="100%" Class="height-100vh">
+	<FluentNavMenu Width="200" Collapsible="false">
+		<FluentNavLink Href="/login">Login</FluentNavLink>
 		<FluentNavLink Href="/settings">Settings</FluentNavLink>
 	</FluentNavMenu>
 

diff --git a/Fuyu.Launcher/Pages/Account.razor b/Fuyu.Launcher/Pages/Account.razor
@@ -1,30 +1,31 @@
-@using Fuyu.Launcher.Services;
+@using Fuyu.Platform.Common.Models.Fuyu.Accounts
+@using Fuyu.Platform.Launcher.Services
 
-@page "/"
 @page "/account"
 
 <FluentStack Orientation="Orientation.Vertical">
 
-    <FluentButton Appearance="Appearance.Accent" IconStart="@(new Icons.Regular.Size24.Play())" OnClick="StartServer">Start Server</FluentButton>
-    <FluentButton Appearance="Appearance.Accent" IconStart="@(new Icons.Regular.Size24.Play())" OnClick="StartEft">Start Game</FluentButton>
+    <FluentButton Appearance="Appearance.Accent" IconStart="@(new Icons.Regular.Size24.Play())" OnClick="StartEft_Clicked">Start EFT</FluentButton>
+    <FluentButton Appearance="Appearance.Accent" IconStart="@(new Icons.Regular.Size24.Play())" OnClick="StartArena_Clicked">Start Arena</FluentButton>
 
 </FluentStack>
 
 @code
 {
-    private void StartServer()
+    [SupplyParameterFromQuery(Name = "sessionid")]
+    private string sessionId { get; set; }
+
+    private void StartEft_Clicked()
     {
-        using (var process = ProcessService.StartServer(SettingsService.ServerDirectory))
+        using (var process = ProcessService.StartEft(SettingsService.EftDirectory, sessionId, SettingsService.EftAddress))
         {
             process.Start();
         }
     }
 
-    private void StartEft()
+    private void StartArena_Clicked()
     {
-        var sessionId = "test";
-
-        using (var process = ProcessService.StartEft(SettingsService.ClientDirectory, sessionId, SettingsService.Address))
+        using (var process = ProcessService.StartArena(SettingsService.ArenaDirectory, sessionId, SettingsService.ArenaAddress))
         {
             process.Start();
         }

diff --git a/Fuyu.Launcher/Pages/Login.razor b/Fuyu.Launcher/Pages/Login.razor
@@ -0,0 +1,45 @@
+@using Fuyu.Platform.Launcher.Services;
+
+@inject NavigationManager Navigation
+
+@page "/"
+@page "/login"
+
+<FluentStack Orientation="Orientation.Vertical">
+
+    <!-- server settings -->
+    <FluentAccordionItem Heading="Login" Expanded=true Style="width: 100%;">
+	    <FluentLabel>Username:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Text" @bind-Value="username" Style="width: 100%;"></FluentTextField>
+        <FluentLabel>Password:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Password" @bind-Value="password" Style="width: 100%;"></FluentTextField>
+        <br />
+        <br />
+        <FluentButton Appearance="Appearance.Accent" OnClick="Login_Clicked">Login</FluentButton>
+        <a href="/register"><FluentLabel>Register</FluentLabel></a>
+    </FluentAccordionItem>
+
+</FluentStack>
+
+@code
+{
+    string username = string.Empty;
+    string password = string.Empty;
+
+    private void Login_Clicked(EventArgs e)
+    {
+        var hashedPassword = HashService.GetSHA256(password);
+        var sessionId = RequestService.LoginAccount(username, hashedPassword);
+
+        if (sessionId == string.Empty)
+        {
+            // TODO:
+            // * show error
+            // -- seionmoya, 2024/09/02
+        }
+        else
+        {
+            Navigation.NavigateTo($"/account?sessionid={sessionId}");
+        }
+    }
+}
diff --git a/Fuyu.Launcher/Pages/Register.razor b/Fuyu.Launcher/Pages/Register.razor
@@ -0,0 +1,50 @@
+@using Fuyu.Platform.Common.Models.Fuyu.Accounts
+@using Fuyu.Platform.Launcher.Services;
+
+@inject NavigationManager Navigation
+
+@page "/register"
+
+<FluentStack Orientation="Orientation.Vertical">
+
+    <!-- server settings -->
+    <FluentAccordionItem Heading="Register" Expanded=true Style="width: 100%;">
+	    <FluentLabel>Username:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Text" @bind-Value="username" Style="width: 100%;"></FluentTextField>
+        <FluentLabel>Password:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Text" @bind-Value="password" Style="width: 100%;"></FluentTextField>
+        <FluentLabel>Edition:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Text" @bind-Value="edition" Style="width: 100%;"></FluentTextField>
+        <br />
+        <br />
+        <FluentButton Appearance="Appearance.Accent" OnClick="Register_Clicked">Register</FluentButton>
+        <a href="/login"><FluentLabel>Login</FluentLabel></a>
+    </FluentAccordionItem>
+
+</FluentStack>
+
+@code
+{
+    string username = string.Empty;
+    string password = string.Empty;
+    string edition = "unheard";
+
+    private void Register_Clicked(EventArgs e)
+    {
+        var hashedPassword = HashService.GetSHA256(password);
+        var registerStatus = RequestService.RegisterAccount(username, hashedPassword, edition);
+
+        switch (registerStatus)
+        {
+            case ERegisterStatus.Success:
+                Navigation.NavigateTo("/login");
+                break;
+
+            case ERegisterStatus.AlreadyExists:
+                // TODO:
+                // * show error
+                // -- seionmoya, 2024/09/02
+                break;
+        }
+    }
+}
diff --git a/Fuyu.Launcher/Pages/Settings.razor b/Fuyu.Launcher/Pages/Settings.razor
@@ -1,43 +1,63 @@
-@using Fuyu.Launcher.Services;
+@using Fuyu.Platform.Launcher.Services;
 
 @page "/settings"
 
 <FluentStack Orientation="Orientation.Vertical">
 
-    <!-- server settings -->
-    <FluentAccordionItem Heading="Server" Style="width: 100%;">
-	    <FluentLabel>Path to installation:</FluentLabel>
-        <FluentTextField TextFieldType="TextFieldType.Text" @oninput="ServerDirectory_TextChanged" @bind-Value="serverDirectory" Style="width: 100%;"></FluentTextField>
+    <!-- fuyu -->
+    <FluentAccordionItem Heading="Fuyu" Style="width: 100%;">
+	    <FluentLabel>Server address:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Url" @oninput="FuyuAddress_TextChanged" @bind-Value="fuyuAddress" Style="width: 100%;"></FluentTextField>
     </FluentAccordionItem>
 
-    <!-- client settings -->
-    <FluentAccordionItem Heading="Client" Style="width: 100%;">
-        <FluentLabel>Path to installation:</FluentLabel>
-        <FluentTextField TextFieldType="TextFieldType.Text" @oninput="ClientDirectory_TextChanged" @bind-Value="clientDirectory" Style="width: 100%;"></FluentTextField>
+    <!-- eft -->
+    <FluentAccordionItem Heading="Escape From Tarkov" Style="width: 100%;">
         <FluentLabel>Server address:</FluentLabel>
-        <FluentTextField TextFieldType="TextFieldType.Url" @oninput="Address_TextChanged" @bind-Value="address" Style="width: 100%;"></FluentTextField>
+        <FluentTextField TextFieldType="TextFieldType.Url" @oninput="EftAddress_TextChanged" @bind-Value="eftAddress" Style="width: 100%;"></FluentTextField>
+        <FluentLabel>Client location:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Text" @oninput="EftDirectory_TextChanged" @bind-Value="eftDirectory" Style="width: 100%;"></FluentTextField>
+    </FluentAccordionItem>
+
+    <!-- arena -->
+    <FluentAccordionItem Heading="Escape From Tarkov: Arena" Style="width: 100%;">
+        <FluentLabel>Server address:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Url" @oninput="ArenaAddress_TextChanged" @bind-Value="arenaAddress" Style="width: 100%;"></FluentTextField>
+        <FluentLabel>Client location:</FluentLabel>
+        <FluentTextField TextFieldType="TextFieldType.Text" @oninput="ArenaDirectory_TextChanged" @bind-Value="arenaDirectory" Style="width: 100%;"></FluentTextField>
     </FluentAccordionItem>
 
 </FluentStack>
 
 @code
 {
-    string serverDirectory = SettingsService.ServerDirectory;
-    string clientDirectory = SettingsService.ClientDirectory;
-    string address = SettingsService.Address;
+    string fuyuAddress = SettingsService.FuyuAddress;
+    string eftAddress = SettingsService.EftAddress;
+    string arenaAddress = SettingsService.ArenaAddress;
+    string eftDirectory = SettingsService.EftDirectory;
+    string arenaDirectory = SettingsService.EftDirectory;
+
+    private void FuyuAddress_TextChanged(ChangeEventArgs e)
+    {
+        SettingsService.FuyuAddress = (string)e.Value;
+    }
+
+    private void EftAddress_TextChanged(ChangeEventArgs e)
+    {
+        SettingsService.EftAddress = (string)e.Value;
+    }
 
-    private void ServerDirectory_TextChanged(ChangeEventArgs e)
+    private void ArenaAddress_TextChanged(ChangeEventArgs e)
     {
-        SettingsService.ServerDirectory = (string)e.Value;
+        SettingsService.ArenaAddress = (string)e.Value;
     }
 
-    private void ClientDirectory_TextChanged(ChangeEventArgs e)
+    private void EftDirectory_TextChanged(ChangeEventArgs e)
     {
-        SettingsService.ClientDirectory = (string)e.Value;
+        SettingsService.EftDirectory = (string)e.Value;
     }
 
-    private void Address_TextChanged(ChangeEventArgs e)
+    private void ArenaDirectory_TextChanged(ChangeEventArgs e)
     {
-        SettingsService.Address = (string)e.Value;
+        SettingsService.ArenaDirectory = (string)e.Value;
     }
 }
diff --git a/Fuyu.Launcher/Services/SettingsService.cs b/Fuyu.Launcher/Services/SettingsService.cs
diff --git a/Fuyu.Platform.Common/IO/VFS.cs b/Fuyu.Platform.Common/IO/VFS.cs
@@ -1,19 +1,66 @@
+using System;
 using System.IO;
 
 namespace Fuyu.Platform.Common.IO
 {
     public class VFS
     {
-        public static bool Exists(string filepath)
+        public static bool DirectoryExists(string filepath)
         {
-            return File.Exists(filepath) || Directory.Exists(filepath);
+            return Directory.Exists(filepath);
+        }
+
+        public static bool FileExists(string filepath)
+        {
+            return File.Exists(filepath);
+        }
+
+        public static string[] GetFiles(string path)
+        {
+            if (!Directory.Exists(path))
+            {
+                throw new DirectoryNotFoundException($"Directory {path} doesn't exist.");
+            }
+
+            return Directory.GetFiles(path);
+        }
+
+        public static void CreateDirectory(string path)
+        {
+            Directory.CreateDirectory(path);
+        }
+
+        public static string ReadTextFile(string filepath)
+        {
+            var path = Path.GetDirectoryName(filepath);
+
+            if (!DirectoryExists(path))
+            {
+                throw new DirectoryNotFoundException($"Directory {path} doesn't exist.");
+            }
+
+            if (!File.Exists(filepath))
+            {
+                throw new FileNotFoundException($"File {filepath} doesn't exist.");
+            }
+
+            using (var fs = new FileStream(filepath, FileMode.Open, FileAccess.Read, FileShare.None)) 
+            {
+                using (var sr = new StreamReader(fs))
+                {
+                    var text = sr.ReadToEnd();
+                    return text;
+                }
+            }
         }
 
         public static void WriteTextFile(string filepath, string text)
         {
-            if (!Exists(filepath))
+            var path = Path.GetDirectoryName(filepath);
+
+            if (!DirectoryExists(path))
             {
-                Directory.CreateDirectory(Path.GetDirectoryName(filepath));
+                CreateDirectory(path);
             }
 
             using (var fs = new FileStream(filepath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None)) 

diff --git a/Fuyu.Platform.Common/Models/EFT/Common/MongoId.cs b/Fuyu.Platform.Common/Models/EFT/Common/MongoId.cs
@@ -36,7 +36,7 @@ public MongoId([JsonProperty("$value")] string id)
 		{
 			if (id == null || id.Length != 24)
 			{
-				throw new ArgumentOutOfRangeException("Critical MongoId error: incorrect length. Id: " + id);
+				throw new ArgumentOutOfRangeException($"Critical MongoId error: incorrect length. Id: {id}");
 			}
 
             _timeStamp = GetTimestamp(id);

diff --git a/Fuyu.Platform.Common/Models/Fuyu/Account.cs → ...rm.Common/Models/Fuyu/Accounts/Account.cs b/Fuyu.Platform.Common/Models/Fuyu/Account.cs → ...rm.Common/Models/Fuyu/Accounts/Account.cs
@@ -1,11 +1,13 @@
 using System.Runtime.Serialization;
-using Fuyu.Platform.Common.Models.Fuyu.Savegame;
 
-namespace Fuyu.Platform.Common.Models.Fuyu
+namespace Fuyu.Platform.Common.Models.Fuyu.Accounts
 {
     [DataContract]
     public struct Account
     {
+        [DataMember]
+        public int Id;
+
         [DataMember]
         public string Username;
 

diff --git a/Fuyu.Platform.Common/Models/Fuyu/Accounts/ERegisterStatus.cs b/Fuyu.Platform.Common/Models/Fuyu/Accounts/ERegisterStatus.cs
@@ -0,0 +1,8 @@
+namespace Fuyu.Platform.Common.Models.Fuyu.Accounts
+{
+    public enum ERegisterStatus
+    {
+        AlreadyExists,
+        Success
+    }
+}
diff --git a/...Common/Models/Fuyu/Savegame/EftProfile.cs → ...Common/Models/Fuyu/Accounts/EftProfile.cs b/...Common/Models/Fuyu/Savegame/EftProfile.cs → ...Common/Models/Fuyu/Accounts/EftProfile.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Serialization;
 using Fuyu.Platform.Common.Models.EFT.Profiles;
 
-namespace Fuyu.Platform.Common.Models.Fuyu.Savegame
+namespace Fuyu.Platform.Common.Models.Fuyu.Accounts
 {
     [DataContract]
     public struct EftProfile

diff --git a/...rm.Common/Models/Fuyu/Savegame/EftSave.cs → ...rm.Common/Models/Fuyu/Accounts/EftSave.cs b/...rm.Common/Models/Fuyu/Savegame/EftSave.cs → ...rm.Common/Models/Fuyu/Accounts/EftSave.cs
@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace Fuyu.Platform.Common.Models.Fuyu.Savegame
+namespace Fuyu.Platform.Common.Models.Fuyu.Accounts
 {
     [DataContract]
     public struct EftSave