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

Add more fine grained control over Matter server commissioning for the Companion apps #106237

Merged
merged 6 commits into from Dec 27, 2023

Conversation

marcelveldt
Copy link
Member

Proposed change

Add a few additional options to the websocket commands used for commissioning matter devices that can be leveraged by the (Android) companion app.

  • Allows Android app to fix the bug that commisisoning is not working when initiated from the HA app
  • Skips bluetooth by default when commissioning

Bumps the matter-server client to version 5.1.1 and depends on schema version 6 to be fully utilized (although backwards compatible).

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@home-assistant
Copy link

Hey there @home-assistant/matter, mind taking a look at this pull request as it has been labeled with an integration (matter) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of matter can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign matter Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@jpelgrom
Copy link
Member

Shouldn't network_only and ip be added to the websocket command annotation as optional?

@marcelveldt
Copy link
Member Author

Shouldn't network_only and ip be added to the websocket command annotation as optional?

yep, now added.

@jbouwh
Copy link
Contributor

jbouwh commented Dec 22, 2023

May be you need to update the snapshots to let the tests pass

@frenck frenck added this to the 2024.1.0b0 milestone Dec 27, 2023
@frenck frenck merged commit 13702d5 into dev Dec 27, 2023
49 checks passed
@frenck frenck deleted the matter-server-commissioning branch December 27, 2023 15:55
@github-actions github-actions bot locked and limited conversation to collaborators Dec 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants