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

fixed get process data call

Browse Source
This commit is contained in:
Boernsman 2021-02-26 21:13:32 +01:00 committed by Simon Stürz
parent ef5c791658
commit 1c7ed8a09b
3 changed files with 15 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sma/sunnywebbox.cpp
View File

@ -67,9 +67,15 @@ QString SunnyWebBox::getProcessDataChannels(const QString &deviceId)
QString SunnyWebBox::getProcessData(const QStringList &deviceKeys) QString SunnyWebBox::getProcessData(const QStringList &deviceKeys)
{ {
QJsonObject params; QJsonObject paramsObj;
params["device"] = deviceKeys.first(); QJsonArray devicesArray;
return sendMessage(m_hostAddresss, "GetProcessData", params); Q_FOREACH(QString key, deviceKeys) {
QJsonObject deviceObj;
deviceObj["key"] = key;
devicesArray.append(deviceObj);
}
paramsObj["devices"] = devicesArray;
return sendMessage(m_hostAddresss, "GetProcessData", paramsObj);
} }
QString SunnyWebBox::getParameterChannels(const QString &deviceKey) QString SunnyWebBox::getParameterChannels(const QString &deviceKey)
@ -87,9 +93,11 @@ QString SunnyWebBox::getParameters(const QStringList &deviceKeys)
{ {
QJsonObject paramsObj; QJsonObject paramsObj;
QJsonArray devicesArray; QJsonArray devicesArray;
QJsonObject deviceObj; Q_FOREACH(QString key, deviceKeys) {
deviceObj["key"] = deviceKeys.first(); //TODO QJsonObject deviceObj;
devicesArray.append(deviceObj); deviceObj["key"] = key;
devicesArray.append(deviceObj);
}
paramsObj["devices"] = devicesArray; paramsObj["devices"] = devicesArray;
return sendMessage(m_hostAddresss, "GetParameter", paramsObj); return sendMessage(m_hostAddresss, "GetParameter", paramsObj);
} }
@ -304,6 +312,7 @@ QString SunnyWebBox::sendMessage(const QHostAddress &address, const QString &pro
QString requestId = map["id"].toString(); QString requestId = map["id"].toString();
QVariantMap result = map.value("result").toMap(); QVariantMap result = map.value("result").toMap();
parseMessage(requestId, requestType, result); parseMessage(requestId, requestType, result);
} else if (map.contains("proc") && map.contains("error")) {
} else { } else {
qCWarning(dcSma()) << "SunnyWebBox: Missing proc or result value"; qCWarning(dcSma()) << "SunnyWebBox: Missing proc or result value";
} }

140
sma/sunnywebboxcommunication.cpp
View File

@ -1,140 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU Lesser General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; version 3. This project is distributed in the hope that
* it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "sunnywebboxcommunication.h"
#include "extern-plugininfo.h"
#include "QJsonDocument"
#include "QJsonObject"
#include <QUuid>
#include <QTimer>
#include <QNetworkReply>
#include <QNetworkRequest>
SunnyWebBoxCommunication::SunnyWebBoxCommunication(NetworkAccessManager *networkAccessManager, QObject *parent) :
QObject(parent),
m_networkManager(networkAccessManager)
{
qCDebug(dcSma()) << "Creating SunnyWebBoxCommunictaion";
m_udpSocket = new QUdpSocket(this);
m_udpSocket->bind(QHostAddress::Any, m_port);
connect(m_udpSocket, &QUdpSocket::stateChanged, this, [this](QAbstractSocket::SocketState state) {
emit socketConnected(state == QAbstractSocket::SocketState::ConnectedState);
});
connect(m_udpSocket, &QUdpSocket::readyRead, this, [this] {
QHostAddress address;
quint16 port;
QByteArray data;
data.resize(m_udpSocket->pendingDatagramSize());
int receivedBytes = m_udpSocket->readDatagram(data.data(), data.size(), &address, &port);
if (receivedBytes == -1) {
qCWarning(dcSma()) << "Error reading pending datagram";
}
datagramReceived(address, data);
});
}
QString SunnyWebBoxCommunication::sendMessage(const QHostAddress &address, const QString &procedure, const QJsonObject &params)
{
QString requestId = QUuid::createUuid().toString().remove('{').remove('-').left(14);
QJsonDocument doc;
QJsonObject obj;
obj.insert("params", params);
obj["format"] = "JSON";
obj["id"] = requestId;
obj["proc"] = procedure;
obj["version"] = "1.0";
doc.setObject(obj);
QByteArray data = doc.toJson(QJsonDocument::JsonFormat::Compact);
if(!m_messageResponsePending) {
qCDebug(dcSma()) << "Send message" << data << address << m_port;
m_udpSocket->writeDatagram(data, address, m_port);
m_messageResponsePending = true;
} else {
if (m_messageQueue[address].length() < 40) {
qCDebug(dcSma()) << "Adding message to queue" << data << address << m_port;
m_messageQueue[address].append(data);
} else {
qCDebug(dcSma()) << "Message queue overflow";
return "";
}
}
return requestId;
}
void SunnyWebBoxCommunication::datagramReceived(const QHostAddress &address, const QByteArray &data)
{
if(!m_messageQueue.value(address).isEmpty()) {
QByteArray data = m_messageQueue[address].takeFirst();
qCDebug(dcSma()) << "Send message from queue" << data << address << m_port;
//The interval between two queries should not be less than 30 seconds.
QTimer::singleShot(3000, this, [this, data, address]{m_udpSocket->writeDatagram(data, address, m_port);});
} else {
m_messageResponsePending = false;
}
QList<QByteArray> arrayList = data.split('\x00');
QByteArray cleanData;
Q_FOREACH(QByteArray i, arrayList) {
//Removing all '\0' characters
cleanData.append(i);
}
qCDebug(dcSma()) << "Datagram received" << cleanData;
QJsonParseError error;
QJsonDocument doc = QJsonDocument::fromJson(cleanData, &error);
if (error.error != QJsonParseError::NoError) {
qCWarning(dcSma()) << "Could not parse JSON" << error.errorString();
return;
}
if (!doc.isObject()) {
qCWarning(dcSma()) << "JSON is not an Object";
return;
}
QVariantMap map = doc.toVariant().toMap();
if (map["version"] != "1.0") {
qCWarning(dcSma()) << "API version not supported" << map["version"];
return;
}
if (map.contains("proc") && map.contains("result")) {
QString requestType = map["proc"].toString();
QString requestId = map["id"].toString();
QVariantMap result = map.value("result").toMap();
emit messageReceived(address, requestId, requestType, result);
} else {
qCWarning(dcSma()) << "Missing proc or result value";
}
}

63
sma/sunnywebboxcommunication.h
View File

@ -1,63 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2020, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
* This project including source code and documentation is protected by
* copyright law, and remains the property of nymea GmbH. All rights, including
* reproduction, publication, editing and translation, are reserved. The use of
* this project is subject to the terms of a license agreement to be concluded
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
* under https://nymea.io/license
*
* GNU Lesser General Public License Usage
* Alternatively, this project may be redistributed and/or modified under the
* terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; version 3. This project is distributed in the hope that
* it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this project. If not, see <https://www.gnu.org/licenses/>.
*
* For any further details and any questions please contact us under
* contact@nymea.io or see our FAQ/Licensing Information on
* https://nymea.io/license/faq
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef SUNNYWEBBOXCOMMUNICATION_H
#define SUNNYWEBBOXCOMMUNICATION_H
#include <QObject>
#include <QUdpSocket>
#include "network/networkaccessmanager.h"
class SunnyWebBoxCommunication : public QObject
{
Q_OBJECT
public:
explicit SunnyWebBoxCommunication(NetworkAccessManager *networkAccessManager, QObject *parent = nullptr);
QString sendMessage(const QHostAddress &address, const QString &procedure);
QString sendMessage(const QHostAddress &address, const QString &procedure, const QJsonObject &params);
private:
NetworkAccessManager *m_networkManager;
int m_port = 34268;
bool m_messageResponsePending = false;
QUdpSocket *m_udpSocket;
QHash<QHostAddress, QList<QByteArray>> m_messageQueue;
void datagramReceived(const QHostAddress &address, const QByteArray &data);
signals:
void socketConnected(bool connected);
void messageReceived(const QHostAddress &address, const QString &messageId, const QString &messageType, const QVariantMap &result);
};
#endif // SUNNYWEBBOXCOMMUNICATION_H