react-native-nitro-modules 0.31.9 → 0.32.0-beta.0

package/ios/platform/NitroLogger.cpp

@@ -0,0 +1,37 @@
+//
+//  NitroLogger.cpp
+//  react-native-nitro
+//
+//  Created by Marc Rousavy on 14.07.24.
+//
+
+#include "NitroLogger.hpp"
+#include "NitroDefines.hpp"
+#include <os/log.h>
+
+namespace margelo::nitro {
+
+void Logger::nativeLog([[maybe_unused]] LogLevel level,           //
+                       [[maybe_unused]] const char* NON_NULL tag, //
+                       [[maybe_unused]] const std::string& message) {
+#ifdef NITRO_DEBUG
+  static os_log_t logger = os_log_create("com.margelo.nitro", "nitro");
+
+  switch (level) {
+    case LogLevel::Debug:
+      os_log_debug(logger, "[%s] %s", tag, message.c_str());
+      break;
+    case LogLevel::Info:
+      os_log_info(logger, "[%s] %s", tag, message.c_str());
+      break;
+    case LogLevel::Warning:
+      os_log_error(logger, "[%s] %s", tag, message.c_str());
+      break;
+    case LogLevel::Error:
+      os_log_error(logger, "[%s] %s", tag, message.c_str());
+      break;
+  }
+#endif
+}
+
+} // namespace margelo::nitro

package/ios/platform/ThreadUtils.cpp

@@ -0,0 +1,43 @@
+//
+//  ThreadUtils.cpp
+//  react-native-nitro
+//
+//  Created by Marc Rousavy on 14.07.24.
+//
+
+#include "ThreadUtils.hpp"
+#include <dispatch/dispatch.h>
+#include <pthread.h>
+#include <sstream>
+#include <thread>
+
+namespace margelo::nitro {
+
+std::string ThreadUtils::getThreadName() {
+  // Try using pthread APIs
+  char threadName[64] = {};
+  int pthreadResult = pthread_getname_np(pthread_self(), threadName, sizeof(threadName));
+  if (pthreadResult == 0 && threadName[0] != '\0') {
+    // We have a pthread name
+    return std::string(threadName);
+  }
+
+  // Try getting DispatchQueue name
+  const char* queueName = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL);
+  if (queueName != nullptr && queueName[0] != '\0') {
+    // We are on a DispatchQueue with a name
+    return std::string(queueName);
+  }
+
+  // Fall back to std::this_thread
+  std::stringstream stream;
+  stream << std::this_thread::get_id();
+  std::string threadId = stream.str();
+  return std::string("Thread #") + threadId;
+}
+
+void ThreadUtils::setThreadName(const std::string& name) {
+  pthread_setname_np(name.c_str());
+}
+
+} // namespace margelo::nitro

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-modules",
-  "version": "0.31.9",
+  "version": "0.32.0-beta.0",
   "description": "Insanely fast native C++, Swift or Kotlin modules with a statically compiled binding layer to JSI.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -59,7 +59,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "postinstall": "bun build || exit 0;",
     "write-native-version": "version=$(node -p \"require('./package.json').version\") && sed -i '' \"s/#define NITRO_VERSION \\\".*\\\"/#define NITRO_VERSION \\\"$version\\\"/\" ./cpp/utils/NitroDefines.hpp",
     "postversion": "bun run write-native-version",
     "build": "rm -rf lib && bun typecheck && bob build",

package/cpp/utils/ObjectUtils.cpp

