@stoprocent/noble 2.3.14 → 2.3.15

package/lib/win/src/peripheral_winrt.cc

@@ -92,16 +92,21 @@ void PeripheralWinrt::ProcessServiceData(const BluetoothLEAdvertisementDataSecti
     dr.Close();
 }
 
+static std::string advSectionToString(const winrt::Windows::Devices::Bluetooth::Advertisement::BluetoothLEAdvertisementDataSection &sec)
+{
+    std::string result;
+    result.resize(sec.Data().Length());
+    auto reader = DataReader::FromBuffer(sec.Data());
+    reader.ReadBytes(winrt::array_view<uint8_t>(
+        reinterpret_cast<uint8_t*>(result.data()), 
+        reinterpret_cast<uint8_t*>(result.data() + result.size())
+    ));
+    return result;
+}
+
 void PeripheralWinrt::Update(const int rssiValue, const BluetoothLEAdvertisement& advertisment,
                              const BluetoothLEAdvertisementType& advertismentType)
 {
-    // Handle name
-    std::string localName = ws2s(advertisment.LocalName().c_str());
-    if (!localName.empty())
-    {
-        name = std::optional<std::string>(localName);
-    }
-
     connectable = advertismentType == BluetoothLEAdvertisementType::ConnectableUndirected ||
         advertismentType == BluetoothLEAdvertisementType::ConnectableDirected;
 
@@ -144,6 +149,18 @@ void PeripheralWinrt::Update(const int rssiValue, const BluetoothLEAdvertisement
         {
             ProcessServiceData(ds, 16);  // 16 bytes for 128-bit UUID
         }
+        else if (ds.DataType() == BluetoothLEAdvertisementDataTypes::ShortenedLocalName())
+        {
+            if (!nameIsComplete)
+            {
+                name = advSectionToString(ds); // use shortened local name if no complete name is available
+            }
+        }
+        else if (ds.DataType() == BluetoothLEAdvertisementDataTypes::CompleteLocalName())
+        {
+            name = advSectionToString(ds);
+            nameIsComplete = true; // set the flag to ignore shortened local names
+        }
     }
 
     // Handle service UUIDs

package/lib/win/src/peripheral_winrt.h

@@ -73,6 +73,7 @@ public:
     std::optional<GattSession> gattSession;
     winrt::event_token maxPduSizeChangedToken;
     std::unordered_map<winrt::guid, CachedService> cachedServices;
+    bool nameIsComplete { false }; // `name` is the Complete Local Name
 
 private:
     void GetServiceFromDevice(winrt::guid serviceUuid,

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.14",
+  "version": "2.3.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/stoprocent/noble.git"