react-native-nitro-buffer 0.0.14 → 0.2.0

package/android/CMakeLists.txt

@@ -9,6 +9,9 @@ add_library(NitroBuffer SHARED
     ../cpp/HybridNitroBuffer.cpp
 )
 
+# Force both hash styles (sysv and gnu) for Android loader compatibility
+target_link_options(NitroBuffer PRIVATE "-Wl,--hash-style=both")
+
 # Include paths for our headers
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../cpp
@@ -23,3 +26,8 @@ target_link_libraries(
     NitroBuffer
     ${LOG_LIB}
 )
+
+# Android 15 16KB page size alignment
+if(ANDROID_ABI STREQUAL "arm64-v8a" OR ANDROID_ABI STREQUAL "x86_64")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")
+endif()

package/android/build.gradle

@@ -22,7 +22,7 @@ android {
     externalNativeBuild {
       cmake {
         cppFlags "-fexceptions -frtti -std=c++20"
-        arguments "-DANDROID_STL=c++_shared"
+        arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
         abiFilters (*reactNativeArchitectures())
       }
     }

package/cpp/HybridNitroBuffer.cpp

@@ -158,7 +158,7 @@ std::shared_ptr<ArrayBuffer> HybridNitroBuffer::allocUnsafe(double size) {
 double HybridNitroBuffer::byteLength(const std::string &string,
                                      const std::string &encoding) {
   if (encoding == "hex") {
-    return string.length() / 2;
+    return (double)(string.length() / 2);
   } else if (encoding == "base64") {
     size_t len = string.length();
     if (len == 0)
@@ -168,10 +168,33 @@ double HybridNitroBuffer::byteLength(const std::string &string,
       padding++;
     if (len > 1 && string[len - 2] == '=')
       padding++;
-    return (len * 3) / 4 - padding;
+    return (double)((len * 3) / 4 - padding);
+  } else if (encoding == "binary" || encoding == "latin1") {
+    // Each character in the original string (0-255) maps to one byte.
+    // The input 'string' is UTF-8 encoded. We count Unicode code points.
+    size_t count = 0;
+    size_t i = 0;
+    size_t len = string.length();
+    const char *str = string.c_str();
+    while (i < len) {
+      unsigned char byte = static_cast<unsigned char>(str[i]);
+      if (byte <= 0x7F) {
+        i += 1;
+      } else if ((byte & 0xE0) == 0xC0) {
+        i += 2;
+      } else if ((byte & 0xF0) == 0xE0) {
+        i += 3;
+      } else if ((byte & 0xF8) == 0xF0) {
+        i += 4;
+      } else {
+        i += 1;
+      }
+      count++;
+    }
+    return (double)count;
   }
   // utf8 (default)
-  return string.length();
+  return (double)string.length();
 }
 
 double HybridNitroBuffer::write(const std::shared_ptr<ArrayBuffer> &buffer,
@@ -191,7 +214,7 @@ double HybridNitroBuffer::write(const std::shared_ptr<ArrayBuffer> &buffer,
     size_t strLen = string.length();
     size_t actualWrite = std::min(toWrite, strLen);
     memcpy(data + start, string.c_str(), actualWrite);
-    return actualWrite;
+    return (double)actualWrite;
   } else if (encoding == "hex") {
     size_t strLen = string.length();
     size_t bytesCount = strLen / 2;
@@ -202,19 +225,58 @@ double HybridNitroBuffer::write(const std::shared_ptr<ArrayBuffer> &buffer,
           (unsigned char)strtol(byteString.c_str(), nullptr, 16);
       data[start + i] = byte;
     }
-    return actualWrite;
+    return (double)actualWrite;
   } else if (encoding == "base64") {
     std::vector<unsigned char> decoded = base64_decode(string);
     size_t actualWrite = std::min(toWrite, decoded.size());
     memcpy(data + start, decoded.data(), actualWrite);
-    return actualWrite;
+    return (double)actualWrite;
+  } else if (encoding == "binary" || encoding == "latin1") {
+    // Decode UTF-8 string back to raw bytes (0x00-0xFF)
+    size_t written = 0;
+    size_t i = 0;
+    const char *str = string.c_str();
+    size_t utf8Len = string.length();
+
+    while (i < utf8Len && written < toWrite) {
+      unsigned char byte = static_cast<unsigned char>(str[i]);
+      uint32_t codePoint = 0;
+      size_t seqLen = 0;
+
+      if (byte <= 0x7F) {
+        codePoint = byte;
+        seqLen = 1;
+      } else if ((byte & 0xE0) == 0xC0 && i + 1 < utf8Len) {
+        codePoint = ((byte & 0x1F) << 6) |
+                    (static_cast<unsigned char>(str[i + 1]) & 0x3F);
+        seqLen = 2;
+      } else if ((byte & 0xF0) == 0xE0 && i + 2 < utf8Len) {
+        codePoint = ((byte & 0x0F) << 12) |
+                    ((static_cast<unsigned char>(str[i + 1]) & 0x3F) << 6) |
+                    (static_cast<unsigned char>(str[i + 2]) & 0x3F);
+        seqLen = 3;
+      } else if ((byte & 0xF8) == 0xF0 && i + 3 < utf8Len) {
+        codePoint = ((byte & 0x07) << 18) |
+                    ((static_cast<unsigned char>(str[i + 1]) & 0x3F) << 12) |
+                    ((static_cast<unsigned char>(str[i + 2]) & 0x3F) << 6) |
+                    (static_cast<unsigned char>(str[i + 3]) & 0x3F);
+        seqLen = 4;
+      } else {
+        codePoint = byte;
+        seqLen = 1;
+      }
+
+      data[start + written++] = static_cast<uint8_t>(codePoint & 0xFF);
+      i += seqLen;
+    }
+    return (double)written;
   }
 
   // Fallback utf8
   size_t strLen = string.length();
   size_t actualWrite = std::min(toWrite, strLen);
   memcpy(data + start, string.c_str(), actualWrite);
-  return actualWrite;
+  return (double)actualWrite;
 }
 
 // UTF-8 replacement character (U+FFFD) encoded as UTF-8

package/nitrogen/generated/android/NitroBuffer+autolinking.cmake

@@ -2,7 +2,7 @@
 # NitroBuffer+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2025 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroBuffer+autolinking.gradle

@@ -2,7 +2,7 @@
 /// NitroBuffer+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroBufferOnLoad.cpp

@@ -2,7 +2,7 @@
 /// NitroBufferOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_NITROBUFFER_WITH_GENERATED_CMAKE_PROJECT
@@ -20,25 +20,30 @@
 namespace margelo::nitro::buffer {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::buffer::registerAllNatives();
+  });
+}
+
+
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::buffer;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "NitroBuffer",
-      []() -> std::shared_ptr<HybridObject> {
-        static_assert(std::is_default_constructible_v<HybridNitroBuffer>,
-                      "The HybridObject \"HybridNitroBuffer\" is not default-constructible! "
-                      "Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
-        return std::make_shared<HybridNitroBuffer>();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "NitroBuffer",
+    []() -> std::shared_ptr<HybridObject> {
+      static_assert(std::is_default_constructible_v<HybridNitroBuffer>,
+                    "The HybridObject \"HybridNitroBuffer\" is not default-constructible! "
+                    "Create a public constructor that takes zero arguments to be able to autolink this HybridObject.");
+      return std::make_shared<HybridNitroBuffer>();
+    }
+  );
 }
 
 } // namespace margelo::nitro::buffer

