@pigeonmal/react-native-nitro-fetch 0.2.0 → 0.2.1

package/NitroFetch.podspec

@@ -1,30 +1,30 @@
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-
-Pod::Spec.new do |s|
-  s.name         = "NitroFetch"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
-
-  s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "http://google.com.git", :tag => "#{s.version}" }
-
-
-  s.source_files = [
-    "ios/**/*.{swift}",
-    "ios/**/*.{m,mm}",
-    "cpp/**/*.{hpp,cpp}",
-  ]
-
-  s.dependency 'React-jsi'
-  s.dependency 'React-callinvoker'
-
-  load 'nitrogen/generated/ios/NitroFetch+autolinking.rb'
-  add_nitrogen_files(s)
-
-  install_modules_dependencies(s)
-end
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "NitroFetch"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "http://google.com.git", :tag => "#{s.version}" }
+
+
+  s.source_files = [
+    "ios/**/*.{swift}",
+    "ios/**/*.{m,mm}",
+    "cpp/**/*.{hpp,cpp}",
+  ]
+
+  s.dependency 'React-jsi'
+  s.dependency 'React-callinvoker'
+
+  load 'nitrogen/generated/ios/NitroFetch+autolinking.rb'
+  add_nitrogen_files(s)
+
+  install_modules_dependencies(s)
+end

package/android/CMakeLists.txt

