refactor(LoadModule): add logger information for load module failed (#…

…5148) * refactor: 复用 LoadModule 方法 * refactor: 增加日志输出 * refactor: 精简代码提高可读性 Co-Authored-By: Alex chow <[email protected]> Co-Authored-By: Argo Zhang <[email protected]>
dotnetcore · Jan 18, 2025 · 84ace2e · 84ace2e
1 parent 3279623
commit 84ace2e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 35 deletions.
diff --git a/src/BootstrapBlazor/Extensions/JSModuleExtensions.cs b/src/BootstrapBlazor/Extensions/JSModuleExtensions.cs
@@ -14,8 +14,9 @@ public static class JSModuleExtensions
     /// 导入 utility js 模块
     /// </summary>
     /// <param name="jsRuntime"></param>
+    /// <param name="version"></param>
     /// <returns>A <see cref="Task"/><![CDATA[<]]><see cref="JSModule"/><![CDATA[>]]> 模块加载器</returns>
-    public static Task<JSModule> LoadUtility(this IJSRuntime jsRuntime) => jsRuntime.LoadModule("./_content/BootstrapBlazor/modules/utility.js");
+    public static Task<JSModule> LoadUtility(this IJSRuntime jsRuntime, string? version = null) => LoadModule(jsRuntime, "./_content/BootstrapBlazor/modules/utility.js", version);
 
     /// <summary>
     /// IJSRuntime 扩展方法 动态加载脚本 脚本目录为 modules
@@ -39,6 +40,7 @@ public static async Task<JSModule> LoadModule(this IJSRuntime jsRuntime, string
         catch (JSException)
         {
 #if DEBUG
+            System.Console.WriteLine($"{nameof(LoadModule)} throw {nameof(JSException)}. import {fileName} failed");
             throw;
 #endif
         }

diff --git a/src/BootstrapBlazor/Utils/JSModule.cs b/src/BootstrapBlazor/Utils/JSModule.cs
@@ -47,28 +47,23 @@ public virtual async ValueTask InvokeVoidAsync(string identifier, CancellationTo
         {
             paras.AddRange(args);
         }
-        await InvokeVoidAsync();
-
-        async ValueTask InvokeVoidAsync()
+        try
         {
-            try
+            if (jSObjectReference != null)
             {
-                if (jSObjectReference != null)
-                {
-                    await jSObjectReference.InvokeVoidAsync(identifier, cancellationToken, [.. paras]);
-                }
+                await jSObjectReference.InvokeVoidAsync(identifier, cancellationToken, [.. paras]);
             }
-            catch (JSException)
-            {
+        }
+        catch (JSException)
+        {
 #if DEBUG
-                System.Console.WriteLine($"identifier: {identifier} args: {string.Join(" ", args!)}");
-                throw;
+            System.Console.WriteLine($"identifier: {identifier} args: {string.Join(" ", args!)}");
+            throw;
 #endif
-            }
-            catch (JSDisconnectedException) { }
-            catch (OperationCanceledException) { }
-            catch (ObjectDisposedException) { }
         }
+        catch (JSDisconnectedException) { }
+        catch (OperationCanceledException) { }
+        catch (ObjectDisposedException) { }
     }
 
     /// <summary>
@@ -107,31 +102,27 @@ async ValueTask InvokeVoidAsync()
         {
             paras.AddRange(args!);
         }
-        return await InvokeAsync();
 
-        async ValueTask<TValue?> InvokeAsync()
+        TValue? ret = default;
+        try
         {
-            TValue? ret = default;
-            try
+            if (jSObjectReference != null)
             {
-                if (jSObjectReference != null)
-                {
-                    ret = await jSObjectReference.InvokeAsync<TValue?>(identifier, cancellationToken, [.. paras]);
-                }
+                ret = await jSObjectReference.InvokeAsync<TValue?>(identifier, cancellationToken, [.. paras]);
             }
-            catch (JSException)
-            {
+        }
+        catch (JSException)
+        {
 #if DEBUG
-                System.Console.WriteLine($"identifier: {identifier} args: {string.Join(" ", args!)}");
-                throw;
+            System.Console.WriteLine($"identifier: {identifier} args: {string.Join(" ", args!)}");
+            throw;
 #endif
-            }
-            catch (JSDisconnectedException) { }
-            catch (OperationCanceledException) { }
-            catch (ObjectDisposedException) { }
-
-            return ret;
         }
+        catch (JSDisconnectedException) { }
+        catch (OperationCanceledException) { }
+        catch (ObjectDisposedException) { }
+
+        return ret;
     }
 
     /// <summary>