Skip to content

Fix reliability, security, and performance issues across clients #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwinarske merged 1 commit into from
Jul 12, 2026
Merged

Fix reliability, security, and performance issues across clients #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 34 additions & 56 deletions src/bluez/adapter1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,65 +60,43 @@ class Adapter1 final
const sdbus::InterfaceName& interfaceName,
const std::map<sdbus::PropertyName, sdbus::Variant>& changedProperties,
const std::vector<sdbus::PropertyName>& invalidatedProperties) override {
if (const auto key = sdbus::MemberName("Address");
changedProperties.contains(key)) {
properties_.address = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("AddressType");
changedProperties.contains(key)) {
properties_.address_type = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("Alias");
changedProperties.contains(key)) {
properties_.alias = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("Class");
changedProperties.contains(key)) {
properties_.class_type = changedProperties.at(key).get<std::uint32_t>();
}
if (const auto key = sdbus::MemberName("Discoverable");
changedProperties.contains(key)) {
properties_.discoverable = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("DiscoverableTimeout");
changedProperties.contains(key)) {
properties_.discoverable_timeout =
changedProperties.at(key).get<std::uint32_t>();
}
if (const auto key = sdbus::MemberName("Discovering");
changedProperties.contains(key)) {
properties_.discovering = changedProperties.at(key).get<bool>();
// Iterate the changed properties once and dispatch on the key. A
// PropertiesChanged signal usually carries only a handful of properties,
// so this avoids scanning every known property (and the per-property map
// lookup + MemberName allocation) on every signal.
for (const auto& [key, value] : changedProperties) {
if (key == "Address") {
properties_.address = value.get<std::string>();
} else if (key == "AddressType") {
properties_.address_type = value.get<std::string>();
} else if (key == "Alias") {
properties_.alias = value.get<std::string>();
} else if (key == "Class") {
properties_.class_type = value.get<std::uint32_t>();
} else if (key == "Discoverable") {
properties_.discoverable = value.get<bool>();
} else if (key == "DiscoverableTimeout") {
properties_.discoverable_timeout = value.get<std::uint32_t>();
} else if (key == "Discovering") {
properties_.discovering = value.get<bool>();

if (!properties_.discovering) {
this->StartDiscovery();
if (!properties_.discovering) {
this->StartDiscovery();
}
} else if (key == "Modalias") {
properties_.modalias = value.get<std::string>();
} else if (key == "Name") {
properties_.name = value.get<std::string>();
} else if (key == "Pairable") {
properties_.pairable = value.get<bool>();
} else if (key == "PairableTimeout") {
properties_.pairable_timeout = value.get<std::uint32_t>();
} else if (key == "Powered") {
properties_.powered = value.get<bool>();
} else if (key == "UUIDs") {
properties_.uuids = value.get<std::vector<std::string>>();
}
}
if (const auto key = sdbus::MemberName("Modalias");
changedProperties.contains(key)) {
properties_.modalias = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("Name");
changedProperties.contains(key)) {
properties_.name = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("Pairable");
changedProperties.contains(key)) {
properties_.pairable = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("PairableTimeout");
changedProperties.contains(key)) {
properties_.pairable_timeout =
changedProperties.at(key).get<std::uint32_t>();
}
if (const auto key = sdbus::MemberName("Powered");
changedProperties.contains(key)) {
properties_.powered = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("UUIDs");
changedProperties.contains(key)) {
properties_.uuids =
changedProperties.at(key).get<std::vector<std::string>>();
}
}
};

Expand Down
102 changes: 38 additions & 64 deletions src/bluez/device1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,70 +85,44 @@ class Device1 final : public sdbus::ProxyInterfaces<sdbus::Properties_proxy,
const sdbus::InterfaceName& interfaceName,
const std::map<sdbus::PropertyName, sdbus::Variant>& changedProperties,
const std::vector<sdbus::PropertyName>& invalidatedProperties) override {
if (const auto key = sdbus::MemberName("Adapter");
changedProperties.contains(key)) {
properties_.adapter = changedProperties.at(key).get<sdbus::ObjectPath>();
}
if (const auto key = sdbus::MemberName("Address");
changedProperties.contains(key)) {
properties_.address = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("AddressType");
changedProperties.contains(key)) {
properties_.address_type = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("Bonded");
changedProperties.contains(key)) {
properties_.bonded = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("Blocked");
changedProperties.contains(key)) {
properties_.blocked = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("Connected");
changedProperties.contains(key)) {
properties_.connected = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("LegacyPairing");
changedProperties.contains(key)) {
properties_.legacy_pairing = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("Paired");
changedProperties.contains(key)) {
properties_.paired = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("Modalias");
changedProperties.contains(key)) {
properties_.modalias =
parse_modalias(changedProperties.at(key).get<std::string>());
}
if (const auto key = sdbus::MemberName("Name");
changedProperties.contains(key)) {
properties_.name = changedProperties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("ServiceData");
changedProperties.contains(key)) {
properties_.service_data =
changedProperties.at(key)
.get<std::map<std::string, sdbus::Variant>>();
}
if (const auto key = sdbus::MemberName("RSSI");
changedProperties.contains(key)) {
properties_.rssi = changedProperties.at(key).get<std::int16_t>();
LOG_DEBUG("RSSI: {}", properties_.rssi);
}
if (const auto key = sdbus::MemberName("ServicesResolved");
changedProperties.contains(key)) {
properties_.services_resolved = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("Trusted");
changedProperties.contains(key)) {
properties_.trusted = changedProperties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("UUIDs");
changedProperties.contains(key)) {
properties_.uuids =
changedProperties.at(key).get<std::vector<std::string>>();
// Iterate the changed properties once and dispatch on the key. A
// PropertiesChanged signal usually carries only a handful of properties,
// so this avoids scanning every known property (and the per-property map
// lookup + MemberName allocation) on every signal.
for (const auto& [key, value] : changedProperties) {
if (key == "Adapter") {
properties_.adapter = value.get<sdbus::ObjectPath>();
} else if (key == "Address") {
properties_.address = value.get<std::string>();
} else if (key == "AddressType") {
properties_.address_type = value.get<std::string>();
} else if (key == "Bonded") {
properties_.bonded = value.get<bool>();
} else if (key == "Blocked") {
properties_.blocked = value.get<bool>();
} else if (key == "Connected") {
properties_.connected = value.get<bool>();
} else if (key == "LegacyPairing") {
properties_.legacy_pairing = value.get<bool>();
} else if (key == "Paired") {
properties_.paired = value.get<bool>();
} else if (key == "Modalias") {
properties_.modalias = parse_modalias(value.get<std::string>());
} else if (key == "Name") {
properties_.name = value.get<std::string>();
} else if (key == "ServiceData") {
properties_.service_data =
value.get<std::map<std::string, sdbus::Variant>>();
} else if (key == "RSSI") {
properties_.rssi = value.get<std::int16_t>();
LOG_DEBUG("RSSI: {}", properties_.rssi);
} else if (key == "ServicesResolved") {
properties_.services_resolved = value.get<bool>();
} else if (key == "Trusted") {
properties_.trusted = value.get<bool>();
} else if (key == "UUIDs") {
properties_.uuids = value.get<std::vector<std::string>>();
}
}
#if 0
Utils::print_changed_properties(interfaceName, changedProperties,
Expand Down
43 changes: 22 additions & 21 deletions src/bluez/gatt_characteristic1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,30 @@ class GattCharacteristic1 final
const sdbus::ObjectPath(&objectPath),
const std::map<sdbus::MemberName, sdbus::Variant>& properties)
: ProxyInterfaces{connection, destination, objectPath} {
if (const auto key = sdbus::MemberName("Flags"); properties.contains(key)) {
properties_.flags = properties.at(key).get<std::vector<std::string>>();
}
if (isNotifyFlagSet()) {
if (const auto key = sdbus::MemberName("NotifyAcquired");
properties.contains(key)) {
properties_.notify_acquired = properties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("Notifying");
properties.contains(key)) {
properties_.notifying = properties.at(key).get<bool>();
// Iterate the provided properties once and dispatch on the key. This avoids
// scanning every known property (and the per-property map lookup +
// MemberName allocation). "Flags" sorts before "NotifyAcquired"/"Notifying"
// in the map, so it is assigned before those guarded assignments are
// reached, preserving the original isNotifyFlagSet() behavior.
for (const auto& [key, value] : properties) {
if (key == "Flags") {
properties_.flags = value.get<std::vector<std::string>>();
} else if (key == "NotifyAcquired") {
if (isNotifyFlagSet()) {
properties_.notify_acquired = value.get<bool>();
}
} else if (key == "Notifying") {
if (isNotifyFlagSet()) {
properties_.notifying = value.get<bool>();
}
} else if (key == "Service") {
properties_.service = value.get<sdbus::ObjectPath>();
} else if (key == "UUID") {
properties_.uuid = value.get<std::string>();
} else if (key == "Value") {
properties_.value = value.get<std::vector<std::uint8_t>>();
}
}
if (const auto key = sdbus::MemberName("Service");
properties.contains(key)) {
properties_.service = properties.at(key).get<sdbus::ObjectPath>();
}
if (const auto key = sdbus::MemberName("UUID"); properties.contains(key)) {
properties_.uuid = properties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("Value"); properties.contains(key)) {
properties_.value = properties.at(key).get<std::vector<std::uint8_t>>();
}
}

[[nodiscard]] bool isNotifyFlagSet() const {
Expand Down
20 changes: 11 additions & 9 deletions src/bluez/gatt_descriptor1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,17 @@ class GattDescriptor1 final
const sdbus::ObjectPath(&objectPath),
const std::map<sdbus::MemberName, sdbus::Variant>& properties)
: ProxyInterfaces{connection, destination, objectPath} {
if (const auto key = sdbus::MemberName("Characteristic");
properties.contains(key)) {
properties_.characteristic = properties.at(key).get<sdbus::ObjectPath>();
}
if (const auto key = sdbus::MemberName("UUID"); properties.contains(key)) {
properties_.uuid = properties.at(key).get<std::string>();
}
if (const auto key = sdbus::MemberName("Value"); properties.contains(key)) {
properties_.value = properties.at(key).get<std::vector<std::uint8_t>>();
// Iterate the provided properties once and dispatch on the key. This avoids
// scanning every known property (and the per-property map lookup +
// MemberName allocation).
for (const auto& [key, value] : properties) {
if (key == "Characteristic") {
properties_.characteristic = value.get<sdbus::ObjectPath>();
} else if (key == "UUID") {
properties_.uuid = value.get<std::string>();
} else if (key == "Value") {
properties_.value = value.get<std::vector<std::uint8_t>>();
}
}
}

Expand Down
28 changes: 13 additions & 15 deletions src/bluez/gatt_service1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,19 @@ class GattService1
const sdbus::ObjectPath(&objectPath),
const std::map<sdbus::MemberName, sdbus::Variant>& properties)
: ProxyInterfaces{connection, destination, objectPath} {
if (const auto key = sdbus::MemberName("Device");
properties.contains(key)) {
properties_.device = properties.at(key).get<sdbus::ObjectPath>();
}
if (const auto key = sdbus::MemberName("Includes");
properties.contains(key)) {
properties_.includes =
properties.at(key).get<std::vector<sdbus::ObjectPath>>();
}
if (const auto key = sdbus::MemberName("Primary");
properties.contains(key)) {
properties_.primary = properties.at(key).get<bool>();
}
if (const auto key = sdbus::MemberName("UUID"); properties.contains(key)) {
properties_.uuid = properties.at(key).get<std::string>();
// Iterate the provided properties once and dispatch on the key. This avoids
// scanning every known property (and the per-property map lookup +
// MemberName allocation).
for (const auto& [key, value] : properties) {
if (key == "Device") {
properties_.device = value.get<sdbus::ObjectPath>();
} else if (key == "Includes") {
properties_.includes = value.get<std::vector<sdbus::ObjectPath>>();
} else if (key == "Primary") {
properties_.primary = value.get<bool>();
} else if (key == "UUID") {
properties_.uuid = value.get<std::string>();
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/bluez/horipad_steam/horipad_steam.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ HoripadSteam::HoripadSteam(sdbus::IConnection& connection)
sub_system ? sub_system : "");
if (std::strcmp(sub_system, "hidraw") == 0) {
if (std::strcmp(action, "remove") == 0) {
std::scoped_lock reader_lock(input_reader_mutex_);
if (input_reader_) {
input_reader_->stop();
input_reader_.reset();
Expand Down Expand Up @@ -155,6 +156,7 @@ void HoripadSteam::onInterfacesAdded(
if (const std::string hidraw_device = FindHidDevice(hidraw_device_key);
!hidraw_device.empty()) {
LOG_INFO("Adding hidraw device: {}", hidraw_device_key);
std::scoped_lock reader_lock(input_reader_mutex_);
if (!input_reader_) {
input_reader_ = std::make_unique<InputReader>(hidraw_device);
input_reader_->start();
Expand Down
4 changes: 4 additions & 0 deletions src/bluez/horipad_steam/horipad_steam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ class HoripadSteam final
std::mutex input1_mutex_;
std::map<sdbus::ObjectPath, std::unique_ptr<Input1>> input1_;

// Guards input_reader_, which is created/started from onInterfacesAdded
// (D-Bus event-loop or main thread) and stopped/reset from the udev monitor
// worker thread.
std::mutex input_reader_mutex_;
std::unique_ptr<InputReader> input_reader_;

void onInterfacesAdded(
Expand Down
Loading
Loading