@@ -1,70 +1,70 @@
-project(nitrofetch)
-cmake_minimum_required(VERSION 3.9.0)
-
-set(PACKAGE_NAME nitrofetch)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_STANDARD 20)
-
-# Define C++ library and add all sources
-add_library(${PACKAGE_NAME} SHARED
-        src/main/cpp/cpp-adapter.cpp
-)
-
-# Add Nitrogen specs :)
-include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/nitrofetch+autolinking.cmake)
-
-# Set up local includes
-include_directories("src/main/cpp" "../cpp")
-
-# Allow Gradle to pass a CRONET_ROOT pointing to extracted headers/libs (see build.gradle prepareCronet task)
-if (DEFINED CRONET_ROOT)
-    set(CRONET_ROOT_DIR ${CRONET_ROOT})
-else()
-    set(CRONET_ROOT_DIR ${CMAKE_SOURCE_DIR}/cronet)
-endif()
-
-# Optional: include Cronet headers if present (placed by script under android/cronet/include)
-if (EXISTS ${CRONET_ROOT_DIR}/include)
-    message(STATUS "Cronet headers base: ${CRONET_ROOT_DIR}/include")
-    include_directories(${CRONET_ROOT_DIR}/include)
-    # Some Cronet packages nest headers under include/cronet
-    if (EXISTS ${CRONET_ROOT_DIR}/include/cronet)
-        include_directories(${CRONET_ROOT_DIR}/include/cronet)
-        if (EXISTS ${CRONET_ROOT_DIR}/include/cronet/cronet_c.h)
-            message(STATUS "Found cronet_c.h: ${CRONET_ROOT_DIR}/include/cronet/cronet_c.h")
-        else()
-            message(WARNING "cronet_c.h not found under ${CRONET_ROOT_DIR}/include/cronet")
-        endif()
-        if (EXISTS ${CRONET_ROOT_DIR}/include/cronet/cronet.idl_c.h)
-            message(STATUS "Found cronet.idl_c.h: ${CRONET_ROOT_DIR}/include/cronet/cronet.idl_c.h")
-        else()
-            message(WARNING "cronet.idl_c.h not found under ${CRONET_ROOT_DIR}/include/cronet")
-        endif()
-    else()
-        message(WARNING "Cronet nested include dir not found: ${CRONET_ROOT_DIR}/include/cronet")
-    endif()
-endif()
-
-find_library(LOG_LIB log)
-
-# Link all libraries together
-target_link_libraries(
-        ${PACKAGE_NAME}
-        ${LOG_LIB}
-        android # <-- Android core
-)
-
-## Kotlin-based implementation only; no custom C++ headers forced.
-
-# Optional: link Cronet if library file is present (drop-in via prepare script or Gradle task)
-set(CRONET_LIB_DIR ${CRONET_ROOT_DIR}/libs/${ANDROID_ABI})
-if (EXISTS ${CRONET_LIB_DIR})
-    file(GLOB CRONET_LIBS "${CRONET_LIB_DIR}/*cronet*.so")
-    if (CRONET_LIBS)
-        message(STATUS "Linking Cronet from ${CRONET_LIB_DIR}")
-        target_link_libraries(${PACKAGE_NAME} ${CRONET_LIBS})
-        target_compile_definitions(${PACKAGE_NAME} PRIVATE NITROFETCH_LINKS_CRONET=1)
-    else()
-        message(WARNING "Cronet libs not found in ${CRONET_LIB_DIR}")
-    endif()
-endif()
+project(nitrofetch)
+cmake_minimum_required(VERSION 3.9.0)
+
+set(PACKAGE_NAME nitrofetch)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_CXX_STANDARD 20)
+
+# Define C++ library and add all sources
+add_library(${PACKAGE_NAME} SHARED
+        src/main/cpp/cpp-adapter.cpp
+)
+
+# Add Nitrogen specs :)
+include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/nitrofetch+autolinking.cmake)
+
+# Set up local includes
+include_directories("src/main/cpp" "../cpp")
+
+# Allow Gradle to pass a CRONET_ROOT pointing to extracted headers/libs (see build.gradle prepareCronet task)
+if (DEFINED CRONET_ROOT)
+    set(CRONET_ROOT_DIR ${CRONET_ROOT})
+else()
+    set(CRONET_ROOT_DIR ${CMAKE_SOURCE_DIR}/cronet)
+endif()
+
+# Optional: include Cronet headers if present (placed by script under android/cronet/include)
+if (EXISTS ${CRONET_ROOT_DIR}/include)
+    message(STATUS "Cronet headers base: ${CRONET_ROOT_DIR}/include")
+    include_directories(${CRONET_ROOT_DIR}/include)
+    # Some Cronet packages nest headers under include/cronet
+    if (EXISTS ${CRONET_ROOT_DIR}/include/cronet)
+        include_directories(${CRONET_ROOT_DIR}/include/cronet)
+        if (EXISTS ${CRONET_ROOT_DIR}/include/cronet/cronet_c.h)
+            message(STATUS "Found cronet_c.h: ${CRONET_ROOT_DIR}/include/cronet/cronet_c.h")
+        else()
+            message(WARNING "cronet_c.h not found under ${CRONET_ROOT_DIR}/include/cronet")
+        endif()
+        if (EXISTS ${CRONET_ROOT_DIR}/include/cronet/cronet.idl_c.h)
+            message(STATUS "Found cronet.idl_c.h: ${CRONET_ROOT_DIR}/include/cronet/cronet.idl_c.h")
+        else()
+            message(WARNING "cronet.idl_c.h not found under ${CRONET_ROOT_DIR}/include/cronet")
+        endif()
+    else()
+        message(WARNING "Cronet nested include dir not found: ${CRONET_ROOT_DIR}/include/cronet")
+    endif()
+endif()
+
+find_library(LOG_LIB log)
+
+# Link all libraries together
+target_link_libraries(
+        ${PACKAGE_NAME}
+        ${LOG_LIB}
+        android # <-- Android core
+)
+
+## Kotlin-based implementation only; no custom C++ headers forced.
+
+# Optional: link Cronet if library file is present (drop-in via prepare script or Gradle task)
+set(CRONET_LIB_DIR ${CRONET_ROOT_DIR}/libs/${ANDROID_ABI})
+if (EXISTS ${CRONET_LIB_DIR})
+    file(GLOB CRONET_LIBS "${CRONET_LIB_DIR}/*cronet*.so")
+    if (CRONET_LIBS)
+        message(STATUS "Linking Cronet from ${CRONET_LIB_DIR}")
+        target_link_libraries(${PACKAGE_NAME} ${CRONET_LIBS})
+        target_compile_definitions(${PACKAGE_NAME} PRIVATE NITROFETCH_LINKS_CRONET=1)
+    else()
+        message(WARNING "Cronet libs not found in ${CRONET_LIB_DIR}")
+    endif()
+endif()

package/android/build.gradle

