munim-bluetooth 0.3.20 → 0.3.22

package/nitrogen/generated/android/MunimBluetoothOnLoad.cpp

@@ -21,24 +21,34 @@
 namespace margelo::nitro::munimbluetooth {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::munimbluetooth::registerAllNatives();
+  });
+}
+
+struct JHybridMunimBluetoothSpecImpl: public jni::JavaClass<JHybridMunimBluetoothSpecImpl, JHybridMunimBluetoothSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/munimbluetooth/HybridMunimBluetooth;";
+  static std::shared_ptr<JHybridMunimBluetoothSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridMunimBluetoothSpecImpl::javaobject()>();
+    jni::local_ref<JHybridMunimBluetoothSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridMunimBluetoothSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::munimbluetooth;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::munimbluetooth::JHybridMunimBluetoothSpec::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "MunimBluetooth",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridMunimBluetoothSpec::javaobject> object("com/munimbluetooth/HybridMunimBluetooth");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::munimbluetooth::JHybridMunimBluetoothSpec::CxxPart::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "MunimBluetooth",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridMunimBluetoothSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::munimbluetooth

package/nitrogen/generated/android/MunimBluetoothOnLoad.hpp

@@ -6,20 +6,29 @@
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::munimbluetooth {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of MunimBluetooth, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of MunimBluetooth, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::munimbluetooth::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all MunimBluetooth HybridObjects
+   *     margelo::nitro::munimbluetooth::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::munimbluetooth

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

@@ -25,7 +25,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JAdvertisingDataTypes final: public jni::JavaClass<JAdvertisingDataTypes> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/AdvertisingDataTypes;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/AdvertisingDataTypes;";
 
   public:
     /**

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

@@ -27,7 +27,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JAdvertisingOptions final: public jni::JavaClass<JAdvertisingOptions> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/AdvertisingOptions;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/AdvertisingOptions;";
 
   public:
     /**

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

@@ -21,7 +21,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JCharacteristicValue final: public jni::JavaClass<JCharacteristicValue> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/CharacteristicValue;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/CharacteristicValue;";
 
   public:
     /**

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

@@ -23,7 +23,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JGATTCharacteristic final: public jni::JavaClass<JGATTCharacteristic> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/GATTCharacteristic;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/GATTCharacteristic;";
 
   public:
     /**

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

@@ -25,7 +25,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JGATTService final: public jni::JavaClass<JGATTService> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/GATTService;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/GATTService;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JHybridMunimBluetoothSpec.cpp

@@ -53,37 +53,31 @@ namespace margelo::nitro::munimbluetooth { enum class WriteType; }
 
 namespace margelo::nitro::munimbluetooth {
 
-  jni::local_ref<JHybridMunimBluetoothSpec::jhybriddata> JHybridMunimBluetoothSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridMunimBluetoothSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridMunimBluetoothSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridMunimBluetoothSpec> JHybridMunimBluetoothSpec::JavaPart::getJHybridMunimBluetoothSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridMunimBluetoothSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridMunimBluetoothSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridMunimBluetoothSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridMunimBluetoothSpec::CxxPart::jhybriddata> JHybridMunimBluetoothSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridMunimBluetoothSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridMunimBluetoothSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridMunimBluetoothSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridMunimBluetoothSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridMunimBluetoothSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridMunimBluetoothSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridMunimBluetoothSpec>(castJavaPart);
   }
 
-  std::string JHybridMunimBluetoothSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridMunimBluetoothSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridMunimBluetoothSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -91,15 +85,15 @@ namespace margelo::nitro::munimbluetooth {
 
   // Methods
   void JHybridMunimBluetoothSpec::startAdvertising(const AdvertisingOptions& options) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JAdvertisingOptions> /* options */)>("startAdvertising");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JAdvertisingOptions> /* options */)>("startAdvertising");
     method(_javaPart, JAdvertisingOptions::fromCpp(options));
   }
   void JHybridMunimBluetoothSpec::updateAdvertisingData(const AdvertisingDataTypes& advertisingData) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JAdvertisingDataTypes> /* advertisingData */)>("updateAdvertisingData");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JAdvertisingDataTypes> /* advertisingData */)>("updateAdvertisingData");
     method(_javaPart, JAdvertisingDataTypes::fromCpp(advertisingData));
   }
   std::shared_ptr<Promise<AdvertisingDataTypes>> JHybridMunimBluetoothSpec::getAdvertisingData() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getAdvertisingData");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getAdvertisingData");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<AdvertisingDataTypes>::create();
