-
-
Notifications
You must be signed in to change notification settings - Fork 209
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
feat: support for Z-Wave JS v13 #3799
Conversation
Pull Request Test Coverage Report for Build 9991427870Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
api/lib/ZwaveClient.ts
Outdated
@@ -1802,7 +1798,8 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> { | |||
this.logNode( | |||
zwaveNode, | |||
'warn', | |||
`Unable to add Node ${a.nodeId} to Group ${groupId} of ${sourceMsg}, association not allowed`, | |||
// FIXME: We should explain the reason why it failed in human-readable form, see doc comments of AssociationCheckResult |
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.
still TODO
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.
do you mean on frontend side?
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.
Both logs and frontend IMO
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.
Check what i did and let me know if it's ok for you
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.
Although, if we do #3801, we don't have to show the error reason in the logs I think, because there shouldn't be one.
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.
there shouldn't doesn't mean there will not, also consider that api can be also called from driver function and MQTT so I would leave it there
api/lib/ZwaveClient.ts
Outdated
const secure = strategy !== InclusionStrategy.Insecure | ||
const message = `${secure ? 'Secure' : 'Non-secure'} inclusion started` | ||
this._updateControllerStatus(message) | ||
// FIXME: Should the frontend also accept the strategy instead of the boolean? | ||
this.emit('event', EventSource.CONTROLLER, 'inclusion started', secure) |
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.
See FIXME comment
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.
Frontend uses startInclusion
and passes the mode:
zwave-js-ui/src/components/dialogs/DialogNodesManager.vue
Lines 995 to 998 in 80c1cd8
this.sendAction('startInclusion', [ | |
mode, | |
{ provisioning }, | |
]) |
zwave-js-ui/src/components/dialogs/DialogNodesManager.vue
Lines 1149 to 1156 in 80c1cd8
this.sendAction('startInclusion', [ | |
mode, | |
{ | |
forceSecurity: s.values.forceSecurity, | |
dsk, | |
...this.nodeProps, | |
}, | |
]) |
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 meant the event that is emitted below the comment. Right now it gets passed secure
, I wonder if it should now include the strategy instead.
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.
that event actually is only emittet to MQTT when Emit events
flag is enabled in MQTT settings, nothing used by UI btw. I can fix that and use the inclusion strategy instead
api/lib/ZwaveClient.ts
Outdated
@@ -1802,7 +1798,8 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> { | |||
this.logNode( | |||
zwaveNode, | |||
'warn', | |||
`Unable to add Node ${a.nodeId} to Group ${groupId} of ${sourceMsg}, association not allowed`, | |||
// FIXME: We should explain the reason why it failed in human-readable form, see doc comments of AssociationCheckResult |
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.
do you mean on frontend side?
api/lib/ZwaveClient.ts
Outdated
const secure = strategy !== InclusionStrategy.Insecure | ||
const message = `${secure ? 'Secure' : 'Non-secure'} inclusion started` | ||
this._updateControllerStatus(message) | ||
// FIXME: Should the frontend also accept the strategy instead of the boolean? | ||
this.emit('event', EventSource.CONTROLLER, 'inclusion started', secure) |
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.
Frontend uses startInclusion
and passes the mode:
zwave-js-ui/src/components/dialogs/DialogNodesManager.vue
Lines 995 to 998 in 80c1cd8
this.sendAction('startInclusion', [ | |
mode, | |
{ provisioning }, | |
]) |
zwave-js-ui/src/components/dialogs/DialogNodesManager.vue
Lines 1149 to 1156 in 80c1cd8
this.sendAction('startInclusion', [ | |
mode, | |
{ | |
forceSecurity: s.values.forceSecurity, | |
dsk, | |
...this.nodeProps, | |
}, | |
]) |
TODO: