Fix bridged RuntimeInformation not updating

src/Tgstation.Server.Host/Components/Interop/Bridge/RuntimeInformation.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Tgstation.Server.Api.Models;
-using Tgstation.Server.Host.Core;
+using Tgstation.Server.Host.Components.Chat;
+using Tgstation.Server.Host.Components.Deployment;
 using Tgstation.Server.Host.System;
 
 namespace Tgstation.Server.Host.Components.Interop.Bridge
@@ -30,7 +31,7 @@ namespace Tgstation.Server.Host.Components.Interop.Bridge
 		/// <summary>
 		/// The <see cref="Api.Models.Instance.Name"/> of the owner at the time of launch
 		/// </summary>
-		public string InstanceName { get; }
+		public string InstanceName { get; set; }
 
 		/// <summary>
 		/// The <see cref="Api.Models.Internal.RevisionInformation"/> of the launch
@@ -50,31 +51,46 @@ namespace Tgstation.Server.Host.Components.Interop.Bridge
 		/// <summary>
 		/// Initializes a new instance of the <see cref="RuntimeInformation"/> <see langword="class"/>.
 		/// </summary>
-		/// <param name="assemblyInformationProvider">The <see cref="IAssemblyInformationProvider"/> to use.</param>
-		/// <param name="serverPortProvider">The <see cref="IServerPortProvider"/> used to set the value of <see cref="ServerPort"/>.</param>
-		/// <param name="testMerges">An <see cref="IEnumerable{T}"/> used to construct the value of <see cref="TestMerges"/>.</param>
-		/// <param name="chatChannels">The <see cref="Chat.ChannelRepresentation"/>s for the <see cref="ChatUpdate"/>.</param>
-		/// <param name="instance">The <see cref="Instance"/> used to set <see cref="InstanceName"/>.</param>
-		/// <param name="revision">The value of <see cref="RevisionInformation"/>.</param>
+		/// <param name="chatTrackingContext">The <see cref="IChatTrackingContext"/> to use.</param>
+		/// <param name="dmbProvider">The <see cref="IDmbProvider"/> to get revision information from.</param>
+		/// <param name="serverVersion">The value of <see cref="ServerVersion"/>.</param>
+		/// <param name="instanceName">The value of <see cref="InstanceName"/>.</param>
 		/// <param name="securityLevel">The value of <see cref="SecurityLevel"/>.</param>
+		/// <param name="serverPort">The value of <see cref="ServerPort"/>.</param>
 		/// <param name="apiValidateOnly">The value of <see cref="ApiValidateOnly"/>.</param>
 		public RuntimeInformation(
-			IAssemblyInformationProvider assemblyInformationProvider,
-			IServerPortProvider serverPortProvider,
-			IEnumerable<TestMergeInformation> testMerges,
-			IEnumerable<Chat.ChannelRepresentation> chatChannels,
-			Api.Models.Instance instance,
-			Api.Models.Internal.RevisionInformation revision,
+			IChatTrackingContext chatTrackingContext,
+			IDmbProvider dmbProvider,
+			Version serverVersion,
+			string instanceName,
 			DreamDaemonSecurity? securityLevel,
+			ushort serverPort,
 			bool apiValidateOnly)
-			: base(chatChannels)
+			: base(chatTrackingContext?.Channels ?? throw new ArgumentNullException(nameof(chatTrackingContext)))
 		{
-			ServerVersion = assemblyInformationProvider?.Version ?? throw new ArgumentNullException(nameof(assemblyInformationProvider));
-			ServerPort = serverPortProvider?.HttpApiPort ?? throw new ArgumentNullException(nameof(serverPortProvider));
-			TestMerges = testMerges?.ToList() ?? throw new ArgumentNullException(nameof(testMerges));
-			InstanceName = instance?.Name ?? throw new ArgumentNullException(nameof(instance));
-			Revision = revision ?? throw new ArgumentNullException(nameof(revision));
+			if (dmbProvider == null)
+				throw new ArgumentNullException(nameof(dmbProvider));
+
+			ServerVersion = serverVersion ?? throw new ArgumentNullException(nameof(serverVersion));
+
+			Revision = new Api.Models.Internal.RevisionInformation
+			{
+				CommitSha = dmbProvider.CompileJob.RevisionInformation.CommitSha,
+				OriginCommitSha = dmbProvider.CompileJob.RevisionInformation.OriginCommitSha
+			};
+
+			TestMerges = (IReadOnlyCollection<TestMergeInformation>)dmbProvider
+				.CompileJob
+				.RevisionInformation
+				.ActiveTestMerges?
+				.Select(x => x.TestMerge)
+				.Select(x => new TestMergeInformation(x, Revision))
+				.ToList()
+				?? Array.Empty<TestMergeInformation>();
+
+			InstanceName = instanceName ?? throw new ArgumentNullException(nameof(instanceName));
 			SecurityLevel = securityLevel;
+			ServerPort = serverPort;
 			ApiValidateOnly = apiValidateOnly;
 		}
 	}

src/Tgstation.Server.Host/Components/Session/SessionController.cs

@@ -458,7 +458,14 @@ namespace Tgstation.Server.Host.Components.Session
 								};
 						}
 
-						response.RuntimeInformation = reattachInformation.RuntimeInformation;
+						response.RuntimeInformation = new RuntimeInformation(
+							chatTrackingContext,
+							reattachInformation.Dmb,
+							reattachInformation.RuntimeInformation.ServerVersion,
+							reattachInformation.RuntimeInformation.InstanceName,
+							reattachInformation.RuntimeInformation.SecurityLevel,
+							reattachInformation.RuntimeInformation.ServerPort,
+							reattachInformation.RuntimeInformation.ApiValidateOnly);
 
 						// Load custom commands
 						chatTrackingContext.CustomCommands = parameters.CustomCommands;
@@ -671,7 +678,10 @@ namespace Tgstation.Server.Host.Components.Session
 
 		/// <inheritdoc />
 		public Task InstanceRenamed(string newInstanceName, CancellationToken cancellationToken)
-			=> SendCommand(new TopicParameters(newInstanceName), cancellationToken);
+		{
+			reattachInformation.RuntimeInformation.InstanceName = newInstanceName;
+			return SendCommand(new TopicParameters(newInstanceName), cancellationToken);
+		}
 
 		/// <inheritdoc />
 		public Task UpdateChannels(IEnumerable<ChannelRepresentation> newChannels, CancellationToken cancellationToken)

src/Tgstation.Server.Host/Components/Session/SessionControllerFactory.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Globalization;
-using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
@@ -457,31 +456,14 @@ namespace Tgstation.Server.Host.Components.Session
 			IChatTrackingContext chatTrackingContext,
 			DreamDaemonSecurity? securityLevel,
 			bool apiValidateOnly)
-		{
-			var revisionInfo = new Api.Models.Internal.RevisionInformation
-			{
-				CommitSha = dmbProvider.CompileJob.RevisionInformation.CommitSha,
-				OriginCommitSha = dmbProvider.CompileJob.RevisionInformation.OriginCommitSha
-			};
-
-			var testMerges = dmbProvider
-				.CompileJob
-				.RevisionInformation
-				.ActiveTestMerges?
-				.Select(x => x.TestMerge)
-				.Select(x => new TestMergeInformation(x, revisionInfo))
-				?? Enumerable.Empty<TestMergeInformation>();
-
-			return new RuntimeInformation(
-				assemblyInformationProvider,
-				serverPortProvider,
-				testMerges,
-				chatTrackingContext.Channels,
-				instance,
-				revisionInfo,
+			=> new RuntimeInformation(
+				chatTrackingContext,
+				dmbProvider,
+				assemblyInformationProvider.Version,
+				instance.Name,
 				securityLevel,
+				serverPortProvider.HttpApiPort,
 				apiValidateOnly);
-		}
 
 		/// <summary>
 		/// Make sure the BYOND pager is not running.