Further subdivision of the Components namespace

src/Tgstation.Server.Host/Components/Byond/ByondExecutableLock.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Byond
 {
 	/// <inheritdoc />
 	sealed class ByondExecutableLock : IByondExecutableLock

src/Tgstation.Server.Host/Components/Byond/ByondManager.cs

@@ -1,16 +1,13 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.IO;
 
-using MemoryStream = System.IO.MemoryStream;
-
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Byond
 {
 	/// <inheritdoc />
 	sealed class ByondManager : IByondManager

src/Tgstation.Server.Host/Components/Byond/IByondExecutableLock.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Byond
 {
 	/// <summary>
 	/// Represents usage of the two primary BYOND server executables

src/Tgstation.Server.Host/Components/Byond/IByondInstaller.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Byond
 {
 	/// <summary>
 	/// For downloading and installing BYOND extractions for a given system

src/Tgstation.Server.Host/Components/Byond/IByondManager.cs

@@ -3,7 +3,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Byond
 {
 	/// <summary>
 	/// For managing the BYOND installation

src/Tgstation.Server.Host/Components/Byond/PosixByondInstaller.cs

@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.IO;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Byond
 {
 	/// <summary>
 	/// <see cref="IByondInstaller"/> for Posix systems

src/Tgstation.Server.Host/Components/Byond/WindowsByondInstaller.cs

@@ -7,7 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.IO;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Byond
 {
 	/// <summary>
 	/// <see cref="IByondInstaller"/> for windows systems

src/Tgstation.Server.Host/Components/Compiler/DmbFactory.cs

@@ -8,7 +8,7 @@ using Tgstation.Server.Host.Core;
 using Tgstation.Server.Host.IO;
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Compiler
 {
 	/// <summary>
 	/// Standard <see cref="IDmbFactory"/>

src/Tgstation.Server.Host/Components/Compiler/DmbProvider.cs

@@ -2,7 +2,7 @@
 using Tgstation.Server.Host.IO;
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Compiler
 {
 	/// <inheritdoc />
 	sealed class DmbProvider : IDmbProvider

src/Tgstation.Server.Host/Components/Compiler/DreamMaker.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -9,11 +10,13 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Api.Models;
 using Tgstation.Server.Api.Models.Internal;
+using Tgstation.Server.Host.Components.Byond;
+using Tgstation.Server.Host.Components.Repository;
 using Tgstation.Server.Host.Components.Watchdog;
 using Tgstation.Server.Host.Core;
 using Tgstation.Server.Host.IO;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Compiler
 {
 	/// <inheritdoc />
 	sealed class DreamMaker : IDreamMaker
@@ -47,9 +50,9 @@ namespace Tgstation.Server.Host.Components
 		/// </summary>
 		readonly IIOManager ioManager;
 		/// <summary>
-		/// The <see cref="IConfiguration"/> for <see cref="DreamMaker"/>
+		/// The <see cref="StaticFiles.IConfiguration"/> for <see cref="DreamMaker"/>
 		/// </summary>
-		readonly IConfiguration configuration;
+		readonly StaticFiles.IConfiguration configuration;
 		/// <summary>
 		/// The <see cref="ISessionControllerFactory"/> for <see cref="DreamMaker"/>
 		/// </summary>
@@ -82,7 +85,7 @@ namespace Tgstation.Server.Host.Components
 		/// <param name="application">The value of <see cref="application"/></param>
 		/// <param name="eventConsumer">The value of <see cref="eventConsumer"/></param>
 		/// <param name="logger">The value of <see cref="logger"/></param>
-		public DreamMaker(IByondManager byond, IIOManager ioManager, IConfiguration configuration, ISessionControllerFactory sessionControllerFactory, ICompileJobConsumer compileJobConsumer, IApplication application, IEventConsumer eventConsumer, ILogger<DreamMaker> logger)
+		public DreamMaker(IByondManager byond, IIOManager ioManager, StaticFiles.IConfiguration configuration, ISessionControllerFactory sessionControllerFactory, ICompileJobConsumer compileJobConsumer, IApplication application, IEventConsumer eventConsumer, ILogger<DreamMaker> logger)
 		{
 			this.byond = byond;
 			this.ioManager = ioManager ?? throw new ArgumentNullException(nameof(ioManager));
@@ -286,8 +289,11 @@ namespace Tgstation.Server.Host.Components
 					}
 
 					if (!ddVerified)
+					{
 						//server never validated or compile failed
-						await Task.WhenAll(CleanupFailedCompile(), eventConsumer.HandleEvent(EventType.CompileFailure, new List<string> { job.ExitCode == 0 ? "1" : "0" }, cancellationToken)).ConfigureAwait(false);
+						await CleanupFailedCompile().ConfigureAwait(false);
+						await eventConsumer.HandleEvent(EventType.CompileFailure, new List<string> { job.ExitCode == 0 ? "1" : "0" }, cancellationToken).ConfigureAwait(false);
+					}
 					else
 					{
 						job.DMApiValidated = true;

src/Tgstation.Server.Host/Components/Compiler/ICompileJobConsumer.cs

@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Hosting;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Tgstation.Server.Host.Models;
+
+namespace Tgstation.Server.Host.Components.Compiler
+{
+	/// <summary>
+	/// Sink for <see cref="CompileJob"/>s
+	/// </summary>
+	interface ICompileJobConsumer : IHostedService, IDisposable
+	{
+		/// <summary>
+		/// Load a new <paramref name="job"/> into the <see cref="ICompileJobConsumer"/>
+		/// </summary>
+		/// <param name="job">The <see cref="CompileJob"/> to load</param>
+		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
+		/// <returns>A <see cref="Task"/> representing the running operation</returns>
+		Task LoadCompileJob(CompileJob job, CancellationToken cancellationToken);
+	}
+}

src/Tgstation.Server.Host/Components/Compiler/IDmbFactory.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Compiler
 {
 	/// <summary>
 	/// Factory for <see cref="IDmbProvider"/>s

src/Tgstation.Server.Host/Components/Compiler/IDreamMaker.cs

@@ -1,8 +1,9 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Tgstation.Server.Host.Components.Repository;
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Compiler
 {
 	/// <summary>
 	/// For managing the compiler

src/Tgstation.Server.Host/Components/Compiler/TemporaryDmbProvider.cs

@@ -1,7 +1,7 @@
 using System;
 using Tgstation.Server.Host.Models;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Compiler
 {
 	/// <summary>
 	/// Temporary <see cref="IDmbProvider"/>

src/Tgstation.Server.Host/Components/ICompileJobConsumer.cs

@@ -1,13 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Tgstation.Server.Host.Models;
-
-namespace Tgstation.Server.Host.Components
-{
-	interface ICompileJobConsumer : IHostedService, IDisposable
-	{
-		Task LoadCompileJob(CompileJob job, CancellationToken cancellationToken);
-	}
-}

src/Tgstation.Server.Host/Components/IInstance.cs

@@ -1,7 +1,11 @@
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using System;
 using System.Threading.Tasks;
+using Tgstation.Server.Host.Components.Byond;
 using Tgstation.Server.Host.Components.Chat;
+using Tgstation.Server.Host.Components.Compiler;
+using Tgstation.Server.Host.Components.Repository;
 using Tgstation.Server.Host.Components.Watchdog;
 
 namespace Tgstation.Server.Host.Components
@@ -37,9 +41,9 @@ namespace Tgstation.Server.Host.Components
 		IChat Chat { get; }
 
 		/// <summary>
-		/// The <see cref="IConfiguration"/> for the <see cref="IInstance"/>
+		/// The <see cref="StaticFiles.IConfiguration"/> for the <see cref="IInstance"/>
 		/// </summary>
-		IConfiguration Configuration { get; }
+		StaticFiles.IConfiguration Configuration { get; }
 
 		/// <summary>
 		/// Get the <see cref="Api.Models.Instance"/> associated with the <see cref="IInstance"/>

src/Tgstation.Server.Host/Components/Instance.cs

@@ -1,9 +1,13 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Tgstation.Server.Host.Components.Byond;
 using Tgstation.Server.Host.Components.Chat;
+using Tgstation.Server.Host.Components.Compiler;
+using Tgstation.Server.Host.Components.Repository;
 using Tgstation.Server.Host.Components.Watchdog;
 using Tgstation.Server.Host.Core;
 
@@ -28,7 +32,7 @@ namespace Tgstation.Server.Host.Components
 		public IChat Chat { get; }
 
 		/// <inheritdoc />
-		public IConfiguration Configuration { get; }
+		public StaticFiles.IConfiguration Configuration { get; }
 		
 		/// <summary>
 		/// The <see cref="ICompileJobConsumer"/> for the <see cref="Instance"/>
@@ -59,7 +63,20 @@ namespace Tgstation.Server.Host.Components
 		/// </summary>
 		CancellationTokenSource timerCts;
 
-		public Instance(Api.Models.Instance metadata, IRepositoryManager repositoryManager, IByondManager byondManager, IDreamMaker dreamMaker, IWatchdog watchdog, IChat chat, IConfiguration configuration, ICompileJobConsumer compileJobConsumer, IDatabaseContextFactory databaseContextFactory, IDmbFactory dmbFactory)
+		/// <summary>
+		/// Construct an <see cref="Instance"/>
+		/// </summary>
+		/// <param name="metadata">The value of <see cref="metadata"/></param>
+		/// <param name="repositoryManager">The value of <see cref="RepositoryManager"/></param>
+		/// <param name="byondManager">The value of <see cref="ByondManager"/></param>
+		/// <param name="dreamMaker">The value of <see cref="DreamMaker"/></param>
+		/// <param name="watchdog">The value of <see cref="Watchdog"/></param>
+		/// <param name="chat">The value of <see cref="Chat"/></param>
+		/// <param name="configuration">The value of <see cref="Configuration"/></param>
+		/// <param name="compileJobConsumer">The value of <see cref="compileJobConsumer"/></param>
+		/// <param name="databaseContextFactory">The value of <see cref="databaseContextFactory"/></param>
+		/// <param name="dmbFactory">The value of <see cref="dmbFactory"/></param>
+		public Instance(Api.Models.Instance metadata, IRepositoryManager repositoryManager, IByondManager byondManager, IDreamMaker dreamMaker, IWatchdog watchdog, IChat chat, StaticFiles.IConfiguration configuration, ICompileJobConsumer compileJobConsumer, IDatabaseContextFactory databaseContextFactory, IDmbFactory dmbFactory)
 		{
 			this.metadata = metadata ?? throw new ArgumentNullException(nameof(metadata));
 			RepositoryManager = repositoryManager ?? throw new ArgumentNullException(nameof(repositoryManager));

src/Tgstation.Server.Host/Components/InstanceFactory.cs

@@ -1,8 +1,11 @@
 using Byond.TopicSender;
 using Microsoft.Extensions.Logging;
 using System;
+using Tgstation.Server.Host.Components.Byond;
 using Tgstation.Server.Host.Components.Chat;
 using Tgstation.Server.Host.Components.Chat.Commands;
+using Tgstation.Server.Host.Components.Compiler;
+using Tgstation.Server.Host.Components.Repository;
 using Tgstation.Server.Host.Components.Watchdog;
 using Tgstation.Server.Host.Core;
 using Tgstation.Server.Host.IO;
@@ -133,7 +136,7 @@ namespace Tgstation.Server.Host.Components
 				try
 				{
 					var byond = new ByondManager(byondIOManager, byondInstaller, loggerFactory.CreateLogger<ByondManager>());
-					var configuration = new Configuration(configurationIoManager, synchronousIOManager, symlinkFactory, loggerFactory.CreateLogger<Configuration>());
+					var configuration = new StaticFiles.Configuration(configurationIoManager, synchronousIOManager, symlinkFactory, loggerFactory.CreateLogger<StaticFiles.Configuration>());
 
 					var chat = chatFactory.CreateChat(metadata.ChatSettings);
 					try

src/Tgstation.Server.Host/Components/ReattachInfoHandler.cs

@@ -3,6 +3,7 @@ using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Tgstation.Server.Host.Components.Compiler;
 using Tgstation.Server.Host.Components.Watchdog;
 using Tgstation.Server.Host.Core;
 

src/Tgstation.Server.Host/Components/Repository/IRepository.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Repository
 {
 	/// <summary>
 	/// Represents an on-disk git repository

src/Tgstation.Server.Host/Components/Repository/IRepositoryManager.cs

@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Repository
 {
 	/// <summary>
 	/// Factory for creating and loading <see cref="IRepository"/>s

src/Tgstation.Server.Host/Components/Repository/Repository.cs

@@ -7,7 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.IO;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Repository
 {
 	/// <inheritdoc />
 	sealed class Repository : IRepository

src/Tgstation.Server.Host/Components/Repository/RepositoryManager.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Tgstation.Server.Api.Models.Internal;
 using Tgstation.Server.Host.IO;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.Repository
 {
 	/// <inheritdoc />
 	sealed class RepositoryManager : IRepositoryManager

src/Tgstation.Server.Host/Components/StaticFiles/Configuration.cs

@@ -11,7 +11,7 @@ using Tgstation.Server.Api.Models;
 using Tgstation.Server.Host.IO;
 using Tgstation.Server.Host.Security;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.StaticFiles
 {
 	/// <inheritdoc />
 	sealed class Configuration : IConfiguration

src/Tgstation.Server.Host/Components/StaticFiles/IConfiguration.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Tgstation.Server.Api.Models;
 using Tgstation.Server.Host.Security;
 
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.StaticFiles
 {
 	/// <summary>
 	/// For managing the Configuration directory

src/Tgstation.Server.Host/Components/StaticFiles/ServerSideModifications.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Tgstation.Server.Host.Components
+namespace Tgstation.Server.Host.Components.StaticFiles
 {
 	/// <summary>
 	/// Represents code modifications via configuration

src/Tgstation.Server.Host/Components/Watchdog/Executor.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Globalization;
 using Tgstation.Server.Api.Models;
 using Tgstation.Server.Api.Models.Internal;
+using Tgstation.Server.Host.Components.Byond;
 
 namespace Tgstation.Server.Host.Components.Watchdog
 {

src/Tgstation.Server.Host/Components/Watchdog/IExecutor.cs

@@ -1,4 +1,5 @@
 using Tgstation.Server.Api.Models.Internal;
+using Tgstation.Server.Host.Components.Byond;
 
 namespace Tgstation.Server.Host.Components.Watchdog
 {

src/Tgstation.Server.Host/Components/Watchdog/ISessionControllerFactory.cs

@@ -1,6 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Api.Models.Internal;
+using Tgstation.Server.Host.Components.Byond;
 
 namespace Tgstation.Server.Host.Components.Watchdog
 {

src/Tgstation.Server.Host/Components/Watchdog/IWatchdogFactory.cs

@@ -1,4 +1,5 @@
 using Tgstation.Server.Api.Models.Internal;
+using Tgstation.Server.Host.Components.Compiler;
 
 namespace Tgstation.Server.Host.Components.Watchdog
 {

src/Tgstation.Server.Host/Components/Watchdog/ReattachInformation.cs

@@ -1,4 +1,5 @@
-using Tgstation.Server.Host.Models;
+using Tgstation.Server.Host.Components.Compiler;
+using Tgstation.Server.Host.Models;
 
 namespace Tgstation.Server.Host.Components.Watchdog
 {

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

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Tgstation.Server.Host.Components.Byond;
 
 namespace Tgstation.Server.Host.Components.Watchdog
 {

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

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Api.Models.Internal;
+using Tgstation.Server.Host.Components.Byond;
 using Tgstation.Server.Host.Components.Chat;
 using Tgstation.Server.Host.Core;
 using Tgstation.Server.Host.IO;

src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs

@@ -10,6 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tgstation.Server.Api.Models.Internal;
 using Tgstation.Server.Host.Components.Chat;
+using Tgstation.Server.Host.Components.Compiler;
 using Tgstation.Server.Host.Core;
 
 namespace Tgstation.Server.Host.Components.Watchdog

src/Tgstation.Server.Host/Components/Watchdog/WatchdogFactory.cs

@@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging;
 using System;
 using Tgstation.Server.Api.Models.Internal;
 using Tgstation.Server.Host.Components.Chat;
+using Tgstation.Server.Host.Components.Compiler;
 using Tgstation.Server.Host.Core;
 
 namespace Tgstation.Server.Host.Components.Watchdog

src/Tgstation.Server.Host/Components/Watchdog/WatchdogReattachInformation.cs

@@ -1,4 +1,4 @@
-using System;
+using Tgstation.Server.Host.Components.Compiler;
 using Tgstation.Server.Host.Models;
 
 namespace Tgstation.Server.Host.Components.Watchdog

src/Tgstation.Server.Host/Controllers/DreamMakerController.cs

@@ -17,7 +17,7 @@ namespace Tgstation.Server.Host.Controllers
 	/// <summary>
 	/// Controller for managing the compiler
 	/// </summary>
-	[Route("/" + nameof(DreamMaker))]
+	[Route("/" + nameof(Api.Models.DreamMaker))]
     public sealed class DreamMakerController : ModelController<Api.Models.DreamMaker>
 	{
 		/// <summary>

src/Tgstation.Server.Host/Core/Application.cs

@@ -20,6 +20,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.Components;
+using Tgstation.Server.Host.Components.Byond;
 using Tgstation.Server.Host.Components.Chat;
 using Tgstation.Server.Host.Components.Chat.Commands;
 using Tgstation.Server.Host.Components.Watchdog;