Proper async cache

CMP.Localiztion.Traduora.sln

@@ -5,10 +5,12 @@ VisualStudioVersion = 15.0.28307.329
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "sample\Web\Web.csproj", "{17E01B10-44A9-4896-96C4-F6D948DEC5F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CachedLocalizer", "src\Core\CachedLocalizer.csproj", "{79B4E158-DADA-4A56-A3BC-E0CCD012FA10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicDictionaryLocalizer", "src\Core\DynamicDictionaryLocalizer.csproj", "{79B4E158-DADA-4A56-A3BC-E0CCD012FA10}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Traduora.Provider", "src\Traduora\Traduora.Provider.csproj", "{A007D934-6807-49F7-B31F-34B9C6AFC5C9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Traduora.Localizer", "Traduora.Localizer\Traduora.Localizer.csproj", "{CD719FDF-97E1-48E1-9600-A1FD58DBCD97}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{A007D934-6807-49F7-B31F-34B9C6AFC5C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A007D934-6807-49F7-B31F-34B9C6AFC5C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A007D934-6807-49F7-B31F-34B9C6AFC5C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD719FDF-97E1-48E1-9600-A1FD58DBCD97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD719FDF-97E1-48E1-9600-A1FD58DBCD97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD719FDF-97E1-48E1-9600-A1FD58DBCD97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD719FDF-97E1-48E1-9600-A1FD58DBCD97}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Traduora.Localizer/Cache/TranslationPollingService.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
+
+namespace Traduora.Localizer.Cache
+{
+    public class TranslationPollingService : BackgroundService
+    {
+        private readonly Func<Task<IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>>>> _asyncDataProvider;
+        private readonly TimeSpan _refreshInterval;
+
+        public TranslationPollingService(
+            Func<Task<IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>>>> asyncDataProvider,
+            TimeSpan refreshInterval)
+        {
+            _asyncDataProvider = asyncDataProvider;
+            _refreshInterval = refreshInterval;
+
+            Data = _asyncDataProvider().Result;
+        }
+
+        public IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> Data { get; set; }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (!stoppingToken.IsCancellationRequested)
+            {
+                Data = await _asyncDataProvider();
+                await Task.Delay(_refreshInterval, stoppingToken);
+            }
+        }
+    }
+}

sample/Web/Config/ConfigurationService.cs → Traduora.Localizer/Config/ConfigurationService.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Web.Config
+namespace Traduora.Localizer.Config
 {
     public static class ConfigurationService
     {

sample/Web/Config/TraduoraApiSettings.cs → Traduora.Localizer/Config/TraduoraApiSettings.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Web.Config
+namespace Traduora.Localizer.Config
 {
     public class TraduoraApiSettings
     {

sample/Web/Config/TraduoraSecretSettings.cs → Traduora.Localizer/Config/TraduoraSecretSettings.cs

@@ -1,4 +1,4 @@
-namespace Web.Config
+namespace Traduora.Localizer.Config
 {
     public class TraduoraSecretSettings
     {

sample/Web/ServiceExtensions.cs → Traduora.Localizer/ServiceExtensions.cs

@@ -1,24 +1,28 @@
 using System.Net.Http;
-using CachedLocalizer;
-using CachedLocalizer.Cache;
+using DynamicDictionaryLocalizer;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
+using Traduora.Localizer.Cache;
+using Traduora.Localizer.Config;
 using Traduora.Provider;
-using Web.Config;
 
-namespace Web
+namespace Traduora.Localizer
 {
     public static class ServiceExtensions
     {
         private const string HttpClientName = "traduora";
-        public static IServiceCollection AddTraduora(this IServiceCollection services)
+        public static IServiceCollection AddTraduora(this IServiceCollection services, IConfiguration config)
         {
+            services.AddTypedConfiguration(config);
+
             services
                 .AddHttpClient(HttpClientName)
                 .ConfigureHttpClient((sp, client) =>
             {
-                var traduoraApiSettings = sp.GetRequiredService<IOptions<TraduoraApiSettings>>().Value;
+                TraduoraApiSettings traduoraApiSettings = sp.GetRequiredService<IOptions<TraduoraApiSettings>>().Value;
                 client.BaseAddress = traduoraApiSettings.BaseUrl;
             });
 
@@ -30,18 +34,21 @@ public static IServiceCollection AddTraduora(this IServiceCollection services)
                 return new TraduoraProvider(httpClient);
             });
 
-            services.AddTransient<ITraduoraService, TraduoraService>();
+            services.AddTransient<TraduoraService>();
 
-            services.AddSingleton<IStringLocalizer>(sp =>
+            services.AddSingleton(sp =>
             {
-                var traduoraApiSettings = sp.GetRequiredService<IOptions<TraduoraApiSettings>>().Value;
+                TraduoraApiSettings traduoraApiSettings =
+                    sp.GetRequiredService<IOptions<TraduoraApiSettings>>().Value;
 
-                var cache = new DictionaryPollingCache(
-                    sp.GetRequiredService<ITraduoraService>().GetTranslations,
+                return new TranslationPollingService(
+                    sp.GetRequiredService<TraduoraService>().GetTranslations,
                     traduoraApiSettings.RefreshIntervalSeconds);
-
-                return new CachedDictionaryStringLocalizer(cache.GetData);
             });
+            services.AddSingleton<IHostedService>(sp => sp.GetRequiredService<TranslationPollingService>());
+
+            services.AddSingleton<IStringLocalizer>(sp =>
+                new DynamicDictionaryStringLocalizer(() => sp.GetRequiredService<TranslationPollingService>().Data));
 
             return services;
         }

Traduora.Localizer/Traduora.Localizer.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\src\Core\DynamicDictionaryLocalizer.csproj" />
+    <ProjectReference Include="..\src\Traduora\Traduora.Provider.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions">
+      <HintPath>..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.configuration.abstractions\2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
+      <HintPath>..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.dependencyinjection.abstractions\2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Hosting.Abstractions">
+      <HintPath>..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.hosting.abstractions\2.2.0\lib\netstandard2.0\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Http">
+      <HintPath>..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.http\2.2.0\lib\netstandard2.0\Microsoft.Extensions.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options">
+      <HintPath>..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.extensions.options\2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>

Traduora.Localizer/TraduoraService.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
+using Traduora.Localizer.Config;
+using Traduora.Provider;
+
+namespace Traduora.Localizer
+{
+    public class TraduoraService
+    {
+        private readonly TraduoraSecretSettings _config;
+        private readonly TraduoraProvider _traduora;
+
+        public TraduoraService(IOptions<TraduoraSecretSettings> config, TraduoraProvider traduora)
+        {
+            _config = config.Value;
+            _traduora = traduora;
+        }
+
+        public async Task<IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>>> GetTranslations()
+        {
+            try
+            {
+                string key = await _traduora.Authenticate(_config.ClientId, _config.ClientSecret);
+
+                return await _traduora.GetData(_config.ProjectId, key);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+
+                var emptyDictionary = new ReadOnlyDictionary<string, IReadOnlyDictionary<string, string>>
+                    (new Dictionary<string, IReadOnlyDictionary<string, string>>());
+
+                return emptyDictionary;
+            }
+        }
+    }
+}

sample/Web/Startup.cs

@@ -1,11 +1,10 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Web.Config;
+using Traduora.Localizer;
 
 namespace Web
 {
@@ -23,13 +22,17 @@ public Startup(IConfiguration config)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc();
-            services.AddTypedConfiguration(_config);
-            services.AddTraduora();
+            services.AddTraduora(_config);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
             var supportedCultures = new[]
             {
                 new CultureInfo("en"),
@@ -38,11 +41,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 new CultureInfo("sv-SE"),
             };
 
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
             app.UseRequestLocalization(new RequestLocalizationOptions
             {
                 DefaultRequestCulture = new RequestCulture(supportedCultures[0]),