Merge pull request #80 from Lan2Play/feature/ConfigByCommand

Feature/config by command
Lan2Play · Nov 25, 2023 · 532a17f · 532a17f
2 parents 5d9bd35 + bf45cce
commit 532a17f
Show file tree

Hide file tree

Showing 34 changed files with 682 additions and 165 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "esbonio.sphinx.confDir": ""
+}
diff --git a/Docs/source/admin/commands.rst b/Docs/source/admin/commands.rst
@@ -46,3 +46,11 @@ These commands are available through rcon or to users with the required permissi
 +----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``!ps_dumpmatch``                      | Dumps the current matchstate and config to console                                                                                                |
 +----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
+| ``!ps_creatematch``                    | Creates a new match without preloaded configuration.                                                                                              |
++----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
+| ``!ps_startmatch``                     | After match configuration is done with ``!ps_creatematch`` the match can be started.                                                              |
++----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
+| ``!ps_addmap``                         | Add a map to the map pool during match creation.                                                                                                  |
++----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
+| ``!ps_removemap``                      | Remove a map from the map pool during match creation.                                                                                             |
++----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/Docs/source/admin/configuration.rst b/Docs/source/admin/configuration.rst
@@ -59,7 +59,9 @@ Matchconfig Fields
 +--------------------------+-----------------+-------------------------------------------------------------------------------------------+
 | server_locale            | en              | This is the language that will be used for the messages that are printed to the users     |
 +--------------------------+-----------------+-------------------------------------------------------------------------------------------+
