Skip to content

fix(ws): make the GeoIP database optional so a fresh clone starts #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
doopey655 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ws): make the GeoIP database optional so a fresh clone starts #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions GenOnlineService/Controllers/WebSocket/WebSocketController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,23 @@ public WebSocketController(LobbyManager lobbyManager, IDbContextFactory<AppDbCon
AllowOutOfOrderMetadataProperties = true
};

// GeoIP DB is designed to be reused; opening per request is expensive
private static readonly DatabaseReader GeoIpReader = new("data/GeoLite2-City.mmdb");
// GeoIP DB is designed to be reused; opening per request is expensive.
// It is gitignored and absent in fresh clones, so a failure to open must
// fall back to the lookup defaults rather than fail static init.
private static readonly DatabaseReader? GeoIpReader = TryOpenGeoIp();

private static DatabaseReader? TryOpenGeoIp()
{
try
{
return new DatabaseReader("data/GeoLite2-City.mmdb");
}
catch (Exception ex)
{
Console.WriteLine($"[WS] GeoIP DB unavailable ({ex.Message}); using fallback coordinates");
return null;
}
}

private struct WSMessageEnvelope
{
Expand Down Expand Up @@ -86,19 +101,22 @@ public async Task Get([FromHeader(Name = "is-reconnect")] bool bIsReconnect)

try
{
var city = GeoIpReader.City(ipAddress);
if (GeoIpReader != null)
{
var city = GeoIpReader.City(ipAddress);

ipContinent = city.Continent.Code;
ipCountry = city.Country.IsoCode;
ipContinent = city.Continent.Code;
ipCountry = city.Country.IsoCode;

if (city.Location.Longitude != null)
{
dLongitude = (double)city.Location.Longitude;
}
if (city.Location.Longitude != null)
{
dLongitude = (double)city.Location.Longitude;
}

if (city.Location.Latitude != null)
{
dLatitude = (double)city.Location.Latitude;
if (city.Location.Latitude != null)
{
dLatitude = (double)city.Location.Latitude;
}
}
}
catch
Expand Down