From 9d4d49560e42968b6962ce578de207a63dfce1d3 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Tue, 22 Mar 2022 20:01:50 +1000 Subject: [PATCH] Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients. --- .../Lib/Model/RCONParameters.cs | 2 +- src/ARKServerManager/Lib/ServerApp.cs | 36 +++++++++--------- .../Lib/ServerProfileSnapshot.cs | 6 ++- src/ARKServerManager/Lib/ServerRCON.cs | 4 +- src/ARKServerManager/Lib/ServerRuntime.cs | 2 +- src/ARKServerManager/VersionFeed.xml | 25 ++++++++++++- src/ARKServerManager/VersionFeedBeta.xml | 8 ++-- .../Windows/OpenRCONWindow.xaml.cs | 2 +- .../Windows/RCONWindow.xaml.cs | 2 +- src/ConanServerManager/Lib/ServerApp.cs | 36 +++++++++--------- src/ConanServerManager/VersionFeed.xml | 25 ++++++++++++- src/ConanServerManager/VersionFeedBeta.xml | 37 ++++--------------- 12 files changed, 107 insertions(+), 78 deletions(-) diff --git a/src/ARKServerManager/Lib/Model/RCONParameters.cs b/src/ARKServerManager/Lib/Model/RCONParameters.cs index 4a56d55e..27bb0e5a 100644 --- a/src/ARKServerManager/Lib/Model/RCONParameters.cs +++ b/src/ARKServerManager/Lib/Model/RCONParameters.cs @@ -27,7 +27,7 @@ namespace ServerManagerTool.Lib public int RCONPort { get; set; } - public string AdminPassword { get; set; } + public string RCONPassword { get; set; } public int MaxPlayers { diff --git a/src/ARKServerManager/Lib/ServerApp.cs b/src/ARKServerManager/Lib/ServerApp.cs index 2facb227..7d23d30d 100644 --- a/src/ARKServerManager/Lib/ServerApp.cs +++ b/src/ARKServerManager/Lib/ServerApp.cs @@ -2550,6 +2550,18 @@ namespace ServerManagerTool.Lib Debug.WriteLine($"[INFO] (Branch {GetBranchName(branchName) ?? "unknown"}) {message}"); } + private void LogProfileDebug(string message, bool includeProgressCallback = true) + { + message = message ?? string.Empty; + + _loggerProfile?.Debug(message); + + if (includeProgressCallback) + ProgressCallback?.Invoke(0, $"{message}"); + + Debug.WriteLine($"[DEBUG] (Profile {_profile?.ProfileName ?? "unknown"}) {message}"); + } + private void LogProfileError(string error, bool includeProgressCallback = true) { if (string.IsNullOrWhiteSpace(error)) @@ -2721,37 +2733,27 @@ namespace ServerManagerTool.Lib var server = QueryMaster.ServerQuery.GetServerInstance(QueryMaster.EngineType.Source, endPoint, sendTimeOut: 10000, receiveTimeOut: 10000); if (server == null) { -#if DEBUG - LogProfileMessage($"FAILED: {nameof(SetupRconConsole)} - ServerQuery could not be created.", false); -#endif + LogProfileDebug($"FAILED: {nameof(SetupRconConsole)} - ServerQuery could not be created.", false); return; } -#if DEBUG - LogProfileMessage($"SUCCESS: {nameof(SetupRconConsole)} - ServerQuery was created.", false); -#endif + LogProfileDebug($"SUCCESS: {nameof(SetupRconConsole)} - ServerQuery was created.", false); Task.Delay(1000).Wait(); - _rconConsole = server.GetControl(_profile.AdminPassword); + _rconConsole = server.GetControl(_profile.RCONPassword); if (_rconConsole == null) { -#if DEBUG - LogProfileMessage($"FAILED: {nameof(SetupRconConsole)} - RconConsole could not be created ({_profile.AdminPassword}).", false); -#endif + LogProfileDebug($"FAILED: {nameof(SetupRconConsole)} - RconConsole could not be created ({_profile.RCONPassword}).", false); return; } -#if DEBUG - LogProfileMessage($"SUCCESS: {nameof(SetupRconConsole)} - RconConsole was created ({_profile.AdminPassword}).", false); -#endif + LogProfileDebug($"SUCCESS: {nameof(SetupRconConsole)} - RconConsole was created ({_profile.RCONPassword}).", false); } catch (Exception ex) { -#if DEBUG - LogProfileMessage($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.Message}", false); - LogProfileMessage($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.StackTrace}", false); -#endif + LogProfileDebug($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.Message}", false); + LogProfileDebug($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.StackTrace}", false); } } diff --git a/src/ARKServerManager/Lib/ServerProfileSnapshot.cs b/src/ARKServerManager/Lib/ServerProfileSnapshot.cs index ee75d889..86c3acdf 100644 --- a/src/ARKServerManager/Lib/ServerProfileSnapshot.cs +++ b/src/ARKServerManager/Lib/ServerProfileSnapshot.cs @@ -25,12 +25,13 @@ namespace ServerManagerTool.Lib public int QueryPort; public bool RCONEnabled; public int RCONPort; + public string RCONPassword; public string ServerMap; public string ServerMapModId; public string TotalConversionModId; public IEnumerable ServerModIds; public string MOTD; - public int MotDDuration; + public int MOTDDuration; public bool MOTDIntervalEnabled; public int MOTDInterval; public bool ForceRespawnDinos; @@ -75,12 +76,13 @@ namespace ServerManagerTool.Lib QueryPort = profile.QueryPort, RCONEnabled = profile.RCONEnabled, RCONPort = profile.RCONPort, + RCONPassword = profile.AdminPassword, ServerMap = ServerProfile.GetProfileMapName(profile), ServerMapModId = ServerProfile.GetProfileMapModId(profile), TotalConversionModId = profile.TotalConversionModId ?? string.Empty, ServerModIds = ModUtils.GetModIdList(profile.ServerModIds), MOTD = profile.MOTD, - MotDDuration = Math.Max(profile.MOTDDuration, 10), + MOTDDuration = Math.Max(profile.MOTDDuration, 10), MOTDIntervalEnabled = profile.MOTDInterval.HasValue && !string.IsNullOrWhiteSpace(profile.MOTD), MOTDInterval = Math.Max(1, Math.Min(int.MaxValue, profile.MOTDInterval.Value)), ForceRespawnDinos = profile.ForceRespawnDinos, diff --git a/src/ARKServerManager/Lib/ServerRCON.cs b/src/ARKServerManager/Lib/ServerRCON.cs index 482d98c0..6dd0b8fc 100644 --- a/src/ARKServerManager/Lib/ServerRCON.cs +++ b/src/ARKServerManager/Lib/ServerRCON.cs @@ -197,7 +197,7 @@ namespace ServerManagerTool.Lib var endpoint = new IPEndPoint(this.rconParams.RCONHostIP, this.rconParams.RCONPort); var server = QueryMaster.ServerQuery.GetServerInstance(QueryMaster.EngineType.Source, endpoint); - this.console = server.GetControl(this.rconParams.AdminPassword); + this.console = server.GetControl(this.rconParams.RCONPassword); return this.console != null; } @@ -473,7 +473,7 @@ namespace ServerManagerTool.Lib } this.maxCommandRetries = 10; - _errorLogger.Error($"Failed to connect to RCON at {this.rconParams.RCONHostIP}:{this.rconParams.RCONPort} with {this.rconParams.AdminPassword}. {lastException.Message}"); + _errorLogger.Error($"Failed to connect to RCON at {this.rconParams.RCONHostIP}:{this.rconParams.RCONPort} with {this.rconParams.RCONPassword}. {lastException.Message}"); throw new Exception($"Command failed to send after {maxCommandRetries} attempts. Last exception: {lastException.Message}", lastException); } #endregion diff --git a/src/ARKServerManager/Lib/ServerRuntime.cs b/src/ARKServerManager/Lib/ServerRuntime.cs index a124b216..78a39566 100644 --- a/src/ARKServerManager/Lib/ServerRuntime.cs +++ b/src/ARKServerManager/Lib/ServerRuntime.cs @@ -1113,7 +1113,7 @@ namespace ServerManagerTool.Lib Task.Delay(1000).Wait(); - _rconConsole = server.GetControl(this.ProfileSnapshot.AdminPassword); + _rconConsole = server.GetControl(this.ProfileSnapshot.RCONPassword); } catch (Exception) { diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 9aa52b7d..75e32221 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -7,9 +7,32 @@ 2022-03-22T00:00:00Z + + urn:uuid:B6B3F1F1-610F-4294-9891-43DD245A5E0A + 1.1.421 (1.1.421.1) + 1.1.421.1 + + 2022-03-22T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + + urn:uuid:344B5D20-74E5-484C-A548-200A4ADAE3A2 - 1.1.419 (1.1.420.1) + 1.1.420 (1.1.420.1) 1.1.420.1 2022-03-22T00:00:00Z diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 791893ba..4c032a0d 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -8,9 +8,9 @@ 2022-03-22T00:00:00Z - urn:uuid:344B5D20-74E5-484C-A548-200A4ADAE3A2 - 1.1.419 (1.1.420.1) - 1.1.420.1 + urn:uuid:B6B3F1F1-610F-4294-9891-43DD245A5E0A + 1.1.421 (1.1.421.1) + 1.1.421.1 2022-03-22T00:00:00Z @@ -19,7 +19,7 @@ BUGFIX
    -
  • Fixed the issue where the Dino Tame settings would be reset when opening the server manager.
    • +
  • Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients.

diff --git a/src/ARKServerManager/Windows/OpenRCONWindow.xaml.cs b/src/ARKServerManager/Windows/OpenRCONWindow.xaml.cs index d72f780b..5191c35c 100644 --- a/src/ARKServerManager/Windows/OpenRCONWindow.xaml.cs +++ b/src/ARKServerManager/Windows/OpenRCONWindow.xaml.cs @@ -59,7 +59,7 @@ namespace ServerManagerTool ProfileId = $"{ServerIP}-{RCONPort}".Replace(".", "-"), RCONHost = ServerIP, RCONPort = RCONPort, - AdminPassword = Password, + RCONPassword = Password, InstallDirectory = String.Empty, AltSaveDirectoryName = String.Empty, PGM_Enabled = false, diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml.cs b/src/ARKServerManager/Windows/RCONWindow.xaml.cs index fb75190a..10ae25a5 100644 --- a/src/ARKServerManager/Windows/RCONWindow.xaml.cs +++ b/src/ARKServerManager/Windows/RCONWindow.xaml.cs @@ -659,7 +659,6 @@ namespace ServerManagerTool PlayerListWidth = server.Profile.RCONPlayerListWidth, Server = server, - AdminPassword = server.Runtime.ProfileSnapshot.AdminPassword, InstallDirectory = server.Runtime.ProfileSnapshot.InstallDirectory, AltSaveDirectoryName = server.Runtime.ProfileSnapshot.AltSaveDirectoryName, ProfileId = server.Runtime.ProfileSnapshot.ProfileId, @@ -667,6 +666,7 @@ namespace ServerManagerTool MaxPlayers = server.Runtime.MaxPlayers, RCONHost = server.Runtime.ProfileSnapshot.ServerIPAddress.ToString(), RCONPort = server.Runtime.ProfileSnapshot.RCONPort, + RCONPassword = server.Runtime.ProfileSnapshot.RCONPassword, PGM_Enabled = server.Profile.PGM_Enabled, PGM_Name = server.Profile.PGM_Name, diff --git a/src/ConanServerManager/Lib/ServerApp.cs b/src/ConanServerManager/Lib/ServerApp.cs index d91c22cf..8cdd1d85 100644 --- a/src/ConanServerManager/Lib/ServerApp.cs +++ b/src/ConanServerManager/Lib/ServerApp.cs @@ -2443,6 +2443,18 @@ namespace ServerManagerTool.Lib Debug.WriteLine($"[INFO] (Branch {GetBranchName(branchName) ?? "unknown"}) {message}"); } + private void LogProfileDebug(string message, bool includeProgressCallback = true) + { + message = message ?? string.Empty; + + _loggerProfile?.Debug(message); + + if (includeProgressCallback) + ProgressCallback?.Invoke(0, $"{message}"); + + Debug.WriteLine($"[DEBUG] (Profile {_profile?.ProfileName ?? "unknown"}) {message}"); + } + private void LogProfileError(string error, bool includeProgressCallback = true) { if (string.IsNullOrWhiteSpace(error)) @@ -2614,37 +2626,27 @@ namespace ServerManagerTool.Lib var server = QueryMaster.ServerQuery.GetServerInstance(QueryMaster.EngineType.Source, endPoint, sendTimeOut: 10000, receiveTimeOut: 10000); if (server == null) { -#if DEBUG - LogProfileMessage($"FAILED: {nameof(SetupRconConsole)} - ServerQuery could not be created.", false); -#endif + LogProfileDebug($"FAILED: {nameof(SetupRconConsole)} - ServerQuery could not be created.", false); return; } -#if DEBUG - LogProfileMessage($"SUCCESS: {nameof(SetupRconConsole)} - ServerQuery was created.", false); -#endif + LogProfileDebug($"SUCCESS: {nameof(SetupRconConsole)} - ServerQuery was created.", false); Task.Delay(1000).Wait(); - _rconConsole = server.GetControl(_profile.AdminPassword); + _rconConsole = server.GetControl(_profile.RconPassword); if (_rconConsole == null) { -#if DEBUG - LogProfileMessage($"FAILED: {nameof(SetupRconConsole)} - RconConsole could not be created ({_profile.AdminPassword}).", false); -#endif + LogProfileDebug($"FAILED: {nameof(SetupRconConsole)} - RconConsole could not be created ({_profile.RconPassword}).", false); return; } -#if DEBUG - LogProfileMessage($"SUCCESS: {nameof(SetupRconConsole)} - RconConsole was created ({_profile.AdminPassword}).", false); -#endif + LogProfileDebug($"SUCCESS: {nameof(SetupRconConsole)} - RconConsole was created ({_profile.RconPassword}).", false); } catch (Exception ex) { -#if DEBUG - LogProfileMessage($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.Message}", false); - LogProfileMessage($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.StackTrace}", false); -#endif + LogProfileDebug($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.Message}", false); + LogProfileDebug($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.StackTrace}", false); } } diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 6bb472da..41fa0899 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -5,7 +5,30 @@ Conan Server Manager Version Feed This is the Conan Server Manager release version feed. - 2022-03-03T00:00:00Z + 2022-03-22T00:00:00Z + + + urn:uuid:674D8E81-FB1B-42D9-8309-41AE40D5192F + 1.1.64 (1.1.64.1) + 1.1.64.1 + + 2022-03-22T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284 diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 7205fe02..d7547e80 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -5,44 +5,21 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2022-03-03T00:00:00Z + 2022-03-22T00:00:00Z - urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284 - 1.1.63 (1.1.63.2) - 1.1.63.2 + urn:uuid:674D8E81-FB1B-42D9-8309-41AE40D5192F + 1.1.64 (1.1.64.1) + 1.1.64.1 - 2022-03-03T00:00:00Z + 2022-03-22T00:00:00Z

- CHANGE + BUGFIX

    -
  • Misc. Language File Updates.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284 - 1.1.63 (1.1.63.1) - 1.1.63.1 - - 2022-03-02T00:00:00Z - -
-

- CHANGE -
-

    -
  • Branch Details moved to new Server Details section, easier to perform profile sync.
    • +
  • Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients.