Fix: unexpected JSDisconnectedException was thrown when it is running…

… on a Blazor Server
jsakamoto · Apr 3, 2024 · 10c86b1 · 10c86b1
1 parent 5b02f3f
commit 10c86b1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/BlazingStory/Internals/Components/Menus/PopupMenu.razor b/BlazingStory/Internals/Components/Menus/PopupMenu.razor
@@ -87,8 +87,8 @@
         this._HotKeysContext = null;
 
         if (this._EventSubscriber == null) return;
-        await this._EventSubscriber.InvokeVoidAsync("dispose");
-        await this._EventSubscriber.DisposeAsync();
+        await this._EventSubscriber.InvokeVoidIfConnectedAsync("dispose");
+        await this._EventSubscriber.DisposeIfConnectedAsync();
         this._EventSubscriber = null;
     }
 

diff --git a/BlazingStory/Internals/Components/Preview/PreviewFrame.razor b/BlazingStory/Internals/Components/Preview/PreviewFrame.razor
@@ -159,6 +159,7 @@
 
     public async ValueTask DisposeAsync()
     {
+        await _EventMonitorSubscriber.InvokeVoidIfConnectedAsync("dispose");
         await _EventMonitorSubscriber.DisposeIfConnectedAsync();
         await _JSModule.DisposeAsync();
         _ThisRef?.Dispose();

diff --git a/BlazingStory/Internals/Extensions/IJSExtensions.cs b/BlazingStory/Internals/Extensions/IJSExtensions.cs
@@ -4,12 +4,15 @@ namespace BlazingStory.Internals.Extensions;
 
 internal static class IJSExtensions
 {
+    public static async ValueTask InvokeVoidIfConnectedAsync(this IJSObjectReference? value, string identifier, params object?[]? args)
+    {
+        try { if (value != null) await value.InvokeVoidAsync(identifier, args); }
+        catch (JSDisconnectedException) { }
+    }
+
     public static async ValueTask DisposeIfConnectedAsync(this IJSObjectReference? value)
     {
-        try
-        {
-            if (value != null) await value.DisposeAsync();
-        }
+        try { if (value != null) await value.DisposeAsync(); }
         catch (JSDisconnectedException) { }
     }
 }
diff --git a/BlazingStory/Internals/Pages/Canvas/MeasureLayer.razor b/BlazingStory/Internals/Pages/Canvas/MeasureLayer.razor
@@ -315,7 +315,7 @@
 
     public async ValueTask DisposeAsync()
     {
-        await this._JSModule.InvokeVoidAsync("detach");
+        await this._JSModule.InvokeVoidIfConnectedAsync("detach");
         await this._JSModule.DisposeAsync();
         this._This.Dispose();
     }

diff --git a/BlazingStory/Internals/Services/JSModule.cs b/BlazingStory/Internals/Services/JSModule.cs
@@ -31,11 +31,7 @@ private async ValueTask<IJSObjectReference> GetModuleAsync()
         return this._Module;
     }
 
-    public async ValueTask InvokeVoidIfConnectedAsync(string identifier, params object?[]? args)
-    {
-        try { await this.InvokeVoidAsync(identifier, args); }
-        catch (JSDisconnectedException) { }
-    }
+    public ValueTask InvokeVoidIfConnectedAsync(string identifier, params object?[]? args) => this._Module.InvokeVoidIfConnectedAsync(identifier, args);
 
     public async ValueTask InvokeVoidAsync(string identifier, params object?[]? args)
     {