Merge pull request project-fika#337 from seionmoya/new-launcher

New launcher
nexus4880 · Jan 23, 2025 · ca051bb · ca051bb
2 parents 2bd4f14 + 6092df7
commit ca051bb
Show file tree

Hide file tree

Showing 203 changed files with 3,033 additions and 2,415 deletions.
diff --git a/Devtools/Fuyu.Devtool.EftLauncher/Fuyu.Devtool.EftLauncher.csproj b/Devtools/Fuyu.Devtool.EftLauncher/Fuyu.Devtool.EftLauncher.csproj
diff --git a/Devtools/Fuyu.Devtool.EftLauncher/Program.cs b/Devtools/Fuyu.Devtool.EftLauncher/Program.cs
diff --git a/Devtools/Fuyu.Devtool.EftLauncher/README.md b/Devtools/Fuyu.Devtool.EftLauncher/README.md
diff --git a/Devtools/Fuyu.Devtool.EftLauncher/Resources/icon.ico b/Devtools/Fuyu.Devtool.EftLauncher/Resources/icon.ico
diff --git a/Documentation/fuyu-build.md b/Documentation/fuyu-build.md
@@ -67,10 +67,9 @@ Terminal > Run Task... > Fuyu: Test
 ### 2. Putting everything in place
 
 1. Copy-paste `Fuyu.Backend/bin/Release/net9.0/win-x64/publish/Fuyu.Backend.exe` into `<gamedir>`
-2. Copy-paste `Fuyu.Launcher/bin/Release/net9.0/win-x64/publish/Fuyu.Launcher.exe` into `<gamedir>`
+2. Copy-paste `Fuyu.Launcher/bin/Release/net9.0-windows/win-x64/publish/Fuyu.Launcher.exe` into `<gamedir>`
 3. Create folder `<gamedir>/Fuyu/`
 4. Copy-paste `Mods/` into `<gamedir>/Fuyu/`
 5. Delete `bin` and `obj` inside `<gamedir>/Fuyu/Mods/**/*`
-6. Copy-paste `Fuyu.Modding.NLog/bin/Release/net48/publish/*.dll` into `<gamedir>/EscapeFroMTarkov_data/Managed/`
-7. Copy-paste `Mods/Client/Fuyu.Client.Common//bin/Release/net48/publish/*.dll`
-   except `Fuyu.Client.Common.dll` into `<gamedir>/Fuyu/Client/Fuyu.Client.Common/`
+6. Copy-paste `Fuyu.Modding.NLog/bin/Release/net48/publish/*.dll` into `<gamedir>/EscapeFromTarkov_data/Managed/`
+7. Copy-paste `Fuyu.Common.Client/bin/Release/net48/publish/*.dll`  into `<gamedir>/EscapeFromTarkov_data/Managed/`
diff --git a/Fuyu.Backend.Arena/Fuyu.Backend.Arena.csproj b/Fuyu.Backend.Arena/Fuyu.Backend.Arena.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../Fuyu.Backend.BSG/Fuyu.Backend.BSG.csproj" />
-    <ProjectReference Include="../Fuyu.Backend.Common/Fuyu.Backend.Common.csproj" />
+    <ProjectReference Include="../Fuyu.Common.Backend/Fuyu.Common.Backend.csproj" />
     <ProjectReference Include="../Fuyu.Common/Fuyu.Common.csproj" />
   </ItemGroup>
 

diff --git a/Fuyu.Backend.BSG/Fuyu.Backend.BSG.csproj b/Fuyu.Backend.BSG/Fuyu.Backend.BSG.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Fuyu.Backend.Common/Fuyu.Backend.Common.csproj" />
+    <ProjectReference Include="../Fuyu.Common.Backend/Fuyu.Common.Backend.csproj" />
     <ProjectReference Include="../Fuyu.Common/Fuyu.Common.csproj" />
   </ItemGroup>
 

diff --git a/...trollers/AccountRegisterGameController.cs → ...trollers/AccountGameRegisterController.cs b/...trollers/AccountRegisterGameController.cs → ...trollers/AccountGameRegisterController.cs
@@ -6,20 +6,21 @@
 
 namespace Fuyu.Backend.Core.Controllers;
 
-public class AccountRegisterGameController : CoreHttpController<AccountRegisterGameRequest>
+public class AccountGameRegisterController : AbstractCoreHttpController<AccountGameRegisterRequest>
 {
     private readonly AccountService _accountService;
 
-    public AccountRegisterGameController() : base("/account/register/game")
+    public AccountGameRegisterController() : base("/account/game/register")
     {
         _accountService = AccountService.Instance;
     }
 
-    public override Task RunAsync(CoreHttpContext context, AccountRegisterGameRequest request)
+    public override Task RunAsync(CoreHttpContext context, AccountGameRegisterRequest request)
     {
         var sessionId = context.SessionId;
         var result = _accountService.RegisterGame(sessionId, request.Game, request.Edition);
 
-        return context.SendJsonAsync(Json.Stringify(result));
+        var text = Json.Stringify(result);
+        return context.SendJsonAsync(text);
     }
 }
