feat: upgrade nitro to v0.18

Author: okwasniewski

example/ios/Podfile.lock

@@ -29,19 +29,21 @@ PODS:
   - hermes-engine (0.76.0):
     - hermes-engine/Pre-built (= 0.76.0)
   - hermes-engine/Pre-built (0.76.0)
-  - NitroModules (0.15.0):
+  - NitroModules (0.18.1):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
+    - React-callinvoker
     - React-Core
     - React-debug
     - React-Fabric
     - React-featureflags
     - React-graphics
     - React-ImageManager
+    - React-jsi
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
@@ -1769,7 +1771,7 @@ SPEC CHECKSUMS:
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
   glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   hermes-engine: 9de51d2f67336348a6cd5b686330e436d1dbd522
-  NitroModules: 11c64b7b1c3fd5c83762c4946c4c4c20951d7b86
+  NitroModules: 1301dc53a33ca73ada1479a3dda1141032d8e597
   RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
   RCTDeprecation: 4c2c4a088b6f0ccfcbd53c9d5614b0238ad57909
   RCTRequired: 2d8a683a7848bc0baf5883f0792c1ac43f6267b5

example/package.json

@@ -12,7 +12,7 @@
     "cli-table3": "^0.6.5",
     "react": "18.3.1",
     "react-native": "0.76.0",
-    "react-native-nitro-modules": "^0.15.0"
+    "react-native-nitro-modules": "^0.18.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

package-lock.json

@@ -23,6 +23,7 @@
 #include "JFunc_void_std__shared_ptr_ArrayBuffer_.hpp"
 #include "JHybridWebSocketManagerSpec.hpp"
 #include <NitroModules/JNISharedPtr.hpp>
+#include <NitroModules/DefaultConstructableObject.hpp>
 #include "HybridCompressorFactory.hpp"
 
 namespace margelo::nitro::fastio {
@@ -52,63 +53,35 @@ int initialize(JavaVM* vm) {
     HybridObjectRegistry::registerHybridObjectConstructor(
       "WebSocketManager",
       []() -> std::shared_ptr<HybridObject> {
-        static auto javaClass = jni::findClassStatic("com/margelo/nitro/fastio/HybridWebSocketManager");
-        static auto defaultConstructor = javaClass->getConstructor<JHybridWebSocketManagerSpec::javaobject()>();
-    
-        auto instance = javaClass->newObject(defaultConstructor);
-    #ifdef NITRO_DEBUG
-        if (instance == nullptr) [[unlikely]] {
-          throw std::runtime_error("Failed to create an instance of \"JHybridWebSocketManagerSpec\" - the constructor returned null!");
-        }
-    #endif
+        static DefaultConstructableObject<JHybridWebSocketManagerSpec::javaobject> object("com/margelo/nitro/fastio/HybridWebSocketManager");
+        auto instance = object.create();
         auto globalRef = jni::make_global(instance);
         return JNISharedPtr::make_shared_from_jni<JHybridWebSocketManagerSpec>(globalRef);
       }
     );
     HybridObjectRegistry::registerHybridObjectConstructor(
       "FileSystem",
       []() -> std::shared_ptr<HybridObject> {
-        static auto javaClass = jni::findClassStatic("com/margelo/nitro/fastio/HybridFileSystem");
-        static auto defaultConstructor = javaClass->getConstructor<JHybridFileSystemSpec::javaobject()>();
-    
-        auto instance = javaClass->newObject(defaultConstructor);
-    #ifdef NITRO_DEBUG
-        if (instance == nullptr) [[unlikely]] {
-          throw std::runtime_error("Failed to create an instance of \"JHybridFileSystemSpec\" - the constructor returned null!");
-        }
-    #endif
+        static DefaultConstructableObject<JHybridFileSystemSpec::javaobject> object("com/margelo/nitro/fastio/HybridFileSystem");
+        auto instance = object.create();
         auto globalRef = jni::make_global(instance);
         return JNISharedPtr::make_shared_from_jni<JHybridFileSystemSpec>(globalRef);
       }
     );
     HybridObjectRegistry::registerHybridObjectConstructor(
       "Network",
       []() -> std::shared_ptr<HybridObject> {
-        static auto javaClass = jni::findClassStatic("com/margelo/nitro/fastio/HybridNetwork");
-        static auto defaultConstructor = javaClass->getConstructor<JHybridNetworkSpec::javaobject()>();
-    
-        auto instance = javaClass->newObject(defaultConstructor);
-    #ifdef NITRO_DEBUG
-        if (instance == nullptr) [[unlikely]] {
-          throw std::runtime_error("Failed to create an instance of \"JHybridNetworkSpec\" - the constructor returned null!");
-        }
-    #endif
+        static DefaultConstructableObject<JHybridNetworkSpec::javaobject> object("com/margelo/nitro/fastio/HybridNetwork");
+        auto instance = object.create();
         auto globalRef = jni::make_global(instance);
         return JNISharedPtr::make_shared_from_jni<JHybridNetworkSpec>(globalRef);
       }
     );
     HybridObjectRegistry::registerHybridObjectConstructor(
       "DuplexStream",
       []() -> std::shared_ptr<HybridObject> {
-        static auto javaClass = jni::findClassStatic("com/margelo/nitro/fastio/HybridDuplexStream");
-        static auto defaultConstructor = javaClass->getConstructor<JHybridDuplexStreamSpec::javaobject()>();
-    
-        auto instance = javaClass->newObject(defaultConstructor);
-    #ifdef NITRO_DEBUG
-        if (instance == nullptr) [[unlikely]] {
-          throw std::runtime_error("Failed to create an instance of \"JHybridDuplexStreamSpec\" - the constructor returned null!");
-        }
-    #endif
+        static DefaultConstructableObject<JHybridDuplexStreamSpec::javaobject> object("com/margelo/nitro/fastio/HybridDuplexStream");
+        auto instance = object.create();
         auto globalRef = jni::make_global(instance);
         return JNISharedPtr::make_shared_from_jni<JHybridDuplexStreamSpec>(globalRef);
       }
@@ -125,15 +98,8 @@ int initialize(JavaVM* vm) {
     HybridObjectRegistry::registerHybridObjectConstructor(
       "StreamFactory",
       []() -> std::shared_ptr<HybridObject> {
-        static auto javaClass = jni::findClassStatic("com/margelo/nitro/fastio/HybridStreamFactory");
-        static auto defaultConstructor = javaClass->getConstructor<JHybridStreamFactorySpec::javaobject()>();
-    
-        auto instance = javaClass->newObject(defaultConstructor);
-    #ifdef NITRO_DEBUG
-        if (instance == nullptr) [[unlikely]] {
-          throw std::runtime_error("Failed to create an instance of \"JHybridStreamFactorySpec\" - the constructor returned null!");
-        }
-    #endif
+        static DefaultConstructableObject<JHybridStreamFactorySpec::javaobject> object("com/margelo/nitro/fastio/HybridStreamFactory");
+        auto instance = object.create();
         auto globalRef = jni::make_global(instance);
         return JNISharedPtr::make_shared_from_jni<JHybridStreamFactorySpec>(globalRef);
       }

packages/react-native-fast-io/nitrogen/generated/android/FastIOOnLoad.cpp

@@ -13,6 +13,7 @@
 #include <functional>
 #include <NitroModules/ArrayBuffer.hpp>
 #include <NitroModules/JArrayBuffer.hpp>
+#include <NitroModules/JUnit.hpp>
 
 namespace margelo::nitro::fastio {
 

packages/react-native-fast-io/nitrogen/generated/android/c++/JFunc_void_std__shared_ptr_ArrayBuffer_.hpp

@@ -17,7 +17,7 @@ namespace margelo::nitro::fastio { struct NativeFilePickerOptions; }
 #include "Metadata.hpp"
 #include "JMetadata.hpp"
 #include <string>
-#include <future>
+#include <NitroModules/Promise.hpp>
 #include <vector>
 #include <NitroModules/JPromise.hpp>
 #include "WellKnownDirectory.hpp"
@@ -57,14 +57,14 @@ namespace margelo::nitro::fastio {
     auto __result = method(_javaPart, JWellKnownDirectory::fromCpp(directory));
     return __result->toStdString();
   }
-  std::future<std::vector<std::string>> JHybridFileSystemSpec::showOpenFilePicker(const std::optional<NativeFilePickerOptions>& options) {
+  std::shared_ptr<Promise<std::vector<std::string>>> JHybridFileSystemSpec::showOpenFilePicker(const std::optional<NativeFilePickerOptions>& options) {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JNativeFilePickerOptions> /* options */)>("showOpenFilePicker");
     auto __result = method(_javaPart, options.has_value() ? JNativeFilePickerOptions::fromCpp(options.value()) : nullptr);
     return [&]() {
-      auto __promise = std::make_shared<std::promise<std::vector<std::string>>>();
+      auto __promise = Promise<std::vector<std::string>>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
         auto __result = jni::static_ref_cast<jni::JArrayClass<jni::JString>>(__boxedResult);
-        __promise->set_value([&]() {
+        __promise->resolve([&]() {
           size_t __size = __result->size();
           std::vector<std::string> __vector;
           __vector.reserve(__size);
@@ -75,11 +75,11 @@ namespace margelo::nitro::fastio {
           return __vector;
         }());
       });
-      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JString>& __message) {
-        std::runtime_error __error(__message->toStdString());
-        __promise->set_exception(std::make_exception_ptr(__error));
+      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+        jni::JniException __jniError(__throwable);
+        __promise->reject(std::make_exception_ptr(__jniError));
       });
-      return __promise->get_future();
+      return __promise;
     }();
   }
 

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridFileSystemSpec.cpp

@@ -53,7 +53,7 @@ namespace margelo::nitro::fastio {
     // Methods
     Metadata getMetadata(const std::string& path) override;
     std::string getWellKnownDirectoryPath(WellKnownDirectory directory) override;
-    std::future<std::vector<std::string>> showOpenFilePicker(const std::optional<NativeFilePickerOptions>& options) override;
+    std::shared_ptr<Promise<std::vector<std::string>>> showOpenFilePicker(const std::optional<NativeFilePickerOptions>& options) override;
 
   private:
     friend HybridBase;

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridFileSystemSpec.hpp

@@ -10,10 +10,11 @@
 // Forward declaration of `ArrayBuffer` to properly resolve imports.
 namespace NitroModules { class ArrayBuffer; }
 
-#include <future>
+#include <NitroModules/Promise.hpp>
 #include <NitroModules/ArrayBuffer.hpp>
 #include <NitroModules/JPromise.hpp>
 #include <NitroModules/JArrayBuffer.hpp>
+#include <NitroModules/JUnit.hpp>
 
 namespace margelo::nitro::fastio {
 
@@ -36,20 +37,20 @@ namespace margelo::nitro::fastio {
 
 
   // Methods
-  std::future<std::shared_ptr<ArrayBuffer>> JHybridInputStreamSpec::read() {
+  std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>> JHybridInputStreamSpec::read() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JPromise::javaobject>()>("read");
     auto __result = method(_javaPart);
     return [&]() {
-      auto __promise = std::make_shared<std::promise<std::shared_ptr<ArrayBuffer>>>();
+      auto __promise = Promise<std::shared_ptr<ArrayBuffer>>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
         auto __result = jni::static_ref_cast<JArrayBuffer::javaobject>(__boxedResult);
-        __promise->set_value(__result->cthis()->getArrayBuffer());
+        __promise->resolve(__result->cthis()->getArrayBuffer());
       });
-      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JString>& __message) {
-        std::runtime_error __error(__message->toStdString());
-        __promise->set_exception(std::make_exception_ptr(__error));
+      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+        jni::JniException __jniError(__throwable);
+        __promise->reject(std::make_exception_ptr(__jniError));
       });
-      return __promise->get_future();
+      return __promise;
     }();
   }
   void JHybridInputStreamSpec::open() {

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridInputStreamSpec.cpp

@@ -51,7 +51,7 @@ namespace margelo::nitro::fastio {
 
   public:
     // Methods
-    std::future<std::shared_ptr<ArrayBuffer>> read() override;
+    std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>> read() override;
     void open() override;
     void close() override;
 

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridInputStreamSpec.hpp

@@ -14,7 +14,7 @@ namespace margelo::nitro::fastio { enum class RequestMethod; }
 // Forward declaration of `HybridInputStreamSpec` to properly resolve imports.
 namespace margelo::nitro::fastio { class HybridInputStreamSpec; }
 
-#include <future>
+#include <NitroModules/Promise.hpp>
 #include <NitroModules/JPromise.hpp>
 #include "RequestOptions.hpp"
 #include "JRequestOptions.hpp"
@@ -48,19 +48,19 @@ namespace margelo::nitro::fastio {
 
 
   // Methods
-  std::future<void> JHybridNetworkSpec::request(const RequestOptions& opts) {
+  std::shared_ptr<Promise<void>> JHybridNetworkSpec::request(const RequestOptions& opts) {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JRequestOptions> /* opts */)>("request");
     auto __result = method(_javaPart, JRequestOptions::fromCpp(opts));
     return [&]() {
-      auto __promise = std::make_shared<std::promise<void>>();
+      auto __promise = Promise<void>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        __promise->set_value();
+        __promise->resolve();
       });
-      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JString>& __message) {
-        std::runtime_error __error(__message->toStdString());
-        __promise->set_exception(std::make_exception_ptr(__error));
+      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+        jni::JniException __jniError(__throwable);
+        __promise->reject(std::make_exception_ptr(__jniError));
       });
-      return __promise->get_future();
+      return __promise;
     }();
   }
 

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridNetworkSpec.cpp

@@ -51,7 +51,7 @@ namespace margelo::nitro::fastio {
 
   public:
     // Methods
-    std::future<void> request(const RequestOptions& opts) override;
+    std::shared_ptr<Promise<void>> request(const RequestOptions& opts) override;
 
   private:
     friend HybridBase;

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridNetworkSpec.hpp

@@ -10,10 +10,11 @@
 // Forward declaration of `ArrayBuffer` to properly resolve imports.
 namespace NitroModules { class ArrayBuffer; }
 
-#include <future>
+#include <NitroModules/Promise.hpp>
 #include <NitroModules/JPromise.hpp>
 #include <NitroModules/ArrayBuffer.hpp>
 #include <NitroModules/JArrayBuffer.hpp>
+#include <NitroModules/JUnit.hpp>
 
 namespace margelo::nitro::fastio {
 
@@ -36,19 +37,19 @@ namespace margelo::nitro::fastio {
 
 
   // Methods
-  std::future<void> JHybridOutputStreamSpec::write(const std::shared_ptr<ArrayBuffer>& buffer) {
+  std::shared_ptr<Promise<void>> JHybridOutputStreamSpec::write(const std::shared_ptr<ArrayBuffer>& buffer) {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JArrayBuffer::javaobject> /* buffer */)>("write");
     auto __result = method(_javaPart, JArrayBuffer::wrap(buffer));
     return [&]() {
-      auto __promise = std::make_shared<std::promise<void>>();
+      auto __promise = Promise<void>::create();
       __result->cthis()->addOnResolvedListener([=](const jni::alias_ref<jni::JObject>& __boxedResult) {
-        __promise->set_value();
+        __promise->resolve();
       });
-      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JString>& __message) {
-        std::runtime_error __error(__message->toStdString());
-        __promise->set_exception(std::make_exception_ptr(__error));
+      __result->cthis()->addOnRejectedListener([=](const jni::alias_ref<jni::JThrowable>& __throwable) {
+        jni::JniException __jniError(__throwable);
+        __promise->reject(std::make_exception_ptr(__jniError));
       });
-      return __promise->get_future();
+      return __promise;
     }();
   }
   void JHybridOutputStreamSpec::open() {

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridOutputStreamSpec.cpp

@@ -51,7 +51,7 @@ namespace margelo::nitro::fastio {
 
   public:
     // Methods
-    std::future<void> write(const std::shared_ptr<ArrayBuffer>& buffer) override;
+    std::shared_ptr<Promise<void>> write(const std::shared_ptr<ArrayBuffer>& buffer) override;
     void open() override;
     void close() override;
 

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridOutputStreamSpec.hpp

@@ -13,6 +13,7 @@ namespace NitroModules { class ArrayBuffer; }
 #include <string>
 #include <NitroModules/ArrayBuffer.hpp>
 #include <NitroModules/JArrayBuffer.hpp>
+#include <NitroModules/JUnit.hpp>
 #include <functional>
 #include "JFunc_void_std__string.hpp"
 #include "JFunc_void_double_std__string.hpp"

packages/react-native-fast-io/nitrogen/generated/android/c++/JHybridWebSocketSpec.cpp

@@ -28,7 +28,7 @@ namespace margelo::nitro::fastio {
     [[maybe_unused]]
     RequestMethod toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<RequestMethod>(ordinal);
     }

packages/react-native-fast-io/nitrogen/generated/android/c++/JRequestMethod.hpp

@@ -28,7 +28,7 @@ namespace margelo::nitro::fastio {
     [[maybe_unused]]
     WellKnownDirectory toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<WellKnownDirectory>(ordinal);
     }

packages/react-native-fast-io/nitrogen/generated/android/c++/JWellKnownDirectory.hpp

@@ -17,5 +17,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 @Keep
 enum class RequestMethod {
   POST,
-  GET
+  GET;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }

packages/react-native-fast-io/nitrogen/generated/android/kotlin/com/margelo/nitro/fastio/RequestMethod.kt

@@ -21,5 +21,9 @@ enum class WellKnownDirectory {
   DOWNLOADS,
   MUSIC,
   PICTURES,
-  VIDEOS
+  VIDEOS;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }