fix samples

Author: lucasteles

samples/Backdash.Samples.sln

@@ -16,8 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWar.Shared", "SpaceWar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWar.Lobby", "SpaceWar.Lobby\SpaceWar.Lobby.csproj", "{9781B364-1706-450F-9F81-751FBFAAAAB2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backdash.Utils", "..\src\Backdash.Utils\Backdash.Utils.csproj", "{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backdash.Analyzers", "..\src\Backdash.Analyzers\Backdash.Analyzers.csproj", "{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C24EEF04-35A8-4574-8968-CCE1DE334185}"
@@ -77,10 +75,6 @@ Global
 		{9781B364-1706-450F-9F81-751FBFAAAAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9781B364-1706-450F-9F81-751FBFAAAAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9781B364-1706-450F-9F81-751FBFAAAAB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -105,7 +99,6 @@ Global
 		{C3B63B4E-12DE-4BC0-9E06-0F12A433E79B} = {52082A6A-CF3A-4792-8218-7A8ECD119CDB}
 		{9781B364-1706-450F-9F81-751FBFAAAAB2} = {52082A6A-CF3A-4792-8218-7A8ECD119CDB}
 		{ACA10360-5A71-4D34-8497-F93AFC7513FC} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
-		{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
 		{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
 		{2C929464-D962-4EF7-8043-ED8688A46955} = {C24EEF04-35A8-4574-8968-CCE1DE334185}
 		{D5C0102D-ED9B-441A-8F95-7AF16161CCC6} = {C6F08499-1C15-43BC-90D4-6B0E7E540D33}

samples/LobbyServer

@@ -1,9 +1,9 @@
 using System.Net;
 using System.Net.Http.Json;
-using System.Net.Sockets;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Backdash.JsonConverters;
+using Backdash.Json;
+using Backdash.Network;
 using SpaceWar.Models;
 
 namespace SpaceWar.Services;
@@ -75,22 +75,8 @@ public async Task ToggleReady(CancellationToken ct = default)
         response.EnsureSuccessStatusCode();
     }
 
-    async Task<IPEndPoint?> GetLocalEndpoint(CancellationToken ct = default)
-    {
-        try
-        {
-            using Socket socket = new(AddressFamily.InterNetwork, SocketType.Dgram, 0);
-            await socket.ConnectAsync("8.8.8.8", 65530, ct);
-            if (socket.LocalEndPoint is not IPEndPoint { Address: { } ipAddress })
-                return null;
-
-            return new(ipAddress, appSettings.LocalPort);
-        }
-        catch (Exception)
-        {
-            // skip
-        }
-
-        return null;
-    }
+    async ValueTask<IPEndPoint?> GetLocalEndpoint(CancellationToken ct = default) =>
+        await NetUtils.FindNetworkIPAddress(ct: ct) is { } ipAddress
+            ? new(ipAddress, appSettings.LocalPort)
+            : null;
 }

samples/SpaceWar.Lobby/Services/LobbyHttpClient.cs

@@ -26,7 +26,6 @@
         <EmbeddedResource Include="Icon.bmp"/>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Backdash.Utils\Backdash.Utils.csproj"/>
         <ProjectReference Include="..\SpaceWar.Shared\SpaceWar.Shared.csproj"/>
     </ItemGroup>
 </Project>

samples/SpaceWar.Lobby/SpaceWar.Lobby.csproj

@@ -2,5 +2,6 @@
 export LOBBY_SERVER_URL=http://localhost:9999
 pushd "$(dirname "$0")/../../../LobbyServer" || exit
 git submodule update --init --recursive "$(pwd)"
+git submodule update --recursive --remote "$(pwd)"
 dotnet run -c Release ./src/LobbyServer --project "$(pwd)/src/LobbyServer"
 popd || exit

samples/SpaceWar.Lobby/scripts/linux/start_server.sh

@@ -1,5 +1,6 @@
 @set LOBBY_SERVER_URL=http://localhost:9999
 @pushd %~dp0\..\..\..\LobbyServer
 git submodule update --init --recursive %cd%
+git submodule update --recursive --remote %cd%
 start dotnet run -c Release --project "%cd%\src\LobbyServer"
 @popd