Merge pull request #1143 from dotintent/fix/missing_advertisingData

fix: missing advertising data fields
dotintent · Nov 24, 2023 · 2ce6e4a · 2ce6e4a
2 parents 26b6188 + 70e4b13
commit 2ce6e4a
Show file tree

Hide file tree

Showing 3 changed files with 2,513 additions and 2,429 deletions.
diff --git a/ios/MultiplatformBleAdapter/BleExtensions.swift b/ios/MultiplatformBleAdapter/BleExtensions.swift
@@ -49,13 +49,18 @@ extension ScannedPeripheral {
 
 
         let advertisementDataDict: [AnyHashable: Any] = [
+            "id": peripheral.identifier.uuidString,
+            "name": peripheral.name as Any,
+            "rssi": rssi,
+            "mtu": mtu,
+
             "localName": advertisementData.localName as Any,
             "manufacturerData": manufacturerData as Any,
             "serviceData": serviceData as Any,
             "serviceUUIDs": serviceUUIDs as Any,
             "txPowerLevel": advertisementData.txPowerLevel as Any,
-            "isConnectable": advertisementData.isConnectable as Any,
             "solicitedServiceUUIDs": solicitedServiceUUIDs as Any,
+            "isConnectable": advertisementData.isConnectable as Any,
             "overflowServiceUUIDs": overflowServiceUUIDs as Any
         ]
 
@@ -67,6 +72,15 @@ extension ScannedPeripheral {
             "name": peripheral.name as Any,
             "rssi": rssi,
             "mtu": mtu,
+
+            "localName": advertisementData.localName as Any,
+            "manufacturerData": manufacturerData as Any,
+            "serviceData": serviceData as Any,
+            "serviceUUIDs": serviceUUIDs as Any,
+            "txPowerLevel": advertisementData.txPowerLevel as Any,
+            "solicitedServiceUUIDs": solicitedServiceUUIDs as Any,
+            "isConnectable": advertisementData.isConnectable as Any,
+            "overflowServiceUUIDs": overflowServiceUUIDs as Any,
             "rawScanRecord": advertisementDataBase64 as Any
         ]
     }

diff --git a/package.json b/package.json
@@ -125,7 +125,6 @@
   "engines": {
     "node": ">= 16.0.0"
   },
-  "packageManager": "^[email protected]",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [