feat: Add service extensions for options using reflection

s2quake · Aug 12, 2024 · f4f69c7 · f4f69c7
1 parent 99a6d9c
commit f4f69c7
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 23 deletions.
diff --git a/sdk/node/Libplanet.Node.Extensions/LibplanetServicesExtensions.cs b/sdk/node/Libplanet.Node.Extensions/LibplanetServicesExtensions.cs
@@ -7,35 +7,15 @@ namespace Libplanet.Node.Extensions;
 
 public static class LibplanetServicesExtensions
 {
-    public static ILibplanetNodeBuilder AddLibplanetNode(
-        this IServiceCollection services)
-    {
-        return new LibplanetNodeBuilder(services);
-    }
-
     public static ILibplanetNodeBuilder AddLibplanetNode(
         this IServiceCollection services,
         IConfiguration configuration)
     {
         SynchronizationContext.SetSynchronizationContext(SynchronizationContext.Current ?? new());
         services.AddSingleton(SynchronizationContext.Current!);
-        services.AddOptions<StoreOptions>()
-            .Bind(configuration.GetSection(StoreOptions.Position))
-            .ValidateDataAnnotations();
         services.Configure<SoloProposeOption>(configuration.GetSection(SoloProposeOption.Position));
-        services.AddOptions<GenesisOptions>()
-            .Bind(configuration.GetSection(GenesisOptions.Position))
-            .ValidateDataAnnotations();
-        services.AddOptions<StoreOptions>(SeedOptions.BlocksyncSeed)
-            .Bind(configuration.GetSection(SeedOptions.BlocksyncSeed))
-            .ValidateDataAnnotations();
-        services.AddOptions<StoreOptions>(SeedOptions.ConsensusSeed)
-            .Bind(configuration.GetSection(SeedOptions.ConsensusSeed))
-            .ValidateDataAnnotations();
-        services.AddOptions<NodeOptions>()
-            .Bind(configuration.GetSection(NodeOptions.Position))
-            .ValidateDataAnnotations();
+        services.AddOptionsFromDomain(configuration);
 
-        return AddLibplanetNode(services);
+        return new LibplanetNodeBuilder(services, configuration);
     }
 }
diff --git a/sdk/node/Libplanet.Node.Extensions/NodeBuilder/LibplanetNodeBuilder.cs b/sdk/node/Libplanet.Node.Extensions/NodeBuilder/LibplanetNodeBuilder.cs
@@ -1,13 +1,17 @@
 using Libplanet.Node.Services;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Libplanet.Node.Extensions.NodeBuilder;
 
 public class LibplanetNodeBuilder : ILibplanetNodeBuilder
 {
-    internal LibplanetNodeBuilder(IServiceCollection services)
+    private readonly IConfiguration _configuration;
+
+    internal LibplanetNodeBuilder(IServiceCollection services, IConfiguration configuration)
     {
         Services = services;
+        _configuration = configuration;
         Services.AddSingletonsFromDomain();
     }
 
@@ -22,6 +26,7 @@ public ILibplanetNodeBuilder WithSolo()
     public ILibplanetNodeBuilder WithNode()
     {
         Services.AddSingletonsFromDomain(scope: "Node");
+        Services.AddOptionsFromDomain(_configuration, scope: "Node");
         return this;
     }
 
@@ -31,6 +36,7 @@ public ILibplanetNodeBuilder WithValidate() =>
     public ILibplanetNodeBuilder WithSeed()
     {
         Services.AddSingletonsFromDomain(scope: "Seed");
+        Services.AddOptionsFromDomain(_configuration, scope: "Seed");
         return this;
     }
 }
diff --git a/sdk/node/Libplanet.Node/DependencyInjection/OptionsAttribute.cs b/sdk/node/Libplanet.Node/DependencyInjection/OptionsAttribute.cs
@@ -0,0 +1,9 @@
+namespace Libplanet.Node.DependencyInjection;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public sealed class OptionsAttribute(string name) : Attribute
+{
+    public string Name { get; } = name;
+
+    public string Scope { get; set; } = string.Empty;
+}
diff --git a/sdk/node/Libplanet.Node/Extensions/ServiceCollectionExtensions.cs b/sdk/node/Libplanet.Node/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 using Libplanet.Node.DependencyInjection;
 using Libplanet.Node.Options;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
