fix: GetGattServicesForUuidAsync() failed to find services

This was an issue discovered with the MagicMotion Vini which wasn't showing up due to not getting a service returned. The service was present and useable when GetServicesAsync() was called instead. Additioanlly: - more logging is now emitted from the UWP BLE manager when this sort of error occures - only one attempt to create a connection to a specific device happens at once now (previously multiple threads could be launched to create a connection for a single device).

Author: blackspherefollower

Buttplug.Server.Managers.UWPBluetoothManager/UWPBluetoothDeviceInterface.cs

@@ -60,21 +60,22 @@ public static async Task<IButtplugDeviceImpl> Create(IButtplugLogManager aLogMan
 protectedasyncTask<GattDeviceService>GetService(GuidaServiceGuid)
 {
 // GetGattServicesForUuidAsync is 15063+ only?
-varserviceResult=await_bleDevice.GetGattServicesForUuidAsync(aServiceGuid,BluetoothCacheMode.Cached);
+varservicedResult=await_bleDevice.GetGattServicesAsync();
 
 // Don't log exceptions here, as we may not want to report them at some points.
-if(serviceResult.Status!=GattCommunicationStatus.Success)
+if(servicedResult.Status!=GattCommunicationStatus.Success)
 {
 thrownewButtplugDeviceException($"Cannot check for service {aServiceGuid} of {_bleDevice.Name}.");
 }
 
-if(serviceResult.Services.Count==0)
+varservices=servicedResult.Services.Where(s =>s.Uuid==aServiceGuid).ToList();
+if(services.Count==0)
 {
 thrownewButtplugDeviceException($"Cannot find service {aServiceGuid} of {_bleDevice.Name}.");
 }
 
 // TODO is there EVER a way we'd get more than one service back?
-returnserviceResult.Services[0];
+returnservices[0];
 }
 
 protectedasyncTaskInitializeDevice(BluetoothLEProtocolConfigurationaConfig)
@@ -85,6 +86,7 @@ protected async Task InitializeDevice(BluetoothLEProtocolConfiguration aConfig)
 // characteristic detection.
 if(serviceInfo.Value==null||serviceInfo.Value.Count==0)
 {
+BpLogger.Debug($"Auto finding characteristics for {_bleDevice.Name}");
 awaitAddDefaultCharacteristics(serviceInfo.Key).ConfigureAwait(false);
 }
 else
@@ -97,11 +99,12 @@ protected async Task InitializeDevice(BluetoothLEProtocolConfiguration aConfig)
 {
 service=awaitGetService(serviceGuid).ConfigureAwait(false);
 }
-catch(ButtplugDeviceException)
+catch(ButtplugDeviceExceptionex)
 {
 // In this case, we may have a whole bunch of services that aren't valid for
 // a device and only one that is. We can ignore the exception here, and throw
 // later if we don't get anything from any service in the list.
+BpLogger.Error(ex.Message);
 continue;
 }
 

Buttplug.Server.Managers.UWPBluetoothManager/UWPBluetoothManager.cs

@@ -123,6 +123,8 @@ private async void OnAdvertisementReceived(BluetoothLEAdvertisementWatcher aObj,
 {
 return;
 }
+
+_seenAddresses.Add(btAddr);
 
 // todo Add advertGUIDs back in. Not sure that ever really gets used though.
 vardeviceCriteria=newBluetoothLEProtocolConfiguration(advertName);
@@ -134,10 +136,9 @@ private async void OnAdvertisementReceived(BluetoothLEAdvertisementWatcher aObj,
 {
 BpLogger.Debug($"No usable device factory available for {advertName}.");
 // If we've got an actual name this time around, and we don't have any factories
-// available that match the info we have, add to our seen list so we won't keep
+// available that match the info we have, keep the device in our seen list so we won't keep
 // rechecking. If a device does have a factory, but doesn't connect, we still want to
 // try again.
-_seenAddresses.Add(btAddr);
 return;
 }
 
@@ -148,6 +149,7 @@ private async void OnAdvertisementReceived(BluetoothLEAdvertisementWatcher aObj,
 // remove it from seen devices, since the user may turn it back on during this scanning period.
 if(fromBluetoothAddressAsync==null)
 {
+_seenAddresses.Remove(btAddr);
 return;
 }
 
@@ -176,8 +178,11 @@ private async void OnAdvertisementReceived(BluetoothLEAdvertisementWatcher aObj,
 }
 
 BpLogger.Error(
-$"Cannot connect to device {advertName}{btAddr}: {ex.Message}");
+$"Cannot connect to device {advertName}{btAddr}: {ex.Message}\n{ex.StackTrace}");
 }
+
+// Remove the device from the seen list so that if we error'ed or disconnect, we can try again
+_seenAddresses.Remove(btAddr);
 }
 
 privatevoidOnWatcherStopped(BluetoothLEAdvertisementWatcheraObj,