@@ -115,11 +109,11 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   void JHybridMunimBluetoothSpec::stopAdvertising() {
-    static const auto method = javaClassStatic()->getMethod<void()>("stopAdvertising");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("stopAdvertising");
     method(_javaPart);
   }
   void JHybridMunimBluetoothSpec::setServices(const std::vector<GATTService>& services) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<JGATTService>> /* services */)>("setServices");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<JGATTService>> /* services */)>("setServices");
     method(_javaPart, [&]() {
       size_t __size = services.size();
       jni::local_ref<jni::JArrayClass<JGATTService>> __array = jni::JArrayClass<JGATTService>::newArray(__size);
@@ -132,7 +126,7 @@ namespace margelo::nitro::munimbluetooth {
     }());
   }
   std::shared_ptr<Promise<bool>> JHybridMunimBluetoothSpec::isBluetoothEnabled() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("isBluetoothEnabled");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("isBluetoothEnabled");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -148,7 +142,7 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridMunimBluetoothSpec::requestBluetoothPermission() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestBluetoothPermission");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestBluetoothPermission");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -164,15 +158,15 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   void JHybridMunimBluetoothSpec::startScan(const std::optional<ScanOptions>& options) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JScanOptions> /* options */)>("startScan");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JScanOptions> /* options */)>("startScan");
     method(_javaPart, options.has_value() ? JScanOptions::fromCpp(options.value()) : nullptr);
   }
   void JHybridMunimBluetoothSpec::stopScan() {
-    static const auto method = javaClassStatic()->getMethod<void()>("stopScan");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("stopScan");
     method(_javaPart);
   }
   std::shared_ptr<Promise<void>> JHybridMunimBluetoothSpec::connect(const std::string& deviceId) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */)>("connect");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */)>("connect");
     auto __result = method(_javaPart, jni::make_jstring(deviceId));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -187,11 +181,11 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   void JHybridMunimBluetoothSpec::disconnect(const std::string& deviceId) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* deviceId */)>("disconnect");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* deviceId */)>("disconnect");
     method(_javaPart, jni::make_jstring(deviceId));
   }
   std::shared_ptr<Promise<std::vector<GATTService>>> JHybridMunimBluetoothSpec::discoverServices(const std::string& deviceId) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */)>("discoverServices");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */)>("discoverServices");
     auto __result = method(_javaPart, jni::make_jstring(deviceId));
     return [&]() {
       auto __promise = Promise<std::vector<GATTService>>::create();
@@ -216,7 +210,7 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   std::shared_ptr<Promise<CharacteristicValue>> JHybridMunimBluetoothSpec::readCharacteristic(const std::string& deviceId, const std::string& serviceUUID, const std::string& characteristicUUID) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */)>("readCharacteristic");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */)>("readCharacteristic");
     auto __result = method(_javaPart, jni::make_jstring(deviceId), jni::make_jstring(serviceUUID), jni::make_jstring(characteristicUUID));
     return [&]() {
       auto __promise = Promise<CharacteristicValue>::create();
@@ -232,7 +226,7 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridMunimBluetoothSpec::writeCharacteristic(const std::string& deviceId, const std::string& serviceUUID, const std::string& characteristicUUID, const std::string& value, std::optional<WriteType> writeType) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */, jni::alias_ref<jni::JString> /* value */, jni::alias_ref<JWriteType> /* writeType */)>("writeCharacteristic");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */, jni::alias_ref<jni::JString> /* value */, jni::alias_ref<JWriteType> /* writeType */)>("writeCharacteristic");
     auto __result = method(_javaPart, jni::make_jstring(deviceId), jni::make_jstring(serviceUUID), jni::make_jstring(characteristicUUID), jni::make_jstring(value), writeType.has_value() ? JWriteType::fromCpp(writeType.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -247,15 +241,15 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   void JHybridMunimBluetoothSpec::subscribeToCharacteristic(const std::string& deviceId, const std::string& serviceUUID, const std::string& characteristicUUID) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */)>("subscribeToCharacteristic");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */)>("subscribeToCharacteristic");
     method(_javaPart, jni::make_jstring(deviceId), jni::make_jstring(serviceUUID), jni::make_jstring(characteristicUUID));
   }
   void JHybridMunimBluetoothSpec::unsubscribeFromCharacteristic(const std::string& deviceId, const std::string& serviceUUID, const std::string& characteristicUUID) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */)>("unsubscribeFromCharacteristic");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* deviceId */, jni::alias_ref<jni::JString> /* serviceUUID */, jni::alias_ref<jni::JString> /* characteristicUUID */)>("unsubscribeFromCharacteristic");
     method(_javaPart, jni::make_jstring(deviceId), jni::make_jstring(serviceUUID), jni::make_jstring(characteristicUUID));
   }
   std::shared_ptr<Promise<std::vector<std::string>>> JHybridMunimBluetoothSpec::getConnectedDevices() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getConnectedDevices");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getConnectedDevices");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<std::vector<std::string>>::create();
