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

Merge PR #354: Shelly: Fix occational crash when setup times out

Browse Source
This commit is contained in:
Jenkins nymea 2020-12-21 18:01:51 +01:00
commit e963cc6f3e
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
shelly/integrationpluginshelly.cpp
View File

@ -599,7 +599,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
qCWarning(dcShelly()) << qUtf8Printable(payload); qCWarning(dcShelly()) << qUtf8Printable(payload);
return; return;
} }
qCDebug(dcShelly()) << "Payload:" << qUtf8Printable(jsonDoc.toJson()); // qCDebug(dcShelly()) << "Payload:" << qUtf8Printable(jsonDoc.toJson());
QVariantMap data = jsonDoc.toVariant().toMap(); QVariantMap data = jsonDoc.toVariant().toMap();
// Wifi signal strength // Wifi signal strength
@ -633,7 +633,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
if (topic.startsWith("shellies/" + shellyId + "/input/")) { if (topic.startsWith("shellies/" + shellyId + "/input/")) {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
int channel = topic.split("/").last().toInt(); int channel = topic.split("/").last().toInt();
// "1" or "0" // "1" or "0"
// Emit event button pressed // Emit event button pressed
@ -650,7 +650,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
QRegExp topicMatcher = QRegExp("shellies/" + shellyId + "/relay/[0-1]"); QRegExp topicMatcher = QRegExp("shellies/" + shellyId + "/relay/[0-1]");
if (topicMatcher.exactMatch(topic)) { if (topicMatcher.exactMatch(topic)) {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
QStringList parts = topic.split("/"); QStringList parts = topic.split("/");
int channel = parts.at(3).toInt(); int channel = parts.at(3).toInt();
bool on = payload == "on"; bool on = payload == "on";
@ -673,7 +673,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
topicMatcher = QRegExp("shellies/" + shellyId + "/(relay|roller)/[0-1]/power"); topicMatcher = QRegExp("shellies/" + shellyId + "/(relay|roller)/[0-1]/power");
if (topicMatcher.exactMatch(topic)) { if (topicMatcher.exactMatch(topic)) {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
QStringList parts = topic.split("/"); QStringList parts = topic.split("/");
int channel = parts.at(3).toInt(); int channel = parts.at(3).toInt();
double power = payload.toDouble(); double power = payload.toDouble();
@ -692,7 +692,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
topicMatcher = QRegExp("shellies/" + shellyId + "/(relay|roller)/[0-1]/energy"); topicMatcher = QRegExp("shellies/" + shellyId + "/(relay|roller)/[0-1]/energy");
if (topicMatcher.exactMatch(topic)) { if (topicMatcher.exactMatch(topic)) {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
QStringList parts = topic.split("/"); QStringList parts = topic.split("/");
int channel = parts.at(3).toInt(); int channel = parts.at(3).toInt();
// W/min => kW/h // W/min => kW/h
@ -711,7 +711,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
} }
if (topic == "shellies/" + shellyId + "/color/0") { if (topic == "shellies/" + shellyId + "/color/0") {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
bool on = payload == "on"; bool on = payload == "on";
if (m_powerStateTypeMap.contains(thing->thingClassId())) { if (m_powerStateTypeMap.contains(thing->thingClassId())) {
thing->setStateValue(m_powerStateTypeMap.value(thing->thingClassId()), on); thing->setStateValue(m_powerStateTypeMap.value(thing->thingClassId()), on);
@ -719,7 +719,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
} }
if (topic == "shellies/" + shellyId + "/color/0/status") { if (topic == "shellies/" + shellyId + "/color/0/status") {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(payload, &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(payload, &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
@ -742,7 +742,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
} }
if (topic == "shellies/" + shellyId + "/light/0") { if (topic == "shellies/" + shellyId + "/light/0") {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
bool on = payload == "on"; bool on = payload == "on";
if (m_powerStateTypeMap.contains(thing->thingClassId())) { if (m_powerStateTypeMap.contains(thing->thingClassId())) {
thing->setStateValue(m_powerStateTypeMap.value(thing->thingClassId()), on); thing->setStateValue(m_powerStateTypeMap.value(thing->thingClassId()), on);
@ -756,7 +756,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
qCWarning(dcShelly()) << "Error parsing JSON from Shelly:" << error.error << error.errorString() << payload; qCWarning(dcShelly()) << "Error parsing JSON from Shelly:" << error.error << error.errorString() << payload;
return; return;
} }
qCDebug(dcShelly()) << "Payload:" << qUtf8Printable(jsonDoc.toJson()); // qCDebug(dcShelly()) << "Payload:" << qUtf8Printable(jsonDoc.toJson());
QVariantMap statusMap = jsonDoc.toVariant().toMap(); QVariantMap statusMap = jsonDoc.toVariant().toMap();
if (m_brightnessStateTypeMap.contains(thing->thingClassId())) { if (m_brightnessStateTypeMap.contains(thing->thingClassId())) {
int brightness = statusMap.value("brightness").toInt(); int brightness = statusMap.value("brightness").toInt();
@ -765,7 +765,7 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
} }
if (topic == "shellies/" + shellyId + "/light/0/power") { if (topic == "shellies/" + shellyId + "/light/0/power") {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
if (m_currentPowerStateTypeMap.contains(thing->thingClassId())) { if (m_currentPowerStateTypeMap.contains(thing->thingClassId())) {
double power = payload.toDouble(); double power = payload.toDouble();
thing->setStateValue(m_currentPowerStateTypeMap.value(thing->thingClassId()), power); thing->setStateValue(m_currentPowerStateTypeMap.value(thing->thingClassId()), power);
@ -773,14 +773,14 @@ void IntegrationPluginShelly::onPublishReceived(MqttChannel *channel, const QStr
} }
if (topic == "shellies/" + shellyId + "/roller/0") { if (topic == "shellies/" + shellyId + "/roller/0") {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
// Roller shutters are always child devices... // Roller shutters are always child devices...
foreach (Thing *child, myThings().filterByParentId(thing->id()).filterByInterface("extendedshutter")) { foreach (Thing *child, myThings().filterByParentId(thing->id()).filterByInterface("extendedshutter")) {
child->setStateValue(shellyRollerMovingStateTypeId, payload != "stop"); child->setStateValue(shellyRollerMovingStateTypeId, payload != "stop");
} }
} }
if (topic == "shellies/" + shellyId + "/roller/0/pos") { if (topic == "shellies/" + shellyId + "/roller/0/pos") {
qCDebug(dcShelly()) << "Payload:" << payload; // qCDebug(dcShelly()) << "Payload:" << payload;
// Roller shutters are always child devices... // Roller shutters are always child devices...
int pos = payload.toInt(); int pos = payload.toInt();
foreach (Thing *child, myThings().filterByParentId(thing->id()).filterByInterface("extendedshutter")) { foreach (Thing *child, myThings().filterByParentId(thing->id()).filterByInterface("extendedshutter")) {
@ -974,14 +974,23 @@ void IntegrationPluginShelly::setupShellyGateway(ThingSetupInfo *info)
QNetworkReply *reply = hardwareManager()->networkManager()->get(request); QNetworkReply *reply = hardwareManager()->networkManager()->get(request);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(info, &ThingSetupInfo::aborted, channel, [this, channel, thing](){ connect(info, &ThingSetupInfo::aborted, channel, [this, channel, thing](){
qCWarning(dcShelly()) << "Setup for" << thing->name() << "aborted.";
hardwareManager()->mqttProvider()->releaseChannel(channel); hardwareManager()->mqttProvider()->releaseChannel(channel);
m_mqttChannels.remove(thing); m_mqttChannels.remove(thing);
}); });
connect(reply, &QNetworkReply::finished, info, [this, info, reply, channel, address](){ connect(reply, &QNetworkReply::finished, info, [this, info, reply, channel, address](){
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
hardwareManager()->mqttProvider()->releaseChannel(channel); qCWarning(dcShelly()) << "Error fetching thing settings for" << info->thing()->name() << reply->error() << reply->errorString();
m_mqttChannels.remove(info->thing()); // Given the networkManagers timeout is the same as the info timeout (30s) and they are
qCWarning(dcShelly()) << "Error fetching thing settings" << reply->error() << reply->errorString(); // both started in the same event loop pass, they'll also time out in the same event loop pass
// and it happens we'll get both, ThingSetupInfo::aborted *and* QNetworkReply::finished (with the
// aborted flag) which both clean up the MQTT channel. Make sure to check if it's still there
// before actually cleaning up. We can't remove any of the cleanups as that might cause leaks if
// either the network reply finishes with an earlier error, or the setup is aborted earlier.
if (m_mqttChannels.contains(info->thing())) {
hardwareManager()->mqttProvider()->releaseChannel(channel);
m_mqttChannels.remove(info->thing());
}
if (reply->error() == QNetworkReply::AuthenticationRequiredError) { if (reply->error() == QNetworkReply::AuthenticationRequiredError) {
info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("Username and password not set correctly.")); info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("Username and password not set correctly."));
} else { } else {