Skip to content
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

Resolving an issue with local_name being blank on Windows 11 #269

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolving an issue with local_name being blank on Windows 11 #269

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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ objc = "0.2.7"
libc = "0.2.133"

[target.'cfg(target_os = "windows")'.dependencies]
windows = { version = "0.41.0", features = ["Devices_Bluetooth", "Devices_Bluetooth_GenericAttributeProfile", "Devices_Bluetooth_Advertisement", "Devices_Radios", "Foundation_Collections", "Foundation", "Storage_Streams"] }
windows = { version = "0.42.0", features = ["Devices_Bluetooth", "Devices_Bluetooth_GenericAttributeProfile", "Devices_Bluetooth_Advertisement", "Devices_Radios", "Foundation_Collections", "Foundation", "Storage_Streams"] }

[dev-dependencies]
rand = "0.8.5"
Expand Down
44 changes: 32 additions & 12 deletions src/winrtble/peripheral.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::{
};
use async_trait::async_trait;
use dashmap::DashMap;
use futures::stream::Stream;
use futures::{executor::block_on, stream::Stream};
use log::{error, trace};
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
Expand All @@ -44,6 +44,7 @@ use tokio::sync::broadcast;
use uuid::Uuid;

use std::sync::Weak;
use windows::Devices::Bluetooth::BluetoothLEDevice;
use windows::Devices::Bluetooth::{Advertisement::*, BluetoothAddressType};

#[cfg_attr(
Expand Down Expand Up @@ -123,17 +124,36 @@ impl Peripheral {
}

pub(crate) fn update_properties(&self, args: &BluetoothLEAdvertisementReceivedEventArgs) {
let advertisement = args.Advertisement().unwrap();

// Advertisements are cumulative: set/replace data only if it's set
if let Ok(name) = advertisement.LocalName() {
if !name.is_empty() {
// XXX: we could probably also assume that we've seen the
// advertisement before and speculatively take a read lock
// to confirm that the name hasn't changed...

let mut local_name_guard = self.shared.local_name.write().unwrap();
*local_name_guard = Some(name.to_string());
let advertisement: BluetoothLEAdvertisement = args.Advertisement().unwrap();

// For some reason, advertisements received on Windows do not reliably include the local_name property
// We have to manually create a BluetoothLEDevice from supplied WinRT functionality, and then manually
// get the name from that.

// Because update_properties is sync and is implemented on other platforms, this blocks the thread temporarily
// while the name is retrieved, and unblocks once the name is retrieved. Failures are ignored, and no name
// is assigned in that case.

let future_name =
BluetoothLEDevice::FromBluetoothAddressAsync(args.BluetoothAddress().unwrap()).unwrap();

let result = block_on(future_name);

match result {
Ok(device) => {
match device.Name()
{
Ok(d) => {
let mut local_name_guard = self.shared.local_name.write().unwrap();
*local_name_guard = Some(d.to_string());
},
_ => {
// could not get device name
}
}
}
Err(r) => {
// could not get device name
}
}
if let Ok(manufacturer_data) = advertisement.ManufacturerData() {
Expand Down