fix issue where MiniLcmApiProvider would be shared by all clients, it…

…'s now shared per circuit
sillsdev · Jan 13, 2025 · 4b28702 · 4b28702
1 parent e290570
commit 4b28702
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/backend/FwLite/FwLiteShared/FwLiteSharedKernel.cs b/backend/FwLite/FwLiteShared/FwLiteSharedKernel.cs
@@ -21,7 +21,9 @@ public static IServiceCollection AddFwLiteShared(this IServiceCollection service
         services.AddScoped<SyncService>();
         services.AddSingleton<LexboxProjectService>();
         services.AddSingleton<CombinedProjectsService>();
-        services.AddSingleton<FwLiteProvider>();
+        //this is scoped so that there will be once instance per blazor circuit, this prevents issues where the same instance is used when reloading the page.
+        //it also avoids issues if there's multiple blazor circuits running at the same time
+        services.AddScoped<FwLiteProvider>();
 
         services.AddSingleton<ChangeEventBus>();
         services.AddSingleton<BackgroundSyncService>();

diff --git a/backend/FwLite/FwLiteShared/Pages/CrdtProject.razor b/backend/FwLite/FwLiteShared/Pages/CrdtProject.razor
@@ -5,6 +5,8 @@
 @inherits OwningComponentBaseAsync
 @layout SvelteLayout;
 @inject IJSRuntime JS;
+@* injecting here means we get a provider scoped to the current circuit *@
+@inject FwLiteProvider FwLiteProvider;
 
 @code {
 
@@ -16,8 +18,8 @@
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (!firstRender) return;
-        var fwLiteProvider = ScopedServices.GetRequiredService<FwLiteProvider>();
-        _disposable = await fwLiteProvider.InjectCrdtProject(JS, ScopedServices, ProjectName);
+        //scoped services here are per page render, meaning they will get cleaned up when the page is disposed
+        _disposable = await FwLiteProvider.InjectCrdtProject(JS, ScopedServices, ProjectName);
     }
 
     protected override async ValueTask DisposeAsyncCore()

diff --git a/backend/FwLite/FwLiteShared/Pages/FwdataProject.razor b/backend/FwLite/FwLiteShared/Pages/FwdataProject.razor
@@ -5,6 +5,7 @@
 @inherits OwningComponentBaseAsync
 @layout SvelteLayout;
 @inject IJSRuntime JS;
+@inject FwLiteProvider FwLiteProvider;
 
 @code {
 
@@ -16,8 +17,7 @@
     protected override Task OnAfterRenderAsync(bool firstRender)
     {
         if (!firstRender) return Task.CompletedTask;
-        var fwLiteProvider = ScopedServices.GetRequiredService<FwLiteProvider>();
-        _disposable = fwLiteProvider.InjectFwDataProject(ScopedServices, ProjectName);
+        _disposable = FwLiteProvider.InjectFwDataProject(ScopedServices, ProjectName);
         return Task.CompletedTask;
     }
 

diff --git a/backend/FwLite/FwLiteShared/Services/FwLiteProvider.cs b/backend/FwLite/FwLiteShared/Services/FwLiteProvider.cs
@@ -127,11 +127,11 @@ public IAsyncDisposable InjectFwDataProject(IServiceProvider scopedServices, str
     private IDisposable ProvideMiniLcmApi(MiniLcmJsInvokable miniLcmApi)
     {
         var reference = DotNetObjectReference.Create(miniLcmApi);
-        _miniLcmApiProvider.SetMiniLcmApi(reference);
+        var cleanup = _miniLcmApiProvider.SetMiniLcmApi(reference);
         return Defer.Action(() =>
         {
-            reference?.Dispose();
-            _miniLcmApiProvider.ClearMiniLcmApi();
+            reference.Dispose();
+            cleanup.Dispose();
         });
     }
 }
@@ -151,10 +151,19 @@ public async Task<DotNetObjectReference<MiniLcmJsInvokable>> GetMiniLcmApi()
 #pragma warning restore VSTHRD003
     }
 
-    public void SetMiniLcmApi(DotNetObjectReference<MiniLcmJsInvokable> miniLcmApi)
+    public IDisposable SetMiniLcmApi(DotNetObjectReference<MiniLcmJsInvokable> miniLcmApi)
     {
         logger.LogInformation("Setting MiniLcmApi");
         _tcs.SetResult(miniLcmApi);
+        var currentTask = _tcs.Task;
+        return Defer.Action(() =>
+        {
+            //if the tcs has been reset, then we don't want to clear it again
+            if (_tcs.Task == currentTask)
+            {
+                ClearMiniLcmApi();
+            }
+        });
     }
 
     [JSInvokable]