react-native-nitro-cookies 1.0.4 → 1.1.0

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +1,9 @@
 #include <jni.h>
+#include <fbjni/fbjni.h>
 #include "nitrocookiesOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::nitrocookies::initialize(vm);
+  return facebook::jni::initialize(vm, [=] {
+    margelo::nitro::nitrocookies::registerAllNatives();
+  });
 }

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

@@ -21,37 +21,31 @@ namespace margelo::nitro::nitrocookies { struct Cookie; }
 
 namespace margelo::nitro::nitrocookies {
 
-  jni::local_ref<JHybridNitroCookiesSpec::jhybriddata> JHybridNitroCookiesSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridNitroCookiesSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridNitroCookiesSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridNitroCookiesSpec> JHybridNitroCookiesSpec::JavaPart::getJHybridNitroCookiesSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridNitroCookiesSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridNitroCookiesSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridNitroCookiesSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridNitroCookiesSpec::CxxPart::jhybriddata> JHybridNitroCookiesSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridNitroCookiesSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridNitroCookiesSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridNitroCookiesSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridNitroCookiesSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridNitroCookiesSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridNitroCookiesSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridNitroCookiesSpec>(castJavaPart);
   }
 
-  std::string JHybridNitroCookiesSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridNitroCookiesSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridNitroCookiesSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -59,7 +53,7 @@ namespace margelo::nitro::nitrocookies {
 
   // Methods
   std::vector<Cookie> JHybridNitroCookiesSpec::getSync(const std::string& url) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JCookie>>(jni::alias_ref<jni::JString> /* url */)>("getSync");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JCookie>>(jni::alias_ref<jni::JString> /* url */)>("getSync");
     auto __result = method(_javaPart, jni::make_jstring(url));
     return [&]() {
       size_t __size = __result->size();
@@ -73,22 +67,22 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   bool JHybridNitroCookiesSpec::setSync(const std::string& url, const Cookie& cookie) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<JCookie> /* cookie */)>("setSync");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<JCookie> /* cookie */)>("setSync");
     auto __result = method(_javaPart, jni::make_jstring(url), JCookie::fromCpp(cookie));
     return static_cast<bool>(__result);
   }
   bool JHybridNitroCookiesSpec::setFromResponseSync(const std::string& url, const std::string& value) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* value */)>("setFromResponseSync");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* value */)>("setFromResponseSync");
     auto __result = method(_javaPart, jni::make_jstring(url), jni::make_jstring(value));
     return static_cast<bool>(__result);
   }
   bool JHybridNitroCookiesSpec::clearByNameSync(const std::string& url, const std::string& name) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* name */)>("clearByNameSync");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* name */)>("clearByNameSync");
     auto __result = method(_javaPart, jni::make_jstring(url), jni::make_jstring(name));
     return static_cast<bool>(__result);
   }
   std::shared_ptr<Promise<bool>> JHybridNitroCookiesSpec::set(const std::string& url, const Cookie& cookie, std::optional<bool> useWebKit) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<JCookie> /* cookie */, jni::alias_ref<jni::JBoolean> /* useWebKit */)>("set");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<JCookie> /* cookie */, jni::alias_ref<jni::JBoolean> /* useWebKit */)>("set");
     auto __result = method(_javaPart, jni::make_jstring(url), JCookie::fromCpp(cookie), useWebKit.has_value() ? jni::JBoolean::valueOf(useWebKit.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -104,7 +98,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<std::vector<Cookie>>> JHybridNitroCookiesSpec::get(const std::string& url, std::optional<bool> useWebKit) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JBoolean> /* useWebKit */)>("get");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JBoolean> /* useWebKit */)>("get");
     auto __result = method(_javaPart, jni::make_jstring(url), useWebKit.has_value() ? jni::JBoolean::valueOf(useWebKit.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<std::vector<Cookie>>::create();
@@ -129,7 +123,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridNitroCookiesSpec::clearAll(std::optional<bool> useWebKit) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JBoolean> /* useWebKit */)>("clearAll");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JBoolean> /* useWebKit */)>("clearAll");
     auto __result = method(_javaPart, useWebKit.has_value() ? jni::JBoolean::valueOf(useWebKit.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -145,7 +139,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridNitroCookiesSpec::setFromResponse(const std::string& url, const std::string& value) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* value */)>("setFromResponse");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* value */)>("setFromResponse");
     auto __result = method(_javaPart, jni::make_jstring(url), jni::make_jstring(value));
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -161,7 +155,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<std::vector<Cookie>>> JHybridNitroCookiesSpec::getFromResponse(const std::string& url) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */)>("getFromResponse");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */)>("getFromResponse");
     auto __result = method(_javaPart, jni::make_jstring(url));
     return [&]() {
       auto __promise = Promise<std::vector<Cookie>>::create();
@@ -186,7 +180,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<std::vector<Cookie>>> JHybridNitroCookiesSpec::getAll(std::optional<bool> useWebKit) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JBoolean> /* useWebKit */)>("getAll");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JBoolean> /* useWebKit */)>("getAll");
     auto __result = method(_javaPart, useWebKit.has_value() ? jni::JBoolean::valueOf(useWebKit.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<std::vector<Cookie>>::create();
@@ -211,7 +205,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridNitroCookiesSpec::clearByName(const std::string& url, const std::string& name, std::optional<bool> useWebKit) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* name */, jni::alias_ref<jni::JBoolean> /* useWebKit */)>("clearByName");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<jni::JString> /* url */, jni::alias_ref<jni::JString> /* name */, jni::alias_ref<jni::JBoolean> /* useWebKit */)>("clearByName");
     auto __result = method(_javaPart, jni::make_jstring(url), jni::make_jstring(name), useWebKit.has_value() ? jni::JBoolean::valueOf(useWebKit.value()) : nullptr);
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -227,7 +221,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridNitroCookiesSpec::flush() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("flush");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("flush");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -242,7 +236,7 @@ namespace margelo::nitro::nitrocookies {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridNitroCookiesSpec::removeSessionCookies() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("removeSessionCookies");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("removeSessionCookies");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<bool>::create();

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::nitrocookies {
 
   using namespace facebook;
 
-  class JHybridNitroCookiesSpec: public jni::HybridClass<JHybridNitroCookiesSpec, JHybridObject>,
-                                 public virtual HybridNitroCookiesSpec {
+  class JHybridNitroCookiesSpec: public virtual HybridNitroCookiesSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrocookies/HybridNitroCookiesSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridNitroCookiesSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridNitroCookiesSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrocookies/HybridNitroCookiesSpec;";
+      std::shared_ptr<JHybridNitroCookiesSpec> getJHybridNitroCookiesSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/nitrocookies/HybridNitroCookiesSpec$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 JHybridNitroCookiesSpec(const jni::local_ref<JHybridNitroCookiesSpec::JavaPart>& javaPart):
+      HybridObject(HybridNitroCookiesSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridNitroCookiesSpec() 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<JHybridNitroCookiesSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridNitroCookiesSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -70,9 +69,7 @@ namespace margelo::nitro::nitrocookies {
     std::shared_ptr<Promise<bool>> removeSessionCookies() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridNitroCookiesSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridNitroCookiesSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::nitrocookies

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitrocookies/HybridNitroCookiesSpec.kt

@@ -25,23 +25,6 @@ import com.margelo.nitro.core.HybridObject
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridNitroCookiesSpec: HybridObject() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
-
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
-
-  // Default implementation of `HybridObject.toString()`
-  override fun toString(): String {
-    return "[HybridObject NitroCookies]"
-  }
-
   // Properties
   
 
@@ -98,7 +81,21 @@ abstract class HybridNitroCookiesSpec: HybridObject() {
   @Keep
   abstract fun removeSessionCookies(): Promise<Boolean>
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject NitroCookies]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridNitroCookiesSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridNitroCookiesSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridNitroCookiesSpec"

package/nitrogen/generated/android/nitrocookiesOnLoad.cpp

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

package/nitrogen/generated/android/nitrocookiesOnLoad.hpp

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-cookies",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "Fetch, Get Cookies 🍪 at the Speed of Nitro",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -77,17 +77,17 @@
     "@types/react": "19.2.14",
     "del-cli": "6.0.0",
     "jest": "30.2.0",
-    "nitrogen": "0.33.9",
+    "nitrogen": "0.35.0",
     "react": "19.2.3",
     "react-native": "0.84.0",
     "react-native-builder-bob": "0.40.18",
-    "react-native-nitro-modules": "0.33.9",
+    "react-native-nitro-modules": "0.35.0",
     "typescript": "5.9.3"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-nitro-modules": "~0.33.9"
+    "react-native-nitro-modules": ">=0.35.0 <1.0.0"
   },
   "prettier": {
     "quoteProps": "consistent",