Minor fixes (#207)

* Fix logging error falsely when writing console input
Fix nginx Dockerfile permission command
Upgrade to postgres 17

* Fix playlists controller

* remove h2m playlist

* bump version to 2.5.4

* Fix value null exception when bindable inlines change

Author: tobibodamer

H2MLauncher.Core/Game/H2MCommunicationService.cs

@@ -273,7 +273,7 @@ private async Task<bool> ExecuteCommandAsync(string[] commands, bool bringGameWi
 
                 foreach (string command in commands)
                 {
-                    if (WriteToConsoleInput(command + "\r"))
+                    if (!WriteToConsoleInput(command + "\r"))
                     {
                         _logger.LogWarning("Could not write command {command} to console input", command);
                     }

H2MLauncher.UI/Properties/AssemblyInfo.cs

@@ -13,7 +13,7 @@
 
 
 
-[assembly: AssemblyVersion("2.5.3.0")]
-[assembly: AssemblyFileVersion("2.5.3.0")]
+[assembly: AssemblyVersion("2.5.4.0")]
+[assembly: AssemblyFileVersion("2.5.4.0")]
 [assembly: AssemblyTitle("Better H2M-Launcher")]
 [assembly: SupportedOSPlatform("windows")]

H2MLauncher.UI/View/Behaviors/TextBlockExtensions.cs

@@ -28,10 +28,14 @@ private static void OnBindableInlinesChanged(DependencyObject d, DependencyPrope
                 return;
             }
 
-            if (target != null)
+            if (target is not null)
             {
                 target.Inlines.Clear();
-                target.Inlines.AddRange(((System.Collections.IEnumerable)e.NewValue));
+
+                if (e.NewValue is not null)
+                {
+                    target.Inlines.AddRange(((System.Collections.IEnumerable)e.NewValue));
+                }
             }
         }
     }

MatchmakingServer/Controllers/PlaylistsController.cs

@@ -26,7 +26,6 @@ public class PlaylistsController : ControllerBase
         private readonly IMemoryCache _memoryCache;
         private readonly ServerStore _serverStore;
         private readonly MatchmakingService _matchmakingService;
-        private readonly IGameServerInfoService<GameServer> _udpGameServerCommunicationService;
         private readonly IGameServerInfoService<GameServer> _tcpGameServerCommunicationService;
         private readonly ILogger<PlaylistsController> _logger;
 
@@ -38,8 +37,7 @@ public PlaylistsController(
             MatchmakingService matchmakingService,
             ServerStore serverStore,
             IMemoryCache memoryCache,
-            [FromKeyedServices("UDP")] IGameServerInfoService<GameServer> udpGameServerCommunicationService,
-            [FromKeyedServices("TCP")] IGameServerInfoService<GameServer> tcpGameServerCommunicationService,
+            IGameServerInfoService<GameServer> tcpGameServerCommunicationService,
             ILogger<PlaylistsController> logger,
             PlaylistStore playlistStore)
         {
@@ -48,7 +46,6 @@ public PlaylistsController(
             _matchmakingService = matchmakingService;
             _serverStore = serverStore;
             _memoryCache = memoryCache;
-            _udpGameServerCommunicationService = udpGameServerCommunicationService;
             _tcpGameServerCommunicationService = tcpGameServerCommunicationService;
             _logger = logger;
             _playlistStore = playlistStore;
@@ -181,35 +178,29 @@ private async Task<int> GetPlayerCountAsync(PlaylistDbo playlist)
 
                     _logger.LogDebug("Requesting game server info for {numServers}", serverToRequest.Count);
 
-                    if (playlist.Id.StartsWith("HMW", StringComparison.OrdinalIgnoreCase))
+                    CancellationTokenSource timeoutCancellation = new(3000);
+                    try
                     {
-                        CancellationTokenSource timeoutCancellation = new(1500);
-                        try
-                        {
-                            // request HMW servers with HTTP
-                            await serverToRequest
-                                .Select((s) => _tcpGameServerCommunicationService.GetInfoAsync(s, timeoutCancellation.Token).ContinueWith(t =>
+                        // request HMW servers with HTTP
+                        await serverToRequest
+                            .Select((s) =>
+                            {
+                                return _tcpGameServerCommunicationService.GetInfoAsync(s, timeoutCancellation.Token)
+                                .ContinueWith(t =>
                                 {
                                     if (t.IsCompletedSuccessfully && t.Result is not null)
                                     {
+                                        _logger.LogInformation("{serverName}: {playerCount}", t.Result.HostName, t.Result.Clients - t.Result.Bots);
                                         Interlocked.Add(ref playerCount, t.Result.Clients - t.Result.Bots);
                                     }
-                                }))
-                                .WhenAll();
-                        }
-                        catch (OperationCanceledException) { }
-                        finally
-                        {
-                            timeoutCancellation.Dispose();
-                        }
+                                });
+                            })
+                            .WhenAll();
                     }
-                    else
+                    catch (OperationCanceledException) { }
+                    finally
                     {
-                        // request server info of all remaining servers
-                        playerCount += await _udpGameServerCommunicationService
-                             .GetAllInfoAsync(serverToRequest, requestTimeoutInMs: 1000)
-                             .Select(r => r.info?.RealPlayerCount ?? 0)
-                             .SumAsync();
+                        timeoutCancellation.Dispose();
                     }
 
                     return playerCount;

MatchmakingServer/appsettings.json

@@ -53,34 +53,6 @@
   "ServerSettings": {
     "PlayerCountCacheExpirationInS": 240,
     "Playlists": [
-      {
-        "Id": "Default",
-        "Name": "Default Mixed Modes (H2M)",
-        "Servers": [
-          "23.26.130.20:27016",
-          "188.64.33.38:5083",
-          "154.12.244.58:27018",
-          "57.128.171.20:27016",
-          "185.249.225.191:27026",
-          "149.202.89.208:27019",
-          "51.81.110.227:27021",
-          "51.81.110.227:27019",
-          "51.81.110.227:27015",
-          "116.202.156.245:27022",
-          "38.60.136.95:27016",
-          "103.51.114.235:27017",
-          "45.61.162.36:27018",
-          "45.61.162.36:27020",
-          "136.243.124.149:27018",
-          "94.130.65.242:27016",
-          "157.90.6.163:27021",
-          "h2m.sinist3r.lol:37020",
-          "195.90.210.175:27016",
-          "195.90.210.175:27017",
-          "73.91.14.209:27016",
-          "38.45.100.46:27016"
-        ]
-      },
       {
         "Id": "HMW-Official",
         "Name": "HMW Official",

docker-compose.yml

@@ -62,7 +62,8 @@ services:
         condition: service_healthy
 
   postgres:
-    image: postgres:15.4-alpine
+    image: postgres:17-alpine
+    user: ${UID:-1001}:${GID:-1001}
     restart: unless-stopped
     ports:
       - "127.0.0.1:5432:5432"

nginx/Dockerfile

@@ -3,7 +3,7 @@ FROM nginx:1.28.0-alpine
 COPY nginx.conf.template /etc/nginx/nginx.conf.template
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
-RUN sudo chmod +x /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
 
 ENTRYPOINT ["/docker-entrypoint.sh"]