diff --git a/Fuyu.Backend.Core/Controllers/AccountGamesController.cs b/Fuyu.Backend.Core/Controllers/AccountGamesController.cs
diff --git a/Fuyu.Backend.Core/Controllers/AccountGetController.cs b/Fuyu.Backend.Core/Controllers/AccountGetController.cs
@@ -0,0 +1,25 @@
+using System.Threading.Tasks;
+using Fuyu.Backend.Core.Networking;
+using Fuyu.Backend.Core.Services;
+using Fuyu.Common.Serialization;
+
+namespace Fuyu.Backend.Core.Controllers;
+
+public class AccountGetController : AbstractCoreHttpController
+{
+    private readonly AccountService _accountService;
+
+    public AccountGetController() : base("/account/get")
+    {
+        _accountService = AccountService.Instance;
+    }
+
+    public override Task RunAsync(CoreHttpContext context)
+    {
+        var sessionId = context.SessionId;
+        var response = _accountService.GetStrippedAccount(sessionId);
+
+        var text = Json.Stringify(response);
+        return context.SendJsonAsync(text);
+    }
+}
diff --git a/Fuyu.Backend.Core/Controllers/AccountLoginController.cs b/Fuyu.Backend.Core/Controllers/AccountLoginController.cs
@@ -6,7 +6,7 @@
 
 namespace Fuyu.Backend.Core.Controllers;
 
-public class AccountLoginController : CoreHttpController<AccountLoginRequest>
+public class AccountLoginController : AbstractCoreHttpController<AccountLoginRequest>
 {
     private readonly AccountService _accountService;
 
@@ -19,6 +19,7 @@ public override Task RunAsync(CoreHttpContext context, AccountLoginRequest body)
     {
         var response = _accountService.LoginAccount(body.Username, body.Password);
 
-        return context.SendJsonAsync(Json.Stringify(response));
+        var text = Json.Stringify(response);
+        return context.SendJsonAsync(text);
     }
 }
diff --git a/Fuyu.Backend.Core/Controllers/AccountLogoutController.cs b/Fuyu.Backend.Core/Controllers/AccountLogoutController.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Net;
+using System.Threading.Tasks;
 using Fuyu.Backend.Core.Networking;
 
 namespace Fuyu.Backend.Core.Controllers;
@@ -14,6 +15,6 @@ public override Task RunAsync(CoreHttpContext context)
         var sessionId = context.SessionId;
         CoreOrm.Instance.RemoveSession(sessionId);
 
-        return context.SendJsonAsync("{}");
+        return context.SendStatus(HttpStatusCode.OK);
     }
 }
diff --git a/Fuyu.Backend.Core/Controllers/AccountRegisterController.cs b/Fuyu.Backend.Core/Controllers/AccountRegisterController.cs
@@ -7,7 +7,7 @@
 
 namespace Fuyu.Backend.Core.Controllers;
 
-public class AccountRegisterController : CoreHttpController<AccountRegisterRequest>
+public class AccountRegisterController : AbstractCoreHttpController<AccountRegisterRequest>
 {
     private readonly AccountService _accountService;
 
@@ -24,6 +24,7 @@ public override Task RunAsync(CoreHttpContext context, AccountRegisterRequest re
             Status = result
         };
 
-        return context.SendJsonAsync(Json.Stringify(response));
+        var text = Json.Stringify(response);
+        return context.SendJsonAsync(text);
     }
 }
diff --git a/Fuyu.Backend.Core/Servers/CoreServer.cs → Fuyu.Backend.Core/CoreServer.cs b/Fuyu.Backend.Core/Servers/CoreServer.cs → Fuyu.Backend.Core/CoreServer.cs
@@ -1,7 +1,7 @@
 using Fuyu.Backend.Core.Controllers;
 using Fuyu.Common.Networking;
 
-namespace Fuyu.Backend.Core.Servers;
+namespace Fuyu.Backend.Core;
 
 public class CoreServer : HttpServer
 {
@@ -12,10 +12,10 @@ public CoreServer() : base("core", "http://localhost:8000/")
     public void RegisterServices()
     {
         HttpRouter.AddController<PingController>();
+        HttpRouter.AddController<AccountGameRegisterController>();
+        HttpRouter.AddController<AccountGetController>();
         HttpRouter.AddController<AccountLoginController>();
         HttpRouter.AddController<AccountLogoutController>();
         HttpRouter.AddController<AccountRegisterController>();
-        HttpRouter.AddController<AccountRegisterGameController>();
-        HttpRouter.AddController<AccountGamesController>();
     }
 }
diff --git a/Fuyu.Backend.Core/Fuyu.Backend.Core.csproj b/Fuyu.Backend.Core/Fuyu.Backend.Core.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Fuyu.Backend.Common/Fuyu.Backend.Common.csproj" />
+    <ProjectReference Include="../Fuyu.Common.Backend/Fuyu.Common.Backend.csproj" />
     <ProjectReference Include="../Fuyu.Common/Fuyu.Common.csproj" />
   </ItemGroup>
 

diff --git a/Fuyu.Backend.Core/Models/Accounts/ERegisterStatus.cs b/Fuyu.Backend.Core/Models/Accounts/ERegisterStatus.cs
@@ -5,11 +5,15 @@ public enum ERegisterStatus
     UsernameEmpty,
     UsernameTooShort,
     UsernameTooLong,
-    UsernameInvalid,
+    UsernameInvalidCharacter,
     PasswordEmpty,
     PasswordTooShort,
     PasswordTooLong,
-    PasswordInvalid,
+    PasswordMissingLowerCase,
+    PasswordMissingUpperCase,
+    PasswordMissingDigit,
+    PasswordMissingSpecial,
+    PasswordInvalidCharacter,
     AlreadyExists,
     Success
 }
diff --git a/...ls/Requests/AccountRegisterGameRequest.cs → ...ls/Requests/AccountGameRegisterRequest.cs b/...ls/Requests/AccountRegisterGameRequest.cs → ...ls/Requests/AccountGameRegisterRequest.cs
@@ -3,7 +3,7 @@
 namespace Fuyu.Backend.Core.Models.Requests;
 
 [DataContract]
-public class AccountRegisterGameRequest
+public class AccountGameRegisterRequest
 {
     [DataMember]
     public string Game { get; set; }