@@ -1,127 +1,128 @@
-buildscript {
-  ext.getExtOrDefault = {name ->
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['NitroFetch_' + name]
-  }
-
-  repositories {
-    google()
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "com.android.tools.build:gradle:8.7.2"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
-  }
-}
-
-def reactNativeArchitectures() {
-  def value = rootProject.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-apply from: '../nitrogen/generated/android/nitrofetch+autolinking.gradle'
-
-// Do not apply React Gradle plugin in library to avoid RN codegen duplicating app classes
-
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["NitroFetch_" + name]).toInteger()
-}
-
-android {
-  namespace "com.margelo.nitro.nitrofetch"
-
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
-
-  defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-
-    externalNativeBuild {
-      cmake {
-        cppFlags "-frtti -fexceptions -Wall -fstack-protector-all"
-        arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-        abiFilters (*reactNativeArchitectures())
-      }
-    }
-  }
-
-  externalNativeBuild {
-    cmake {
-      path "CMakeLists.txt"
-    }
-  }
-
-  packagingOptions {
-    excludes = [
-            "**/libc++_shared.so",
-            "**/libfbjni.so",
-            "**/libjsi.so",
-            "**/libfolly_json.so",
-            "**/libfolly_runtime.so",
-            "**/libglog.so",
-            "**/libhermes.so",
-            "**/libhermes-executor-debug.so",
-            "**/libhermes_executor.so",
-            "**/libreactnative.so",
-            "**/libreactnativejni.so",
-            "**/libturbomodulejsijni.so",
-            "**/libreact_nativemodule_core.so",
-            "**/libjscexecutor.so"
-    ]
-  }
-
-  buildFeatures {
-    buildConfig true
-    prefab true
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-
-  lintOptions {
-    disable "GradleCompatible"
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  sourceSets {
-    main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni"
-      ]
-    }
-  }
-}
-
-repositories {
-  mavenCentral()
-  google()
-}
-
-def kotlin_version = getExtOrDefault("kotlinVersion")
-
-dependencies {
-  implementation "com.facebook.react:react-android"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation project(":react-native-nitro-modules")
-  api project(':cronet-release')
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
-
-}
-
-configurations {
-  cronetAar
-}
-
-
-// No automatic fetching of Cronet headers/libs; library uses Cronet Java API only.
+buildscript {
+  ext.getExtOrDefault = {name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['NitroFetch_' + name]
+  }
+
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:8.7.2"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
+  }
+}
+
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+apply from: '../nitrogen/generated/android/nitrofetch+autolinking.gradle'
+
+// Do not apply React Gradle plugin in library to avoid RN codegen duplicating app classes
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["NitroFetch_" + name]).toInteger()
+}
+
+android {
+  namespace "com.margelo.nitro.nitrofetch"
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
+    externalNativeBuild {
+      cmake {
+        cppFlags "-frtti -fexceptions -Wall -fstack-protector-all"
+        arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+        abiFilters (*reactNativeArchitectures())
+      }
+    }
+  }
+
+  externalNativeBuild {
+    cmake {
+      path "CMakeLists.txt"
+    }
+  }
+
+  packagingOptions {
+    excludes = [
+            "**/libc++_shared.so",
+            "**/libfbjni.so",
+            "**/libjsi.so",
+            "**/libfolly_json.so",
+            "**/libfolly_runtime.so",
+            "**/libglog.so",
+            "**/libhermes.so",
+            "**/libhermes-executor-debug.so",
+            "**/libhermes_executor.so",
+            "**/libreactnative.so",
+            "**/libreactnativejni.so",
+            "**/libturbomodulejsijni.so",
+            "**/libreact_nativemodule_core.so",
+            "**/libjscexecutor.so"
+    ]
+  }
+
+  buildFeatures {
+    buildConfig true
+    prefab true
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+    }
+  }
+}
+
+repositories {
+  mavenCentral()
+  google()
+}
+
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
+dependencies {
+  implementation "com.facebook.react:react-android"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation project(":react-native-nitro-modules")
+  api project(':cronet-release')
+  implementation "com.google.protobuf:protobuf-javalite:3.25.8"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
+
+}
+
+configurations {
+  cronetAar
+}
+
+
+// No automatic fetching of Cronet headers/libs; library uses Cronet Java API only.

package/android/cronet-release/build.gradle

@@ -1,2 +1,2 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('cronet-release.aar'))
+configurations.maybeCreate("default")
+artifacts.add("default", file('cronet-release.aar'))

package/android/gradle.properties

@@ -1,5 +1,5 @@
-NitroFetch_kotlinVersion=2.0.21
-NitroFetch_minSdkVersion=24
-NitroFetch_targetSdkVersion=34
-NitroFetch_compileSdkVersion=35
-NitroFetch_ndkVersion=27.1.12297006
+NitroFetch_kotlinVersion=2.0.21
+NitroFetch_minSdkVersion=24
+NitroFetch_targetSdkVersion=34
+NitroFetch_compileSdkVersion=35
+NitroFetch_ndkVersion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

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

@@ -1,6 +1,6 @@
-#include <jni.h>
-#include "nitrofetchOnLoad.hpp"
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::nitrofetch::initialize(vm);
-}
+#include <jni.h>
+#include "nitrofetchOnLoad.hpp"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+  return margelo::nitro::nitrofetch::initialize(vm);
+}

package/android/src/main/java/com/margelo/nitro/nitrofetch/AutoPrefetcher.kt

