react-native-ble-nitro 1.9.2 → 1.9.4

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

@@ -2,7 +2,7 @@
 /// ScanFilter.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,6 +22,11 @@
 #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
 
 // Forward declaration of `AndroidScanMode` to properly resolve imports.
 namespace margelo::nitro::co::zyke::ble { enum class AndroidScanMode; }
@@ -35,7 +40,7 @@ namespace margelo::nitro::co::zyke::ble {
   /**
    * A struct which can be represented as a JavaScript object (ScanFilter).
    */
-  struct ScanFilter {
+  struct ScanFilter final {
   public:
     std::vector<std::string> serviceUUIDs     SWIFT_PRIVATE;
     double rssiThreshold     SWIFT_PRIVATE;
@@ -45,6 +50,9 @@ namespace margelo::nitro::co::zyke::ble {
   public:
     ScanFilter() = default;
     explicit ScanFilter(std::vector<std::string> serviceUUIDs, double rssiThreshold, bool allowDuplicates, AndroidScanMode androidScanMode): serviceUUIDs(serviceUUIDs), rssiThreshold(rssiThreshold), allowDuplicates(allowDuplicates), androidScanMode(androidScanMode) {}
+
+  public:
+    friend bool operator==(const ScanFilter& lhs, const ScanFilter& rhs) = default;
   };
 
 } // namespace margelo::nitro::co::zyke::ble
@@ -57,18 +65,18 @@ namespace margelo::nitro {
     static inline margelo::nitro::co::zyke::ble::ScanFilter fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::co::zyke::ble::ScanFilter(
-        JSIConverter<std::vector<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "serviceUUIDs")),
-        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, "rssiThreshold")),
-        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "allowDuplicates")),
-        JSIConverter<margelo::nitro::co::zyke::ble::AndroidScanMode>::fromJSI(runtime, obj.getProperty(runtime, "androidScanMode"))
+        JSIConverter<std::vector<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "serviceUUIDs"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "rssiThreshold"))),
+        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "allowDuplicates"))),
+        JSIConverter<margelo::nitro::co::zyke::ble::AndroidScanMode>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "androidScanMode")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::co::zyke::ble::ScanFilter& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "serviceUUIDs", JSIConverter<std::vector<std::string>>::toJSI(runtime, arg.serviceUUIDs));
-      obj.setProperty(runtime, "rssiThreshold", JSIConverter<double>::toJSI(runtime, arg.rssiThreshold));
-      obj.setProperty(runtime, "allowDuplicates", JSIConverter<bool>::toJSI(runtime, arg.allowDuplicates));
-      obj.setProperty(runtime, "androidScanMode", JSIConverter<margelo::nitro::co::zyke::ble::AndroidScanMode>::toJSI(runtime, arg.androidScanMode));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "serviceUUIDs"), JSIConverter<std::vector<std::string>>::toJSI(runtime, arg.serviceUUIDs));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "rssiThreshold"), JSIConverter<double>::toJSI(runtime, arg.rssiThreshold));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "allowDuplicates"), JSIConverter<bool>::toJSI(runtime, arg.allowDuplicates));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "androidScanMode"), JSIConverter<margelo::nitro::co::zyke::ble::AndroidScanMode>::toJSI(runtime, arg.androidScanMode));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -79,10 +87,10 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::vector<std::string>>::canConvert(runtime, obj.getProperty(runtime, "serviceUUIDs"))) return false;
-      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, "rssiThreshold"))) return false;
-      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "allowDuplicates"))) return false;
-      if (!JSIConverter<margelo::nitro::co::zyke::ble::AndroidScanMode>::canConvert(runtime, obj.getProperty(runtime, "androidScanMode"))) return false;
+      if (!JSIConverter<std::vector<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "serviceUUIDs")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "rssiThreshold")))) return false;
+      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "allowDuplicates")))) return false;
+      if (!JSIConverter<margelo::nitro::co::zyke::ble::AndroidScanMode>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "androidScanMode")))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ble-nitro",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "High-performance React Native BLE library built on Nitro Modules",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -84,20 +84,20 @@
     "react-native-nitro-modules": "*"
   },
   "devDependencies": {
-    "@expo/config-plugins": "^54.0.2",
+    "@expo/config-plugins": "^54.0.4",
     "@types/jest": "^29.5.0",
-    "@types/node": "^20.19.21",
+    "@types/node": "^20.19.30",
     "@types/react": "^19.2.2",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "eslint": "^8.0.0",
-    "expo-module-scripts": "^5.0.7",
+    "eslint": "^8.57.1",
+    "expo-module-scripts": "^5.0.8",
     "jest": "^29.0.0",
-    "nitrogen": "^0.30.0",
-    "react-native": "^0.81.4",
-    "react-native-nitro-modules": "^0.30.0",
-    "rimraf": "^6.0.1",
-    "ts-jest": "^29.4.5",
+    "nitrogen": "^0.33.9",
+    "react-native": "^0.83.2",
+    "react-native-nitro-modules": "^0.33.9",
+    "rimraf": "^6.1.3",
+    "ts-jest": "^29.4.6",
     "typescript": "^5.9.3"
   },
   "files": [

package/src/manager.ts

@@ -310,7 +310,7 @@ export class BleNitroManager {
    * @param scanTimeout Optional timeout for the scan in milliseconds (default: 5000ms)
    * @returns Promise resolving deviceId when connected
    */
-  public findAndConnect(deviceId: string, options?: { scanTimeout?: number, autoConnectAndroid?: boolean, onDisconnect?: DisconnectEventCallback }): Promise<string> {
+  public findAndConnect(deviceId: string, options?: { scanTimeout?: number, autoConnectAndroid?: boolean, onDisconnect?: DisconnectEventCallback, onFound?: (device: BLEDevice) => void }): Promise<string> {
     const isConnected = this.isConnected(deviceId);
     if (isConnected) {
       return Promise.resolve(deviceId);
@@ -327,6 +327,7 @@ export class BleNitroManager {
         if (device.id === deviceId) {
           this.stopScan();
           clearTimeout(timeoutScan);
+          options?.onFound?.(device);
           this.connect(deviceId, options?.onDisconnect, options?.autoConnectAndroid).then(async (connectedDeviceId) => {
             resolve(connectedDeviceId);
           }).catch((error) => {

package/nitrogen/generated/android/c++/JFunc_void_std__optional_BLEDevice__std__optional_std__string_.hpp

@@ -1,86 +0,0 @@
-///
-/// JFunc_void_std__optional_BLEDevice__std__optional_std__string_.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#include <fbjni/fbjni.h>
-#include <functional>
-
-#include "BLEDevice.hpp"
-#include <optional>
-#include <string>
-#include <functional>
-#include "JBLEDevice.hpp"
-#include "ManufacturerData.hpp"
-#include "JManufacturerData.hpp"
-#include "ManufacturerDataEntry.hpp"
-#include <vector>
-#include "JManufacturerDataEntry.hpp"
-#include <NitroModules/ArrayBuffer.hpp>
-#include <NitroModules/JArrayBuffer.hpp>
-#include <NitroModules/JUnit.hpp>
-
-namespace margelo::nitro::co::zyke::ble {
-
-  using namespace facebook;
-
-  /**
-   * Represents the Java/Kotlin callback `(device: BLEDevice?, error: String?) -> Unit`.
-   * This can be passed around between C++ and Java/Kotlin.
-   */
-  struct JFunc_void_std__optional_BLEDevice__std__optional_std__string_: public jni::JavaClass<JFunc_void_std__optional_BLEDevice__std__optional_std__string_> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/co/zyke/ble/Func_void_std__optional_BLEDevice__std__optional_std__string_;";
-
-  public:
-    /**
-     * Invokes the function this `JFunc_void_std__optional_BLEDevice__std__optional_std__string_` instance holds through JNI.
-     */
-    void invoke(const std::optional<BLEDevice>& device, const std::optional<std::string>& error) const {
-      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JBLEDevice> /* device */, jni::alias_ref<jni::JString> /* error */)>("invoke");
-      method(self(), device.has_value() ? JBLEDevice::fromCpp(device.value()) : nullptr, error.has_value() ? jni::make_jstring(error.value()) : nullptr);
-    }
-  };
-
-  /**
-   * An implementation of Func_void_std__optional_BLEDevice__std__optional_std__string_ that is backed by a C++ implementation (using `std::function<...>`)
-   */
-  struct JFunc_void_std__optional_BLEDevice__std__optional_std__string__cxx final: public jni::HybridClass<JFunc_void_std__optional_BLEDevice__std__optional_std__string__cxx, JFunc_void_std__optional_BLEDevice__std__optional_std__string_> {
-  public:
-    static jni::local_ref<JFunc_void_std__optional_BLEDevice__std__optional_std__string_::javaobject> fromCpp(const std::function<void(const std::optional<BLEDevice>& /* device */, const std::optional<std::string>& /* error */)>& func) {
-      return JFunc_void_std__optional_BLEDevice__std__optional_std__string__cxx::newObjectCxxArgs(func);
-    }
-
-  public:
-    /**
-     * Invokes the C++ `std::function<...>` this `JFunc_void_std__optional_BLEDevice__std__optional_std__string__cxx` instance holds.
-     */
-    void invoke_cxx(jni::alias_ref<JBLEDevice> device, jni::alias_ref<jni::JString> error) {
-      _func(device != nullptr ? std::make_optional(device->toCpp()) : std::nullopt, error != nullptr ? std::make_optional(error->toStdString()) : std::nullopt);
-    }
-
-  public:
-    [[nodiscard]]
-    inline const std::function<void(const std::optional<BLEDevice>& /* device */, const std::optional<std::string>& /* error */)>& getFunction() const {
-      return _func;
-    }
-
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/co/zyke/ble/Func_void_std__optional_BLEDevice__std__optional_std__string__cxx;";
-    static void registerNatives() {
-      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__optional_BLEDevice__std__optional_std__string__cxx::invoke_cxx)});
-    }
-
-  private:
-    explicit JFunc_void_std__optional_BLEDevice__std__optional_std__string__cxx(const std::function<void(const std::optional<BLEDevice>& /* device */, const std::optional<std::string>& /* error */)>& func): _func(func) { }
-
-  private:
-    friend HybridBase;
-    std::function<void(const std::optional<BLEDevice>& /* device */, const std::optional<std::string>& /* error */)> _func;
-  };
-
-} // namespace margelo::nitro::co::zyke::ble

package/nitrogen/generated/ios/swift/Func_void_std__optional_BLEDevice__std__optional_std__string_.swift

@@ -1,54 +0,0 @@
-///
-/// Func_void_std__optional_BLEDevice__std__optional_std__string_.swift
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-import NitroModules
-
-
-/**
- * Wraps a Swift `(_ device: BLEDevice?, _ error: String?) -> Void` as a class.
- * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.
- */
-public final class Func_void_std__optional_BLEDevice__std__optional_std__string_ {
-  public typealias bridge = margelo.nitro.co.zyke.ble.bridge.swift
-
-  private let closure: (_ device: BLEDevice?, _ error: String?) -> Void
-
-  public init(_ closure: @escaping (_ device: BLEDevice?, _ error: String?) -> Void) {
-    self.closure = closure
-  }
-
-  @inline(__always)
-  public func call(device: bridge.std__optional_BLEDevice_, error: bridge.std__optional_std__string_) -> Void {
-    self.closure(device.value, { () -> String? in
-      if bridge.has_value_std__optional_std__string_(error) {
-        let __unwrapped = bridge.get_std__optional_std__string_(error)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }())
-  }
-
-  /**
-   * Casts this instance to a retained unsafe raw pointer.
-   * This acquires one additional strong reference on the object!
-   */
-  @inline(__always)
-  public func toUnsafe() -> UnsafeMutableRawPointer {
-    return Unmanaged.passRetained(self).toOpaque()
-  }
-
-  /**
-   * Casts an unsafe pointer to a `Func_void_std__optional_BLEDevice__std__optional_std__string_`.
-   * The pointer has to be a retained opaque `Unmanaged<Func_void_std__optional_BLEDevice__std__optional_std__string_>`.
-   * This removes one strong reference from the object!
-   */
-  @inline(__always)
-  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_std__optional_BLEDevice__std__optional_std__string_ {
-    return Unmanaged<Func_void_std__optional_BLEDevice__std__optional_std__string_>.fromOpaque(pointer).takeRetainedValue()
-  }
-}