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

finalized bluetooth server

Browse Source
This commit is contained in:
Simon Stürz 2016-09-14 10:44:35 +02:00 committed by Michael Zanetti
parent 5bcedc40df
commit 25223de636
13 changed files with 113 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guh.pri
View File

@ -13,11 +13,15 @@ QT+= network websockets
QMAKE_CXXFLAGS += -Werror -std=c++11 -g QMAKE_CXXFLAGS += -Werror -std=c++11 -g
QMAKE_LFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11
#QMAKE_CXX = g++ ccache
top_srcdir=$$PWD top_srcdir=$$PWD
top_builddir=$$shadowed($$PWD) top_builddir=$$shadowed($$PWD)
# Check if ccache is enabled
ccache {
QMAKE_CXX = ccache g++
}
# Check for Bluetoot LE support (Qt >= 5.4) # Check for Bluetoot LE support (Qt >= 5.4)
equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) { equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 3) {
QT += bluetooth QT += bluetooth

78
server/bluetoothserver.cpp
View File

@ -18,6 +18,22 @@
* * * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*!
\class guhserver::BluetoothServer
\brief This class represents the bluetooth server for guhd.
\ingroup server
\inmodule core
\inherits TransportInterface
The bluetooth server allowes clients to connect to the JSON-RPC API using an RFCOMM bluetooth connection. If the server is enabled, a client
can discover the services running on this host. The service for the JSON-RPC api is called \tt guhIO and has the uuid \tt 997936b5-d2cd-4c57-b41b-c6048320cd2b .
\sa TransportInterface
*/
#include "bluetoothserver.h" #include "bluetoothserver.h"
#include "loggingcategories.h" #include "loggingcategories.h"
@ -26,7 +42,7 @@
namespace guhserver { namespace guhserver {
static const QLatin1String serviceUuid("81679f09-1404-4242-b685-a7f7e23df8cf"); static const QBluetoothUuid serviceUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b"));
BluetoothServer::BluetoothServer(QObject *parent) : BluetoothServer::BluetoothServer(QObject *parent) :
TransportInterface(parent), TransportInterface(parent),
@ -37,6 +53,9 @@ BluetoothServer::BluetoothServer(QObject *parent) :
BluetoothServer::~BluetoothServer() BluetoothServer::~BluetoothServer()
{ {
if (m_server && m_server->isListening())
qCDebug(dcApplication) << "Shutting down \"Bluetooth server\"";
stopServer(); stopServer();
} }
@ -51,7 +70,7 @@ void BluetoothServer::sendData(const QUuid &clientId, const QVariantMap &data)
QBluetoothSocket *client = 0; QBluetoothSocket *client = 0;
client = m_clientList.value(clientId); client = m_clientList.value(clientId);
if (client) if (client)
client->write(QJsonDocument::fromVariant(data).toJson() + "\n"); client->write(QJsonDocument::fromVariant(data).toJson(QJsonDocument::Compact) + '\n');
} }
void BluetoothServer::sendData(const QList<QUuid> &clients, const QVariantMap &data) void BluetoothServer::sendData(const QList<QUuid> &clients, const QVariantMap &data)
@ -101,9 +120,15 @@ void BluetoothServer::readData()
if (!client) if (!client)
return; return;
QByteArray message;
while (client->canReadLine()) { while (client->canReadLine()) {
QByteArray line = client->readLine().trimmed(); QByteArray dataLine = client->readLine();
qCDebug(dcConnection()) << "Bluetooth server: line in:" << QString::fromUtf8(line.constData(), line.length()); message.append(dataLine);
if (dataLine.endsWith('\n')) {
qCDebug(dcConnection()) << "Bluetooth data received:" << message;
validateMessage(m_clientList.key(client), message);
message.clear();
}
} }
} }
@ -115,9 +140,8 @@ bool BluetoothServer::startServer()
// Check if Bluetooth is available on this device // Check if Bluetooth is available on this device
QBluetoothLocalDevice localDevice; QBluetoothLocalDevice localDevice;
if (localDevice.isValid()) { if (localDevice.isValid()) {
// Turn Bluetooth on qCDebug(dcConnection()) << "Bluetooth: using adapter" << localDevice.name() << localDevice.address().toString();
localDevice.powerOn(); localDevice.powerOn();
// Make it visible to others
localDevice.setHostMode(QBluetoothLocalDevice::HostDiscoverable); localDevice.setHostMode(QBluetoothLocalDevice::HostDiscoverable);
} else { } else {
qCWarning(dcConnection()) << "Bluetooth server: could find any bluetooth hardware"; qCWarning(dcConnection()) << "Bluetooth server: could find any bluetooth hardware";
@ -133,33 +157,41 @@ bool BluetoothServer::startServer()
qCDebug(dcConnection) << "Started bluetooth server" << m_server->serverAddress().toString(); qCDebug(dcConnection) << "Started bluetooth server" << m_server->serverAddress().toString();
// Set service attributes
QBluetoothServiceInfo::Sequence browseSequence;
browseSequence << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
m_serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList, browseSequence);
QBluetoothServiceInfo::Sequence classId; QBluetoothServiceInfo::Sequence classId;
classId << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::SerialPort)); classId << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::SerialPort));
m_serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList, classId); m_serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList, classId);
classId.prepend(QVariant::fromValue(serviceUuid));
classId.prepend(QVariant::fromValue(QBluetoothUuid(serviceUuid)));
m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId); m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId);
m_serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList,classId); m_serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList,classId);
m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceName, tr("guhIO JSON-RPC")); m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceName, QVariant("guhIO"));
m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceDescription, tr("The JSON-RPC interface for guhIO.")); m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceDescription, QVariant("The JSON-RPC interface for guhIO."));
m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceProvider, "guh.io"); m_serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceProvider, QVariant("https://guh.io"));
m_serviceInfo.setServiceUuid(QBluetoothUuid(serviceUuid));
QBluetoothServiceInfo::Sequence publicBrowse;
publicBrowse << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup));
m_serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList, publicBrowse);
// Define protocol
QBluetoothServiceInfo::Sequence protocolDescriptorList; QBluetoothServiceInfo::Sequence protocolDescriptorList;
QBluetoothServiceInfo::Sequence protocol; QBluetoothServiceInfo::Sequence protocol;
protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::L2cap));
protocolDescriptorList.append(QVariant::fromValue(protocol));
protocol.clear();
protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::Rfcomm)) protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::Rfcomm))
<< QVariant::fromValue(quint8(m_server->serverPort())); << QVariant::fromValue(quint8(m_server->serverPort()));
protocolDescriptorList.append(QVariant::fromValue(protocol)); protocolDescriptorList.append(QVariant::fromValue(protocol));
m_serviceInfo.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList); m_serviceInfo.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList);
m_serviceInfo.registerService(localDevice.address());
// Set UUID
m_serviceInfo.setServiceUuid(serviceUuid);
// Register the service in the local device
if (!m_serviceInfo.registerService(localDevice.address())) {
qCWarning(dcConnection()) << "Bluetooth: Could not register service" << m_serviceInfo.serviceName() << serviceUuid.toString();
return false;
}
qCDebug(dcConnection()) << "Bluetooth: Registered successfully service" << m_serviceInfo.serviceName() << serviceUuid.toString();
return true; return true;
} }
@ -169,10 +201,16 @@ bool BluetoothServer::stopServer()
client->close(); client->close();
} }
if (!m_server)
return true;
m_serviceInfo.unregisterService();
m_server->close(); m_server->close();
m_server->deleteLater(); m_server->deleteLater();
m_server = 0; m_server = 0;
return true; return true;
} }
} }

4
server/guhcore.cpp
View File

@ -438,11 +438,13 @@ GuhCore::GuhCore(QObject *parent) :
m_serverManager->jsonServer()->registerTransportInterface(m_tcpServer); m_serverManager->jsonServer()->registerTransportInterface(m_tcpServer);
m_serverManager->jsonServer()->registerTransportInterface(m_webSocketServer); m_serverManager->jsonServer()->registerTransportInterface(m_webSocketServer);
m_serverManager->jsonServer()->registerTransportInterface(m_cloudManager); m_serverManager->jsonServer()->registerTransportInterface(m_cloudManager);
m_serverManager->jsonServer()->registerTransportInterface(m_bluetoothServer); m_serverManager->jsonServer()->registerTransportInterface(m_bluetoothServer, m_configuration->bluetoothServerEnabled());
// Webserver setup
m_webServer = new WebServer(m_configuration->webServerAddress(), m_configuration->webServerPort(), m_configuration->webServerPublicFolder(), this); m_webServer = new WebServer(m_configuration->webServerAddress(), m_configuration->webServerPort(), m_configuration->webServerPublicFolder(), this);
m_serverManager->restServer()->registerWebserver(m_webServer); m_serverManager->restServer()->registerWebserver(m_webServer);
// Connect the configuration changes // Connect the configuration changes
connect(m_configuration, &GuhConfiguration::cloudEnabledChanged, m_cloudManager, &CloudManager::onCloudEnabledChanged); connect(m_configuration, &GuhConfiguration::cloudEnabledChanged, m_cloudManager, &CloudManager::onCloudEnabledChanged);
connect(m_configuration, &GuhConfiguration::cloudProxyServerChanged, m_cloudManager, &CloudManager::onProxyServerUrlChanged); connect(m_configuration, &GuhConfiguration::cloudProxyServerChanged, m_cloudManager, &CloudManager::onProxyServerUrlChanged);

