react-native-nitro-modules 0.1.5 → 0.1.7

package/cpp/jsi/JSIConverter.hpp

@@ -25,18 +25,34 @@ using namespace facebook;
  * Value types, custom types (HostObjects), and even functions with any number of arguments/types are supported.
  * This type can be extended by just creating a new template for JSIConverter in a header.
  */
-template <typename ArgType, typename Enable = void>
+template <typename T, typename Enable = void>
 struct JSIConverter final {
   JSIConverter() = delete;
 
-  static inline ArgType fromJSI(jsi::Runtime&, const jsi::Value&) {
-    static_assert(always_false<ArgType>::value, "This type is not supported by the JSIConverter!");
-    return ArgType();
-  }
-  static inline jsi::Value toJSI(jsi::Runtime&, ArgType) {
-    static_assert(always_false<ArgType>::value, "This type is not supported by the JSIConverter!");
+  /**
+   * Converts the given `jsi::Value` to type `T`.
+   * By default, this static-asserts.
+   */
+  static inline T fromJSI(jsi::Runtime&, const jsi::Value&) {
+    static_assert(always_false<T>::value, "This type is not supported by the JSIConverter!");
+    return T();
+  }
+  /**
+   * Converts `T` to a `jsi::Value`.
+   * By default, this static-asserts.
+   */
+  static inline jsi::Value toJSI(jsi::Runtime&, T) {
+    static_assert(always_false<T>::value, "This type is not supported by the JSIConverter!");
     return jsi::Value::undefined();
   }
+  /**
+   * Returns whether the given `jsi::Value` can be converted to `T`.
+   * This involves runtime type-checks.
+   * By default, this returns `false`.
+   */
+  static inline bool canConvert(jsi::Runtime&, const jsi::Value&) {
+    return false;
+  }
 
 private:
   template <typename>
@@ -52,6 +68,9 @@ struct JSIConverter<int> {
   static inline jsi::Value toJSI(jsi::Runtime&, int arg) {
     return jsi::Value(arg);
   }
+  static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
+    return value.isNumber();
+  }
 };
 
 // std::monostate <> null
@@ -63,6 +82,9 @@ struct JSIConverter<std::monostate> {
   static inline jsi::Value toJSI(jsi::Runtime&, std::monostate arg) {
     return jsi::Value::null();
   }
+  static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
+    return value.isNull() || value.isUndefined();
+  }
 };
 
 // double <> number
@@ -74,6 +96,9 @@ struct JSIConverter<double> {
   static inline jsi::Value toJSI(jsi::Runtime&, double arg) {
     return jsi::Value(arg);
   }
+  static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
+    return value.isNumber();
+  }
 };
 
 // float <> number
@@ -85,6 +110,9 @@ struct JSIConverter<float> {
   static inline jsi::Value toJSI(jsi::Runtime&, float arg) {
     return jsi::Value(static_cast<double>(arg));
   }
+  static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
+    return value.isNumber();
+  }
 };
 
 // int64_t <> BigInt
@@ -96,6 +124,13 @@ struct JSIConverter<int64_t> {
   static inline jsi::Value toJSI(jsi::Runtime& runtime, int64_t arg) {
     return jsi::BigInt::fromInt64(runtime, arg);
   }
+  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+    if (value.isBigInt()) {
+      jsi::BigInt bigint = value.getBigInt(runtime);
+      return bigint.isInt64(runtime);
+    }
+    return false;
+  }
 };
 
 // uint64_t <> BigInt
@@ -107,6 +142,13 @@ struct JSIConverter<uint64_t> {
   static inline jsi::Value toJSI(jsi::Runtime& runtime, uint64_t arg) {
     return jsi::BigInt::fromUint64(runtime, arg);
   }
+  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+    if (value.isBigInt()) {
+      jsi::BigInt bigint = value.getBigInt(runtime);
+      return bigint.isUint64(runtime);
+    }
+    return false;
+  }
 };
 
 // bool <> boolean
@@ -118,6 +160,9 @@ struct JSIConverter<bool> {
   static inline jsi::Value toJSI(jsi::Runtime&, bool arg) {
     return jsi::Value(arg);
   }
+  static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
+    return value.isBool();
+  }
 };
 
 // std::string <> string
@@ -129,6 +174,9 @@ struct JSIConverter<std::string> {
   static inline jsi::Value toJSI(jsi::Runtime& runtime, const std::string& arg) {
     return jsi::String::createFromUtf8(runtime, arg);
   }
+  static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
+    return value.isString();
+  }
 };
 
 } // namespace margelo::nitro

package/cpp/jsi/JSIHelpers.hpp

@@ -0,0 +1,52 @@
+//
+//  JSIHelpers.hpp
+//  Pods
+//
+//  Created by Marc Rousavy on 07.08.24.
+//
+
+#pragma once
+
+#include "ThreadUtils.hpp"
+#include <jsi/jsi.h>
+
+namespace margelo::nitro {
+
+using namespace facebook;
+
+/**
+ * Returns whether the given `jsi::Object` is a plain-JS object, or not.
+ * If it is not a plain-JS object, it could be an Array, ArrayBuffer, Function,
+ * HostObject or NativeState.
+ */
+static inline bool isPlainObject(jsi::Runtime& runtime, const jsi::Object& object) {
+  if (object.isArray(runtime)) {
+    return false;
+  }
+  if (object.isArrayBuffer(runtime)) {
+    return false;
+  }
+  if (object.isFunction(runtime)) {
+    return false;
+  }
+  if (object.isHostObject(runtime)) {
+    return false;
+  }
+  if (object.hasNativeState(runtime)) {
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Get an ID for the given Runtime.
+ *
+ * The ID usually consists of a Runtime description (e.g. "HermesRuntime"),
+ * and it's Thread (e.g. "com.facebook.react.runtime.JavaScript")
+ */
+static inline std::string getRuntimeId(jsi::Runtime& runtime) {
+  std::string threadName = ThreadUtils::getThreadName();
+  return runtime.description() + std::string(" (") + threadName + std::string(")");
+}
+
+} // namespace margelo::nitro

package/cpp/jsi/Promise.cpp

@@ -8,9 +8,9 @@ namespace margelo::nitro {
 using namespace facebook;
 
 Promise::Promise(jsi::Runtime& runtime, jsi::Function&& resolver, jsi::Function&& rejecter) {
-  auto functionCache = JSICache<jsi::Function>::getOrCreateCache(runtime);
-  _resolver = functionCache.makeGlobal(std::move(resolver));
-  _rejecter = functionCache.makeGlobal(std::move(rejecter));
+  auto functionCache = JSICache::getOrCreateCache(runtime);
+  _resolver = functionCache.makeGlobal<jsi::Function>(std::move(resolver));
+  _rejecter = functionCache.makeGlobal<jsi::Function>(std::move(rejecter));
 }
 
 jsi::Value Promise::createPromise(jsi::Runtime& runtime, RunPromise&& run) {
@@ -35,6 +35,8 @@ jsi::Value Promise::createPromise(jsi::Runtime& runtime, RunPromise&& run) {
 }
 
 void Promise::resolve(jsi::Runtime& runtime, jsi::Value&& result) {
+  OwningLock<jsi::Function> lock = _resolver.lock();
+
   if (!_resolver) {
     Logger::log(TAG, "Promise resolver function has already been deleted! Ignoring call..");
     return;
@@ -43,6 +45,8 @@ void Promise::resolve(jsi::Runtime& runtime, jsi::Value&& result) {
 }
 
 void Promise::reject(jsi::Runtime& runtime, std::string message) {
+  OwningLock<jsi::Function> lock = _rejecter.lock();
+
   if (!_rejecter) {
     Logger::log(TAG, "Promise rejecter function has already been deleted! Ignoring call..");
     return;

package/cpp/threading/Dispatcher.cpp

@@ -1,5 +1,5 @@
 #include "Dispatcher.hpp"
-#include "GetRuntimeID.hpp"
+#include "JSIHelpers.hpp"
 #include "NitroLogger.hpp"
 
 namespace margelo::nitro {

package/cpp/turbomodule/NativeNitroModules.cpp

@@ -9,7 +9,6 @@
 #include "CallInvokerDispatcher.hpp"
 #include "Dispatcher.hpp"
 #include "HybridObjectRegistry.hpp"
-#include "TestHybridObject.hpp"
 
 namespace facebook::react {
 

package/cpp/utils/OwningReference.hpp

@@ -76,12 +76,25 @@ public:
   }
 
 private:
+  // BorrowingReference<T> -> OwningReference<T> Lock-constructor
   OwningReference(const BorrowingReference<T>& ref)
       : _value(ref._value), _isDeleted(ref._isDeleted), _strongRefCount(ref._strongRefCount), _weakRefCount(ref._weakRefCount),
         _mutex(ref._mutex) {
     (*_strongRefCount)++;
   }
 
+private:
+  // OwningReference<C> -> OwningReference<T> Cast-constructor
+  template <typename OldT>
+  OwningReference(T* value, const OwningReference<OldT>& originalRef)
+      : _value(value), _isDeleted(originalRef._isDeleted), _strongRefCount(originalRef._strongRefCount),
+        _weakRefCount(originalRef._weakRefCount), _mutex(originalRef._mutex) {
+    (*_strongRefCount)++;
+  }
+
+  template <typename C>
+  friend class OwningReference;
+
 public:
   ~OwningReference() {
     if (_strongRefCount == nullptr) {
@@ -94,6 +107,15 @@ public:
     maybeDestroy();
   }
 
+public:
+  /**
+   Casts this `OwningReference<T>` to a `OwningReference<C>`.
+   */
+  template <typename C>
+  OwningReference<C> as() {
+    return OwningReference<C>(static_cast<C*>(_value), *this);
+  }
+
 public:
   /**
    Creates an `OwningLock<T>` for the given `OwningReference<T>` to guarantee safe

package/ios/turbomodule/NitroModuleOnLoad.mm

@@ -7,7 +7,6 @@
 
 #import "HybridObjectRegistry.hpp"
 #import "RegisterNativeNitroModules.hpp"
-#import "TestHybridObject.hpp"
 #import <Foundation/Foundation.h>
 
 @interface NitroModulesOnLoad : NSObject
@@ -22,10 +21,6 @@ using namespace margelo::nitro;
   // We need Objective-C here because these things do not get compiled out - meaning this will always be
   // called when the app starts.
   RegisterNativeNitroModules::registerNativeNitroModules();
-
-  // Register Test HybridObject so it can be created from JS.
-  HybridObjectRegistry::registerHybridObjectConstructor(
-      "TestHybridObject", []() -> std::shared_ptr<TestHybridObject> { return std::make_shared<TestHybridObject>(); });
 }
 
 @end

package/lib/commonjs/index.js

@@ -3,17 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _createTestObject = require("./createTestObject");
-Object.keys(_createTestObject).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _createTestObject[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _createTestObject[key];
-    }
-  });
-});
 var _HybridObject = require("./HybridObject");
 Object.keys(_HybridObject).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_createTestObject","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_HybridObject","_NitroModules","_AnyMap"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,iBAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,iBAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,iBAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,aAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,aAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,aAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,aAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,aAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,aAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,aAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,aAAA,CAAAN,GAAA;IAAA;EAAA;AAAA;AACA,IAAAO,OAAA,GAAAX,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAS,OAAA,EAAAR,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAO,OAAA,CAAAP,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAG,OAAA,CAAAP,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"names":["_HybridObject","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_NitroModules","_AnyMap"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,aAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,aAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,aAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,aAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,aAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,aAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,aAAA,CAAAL,GAAA;IAAA;EAAA;AAAA;AACA,IAAAM,OAAA,GAAAV,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAQ,OAAA,EAAAP,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAM,OAAA,CAAAN,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,OAAA,CAAAN,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}

package/lib/index.d.ts

@@ -1,4 +1,3 @@
-export * from './createTestObject';
 export * from './HybridObject';
 export * from './NitroModules';
 export * from './AnyMap';

package/lib/index.js

@@ -1,4 +1,3 @@
-export * from './createTestObject';
 export * from './HybridObject';
 export * from './NitroModules';
 export * from './AnyMap';

package/lib/module/index.js

@@ -1,4 +1,3 @@
-export * from './createTestObject';
 export * from './HybridObject';
 export * from './NitroModules';
 export * from './AnyMap';

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,cAAc,oBAAoB;AAClC,cAAc,gBAAgB;AAC9B,cAAc,gBAAgB;AAC9B,cAAc,UAAU","ignoreList":[]}
+{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,cAAc,gBAAgB;AAC9B,cAAc,gBAAgB;AAC9B,cAAc,UAAU","ignoreList":[]}