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

Default remote connection to TCP connection and handle connection type appropriate

Browse Source
This commit is contained in:
Simon Stürz 2022-03-09 17:45:32 +01:00
parent 3eb3b8ad8a
commit 836e0a5e14
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libnymea-core/cloud/cloudtransport.cpp
View File

@ -40,7 +40,7 @@ namespace nymeaserver {
CloudTransport::CloudTransport(const ServerConfiguration &config, QObject *parent): CloudTransport::CloudTransport(const ServerConfiguration &config, QObject *parent):
TransportInterface(config, parent) TransportInterface(config, parent)
{ {
m_defaultProxyUrl = "wss://remoteproxy.nymea.io"; m_defaultProxyUrl = "ssl://remoteproxy.nymea.io:4433";
} }
void CloudTransport::sendData(const QUuid &clientId, const QByteArray &data) void CloudTransport::sendData(const QUuid &clientId, const QByteArray &data)
@ -89,12 +89,18 @@ void CloudTransport::connectToCloud(const QString &token, const QString &nonce,
QString proxyUrl = serverUrl.isEmpty() ? m_defaultProxyUrl : serverUrl; QString proxyUrl = serverUrl.isEmpty() ? m_defaultProxyUrl : serverUrl;
qCDebug(dcCloud()) << "Connecting to remote proxy server" << proxyUrl; qCDebug(dcCloud()) << "Connecting to remote proxy server" << proxyUrl;
RemoteProxyConnection::ConnectionType connectionType = RemoteProxyConnection::ConnectionTypeTcpSocket;
QUrl url(proxyUrl);
if (url.scheme() == "wss" || url.scheme() == "ws") {
connectionType = RemoteProxyConnection::ConnectionTypeWebSocket;
}
ConnectionContext context; ConnectionContext context;
context.clientId = QUuid::createUuid(); context.clientId = QUuid::createUuid();
context.token = token; context.token = token;
context.nonce = nonce; context.nonce = nonce;
QString identifier = QString("nymea:core (%1)").arg(NymeaCore::instance()->configuration()->serverName()); QString identifier = QString("nymea:core (%1)").arg(NymeaCore::instance()->configuration()->serverName());
context.proxyConnection = new RemoteProxyConnection(NymeaCore::instance()->configuration()->serverUuid().toString(), identifier, this); context.proxyConnection = new RemoteProxyConnection(NymeaCore::instance()->configuration()->serverUuid().toString(), identifier, connectionType, this);
m_connections.insert(context.proxyConnection, context); m_connections.insert(context.proxyConnection, context);
connect(context.proxyConnection, &RemoteProxyConnection::ready, this, &CloudTransport::transportReady); connect(context.proxyConnection, &RemoteProxyConnection::ready, this, &CloudTransport::transportReady);
@ -103,7 +109,7 @@ void CloudTransport::connectToCloud(const QString &token, const QString &nonce,
connect(context.proxyConnection, &RemoteProxyConnection::remoteConnectionEstablished, this, &CloudTransport::transportConnected); connect(context.proxyConnection, &RemoteProxyConnection::remoteConnectionEstablished, this, &CloudTransport::transportConnected);
connect(context.proxyConnection, &RemoteProxyConnection::disconnected, this, &CloudTransport::transportDisconnected); connect(context.proxyConnection, &RemoteProxyConnection::disconnected, this, &CloudTransport::transportDisconnected);
context.proxyConnection->connectServer(QUrl(proxyUrl)); context.proxyConnection->connectServer(url);
} }
void CloudTransport::remoteConnectionStateChanged(RemoteProxyConnection::State state) void CloudTransport::remoteConnectionStateChanged(RemoteProxyConnection::State state)