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

Extendend reconnect timer if server replies with error too many requests

Browse Source
This commit is contained in:
Boernsman 2020-12-14 09:34:17 +01:00
parent 48efaae456
commit 816de5b538
2 changed files with 118 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
homeconnect/homeconnect.cpp
View File

@ -162,7 +162,7 @@ bool HomeConnect::checkStatusCode(QNetworkReply *reply, const QByteArray &rawDat
return false; return false;
case 409: case 409:
qCWarning(dcHomeConnect()) << "Conflict - Command/Query cannot be executed for the home appliance, the error response contains the error details"; qCWarning(dcHomeConnect()) << "Conflict - Command/Query cannot be executed for the home appliance, the error response contains the error details";
qCWarning(dcHomeConnect()) << "Error" << jsonDoc.toVariant().toMap().value("error").toString(); qCWarning(dcHomeConnect()) << "Error" << jsonDoc;
return false; return false;
case 415: case 415:
qCWarning(dcHomeConnect())<< "Unsupported Media Type. The request's Content-Type is not supported"; qCWarning(dcHomeConnect())<< "Unsupported Media Type. The request's Content-Type is not supported";
@ -753,80 +753,96 @@ void HomeConnect::connectEventStream()
request.setRawHeader("accept", "text/event-stream"); request.setRawHeader("accept", "text/event-stream");
QNetworkReply *reply = m_networkManager->get(request); QNetworkReply *reply = m_networkManager->get(request);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, [reply, this] { connect(reply, &QNetworkReply::finished, [reply, this] {
reply->deleteLater(); int reconnectTime = 5000; // Usual reconnect in 5 s
QTimer::singleShot(5000, this, [this] {connectEventStream();}); //try to reconnect every 5 seconds if (reply->error() != QNetworkReply::NetworkError::NoError) {
qCDebug(dcHomeConnect()) << "Event stream error" << reply->errorString() << reply->readAll();
}
qCDebug(dcHomeConnect()) << "Eventstream disconected";
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (status == 429) {
reconnectTime = 600000;
}
qCDebug(dcHomeConnect()) << "Trying to reconnect event stream in" << reconnectTime/1000 << "seconds";
QTimer::singleShot(reconnectTime, this, [this] {
qCDebug(dcHomeConnect()) << "Reconnecting event stream";
connectEventStream();
});
}); });
connect(reply, &QNetworkReply::readyRead, this, [this, reply]{ connect(reply, &QNetworkReply::readyRead, this, [this, reply]{
while (reply->canReadLine()) { int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
QJsonDocument data; if (status == 200) {
QString haId; while (reply->canReadLine()) {
EventType eventType; QJsonDocument data;
QString haId;
EventType eventType;
QByteArray eventTypeLine = reply->readLine(); QByteArray eventTypeLine = reply->readLine();
if (eventTypeLine == "\n") if (eventTypeLine == "\n")
continue; continue;
if (eventTypeLine.startsWith("event")) { if (eventTypeLine.startsWith("event")) {
QString eventString = eventTypeLine.split(':').last().trimmed(); QString eventString = eventTypeLine.split(':').last().trimmed();
if (eventString == "KEEP-ALIVE") { if (eventString == "KEEP-ALIVE") {
eventType = EventTypeKeepAlive; eventType = EventTypeKeepAlive;
} else if (eventString == "STATUS") { } else if (eventString == "STATUS") {
eventType = EventTypeStatus; eventType = EventTypeStatus;
} else if (eventString == "EVENT") { } else if (eventString == "EVENT") {
eventType = EventTypeEvent; eventType = EventTypeEvent;
} else if (eventString == "NOTIFY") { } else if (eventString == "NOTIFY") {
eventType = EventTypeNotify; eventType = EventTypeNotify;
} else if (eventString == "DISCONNECTED") { } else if (eventString == "DISCONNECTED") {
eventType = EventTypeDisconnected; eventType = EventTypeDisconnected;
} else if (eventString == "CONNECTED") { } else if (eventString == "CONNECTED") {
eventType = EventTypeConnected; eventType = EventTypeConnected;
} else if (eventString == "PAIRED") { } else if (eventString == "PAIRED") {
eventType = EventTypePaired; eventType = EventTypePaired;
} else if (eventString == "DEPAIRED") { } else if (eventString == "DEPAIRED") {
eventType = EventTypeDepaired; eventType = EventTypeDepaired;
} else {
qCWarning(dcHomeConnect()) << "Unhandled event type" << eventString;
return;
}
QByteArray dataLine = reply->readLine();
if (dataLine.startsWith("data")) {
data = QJsonDocument::fromJson(dataLine.remove(0,6));
QByteArray idLine = reply->readLine();
if (idLine.startsWith("id")) {
haId = idLine.split(':').last().trimmed();
} else { } else {
qCWarning(dcHomeConnect()) << "Id line: Unexpected line" << eventTypeLine; qCWarning(dcHomeConnect()) << "Unhandled event type" << eventString;
return;
}
QByteArray dataLine = reply->readLine();
if (dataLine.startsWith("data")) {
data = QJsonDocument::fromJson(dataLine.remove(0,6));
QByteArray idLine = reply->readLine();
if (idLine.startsWith("id")) {
haId = idLine.split(':').last().trimmed();
} else {
qCWarning(dcHomeConnect()) << "Id line: Unexpected line" << eventTypeLine;
continue;
}
} else {
qCWarning(dcHomeConnect()) << "Data Line: Unexpected line" << eventTypeLine;
continue; continue;
} }
} else { } else {
qCWarning(dcHomeConnect()) << "Data Line: Unexpected line" << eventTypeLine; qCWarning(dcHomeConnect()) << "Event type: Unexpected line" << eventTypeLine;
continue; continue;
} }
} else {
qCWarning(dcHomeConnect()) << "Event type: Unexpected line" << eventTypeLine;
continue;
}
if (data.toVariant().toMap().contains("items")) { if (data.toVariant().toMap().contains("items")) {
QList<Event> events; QList<Event> events;
QVariantList itemsList = data.toVariant().toMap().value("items").toList(); QVariantList itemsList = data.toVariant().toMap().value("items").toList();
Q_FOREACH(QVariant item, itemsList) { Q_FOREACH(QVariant item, itemsList) {
QVariantMap map = item.toMap(); QVariantMap map = item.toMap();
Event event; Event event;
event.key = map["key"].toString(); event.key = map["key"].toString();
event.uri = map["uri"].toString(); event.uri = map["uri"].toString();
event.name = map["uri"].toString(); event.name = map["uri"].toString();
event.value = map["value"]; event.value = map["value"];
event.unit = map["unit"].toString(); event.unit = map["unit"].toString();
event.timestamp = map["timestamp"].toInt(); event.timestamp = map["timestamp"].toInt();
events.append(event); events.append(event);
}
if (!events.isEmpty())
emit receivedEvents(eventType, haId, events);
} else if (data.toVariant().toMap().contains("error")) {
qCWarning(dcHomeConnect()) << "Event stream error" << data.toVariant().toMap().value("error");
} }
if (!events.isEmpty())
emit receivedEvents(eventType, haId, events);
} else if (data.toVariant().toMap().contains("error")) {
qCWarning(dcHomeConnect()) << "Event stream error" << data.toVariant().toMap().value("error");
} }
} }
}); });

54
homeconnect/integrationpluginhomeconnect.cpp
View File

@ -181,8 +181,14 @@ void IntegrationPluginHomeConnect::startPairing(ThingPairingInfo *info)
if (reply->error() != QNetworkReply::NetworkError::HostNotFoundError) { if (reply->error() != QNetworkReply::NetworkError::HostNotFoundError) {
qCDebug(dcHomeConnect()) << "HomeConnect server is reachable"; qCDebug(dcHomeConnect()) << "HomeConnect server is reachable";
ThingId thingId = info->thingId();
m_setupHomeConnectConnections.insert(info->thingId(), homeConnect); m_setupHomeConnectConnections.insert(info->thingId(), homeConnect);
connect(info, &ThingPairingInfo::aborted, this, [info, this] {m_setupHomeConnectConnections.take(info->thingId())->deleteLater();}); connect(info, &ThingPairingInfo::aborted, this, [thingId, this] {
qCWarning(dcHomeConnect()) << "ThingPairingInfo aborted, cleaning up";
HomeConnect *homeConnect = m_setupHomeConnectConnections.take(thingId);
if (homeConnect)
homeConnect->deleteLater();
});
info->setOAuthUrl(url); info->setOAuthUrl(url);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
} else { } else {
@ -239,17 +245,19 @@ void IntegrationPluginHomeConnect::setupThing(ThingSetupInfo *info)
qCDebug(dcHomeConnect()) << "Setup thing" << thing->name(); qCDebug(dcHomeConnect()) << "Setup thing" << thing->name();
if (thing->thingClassId() == homeConnectAccountThingClassId) { if (thing->thingClassId() == homeConnectAccountThingClassId) {
bool simulationMode = configValue(homeConnectPluginSimulationModeParamTypeId).toBool();
HomeConnect *homeConnect;
HomeConnect *homeConnect;
if (m_homeConnectConnections.contains(thing)) { if (m_homeConnectConnections.contains(thing)) {
qCDebug(dcHomeConnect()) << "Setup after reconfiguration, cleaning up"; qCDebug(dcHomeConnect()) << "Setup after reconfiguration, cleaning up";
m_homeConnectConnections.take(thing)->deleteLater(); m_homeConnectConnections.take(thing)->deleteLater();
} }
if (m_setupHomeConnectConnections.keys().contains(thing->id())) { if (m_setupHomeConnectConnections.keys().contains(thing->id())) {
//Fresh device setup, has already a fresh access token // This thing setup is after a pairing process
qCDebug(dcHomeConnect()) << "HomeConnect OAuth setup complete"; qCDebug(dcHomeConnect()) << "HomeConnect OAuth setup complete";
homeConnect = m_setupHomeConnectConnections.take(thing->id()); homeConnect = m_setupHomeConnectConnections.take(thing->id());
if (!homeConnect) {
qCWarning(dcHomeConnect()) << "HomeConnect connection object not found for thing" << thing->name();
}
m_homeConnectConnections.insert(thing, homeConnect); m_homeConnectConnections.insert(thing, homeConnect);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
} else { } else {
@ -261,6 +269,7 @@ void IntegrationPluginHomeConnect::setupThing(ThingSetupInfo *info)
info->finish(Thing::ThingErrorAuthenticationFailure, tr("Refresh token is not available.")); info->finish(Thing::ThingErrorAuthenticationFailure, tr("Refresh token is not available."));
return; return;
} }
bool simulationMode = configValue(homeConnectPluginSimulationModeParamTypeId).toBool();
QByteArray clientKey = configValue(homeConnectPluginCustomClientKeyParamTypeId).toByteArray(); QByteArray clientKey = configValue(homeConnectPluginCustomClientKeyParamTypeId).toByteArray();
QByteArray clientSecret = configValue(homeConnectPluginCustomClientSecretParamTypeId).toByteArray(); QByteArray clientSecret = configValue(homeConnectPluginCustomClientSecretParamTypeId).toByteArray();
if (clientKey.isEmpty() || clientSecret.isEmpty()) { if (clientKey.isEmpty() || clientSecret.isEmpty()) {
@ -309,9 +318,11 @@ void IntegrationPluginHomeConnect::setupThing(ThingSetupInfo *info)
void IntegrationPluginHomeConnect::postSetupThing(Thing *thing) void IntegrationPluginHomeConnect::postSetupThing(Thing *thing)
{ {
qCDebug(dcHomeConnect()) << "Post setup thing" << thing->name(); qCDebug(dcHomeConnect()) << "Post setup thing" << thing->name();
if (!m_pluginTimer15min) { if (!m_pluginTimer15min) {
m_pluginTimer15min = hardwareManager()->pluginTimerManager()->registerTimer(60*15); m_pluginTimer15min = hardwareManager()->pluginTimerManager()->registerTimer(60*15);
connect(m_pluginTimer15min, &PluginTimer::timeout, this, [this]() { connect(m_pluginTimer15min, &PluginTimer::timeout, this, [this]() {
qCDebug(dcHomeConnect()) << "Refresh timer timout, polling all HomeConnect accounts.";
Q_FOREACH (Thing *thing, myThings().filterByThingClassId(homeConnectAccountThingClassId)) { Q_FOREACH (Thing *thing, myThings().filterByThingClassId(homeConnectAccountThingClassId)) {
HomeConnect *homeConnect = m_homeConnectConnections.value(thing); HomeConnect *homeConnect = m_homeConnectConnections.value(thing);
if (!homeConnect) { if (!homeConnect) {
@ -330,12 +341,21 @@ void IntegrationPluginHomeConnect::postSetupThing(Thing *thing)
} }
if (thing->thingClassId() == homeConnectAccountThingClassId) { if (thing->thingClassId() == homeConnectAccountThingClassId) {
qCDebug(dcHomeConnect()) << "HomeConnect Account thing count" << myThings().filterByThingClassId(homeConnectAccountThingClassId).count();
qCDebug(dcHomeConnect()) << " - HomeConnect connection count" << m_homeConnectConnections.count();
qCDebug(dcHomeConnect()) << " - Setup connections" << m_setupHomeConnectConnections.count();
HomeConnect *homeConnect = m_homeConnectConnections.value(thing); HomeConnect *homeConnect = m_homeConnectConnections.value(thing);
homeConnect->getHomeAppliances(); if (!homeConnect) {
homeConnect->connectEventStream(); qCWarning(dcHomeConnect()) << "Could not find HomeConnect connection for thing" << thing->name();
thing->setStateValue(homeConnectAccountConnectedStateTypeId, true); } else {
thing->setStateValue(homeConnectAccountLoggedInStateTypeId, true); homeConnect->getHomeAppliances();
//TBD Set user name homeConnect->connectEventStream();
thing->setStateValue(homeConnectAccountConnectedStateTypeId, true);
thing->setStateValue(homeConnectAccountLoggedInStateTypeId, true);
//TBD Set user name
}
} else if (m_idParamTypeIds.contains(thing->thingClassId())) { } else if (m_idParamTypeIds.contains(thing->thingClassId())) {
Thing *parentThing = myThings().findById(thing->parentId()); Thing *parentThing = myThings().findById(thing->parentId());
if (!parentThing) if (!parentThing)
@ -520,7 +540,9 @@ void IntegrationPluginHomeConnect::thingRemoved(Thing *thing)
{ {
qCDebug(dcHomeConnect) << "Delete " << thing->name(); qCDebug(dcHomeConnect) << "Delete " << thing->name();
if (thing->thingClassId() == homeConnectAccountThingClassId) { if (thing->thingClassId() == homeConnectAccountThingClassId) {
m_homeConnectConnections.take(thing)->deleteLater(); HomeConnect *homeConnect = m_homeConnectConnections.take(thing);
if (homeConnect)
homeConnect->deleteLater();
} else { } else {
m_selectedProgram.remove(thing); m_selectedProgram.remove(thing);
} }
@ -860,13 +882,16 @@ void IntegrationPluginHomeConnect::onConnectionChanged(bool connected)
void IntegrationPluginHomeConnect::onAuthenticationStatusChanged(bool authenticated) void IntegrationPluginHomeConnect::onAuthenticationStatusChanged(bool authenticated)
{ {
HomeConnect *homeConnectConnection = static_cast<HomeConnect *>(sender()); qCDebug(dcHomeConnect()) << "Authentication changed" << authenticated;
HomeConnect *homeConnectConnection = static_cast<HomeConnect *>(sender());
if (m_asyncSetup.contains(homeConnectConnection)) { if (m_asyncSetup.contains(homeConnectConnection)) {
ThingSetupInfo *info = m_asyncSetup.take(homeConnectConnection); ThingSetupInfo *info = m_asyncSetup.take(homeConnectConnection);
if (authenticated) { if (authenticated) {
qCDebug(dcHomeConnect()) << "Finishing async setup" << info->thing()->name();
m_homeConnectConnections.insert(info->thing(), homeConnectConnection); m_homeConnectConnections.insert(info->thing(), homeConnectConnection);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
} else { } else {
qCWarning(dcHomeConnect()) << "Authentication failed, aborting setup";
homeConnectConnection->deleteLater(); homeConnectConnection->deleteLater();
info->finish(Thing::ThingErrorHardwareFailure); info->finish(Thing::ThingErrorHardwareFailure);
} }
@ -900,6 +925,7 @@ void IntegrationPluginHomeConnect::onRequestExecuted(QUuid requestId, bool succe
void IntegrationPluginHomeConnect::onReceivedHomeAppliances(const QList<HomeConnect::HomeAppliance> &appliances) void IntegrationPluginHomeConnect::onReceivedHomeAppliances(const QList<HomeConnect::HomeAppliance> &appliances)
{ {
qCDebug(dcHomeConnect()) << "Received home appliances list, with" << appliances.count() << "entries";
HomeConnect *homeConnectConnection = static_cast<HomeConnect *>(sender()); HomeConnect *homeConnectConnection = static_cast<HomeConnect *>(sender());
Thing *parentThing = m_homeConnectConnections.key(homeConnectConnection); Thing *parentThing = m_homeConnectConnections.key(homeConnectConnection);
if (!parentThing) if (!parentThing)
@ -943,12 +969,12 @@ void IntegrationPluginHomeConnect::onReceivedHomeAppliances(const QList<HomeConn
continue; continue;
} }
if (!myThings().filterByParam(m_idParamTypeIds.value(thingClassId), appliance.homeApplianceId).isEmpty()) { if (!myThings().findByParams(ParamList() << Param(m_idParamTypeIds.value(thingClassId), appliance.homeApplianceId))) {
Thing * existingThing = myThings().filterByParam(m_idParamTypeIds.value(thingClassId), appliance.homeApplianceId).first(); Thing * existingThing = myThings().findByParams(ParamList() << Param(m_idParamTypeIds.value(thingClassId), appliance.homeApplianceId));
existingThing->setStateValue(m_connectedStateTypeIds.value(thingClassId), appliance.connected); existingThing->setStateValue(m_connectedStateTypeIds.value(thingClassId), appliance.connected);
continue; continue;
} }
qCDebug(dcHomeConnect()) << "Found new appliance:" << appliance.name << "brand:" << appliance.brand << "product:" << appliance.vib;
ThingDescriptor descriptor(thingClassId, appliance.name, appliance.brand+" "+appliance.vib, parentThing->id()); ThingDescriptor descriptor(thingClassId, appliance.name, appliance.brand+" "+appliance.vib, parentThing->id());
ParamList params; ParamList params;