@@ -280,7 +274,7 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   std::shared_ptr<Promise<double>> JHybridMunimBluetoothSpec::readRSSI(const std::string& deviceId) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */)>("readRSSI");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* deviceId */)>("readRSSI");
     auto __result = method(_javaPart, jni::make_jstring(deviceId));
     return [&]() {
       auto __promise = Promise<double>::create();
@@ -296,11 +290,11 @@ namespace margelo::nitro::munimbluetooth {
     }();
   }
   void JHybridMunimBluetoothSpec::addListener(const std::string& eventName) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* eventName */)>("addListener");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* eventName */)>("addListener");
     method(_javaPart, jni::make_jstring(eventName));
   }
   void JHybridMunimBluetoothSpec::removeListeners(double count) {
-    static const auto method = javaClassStatic()->getMethod<void(double /* count */)>("removeListeners");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* count */)>("removeListeners");
     method(_javaPart, count);
   }
 

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::munimbluetooth {
 
   using namespace facebook;
 
-  class JHybridMunimBluetoothSpec: public jni::HybridClass<JHybridMunimBluetoothSpec, JHybridObject>,
-                                   public virtual HybridMunimBluetoothSpec {
+  class JHybridMunimBluetoothSpec: public virtual HybridMunimBluetoothSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/HybridMunimBluetoothSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridMunimBluetoothSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridMunimBluetoothSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/HybridMunimBluetoothSpec;";
+      std::shared_ptr<JHybridMunimBluetoothSpec> getJHybridMunimBluetoothSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/HybridMunimBluetoothSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridMunimBluetoothSpec(const jni::local_ref<JHybridMunimBluetoothSpec::JavaPart>& javaPart):
+      HybridObject(HybridMunimBluetoothSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridMunimBluetoothSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridMunimBluetoothSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridMunimBluetoothSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -77,9 +76,7 @@ namespace margelo::nitro::munimbluetooth {
     void removeListeners(double count) override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridMunimBluetoothSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridMunimBluetoothSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::munimbluetooth

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

@@ -19,7 +19,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JScanMode final: public jni::JavaClass<JScanMode> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/ScanMode;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/ScanMode;";
 
   public:
     /**

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

@@ -25,7 +25,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JScanOptions final: public jni::JavaClass<JScanOptions> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/ScanOptions;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/ScanOptions;";
 
   public:
     /**

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

@@ -21,7 +21,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JServiceDataEntry final: public jni::JavaClass<JServiceDataEntry> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/ServiceDataEntry;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/ServiceDataEntry;";
 
   public:
     /**

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

@@ -19,7 +19,7 @@ namespace margelo::nitro::munimbluetooth {
    */
   struct JWriteType final: public jni::JavaClass<JWriteType> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/WriteType;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/munimbluetooth/WriteType;";
 
   public:
     /**

package/nitrogen/generated/android/kotlin/com/margelo/nitro/munimbluetooth/HybridMunimBluetoothSpec.kt

@@ -26,7 +26,7 @@ import com.margelo.nitro.core.HybridObject
 )
 abstract class HybridMunimBluetoothSpec: HybridObject() {
   // Properties
-
+  
 
   // Methods
   @DoNotStrip

package/nitrogen/generated/ios/MunimBluetooth-Swift-Cxx-Bridge.hpp

@@ -80,7 +80,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<double>
@@ -95,7 +95,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline double get_std__optional_double_(const std::optional<double>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<std::vector<std::string>>
@@ -110,7 +110,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline std::vector<std::string> get_std__optional_std__vector_std__string__(const std::optional<std::vector<std::string>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::vector<ServiceDataEntry>
@@ -136,7 +136,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline std::vector<ServiceDataEntry> get_std__optional_std__vector_ServiceDataEntry__(const std::optional<std::vector<ServiceDataEntry>>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<AdvertisingDataTypes>
@@ -151,7 +151,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline AdvertisingDataTypes get_std__optional_AdvertisingDataTypes_(const std::optional<AdvertisingDataTypes>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<Promise<AdvertisingDataTypes>>
@@ -278,7 +278,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline bool get_std__optional_bool_(const std::optional<bool>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<ScanMode>
@@ -293,7 +293,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline ScanMode get_std__optional_ScanMode_(const std::optional<ScanMode>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<ScanOptions>
@@ -308,7 +308,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline ScanOptions get_std__optional_ScanOptions_(const std::optional<ScanOptions>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<Promise<void>>
@@ -425,7 +425,7 @@ namespace margelo::nitro::munimbluetooth::bridge::swift {
     return optional.has_value();
   }
   inline WriteType get_std__optional_WriteType_(const std::optional<WriteType>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<Promise<std::vector<std::string>>>

package/nitrogen/generated/ios/MunimBluetoothAutolinking.mm

@@ -24,7 +24,7 @@
   HybridObjectRegistry::registerHybridObjectConstructor(
     "MunimBluetooth",
     []() -> std::shared_ptr<HybridObject> {
-      std::shared_ptr<HybridMunimBluetoothSpec> hybridObject = MunimBluetooth::MunimBluetoothAutolinking::AutolinkedMunimBluetooth::create();
+      std::shared_ptr<HybridMunimBluetoothSpec> hybridObject = MunimBluetooth::MunimBluetoothAutolinking::createMunimBluetooth();
       return hybridObject;
     }
   );

package/nitrogen/generated/ios/MunimBluetoothAutolinking.swift

@@ -12,33 +12,15 @@ import NitroModules
 public final class MunimBluetoothAutolinking {
   public typealias bridge = margelo.nitro.munimbluetooth.bridge.swift
 
-  private protocol AutolinkedClass {
-    associatedtype T
-    /**
-     * Creates an instance of the Swift class that implements the HybridObject's spec,
-     * and wraps it in a Swift class that can directly interop with C++.
-     *
-     * This is generated by Nitrogen and will initialize the class specified
-     * in the `"autolinking"` property of `nitro.json`.
-     */
-    static func create() -> T
-    /**
-     * Returns whether this concrete implementation is also
-     * conforming to the `RecyclableView` protocol, or not.
-     */
-    static var isRecyclableHybridView: Bool { get }
+  public static func createMunimBluetooth() -> bridge.std__shared_ptr_HybridMunimBluetoothSpec_ {
+    let hybridObject = HybridMunimBluetooth()
+    return { () -> bridge.std__shared_ptr_HybridMunimBluetoothSpec_ in
+      let __cxxWrapped = hybridObject.getCxxWrapper()
+      return __cxxWrapped.getCxxPart()
+    }()
   }
-
-  public final class AutolinkedMunimBluetooth: AutolinkedClass {
-    public static func create() -> bridge.std__shared_ptr_HybridMunimBluetoothSpec_ {
-      let hybridObject = HybridMunimBluetooth()
-      return { () -> bridge.std__shared_ptr_HybridMunimBluetoothSpec_ in
-        let __cxxWrapped = hybridObject.getCxxWrapper()
-        return __cxxWrapped.getCxxPart()
-      }()
-    }
-    public static var isRecyclableHybridView: Bool {
-      return HybridMunimBluetooth.self is any RecyclableView.Type
-    }
+  
+  public static func isMunimBluetoothRecyclable() -> Bool {
+    return HybridMunimBluetooth.self is any RecyclableView.Type
   }
 }

package/nitrogen/generated/ios/swift/AdvertisingDataTypes.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**
@@ -205,7 +204,14 @@ public extension AdvertisingDataTypes {
 
   @inline(__always)
   var flags: Double? {
-    return self.__flags.value
+    return { () -> Double? in
+      if bridge.has_value_std__optional_double_(self.__flags) {
+        let __unwrapped = bridge.get_std__optional_double_(self.__flags)
+        return __unwrapped
+      } else {
+        return nil
+      }
+    }()
   }
   
   @inline(__always)
@@ -306,7 +312,14 @@ public extension AdvertisingDataTypes {
   
   @inline(__always)
   var txPowerLevel: Double? {
-    return self.__txPowerLevel.value
+    return { () -> Double? in
+      if bridge.has_value_std__optional_double_(self.__txPowerLevel) {
+        let __unwrapped = bridge.get_std__optional_double_(self.__txPowerLevel)
+        return __unwrapped
+      } else {
+        return nil
+      }
+    }()
   }
   
   @inline(__always)
@@ -371,7 +384,14 @@ public extension AdvertisingDataTypes {
   
   @inline(__always)
   var appearance: Double? {
-    return self.__appearance.value
+    return { () -> Double? in
+      if bridge.has_value_std__optional_double_(self.__appearance) {
+        let __unwrapped = bridge.get_std__optional_double_(self.__appearance)
+        return __unwrapped
+      } else {
+        return nil
+      }
+    }()
   }
   
   @inline(__always)

package/nitrogen/generated/ios/swift/AdvertisingOptions.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/CharacteristicValue.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_AdvertisingDataTypes.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_CharacteristicValue.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_bool.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_double.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__exception_ptr.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__vector_GATTService_.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/Func_void_std__vector_std__string_.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/GATTCharacteristic.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/GATTService.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/HybridMunimBluetoothSpec.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridMunimBluetoothSpec``
@@ -44,11 +43,9 @@ public extension HybridMunimBluetoothSpec_protocol {
 }
 
 /// See ``HybridMunimBluetoothSpec``
-open class HybridMunimBluetoothSpec_base: NSObject {
+open class HybridMunimBluetoothSpec_base {
   private weak var cxxWrapper: HybridMunimBluetoothSpec_cxx? = nil
-  public override init() {
-    super.init()
-  }
+  public init() { }
   public func getCxxWrapper() -> HybridMunimBluetoothSpec_cxx {
   #if DEBUG
     guard self is any HybridMunimBluetoothSpec else {

package/nitrogen/generated/ios/swift/HybridMunimBluetoothSpec_cxx.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/ScanOptions.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/nitrogen/generated/ios/swift/ServiceDataEntry.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "munim-bluetooth",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "description": "A comprehensive React Native library for all your Bluetooth Low Energy (BLE) needs, supporting both peripheral and central roles with Expo support",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
@@ -85,12 +85,12 @@
     "@semantic-release/git": "^10.0.1",
     "@types/jest": "^29.5.14",
     "@types/react": "19.2.8",
-    "nitrogen": "0.35.2",
+    "conventional-changelog-conventionalcommits": "^9.1.0",
+    "nitrogen": "^0.35.2",
     "react": "19.2.3",
     "react-native": "0.83.1",
     "react-native-builder-bob": "^0.40.17",
-    "react-native-nitro-modules": "0.35.2",
-    "conventional-changelog-conventionalcommits": "^9.1.0",
+    "react-native-nitro-modules": "^0.35.2",
     "semantic-release": "^25.0.2",
     "typescript": "^5.8.3"
   },