@@ -1,172 +0,0 @@
-//
-//  ObjectUtils.cpp
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 17.10.25.
-//
-
-#include "ObjectUtils.hpp"
-#include "JSICache.hpp"
-#include "JSIHelpers.hpp"
-#include "NitroDefines.hpp"
-
-#if __has_include(<React-cxxreact/cxxreact/ReactNativeVersion.h>)
-#include <React-cxxreact/cxxreact/ReactNativeVersion.h>
-#if REACT_NATIVE_VERSION_MINOR >= 78
-#define ENABLE_NATIVE_OBJECT_CREATE
-#endif
-#endif
-
-namespace margelo::nitro {
-
-using namespace facebook;
-
-std::unordered_map<jsi::Runtime*, ObjectUtils::FunctionCache> ObjectUtils::_cache;
-
-const char* ObjectUtils::getKnownGlobalPropertyNameString(KnownGlobalPropertyName name) {
-  switch (name) {
-    case KnownGlobalPropertyName::DISPATCHER:
-      return "__nitroDispatcher";
-    case KnownGlobalPropertyName::JSI_CACHE:
-      return "__nitroJsiCache";
-    case KnownGlobalPropertyName::NITRO_MODULES_PROXY:
-      return "NitroModulesProxy";
-  }
-}
-
-jsi::Object ObjectUtils::create(jsi::Runtime& runtime, const jsi::Value& prototype, bool allowCache) {
-#ifdef ENABLE_NATIVE_OBJECT_CREATE
-  return jsi::Object::create(runtime, prototype);
-#else
-  BorrowingReference<jsi::Function> createFn = getGlobalFunction(
-      runtime, "Object.create",
-      [](jsi::Runtime& runtime) {
-        return runtime.global().getPropertyAsObject(runtime, "Object").getPropertyAsFunction(runtime, "create");
-      },
-      allowCache);
-  return createFn->call(runtime, prototype).getObject(runtime);
-#endif
-}
-
-void ObjectUtils::defineGlobal(jsi::Runtime& runtime, KnownGlobalPropertyName name, jsi::Value&& value, bool allowCache) {
-  const char* nameString = getKnownGlobalPropertyNameString(name);
-
-#ifdef NITRO_DEBUG
-  // In debug, let's perform additional safety checks.
-  if (runtime.global().hasProperty(runtime, nameString)) [[unlikely]] {
-    throw std::runtime_error("Failed to set `global." + std::string(nameString) + "` - it already exists for Runtime \"" +
-                             getRuntimeId(runtime) + "\"! Did you call `defineGlobal(\"" + std::string(nameString) +
-                             "\")` twice? Did you link Nitro Modules twice?");
-  }
-  defineProperty(runtime, runtime.global(), nameString,
-                 PlainPropertyDescriptor{.configurable = false, .enumerable = true, .value = std::move(value), .writable = false},
-                 allowCache);
-#else
-  // In release, just set the property.
-  runtime.global().setProperty(runtime, nameString, std::move(value));
-#endif
-}
-
-void ObjectUtils::defineProperty(jsi::Runtime& runtime, const jsi::Object& object, const char* propertyName,
-                                 PlainPropertyDescriptor&& descriptor, bool allowCache) {
-  BorrowingReference<jsi::Function> definePropertyFn = getGlobalFunction(
-      runtime, "Object.defineProperty",
-      [](jsi::Runtime& runtime) {
-        return runtime.global().getPropertyAsObject(runtime, "Object").getPropertyAsFunction(runtime, "defineProperty");
-      },
-      allowCache);
-
-  jsi::String nameJs = jsi::String::createFromAscii(runtime, propertyName);
-
-  jsi::Object descriptorJs(runtime);
-  descriptorJs.setProperty(runtime, "configurable", jsi::Value(descriptor.configurable));
-  descriptorJs.setProperty(runtime, "enumerable", jsi::Value(descriptor.enumerable));
-  descriptorJs.setProperty(runtime, "value", std::move(descriptor.value));
-  descriptorJs.setProperty(runtime, "writable", jsi::Value(descriptor.writable));
-
-  definePropertyFn->call(runtime, object, std::move(nameJs), std::move(descriptorJs));
-}
-
-void ObjectUtils::defineProperty(jsi::Runtime& runtime, const jsi::Object& object, const char* propertyName,
-                                 ComputedReadonlyPropertyDescriptor&& descriptor, bool allowCache) {
-  BorrowingReference<jsi::Function> definePropertyFn = getGlobalFunction(
-      runtime, "Object.defineProperty",
-      [](jsi::Runtime& runtime) {
-        return runtime.global().getPropertyAsObject(runtime, "Object").getPropertyAsFunction(runtime, "defineProperty");
-      },
-      allowCache);
-
-  jsi::String nameJs = jsi::String::createFromAscii(runtime, propertyName);
-
-  jsi::Object descriptorJs(runtime);
-  descriptorJs.setProperty(runtime, "configurable", jsi::Value(descriptor.configurable));
-  descriptorJs.setProperty(runtime, "enumerable", jsi::Value(descriptor.enumerable));
-  descriptorJs.setProperty(runtime, "get", std::move(descriptor.get));
-
-  definePropertyFn->call(runtime, object, std::move(nameJs), std::move(descriptorJs));
-}
-
-void ObjectUtils::defineProperty(jsi::Runtime& runtime, const jsi::Object& object, const char* propertyName,
-                                 ComputedPropertyDescriptor&& descriptor, bool allowCache) {
-  BorrowingReference<jsi::Function> definePropertyFn = getGlobalFunction(
-      runtime, "Object.defineProperty",
-      [](jsi::Runtime& runtime) {
-        return runtime.global().getPropertyAsObject(runtime, "Object").getPropertyAsFunction(runtime, "defineProperty");
-      },
-      allowCache);
-
-  jsi::String nameJs = jsi::String::createFromAscii(runtime, propertyName);
-
-  jsi::Object descriptorJs(runtime);
-  descriptorJs.setProperty(runtime, "configurable", jsi::Value(descriptor.configurable));
-  descriptorJs.setProperty(runtime, "enumerable", jsi::Value(descriptor.enumerable));
-  descriptorJs.setProperty(runtime, "get", std::move(descriptor.get));
-  descriptorJs.setProperty(runtime, "set", std::move(descriptor.set));
-
-  definePropertyFn->call(runtime, object, std::move(nameJs), std::move(descriptorJs));
-}
-
-void ObjectUtils::freeze(jsi::Runtime& runtime, const jsi::Object& object, bool allowCache) {
-  BorrowingReference<jsi::Function> freezeFn = getGlobalFunction(
-      runtime, "Object.freeze",
-      [](jsi::Runtime& runtime) {
-        return runtime.global().getPropertyAsObject(runtime, "Object").getPropertyAsFunction(runtime, "freeze");
-      },
-      allowCache);
-
-  freezeFn->call(runtime, object);
-}
-
-BorrowingReference<jsi::Function> ObjectUtils::getGlobalFunction(jsi::Runtime& runtime, const char* key,
-                                                                 std::function<jsi::Function(jsi::Runtime&)> getFunction, bool allowCache) {
-  if (allowCache) [[likely]] {
-    // Let's try to find the function in cache
-    FunctionCache& functionCache = _cache[&runtime];
-    std::string stringKey = key;
-    auto iterator = functionCache.find(stringKey);
-    if (iterator != functionCache.end()) {
-      // We found it! Let's check if the reference is still valid...
-      BorrowingReference<jsi::Function> function = iterator->second;
-      if (function != nullptr) [[likely]] {
-        // It's still alive - let's use it from cache!
-        return function;
-      }
-    }
-  }
-  // We haven't found the function with the given key in cache - so let's get it:
-  jsi::Function function = getFunction(runtime);
-  if (allowCache) [[likely]] {
-    // Let's throw it in cache!
-    FunctionCache& functionCache = _cache[&runtime];
-    JSICacheReference jsiCache = JSICache::getOrCreateCache(runtime);
-    BorrowingReference<jsi::Function> sharedFunction = jsiCache.makeShared(std::move(function));
-    functionCache[std::string(key)] = sharedFunction;
-    return sharedFunction;
-  } else {
-    // We are not allowed to use cache - so let's just wrap it in a BorrowingReference to match the return type.
-    jsi::Function* heapFunction = new jsi::Function(std::move(function));
-    return BorrowingReference<jsi::Function>(heapFunction);
-  }
-}
-
-} // namespace margelo::nitro

package/cpp/utils/ObjectUtils.hpp

@@ -1,94 +0,0 @@
-//
-//  ObjectUtils.hpp
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 17.10.25.
-//
-
-#pragma once
-
-#include "BorrowingReference.hpp"
-#include <jsi/jsi.h>
-#include <unordered_map>
-
-namespace margelo::nitro {
-
-using namespace facebook;
-
-struct PlainPropertyDescriptor {
-  bool configurable;
-  bool enumerable;
-  jsi::Value value;
-  bool writable;
-};
-struct ComputedReadonlyPropertyDescriptor {
-  bool configurable;
-  bool enumerable;
-  jsi::Function get;
-};
-struct ComputedPropertyDescriptor {
-  bool configurable;
-  bool enumerable;
-  jsi::Function get;
-  jsi::Function set;
-};
-
-enum class KnownGlobalPropertyName { DISPATCHER, JSI_CACHE, NITRO_MODULES_PROXY };
-
-class ObjectUtils {
-public:
-  ObjectUtils() = delete;
-  ~ObjectUtils() = delete;
-
-public:
-  /**
-   * Create a new `jsi::Object` with the given `prototype`.
-   * Uses a native implementation if possible.
-   */
-  static jsi::Object create(jsi::Runtime& runtime, const jsi::Value& prototype, bool allowCache = true);
-
-  /**
-   * Define a global value for the given Runtime.
-   * In debug, this performs additional safety checks such as freezing the property.
-   */
-  static void defineGlobal(jsi::Runtime& runtime, KnownGlobalPropertyName name, jsi::Value&& value, bool allowCache = true);
-
-  /**
-   * Define a plain property on the given `object` with the given `propertyName`.
-   * The `descriptor` defines the attributes of this property.
-   */
-  static void defineProperty(jsi::Runtime& runtime, const jsi::Object& object, const char* propertyName,
-                             PlainPropertyDescriptor&& descriptor, bool allowCache = true);
-  /**
-   * Define a plain property on the given `object` with the given `propertyName`.
-   * The `descriptor` defines the attributes of this property.
-   */
-  static void defineProperty(jsi::Runtime& runtime, const jsi::Object& object, const char* propertyName,
-                             ComputedReadonlyPropertyDescriptor&& descriptor, bool allowCache = true);
-  /**
-   * Define a plain property on the given `object` with the given `propertyName`.
-   * The `descriptor` defines the attributes of this property.
-   */
-  static void defineProperty(jsi::Runtime& runtime, const jsi::Object& object, const char* propertyName,
-                             ComputedPropertyDescriptor&& descriptor, bool allowCache = true);
-
-  /**
-   * Freezes all values of the given `object`.
-   */
-  static void freeze(jsi::Runtime& runtime, const jsi::Object& object, bool allowCache = true);
-
-  /**
-   * Get a string name for a known global property name.
-   */
-  static const char* getKnownGlobalPropertyNameString(KnownGlobalPropertyName name);
-
-private:
-  using FunctionCache = std::unordered_map<std::string, BorrowingReference<jsi::Function>>;
-  static std::unordered_map<jsi::Runtime*, FunctionCache> _cache;
-
-  static BorrowingReference<jsi::Function> getGlobalFunction(jsi::Runtime& runtime, const char* key,
-                                                             std::function<jsi::Function(jsi::Runtime&)> getFunction,
-                                                             bool allowCache = true);
-};
-
-} // namespace margelo::nitro

package/ios/platform/NitroLogger.mm

@@ -1,36 +0,0 @@
-//
-//  NitroLogger.mm
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 14.07.24.
-//
-
-#include "NitroLogger.hpp"
-#include "NitroDefines.hpp"
-#include <Foundation/Foundation.h>
-
-namespace margelo::nitro {
-
-const char* levelToString(LogLevel level) {
-  switch (level) {
-    case LogLevel::Debug:
-      return "DEBUG";
-    case LogLevel::Info:
-      return "INFO";
-    case LogLevel::Warning:
-      return "WARNING";
-    case LogLevel::Error:
-      return "ERROR";
-    default:
-      throw std::invalid_argument("Invalid LogLevel!");
-  }
-}
-
-void Logger::nativeLog([[maybe_unused]] LogLevel level, [[maybe_unused]] const char* tag, [[maybe_unused]] const std::string& message) {
-#ifdef NITRO_DEBUG
-  const char* logLevel = levelToString(level);
-  NSLog(@"[%s] [Nitro.%s] %s", logLevel, tag, message.c_str());
-#endif
-}
-
-} // namespace margelo::nitro

package/ios/platform/ThreadUtils.mm

@@ -1,46 +0,0 @@
-//
-//  ThreadUtils.mm
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 14.07.24.
-//
-
-#include "ThreadUtils.hpp"
-#include <pthread.h>
-#include <sstream>
-#include <thread>
-
-// ObjC import
-#import <Foundation/Foundation.h>
-
-namespace margelo::nitro {
-
-std::string ThreadUtils::getThreadName() {
-  // Try using NSThread APIs
-  NSString* threadName = NSThread.currentThread.name;
-  if (threadName != nil && threadName.length > 0) {
-    return threadName.UTF8String;
-  }
-
-  // Try using DispatchQueue APIs as fallback
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  dispatch_queue_t queue = dispatch_get_current_queue();
-#pragma clang diagnostic pop
-  const char* label = dispatch_queue_get_label(queue);
-  if (label != nullptr) {
-    return label;
-  }
-
-  // Fall back to this_thread ID
-  std::stringstream stream;
-  stream << std::this_thread::get_id();
-  std::string threadId = stream.str();
-  return "Thread #" + threadId;
-}
-
-void ThreadUtils::setThreadName(const std::string& name) {
-  pthread_setname_np(name.c_str());
-}
-
-} // namespace margelo::nitro