Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(WebClient): add catch exception logic #5411

Merged
merged 6 commits into from
Feb 21, 2025
Merged

refactor(WebClient): add catch exception logic #5411

merged 6 commits into from
Feb 21, 2025

Conversation

ArgoZhang
Copy link
Collaborator

@ArgoZhang ArgoZhang commented Feb 21, 2025

add catch exception logic

Summary of the changes (Less than 80 chars)

简单描述你更改了什么, 不超过80个字符;如果有关联 Issue 请在下方填写相关编号

Description

fixes #5410

Regression?

  • Yes
  • No

[If yes, specify the version the behavior has regressed from]

[是否影响老版本]

Risk

  • High
  • Medium
  • Low

[Justify the selection above]

Verification

  • Manual (required)
  • Automated

Packaging changes reviewed?

  • Yes
  • No
  • N/A

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • Merge the latest code from the main branch

Summary by Sourcery

This pull request adds exception handling logic to the JavaScript module loading process and simplifies the retrieval of client information. It improves the robustness of the application by preventing crashes due to JavaScript module loading failures and streamlines the client information retrieval process.

Bug Fixes:

  • Catches exceptions that occur when loading JavaScript modules to prevent the application from crashing.

Enhancements:

  • Simplifies the getClientInfo function by removing the options parameter and directly calling the execute function to retrieve IP address information.
  • Removes the enableIpLocator option from the ping function in the JavaScript client module, streamlining the process of retrieving client information.

@bb-auto bb-auto bot added the enhancement New feature or request label Feb 21, 2025
Copy link

sourcery-ai bot commented Feb 21, 2025

Reviewer's Guide by Sourcery

This pull request refactors the WebClient service to add exception handling and remove the EnableIpLocator option. The changes include adding try-catch blocks to handle exceptions in WebClientService.cs and JSModuleExtensions.cs, removing the options parameter from javascript functions, and removing the EnableIpLocator option from ConnectionHub.cs and javascript files.

Sequence diagram for GetClientInfo with exception handling

sequenceDiagram
  participant WC as WebClientService
  participant JSR as JSRuntime
  participant JS as client.js
  participant Server
  participant DotNetObject

  WC->>JSR: LoadModuleByName("client")
  alt JSModule is loaded successfully
    JSR-->>WC: JSModule
    WC->>DotNetObject: Create(this)
    DotNetObject-->>WC: DotNetObjectReference
    WC->>JS: InvokeVoidAsync("ping", "ip.axd", DotNetObjectReference, "SetData")
    JS->>Server: GET ip.axd
    alt Request succeeds
      Server-->>JS: {Ip: ...}
      JS->>JS: localStorage.getItem('bb_hub_connection_id')
      JS->>JS: browser()
      JS-->>WC: ClientInfo
    else Request fails
      Server-->>JS: Error
      JS-->>WC: ClientInfo
    end
    WC->>WC: _taskCompletionSource.Task.WaitAsync(TimeSpan.FromSeconds(3))
  else JSModule fails to load
    JSR-->>WC: Exception
    WC->>Logger: LogError(ex, "{GetClientInfo} throw exception", nameof(GetClientInfo))
  end
  WC-->>WC: Returns ClientInfo
Loading

Updated class diagram for WebClientService

classDiagram
  class WebClientService {
    -IJSRuntime runtime
    -ILogger logger
    -JSModule? _jsModule
    -DotNetObjectReference _interop
    -TaskCompletionSource _taskCompletionSource
    +WebClientService(IJSRuntime runtime, ILogger logger, IOptionsSnapshot BootstrapBlazorOptions)
    +Task<ClientInfo> GetClientInfo()
    +void SetData(string ip)
  }
  note for WebClientService "Added exception handling in GetClientInfo method"
Loading

File-Level Changes

Change Details Files
Added exception handling to the GetClientInfo method in WebClientService.cs to catch and log exceptions that occur during the process of retrieving client information.
  • Added a try-catch block to handle exceptions during the GetClientInfo method execution.
  • Logged any exceptions that occur during the process using logger.LogError.
src/BootstrapBlazor/Services/WebClientService.cs
Removed the options parameter from the ping and getClientInfo functions in client.js and updated the calls to these functions in WebClientService.cs and hub.js.
  • Removed the options parameter from the ping function in client.js.
  • Removed the options parameter from the getClientInfo function in client.js.
  • Updated the call to _jsModule.InvokeVoidAsync("ping", ...) in WebClientService.cs to remove the options parameter.
  • Updated the call to getClientInfo(url, ...) in hub.js to remove the options parameter.
src/BootstrapBlazor/wwwroot/modules/client.js
src/BootstrapBlazor/Services/WebClientService.cs
src/BootstrapBlazor/wwwroot/modules/hub.js
Removed EnableIpLocator from ConnectionHub.cs and javascript files.
  • Removed BootstrapBlazorOptions.Value.WebClientOptions.EnableIpLocator from ConnectionHub.cs.
  • Removed enableIpLocator from hub.js.
  • Removed options parameter from client.js.
src/BootstrapBlazor/Components/ConnectionHub/ConnectionHub.cs
src/BootstrapBlazor/wwwroot/modules/hub.js
src/BootstrapBlazor/wwwroot/modules/client.js
Added exception handling for JSDisconnectedException, JSException, OperationCanceledException, and ObjectDisposedException in JSModuleExtensions.cs.
  • Added a catch block for JSDisconnectedException.
  • Added a catch block for JSException.
  • Added a catch block for OperationCanceledException.
  • Added a catch block for ObjectDisposedException.
src/BootstrapBlazor/Extensions/JSModuleExtensions.cs

Assessment against linked issues

Issue Objective Addressed Explanation
#5410 Add catch exception logic to handle potential errors in WebClient operations.

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@bb-auto bb-auto bot added this to the v9.3.0 milestone Feb 21, 2025
sourcery-ai[bot]
sourcery-ai bot previously approved these changes Feb 21, 2025
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @ArgoZhang - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider adding a try-catch block around the execute call in getClientInfo in client.js to handle potential network errors.
  • It looks like you're catching ObjectDisposedException in JSModuleExtensions.cs, but not re-throwing it - is this intentional?
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link

codecov bot commented Feb 21, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (e1a8f53) to head (b18100c).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##              main     #5411   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          644       644           
  Lines        29330     29330           
  Branches      4128      4129    +1     
=========================================
  Hits         29330     29330           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ArgoZhang ArgoZhang merged commit c45b44c into main Feb 21, 2025
5 checks passed
@ArgoZhang ArgoZhang deleted the refactor-ip branch February 21, 2025 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

refactor(WebClient): add catch exception logic
1 participant