-
Notifications
You must be signed in to change notification settings - Fork 553
Fix error resubscribe #3105
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
Open
KyuminAhn
wants to merge
2
commits into
SmartThingsCommunity:main
Choose a base branch
from
KyuminAhn:fix/error-resubscribe
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix error resubscribe #3105
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| name: matter-bridge | ||
| components: | ||
| - id: main | ||
| capabilities: | ||
| - id: firmwareUpdate | ||
| version: 1 | ||
| - id: refresh | ||
| version: 1 | ||
| categories: | ||
| - name: Bridges |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| -- SinuxSoft (c) 2025 | ||
| -- Licensed under the Apache License, Version 2.0 | ||
|
|
||
| local im = require "st.matter.interaction_model" | ||
| local log = require "log" | ||
|
|
||
| local utils = {} | ||
|
|
||
| -- Sends subscription request directly via device:send(), following the matter-switch pattern. | ||
| -- The default device:subscribe() reuses cached sessions, which causes timeout after hub | ||
| -- replacement because the hub Node ID changes and all sessions expire. | ||
| -- device:send() creates a new session directly, so it works correctly after hub replacement. | ||
| function utils.make_subscribe(subscribed_attributes) | ||
| return function(device) | ||
| local subscribe_request = im.InteractionRequest(im.InteractionRequest.RequestType.SUBSCRIBE, {}) | ||
| for cap_id, attributes in pairs(subscribed_attributes) do | ||
| if device:supports_capability_by_id(cap_id) then | ||
| for _, attr in ipairs(attributes) do | ||
| local cluster_id = (attr._cluster and attr._cluster.ID) or attr.cluster | ||
| local attr_id = attr.ID or attr.attribute | ||
| local ib = im.InteractionInfoBlock(nil, cluster_id, attr_id) | ||
| subscribe_request:with_info_block(ib) | ||
| end | ||
| end | ||
| end | ||
| if #subscribe_request.info_blocks > 0 then | ||
| log.info_with({hub_logs=true}, string.format("[britzyhub] subscribe via send: %d blocks", #subscribe_request.info_blocks)) | ||
| device:send(subscribe_request) | ||
| end | ||
| end | ||
| end | ||
|
|
||
| return utils |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if the issue is that there was no subscription being sent my the bridge device if this
bridge_initfunction was not previously populated?@DongHoon-Ryu could you check if just removing this function causes the issue to occur again during hub replace? And then if adding it back fixes the issue?
The reason I am more suspicious of this is because the other subscribe logic above is very similar to what already exists in the subscribe function, so I'm not sure yet how that is providing a change in functionality.