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

Ensure BLE device is disconnected after unhandled connect exception #999

Merged
merged 3 commits into from
Nov 23, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 23, 2024

If we get an unexpected exception during connect, ensure the BLE connection is closed. The mostly likely case is cancellation

If we get an unexpected exception during connect, ensure the
BLE connection is closed. The mostly likely case is cancellation
Copy link

codecov bot commented Nov 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

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

Additional details and impacted files
@@            Coverage Diff            @@
##              main      #999   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           17        17           
  Lines         2673      2681    +8     
=========================================
+ Hits          2673      2681    +8     

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


🚨 Try these New Features:

Copy link

codspeed-hq bot commented Nov 23, 2024

CodSpeed Performance Report

Merging #999 will not alter performance

Comparing cleanup_after_unhandled_exception_ble_connect (1aa3a5e) with main (b2505a1)

Summary

✅ 2 untouched benchmarks

@bdraco bdraco marked this pull request as ready for review November 23, 2024 18:36
Copy link
Contributor

coderabbitai bot commented Nov 23, 2024

Walkthrough

The pull request introduces modifications to the APIClient class in aioesphomeapi/client.py, enhancing error handling and connection management for Bluetooth devices. A new method, _bluetooth_disconnect_no_wait, is added to facilitate immediate disconnection without waiting for a response. The bluetooth_device_connect method is updated to track unhandled exceptions and ensure proper resource management during connection attempts. Corresponding tests in tests/test_client.py have been expanded to cover new scenarios, including connection cancellations and Bluetooth operation failures, improving the robustness of the test suite.

Changes

File Change Summary
aioesphomeapi/client.py - Added method _bluetooth_disconnect_no_wait(self, address: int) -> None to APIClient class.
- Updated bluetooth_device_connect method to handle unhandled exceptions and manage connection state.
tests/test_client.py - Added new test case test_bluetooth_device_connect_cancelled to verify disconnect requests on canceled connections.
- Expanded tests for Bluetooth operations and voice assistant functionalities.

Sequence Diagram(s)

sequenceDiagram
    participant Client as APIClient
    participant Bluetooth as BluetoothDevice
    participant Transport as TransportLayer

    Client->>Bluetooth: Attempt to connect
    alt Connection successful
        Bluetooth-->>Client: Connection established
    else Connection failed
        Client->>Transport: Request disconnect
        Transport-->>Client: Disconnect confirmed
    end
Loading

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
tests/test_client.py (1)

Line range hint 2007-2040: Consider adding assertions to validate connection state changes

In the test test_bluetooth_device_connect_and_disconnect_times_out, you might enhance the test by asserting the state changes in the states list after the timeout occurs. This would verify that the on_bluetooth_connection_state callback is not inadvertently invoked during timeout situations.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between b2505a1 and 1aa3a5e.

📒 Files selected for processing (2)
  • aioesphomeapi/client.py (3 hunks)
  • tests/test_client.py (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
aioesphomeapi/client.py (1)

Pattern **: - Do not generate or add any sequence diagrams

tests/test_client.py (1)

Pattern **: - Do not generate or add any sequence diagrams

🔇 Additional comments (3)
aioesphomeapi/client.py (1)

728-735: _bluetooth_disconnect_no_wait method implementation is appropriate

The _bluetooth_disconnect_no_wait method correctly sends a disconnect request without awaiting a response, ensuring that resources are freed promptly in the event of an unhandled exception.

tests/test_client.py (2)

Line range hint 2191-2233: Effective test for handling Bluetooth connection cancellation

The test test_bluetooth_device_connect_cancelled properly verifies that when a Bluetooth device connection attempt is canceled, the client sends a disconnect request and ensures no message handlers are leaked. This ensures robust handling of cancellation scenarios and prevents potential resource leaks.


Line range hint 2107-2145: Test correctly validates timeout and disconnect sequence

The test test_bluetooth_device_connect_times_out_disconnect_ok effectively checks that when a Bluetooth connection attempt times out, a disconnect request is sent and the appropriate timeout exception is raised. This ensures that the client properly handles timeout scenarios without leaving connections hanging.

aioesphomeapi/client.py Show resolved Hide resolved
@bdraco bdraco merged commit 71212d8 into main Nov 23, 2024
18 checks passed
@bdraco bdraco deleted the cleanup_after_unhandled_exception_ble_connect branch November 23, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant