react-native-ble-nitro 1.12.0 → 1.14.0

package/nitrogen/generated/shared/c++/ServiceDataEntry.hpp

@@ -0,0 +1,88 @@
+///
+/// ServiceDataEntry.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+#include <string>
+#include <NitroModules/ArrayBuffer.hpp>
+
+namespace margelo::nitro::co::zyke::ble {
+
+  /**
+   * A struct which can be represented as a JavaScript object (ServiceDataEntry).
+   */
+  struct ServiceDataEntry final {
+  public:
+    std::string uuid     SWIFT_PRIVATE;
+    std::shared_ptr<ArrayBuffer> data     SWIFT_PRIVATE;
+
+  public:
+    ServiceDataEntry() = default;
+    explicit ServiceDataEntry(std::string uuid, std::shared_ptr<ArrayBuffer> data): uuid(uuid), data(data) {}
+
+  public:
+    friend bool operator==(const ServiceDataEntry& lhs, const ServiceDataEntry& rhs) = default;
+  };
+
+} // namespace margelo::nitro::co::zyke::ble
+
+namespace margelo::nitro {
+
+  // C++ ServiceDataEntry <> JS ServiceDataEntry (object)
+  template <>
+  struct JSIConverter<margelo::nitro::co::zyke::ble::ServiceDataEntry> final {
+    static inline margelo::nitro::co::zyke::ble::ServiceDataEntry fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::co::zyke::ble::ServiceDataEntry(
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "uuid"))),
+        JSIConverter<std::shared_ptr<ArrayBuffer>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "data")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::co::zyke::ble::ServiceDataEntry& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "uuid"), JSIConverter<std::string>::toJSI(runtime, arg.uuid));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "data"), JSIConverter<std::shared_ptr<ArrayBuffer>>::toJSI(runtime, arg.data));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "uuid")))) return false;
+      if (!JSIConverter<std::shared_ptr<ArrayBuffer>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "data")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ble-nitro",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "description": "High-performance React Native BLE library built on Nitro Modules",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/__tests__/index.test.ts

@@ -85,6 +85,43 @@ describe('BleNitro', () => {
     );
   });
 
+  test('startScan exposes converted service data to the callback', async () => {
+    // Reset any scanning state left over from previous tests
+    mockNative.stopScan.mockImplementation(() => true);
+    BleManager.stopScan();
+
+    const nativeDevice = {
+      id: 'device-1',
+      name: 'Treadmill',
+      rssi: -50,
+      manufacturerData: { companyIdentifiers: [] },
+      serviceData: {
+        services: [
+          {
+            uuid: '1826',
+            data: new Uint8Array([0x01, 0x02, 0x03]).buffer,
+          },
+        ],
+      },
+      serviceUUIDs: ['1826'],
+      isConnectable: true,
+      isConnected: false,
+    };
+
+    mockNative.startScan.mockImplementation((filter, callback) => { // eslint-disable-line @typescript-eslint/no-unused-vars
+      callback(nativeDevice);
+    });
+
+    const scanCallback = jest.fn();
+    BleManager.startScan({}, scanCallback);
+
+    expect(scanCallback).toHaveBeenCalledTimes(1);
+    const device = scanCallback.mock.calls[0][0];
+    expect(device.serviceData.services).toHaveLength(1);
+    expect(device.serviceData.services[0].uuid).toBe('00001826-0000-1000-8000-00805f9b34fb');
+    expect(device.serviceData.services[0].data).toEqual([0x01, 0x02, 0x03]);
+  });
+
   test('stopScan calls native and resolves', async () => {
     // First start a scan to set _isScanning to true
     mockNative.startScan.mockImplementation((filter, callback) => { // eslint-disable-line @typescript-eslint/no-unused-vars

package/src/index.ts

@@ -5,6 +5,8 @@ export {
   type ScanCallback,
   type ManufacturerDataEntry,
   type ManufacturerData,
+  type ServiceDataEntry,
+  type ServiceData,
   type ConnectionCallback,
   type DisconnectEventCallback,
   type OperationCallback,

package/src/manager.ts

@@ -44,11 +44,21 @@ export interface ManufacturerData {
   companyIdentifiers: ManufacturerDataEntry[];
 }
 
+export interface ServiceDataEntry {
+  uuid: string;
+  data: ByteArray;
+}
+
+export interface ServiceData {
+  services: ServiceDataEntry[];
+}
+
 export interface BLEDevice {
   id: string;
   name: string;
   rssi: number;
   manufacturerData: ManufacturerData;
+  serviceData: ServiceData;
   serviceUUIDs: string[];
   isConnectable: boolean;
   isConnected: boolean;
@@ -132,6 +142,12 @@ export function convertNativeBleDeviceToBleDevice(nativeBleDevice: NativeBLEDevi
         id: entry.id,
         data: arrayBufferToByteArray(entry.data)
       }))
+    },
+    serviceData: {
+      services: nativeBleDevice.serviceData.services.map(entry => ({
+        uuid: BleNitroManager.normalizeGattUUID(entry.uuid),
+        data: arrayBufferToByteArray(entry.data)
+      }))
     }
   }
 }

package/src/specs/NativeBleNitro.nitro.ts

@@ -22,11 +22,21 @@ export interface ManufacturerData {
   companyIdentifiers: ManufacturerDataEntry[];
 }
 
+export interface ServiceDataEntry {
+  uuid: string;
+  data: BLEValue;
+}
+
+export interface ServiceData {
+  services: ServiceDataEntry[];
+}
+
 export interface BLEDevice {
   id: string;
   name: string;
   rssi: number;
   manufacturerData: ManufacturerData;
+  serviceData: ServiceData;
   serviceUUIDs: string[];
   isConnectable: boolean;
   isConnected: boolean;