@stoprocent/noble 2.5.1 → 2.5.2

package/lib/dbus/bindings.js

@@ -109,7 +109,8 @@ function buildAdvertisement (deviceProps) {
     const entries = Object.entries(deviceProps.ManufacturerData);
     if (entries.length > 0) {
       const buffers = [];
-      for (const [companyId, payload] of entries) {
+      for (const [companyId, rawPayload] of entries) {
+        const payload = unwrapVariant(rawPayload);
         const id = Number(companyId) & 0xffff;
         const header = Buffer.from([id & 0xff, (id >> 8) & 0xff]);
         const data = Buffer.isBuffer(payload) ? payload : Buffer.from(payload);
@@ -120,7 +121,8 @@ function buildAdvertisement (deviceProps) {
   }
 
   if (deviceProps.ServiceData && typeof deviceProps.ServiceData === 'object') {
-    for (const [uuid, payload] of Object.entries(deviceProps.ServiceData)) {
+    for (const [uuid, rawPayload] of Object.entries(deviceProps.ServiceData)) {
+      const payload = unwrapVariant(rawPayload);
       advertisement.serviceData.push({
         uuid: normalizeUuid(uuid),
         data: Buffer.isBuffer(payload) ? payload : Buffer.from(payload)

package/package.json

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

package/test/lib/dbus/bindings.test.js

@@ -270,6 +270,44 @@ describe('dbus/bindings', () => {
     expect(advertisement.serviceUuids).toEqual(['180d']);
   });
 
+  test('InterfacesAdded unwraps Variant-wrapped ManufacturerData and ServiceData payloads', async () => {
+    const bindings = new DbusBindings();
+    const discoveries = [];
+    bindings.on('discover', (...args) => discoveries.push(args));
+
+    bindings.start();
+    await flush();
+
+    // BlueZ exposes ManufacturerData as a{qv} and ServiceData as a{sv}; dbus-next
+    // surfaces each inner value as a Variant, not the raw bytes.
+    const mfgPayload = Buffer.from([0xde, 0xad, 0xbe, 0xef]);
+    const svcPayload = Buffer.from([0x01, 0x02, 0x03]);
+
+    const om = state.rootProxy.getInterface('org.freedesktop.DBus.ObjectManager');
+    om.emit('InterfacesAdded', '/org/bluez/hci0/dev_AA_BB_CC_DD_EE_FF', {
+      'org.bluez.Device1': wrapDict({
+        Address: 'AA:BB:CC:DD:EE:FF',
+        AddressType: 'public',
+        ManufacturerData: { 0x004c: v('ay', mfgPayload) },
+        ServiceData: { '0000180d-0000-1000-8000-00805f9b34fb': v('ay', svcPayload) }
+      })
+    });
+    await flush();
+
+    expect(discoveries.length).toBe(1);
+    const advertisement = discoveries[0][4];
+
+    // Manufacturer: 2-byte little-endian company id (0x004c => Apple) + payload
+    expect(Buffer.isBuffer(advertisement.manufacturerData)).toBe(true);
+    expect(advertisement.manufacturerData.equals(
+      Buffer.concat([Buffer.from([0x4c, 0x00]), mfgPayload])
+    )).toBe(true);
+
+    expect(advertisement.serviceData).toEqual([
+      { uuid: '180d', data: svcPayload }
+    ]);
+  });
+
   test('discoverServices/Characteristics/Descriptors walk the cached object tree', async () => {
     const tree = adapterTree({
       '/org/bluez/hci0/dev_AA_BB_CC_DD_EE_FF': {