@stoprocent/noble 2.3.1 → 2.3.3

package/lib/noble.js

@@ -171,8 +171,8 @@ class Noble extends EventEmitter {
       }, timeout);
 
       const listener = (state) => {
-        clearTimeout(timeoutId);
         if (state === 'poweredOn') {
+          clearTimeout(timeoutId);
           resolve();
         } else {
           this.once('stateChange', listener);

package/lib/win/src/ble_manager.cc

@@ -413,9 +413,12 @@ void BLEManager::OnConnectionStatusChanged(BluetoothLEDevice device,
             return;
         }
         PeripheralWinrt& peripheral = mDeviceMap[uuid];
-        peripheral.Disconnect();
-        mNotifyMap.Remove(uuid);
-        mEmit.Disconnected(uuid);
+        if(peripheral.device.has_value() && &(peripheral.device.value()) == &device )
+        {
+            peripheral.Disconnect();
+            mNotifyMap.Remove(uuid);
+            mEmit.Disconnected(uuid);
+        }
     }
 }
 
@@ -454,7 +457,7 @@ void BLEManager::OnServicesDiscovered(IAsyncOperation<GattDeviceServicesResult>
     };
 
     CHECK_STATUS_AND_RESULT(status, result, emit);
-
+    PeripheralWinrt& peripheral = mDeviceMap[uuid];
     FOR(service, result.Services())
     {
         auto id = service.Uuid();
@@ -462,6 +465,8 @@ void BLEManager::OnServicesDiscovered(IAsyncOperation<GattDeviceServicesResult>
         {
             serviceUuids.push_back(toStr(id));
         }
+        //remember for cleanup
+        peripheral.cachedServices.insert(std::make_pair(id, CachedService(service)));
     }
     mEmit.ServicesDiscovered(uuid, serviceUuids);
 }
@@ -503,7 +508,7 @@ void BLEManager::OnIncludedServicesDiscovered(IAsyncOperation<GattDeviceServices
     };
 
     CHECK_STATUS_AND_RESULT(status, result, emit);
-    
+    PeripheralWinrt& peripheral = mDeviceMap[uuid];
     FOR(service, result.Services())
     {
         auto id = service.Uuid();
@@ -511,6 +516,8 @@ void BLEManager::OnIncludedServicesDiscovered(IAsyncOperation<GattDeviceServices
         {
             servicesUuids.push_back(toStr(id));
         }
+        //remember for cleanup
+        peripheral.cachedServices.insert(std::make_pair(id, CachedService(service)));
     }
     mEmit.IncludedServicesDiscovered(uuid, serviceId, servicesUuids);
 }
@@ -552,7 +559,6 @@ void BLEManager::OnCharacteristicsDiscovered(IAsyncOperation<GattCharacteristics
     };
     
     CHECK_STATUS_AND_RESULT(status, result, emit);
-    
     FOR(characteristic, result.Characteristics())
     {
         auto id = characteristic.Uuid();

package/lib/win/src/peripheral_winrt.cc

@@ -162,15 +162,27 @@ void PeripheralWinrt::Update(const int rssiValue, const BluetoothLEAdvertisement
 
 void PeripheralWinrt::Disconnect()
 {
+    //clean up to ensure disconnect from Windows
+    for(auto const& cachedService : cachedServices)
+    {
+        cachedService.second.service.Close();
+    }
     cachedServices.clear();
-    if (gattSession.has_value() && maxPduSizeChangedToken)
+    if (gattSession.has_value())
     {
-        gattSession->MaxPduSizeChanged(maxPduSizeChangedToken);
+        if(maxPduSizeChangedToken)
+        {
+            gattSession->MaxPduSizeChanged(maxPduSizeChangedToken);
+        }
+        gattSession->Close();
     }
-    if (device.has_value() && connectionToken)
+    if (device.has_value())
     {
+        if(connectionToken)
+        {
+            device->ConnectionStatusChanged(connectionToken);
+        }
         device->Close();
-        device->ConnectionStatusChanged(connectionToken);
     }
     device = std::nullopt;
 }

package/lib/win/src/peripheral_winrt.h

@@ -72,6 +72,7 @@ public:
     winrt::event_token connectionToken;
     std::optional<GattSession> gattSession;
     winrt::event_token maxPduSizeChangedToken;
+    std::unordered_map<winrt::guid, CachedService> cachedServices;
 
 private:
     void GetServiceFromDevice(winrt::guid serviceUuid,
@@ -82,6 +83,5 @@ private:
     void
     GetDescriptorFromCharacteristic(GattCharacteristic characteristic, winrt::guid descriptorUuid,
                                     std::function<void(std::optional<GattDescriptor>)> callback);
-    std::unordered_map<winrt::guid, CachedService> cachedServices;
     void ProcessServiceData(const BluetoothLEAdvertisementDataSection& ds, size_t uuidSize);
 };

package/lib/win/src/radio_watcher.cc

@@ -80,22 +80,25 @@ winrt::fire_and_forget RadioWatcher::OnRadioChanged() {
             capabilities.centralRoleSupported = adapter.IsCentralRoleSupported();
 
             Radio bluetooth = nullptr;
-            if (radio.State() == RadioState::On && adapter.IsPeripheralRoleSupported()) {
+            if(adapter.IsCentralRoleSupported())
+            {
+                // Always set up radio state monitoring for any radio (on or off)
                 bluetooth = radio;
-            }
-
-            if (!bluetooth || bluetooth != mRadio) {
-                if (bluetooth) {
-                    mRadioStateChangedRevoker.revoke();
-                    mRadioStateChangedRevoker = bluetooth.StateChanged(
-                        winrt::auto_revoke, 
-                        [this, capabilities](Radio radio, auto&&) { 
-                            radioStateChanged(radio, capabilities); 
-                        });
-                } else {
-                    mRadioStateChangedRevoker.revoke();
-                }
+                mRadioStateChangedRevoker.revoke();
+                mRadioStateChangedRevoker = radio.StateChanged(
+                    winrt::auto_revoke, 
+                    [this, capabilities](Radio radio, auto&&) { 
+                        Radio bluetooth = radio;
+                        radioStateChanged(bluetooth, capabilities); 
+                    });
+                
+                radioStateChanged(bluetooth, capabilities);
+                mRadio = bluetooth;
                 
+            }
+            else
+            {
+                mRadioStateChangedRevoker.revoke();
                 radioStateChanged(bluetooth, capabilities);
                 mRadio = bluetooth;
             }

package/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "name": "@stoprocent/noble",
   "description": "A Node.js BLE (Bluetooth Low Energy) central library.",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/stoprocent/noble.git"