added simple http server
parent
c614bbd54c
commit
bd5a7c9fbc
|
|
@ -69,6 +69,13 @@ void DevicePluginHttpCommander::setupDevice(DeviceSetupInfo *info)
|
||||||
}
|
}
|
||||||
return info->finish(Device::DeviceErrorNoError);
|
return info->finish(Device::DeviceErrorNoError);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (device->deviceClassId() == httpServerDeviceClassId) {
|
||||||
|
//TODO create a simple server
|
||||||
|
HttpSimpleServer *httpSimpleServer = new HttpSimpleServer();
|
||||||
|
m_httpSimpleServer.insert(device, httpSimpleServer);
|
||||||
|
return info->finish(Device::DeviceErrorNoError);
|
||||||
|
}
|
||||||
info->finish(Device::DeviceErrorNoError);
|
info->finish(Device::DeviceErrorNoError);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@
|
||||||
|
|
||||||
#include "devices/deviceplugin.h"
|
#include "devices/deviceplugin.h"
|
||||||
#include "plugintimer.h"
|
#include "plugintimer.h"
|
||||||
|
#include "httpsimpleserver.h"
|
||||||
|
#include "httprequest.h"
|
||||||
|
|
||||||
#include <QNetworkReply>
|
#include <QNetworkReply>
|
||||||
#include <QHostInfo>
|
#include <QHostInfo>
|
||||||
|
|
@ -47,6 +49,7 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
PluginTimer *m_pluginTimer = nullptr;
|
PluginTimer *m_pluginTimer = nullptr;
|
||||||
|
QHash<Device *, HttpSimpleServer *> m_httpSimpleServer;
|
||||||
QHash<QNetworkReply *, Device *> m_httpRequests;
|
QHash<QNetworkReply *, Device *> m_httpRequests;
|
||||||
|
|
||||||
void makeGetCall(Device *device);
|
void makeGetCall(Device *device);
|
||||||
|
|
|
||||||
|
|
@ -165,6 +165,59 @@
|
||||||
"displayNameEvent": "Response data received"
|
"displayNameEvent": "Response data received"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
|
||||||
|
"id": "56efcdc3-c769-4e25-8a5b-c0affe68252a",
|
||||||
|
"name": "httpServer",
|
||||||
|
"displayName": "HTTP Server",
|
||||||
|
"createMethods": ["user"],
|
||||||
|
"interfaces": [ "inputtrigger" ],
|
||||||
|
"paramTypes": [
|
||||||
|
{
|
||||||
|
"id": "438117cb-c2de-49d0-9f91-5988c17225f8",
|
||||||
|
"name": "port",
|
||||||
|
"displayName": "Port",
|
||||||
|
"type": "int",
|
||||||
|
"defaultValue": "8000"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"eventTypes": [
|
||||||
|
{
|
||||||
|
"id": "86f794c6-31ad-40a8-928f-4b8802506ce1",
|
||||||
|
"name": "triggered",
|
||||||
|
"displayName": "Http request received",
|
||||||
|
"paramTypes": [
|
||||||
|
{
|
||||||
|
"id": "dd3c6033-0483-4237-ac15-7a64ae4dd29c",
|
||||||
|
"name": "requestType",
|
||||||
|
"displayName": "Request type",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": [
|
||||||
|
"GET",
|
||||||
|
"POST",
|
||||||
|
"PUT",
|
||||||
|
"DELETE"
|
||||||
|
],
|
||||||
|
"defaultValue": "GET"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "c936810e-a73d-424f-8981-48baf0a440bb",
|
||||||
|
"name": "body",
|
||||||
|
"displayName": "Body",
|
||||||
|
"type": "QString",
|
||||||
|
"defaultValue": ""
|
||||||
|
} ,
|
||||||
|
{
|
||||||
|
"id": "0d4dc8f0-df0d-4fb0-b771-b62dee28a625",
|
||||||
|
"name": "path",
|
||||||
|
"displayName": "Path",
|
||||||
|
"type": "QString",
|
||||||
|
"defaultValue": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,12 @@ TARGET = $$qtLibraryTarget(nymea_devicepluginhttpcommander)
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
devicepluginhttpcommander.cpp \
|
devicepluginhttpcommander.cpp \
|
||||||
httprequest.cpp
|
httprequest.cpp \
|
||||||
|
httpsimpleserver.cpp
|
||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
devicepluginhttpcommander.h \
|
devicepluginhttpcommander.h \
|
||||||
httprequest.h
|
httprequest.h \
|
||||||
|
httpsimpleserver.h
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,241 @@
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* *
|
||||||
|
* Copyright (C) 2015 Simon Stürz <simon.stuerz@guh.io> *
|
||||||
|
* Copyright (C) 2014 Michael Zanetti <michael_zanetti@gmx.net> *
|
||||||
|
* *
|
||||||
|
* This file is part of nymea. *
|
||||||
|
* *
|
||||||
|
* This library is free software; you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU Lesser General Public *
|
||||||
|
* License as published by the Free Software Foundation; either *
|
||||||
|
* version 2.1 of the License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* This library 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 library; If not, see *
|
||||||
|
* <http://www.gnu.org/licenses/>. *
|
||||||
|
* *
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
#include "httpsimpleserver.h"
|
||||||
|
|
||||||
|
#include "devices/device.h"
|
||||||
|
#include "devices/deviceplugin.h"
|
||||||
|
#include "types/deviceclass.h"
|
||||||
|
#include "types/statetype.h"
|
||||||
|
#include "extern-plugininfo.h"
|
||||||
|
|
||||||
|
#include <QTcpSocket>
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QUrlQuery>
|
||||||
|
#include <QRegExp>
|
||||||
|
#include <QStringList>
|
||||||
|
|
||||||
|
HttpSimpleServer::HttpSimpleServer(Device *device, DevicePlugin *parent):
|
||||||
|
QTcpServer(parent),
|
||||||
|
disabled(false),
|
||||||
|
m_plugin(parent),
|
||||||
|
m_device(device)
|
||||||
|
{
|
||||||
|
//QHash<DeviceClassId, ParamTypeId> portMap;
|
||||||
|
//portMap.insert(mockDeviceClassId, mockDeviceHttpportParamTypeId);
|
||||||
|
//portMap.insert(mockDeviceAutoDeviceClassId, mockDeviceAutoDeviceHttpportParamTypeId);
|
||||||
|
//listen(QHostAddress::Any, device->paramValue(portMap.value(device->deviceClassId())).toInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpSimpleServer::~HttpSimpleServer()
|
||||||
|
{
|
||||||
|
close();
|
||||||
|
}
|
||||||
|
|
||||||
|
void HttpSimpleServer::incomingConnection(qintptr socket)
|
||||||
|
{
|
||||||
|
if (disabled)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// When a new client connects, the server constructs a QTcpSocket and all
|
||||||
|
// communication with the client is done over this QTcpSocket. QTcpSocket
|
||||||
|
// works asynchronously, this means that all the communication is done
|
||||||
|
// in the two slots readClient() and discardClient().
|
||||||
|
QTcpSocket* s = new QTcpSocket(this);
|
||||||
|
connect(s, SIGNAL(readyRead()), this, SLOT(readClient()));
|
||||||
|
connect(s, SIGNAL(disconnected()), this, SLOT(discardClient()));
|
||||||
|
s->setSocketDescriptor(socket);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void HttpSimpleServer::actionExecuted(const ActionTypeId &actionTypeId)
|
||||||
|
{
|
||||||
|
m_actionList.append(qMakePair<ActionTypeId, QDateTime>(actionTypeId, QDateTime::currentDateTime()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void HttpSimpleServer::readClient()
|
||||||
|
{
|
||||||
|
if (disabled)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// This slot is called when the client sent data to the server. The
|
||||||
|
// server looks if it was a get request and sends a very simple HTML
|
||||||
|
// document back.
|
||||||
|
/*QTcpSocket* socket = (QTcpSocket*)sender();
|
||||||
|
if (socket->canReadLine()) {
|
||||||
|
QByteArray data = socket->readLine();
|
||||||
|
QStringList tokens = QString(data).split(QRegExp("[ \r\n][ \r\n]*"));
|
||||||
|
QUrl url("http://foo.bar" + tokens[1]);
|
||||||
|
QUrlQuery query(url);
|
||||||
|
if (url.path() == "/setstate") {
|
||||||
|
StateTypeId stateTypeId = StateTypeId(query.queryItems().first().first);
|
||||||
|
QVariant stateValue = query.queryItems().first().second;
|
||||||
|
if (stateTypeId == mockBoolStateTypeId || stateTypeId == mockBatteryCriticalStateTypeId) {
|
||||||
|
stateValue.convert(QVariant::Bool);
|
||||||
|
} else if (stateTypeId == mockIntStateTypeId) {
|
||||||
|
stateValue.convert(QVariant::Int);
|
||||||
|
} else if (stateTypeId == mockDoubleStateTypeId) {
|
||||||
|
stateValue.convert(QVariant::Double);
|
||||||
|
}
|
||||||
|
qCDebug(dcHttpCommander) << "Set state value" << stateValue;
|
||||||
|
emit setState(stateTypeId, stateValue);
|
||||||
|
} else if (url.path() == "/generateevent") {
|
||||||
|
emit triggerEvent(EventTypeId(query.queryItemValue("eventtypeid")));
|
||||||
|
} else if (url.path() == "/actionhistory") {
|
||||||
|
qCDebug(dcHttpCommander) << "Get action history called";
|
||||||
|
|
||||||
|
QTextStream os(socket);
|
||||||
|
os.setAutoDetectUnicode(true);
|
||||||
|
os << generateHeader();
|
||||||
|
for (int i = 0; i < m_actionList.count(); ++i) {
|
||||||
|
os << m_actionList.at(i).first.toString() << '\n';
|
||||||
|
qCDebug(dcHttpCommander) << " " << m_actionList.at(i).first.toString();
|
||||||
|
}
|
||||||
|
socket->close();
|
||||||
|
return;
|
||||||
|
} else if (url.path() == "/clearactionhistory") {
|
||||||
|
qCDebug(dcHttpCommander) << "Clear action history";
|
||||||
|
m_actionList.clear();
|
||||||
|
} else if (url.path() == "/disappear") {
|
||||||
|
qCDebug(dcHttpCommander) << "Should disappear";
|
||||||
|
emit disappear();
|
||||||
|
} else if (url.path() == "/reconfigureautodevice") {
|
||||||
|
qCDebug(dcHttpCommander) << "Reconfigure auto device";
|
||||||
|
emit reconfigureAutodevice();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokens[0] == "GET") {
|
||||||
|
QTextStream os(socket);
|
||||||
|
os.setAutoDetectUnicode(true);
|
||||||
|
os << generateWebPage();
|
||||||
|
socket->close();
|
||||||
|
|
||||||
|
if (socket->state() == QTcpSocket::UnconnectedState)
|
||||||
|
delete socket;
|
||||||
|
}
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
|
||||||
|
void HttpSimpleServer::discardClient()
|
||||||
|
{
|
||||||
|
QTcpSocket* socket = (QTcpSocket*)sender();
|
||||||
|
socket->deleteLater();
|
||||||
|
}
|
||||||
|
|
||||||
|
QString HttpSimpleServer::generateHeader()
|
||||||
|
{
|
||||||
|
QString contentHeader(
|
||||||
|
"HTTP/1.0 200 Ok\r\n"
|
||||||
|
"Content-Type: text/html; charset=\"utf-8\"\r\n"
|
||||||
|
"\r\n"
|
||||||
|
);
|
||||||
|
return contentHeader;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString HttpSimpleServer::generateWebPage()
|
||||||
|
{
|
||||||
|
DeviceClass deviceClass;
|
||||||
|
foreach (const DeviceClass &dc, m_plugin->supportedDevices()) {
|
||||||
|
if (dc.id() == m_device->deviceClassId()) {
|
||||||
|
deviceClass = dc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Q_ASSERT(deviceClass.isValid());
|
||||||
|
|
||||||
|
QString body = QString(
|
||||||
|
"<html>"
|
||||||
|
"<body>"
|
||||||
|
"<h1>Mock device Controller</h1>\n"
|
||||||
|
"<hr>"
|
||||||
|
"<h2>Device Information</h2>"
|
||||||
|
"Name: %1<br>"
|
||||||
|
"ID: %2<br>"
|
||||||
|
"DeviceClass ID: %3<br>").arg(m_device->name()).arg(m_device->id().toString()).arg(deviceClass.id().toString());
|
||||||
|
|
||||||
|
body.append("<hr>");
|
||||||
|
body.append("<h2>States</h2>");
|
||||||
|
|
||||||
|
body.append("<table>");
|
||||||
|
for (int i = 0; i < deviceClass.stateTypes().count(); ++i) {
|
||||||
|
body.append("<tr>");
|
||||||
|
body.append("<form action=\"/setstate\" method=\"get\">");
|
||||||
|
StateType stateType = deviceClass.stateTypes().at(i);
|
||||||
|
body.append("<td>" + stateType.name() + "</td>");
|
||||||
|
body.append(QString("<td><input type='input'' name='%1' value='%2'></td>").arg(stateType.id().toString()).arg(m_device->states().at(i).value().toString()));
|
||||||
|
body.append("<td><input type=submit value='Set State'/></td>");
|
||||||
|
body.append("</form>");
|
||||||
|
body.append("</tr>");
|
||||||
|
}
|
||||||
|
body.append("</table>");
|
||||||
|
|
||||||
|
body.append("<hr>");
|
||||||
|
body.append("<h2>Events</h2>");
|
||||||
|
|
||||||
|
body.append("<table>");
|
||||||
|
for (int i = 0; i < deviceClass.eventTypes().count(); ++i) {
|
||||||
|
EventType eventType = deviceClass.eventTypes().at(i);
|
||||||
|
body.append(QString(
|
||||||
|
"<tr>"
|
||||||
|
"<form action=\"/generateevent\" method=\"get\">"
|
||||||
|
"<td>%1<input type='hidden' name='eventtypeid' value='%2'/></td>"
|
||||||
|
"<td>").arg(eventType.name()).arg(eventType.id().toString()));
|
||||||
|
if (!eventType.displayName().endsWith(" changed")) {
|
||||||
|
body.append(QStringLiteral("<input type='submit' value='Generate'/>"));
|
||||||
|
}
|
||||||
|
body.append("</td>"
|
||||||
|
"</form>"
|
||||||
|
"</tr>"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
body.append("</table>");
|
||||||
|
|
||||||
|
body.append("<hr>");
|
||||||
|
body.append("<h2>Actions</h2>");
|
||||||
|
|
||||||
|
body.append("<table border=2px>");
|
||||||
|
body.append("<tr><td>Name</td><td>Type ID</td><td>Timestamp</td></tr>");
|
||||||
|
for (int i = 0; i < m_actionList.count(); ++i) {
|
||||||
|
ActionTypeId actionTypeId = ActionTypeId(m_actionList.at(i).first);
|
||||||
|
QDateTime timestamp = m_actionList.at(i).second;
|
||||||
|
QString actionName;
|
||||||
|
foreach (const ActionType &at, deviceClass.actionTypes()) {
|
||||||
|
if (at.id() == actionTypeId) {
|
||||||
|
actionName = at.name();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
body.append(QString(
|
||||||
|
"<tr>"
|
||||||
|
"<td>%1</td>"
|
||||||
|
"<td>%2</td>"
|
||||||
|
"<td>%3</td>"
|
||||||
|
"</tr>"
|
||||||
|
).arg(actionName).arg(actionTypeId.toString()).arg(timestamp.toString()));
|
||||||
|
}
|
||||||
|
body.append("</table>");
|
||||||
|
|
||||||
|
body.append("</body></html>\n");
|
||||||
|
|
||||||
|
return generateHeader() + body;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,69 @@
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
* *
|
||||||
|
* Copyright (C) 2015 Simon Stürz <simon.stuerz@guh.io> *
|
||||||
|
* Copyright (C) 2014 Michael Zanetti <michael_zanetti@gmx.net> *
|
||||||
|
* *
|
||||||
|
* This file is part of nymea. *
|
||||||
|
* *
|
||||||
|
* This library is free software; you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU Lesser General Public *
|
||||||
|
* License as published by the Free Software Foundation; either *
|
||||||
|
* version 2.1 of the License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* This library 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 library; If not, see *
|
||||||
|
* <http://www.gnu.org/licenses/>. *
|
||||||
|
* *
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
#ifndef HTTPSIMPLESERVER_H
|
||||||
|
#define HTTPSIMPLESERVER_H
|
||||||
|
|
||||||
|
#include "typeutils.h"
|
||||||
|
|
||||||
|
#include <QTcpServer>
|
||||||
|
#include <QUuid>
|
||||||
|
#include <QDateTime>
|
||||||
|
|
||||||
|
class Device;
|
||||||
|
class DevicePlugin;
|
||||||
|
|
||||||
|
class HttpSimpleServer : public QTcpServer
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
HttpSimpleServer(Device *device, DevicePlugin* parent = nullptr);
|
||||||
|
~HttpSimpleServer();
|
||||||
|
void incomingConnection(qintptr socket) override;
|
||||||
|
|
||||||
|
void actionExecuted(const ActionTypeId &actionTypeId);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void setState(const StateTypeId &stateTypeId, const QVariant &value);
|
||||||
|
void triggerEvent(const EventTypeId &eventTypeId);
|
||||||
|
void disappear();
|
||||||
|
void reconfigureAutodevice();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void readClient();
|
||||||
|
void discardClient();
|
||||||
|
|
||||||
|
private:
|
||||||
|
QString generateHeader();
|
||||||
|
QString generateWebPage();
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool disabled;
|
||||||
|
|
||||||
|
DevicePlugin *m_plugin;
|
||||||
|
Device *m_device;
|
||||||
|
|
||||||
|
QList<QPair<ActionTypeId, QDateTime> > m_actionList;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // HttpSimpleServer_H
|
||||||
Loading…
Reference in New Issue