Skip to content

Commit c759f1d

Browse files
committed
fix samples
1 parent 9e9843d commit c759f1d

6 files changed

Lines changed: 9 additions & 29 deletions

File tree

samples/Backdash.Samples.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWar.Shared", "SpaceWar
1616
EndProject
1717
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWar.Lobby", "SpaceWar.Lobby\SpaceWar.Lobby.csproj", "{9781B364-1706-450F-9F81-751FBFAAAAB2}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backdash.Utils", "..\src\Backdash.Utils\Backdash.Utils.csproj", "{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}"
20-
EndProject
2119
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backdash.Analyzers", "..\src\Backdash.Analyzers\Backdash.Analyzers.csproj", "{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}"
2220
EndProject
2321
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C24EEF04-35A8-4574-8968-CCE1DE334185}"
@@ -77,10 +75,6 @@ Global
7775
{9781B364-1706-450F-9F81-751FBFAAAAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
7876
{9781B364-1706-450F-9F81-751FBFAAAAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
7977
{9781B364-1706-450F-9F81-751FBFAAAAB2}.Release|Any CPU.Build.0 = Release|Any CPU
80-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
81-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Debug|Any CPU.Build.0 = Debug|Any CPU
82-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Release|Any CPU.ActiveCfg = Release|Any CPU
83-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96}.Release|Any CPU.Build.0 = Release|Any CPU
8478
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8579
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
8680
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -105,7 +99,6 @@ Global
10599
{C3B63B4E-12DE-4BC0-9E06-0F12A433E79B} = {52082A6A-CF3A-4792-8218-7A8ECD119CDB}
106100
{9781B364-1706-450F-9F81-751FBFAAAAB2} = {52082A6A-CF3A-4792-8218-7A8ECD119CDB}
107101
{ACA10360-5A71-4D34-8497-F93AFC7513FC} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
108-
{BA97CA2F-E2BB-40FE-9911-FCBD620A8D96} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
109102
{FD3F38F9-3D7B-4D8E-ABE7-81A78D6309BA} = {53EC6C8F-493B-4116-85D1-0AA416FF59DE}
110103
{2C929464-D962-4EF7-8043-ED8688A46955} = {C24EEF04-35A8-4574-8968-CCE1DE334185}
111104
{D5C0102D-ED9B-441A-8F95-7AF16161CCC6} = {C6F08499-1C15-43BC-90D4-6B0E7E540D33}

samples/SpaceWar.Lobby/Services/LobbyHttpClient.cs

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Net;
22
using System.Net.Http.Json;
3-
using System.Net.Sockets;
43
using System.Text.Json;
54
using System.Text.Json.Serialization;
6-
using Backdash.JsonConverters;
5+
using Backdash.Json;
6+
using Backdash.Network;
77
using SpaceWar.Models;
88

99
namespace SpaceWar.Services;
@@ -75,22 +75,8 @@ public async Task ToggleReady(CancellationToken ct = default)
7575
response.EnsureSuccessStatusCode();
7676
}
7777

78-
async Task<IPEndPoint?> GetLocalEndpoint(CancellationToken ct = default)
79-
{
80-
try
81-
{
82-
using Socket socket = new(AddressFamily.InterNetwork, SocketType.Dgram, 0);
83-
await socket.ConnectAsync("8.8.8.8", 65530, ct);
84-
if (socket.LocalEndPoint is not IPEndPoint { Address: { } ipAddress })
85-
return null;
86-
87-
return new(ipAddress, appSettings.LocalPort);
88-
}
89-
catch (Exception)
90-
{
91-
// skip
92-
}
93-
94-
return null;
95-
}
78+
async ValueTask<IPEndPoint?> GetLocalEndpoint(CancellationToken ct = default) =>
79+
await NetUtils.FindNetworkIPAddress(ct: ct) is { } ipAddress
80+
? new(ipAddress, appSettings.LocalPort)
81+
: null;
9682
}

samples/SpaceWar.Lobby/SpaceWar.Lobby.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<EmbeddedResource Include="Icon.bmp"/>
2727
</ItemGroup>
2828
<ItemGroup>
29-
<ProjectReference Include="..\..\src\Backdash.Utils\Backdash.Utils.csproj"/>
3029
<ProjectReference Include="..\SpaceWar.Shared\SpaceWar.Shared.csproj"/>
3130
</ItemGroup>
3231
</Project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
export LOBBY_SERVER_URL=http://localhost:9999
33
pushd "$(dirname "$0")/../../../LobbyServer" || exit
44
git submodule update --init --recursive "$(pwd)"
5+
git submodule update --recursive --remote "$(pwd)"
56
dotnet run -c Release ./src/LobbyServer --project "$(pwd)/src/LobbyServer"
67
popd || exit
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@set LOBBY_SERVER_URL=http://localhost:9999
22
@pushd %~dp0\..\..\..\LobbyServer
33
git submodule update --init --recursive %cd%
4+
git submodule update --recursive --remote %cd%
45
start dotnet run -c Release --project "%cd%\src\LobbyServer"
56
@popd

0 commit comments

Comments
 (0)