refactor(configuration): Local Configuration removes the file Section node

src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/ConfigurationApiClient.cs

@@ -1,10 +1,11 @@
 namespace Masa.Contrib.BasicAbility.Dcc;
 
-public class ConfigurationApiClient : ConfigurationAPIBase, IConfigurationApiClient
+public class ConfigurationApiClient : ConfigurationApiBase, IConfigurationApiClient
 {
     private readonly IServiceProvider _serviceProvider;
     private readonly IMemoryCacheClient _client;
     private readonly JsonSerializerOptions _jsonSerializerOptions;
+    private readonly ILogger<ConfigurationApiClient>? _logger;
 
     private readonly ConcurrentDictionary<string, Lazy<Task<ExpandoObject>>> _taskExpandoObjects = new();
     private readonly ConcurrentDictionary<string, Lazy<Task<object>>> _taskJsonObjects = new();
@@ -20,6 +21,7 @@ public ConfigurationApiClient(
         _serviceProvider = serviceProvider;
         _client = client;
         _jsonSerializerOptions = jsonSerializerOptions;
+        _logger = serviceProvider.GetService<ILogger<ConfigurationApiClient>>();
     }
 
     public Task<(string Raw, ConfigurationTypes ConfigurationType)> GetRawAsync(string environment, string cluster, string appId,
@@ -33,7 +35,7 @@ public async Task<T> GetAsync<T>(string environment, string cluster, string appI
     {
         var key = FomartKey(environment, cluster, appId, configObject);
 
-        var value = await _taskJsonObjects.GetOrAdd(key, (k) => new Lazy<Task<object>>(async () =>
+        var value = await _taskJsonObjects.GetOrAdd(key, k => new Lazy<Task<object>>(async () =>
         {
             var options = new JsonSerializerOptions(_jsonSerializerOptions);
             options.EnableDynamicTypes();
@@ -60,59 +62,55 @@ public async Task<T> GetAsync<T>(string environment, string cluster, string appI
         return (T)value;
     }
 
-    public async Task<dynamic> GetDynamicAsync(string environment, string cluster, string appId, string configObject,
-        Action<dynamic> valueChanged)
+    public async Task<dynamic> GetDynamicAsync(string environment, string cluster, string appId, string configObject, Action<dynamic> valueChanged)
     {
         var key = FomartKey(environment, cluster, appId, configObject);
 
-        var value = _taskExpandoObjects.GetOrAdd(key, (k) => new Lazy<Task<ExpandoObject>>(async () =>
+        return await GetDynamicAsync(key, (k, value, options) =>
+        {
+            var result = JsonSerializer.Deserialize<ExpandoObject>(value, options);
+            var newValue = new Lazy<Task<ExpandoObject?>>(() => Task.FromResult(result)!);
+            _taskExpandoObjects.AddOrUpdate(k, newValue!, (_, _) => newValue!);
+            valueChanged?.Invoke(result!);
+        });
+    }
+
+    public Task<dynamic> GetDynamicAsync(string key) => GetDynamicAsync(key, null);
+
+    protected virtual async Task<dynamic> GetDynamicAsync(string key, Action<string, dynamic, JsonSerializerOptions>? valueChanged)
+    {
+        if (string.IsNullOrEmpty(key))
+            throw new ArgumentNullException(nameof(key));
+
+        var value = _taskExpandoObjects.GetOrAdd(key, k => new Lazy<Task<ExpandoObject>>(async () =>
         {
             var options = new JsonSerializerOptions(_jsonSerializerOptions);
             options.EnableDynamicTypes();
 
-            var raw = await GetRawByKeyAsync(k, (value) =>
+            var raw = await GetRawByKeyAsync(k, value =>
             {
-                var result = JsonSerializer.Deserialize<ExpandoObject>(value, options);
-                var newValue = new Lazy<Task<ExpandoObject?>>(() => Task.FromResult(result)!);
-                _taskExpandoObjects.AddOrUpdate(k, newValue!, (_, _) => newValue!);
-                valueChanged?.Invoke(result!);
+                valueChanged?.Invoke(k, value, options);
             });
-
-            return JsonSerializer.Deserialize<ExpandoObject>(raw.Raw, options) ?? throw new ArgumentException(nameof(configObject));
+            return JsonSerializer.Deserialize<ExpandoObject>(raw.Raw, options) ?? throw new ArgumentException(key);
         })).Value;
 
         return await value;
     }
 
-    public async Task<dynamic> GetDynamicAsync(string key)
+    protected virtual async Task<(string Raw, ConfigurationTypes ConfigurationType)> GetRawByKeyAsync(string key, Action<string>? valueChanged)
     {
-        if (string.IsNullOrEmpty(key))
-            throw new ArgumentNullException(nameof(key));
-
-        var configuration = _serviceProvider.GetRequiredService<IConfiguration>();
-        key = key.Replace(".", ConfigurationPath.KeyDelimiter);
-        return await Task.FromResult(Format(configuration.GetSection(key)));
-    }
-
-    private async Task<(string Raw, ConfigurationTypes ConfigurationType)> GetRawByKeyAsync(string key, Action<string> valueChanged)
-    {
-        var raw = await _client.GetAsync<string>(key, (value) =>
+        var raw = await _client.GetAsync<string>(key, value =>
         {
-            var result = FormatRaw(value);
+            var result = FormatRaw(value, key);
             valueChanged?.Invoke(result.Raw);
         });
 
-        return FormatRaw(raw);
+        return FormatRaw(raw, key);
     }
 
-    private (string Raw, ConfigurationTypes ConfigurationType) FormatRaw(string? raw)
+    protected virtual (string Raw, ConfigurationTypes ConfigurationType) FormatRaw(string? raw, string paramName)
     {
-        if (raw == null)
-            throw new ArgumentException("configObject invalid");
-
-        var result = JsonSerializer.Deserialize<PublishRelease>(raw, _jsonSerializerOptions);
-        if (result == null || result.ConfigFormat == 0)
-            throw new ArgumentException("configObject invalid");
+        PublishRelease result = GetPublishRelease(raw, paramName);
 
         switch (result.ConfigFormat)
         {
@@ -123,11 +121,17 @@ public async Task<dynamic> GetDynamicAsync(string key)
                 return (result.Content!, ConfigurationTypes.Text);
 
             case ConfigFormats.Properties:
-                var properties = PropertyConfigurationParser.Parse(result.Content!, _jsonSerializerOptions);
-                if (properties == null)
+                try
+                {
+                    var properties = PropertyConfigurationParser.Parse(result.Content!, _jsonSerializerOptions);
+                    return (JsonSerializer.Serialize(properties, _jsonSerializerOptions), ConfigurationTypes.Properties);
+                }
+                catch (Exception exception)
+                {
+                    _logger?.LogWarning(exception,
+                        $"Dcc.ConfigurationApiClient: configObject invalid, {paramName} is not a valid Properties type");
                     throw new ArgumentException("configObject invalid");
-
-                return (JsonSerializer.Serialize(properties, _jsonSerializerOptions), ConfigurationTypes.Properties);
+                }
 
             default:
                 throw new NotSupportedException("Unsupported configuration type");
@@ -137,22 +141,25 @@ public async Task<dynamic> GetDynamicAsync(string key)
     private string FomartKey(string environment, string cluster, string appId, string configObject)
         => $"{GetEnvironment(environment)}-{GetCluster(cluster)}-{GetAppId(appId)}-{GetConfigObject(configObject)}".ToLower();
 
-    private dynamic Format(IConfigurationSection section)
+    private PublishRelease GetPublishRelease(string? raw, string paramName)
     {
-        var childrenSections = section.GetChildren();
-        if (!section.Exists() || !childrenSections.Any())
+        if (raw == null)
+            throw new ArgumentException($"configObject invalid, {paramName} is not null");
+
+        PublishRelease? result;
+        try
         {
-            return section.Value;
+            result = JsonSerializer.Deserialize<PublishRelease>(raw, _jsonSerializerOptions);
         }
-        else
+        catch (Exception exception)
         {
-            var result = new ExpandoObject();
-            var parent = result as IDictionary<string, object>;
-            foreach (var child in childrenSections)
-            {
-                parent[child.Key] = Format(child);
-            }
-            return result;
+            string message = $"Dcc.ConfigurationApiClient: configObject invalid, {paramName} is not a valid response value";
+            _logger?.LogWarning(exception, message);
+            throw new ArgumentException(message);
         }
+        if (result == null || result.ConfigFormat == 0)
+            throw new ArgumentException($"Dcc.ConfigurationApiClient: configObject invalid, {paramName} is an unsupported type");
+
+        return result;
     }
 }

src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/ConfigurationApiManage.cs

@@ -1,6 +1,6 @@
 namespace Masa.Contrib.BasicAbility.Dcc;
 
-public class ConfigurationApiManage : ConfigurationAPIBase, IConfigurationApiManage
+public class ConfigurationApiManage : ConfigurationApiBase, IConfigurationApiManage
 {
     private readonly ICallerProvider _callerProvider;
 

src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/ConfigurationAPIBase.cs → src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/ConfigurationApiBase.cs

@@ -1,11 +1,11 @@
 namespace Masa.Contrib.BasicAbility.Dcc.Internal;
 
-public class ConfigurationAPIBase
+public class ConfigurationApiBase
 {
     private readonly DccSectionOptions _defaultSectionOption;
     private readonly List<DccSectionOptions> _expandSectionOptions;
 
-    protected ConfigurationAPIBase(DccSectionOptions defaultSectionOption, List<DccSectionOptions>? expandSectionOptions)
+    protected ConfigurationApiBase(DccSectionOptions defaultSectionOption, List<DccSectionOptions>? expandSectionOptions)
     {
         _defaultSectionOption = defaultSectionOption;
         _expandSectionOptions = expandSectionOptions ?? new();

src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/Constants.cs

@@ -2,7 +2,7 @@ namespace Masa.Contrib.BasicAbility.Dcc.Internal;
 
 internal class Constants
 {
-    internal const string DEFAULT_CLIENT_NAME = "masa.plugins.caching.dcc";
+    internal const string DEFAULT_CLIENT_NAME = "masa.contrib.basicability.dcc";
 
     internal const string DEFAULT_SUBSCRIBE_KEY_PREFIX = "masa.dcc:";
 

src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/DccConfigurationRepository.cs

@@ -4,7 +4,7 @@ internal class DccConfigurationRepository : AbstractConfigurationRepository
 {
     private readonly IConfigurationApiClient _client;
 
-    public override SectionTypes SectionType { get; init; } = SectionTypes.ConfigurationAPI;
+    public override SectionTypes SectionType => SectionTypes.ConfigurationAPI;
 
     private readonly ConcurrentDictionary<string, IDictionary<string, string>> _dictionaries = new();
 
@@ -56,7 +56,7 @@ private IDictionary<string, string> FormatRaw(string appId, string configObject,
             case ConfigurationTypes.Text:
                 return new Dictionary<string, string>()
                 {
-                    { $"{appId}{ConfigurationPath.KeyDelimiter}{DATA_DICTIONARY_SECTION_NAME}{ConfigurationPath.KeyDelimiter}{configObject}" , raw ?? "" }
+                    { $"{appId}{ConfigurationPath.KeyDelimiter}{configObject}" , raw ?? "" }
                 };
             default:
                 throw new NotSupportedException(nameof(configurationType));
@@ -83,7 +83,7 @@ public override Properties Load()
         {
             foreach (var key in item.Value.Keys)
             {
-                properties[key] = item.Value[key] ?? string.Empty;
+                properties[key] = item.Value[key];
             }
         }
         return new Properties(properties);

src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Internal/Options/DccOptions.cs

@@ -0,0 +1,17 @@
+namespace Masa.Contrib.BasicAbility.Dcc.Internal.Options;
+
+internal class DccOptions
+{
+    public DccConfigurationOptions DccConfigurationOptions { get; }
+
+    public DccSectionOptions DefaultSectionOptions { get; }
+
+    public List<DccSectionOptions> ExpansionSectionOptions { get; }
+
+    public DccOptions(DccConfigurationOptions dccConfigurationOptions, DccSectionOptions defaultSectionOptions, List<DccSectionOptions> expansionSectionOptions)
+    {
+        DccConfigurationOptions = dccConfigurationOptions;
+        DefaultSectionOptions = defaultSectionOptions;
+        ExpansionSectionOptions = expansionSectionOptions;
+    }
+}