@@ -1,72 +1,72 @@
-package com.margelo.nitro.nitrofetch
-
-import android.app.Application
-import android.content.Context
-import org.json.JSONArray
-import org.json.JSONObject
-import java.util.concurrent.CompletableFuture
-
-
-object AutoPrefetcher {
-  @Volatile private var initialized = false
-  private const val KEY_QUEUE = "nitrofetch_autoprefetch_queue"
-  private const val PREFS_NAME = "nitro_fetch_storage"
-
-  fun prefetchOnStart(app: Application) {
-    if (initialized) return
-    initialized = true
-    try {
-      val prefs = app.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-      val raw = prefs.getString(KEY_QUEUE, null) ?: ""
-      if (raw.isEmpty()) return
-      val arr = JSONArray(raw)
-      for (i in 0 until arr.length()) {
-        val o = arr.optJSONObject(i) ?: continue
-        val url = o.optString("url", null) ?: continue
-        val prefetchKey = o.optString("prefetchKey", null) ?: continue
-        val headersObj = o.optJSONObject("headers") ?: JSONObject()
-        val headersList = mutableListOf<Pair<String, String>>()
-        headersObj.keys().forEachRemaining { k ->
-          headersList.add(k to headersObj.optString(k, ""))
-        }
-        // Ensure prefetchKey header is present
-        headersList.add("prefetchKey" to prefetchKey)
-
-        val headerObjs = headersList.map { (k, v) -> NitroHeader(k, v) }.toTypedArray()
-        val req = NitroRequest(
-          url = url,
-          method = null,
-          headers = headerObjs,
-          bodyString = null,
-          bodyBytes = null,
-          timeoutMs = null,
-          followRedirects = null
-        )
-
-        // If already pending or fresh, skip starting a new one
-        if (FetchCache.getPending(prefetchKey) != null) continue
-        if (FetchCache.hasFreshResult(prefetchKey, 5_000L)) continue
-
-        val future = CompletableFuture<NitroResponse>()
-        FetchCache.setPending(prefetchKey, future)
-        NitroFetchClient.fetch(req,
-          onSuccess = { res ->
-            try {
-              FetchCache.complete(prefetchKey, res)
-              future.complete(res)
-            } catch (t: Throwable) {
-              FetchCache.completeExceptionally(prefetchKey, t)
-              future.completeExceptionally(t)
-            }
-          },
-          onFail = { err ->
-            FetchCache.completeExceptionally(prefetchKey, err)
-            future.completeExceptionally(err)
-          }
-        )
-      }
-    } catch (_: Throwable) {
-      // ignore – prefetch-on-start is best-effort
-    }
-  }
-}
+package com.margelo.nitro.nitrofetch
+
+import android.app.Application
+import android.content.Context
+import org.json.JSONArray
+import org.json.JSONObject
+import java.util.concurrent.CompletableFuture
+
+
+object AutoPrefetcher {
+  @Volatile private var initialized = false
+  private const val KEY_QUEUE = "nitrofetch_autoprefetch_queue"
+  private const val PREFS_NAME = "nitro_fetch_storage"
+
+  fun prefetchOnStart(app: Application) {
+    if (initialized) return
+    initialized = true
+    try {
+      val prefs = app.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+      val raw = prefs.getString(KEY_QUEUE, null) ?: ""
+      if (raw.isEmpty()) return
+      val arr = JSONArray(raw)
+      for (i in 0 until arr.length()) {
+        val o = arr.optJSONObject(i) ?: continue
+        val url = o.optString("url", null) ?: continue
+        val prefetchKey = o.optString("prefetchKey", null) ?: continue
+        val headersObj = o.optJSONObject("headers") ?: JSONObject()
+        val headersList = mutableListOf<Pair<String, String>>()
+        headersObj.keys().forEachRemaining { k ->
+          headersList.add(k to headersObj.optString(k, ""))
+        }
+        // Ensure prefetchKey header is present
+        headersList.add("prefetchKey" to prefetchKey)
+
+        val headerObjs = headersList.map { (k, v) -> NitroHeader(k, v) }.toTypedArray()
+        val req = NitroRequest(
+          url = url,
+          method = null,
+          headers = headerObjs,
+          bodyString = null,
+          bodyBytes = null,
+          timeoutMs = null,
+          followRedirects = null
+        )
+
+        // If already pending or fresh, skip starting a new one
+        if (FetchCache.getPending(prefetchKey) != null) continue
+        if (FetchCache.hasFreshResult(prefetchKey, 5_000L)) continue
+
+        val future = CompletableFuture<NitroResponse>()
+        FetchCache.setPending(prefetchKey, future)
+        NitroFetchClient.fetch(req,
+          onSuccess = { res ->
+            try {
+              FetchCache.complete(prefetchKey, res)
+              future.complete(res)
+            } catch (t: Throwable) {
+              FetchCache.completeExceptionally(prefetchKey, t)
+              future.completeExceptionally(t)
+            }
+          },
+          onFail = { err ->
+            FetchCache.completeExceptionally(prefetchKey, err)
+            future.completeExceptionally(err)
+          }
+        )
+      }
+    } catch (_: Throwable) {
+      // ignore – prefetch-on-start is best-effort
+    }
+  }
+}