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

Increase timout and improve timeout handling

Browse Source
This commit is contained in:
Simon Stürz 2025-09-24 16:35:09 +02:00
parent 6ec2abe1d2
commit 51203c588f
5 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
everest/integrationplugineverest.cpp
View File

@ -104,7 +104,6 @@ void IntegrationPluginEverest::startMonitoringAutoThings()
client->connectToServer(url);
}
if (m_useMqtt) {
// Check on localhost if there is any EVerest instance running and if we have to set up a thing for this EV charger
@ -169,8 +168,6 @@ void IntegrationPluginEverest::startMonitoringAutoThings()
mqttDiscovery->startLocalhost();
}
}
void IntegrationPluginEverest::discoverThings(ThingDiscoveryInfo *info)
@ -433,7 +430,6 @@ void IntegrationPluginEverest::setupThing(ThingSetupInfo *info)
}
}
// TODO: evaluate if any thing dissapeared
if (!descriptors.isEmpty()) {

4
everest/jsonrpc/everestconnection.cpp
View File

@ -172,6 +172,10 @@ void EverestConnection::onMonitorReachableChanged(bool reachable)
QUrl EverestConnection::buildUrl() const
{
QUrl url;
if (!m_monitor)
return url;
url.setScheme("ws");
url.setHost(m_monitor->networkDeviceInfo().address().toString());
url.setPort(m_port);

58
everest/jsonrpc/everestjsonrpcclient.cpp
View File

@ -168,7 +168,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::evseGetInfo(int evseIndex)
QVariantMap params;
params.insert("evse_index", evseIndex);
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "EVSE.GetInfo", params, this);
EverestJsonRpcReply *reply = createReply("EVSE.GetInfo", params);
qCDebug(dcEverest()) << "Calling" << reply->method() << params;
sendRequest(reply);
return reply;
@ -179,7 +179,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::evseGetStatus(int evseIndex)
QVariantMap params;
params.insert("evse_index", evseIndex);
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "EVSE.GetStatus", params, this);
EverestJsonRpcReply *reply = createReply("EVSE.GetStatus", params);
qCDebug(dcEverest()) << "Calling" << reply->method() << params;
sendRequest(reply);
return reply;
@ -190,7 +190,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::evseGetHardwareCapabilities(int evseI
QVariantMap params;
params.insert("evse_index", evseIndex);
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "EVSE.GetHardwareCapabilities", params, this);
EverestJsonRpcReply *reply = createReply("EVSE.GetHardwareCapabilities", params);
qCDebug(dcEverest()) << "Calling" << reply->method() << params;
sendRequest(reply);
return reply;
@ -201,7 +201,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::evseGetMeterData(int evseIndex)
QVariantMap params;
params.insert("evse_index", evseIndex);
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "EVSE.GetMeterData", params, this);
EverestJsonRpcReply *reply = createReply("EVSE.GetMeterData", params);
qCDebug(dcEverest()) << "Calling" << reply->method() << params;
sendRequest(reply);
return reply;
@ -213,7 +213,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::evseSetChargingAllowed(int evseIndex,
params.insert("evse_index", evseIndex);
params.insert("charging_allowed", allowed);
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "EVSE.SetChargingAllowed", params, this);
EverestJsonRpcReply *reply = createReply("EVSE.SetChargingAllowed", params);
qCDebug(dcEverest()) << "Calling" << reply->method() << params;
sendRequest(reply);
return reply;
@ -225,7 +225,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::evseSetACChargingCurrent(int evseInde
params.insert("evse_index", evseIndex);
params.insert("max_current", current);
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "EVSE.SetACChargingCurrent", params, this);
EverestJsonRpcReply *reply = createReply("EVSE.SetACChargingCurrent", params);
qCDebug(dcEverest()) << "Calling" << reply->method() << params;
sendRequest(reply);
return reply;
@ -237,7 +237,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::evseSetACChargingPhaseCount(int evseI
params.insert("evse_index", evseIndex);
params.insert("phase_count", phaseCount);
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "EVSE.SetACChargingPhaseCount", params, this);
EverestJsonRpcReply *reply = createReply("EVSE.SetACChargingPhaseCount", params);
qCDebug(dcEverest()) << "Calling" << reply->method() << params;
sendRequest(reply);
return reply;
@ -284,7 +284,11 @@ EverestJsonRpcClient::ConnectorInfo EverestJsonRpcClient::parseConnectorInfo(con
ConnectorInfo connectorInfo;
connectorInfo.connectorId = connectorInfoMap.value("id").toInt();
connectorInfo.type = parseConnectorType(connectorInfoMap.value("type").toString());
connectorInfo.description = connectorInfoMap.value("description").toString();
// optional
if (connectorInfoMap.contains("description"))
connectorInfo.description = connectorInfoMap.value("description").toString();
return connectorInfo;
}
@ -301,8 +305,15 @@ EverestJsonRpcClient::EVSEStatus EverestJsonRpcClient::parseEvseStatus(const QVa
evseStatus.chargeProtocol = parseChargeProtocol(evseStatusMap.value("charge_protocol").toString());
evseStatus.evseState = parseEvseState(evseStatusMap.value("state").toString());
evseStatus.evseStateString = evseStatusMap.value("state").toString();
evseStatus.acChargeStatus = EverestJsonRpcClient::parseACChargeStatus(evseStatusMap.value("ac_charge_status").toMap());
evseStatus.acChargeParameters = EverestJsonRpcClient::parseACChargeParameters(evseStatusMap.value("ac_charge_param").toMap());
// optional
if (evseStatusMap.contains("ac_charge_status"))
evseStatus.acChargeStatus = EverestJsonRpcClient::parseACChargeStatus(evseStatusMap.value("ac_charge_status").toMap());
// optional
if (evseStatusMap.contains("ac_charge_param"))
evseStatus.acChargeParameters = EverestJsonRpcClient::parseACChargeParameters(evseStatusMap.value("ac_charge_param").toMap());
return evseStatus;
}
@ -411,12 +422,16 @@ void EverestJsonRpcClient::sendRequest(EverestJsonRpcReply *reply)
QVariantMap requestMap = reply->requestMap();
QByteArray data = QJsonDocument::fromVariant(requestMap).toJson(QJsonDocument::Compact) + '\n';
m_replies.insert(reply->commandId(), reply);
connect(reply, &EverestJsonRpcReply::finished, this, [this, reply](){
// Clean up internals after finished (in any error case),
// it is up to the caller to delete the reply object itself
m_replies.remove(reply->commandId());
});
qCDebug(dcEverestTraffic()) << "-->" << m_interface->serverUrl().toString() << qUtf8Printable(data);
m_interface->sendData(data);
m_replies.insert(m_commandId, reply);
m_commandId++;
reply->startWaiting();
}
@ -440,7 +455,6 @@ void EverestJsonRpcClient::processDataPacket(const QByteArray &data)
if (dataMap.contains("id")) {
// Response to a request
int commandId = dataMap.value("id").toInt();
EverestJsonRpcReply *reply = m_replies.take(commandId);
@ -456,7 +470,7 @@ void EverestJsonRpcClient::processDataPacket(const QByteArray &data)
return;
} else {
// Data without reply, check if this is a notification
qCDebug(dcEverest()) << "Received response data without reply" << qUtf8Printable(data);
qCDebug(dcEverest()) << "Received response data without any pending reply, maybe the reply timed out:" << qUtf8Printable(data);
}
} else {
@ -485,9 +499,17 @@ void EverestJsonRpcClient::processDataPacket(const QByteArray &data)
}
}
EverestJsonRpcReply *EverestJsonRpcClient::createReply(QString method, QVariantMap params)
{
int commandId = m_commandId;
m_commandId += 1;
return new EverestJsonRpcReply(commandId, method, params, this);
}
EverestJsonRpcReply *EverestJsonRpcClient::apiHello()
{
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "API.Hello", QVariantMap(), this);
EverestJsonRpcReply *reply = createReply("API.Hello", QVariantMap());
qCDebug(dcEverest()) << "Calling" << reply->method();
sendRequest(reply);
return reply;
@ -495,7 +517,7 @@ EverestJsonRpcReply *EverestJsonRpcClient::apiHello()
EverestJsonRpcReply *EverestJsonRpcClient::chargePointGetEVSEInfos()
{
EverestJsonRpcReply *reply = new EverestJsonRpcReply(m_commandId, "ChargePoint.GetEVSEInfos", QVariantMap(), this);
EverestJsonRpcReply *reply = createReply("ChargePoint.GetEVSEInfos", QVariantMap());
qCDebug(dcEverest()) << "Calling" << reply->method();
sendRequest(reply);
return reply;

2
everest/jsonrpc/everestjsonrpcclient.h
View File

@ -272,6 +272,8 @@ private:
EverestJsonRpcInterface *m_interface = nullptr;
QHash<int, EverestJsonRpcReply *> m_replies;
EverestJsonRpcReply *createReply(QString method, QVariantMap params = QVariantMap());
// Init infos
QString m_apiVersion;
QString m_everestVersion;

3
everest/jsonrpc/everestjsonrpcreply.cpp
View File

@ -36,7 +36,7 @@ EverestJsonRpcReply::EverestJsonRpcReply(int commandId, QString method, QVariant
m_method{method},
m_params{params}
{
m_timer.setInterval(2000);
m_timer.setInterval(30000);
m_timer.setSingleShot(true);
connect(&m_timer, &QTimer::timeout, this, [this](){
m_error = ErrorTimeout;
@ -73,7 +73,6 @@ QVariantMap EverestJsonRpcReply::requestMap()
if (!m_params.isEmpty())
request.insert("params", params());
m_commandId++;
return request;
}