package/nitrogen/generated/android/NitroBufferOnLoad.hpp

@@ -2,24 +2,33 @@
 /// NitroBufferOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::buffer {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of NitroBuffer, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of NitroBuffer, 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::buffer::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all NitroBuffer HybridObjects
+   *     margelo::nitro::buffer::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::buffer

package/nitrogen/generated/android/kotlin/com/margelo/nitro/buffer/NitroBufferOnLoad.kt

@@ -2,7 +2,7 @@
 /// NitroBufferOnLoad.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.buffer

package/nitrogen/generated/ios/NitroBuffer+autolinking.rb

@@ -2,7 +2,7 @@
 # NitroBuffer+autolinking.rb
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2025 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a Ruby script that adds all files generated by Nitrogen

package/nitrogen/generated/ios/NitroBuffer-Swift-Cxx-Bridge.cpp

@@ -2,7 +2,7 @@
 /// NitroBuffer-Swift-Cxx-Bridge.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "NitroBuffer-Swift-Cxx-Bridge.hpp"

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

@@ -2,7 +2,7 @@
 /// NitroBuffer-Swift-Cxx-Bridge.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/ios/NitroBuffer-Swift-Cxx-Umbrella.hpp

@@ -2,7 +2,7 @@
 /// NitroBuffer-Swift-Cxx-Umbrella.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/ios/NitroBufferAutolinking.mm

@@ -2,7 +2,7 @@
 /// NitroBufferAutolinking.mm
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #import <Foundation/Foundation.h>

package/nitrogen/generated/ios/NitroBufferAutolinking.swift

@@ -2,9 +2,13 @@
 /// NitroBufferAutolinking.swift
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
+import NitroModules
+
+// TODO: Use empty enums once Swift supports exporting them as namespaces
+//       See: https://github.com/swiftlang/swift/pull/83616
 public final class NitroBufferAutolinking {
   public typealias bridge = margelo.nitro.buffer.bridge.swift
 

package/nitrogen/generated/shared/c++/HybridNitroBufferSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridNitroBufferSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "HybridNitroBufferSpec.hpp"

package/nitrogen/generated/shared/c++/HybridNitroBufferSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridNitroBufferSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-nitro-buffer",
-    "version": "0.0.14",
+    "version": "0.2.0",
     "description": "The fastest, 100% Node.js-compatible Buffer implementation for React Native, powered by Nitro Modules and C++.",
     "type": "module",
     "main": "lib/index.js",
@@ -8,7 +8,7 @@
     "types": "lib/index.d.ts",
     "react-native": "src/index.ts",
     "scripts": {
-        "build": "npx nitrogen@0.32.0 && tsc",
+        "build": "npx nitrogen@0.35.0 && tsc",
         "test": "jest",
         "prepublishOnly": "npm run build"
     },
@@ -25,14 +25,14 @@
     "peerDependencies": {
         "react": "*",
         "react-native": "*",
-        "react-native-nitro-modules": "^0.32.0"
+        "react-native-nitro-modules": "^0.35.0"
     },
     "devDependencies": {
         "@types/jest": "^30.0.0",
         "@types/node": "^18.19.130",
         "@types/react": "*",
         "jest": "^29.0.0",
-        "react-native-nitro-modules": "^0.32.0",
+        "react-native-nitro-modules": "^0.35.0",
         "ts-jest": "^29.0.0",
         "typescript": "^5.0.0"
     },