7
server/jsonrpc/actionhandler.h
View File

@ -35,15 +35,14 @@ public:
QString name() const; QString name() const;
Q_INVOKABLE JsonReply* ExecuteAction(const QVariantMap &params); Q_INVOKABLE JsonReply *ExecuteAction(const QVariantMap &params);
Q_INVOKABLE JsonReply *GetActionType(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetActionType(const QVariantMap &params) const;
private slots: private slots:
void actionExecuted(const ActionId &id, DeviceManager::DeviceError status); void actionExecuted(const ActionId &id, DeviceManager::DeviceError status);
private: private:
QHash<ActionId, JsonReply*> m_asyncActionExecutions; QHash<ActionId, JsonReply *> m_asyncActionExecutions;
}; };
} }

9
server/jsonrpc/cloudhandler.h
View File

@ -37,8 +37,13 @@ public:
QString name() const; QString name() const;
Q_INVOKABLE JsonReply* Authenticate(const QVariantMap &params) const; Q_INVOKABLE JsonReply *Authenticate(const QVariantMap &params);
Q_INVOKABLE JsonReply* GetConnectionStatus(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetConnectionStatus(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *Enable(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *Disable(const QVariantMap &params) const;
private:
QList<JsonReply *> m_asyncAuthenticationReplies;
signals: signals:
void ConnectionStatusChanged(const QVariantMap &params); void ConnectionStatusChanged(const QVariantMap &params);

12
server/jsonrpc/configurationhandler.h
View File

@ -35,13 +35,13 @@ public:
ConfigurationHandler(QObject *parent = 0); ConfigurationHandler(QObject *parent = 0);
QString name() const; QString name() const;
Q_INVOKABLE JsonReply* GetConfigurations(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetConfigurations(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetTimeZones(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetTimeZones(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* SetServerName(const QVariantMap &params) const; Q_INVOKABLE JsonReply *SetServerName(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* SetTimeZone(const QVariantMap &params) const; Q_INVOKABLE JsonReply *SetTimeZone(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* SetTcpServerConfiguration(const QVariantMap &params) const; Q_INVOKABLE JsonReply *SetTcpServerConfiguration(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *SetWebServerConfiguration(const QVariantMap &params) const; Q_INVOKABLE JsonReply *SetWebServerConfiguration(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* SetWebSocketServerConfiguration(const QVariantMap &params) const; Q_INVOKABLE JsonReply *SetWebSocketServerConfiguration(const QVariantMap &params) const;
signals: signals:
void BasicConfigurationChanged(const QVariantMap &params); void BasicConfigurationChanged(const QVariantMap &params);

51
server/jsonrpc/devicehandler.h
View File

@ -35,41 +35,26 @@ public:
QString name() const override; QString name() const override;
Q_INVOKABLE JsonReply* GetSupportedVendors(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetSupportedVendors(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *GetSupportedDevices(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *GetDiscoveredDevices(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *GetPlugins(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *GetPluginConfiguration(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *SetPluginConfiguration(const QVariantMap &params);
Q_INVOKABLE JsonReply* GetSupportedDevices(const QVariantMap &params) const; Q_INVOKABLE JsonReply *AddConfiguredDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply *PairDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply *ConfirmPairing(const QVariantMap &params);
Q_INVOKABLE JsonReply *GetConfiguredDevices(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *ReconfigureDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply *EditDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply *RemoveConfiguredDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply* GetDiscoveredDevices(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetEventTypes(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *GetActionTypes(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetPlugins(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetStateTypes(const QVariantMap &params) const;
Q_INVOKABLE JsonReply *GetStateValue(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetPluginConfiguration(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetStateValues(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* SetPluginConfiguration(const QVariantMap &params);
Q_INVOKABLE JsonReply* AddConfiguredDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply* PairDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply* ConfirmPairing(const QVariantMap &params);
Q_INVOKABLE JsonReply* GetConfiguredDevices(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* ReconfigureDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply* EditDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply* RemoveConfiguredDevice(const QVariantMap &params);
Q_INVOKABLE JsonReply* GetEventTypes(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetActionTypes(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetStateTypes(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetStateValue(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* GetStateValues(const QVariantMap &params) const;
signals: signals:
void StateChanged(const QVariantMap &params); void StateChanged(const QVariantMap &params);

1
server/jsonrpc/eventhandler.h
View File

@ -34,6 +34,7 @@ public:
QString name() const override; QString name() const override;
Q_INVOKABLE JsonReply *GetEventType(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetEventType(const QVariantMap &params) const;
signals: signals:
void EventTriggered(const QVariantMap &params); void EventTriggered(const QVariantMap &params);

4
server/jsonrpc/jsonhandler.h
View File

@ -42,8 +42,8 @@ public:
TypeAsync TypeAsync
}; };
static JsonReply* createReply(JsonHandler *handler, const QVariantMap &data); static JsonReply *createReply(JsonHandler *handler, const QVariantMap &data);
static JsonReply* createAsyncReply(JsonHandler *handler, const QString &method); static JsonReply *createAsyncReply(JsonHandler *handler, const QString &method);
Type type() const; Type type() const;
QVariantMap data() const; QVariantMap data() const;

5
server/jsonrpc/jsonrpcserver.cpp
View File

@ -150,14 +150,15 @@ QHash<QString, JsonHandler *> JsonRPCServer::handlers() const
return m_handlers; return m_handlers;
} }
void JsonRPCServer::registerTransportInterface(TransportInterface *interface) void JsonRPCServer::registerTransportInterface(TransportInterface *interface, const bool &enabled)
{ {
// Now set up the logic // Now set up the logic
connect(interface, SIGNAL(clientConnected(const QUuid &)), this, SLOT(clientConnected(const QUuid &))); connect(interface, SIGNAL(clientConnected(const QUuid &)), this, SLOT(clientConnected(const QUuid &)));
connect(interface, SIGNAL(clientDisconnected(const QUuid &)), this, SLOT(clientDisconnected(const QUuid &))); connect(interface, SIGNAL(clientDisconnected(const QUuid &)), this, SLOT(clientDisconnected(const QUuid &)));
connect(interface, SIGNAL(dataAvailable(QUuid, QString, QString, QVariantMap)), this, SLOT(processData(QUuid, QString, QString, QVariantMap))); connect(interface, SIGNAL(dataAvailable(QUuid, QString, QString, QVariantMap)), this, SLOT(processData(QUuid, QString, QString, QVariantMap)));
QMetaObject::invokeMethod(interface, "startServer", Qt::QueuedConnection); if (enabled)
QMetaObject::invokeMethod(interface, "startServer", Qt::QueuedConnection);
m_interfaces.append(interface); m_interfaces.append(interface);
} }

10
server/jsonrpc/jsonrpcserver.h
View File

@ -46,13 +46,13 @@ public:
// JsonHandler API implementation // JsonHandler API implementation
QString name() const; QString name() const;
Q_INVOKABLE JsonReply* Introspect(const QVariantMap &params) const; Q_INVOKABLE JsonReply *Introspect(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* Version(const QVariantMap &params) const; Q_INVOKABLE JsonReply *Version(const QVariantMap &params) const;
Q_INVOKABLE JsonReply* SetNotificationStatus(const QVariantMap &params); Q_INVOKABLE JsonReply *SetNotificationStatus(const QVariantMap &params);
QHash<QString, JsonHandler*> handlers() const; QHash<QString, JsonHandler *> handlers() const;
void registerTransportInterface(TransportInterface *interface); void registerTransportInterface(TransportInterface *interface, const bool &enabled = true);
private slots: private slots:
void setup(); void setup();

1
server/jsonrpc/logginghandler.h
View File

@ -35,6 +35,7 @@ public:
QString name() const override; QString name() const override;
Q_INVOKABLE JsonReply *GetLogEntries(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetLogEntries(const QVariantMap &params) const;
signals: signals:
void LogEntryAdded(const QVariantMap &params); void LogEntryAdded(const QVariantMap &params);
void LogDatabaseUpdated(const QVariantMap &params); void LogDatabaseUpdated(const QVariantMap &params);

1
server/jsonrpc/statehandler.h
View File

@ -34,6 +34,7 @@ public:
QString name() const override; QString name() const override;
Q_INVOKABLE JsonReply *GetStateType(const QVariantMap &params) const; Q_INVOKABLE JsonReply *GetStateType(const QVariantMap &params) const;
}; };
} }