ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PhilipsHue: Fix automatic rediscovery of the bridge if it changes IP

Browse Source
This commit is contained in:
Michael Zanetti 2020-09-02 14:23:44 +02:00
parent 34ac58feaa
commit 1c09440ca9
2 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
philipshue/integrationpluginphilipshue.cpp
View File

@ -83,20 +83,18 @@ void IntegrationPluginPhilipsHue::init()
m_zeroConfBrowser = hardwareManager()->zeroConfController()->createServiceBrowser("_hue._tcp"); m_zeroConfBrowser = hardwareManager()->zeroConfController()->createServiceBrowser("_hue._tcp");
connect(m_zeroConfBrowser, &ZeroConfServiceBrowser::serviceEntryAdded, this, [=](const ZeroConfServiceEntry &entry){ connect(m_zeroConfBrowser, &ZeroConfServiceBrowser::serviceEntryAdded, this, [=](const ZeroConfServiceEntry &entry){
foreach (Thing *thing, myThings().filterByThingClassId(bridgeThingClassId)) {
QString thingId = thing->paramValue(bridgeThingIdParamTypeId).toString();
if (entry.protocol() == QAbstractSocket::IPv4Protocol) { if (entry.protocol() == QAbstractSocket::IPv4Protocol) {
return;
foreach (const QString &txtEntry, entry.txt()) { }
QStringList parts = txtEntry.split('='); QString bridgeId = normalizeBridgeId(entry.txt("bridgeid"));
if (parts.length() == 2 && parts.first() == "bridgeid" && parts.last().toLower() == thingId) { Thing *thing = bridgeForBridgeId(bridgeId);
if (!thing) {
qCDebug(dcPhilipsHue()) << "We don't know this bridge yet...";
return;
}
thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString()); thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString());
HueBridge *bridge = m_bridges.key(thing); HueBridge *bridge = m_bridges.key(thing);
bridge->setHostAddress(entry.hostAddress()); bridge->setHostAddress(entry.hostAddress());
}
}
}
}
}); });
} }
@ -130,21 +128,7 @@ void IntegrationPluginPhilipsHue::discoverThings(ThingDiscoveryInfo *info)
continue; continue;
} }
QString id; QString id = normalizeBridgeId(entry.txt("bridgeid"));
foreach (const QString &txt, entry.txt()) {
QString field = txt.split("=").first();
QString value = txt.split("=").last();
if (field == "bridgeid") {
id = value.toLower();
break;
}
}
// For some reason the UPnP api returns serial numbers withouot a "fffe" in the middle. For backwards compatiblity adjust to that
if (id.indexOf("fffe") == 6) {
id.remove(6, 4);
}
QHostAddress address = entry.hostAddress(); QHostAddress address = entry.hostAddress();
ParamList params; ParamList params;
@ -232,20 +216,13 @@ void IntegrationPluginPhilipsHue::discoverThings(ThingDiscoveryInfo *info)
} }
foreach (const QVariant &bridgeVariant, jsonDoc.toVariant().toList()) { foreach (const QVariant &bridgeVariant, jsonDoc.toVariant().toList()) {
QVariantMap bridgeMap = bridgeVariant.toMap(); QVariantMap bridgeMap = bridgeVariant.toMap();
ThingDescriptor descriptor(bridgeThingClassId, "Philips Hue Bridge", bridgeMap.value("internalipaddress").toString()); ThingDescriptor descriptor(bridgeThingClassId, "Philips Hue Bridge", bridgeMap.value("internalipaddress").toString());
ParamList params; ParamList params;
QString bridgeId = bridgeMap.value("id").toString().toLower(); QString bridgeId = normalizeBridgeId(bridgeMap.value("id").toString());
QString address = bridgeMap.value("internalipaddress").toString(); QString address = bridgeMap.value("internalipaddress").toString();
// For some reason the UPnP api returns serial numbers withouot a "fffe" in the middle. For backwards compatiblity adjust to that
if (bridgeId.indexOf("fffe") == 6) {
bridgeId.remove(6, 4);
}
params.append(Param(bridgeThingHostParamTypeId, address));
params.append(Param(bridgeThingIdParamTypeId, bridgeId)); params.append(Param(bridgeThingIdParamTypeId, bridgeId));
params.append(Param(bridgeThingHostParamTypeId, address));
descriptor.setParams(params); descriptor.setParams(params);
qCDebug(dcPhilipsHue()) << "N-UPnP: Found Hue bridge:" << bridgeId << address; qCDebug(dcPhilipsHue()) << "N-UPnP: Found Hue bridge:" << bridgeId << address;
discovery->results.append(descriptor); discovery->results.append(descriptor);
@ -796,6 +773,20 @@ void IntegrationPluginPhilipsHue::onDeviceNameChanged()
} }
} }
QString IntegrationPluginPhilipsHue::normalizeBridgeId(const QString &bridgeId)
{
// For some reason the hue apis return slightly different bridge ids:
// * UPnP api returns serial numbers withouot a "fffe" in the middle
// * N-UPnP and ZeroConf do have such a "fffe" in them.
// Let's normalize it to something that's save to compare.
QString ret = bridgeId.toLower();
if (bridgeId.indexOf("fffe") == 6) {
ret.remove(6, 4);
}
return ret;
}
void IntegrationPluginPhilipsHue::executeAction(ThingActionInfo *info) void IntegrationPluginPhilipsHue::executeAction(ThingActionInfo *info)
{ {
Thing *thing = info->thing(); Thing *thing = info->thing();

3
philipshue/integrationpluginphilipshue.h
View File

@ -86,6 +86,9 @@ private slots:
void networkManagerReplyReady(); void networkManagerReplyReady();
void onDeviceNameChanged(); void onDeviceNameChanged();
private:
QString normalizeBridgeId(const QString &bridgeId);
private: private:
class DiscoveryJob { class DiscoveryJob {
public: public: