Merge branch 'dev' into unbased

build/Version.props

@@ -6,7 +6,7 @@
     <TgsConfigVersion>2.1.0</TgsConfigVersion>
     <TgsApiVersion>7.3.0</TgsApiVersion>
     <TgsClientVersion>8.3.0</TgsClientVersion>
-    <TgsDmapiVersion>5.2.3</TgsDmapiVersion>
+    <TgsDmapiVersion>5.2.4</TgsDmapiVersion>
     <TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
     <TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
   </PropertyGroup>

src/DMAPI/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.2.3"
+#define TGS_DMAPI_VERSION "5.2.4"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

src/DMAPI/tgs/v5/api.dm

@@ -15,8 +15,10 @@
 	var/datum/tgs_revision_information/revision
 	var/list/chat_channels
 
+	var/initialized = FALSE
+
 /datum/tgs_api/v5/ApiVersion()
-	return new /datum/tgs_version("5.2.3")
+	return new /datum/tgs_version("5.2.4")
 
 /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level)
 	server_port = world.params[DMAPI5_PARAM_SERVER_PORT]
@@ -79,6 +81,7 @@
 	chat_channels = list()
 	DecodeChannels(runtime_information)
 
+	initialized = TRUE
 	return TRUE
 
 /datum/tgs_api/v5/proc/RequireInitialBridgeResponse()
@@ -95,10 +98,13 @@
 	return json_encode(response)
 
 /datum/tgs_api/v5/OnTopic(T)
+	if(!initialized)
+		return FALSE	//continue world/Topic
+
 	var/list/params = params2list(T)
 	var/json = params[DMAPI5_TOPIC_DATA]
 	if(!json)
-		return FALSE	//continue world/Topic
+		return FALSE
 
 	var/list/topic_parameters = json_decode(json)
 	if(!topic_parameters)

src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using System;
 using Tgstation.Server.Host.Components.Interop.Converters;
@@ -33,7 +33,7 @@ namespace Tgstation.Server.Host.Components.Interop
 		/// <summary>
 		/// The DMAPI <see cref="Version"/> being used.
 		/// </summary>
-		public static readonly Version Version = new Version(5, 2, 3);
+		public static readonly Version Version = new Version(5, 2, 4);
 
 		/// <summary>
 		/// <see cref="JsonSerializerSettings"/> for use when communicating with the DMAPI.

tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs

@@ -89,7 +89,7 @@ namespace Tgstation.Server.Tests.Instance
 			var killTask = Task.Run(() =>
 			{
 				killTaskStarted.SetResult(null);
-				while (jobTcs.Task?.IsCompleted != true)
+				while (!jobTcs.Task.IsCompleted)
 					KillDD(false);
 			});
 
@@ -98,12 +98,12 @@ namespace Tgstation.Server.Tests.Instance
 			{
 				await killTaskStarted.Task;
 				var dumpTask = instanceClient.DreamDaemon.CreateDump(cancellationToken);
-				await killTask;
 				job = await WaitForJob(await dumpTask, 20, true, null, cancellationToken);
 			}
 			finally
 			{
 				jobTcs.SetResult(null);
+				await killTask;
 			}
 			Assert.IsTrue(job.ErrorCode == ErrorCode.DreamDaemonOffline || job.ErrorCode == ErrorCode.GCoreFailure, $"{job.ErrorCode}: {job.ExceptionDetails}");
 			await Task.Delay(TimeSpan.FromSeconds(20), cancellationToken);

tests/Tgstation.Server.Tests/IntegrationTest.cs

@@ -318,7 +318,7 @@ namespace Tgstation.Server.Tests
 					foreach (var job in jobs)
 					{
 						Assert.IsTrue(job.StartedAt.Value >= preStartupTime);
-						await jrt.WaitForJob(job, 120, false, null, cancellationToken);
+						await jrt.WaitForJob(job, 130, false, null, cancellationToken);
 					}
 
 					var dd = await instanceClient.DreamDaemon.Read(cancellationToken);