@@ -31,6 +32,33 @@ static IEnumerable<SingletonAttribute> GetAttributes(Type type, string scope)
         return @this;
     }
 
+    public static IServiceCollection AddOptionsFromDomain(
+        this IServiceCollection @this, IConfiguration configuration)
+        => @this.AddOptionsFromDomain(configuration, scope: string.Empty);
+
+    public static IServiceCollection AddOptionsFromDomain(
+        this IServiceCollection @this, IConfiguration configuration, string scope)
+    {
+        var types = ServiceUtility.GetTypes(typeof(OptionsAttribute), inherit: true);
+        foreach (var type in types)
+        {
+            var optionsNames = GetAttributes(type, scope).Select(item => item.Name);
+            foreach (var optionsName in optionsNames)
+            {
+                @this.AddOptions<StoreOptions>()
+                    .Bind(configuration.GetSection(optionsName))
+                    .ValidateDataAnnotations();
+            }
+
+            static IEnumerable<OptionsAttribute> GetAttributes(Type type, string scope)
+                => Attribute.GetCustomAttributes(type, typeof(OptionsAttribute))
+                    .OfType<OptionsAttribute>()
+                    .Where(item => item.Scope == scope);
+        }
+
+        return @this;
+    }
+
     public static IServiceCollection AddOptionsConfigurator<TO, TC>(this IServiceCollection @this)
         where TO : OptionsBase<TO>
         where TC : OptionsConfiguratorBase<TO>

diff --git a/sdk/node/Libplanet.Node/Libplanet.Node.csproj b/sdk/node/Libplanet.Node/Libplanet.Node.csproj
@@ -5,6 +5,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sdk/node/Libplanet.Node/Options/GenesisOptions.cs b/sdk/node/Libplanet.Node/Options/GenesisOptions.cs
@@ -1,9 +1,11 @@
 using Libplanet.Crypto;
 using Libplanet.Net;
 using Libplanet.Node.DataAnnotations;
+using Libplanet.Node.DependencyInjection;
 
 namespace Libplanet.Node.Options;
 
+[Options(Position)]
 public sealed class GenesisOptions : OptionsBase<GenesisOptions>
 {
     public const string Position = "Genesis";

diff --git a/sdk/node/Libplanet.Node/Options/NodeOptions.cs b/sdk/node/Libplanet.Node/Options/NodeOptions.cs
@@ -1,7 +1,9 @@
 using Libplanet.Node.DataAnnotations;
+using Libplanet.Node.DependencyInjection;
 
 namespace Libplanet.Node.Options;
 
+[Options(Position, Scope = "Node")]
 public sealed class NodeOptions : OptionsBase<NodeOptions>
 {
     public const string Position = "Node";

diff --git a/sdk/node/Libplanet.Node/Options/SeedOptions.cs b/sdk/node/Libplanet.Node/Options/SeedOptions.cs
@@ -1,8 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using Libplanet.Node.DataAnnotations;
+using Libplanet.Node.DependencyInjection;
 
 namespace Libplanet.Node.Options;
 
+[Options(BlocksyncSeed, Scope = "Seed")]
+[Options(ConsensusSeed, Scope = "Seed")]
 public sealed class SeedOptions : OptionsBase<SeedOptions>
 {
     public const string BlocksyncSeed = nameof(BlocksyncSeed);

diff --git a/sdk/node/Libplanet.Node/Options/StoreOptions.cs b/sdk/node/Libplanet.Node/Options/StoreOptions.cs
@@ -1,5 +1,8 @@
+using Libplanet.Node.DependencyInjection;
+
 namespace Libplanet.Node.Options;
 
+[Options(Position)]
 public sealed class StoreOptions : OptionsBase<StoreOptions>
 {
     public const string Position = "Store";