8eff1dcca7
Context: https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/600#note_884500
When bluetooth doesn't exist on the machine at all, QTConnectivity
tries to communicate with Bluez via dbus and introduces a 30 odd second
pause. That's not necessarily a problem in concept, however this blocks
the main thread of KDEConnect, which also then blocks the main thread
of Plasma on logon and causes tremendous delays and very broken
behaviour.
For the life of me, I cannot find a way to do "is bluetooth ok" without
QTConnect kicking off the dbus call so I think the only option is to
thread off the startup of the providers so that pauses don't block
the whole process.
I've just tested this here and my logon with bluetooth missing went
from approx 35 seconds down to about 2.
Ready for input/feedback whenever people have time; in my testing at the moment it seems to completely break the behaviour of KDEConnect (i.e. things can't connect), I'm guessing this is something to do with the effect of wrapping everything in the QThread. I'll dig into that next and see if I can figure it out.
BUG: 481870
(cherry picked from commit bb146a76d0
)
4beb8c65 Fixing hanging startup/logon when bluetooth is unavailable
Co-authored-by: Rob Emery <kde@mintsoft.net>
297 lines
8.1 KiB
C++
297 lines
8.1 KiB
C++
/**
|
|
* SPDX-FileCopyrightText: 2013 Albert Vaca <albertvaka@gmail.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
*/
|
|
|
|
#include "daemon.h"
|
|
|
|
#include <QDBusMetaType>
|
|
#include <QDebug>
|
|
#include <QNetworkAccessManager>
|
|
#include <QPointer>
|
|
#include <QProcess>
|
|
|
|
#include "core_debug.h"
|
|
#include "dbushelper.h"
|
|
#include "kdeconnectconfig.h"
|
|
#include "networkpacket.h"
|
|
#include "notificationserverinfo.h"
|
|
|
|
#ifdef KDECONNECT_BLUETOOTH
|
|
#include "backends/bluetooth/bluetoothlinkprovider.h"
|
|
#endif
|
|
|
|
#include "backends/devicelink.h"
|
|
#include "backends/lan/lanlinkprovider.h"
|
|
#include "backends/linkprovider.h"
|
|
#include "backends/loopback/loopbacklinkprovider.h"
|
|
#include "device.h"
|
|
|
|
static Daemon *s_instance = nullptr;
|
|
|
|
struct DaemonPrivate {
|
|
// Different ways to find devices and connect to them
|
|
QSet<LinkProvider *> m_linkProviders;
|
|
|
|
// Every known device
|
|
QMap<QString, Device *> m_devices;
|
|
|
|
bool m_testMode;
|
|
};
|
|
|
|
Daemon *Daemon::instance()
|
|
{
|
|
Q_ASSERT(s_instance != nullptr);
|
|
return s_instance;
|
|
}
|
|
|
|
Daemon::Daemon(QObject *parent, bool testMode)
|
|
: QObject(parent)
|
|
, d(new DaemonPrivate)
|
|
{
|
|
Q_ASSERT(!s_instance);
|
|
s_instance = this;
|
|
d->m_testMode = testMode;
|
|
|
|
// HACK init may call pure virtual functions from this class so it can't be called directly from the ctor
|
|
QTimer::singleShot(0, this, &Daemon::init);
|
|
}
|
|
|
|
void Daemon::init()
|
|
{
|
|
qCDebug(KDECONNECT_CORE) << "Daemon starting";
|
|
|
|
// Register on DBus
|
|
// This must happen as early as possible in the process startup to ensure
|
|
// the absolute minimum amount of blocking on logon/autostart
|
|
|
|
qDBusRegisterMetaType<QMap<QString, QString>>();
|
|
QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kdeconnect"));
|
|
QDBusConnection::sessionBus().registerObject(QStringLiteral("/modules/kdeconnect"), this, QDBusConnection::ExportScriptableContents);
|
|
|
|
qCDebug(KDECONNECT_CORE) << "DBus registration complete";
|
|
|
|
// Load backends
|
|
if (d->m_testMode)
|
|
d->m_linkProviders.insert(new LoopbackLinkProvider());
|
|
else {
|
|
d->m_linkProviders.insert(new LanLinkProvider());
|
|
#ifdef KDECONNECT_BLUETOOTH
|
|
d->m_linkProviders.insert(new BluetoothLinkProvider());
|
|
#endif
|
|
#ifdef KDECONNECT_LOOPBACK
|
|
d->m_linkProviders.insert(new LoopbackLinkProvider());
|
|
#endif
|
|
}
|
|
|
|
qCDebug(KDECONNECT_CORE) << "Backends loaded";
|
|
|
|
// Read remembered paired devices
|
|
const QStringList &list = KdeConnectConfig::instance().trustedDevices();
|
|
for (const QString &id : list) {
|
|
addDevice(new Device(this, id));
|
|
}
|
|
|
|
qCDebug(KDECONNECT_CORE) << "Paired devices added";
|
|
|
|
// Listen to new devices
|
|
for (LinkProvider *a : std::as_const(d->m_linkProviders)) {
|
|
connect(a, &LinkProvider::onConnectionReceived, this, &Daemon::onNewDeviceLink);
|
|
a->onStart();
|
|
}
|
|
|
|
qCDebug(KDECONNECT_CORE) << "Link providers started";
|
|
|
|
NotificationServerInfo::instance().init();
|
|
|
|
qCDebug(KDECONNECT_CORE) << "Daemon started";
|
|
}
|
|
|
|
void Daemon::removeDevice(Device *device)
|
|
{
|
|
d->m_devices.remove(device->id());
|
|
device->deleteLater();
|
|
Q_EMIT deviceRemoved(device->id());
|
|
Q_EMIT deviceListChanged();
|
|
}
|
|
|
|
void Daemon::forceOnNetworkChange()
|
|
{
|
|
qCDebug(KDECONNECT_CORE) << "Sending onNetworkChange to" << d->m_linkProviders.size() << "LinkProviders";
|
|
for (LinkProvider *a : std::as_const(d->m_linkProviders)) {
|
|
a->onNetworkChange();
|
|
}
|
|
}
|
|
|
|
Device *Daemon::getDevice(const QString &deviceId)
|
|
{
|
|
for (Device *device : std::as_const(d->m_devices)) {
|
|
if (device->id() == deviceId) {
|
|
return device;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
QSet<LinkProvider *> Daemon::getLinkProviders() const
|
|
{
|
|
return d->m_linkProviders;
|
|
}
|
|
|
|
QStringList Daemon::devices(bool onlyReachable, bool onlyTrusted) const
|
|
{
|
|
QStringList ret;
|
|
for (Device *device : std::as_const(d->m_devices)) {
|
|
if (onlyReachable && !device->isReachable())
|
|
continue;
|
|
if (onlyTrusted && !device->isPaired())
|
|
continue;
|
|
ret.append(device->id());
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
QMap<QString, QString> Daemon::deviceNames(bool onlyReachable, bool onlyTrusted) const
|
|
{
|
|
QMap<QString, QString> ret;
|
|
for (Device *device : std::as_const(d->m_devices)) {
|
|
if (onlyReachable && !device->isReachable())
|
|
continue;
|
|
if (onlyTrusted && !device->isPaired())
|
|
continue;
|
|
ret[device->id()] = device->name();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void Daemon::onNewDeviceLink(DeviceLink *link)
|
|
{
|
|
QString id = link->deviceId();
|
|
|
|
qCDebug(KDECONNECT_CORE) << "Device discovered" << id << "via link with priority" << link->priority();
|
|
|
|
if (d->m_devices.contains(id)) {
|
|
qCDebug(KDECONNECT_CORE) << "It is a known device" << link->deviceInfo().name;
|
|
Device *device = d->m_devices[id];
|
|
bool wasReachable = device->isReachable();
|
|
device->addLink(link);
|
|
if (!wasReachable) {
|
|
Q_EMIT deviceVisibilityChanged(id, true);
|
|
Q_EMIT deviceListChanged();
|
|
}
|
|
} else {
|
|
qCDebug(KDECONNECT_CORE) << "It is a new device" << link->deviceInfo().name;
|
|
Device *device = new Device(this, link);
|
|
addDevice(device);
|
|
}
|
|
}
|
|
|
|
void Daemon::onDeviceStatusChanged()
|
|
{
|
|
Device *device = (Device *)sender();
|
|
|
|
// qCDebug(KDECONNECT_CORE) << "Device" << device->name() << "status changed. Reachable:" << device->isReachable() << ". Paired: " << device->isPaired();
|
|
|
|
if (!device->isReachable() && !device->isPaired()) {
|
|
// qCDebug(KDECONNECT_CORE) << "Destroying device" << device->name();
|
|
removeDevice(device);
|
|
} else {
|
|
Q_EMIT deviceVisibilityChanged(device->id(), device->isReachable());
|
|
Q_EMIT deviceListChanged();
|
|
}
|
|
}
|
|
|
|
void Daemon::setAnnouncedName(const QString &name)
|
|
{
|
|
QString filteredName = DeviceInfo::filterName(name);
|
|
qCDebug(KDECONNECT_CORE) << "Announcing name";
|
|
KdeConnectConfig::instance().setName(filteredName);
|
|
forceOnNetworkChange();
|
|
Q_EMIT announcedNameChanged(filteredName);
|
|
}
|
|
|
|
void Daemon::setCustomDevices(const QStringList &addresses)
|
|
{
|
|
auto &config = KdeConnectConfig::instance();
|
|
|
|
auto customDevices = config.customDevices();
|
|
if (customDevices != addresses) {
|
|
qCDebug(KDECONNECT_CORE) << "Changed list of custom device addresses:" << addresses;
|
|
config.setCustomDevices(addresses);
|
|
Q_EMIT customDevicesChanged(addresses);
|
|
|
|
forceOnNetworkChange();
|
|
}
|
|
}
|
|
|
|
QStringList Daemon::customDevices() const
|
|
{
|
|
return KdeConnectConfig::instance().customDevices();
|
|
}
|
|
|
|
QString Daemon::announcedName()
|
|
{
|
|
return KdeConnectConfig::instance().name();
|
|
}
|
|
|
|
QNetworkAccessManager *Daemon::networkAccessManager()
|
|
{
|
|
static QPointer<QNetworkAccessManager> manager;
|
|
if (!manager) {
|
|
manager = new QNetworkAccessManager(this);
|
|
}
|
|
return manager;
|
|
}
|
|
|
|
QList<Device *> Daemon::devicesList() const
|
|
{
|
|
return d->m_devices.values();
|
|
}
|
|
|
|
QString Daemon::deviceIdByName(const QString &name) const
|
|
{
|
|
for (Device *device : std::as_const(d->m_devices)) {
|
|
if (device->name() == name && device->isPaired())
|
|
return device->id();
|
|
}
|
|
return {};
|
|
}
|
|
|
|
void Daemon::addDevice(Device *device)
|
|
{
|
|
const QString id = device->id();
|
|
connect(device, &Device::reachableChanged, this, &Daemon::onDeviceStatusChanged);
|
|
connect(device, &Device::pairStateChanged, this, &Daemon::onDeviceStatusChanged);
|
|
connect(device, &Device::pairStateChanged, this, &Daemon::pairingRequestsChanged);
|
|
connect(device, &Device::pairStateChanged, this, [this, device](int pairStateAsInt) {
|
|
PairState pairState = (PairState)pairStateAsInt;
|
|
if (pairState == PairState::RequestedByPeer)
|
|
askPairingConfirmation(device);
|
|
});
|
|
d->m_devices[id] = device;
|
|
|
|
Q_EMIT deviceAdded(id);
|
|
Q_EMIT deviceListChanged();
|
|
}
|
|
|
|
QStringList Daemon::pairingRequests() const
|
|
{
|
|
QStringList ret;
|
|
for (Device *dev : std::as_const(d->m_devices)) {
|
|
if (dev->isPairRequestedByPeer())
|
|
ret += dev->id();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
Daemon::~Daemon()
|
|
{
|
|
}
|
|
|
|
QString Daemon::selfId() const
|
|
{
|
|
return KdeConnectConfig::instance().deviceId();
|
|
}
|
|
|
|
#include "moc_daemon.cpp"
|