Make remote localization startup non-blocking
This commit is contained in:
@@ -11,6 +11,7 @@ namespace StellaOps.Localization;
|
||||
/// </summary>
|
||||
public sealed class RemoteBundleProvider : ITranslationBundleProvider
|
||||
{
|
||||
private static readonly TimeSpan DefaultRequestTimeout = TimeSpan.FromSeconds(3);
|
||||
private readonly TranslationOptions _options;
|
||||
private readonly IHttpClientFactory? _httpClientFactory;
|
||||
private readonly ILogger<RemoteBundleProvider> _logger;
|
||||
@@ -45,7 +46,13 @@ public sealed class RemoteBundleProvider : ITranslationBundleProvider
|
||||
try
|
||||
{
|
||||
var client = _httpClientFactory.CreateClient("StellaOpsLocalization");
|
||||
var response = await client.GetAsync(url, ct).ConfigureAwait(false);
|
||||
var requestTimeout = ResolveRequestTimeout();
|
||||
client.Timeout = requestTimeout;
|
||||
|
||||
using var timeoutCts = CancellationTokenSource.CreateLinkedTokenSource(ct);
|
||||
timeoutCts.CancelAfter(requestTimeout);
|
||||
|
||||
var response = await client.GetAsync(url, timeoutCts.Token).ConfigureAwait(false);
|
||||
|
||||
if (!response.IsSuccessStatusCode)
|
||||
{
|
||||
@@ -78,6 +85,13 @@ public sealed class RemoteBundleProvider : ITranslationBundleProvider
|
||||
return Task.FromResult<IReadOnlyList<string>>([]);
|
||||
}
|
||||
|
||||
private TimeSpan ResolveRequestTimeout()
|
||||
{
|
||||
return _options.RemoteBundleRequestTimeout > TimeSpan.Zero
|
||||
? _options.RemoteBundleRequestTimeout
|
||||
: DefaultRequestTimeout;
|
||||
}
|
||||
|
||||
private sealed class RemoteBundleResponse
|
||||
{
|
||||
public string? Locale { get; set; }
|
||||
|
||||
@@ -22,6 +22,9 @@ public sealed class TranslationOptions
|
||||
/// <summary>Cache TTL for remote bundles.</summary>
|
||||
public TimeSpan RemoteBundleCacheDuration { get; set; } = TimeSpan.FromMinutes(30);
|
||||
|
||||
/// <summary>Maximum time to wait for a single remote bundle request during startup.</summary>
|
||||
public TimeSpan RemoteBundleRequestTimeout { get; set; } = TimeSpan.FromSeconds(3);
|
||||
|
||||
/// <summary>Whether to return the key as fallback when translation is missing.</summary>
|
||||
public bool ReturnKeyWhenMissing { get; set; } = true;
|
||||
}
|
||||
|
||||
@@ -44,28 +44,28 @@ public sealed class TranslationRegistry
|
||||
// Ensure default locale is always loaded
|
||||
allLocales.Add(_options.DefaultLocale);
|
||||
|
||||
// Load bundles in priority order (lower first, higher overwrites)
|
||||
// Load bundles in priority order (lower first, higher overwrites).
|
||||
// Locales within the same provider are independent, so load them concurrently
|
||||
// and merge back in deterministic locale order.
|
||||
foreach (var provider in ordered)
|
||||
{
|
||||
foreach (var locale in allLocales)
|
||||
var loadTasks = allLocales
|
||||
.OrderBy(locale => locale, StringComparer.OrdinalIgnoreCase)
|
||||
.Select(locale => LoadProviderBundleAsync(provider, locale, ct))
|
||||
.ToArray();
|
||||
|
||||
var results = await Task.WhenAll(loadTasks).ConfigureAwait(false);
|
||||
foreach (var result in results)
|
||||
{
|
||||
try
|
||||
if (result.Bundle.Count == 0)
|
||||
{
|
||||
var bundle = await provider.LoadAsync(locale, ct).ConfigureAwait(false);
|
||||
if (bundle.Count > 0)
|
||||
{
|
||||
MergeBundles(locale, bundle);
|
||||
_logger.LogDebug(
|
||||
"Loaded {Count} translations for locale {Locale} from provider (priority {Priority})",
|
||||
bundle.Count, locale, provider.Priority);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex,
|
||||
"Failed to load translations for locale {Locale} from provider (priority {Priority})",
|
||||
locale, provider.Priority);
|
||||
continue;
|
||||
}
|
||||
|
||||
MergeBundles(result.Locale, result.Bundle);
|
||||
_logger.LogDebug(
|
||||
"Loaded {Count} translations for locale {Locale} from provider (priority {Priority})",
|
||||
result.Bundle.Count, result.Locale, provider.Priority);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,6 +75,27 @@ public sealed class TranslationRegistry
|
||||
_store.Count, totalKeys);
|
||||
}
|
||||
|
||||
private async Task<ProviderLocaleBundle> LoadProviderBundleAsync(
|
||||
ITranslationBundleProvider provider,
|
||||
string locale,
|
||||
CancellationToken ct)
|
||||
{
|
||||
try
|
||||
{
|
||||
var bundle = await provider.LoadAsync(locale, ct).ConfigureAwait(false);
|
||||
return new ProviderLocaleBundle(locale, bundle);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex,
|
||||
"Failed to load translations for locale {Locale} from provider (priority {Priority})",
|
||||
locale, provider.Priority);
|
||||
return new ProviderLocaleBundle(
|
||||
locale,
|
||||
new Dictionary<string, string>(StringComparer.Ordinal));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Merges a bundle into the store. Higher-priority values overwrite lower.
|
||||
/// </summary>
|
||||
@@ -248,4 +269,6 @@ public sealed class TranslationRegistry
|
||||
_ => value.ToString() ?? string.Empty
|
||||
};
|
||||
}
|
||||
|
||||
private sealed record ProviderLocaleBundle(string Locale, IReadOnlyDictionary<string, string> Bundle);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user