-
+| team_mode                | 0               | Change how teams are defined. 0: Default (Teams are fix defined) 1: Scramble (Teams are scrambled when all players are ready) |
++--------------------------+-----------------+-------------------------------------------------------------------------------------------+
+
 Matchconfig Example
 '''''''''''''''''''''
 

diff --git a/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj b/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj
@@ -6,6 +6,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Update="Meziantou.Analyzer" Version="2.0.110">
       <PrivateAssets>all</PrivateAssets>

diff --git a/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj b/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj
@@ -7,7 +7,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/PugSharp.Api.Json/PugSharp.Api.Json.csproj b/PugSharp.Api.Json/PugSharp.Api.Json.csproj
@@ -7,7 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PugSharp.ApiStats/BaseApi.cs b/PugSharp.ApiStats/BaseApi.cs
@@ -33,6 +33,8 @@ protected void InitializeBase(string? baseUrl, string? authKey)
 
             HttpClient.BaseAddress = new Uri(baseUrl);
 
+            HttpClient.DefaultRequestHeaders.Remove(HeaderNames.Authorization);
+
             if (!string.IsNullOrEmpty(authKey))
             {
                 HttpClient.DefaultRequestHeaders.Add(HeaderNames.Authorization, authKey);

diff --git a/PugSharp.ApiStats/PugSharp.ApiStats.csproj b/PugSharp.ApiStats/PugSharp.ApiStats.csproj
@@ -13,7 +13,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
 	  <PackageReference Update="Meziantou.Analyzer" Version="2.0.110">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/PugSharp.Config/ConfigCreator.cs b/PugSharp.Config/ConfigCreator.cs
@@ -0,0 +1,24 @@
+namespace PugSharp.Config;
+
+public class ConfigCreator
+{
+    public ConfigCreator()
+    {
+        Config = new MatchConfig
+        {
+            // TODO Maybe use guid for demo, ...
+            MatchId = "CustomMatch",
+            Team1 = new Team
+            {
+                Name = "Team 1",
+            },
+            Team2 = new Team
+            {
+                Name = "Team 2",
+            },
+            TeamMode = TeamMode.Scramble,
+        };
+    }
+
+    public MatchConfig Config { get; }
+}
diff --git a/PugSharp.Config/MatchConfig.cs b/PugSharp.Config/MatchConfig.cs
@@ -5,7 +5,7 @@ namespace PugSharp.Config;
 public class MatchConfig
 {
     [JsonPropertyName("maplist")]
-    public required string[] Maplist { get; init; }
+    public IList<string> Maplist { get; init; } = new List<string>();
 
     [JsonPropertyName("team1")]
     public required Team Team1 { get; init; }
@@ -20,16 +20,16 @@ public class MatchConfig
     public int NumMaps { get; init; } = 1;
 
     [JsonPropertyName("players_per_team")]
-    public int PlayersPerTeam { get; init; } = 5;
+    public int PlayersPerTeam { get; set; } = 5;
 
     [JsonPropertyName("min_players_to_ready")]
-    public int MinPlayersToReady { get; init; } = 5;
+    public int MinPlayersToReady { get; set; } = 5;
 
     [JsonPropertyName("max_rounds")]
-    public int MaxRounds { get; init; } = 24;
+    public int MaxRounds { get; set; } = 24;
 
     [JsonPropertyName("max_overtime_rounds")]
-    public int MaxOvertimeRounds { get; init; } = 6;
+    public int MaxOvertimeRounds { get; set; } = 6;
 
     [JsonPropertyName("vote_timeout")]
     public long VoteTimeout { get; init; } = 60000;
@@ -60,4 +60,7 @@ public class MatchConfig
 
     [JsonPropertyName("server_locale")]
     public string ServerLocale { get; init; } = "en";
+
+    [JsonPropertyName("team_mode")]
+    public TeamMode TeamMode { get; set; }
 }
diff --git a/PugSharp.Config/PugSharp.Config.csproj b/PugSharp.Config/PugSharp.Config.csproj
@@ -7,7 +7,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
 		<PackageReference Include="OneOf" Version="3.0.263" />
 	</ItemGroup>
 

diff --git a/PugSharp.Config/Team.cs b/PugSharp.Config/Team.cs
@@ -5,7 +5,7 @@ namespace PugSharp.Config;
 public class Team
 {
     [JsonPropertyName("name")]
-    public required string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("tag")]
     public string Tag { get; init; } = string.Empty;
@@ -14,5 +14,5 @@ public class Team
     public string Flag { get; init; } = string.Empty;
 
     [JsonPropertyName("players")]
-    public required IDictionary<ulong, string> Players { get; init; }
+    public IDictionary<ulong, string> Players { get; init; } = new Dictionary<ulong, string>();
 }
diff --git a/PugSharp.Config/TeamMode.cs b/PugSharp.Config/TeamMode.cs
@@ -0,0 +1,10 @@
+namespace PugSharp.Config;
+
+public enum TeamMode
+{
+    // Take Teams as they are
+    Default,
+
+    // Scramble Teams afte all players are joined
+    Scramble,
+}
diff --git a/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj b/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj
@@ -12,6 +12,11 @@
 		<OutputPath>..\cs2\game\csgo\addons\counterstrikesharp\plugins\PugSharp\</OutputPath>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+	</ItemGroup>
+
 
 	<ItemGroup>
     <ProjectReference Include="..\PugSharp\PugSharp.csproj" />

diff --git a/PugSharp.Match.Contract/MatchCommand.cs b/PugSharp.Match.Contract/MatchCommand.cs
@@ -14,4 +14,5 @@ public enum MatchCommand
     CompleteMap,
     Pause,
     Unpause,
+    TeamsDefined,
 }
diff --git a/PugSharp.Match.Contract/MatchState.cs b/PugSharp.Match.Contract/MatchState.cs
@@ -14,4 +14,5 @@ public enum MatchState
     MapCompleted,
     MatchCompleted,
     RestoreMatch,
+    DefineTeams,
 }
diff --git a/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj b/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj
@@ -6,6 +6,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\PugSharp.Api.Contract\PugSharp.Api.Contract.csproj" />
   </ItemGroup>

diff --git a/PugSharp.Match.Tests/MatchTests.cs b/PugSharp.Match.Tests/MatchTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 using NSubstitute;
 
@@ -23,7 +22,7 @@ private static IServiceProvider CreateTestProvider()
         services.AddSingleton(Substitute.For<ICsServer>());
         services.AddLogging(options =>
         {
-            options.AddConsole();
+            //options.AddConsole();
         });
         services.AddSingleton<IApplication, Application>();
 
@@ -151,16 +150,16 @@ private static async Task VoteTeam(ICsServer csServer, MatchConfig config, Match
         csServer.Received().SwitchMap(config.Maplist[^1]);
 
         Assert.Equal(MatchState.WaitingForPlayersReady, match.CurrentState);
-        await match.TogglePlayerIsReadyAsync(player1).ConfigureAwait(false);
+        match.TogglePlayerIsReady(player1);
         Assert.Equal(MatchState.WaitingForPlayersReady, match.CurrentState);
-        await match.TogglePlayerIsReadyAsync(player2).ConfigureAwait(false);
+        match.TogglePlayerIsReady(player2);
 
         Assert.Equal(MatchState.MatchRunning, match.CurrentState);
     }
 
     private static IPlayer VoteForMap(MatchConfig config, Match match, IPlayer player1, IPlayer player2)
     {
-        var matchCount = config.Maplist.Length;
+        var matchCount = config.Maplist.Count;
         var votePlayer = player1;
 
         Assert.False(match.BanMap(votePlayer, matchCount));
@@ -184,9 +183,9 @@ private static IPlayer VoteForMap(MatchConfig config, Match match, IPlayer playe
 
     private static async Task SetPlayersReady(Match match, IPlayer player1, IPlayer player2, MatchState expectedMatchStateAfterReady)
     {
-        await match.TogglePlayerIsReadyAsync(player1).ConfigureAwait(false);
+        match.TogglePlayerIsReady(player1);
         Assert.Equal(MatchState.WaitingForPlayersConnectedReady, match.CurrentState);
-        await match.TogglePlayerIsReadyAsync(player2).ConfigureAwait(false);
+        match.TogglePlayerIsReady(player2);
         Assert.Equal(expectedMatchStateAfterReady, match.CurrentState);
     }
 
@@ -210,7 +209,7 @@ private static MatchConfig CreateExampleConfig(IEnumerable<string>? mapList = nu
             mapListInternal = mapList;
         }
 
-        return new MatchConfig
+        var matchConfig = new MatchConfig
         {
             MatchId = "1337",
             PlayersPerTeam = 1,
@@ -232,8 +231,14 @@ private static MatchConfig CreateExampleConfig(IEnumerable<string>? mapList = nu
                     { 1,"Def" },
                 },
             },
-            Maplist = mapListInternal.ToArray(),
         };
+
+        foreach (var map in mapListInternal)
+        {
+            matchConfig.Maplist.Add(map);
+        }
+
+        return matchConfig;
     }
 
     private static IPlayer CreatePlayerSub(ulong steamId, int playerId)

diff --git a/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj b/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj
@@ -10,6 +10,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.14" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
 		<PackageReference Include="xunit" Version="2.6.2" />