optimization multi tenancy

tracy.ma · tracy.ma · commit 6214647db95c · 2026-02-12T15:23:06.000+08:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/ConnectionStringNameAttribute.cs b/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/ConnectionStringNameAttribute.cs
@@ -1,3 +1,5 @@
+using System.Reflection;
+
 namespace BotSharp.Abstraction.MultiTenancy;
 
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
@@ -10,7 +12,11 @@ public ConnectionStringNameAttribute(string name)
         Name = name;
     }
 
-    public static string GetConnStringName(Type type) => type.FullName ?? string.Empty;
+    public static string GetConnStringName(Type type)
+    {
+        var customAttribute = type.GetTypeInfo().GetCustomAttribute<ConnectionStringNameAttribute>();
+        return customAttribute == null ? type.FullName : customAttribute.Name;
+    }
 
     public static string GetConnStringName<T>() => GetConnStringName(typeof(T));
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/IConnectionStringResolver.cs b/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/IConnectionStringResolver.cs
@@ -5,4 +5,4 @@ public interface IConnectionStringResolver
     string? GetConnectionString(string connectionStringName);
 
     string? GetConnectionString<TContext>();
-}
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/IMultiTenant.cs b/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/IMultiTenant.cs
@@ -0,0 +1,8 @@
+namespace BotSharp.Abstraction.MultiTenancy;
+public interface IMultiTenant
+{
+    /// <summary>
+    /// Id of the related tenant.
+    /// </summary>
+    string? TenantId { get; }
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/ITenantRepository.cs b/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/ITenantRepository.cs
@@ -0,0 +1,8 @@
+using BotSharp.Abstraction.MultiTenancy.Options;
+
+namespace BotSharp.Abstraction.MultiTenancy;
+
+public interface ITenantRepository
+{
+    List<TenantConfiguration> GetTenants();
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/ITenantStore.cs b/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/ITenantStore.cs
@@ -0,0 +1,8 @@
+using BotSharp.Abstraction.MultiTenancy.Options;
+
+namespace BotSharp.Abstraction.MultiTenancy;
+
+public interface ITenantStore
+{
+    List<TenantConfiguration> GetTenants();
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/Options/TenantConfiguration.cs b/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/Options/TenantConfiguration.cs
@@ -19,27 +19,19 @@ public TenantConfiguration()
         IsActive = true;
     }
 
-    public TenantConfiguration(Guid id, [NotNull] string name)
-        : this()
+    public TenantConfiguration(Guid id, [NotNull] string name) : this()
     {
-        if (string.IsNullOrWhiteSpace(name))
-        {
-            throw new ArgumentException("Name cannot be null or whitespace.");
-        }
-
+        if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Name cannot be null or whitespace.");
         Id = id;
         Name = name;
+
         ConnectionStrings = new ConnectionStrings();
     }
 
     public TenantConfiguration(Guid id, [NotNull] string name, [NotNull] string normalizedName)
         : this(id, name)
     {
-        if (string.IsNullOrWhiteSpace(normalizedName))
-        {
-            throw new ArgumentException("NormalizedName cannot be null or whitespace.");
-        }
-
+        if (string.IsNullOrWhiteSpace(normalizedName)) throw new ArgumentException("NormalizedName cannot be null or whitespace.");
         NormalizedName = normalizedName;
     }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/TenantStoreExtensions.cs b/src/Infrastructure/BotSharp.Abstraction/MultiTenancy/TenantStoreExtensions.cs
@@ -0,0 +1,16 @@
+using BotSharp.Abstraction.MultiTenancy.Options;
+using Microsoft.Extensions.Options;
+
+namespace BotSharp.Abstraction.MultiTenancy;
+
+public static class TenantStoreExtensions
+{
+    public static bool IsEnabled(this IOptionsMonitor<TenantStoreOptions> options)
+        => options.CurrentValue.Enabled;
+
+    public static bool HasConfiguredTenants(this IOptionsMonitor<TenantStoreOptions> options)
+        => options.CurrentValue.Tenants is { Length: > 0 };
+
+    public static IReadOnlyList<TenantConfiguration> ConfiguredTenants(this IOptionsMonitor<TenantStoreOptions> options)
+        => options.CurrentValue.Tenants;
+}
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/Controllers/TenantsController.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/Controllers/TenantsController.cs
@@ -1,28 +1,40 @@
 using BotSharp.Abstraction.MultiTenancy;
+using BotSharp.Abstraction.MultiTenancy.Options;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace BotSharp.Plugin.MultiTenancy.Controllers;
 
 [ApiController]
 public class TenantsController : ControllerBase
 {
-    private readonly ITenantOptionProvider _tenantOptionProvider;
+    private readonly ITenantStore _tenantStore;
+    private readonly IOptionsMonitor<TenantStoreOptions> _options;
 
-    public TenantsController(ITenantOptionProvider tenantOptionProvider)
+    public TenantsController(ITenantStore tenantStore, IOptionsMonitor<TenantStoreOptions> options)
     {
-        _tenantOptionProvider = tenantOptionProvider;
+        _tenantStore = tenantStore;
+        _options = options;
     }
 
     [AllowAnonymous]
     [HttpGet]
     [Route("/tenants/options")]
-    public async Task<IActionResult> Options()
+    public IActionResult Options()
     {
-        var tenants = await _tenantOptionProvider.GetOptionsAsync();
-        var payload = tenants.Select(t => new { tenantId = t.TenantId, name = t.Name }).ToArray();
+        if (!_options.CurrentValue.Enabled)
+        {
+            return Ok(System.Array.Empty<object>());
+        }
+
+        var tenants = _tenantStore.GetTenants();
+        var payload = tenants
+            .Select(t => new { tenantId = t.Id, name = t.Name })
+            .Distinct()
+            .ToArray();
+
         return Ok(payload);
     }
 }
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/Extensions/MultiTenancyServiceCollectionExtensions.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/Extensions/MultiTenancyServiceCollectionExtensions.cs
@@ -1,38 +1,58 @@
 using BotSharp.Abstraction.MultiTenancy;
 using BotSharp.Abstraction.MultiTenancy.Options;
-using BotSharp.Plugin.MultiTenancy.Interfaces;
 using BotSharp.Plugin.MultiTenancy.Models;
 using BotSharp.Plugin.MultiTenancy.MultiTenancy;
-using BotSharp.Plugin.MultiTenancy.MultiTenancy.Providers;
 using BotSharp.Plugin.MultiTenancy.MultiTenancy.Resolvers;
-using BotSharp.Plugin.MultiTenancy.MultiTenancy.Tenant;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+using System.Collections.Generic;
 
 namespace BotSharp.Plugin.MultiTenancy.Extensions;
 
 public static class MultiTenancyServiceCollectionExtensions
 {
     public static IServiceCollection AddMultiTenancy(this IServiceCollection services, IConfiguration configuration, string sectionName = "TenantStore")
     {
+        var section = configuration.GetSection(sectionName);
+        if (section.Exists())
+        {
+            services.Configure<TenantStoreOptions>(section);
+        }
+        else
+        {
+            services.Configure<TenantStoreOptions>(_ => { });
+        }
+
         services.Configure<TenantResolveOptions>(options =>
         {
             options.TenantResolvers.Add(new ClaimsTenantResolveContributor());
             options.TenantResolvers.Add(new HeaderTenantResolveContributor());
             options.TenantResolvers.Add(new QueryStringTenantResolveContributor());
         });
 
-        services.Configure<TenantStoreOptions>(configuration.GetSection(sectionName));
-        services.AddScoped<ICurrentTenant, CurrentTenant>();
-        services.AddSingleton<ICurrentTenantAccessor>(AsyncLocalCurrentTenantAccessor.Instance);
         services.AddScoped<ITenantResolver, TenantResolver>();
-        services.AddScoped<IConnectionStringResolver, DefaultConnectionStringResolver>();
-        services.AddScoped<ITenantConnectionProvider, TenantConnectionProvider>();
-        services.AddSingleton<ITenantFeature, TenantFeature>();
         services.AddScoped<MultiTenancyMiddleware>();
+        services.AddScoped<ICurrentTenant, CurrentTenant>();
+        services.AddSingleton<ICurrentTenantAccessor>(AsyncLocalCurrentTenantAccessor.Instance);
+
+        // tenant store infrastructure
+        services.AddMemoryCache();
+        services.TryAddScoped<ITenantRepository, NullTenantRepository>();
+        services.TryAddScoped<ConfigTenantStore>();
+        services.TryAddScoped<DbTenantStore>();
+        services.TryAddScoped<ITenantStore>(sp => new CompositeTenantStore(
+            sp.GetRequiredService<IOptionsMonitor<TenantStoreOptions>>(),
+            new List<ITenantStore>
+            {
+                sp.GetRequiredService<ConfigTenantStore>(),
+                sp.GetRequiredService<DbTenantStore>()
+            }));
 
-        services.TryAddScoped<ITenantOptionProvider, ConfigTenantOptionProvider>();
+        services.TryAddScoped<IConnectionStringResolver, DefaultConnectionStringResolver>();
+        services.TryAddScoped<ITenantFeature, TenantFeature>();
+        services.TryAddScoped<ITenantConnectionProvider, TenantConnectionProvider>();
 
         return services;
     }
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/AsyncLocalCurrentTenantAccessor.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/AsyncLocalCurrentTenantAccessor.cs
@@ -0,0 +1,21 @@
+using BotSharp.Plugin.MultiTenancy.Models;
+using System.Threading;
+
+namespace BotSharp.Plugin.MultiTenancy.MultiTenancy;
+
+public class AsyncLocalCurrentTenantAccessor : ICurrentTenantAccessor
+{
+    private readonly AsyncLocal<TenantInfoBasic?> _currentScope;
+    private AsyncLocalCurrentTenantAccessor()
+    {
+        _currentScope = new AsyncLocal<TenantInfoBasic?>();
+    }
+
+    public static AsyncLocalCurrentTenantAccessor Instance { get; } = new();
+
+    public TenantInfoBasic? Current
+    {
+        get => _currentScope.Value;
+        set => _currentScope.Value = value;
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/CompositeTenantStore.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/CompositeTenantStore.cs
@@ -0,0 +1,39 @@
+using BotSharp.Abstraction.MultiTenancy;
+using BotSharp.Abstraction.MultiTenancy.Options;
+using Microsoft.Extensions.Options;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BotSharp.Plugin.MultiTenancy.MultiTenancy;
+
+public class CompositeTenantStore : ITenantStore
+{
+    private readonly IOptionsMonitor<TenantStoreOptions> _options;
+    private readonly IEnumerable<ITenantStore> _stores;
+
+    public CompositeTenantStore(IOptionsMonitor<TenantStoreOptions> options, IEnumerable<ITenantStore> stores)
+    {
+        _options = options;
+        _stores = stores;
+    }
+
+    public List<TenantConfiguration> GetTenants()
+    {
+        // If configuration has tenants, prefer it.
+        var configured = _options.CurrentValue.Tenants;
+        if (configured is { Length: > 0 })
+        {
+            return configured.ToList();
+        }
+
+        // Otherwise, try other stores in order.
+        foreach (var s in _stores)
+        {
+            if (s is ConfigTenantStore) continue;
+            var tenants = s.GetTenants();
+            if (tenants.Count > 0) return tenants;
+        }
+
+        return new List<TenantConfiguration>();
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/ConfigTenantStore.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/ConfigTenantStore.cs
@@ -0,0 +1,23 @@
+using BotSharp.Abstraction.MultiTenancy;
+using BotSharp.Abstraction.MultiTenancy.Options;
+using Microsoft.Extensions.Options;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BotSharp.Plugin.MultiTenancy.MultiTenancy;
+
+public class ConfigTenantStore : ITenantStore
+{
+    private readonly TenantStoreOptions _options;
+
+    public ConfigTenantStore(IOptionsMonitor<TenantStoreOptions> options)
+    {
+        _options = options.CurrentValue;
+    }
+
+    public List<TenantConfiguration> GetTenants()
+    {
+        return [.. _options.Tenants];
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/CurrentTenant.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/CurrentTenant.cs
@@ -0,0 +1,36 @@
+using BotSharp.Abstraction.MultiTenancy;
+using BotSharp.Plugin.MultiTenancy.Models;
+using System;
+
+namespace BotSharp.Plugin.MultiTenancy.MultiTenancy;
+
+public class CurrentTenant : ICurrentTenant
+{
+    private readonly ICurrentTenantAccessor _currentTenantAccessor;
+
+    public CurrentTenant(ICurrentTenantAccessor currentTenantAccessor)
+    {
+        _currentTenantAccessor = currentTenantAccessor;
+    }
+
+    public virtual Guid? Id => _currentTenantAccessor.Current?.TenantId;
+
+    public string? Name => _currentTenantAccessor.Current?.Name;
+
+    public IDisposable Change(Guid? id, string? name = null)
+    {
+        return SetCurrent(id, name);
+    }
+
+    private IDisposable SetCurrent(Guid? tenantId, string? name = null)
+    {
+        var parentScope = _currentTenantAccessor.Current;
+        _currentTenantAccessor.Current = new TenantInfoBasic(tenantId, name);
+
+        return new DisposeAction<ValueTuple<ICurrentTenantAccessor, TenantInfoBasic?>>(static (state) =>
+        {
+            var (currentTenantAccessor, parentScope) = state;
+            currentTenantAccessor.Current = parentScope;
+        }, (_currentTenantAccessor, parentScope));
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/DbTenantStore.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/DbTenantStore.cs
@@ -0,0 +1,33 @@
+using BotSharp.Abstraction.MultiTenancy;
+using BotSharp.Abstraction.MultiTenancy.Options;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+
+namespace BotSharp.Plugin.MultiTenancy.MultiTenancy;
+
+public class DbTenantStore : ITenantStore
+{
+    private readonly ITenantRepository _repo;
+    private readonly ILogger<DbTenantStore> _logger;
+
+    public DbTenantStore(ITenantRepository repo, ILogger<DbTenantStore> logger)
+    {
+        _repo = repo;
+        _logger = logger;
+    }
+
+    public List<TenantConfiguration> GetTenants()
+    {
+        try
+        {
+            var tenants = _repo.GetTenants();
+            return tenants;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "DbTenantStore: failed to load tenant configurations from database.");
+            return new List<TenantConfiguration>();
+        }
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/DefaultConnectionStringResolver.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/DefaultConnectionStringResolver.cs
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/ICurrentTenantAccessor.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/ICurrentTenantAccessor.cs
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/NullTenantRepository.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/NullTenantRepository.cs
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/TenantConnectionProvider.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/TenantConnectionProvider.cs
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/TenantFeature.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/TenantFeature.cs
diff --git a/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/TenantResolver.cs b/src/Plugins/BotSharp.Plugin.MultiTenancy/MultiTenancy/TenantResolver.cs

Original file line number	Diff line number	Diff line change
`@@ -19,27 +19,19 @@ public TenantConfiguration()`
`19`	`19`	`IsActive = true;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public TenantConfiguration(Guid id, [NotNull] string name)`
`23`		`- : this()`
	`22`	`+ public TenantConfiguration(Guid id, [NotNull] string name) : this()`
`24`	`23`	`{`
`25`		`- if (string.IsNullOrWhiteSpace(name))`
`26`		`- {`
`27`		`- throw new ArgumentException("Name cannot be null or whitespace.");`
`28`		`- }`
`29`		`-`
	`24`	`+ if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Name cannot be null or whitespace.");`
`30`	`25`	`Id = id;`
`31`	`26`	`Name = name;`
	`27`	`+`
`32`	`28`	`ConnectionStrings = new ConnectionStrings();`
`33`	`29`	`}`
`34`	`30`
`35`	`31`	`public TenantConfiguration(Guid id, [NotNull] string name, [NotNull] string normalizedName)`
`36`	`32`	`: this(id, name)`
`37`	`33`	`{`
`38`		`- if (string.IsNullOrWhiteSpace(normalizedName))`
`39`		`- {`
`40`		`- throw new ArgumentException("NormalizedName cannot be null or whitespace.");`
`41`		`- }`
`42`		`-`
	`34`	`+ if (string.IsNullOrWhiteSpace(normalizedName)) throw new ArgumentException("NormalizedName cannot be null or whitespace.");`
`43`	`35`	`NormalizedName = normalizedName;`
`44`	`36`	`}`
`45`	`37`	`}`