update lobby server client

Author: lucasteles

samples/.run/SpaceWar.Lobby (local 9100).run.xml

@@ -1,12 +1,15 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="SpaceWar.Lobby (local 9100)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/SpaceWar.Lobby/bin/Debug/net8.0/SpaceWar.exe" />
-    <option name="PROGRAM_PARAMETERS" value="-LocalPort  9100  -ServerUrl &quot;http://localhost:9999&quot;" />
+    <option name="PROGRAM_PARAMETERS" value="-LocalPort  9100  -ServerUrl &quot;http://localhost:9999&quot; -GameId 99" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/SpaceWar.Lobby/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="ENV_FILE_PATHS" value="" />
+    <option name="REDIRECT_INPUT_PATH" value="" />
+    <option name="MIXED_MODE_DEBUG" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="AUTO_ATTACH_CHILDREN" value="0" />
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/SpaceWar.Lobby/SpaceWar.Lobby.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
@@ -17,4 +20,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>

samples/.run/SpaceWar.Lobby (local 9101) .run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="SpaceWar.Lobby (local 9101) " type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/SpaceWar.Lobby/bin/Debug/net8.0/SpaceWar.exe" />
-    <option name="PROGRAM_PARAMETERS" value="-LocalPort  9101  -ServerUrl &quot;http://localhost:9999&quot;" />
+    <option name="PROGRAM_PARAMETERS" value="-LocalPort  9101  -ServerUrl &quot;http://localhost:9999&quot; -GameId 99" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/SpaceWar.Lobby/bin/Debug/net8.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="ENV_FILE_PATHS" value="" />

samples/SpaceWar.Lobby/AppSettings.cs

@@ -6,6 +6,7 @@ namespace SpaceWar;
 public class AppSettings
 {
     public string Username { get; set; } = string.Empty;
+    public int GameId { get; set; }
     public required string LobbyName { get; set; }
     public required Uri ServerUrl { get; set; }
     public int LocalPort { get; set; }
@@ -38,6 +39,10 @@ public void ParseArgs(string[] args)
         if (argsDict.TryGetValue(nameof(Username), out var usernameArg) &&
             !string.IsNullOrWhiteSpace(usernameArg))
             Username = usernameArg;
+
+        if (argsDict.TryGetValue(nameof(GameId), out var gameIdArg) &&
+            int.TryParse(gameIdArg, out var gameId))
+            GameId = gameId;
     }
 
     public static AppSettings LoadFromJson(string file)

samples/SpaceWar.Lobby/Scenes/LobbyScene.cs

@@ -59,7 +59,7 @@ async Task ToggleReady()
     {
         if (!AllReachable()) return;
 
-        await client.ToggleReady(user);
+        await client.ToggleReady();
         ready = true;
     }
 
@@ -306,7 +306,7 @@ async Task RequestLobby()
 
     async Task RefreshLobby()
     {
-        lobbyInfo = await client.GetLobby(user);
+        lobbyInfo = await client.GetLobby();
 
         await lobbyUdpClient.HandShake(user);
 
@@ -491,7 +491,7 @@ protected override void Dispose(bool disposing)
             cts.Dispose();
             lobbyUdpClient.Dispose();
             if (user is not null && lobbyInfo is { Ready: false })
-                client.LeaveLobby(user).GetAwaiter().GetResult();
+                client.LeaveLobby().GetAwaiter().GetResult();
         }
         catch (Exception e)
         {

samples/SpaceWar.Lobby/Services/LobbyHttpClient.cs

@@ -25,19 +25,22 @@ public sealed class LobbyHttpClient(AppSettings appSettings)
         BaseAddress = appSettings.ServerUrl,
     };
 
+    readonly Guid recreationKey = Guid.NewGuid();
+
     public async Task<User> EnterLobby(string lobbyName, string username, PlayerMode mode)
     {
         var localEndpoint = await GetLocalEndpoint();
-        var response = await client.PostAsJsonAsync("/lobby", new
+        var response = await client.PostAsJsonAsync($"/{appSettings.GameId}/lobby", new
         {
             lobbyName,
             username,
             mode,
             localEndpoint,
+            recreationKey,
         }, jsonOptions);
 
         if (response.StatusCode is HttpStatusCode.UnprocessableEntity)
-            throw new InvalidOperationException("Already started");
+            throw new InvalidOperationException("Failed to enter lobby");
 
         response.EnsureSuccessStatusCode();
 
@@ -49,19 +52,19 @@ public async Task<User> EnterLobby(string lobbyName, string username, PlayerMode
         return result;
     }
 
-    public async Task<Lobby> GetLobby(User user) =>
-        await client.GetFromJsonAsync<Lobby>($"/lobby/{user.LobbyName}", jsonOptions)
+    public async Task<Lobby> GetLobby() =>
+        await client.GetFromJsonAsync<Lobby>("/entry/lobby", jsonOptions)
         ?? throw new InvalidOperationException();
 
-    public async Task LeaveLobby(User user)
+    public async Task LeaveLobby()
     {
-        var response = await client.DeleteAsync($"/lobby/{user.LobbyName}");
+        var response = await client.DeleteAsync("/entry");
         response.EnsureSuccessStatusCode();
     }
 
-    public async Task ToggleReady(User user)
+    public async Task ToggleReady()
     {
-        var response = await client.PutAsync($"/lobby/{user.LobbyName}", null);
+        var response = await client.PutAsync("/entry/ready", null);
         response.EnsureSuccessStatusCode();
     }
 

samples/SpaceWar.Lobby/appsettings.json

@@ -1,5 +1,6 @@
 {
     "LobbyName": "spacewar",
+    "GameId": 0,
     "LocalPort": 9000,
     "ServerUrl": "https://lobby-server.fly.dev",
     "ServerUdpPort": 8888