Merge pull request #385 from MUnique/config-hot-reload

🔥 Configuration Hot Reload

deploy/distributed/docker-compose.dcproj

@@ -7,7 +7,9 @@
     <DockerLaunchAction>None</DockerLaunchAction>
     <DockerServiceUrl>{Scheme}://localhost:{ServicePort}</DockerServiceUrl>
   </PropertyGroup>
-  <PropertyGroup />
+  <PropertyGroup>
+    <DockerServiceName>openmu-distributed</DockerServiceName>
+  </PropertyGroup>
   <ItemGroup>
     <None Include="dapr-components\config.yaml" />
     <None Include="dapr-components\localSecretStore.yaml" />

deploy/distributed/launchSettings.json

@@ -24,9 +24,8 @@
         "grafana": "StartWithoutDebugging",
         "loki": "StartWithoutDebugging",
         "minio": "StartWithoutDebugging",
-        "nginx": "StartWithoutDebugging",
+        "nginx-80": "StartWithoutDebugging",
         "prometheus": "StartWithoutDebugging",
-        "zipkin": "StartWithoutDebugging"
         "zipkin": "StartWithoutDebugging",
         "gameServer0": "StartWithoutDebugging",
         "gameServer0-dapr": "StartWithoutDebugging",

src/Annotations/CloneableAttribute.cs

@@ -0,0 +1,14 @@
+// <copyright file="CloneableAttribute.cs" company="MUnique">
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+// </copyright>
+
+namespace MUnique.OpenMU.Annotations;
+
+/// <summary>
+/// Classes marked with this attribute will get a generic Clonable-Interface
+/// implemented by a code generator.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+public sealed class CloneableAttribute : Attribute
+{
+}

src/Annotations/MUnique.OpenMU.Annotations.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable;CS4014;VSTHRD110;VSTHRD100</WarningsAsErrors>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+</Project>

src/Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>

src/Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>

src/Dapr/Common/ConfigurationChangeArguments.cs

@@ -0,0 +1,10 @@
+// <copyright file="ConfigurationChangeArguments.cs" company="MUnique">
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+// </copyright>
+
+namespace MUnique.OpenMU.Dapr.Common;
+
+/// <summary>
+/// Arguments for the change notifications of <see cref="ConfigurationChangePublisher"/>.
+/// </summary>
+public record class ConfigurationChangeArguments(Type Type, Guid Id, object? Configuration);

src/Dapr/Common/ConfigurationChangePublisher.cs

@@ -32,7 +32,10 @@ public ConfigurationChangePublisher(DaprClient daprClient)
     /// <param name="configuration">The changed configuration.</param>
     public Task ConfigurationChangedAsync(Type type, Guid id, object configuration)
     {
-        return this._daprClient.PublishEventAsync("pubsub", nameof(this.ConfigurationChangedAsync), configuration);
+        return this._daprClient.PublishEventAsync(
+            "pubsub",
+            nameof(this.ConfigurationChangedAsync),
+            new ConfigurationChangeArguments(type, id, configuration));
     }
 
     /// <summary>
@@ -43,7 +46,10 @@ public Task ConfigurationChangedAsync(Type type, Guid id, object configuration)
     /// <param name="configuration">The added configuration.</param>
     public Task ConfigurationAddedAsync(Type type, Guid id, object configuration)
     {
-        return this._daprClient.PublishEventAsync("pubsub", nameof(this.ConfigurationAddedAsync), configuration);
+        return this._daprClient.PublishEventAsync(
+            "pubsub",
+            nameof(this.ConfigurationAddedAsync),
+            new ConfigurationChangeArguments(type, id, configuration));
     }
 
     /// <summary>
@@ -53,6 +59,9 @@ public Task ConfigurationAddedAsync(Type type, Guid id, object configuration)
     /// <param name="id">The identifier of the removed configuration.</param>
     public Task ConfigurationRemovedAsync(Type type, Guid id)
     {
-        return this._daprClient.PublishEventAsync("pubsub", nameof(this.ConfigurationRemovedAsync), id);
+        return this._daprClient.PublishEventAsync(
+            "pubsub",
+            nameof(this.ConfigurationRemovedAsync),
+            new ConfigurationChangeArguments(type, id, null));
     }
 }

src/Dapr/Common/Extensions.cs

@@ -37,6 +37,7 @@ public static class Extensions
     /// <returns>The services.</returns>
     public static IServiceCollection AddPeristenceProvider(this IServiceCollection services, bool publishConfigChanges = false)
     {
+        services.AddSingleton<IConfigurationChangeListener, ConfigurationChangeListener>();
         if (publishConfigChanges)
         {
             services.AddSingleton<IConfigurationChangePublisher, ConfigurationChangePublisher>();
@@ -49,7 +50,8 @@ public static IServiceCollection AddPeristenceProvider(this IServiceCollection s
         return services
             .AddSingleton<IMigratableDatabaseContextProvider, PersistenceContextProvider>()
             .AddSingleton(s => (PersistenceContextProvider)s.GetService<IMigratableDatabaseContextProvider>()!)
-            .AddSingleton(s => (IPersistenceContextProvider)s.GetService<IMigratableDatabaseContextProvider>()!);
+            .AddSingleton(s => (IPersistenceContextProvider)s.GetService<IMigratableDatabaseContextProvider>()!)
+            .AddSingleton(s => new Lazy<IPersistenceContextProvider>(s.GetRequiredService<IPersistenceContextProvider>));
     }
 
     /// <summary>

src/Dapr/Common/MUnique.OpenMU.Dapr.Common.csproj

@@ -21,7 +21,7 @@
     <PackageReference Include="Dapr.Client" Version="1.10.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.4.3" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.10" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.1" />
     <PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="1.2.0-rc5" />
     <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.3.1" />

src/Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>

src/Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>

src/Dapr/GameServer.Host/ConfigurationChangeController.cs

@@ -0,0 +1,66 @@
+// <copyright file="ConfigurationChangeController.cs" company="MUnique">
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+// </copyright>
+
+namespace MUnique.OpenMU.GameServer.Host;
+
+using global::Dapr;
+using Microsoft.AspNetCore.Mvc;
+using MUnique.OpenMU.Dapr.Common;
+using MUnique.OpenMU.Interfaces;
+using MUnique.OpenMU.Persistence.EntityFramework;
+
+/// <summary>
+/// The API controller which handles the calls of the <see cref="ConfigurationChangePublisher"/>
+/// from other services, such as the AdminPanel.
+/// It forwards the changes to a <see cref="IConfigurationChangeListener"/>, so
+/// that the caches are updated and the game logic can react to that.
+/// </summary>
+[ApiController]
+[Route("")]
+public class ConfigurationChangeController : ControllerBase
+{
+    private readonly IConfigurationChangeListener _changeListener;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConfigurationChangeController" /> class.
+    /// </summary>
+    /// <param name="changeListener">The change listener.</param>
+    public ConfigurationChangeController(IConfigurationChangeListener changeListener)
+    {
+        this._changeListener = changeListener;
+    }
+
+    /// <summary>
+    /// Called when a configuration got added on the admin panel.
+    /// </summary>
+    /// <param name="arguments">The message arguments.</param>
+    [HttpPost(nameof(IConfigurationChangePublisher.ConfigurationAddedAsync))]
+    [Topic("pubsub", nameof(IConfigurationChangePublisher.ConfigurationAddedAsync))]
+    public ValueTask ConfigurationAddedAsync([FromBody] ConfigurationChangeArguments arguments)
+    {
+        return this._changeListener.ConfigurationAddedAsync(arguments.Type, arguments.Id, arguments.Configuration!, null, null);
+    }
+
+    /// <summary>
+    /// Called when a configuration got added on the admin panel.
+    /// </summary>
+    /// <param name="arguments">The message arguments.</param>
+    [HttpPost(nameof(IConfigurationChangePublisher.ConfigurationChangedAsync))]
+    [Topic("pubsub", nameof(IConfigurationChangePublisher.ConfigurationChangedAsync))]
+    public ValueTask ConfigurationChangedAsync([FromBody] ConfigurationChangeArguments arguments)
+    {
+        return this._changeListener.ConfigurationChangedAsync(arguments.Type, arguments.Id, arguments.Configuration!, null);
+    }
+
+    /// <summary>
+    /// Called when a configuration got removed on the admin panel.
+    /// </summary>
+    /// <param name="arguments">The message arguments.</param>
+    [HttpPost(nameof(IConfigurationChangePublisher.ConfigurationRemovedAsync))]
+    [Topic("pubsub", nameof(IConfigurationChangePublisher.ConfigurationRemovedAsync))]
+    public ValueTask ConfigurationRemovedAsync([FromBody] ConfigurationChangeArguments arguments)
+    {
+        return this._changeListener.ConfigurationRemovedAsync(arguments.Type, arguments.Id, null, null);
+    }
+}

src/Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>

src/Dapr/GameServer.Host/Program.cs

@@ -5,9 +5,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using MUnique.OpenMU.Dapr.Common;
 using MUnique.OpenMU.DataModel.Configuration;
+using MUnique.OpenMU.GameLogic;
 using MUnique.OpenMU.GameServer.Host;
 using MUnique.OpenMU.Interfaces;
-using MUnique.OpenMU.Network;
 using MUnique.OpenMU.PlugIns;
 using MUnique.OpenMU.ServerClients;
 using MUnique.OpenMU.Web.Map;
@@ -29,6 +29,9 @@
     .AddSingleton<IList<IManageableServer>>(s => new List<IManageableServer>() { s.GetService<GameServer>()! })
     .AddSingleton(s => s.GetService<GameServer>()!.Context)
     .AddSingleton<IGameServerStateObserver, GameServerStatePublisher>()
+    .AddSingleton<ConfigurationChangeMediator>()
+    .AddSingleton<IConfigurationChangeMediator>(s => s.GetRequiredService<ConfigurationChangeMediator>())
+    .AddSingleton<IConfigurationChangeMediatorListener>(s => s.GetRequiredService<ConfigurationChangeMediator>())
     .AddSingleton<ILoginServer, LoginServer>()
     .AddSingleton<IGuildServer, GuildServer>()
     .AddSingleton<IEventPublisher, EventPublisher>()

src/Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>

src/Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
 
   <ItemGroup>

src/DataModel/AssignableExtensions.cs

@@ -0,0 +1,51 @@
+// <copyright file="AssignableExtensions.cs" company="MUnique">
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+// </copyright>
+
+namespace MUnique.OpenMU.DataModel;
+
+using MUnique.OpenMU.DataModel.Configuration;
+
+/// <summary>
+/// Extensions for <see cref="IAssignable{T}"/>.
+/// </summary>
+public static class AssignableExtensions
+{
+    /// <summary>
+    /// Assigns a collection to another one, resolving the objects to the ones
+    /// which are contained in the given <see cref="GameConfiguration"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of the collection elements.</typeparam>
+    /// <param name="collection">The target collection.</param>
+    /// <param name="other">The other collection.</param>
+    /// <param name="gameConfiguration">The game configuration.</param>
+    public static void AssignCollection<T>(this ICollection<T> collection, ICollection<T> other, GameConfiguration gameConfiguration)
+        where T : class
+    {
+        var newItems = collection.Except(other).ToList();
+        var oldItems = other.Except(collection).ToList();
+
+        oldItems.ForEach(i => collection.Remove(i));
+        newItems.ForEach(i => collection.Add(
+            gameConfiguration.GetObjectOfConfig(i)
+            ?? (i as ICloneable<T>)?.Clone(gameConfiguration)
+            ?? (i as ICloneable)?.Clone() as T
+            ?? i));
+    }
+
+    /// <summary>
+    /// Assigns a collection to another one.
+    /// </summary>
+    /// <typeparam name="T">The type of the collection values.</typeparam>
+    /// <param name="collection">The target collection.</param>
+    /// <param name="other">The other collection.</param>
+    public static void AssignCollection<T>(this ICollection<T> collection, ICollection<T> other)
+        where T : struct
+    {
+        var newItems = collection.Except(other).ToList();
+        var oldItems = other.Except(collection).ToList();
+
+        oldItems.ForEach(i => collection.Remove(i));
+        newItems.ForEach(collection.Add);
+    }
+}

src/DataModel/Attributes/PowerUpDefinition.cs

@@ -5,12 +5,14 @@
 namespace MUnique.OpenMU.DataModel.Attributes;
 
 using System.Globalization;
+using MUnique.OpenMU.Annotations;
 using MUnique.OpenMU.AttributeSystem;
 
 /// <summary>
 /// The power up definition which describes the boost of an target attribute.
 /// </summary>
-public class PowerUpDefinition
+[Cloneable]
+public partial class PowerUpDefinition
 {
     /// <summary>
     /// Gets or sets the target attribute.

src/DataModel/Attributes/PowerUpDefinitionValue.cs

@@ -5,12 +5,14 @@
 namespace MUnique.OpenMU.DataModel.Attributes;
 
 using System.ComponentModel;
+using MUnique.OpenMU.Annotations;
 using MUnique.OpenMU.AttributeSystem;
 
 /// <summary>
 /// The power up definition value which can consist of a constant value and several related values which are all added together to get the result.
 /// </summary>
-public class PowerUpDefinitionValue
+[Cloneable]
+public partial class PowerUpDefinitionValue
 {
     /// <summary>
     /// Gets or sets the constant value part of the value.

src/DataModel/Configuration/BattleZoneDefinition.cs

@@ -4,10 +4,13 @@
 
 namespace MUnique.OpenMU.DataModel.Configuration;
 
+using MUnique.OpenMU.Annotations;
+
 /// <summary>
 /// Defines a battle zone.
 /// </summary>
-public class BattleZoneDefinition
+[Cloneable]
+public partial class BattleZoneDefinition
 {
     /// <summary>
     /// Gets or sets the battle type.

src/DataModel/Configuration/CharacterClass.cs

@@ -4,13 +4,15 @@
 
 namespace MUnique.OpenMU.DataModel.Configuration;
 
+using MUnique.OpenMU.Annotations;
 using MUnique.OpenMU.AttributeSystem;
 using MUnique.OpenMU.DataModel.Entities;
 
 /// <summary>
 /// Defines a character class.
 /// </summary>
-public class CharacterClass
+[Cloneable]
+public partial class CharacterClass
 {
     /// <summary>
     /// Gets or sets the id of a character class.