Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Support for the new way of reporting events on ZWaveJS-UI.

Browse source 
The most recent versions of ZwaveJS-UI don't send the `hexId` of the
node on node change events. We have therefore to infer it from the
reported `dbLink`.
This commit is contained in:
Fabio Manganiello 2022-12-04 20:48:42 +01:00
parent ecba72935f
commit 3a92bf59ca
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
platypush/plugins/zwave/mqtt/__init__.py
View file

@ -17,6 +17,7 @@ from typing import (
Type, Type,
Union, Union,
) )
from urllib.parse import parse_qs, urlparse
from platypush.entities import Entity from platypush.entities import Entity
from platypush.entities.batteries import Battery from platypush.entities.batteries import Battery
@ -345,9 +346,21 @@ class ZwaveMqttPlugin(MqttPlugin, ZwaveBasePlugin):
if node.get('zwavePlusVersion'): if node.get('zwavePlusVersion'):
capabilities += ['zwave_plus'] capabilities += ['zwave_plus']
db_link = node.get('dbLink', node.get('db_link', ''))
device_id = node.get('hexId')
if not device_id:
if db_link:
device_id = ':'.join(
parse_qs(urlparse(db_link).query)
.get('jumpTo', '')[0]
.split(':')[:-1]
)
else:
device_id = str(node['id'])
return { return {
'node_id': node['id'], 'node_id': node['id'],
'device_id': node['hexId'].replace('0x', ''), 'device_id': device_id.replace('0x', ''),
'name': node.get('name'), 'name': node.get('name'),
'capabilities': capabilities, 'capabilities': capabilities,
'manufacturer_id': '0x{:04x}'.format(node['manufacturerId']) 'manufacturer_id': '0x{:04x}'.format(node['manufacturerId'])