react-native-nitro-fetch 1.2.1 → 1.3.1

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

@@ -31,9 +31,21 @@ object AutoPrefetcher {
     context: Context,
     url: String,
     prefetchKey: String,
-    headers: Map<String, String> = emptyMap()
+    headers: Map<String, String> = emptyMap(),
+    method: String? = null,
+    bodyString: String? = null,
+    bodyBytes: String? = null,
+    bodyFormData: List<Map<String, String?>>? = null,
+    timeoutMs: Double? = null,
+    followRedirects: Boolean? = null,
+    prefetchCacheTtlMs: Double? = null,
   ) {
     if (url.isEmpty() || prefetchKey.isEmpty()) return
+    val entry = buildEntryJson(
+      url, prefetchKey, headers,
+      method, bodyString, bodyBytes, bodyFormData, timeoutMs, followRedirects,
+      prefetchCacheTtlMs
+    )
     try {
       val prefs = context.applicationContext
         .getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
@@ -46,14 +58,6 @@ object AutoPrefetcher {
         if (o.optString("prefetchKey", "") == prefetchKey) continue
         next.put(o)
       }
-
-      val headersObj = JSONObject()
-      headers.forEach { (k, v) -> headersObj.put(k, v) }
-      val entry = JSONObject().apply {
-        put("url", url)
-        put("prefetchKey", prefetchKey)
-        put("headers", headersObj)
-      }
       next.put(entry)
       prefs.edit().putString(KEY_QUEUE, next.toString()).apply()
     } catch (_: Throwable) {
@@ -73,15 +77,7 @@ object AutoPrefetcher {
           } catch (_: Throwable) { emptyMap() }
         } else emptyMap()
 
-        val single = JSONArray().apply {
-          val headersObj = JSONObject()
-          headers.forEach { (k, v) -> headersObj.put(k, v) }
-          put(JSONObject().apply {
-            put("url", url)
-            put("prefetchKey", prefetchKey)
-            put("headers", headersObj)
-          })
-        }
+        val single = JSONArray().apply { put(entry) }
         startPrefetches(single, tokenHeaders)
       } catch (_: Throwable) {}
     }
@@ -169,21 +165,13 @@ object AutoPrefetcher {
 
       android.util.Log.d("NitroFetch", "[TokenRefresh] Prefetching $url with ${merged.size} header(s)")
       merged.forEach { (k, v) -> android.util.Log.d("NitroFetch", "[TokenRefresh]   $k: $v") }
-      val headerObjs = merged.map { (k, v) -> NitroHeader(k, v) }.toTypedArray()
-      val req = NitroRequest(
-        url = url,
-        method = null,
-        headers = headerObjs,
-        bodyString = null,
-        bodyBytes = null,
-        bodyFormData = null,
-        timeoutMs = null,
-        followRedirects = null,
-        requestId = null
-      )
+      val req = buildNitroRequestFromEntry(url, merged, o)
 
       if (FetchCache.getPending(prefetchKey) != null) continue
-      if (FetchCache.hasFreshResult(prefetchKey, 5_000L)) continue
+      val entryTtlMs = if (o.has("prefetchCacheTtlMs") && !o.isNull("prefetchCacheTtlMs")) {
+        o.optDouble("prefetchCacheTtlMs").toLong()
+      } else 5_000L
+      if (FetchCache.hasFreshResult(prefetchKey, entryTtlMs)) continue
 
       val future = CompletableFuture<NitroResponse>()
       FetchCache.setPending(prefetchKey, future)
@@ -205,6 +193,101 @@ object AutoPrefetcher {
     }
   }
 
+  private fun buildEntryJson(
+    url: String,
+    prefetchKey: String,
+    headers: Map<String, String>,
+    method: String?,
+    bodyString: String?,
+    bodyBytes: String?,
+    bodyFormData: List<Map<String, String?>>?,
+    timeoutMs: Double?,
+    followRedirects: Boolean?,
+    prefetchCacheTtlMs: Double? = null,
+  ): JSONObject {
+    val headersObj = JSONObject()
+    headers.forEach { (k, v) -> headersObj.put(k, v) }
+    return JSONObject().apply {
+      put("url", url)
+      put("prefetchKey", prefetchKey)
+      put("headers", headersObj)
+      if (method != null && method.isNotEmpty() && method != "GET") put("method", method)
+      if (bodyString != null) put("bodyString", bodyString)
+      if (bodyBytes != null) put("bodyBytes", bodyBytes)
+      if (!bodyFormData.isNullOrEmpty()) {
+        val arr = JSONArray()
+        bodyFormData.forEach { part ->
+          val obj = JSONObject()
+          part["name"]?.let { obj.put("name", it) }
+          part["value"]?.let { obj.put("value", it) }
+          part["fileUri"]?.let { obj.put("fileUri", it) }
+          part["fileName"]?.let { obj.put("fileName", it) }
+          part["mimeType"]?.let { obj.put("mimeType", it) }
+          arr.put(obj)
+        }
+        put("bodyFormData", arr)
+      }
+      if (timeoutMs != null) put("timeoutMs", timeoutMs)
+      if (followRedirects == false) put("followRedirects", false)
+      if (prefetchCacheTtlMs != null) put("prefetchCacheTtlMs", prefetchCacheTtlMs)
+    }
+  }
+
+  private fun buildNitroRequestFromEntry(
+    url: String,
+    mergedHeaders: Map<String, String>,
+    entry: JSONObject?,
+  ): NitroRequest {
+    val headerObjs = mergedHeaders.map { (k, v) -> NitroHeader(k, v) }.toTypedArray()
+
+    val methodStr = entry?.optString("method", "")?.takeIf { it.isNotEmpty() }
+    val method: NitroRequestMethod? = methodStr?.let {
+      runCatching { NitroRequestMethod.valueOf(it) }.getOrNull()
+    }
+    val bodyString = entry
+      ?.takeIf { it.has("bodyString") && !it.isNull("bodyString") }
+      ?.optString("bodyString")
+    val bodyBytes = entry
+      ?.takeIf { it.has("bodyBytes") && !it.isNull("bodyBytes") }
+      ?.optString("bodyBytes")
+    val timeoutMs = entry
+      ?.takeIf { it.has("timeoutMs") && !it.isNull("timeoutMs") }
+      ?.optDouble("timeoutMs")
+    val followRedirects = entry
+      ?.takeIf { it.has("followRedirects") && !it.isNull("followRedirects") }
+      ?.optBoolean("followRedirects")
+    val prefetchCacheTtlMs = entry
+      ?.takeIf { it.has("prefetchCacheTtlMs") && !it.isNull("prefetchCacheTtlMs") }
+      ?.optDouble("prefetchCacheTtlMs")
+
+    val formArr = entry?.optJSONArray("bodyFormData")
+    val bodyFormData: Array<NitroFormDataPart>? = formArr?.let { ja ->
+      Array(ja.length()) { i ->
+        val p = ja.optJSONObject(i) ?: JSONObject()
+        NitroFormDataPart(
+          name = p.optString("name", ""),
+          value = if (p.has("value") && !p.isNull("value")) p.optString("value") else null,
+          fileUri = if (p.has("fileUri") && !p.isNull("fileUri")) p.optString("fileUri") else null,
+          fileName = if (p.has("fileName") && !p.isNull("fileName")) p.optString("fileName") else null,
+          mimeType = if (p.has("mimeType") && !p.isNull("mimeType")) p.optString("mimeType") else null
+        )
+      }
+    }
+
+    return NitroRequest(
+      url = url,
+      method = method,
+      headers = headerObjs,
+      bodyString = bodyString,
+      bodyBytes = bodyBytes,
+      bodyFormData = bodyFormData,
+      timeoutMs = timeoutMs,
+      followRedirects = followRedirects,
+      prefetchCacheTtlMs = prefetchCacheTtlMs,
+      requestId = null
+    )
+  }
+
   // MARK: - Token refresh (synchronous, runs on background thread)
 
   private fun callTokenRefreshSync(config: JSONObject): Map<String, String>? {

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

@@ -14,6 +14,9 @@ import org.chromium.net.UrlResponseInfo
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.nio.ByteBuffer
+import java.nio.charset.Charset
+import java.nio.charset.CharsetDecoder
+import java.nio.charset.CodingErrorAction
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executor
@@ -27,6 +30,33 @@ fun ByteBuffer.toByteArray(): ByteArray {
   return arr
 }
 
+// Strict UTF-8 decoder reused per-thread. Decoding response bodies is on the hot
+// path for every request; allocating a fresh decoder each time is wasteful, and
+// CharsetDecoder is not thread-safe — a ThreadLocal gives us both. REPORT (rather
+// than the default REPLACE) makes invalid UTF-8 throw, which is how we detect a
+// binary body instead of silently corrupting it with U+FFFD replacement chars.
+private val utf8StrictDecoder = ThreadLocal.withInitial {
+  Charsets.UTF_8.newDecoder()
+    .onMalformedInput(CodingErrorAction.REPORT)
+    .onUnmappableCharacter(CodingErrorAction.REPORT)
+}
+
+private fun strictDecoderFor(charset: Charset): CharsetDecoder =
+  if (charset == Charsets.UTF_8) {
+    utf8StrictDecoder.get()
+  } else {
+    charset.newDecoder()
+      .onMalformedInput(CodingErrorAction.REPORT)
+      .onUnmappableCharacter(CodingErrorAction.REPORT)
+  }
+
+// Wrap raw bytes into a Nitro ArrayBuffer for zero-base64 bridging to JS.
+private fun ByteArray.toArrayBuffer(): ArrayBuffer {
+  val ab = ArrayBuffer.allocate(this.size)
+  ab.getBuffer(false).put(this)
+  return ab
+}
+
 @DoNotStrip
 class NitroFetchClient(private val engine: CronetEngine, private val executor: Executor) : HybridNitroFetchClientSpec() {
   
@@ -187,7 +217,14 @@ class NitroFetchClient(private val engine: CronetEngine, private val executor: E
                 Charsets.UTF_8
               }
             }
-            val bodyStr = try { String(bytes, charset) } catch (_: Throwable) { String(bytes, Charsets.UTF_8) }
+            // Strict-decode the body as text. If it fails the response is binary,
+            // so we bridge the raw bytes as an ArrayBuffer instead — no base64.
+            val bodyStr: String? = try {
+              strictDecoderFor(charset).decode(ByteBuffer.wrap(bytes)).toString()
+            } catch (_: Throwable) { null }
+            val bodyBytesAb: ArrayBuffer? = if (bodyStr == null && bytes.isNotEmpty())
+              bytes.toArrayBuffer()
+            else null
             val res = NitroResponse(
               url = info.url,
               status = status.toDouble(),
@@ -196,7 +233,7 @@ class NitroFetchClient(private val engine: CronetEngine, private val executor: E
               redirected = info.url != url,
               headers = headersArr,
               bodyString = bodyStr,
-              bodyBytes = null
+              bodyBytes = bodyBytesAb
             )
             onSuccess(res)
           } catch (t: Throwable) {
@@ -366,7 +403,7 @@ class NitroFetchClient(private val engine: CronetEngine, private val executor: E
           throw e.cause ?: e
         }
       }
-      FetchCache.getResultIfFresh(key, 5_000L)?.let { cached ->
+      FetchCache.getResultIfFresh(key, req.prefetchCacheTtlMs?.toLong() ?: 5_000L)?.let { cached ->
         return withPrefetchedHeader(cached)
       }
     }
@@ -408,8 +445,8 @@ class NitroFetchClient(private val engine: CronetEngine, private val executor: E
         }
         return promise
       }
-      // If a fresh prefetched result exists (<=5s old), return it immediately
-      FetchCache.getResultIfFresh(key, 5_000L)?.let { cached ->
+      // If a fresh prefetched result exists, return it immediately
+      FetchCache.getResultIfFresh(key, req.prefetchCacheTtlMs?.toLong() ?: 5_000L)?.let { cached ->
         promise.resolve(withPrefetchedHeader(cached))
         return promise
       }
@@ -442,7 +479,7 @@ class NitroFetchClient(private val engine: CronetEngine, private val executor: E
       return promise
     }
     // If already have a fresh result, resolve immediately (NON-DESTRUCTIVE CHECK)
-    if (FetchCache.hasFreshResult(key, 5_000L)) {
+    if (FetchCache.hasFreshResult(key, req.prefetchCacheTtlMs?.toLong() ?: 5_000L)) {
       promise.resolve(Unit)
       return promise
     }

package/ios/NitroAutoPrefetcher.h

@@ -20,6 +20,27 @@ NS_ASSUME_NONNULL_BEGIN
                     prefetchKey:(NSString *)prefetchKey
                         headers:(NSDictionary<NSString *, NSString *> *)headers;
 
++ (void)registerPrefetchWithURL:(NSString *)url
+                    prefetchKey:(NSString *)prefetchKey
+                        headers:(NSDictionary<NSString *, NSString *> *)headers
+                         method:(nullable NSString *)method
+                     bodyString:(nullable NSString *)bodyString
+                      bodyBytes:(nullable NSString *)bodyBytes
+                   bodyFormData:(nullable NSArray<NSDictionary<NSString *, NSString *> *> *)bodyFormData
+                      timeoutMs:(nullable NSNumber *)timeoutMs
+                followRedirects:(nullable NSNumber *)followRedirects;
+
++ (void)registerPrefetchWithURL:(NSString *)url
+                    prefetchKey:(NSString *)prefetchKey
+                        headers:(NSDictionary<NSString *, NSString *> *)headers
+                         method:(nullable NSString *)method
+                     bodyString:(nullable NSString *)bodyString
+                      bodyBytes:(nullable NSString *)bodyBytes
+                   bodyFormData:(nullable NSArray<NSDictionary<NSString *, NSString *> *> *)bodyFormData
+                      timeoutMs:(nullable NSNumber *)timeoutMs
+                followRedirects:(nullable NSNumber *)followRedirects
+             prefetchCacheTtlMs:(nullable NSNumber *)prefetchCacheTtlMs;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/NitroAutoPrefetcher.swift

@@ -20,8 +20,80 @@ public final class NitroAutoPrefetcher: NSObject {
     url: String,
     prefetchKey: String,
     headers: [String: String]
+  ) {
+    registerPrefetchInternal(
+      url: url, prefetchKey: prefetchKey, headers: headers,
+      method: nil, bodyString: nil, bodyBytes: nil,
+      bodyFormData: nil, timeoutMs: nil, followRedirects: nil,
+      prefetchCacheTtlMs: nil
+    )
+  }
+
+  @objc(registerPrefetchWithURL:prefetchKey:headers:method:bodyString:bodyBytes:bodyFormData:timeoutMs:followRedirects:)
+  public static func registerPrefetch(
+    url: String,
+    prefetchKey: String,
+    headers: [String: String],
+    method: String?,
+    bodyString: String?,
+    bodyBytes: String?,
+    bodyFormData: [[String: String]]?,
+    timeoutMs: NSNumber?,
+    followRedirects: NSNumber?
+  ) {
+    registerPrefetchInternal(
+      url: url, prefetchKey: prefetchKey, headers: headers,
+      method: method, bodyString: bodyString, bodyBytes: bodyBytes,
+      bodyFormData: bodyFormData,
+      timeoutMs: timeoutMs?.doubleValue,
+      followRedirects: followRedirects?.boolValue,
+      prefetchCacheTtlMs: nil
+    )
+  }
+
+  @objc(registerPrefetchWithURL:prefetchKey:headers:method:bodyString:bodyBytes:bodyFormData:timeoutMs:followRedirects:prefetchCacheTtlMs:)
+  public static func registerPrefetch(
+    url: String,
+    prefetchKey: String,
+    headers: [String: String],
+    method: String?,
+    bodyString: String?,
+    bodyBytes: String?,
+    bodyFormData: [[String: String]]?,
+    timeoutMs: NSNumber?,
+    followRedirects: NSNumber?,
+    prefetchCacheTtlMs: NSNumber?
+  ) {
+    registerPrefetchInternal(
+      url: url, prefetchKey: prefetchKey, headers: headers,
+      method: method, bodyString: bodyString, bodyBytes: bodyBytes,
+      bodyFormData: bodyFormData,
+      timeoutMs: timeoutMs?.doubleValue,
+      followRedirects: followRedirects?.boolValue,
+      prefetchCacheTtlMs: prefetchCacheTtlMs?.doubleValue
+    )
+  }
+
+  private static func registerPrefetchInternal(
+    url: String,
+    prefetchKey: String,
+    headers: [String: String],
+    method: String?,
+    bodyString: String?,
+    bodyBytes: String?,
+    bodyFormData: [[String: String]]?,
+    timeoutMs: Double?,
+    followRedirects: Bool?,
+    prefetchCacheTtlMs: Double?
   ) {
     if url.isEmpty || prefetchKey.isEmpty { return }
+    let entry = buildEntryDict(
+      url: url, prefetchKey: prefetchKey, headers: headers,
+      method: method, bodyString: bodyString, bodyBytes: bodyBytes,
+      bodyFormData: bodyFormData, timeoutMs: timeoutMs,
+      followRedirects: followRedirects,
+      prefetchCacheTtlMs: prefetchCacheTtlMs
+    )
     let userDefaults = UserDefaults(suiteName: suiteName) ?? UserDefaults.standard
 
     var arr: [[String: Any]] = []
@@ -32,11 +104,7 @@ public final class NitroAutoPrefetcher: NSObject {
       arr = parsed
     }
     arr.removeAll { ($0["prefetchKey"] as? String) == prefetchKey }
-    arr.append([
-      "url": url,
-      "prefetchKey": prefetchKey,
-      "headers": headers,
-    ])
+    arr.append(entry)
     if let data = try? JSONSerialization.data(withJSONObject: arr),
        let str = String(data: data, encoding: .utf8) {
       userDefaults.set(str, forKey: queueKey)
@@ -55,17 +123,7 @@ public final class NitroAutoPrefetcher: NSObject {
       for (k, v) in tokenHeaders { merged[k] = v }
       var hdrs: [NitroHeader] = merged.map { NitroHeader(key: $0.key, value: $0.value) }
       hdrs.append(NitroHeader(key: "prefetchKey", value: prefetchKey))
-      let req = NitroRequest(
-        url: url,
-        method: nil,
-        headers: hdrs,
-        bodyString: nil,
-        bodyBytes: nil,
-        bodyFormData: nil,
-        timeoutMs: nil,
-        followRedirects: true,
-        requestId: nil
-      )
+      let req = buildNitroRequest(from: entry, mergedHeaders: hdrs)
       Task {
         do { try await NitroFetchClient.prefetchStatic(req) } catch { /* best-effort */ }
       }
@@ -143,17 +201,7 @@ public final class NitroAutoPrefetcher: NSObject {
         print("[NitroFetch][TokenRefresh] Prefetching \(url) with \(merged.count) header(s)")
         for (k, v) in merged { print("[NitroFetch][TokenRefresh]   \(k): \(v)") }
 
-        let req = NitroRequest(
-          url: url,
-          method: nil,
-          headers: headers,
-          bodyString: nil,
-          bodyBytes: nil,
-          bodyFormData: nil,
-          timeoutMs: nil,
-          followRedirects: true,
-          requestId: nil
-        )
+        let req = buildNitroRequest(from: obj, mergedHeaders: headers)
         Task {
           do { try await NitroFetchClient.prefetchStatic(req) } catch { /* ignore – best effort */ }
         }
@@ -161,6 +209,80 @@ public final class NitroAutoPrefetcher: NSObject {
     }
   }
 
+  private static func buildEntryDict(
+    url: String,
+    prefetchKey: String,
+    headers: [String: String],
+    method: String?,
+    bodyString: String?,
+    bodyBytes: String?,
+    bodyFormData: [[String: String]]?,
+    timeoutMs: Double?,
+    followRedirects: Bool?,
+    prefetchCacheTtlMs: Double? = nil
+  ) -> [String: Any] {
+    var entry: [String: Any] = [
+      "url": url,
+      "prefetchKey": prefetchKey,
+      "headers": headers,
+    ]
+    if let method = method, !method.isEmpty, method != "GET" { entry["method"] = method }
+    if let bodyString = bodyString { entry["bodyString"] = bodyString }
+    if let bodyBytes = bodyBytes { entry["bodyBytes"] = bodyBytes }
+    if let parts = bodyFormData, !parts.isEmpty {
+      entry["bodyFormData"] = parts.map { part -> [String: String] in
+        var clean: [String: String] = [:]
+        if let v = part["name"] { clean["name"] = v }
+        if let v = part["value"] { clean["value"] = v }
+        if let v = part["fileUri"] { clean["fileUri"] = v }
+        if let v = part["fileName"] { clean["fileName"] = v }
+        if let v = part["mimeType"] { clean["mimeType"] = v }
+        return clean
+      }
+    }
+    if let timeoutMs = timeoutMs { entry["timeoutMs"] = timeoutMs }
+    if followRedirects == false { entry["followRedirects"] = false }
+    if let prefetchCacheTtlMs = prefetchCacheTtlMs { entry["prefetchCacheTtlMs"] = prefetchCacheTtlMs }
+    return entry
+  }
+
+  private static func buildNitroRequest(
+    from entry: [String: Any],
+    mergedHeaders: [NitroHeader]
+  ) -> NitroRequest {
+    let url = (entry["url"] as? String) ?? ""
+    let methodStr = entry["method"] as? String
+    let method: NitroRequestMethod? = methodStr.flatMap { NitroRequestMethod(fromString: $0) }
+    let bodyString = entry["bodyString"] as? String
+    let bodyBytes = entry["bodyBytes"] as? String
+    let timeoutMs = (entry["timeoutMs"] as? NSNumber)?.doubleValue
+    let followRedirects = (entry["followRedirects"] as? Bool) ?? true
+    let prefetchCacheTtlMs = (entry["prefetchCacheTtlMs"] as? NSNumber)?.doubleValue
+
+    let formData: [NitroFormDataPart]? = (entry["bodyFormData"] as? [[String: Any]])?.map { p in
+      NitroFormDataPart(
+        name: (p["name"] as? String) ?? "",
+        value: p["value"] as? String,
+        fileUri: p["fileUri"] as? String,
+        fileName: p["fileName"] as? String,
+        mimeType: p["mimeType"] as? String
+      )
+    }
+
+    return NitroRequest(
+      url: url,
+      method: method,
+      headers: mergedHeaders,
+      bodyString: bodyString,
+      bodyBytes: bodyBytes,
+      bodyFormData: formData,
+      timeoutMs: timeoutMs,
+      followRedirects: followRedirects,
+      prefetchCacheTtlMs: prefetchCacheTtlMs,
+      requestId: nil
+    )
+  }
+
   // MARK: - Token refresh
 
   private static func callTokenRefresh(config: [String: Any]) async throws -> [String: String] {

package/ios/NitroFetchClient.swift

@@ -119,7 +119,7 @@ final class NitroFetchClient: HybridNitroFetchClientSpec {
   public class func requestStatic(_ req: NitroRequest) async throws -> NitroResponse {
     if let key = findPrefetchKey(req) {
       // If a prefetched result is fresh, return immediately
-      if let cached = FetchCache.getResultIfFresh(key, maxAgeMs: 5_000) {
+      if let cached = FetchCache.getResultIfFresh(key, maxAgeMs: Int64(req.prefetchCacheTtlMs ?? 5_000)) {
         var headers = cached.headers ?? []
         headers.append(NitroHeader(key: "nitroPrefetched", value: "true"))
         return NitroResponse(url: cached.url,
@@ -231,9 +231,15 @@ final class NitroFetchClient: HybridNitroFetchClientSpec {
     }
     #endif
 
-    // Choose bodyString by default (matching Android’s first pass)
+    // Choose bodyString by default (matching Android’s first pass).
+    // For binary responses that can’t be decoded as text, bridge the raw bytes
+    // as an ArrayBuffer so arrayBuffer() / bytes() return them with no base64.
     let charset = NitroFetchClient.detectCharset(from: http) ?? String.Encoding.utf8
     let bodyStr = String(data: data, encoding: charset) ?? String(data: data, encoding: .utf8)
+    var bodyBytesAb: ArrayBuffer? = nil
+    if bodyStr == nil && !data.isEmpty {
+      bodyBytesAb = try ArrayBuffer.copy(data: data)
+    }
 
     let res = NitroResponse(
       url: finalURL?.absoluteString ?? http.url?.absoluteString ?? req.url,
@@ -243,7 +249,7 @@ final class NitroFetchClient: HybridNitroFetchClientSpec {
       redirected: (finalURL?.absoluteString ?? http.url?.absoluteString ?? req.url) != req.url,
       headers: headersPairs,
       bodyString: bodyStr,
-      bodyBytes: nil
+      bodyBytes: bodyBytesAb
     )
 
     // Do not write to cache here; only prefetch should populate the cache
@@ -261,7 +267,7 @@ final class NitroFetchClient: HybridNitroFetchClientSpec {
       throw NSError(domain: "NitroFetch", code: -2, userInfo: [NSLocalizedDescriptionKey: "prefetch: missing 'prefetchKey' header"])
     }
 
-    if FetchCache.getResultIfFresh(key, maxAgeMs: 5_000) != nil {
+    if FetchCache.getResultIfFresh(key, maxAgeMs: Int64(req.prefetchCacheTtlMs ?? 5_000)) != nil {
       return // already have a fresh result
     }
 
@@ -284,6 +290,10 @@ final class NitroFetchClient: HybridNitroFetchClientSpec {
         }
         let charset = NitroFetchClient.detectCharset(from: http) ?? .utf8
         let bodyStr = String(data: data, encoding: charset) ?? String(data: data, encoding: .utf8)
+        var bodyBytesAb: ArrayBuffer? = nil
+        if bodyStr == nil && !data.isEmpty {
+          bodyBytesAb = try ArrayBuffer.copy(data: data)
+        }
         let res = NitroResponse(
           url: finalURL?.absoluteString ?? http.url?.absoluteString ?? req.url,
           status: Double(http.statusCode),
@@ -292,7 +302,7 @@ final class NitroFetchClient: HybridNitroFetchClientSpec {
           redirected: (finalURL?.absoluteString ?? http.url?.absoluteString ?? req.url) != req.url,
           headers: headersPairs,
           bodyString: bodyStr,
-          bodyBytes: nil
+          bodyBytes: bodyBytesAb
         )
         FetchCache.complete(key, with: .success(res))
       } catch {
@@ -300,7 +310,8 @@ final class NitroFetchClient: HybridNitroFetchClientSpec {
       }
     }
   }
-  
+
+
   private static func reqToHttpMethod(_ req: NitroRequest) -> String? {
     return req.method?.stringValue
   }

package/lib/module/CurlGenerator.js.map

@@ -1 +1 @@
-{"version":3,"names":["shellEscape","str","test","replace","generateCurl","options","parts","method","push","headers","h","key","toLowerCase","value","body","maxLen","truncated","length","slice","verbose","compressed","url","join"],"sourceRoot":"../../src","sources":["CurlGenerator.ts"],"mappings":";;AASA,SAASA,WAAWA,CAACC,GAAW,EAAU;EACxC,IAAI,0BAA0B,CAACC,IAAI,CAACD,GAAG,CAAC,EAAE,OAAOA,GAAG;EACpD,OAAO,GAAG,GAAGA,GAAG,CAACE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,GAAG;AAC/C;AAEA,OAAO,SAASC,YAAYA,CAACC,OAAoB,EAAU;EACzD,MAAMC,KAAe,GAAG,CAAC,MAAM,CAAC;EAEhC,IAAID,OAAO,CAACE,MAAM,IAAIF,OAAO,CAACE,MAAM,KAAK,KAAK,EAAE;IAC9CD,KAAK,CAACE,IAAI,CAAC,IAAI,EAAER,WAAW,CAACK,OAAO,CAACE,MAAM,CAAC,CAAC;EAC/C;EAEA,IAAIF,OAAO,CAACI,OAAO,EAAE;IACnB,KAAK,MAAMC,CAAC,IAAIL,OAAO,CAACI,OAAO,EAAE;MAC/B,IAAIC,CAAC,CAACC,GAAG,CAACC,WAAW,CAAC,CAAC,KAAK,aAAa,EAAE;MAC3CN,KAAK,CAACE,IAAI,CAAC,IAAI,EAAER,WAAW,CAAC,GAAGU,CAAC,CAACC,GAAG,KAAKD,CAAC,CAACG,KAAK,EAAE,CAAC,CAAC;IACvD;EACF;EAEA,IAAIR,OAAO,CAACS,IAAI,EAAE;IAChB,MAAMC,MAAM,GAAG,MAAM;IACrB,MAAMC,SAAS,GACbX,OAAO,CAACS,IAAI,CAACG,MAAM,GAAGF,MAAM,GACxBV,OAAO,CAACS,IAAI,CAACI,KAAK,CAAC,CAAC,EAAEH,MAAM,CAAC,GAAG,gBAAgB,GAChDV,OAAO,CAACS,IAAI;IAClBR,KAAK,CAACE,IAAI,CAAC,IAAI,EAAER,WAAW,CAACgB,SAAS,CAAC,CAAC;EAC1C;EAEA,IAAIX,OAAO,CAACc,OAAO,EAAEb,KAAK,CAACE,IAAI,CAAC,IAAI,CAAC;EACrC,IAAIH,OAAO,CAACe,UAAU,EAAEd,KAAK,CAACE,IAAI,CAAC,cAAc,CAAC;EAElDF,KAAK,CAACE,IAAI,CAACR,WAAW,CAACK,OAAO,CAACgB,GAAG,CAAC,CAAC;EAEpC,OAAOf,KAAK,CAACgB,IAAI,CAAC,GAAG,CAAC;AACxB","ignoreList":[]}
+{"version":3,"names":["shellEscape","str","test","replace","generateCurl","options","parts","method","push","headers","h","key","toLowerCase","value","body","maxLen","truncated","length","slice","verbose","compressed","url","join"],"sourceRoot":"../../src","sources":["CurlGenerator.js"],"mappings":";;AAAA,SAASA,WAAWA,CAACC,GAAG,EAAE;EACtB,IAAI,0BAA0B,CAACC,IAAI,CAACD,GAAG,CAAC,EACpC,OAAOA,GAAG;EACd,OAAO,GAAG,GAAGA,GAAG,CAACE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,GAAG;AACjD;AACA,OAAO,SAASC,YAAYA,CAACC,OAAO,EAAE;EAClC,MAAMC,KAAK,GAAG,CAAC,MAAM,CAAC;EACtB,IAAID,OAAO,CAACE,MAAM,IAAIF,OAAO,CAACE,MAAM,KAAK,KAAK,EAAE;IAC5CD,KAAK,CAACE,IAAI,CAAC,IAAI,EAAER,WAAW,CAACK,OAAO,CAACE,MAAM,CAAC,CAAC;EACjD;EACA,IAAIF,OAAO,CAACI,OAAO,EAAE;IACjB,KAAK,MAAMC,CAAC,IAAIL,OAAO,CAACI,OAAO,EAAE;MAC7B,IAAIC,CAAC,CAACC,GAAG,CAACC,WAAW,CAAC,CAAC,KAAK,aAAa,EACrC;MACJN,KAAK,CAACE,IAAI,CAAC,IAAI,EAAER,WAAW,CAAC,GAAGU,CAAC,CAACC,GAAG,KAAKD,CAAC,CAACG,KAAK,EAAE,CAAC,CAAC;IACzD;EACJ;EACA,IAAIR,OAAO,CAACS,IAAI,EAAE;IACd,MAAMC,MAAM,GAAG,MAAM;IACrB,MAAMC,SAAS,GAAGX,OAAO,CAACS,IAAI,CAACG,MAAM,GAAGF,MAAM,GACxCV,OAAO,CAACS,IAAI,CAACI,KAAK,CAAC,CAAC,EAAEH,MAAM,CAAC,GAAG,gBAAgB,GAChDV,OAAO,CAACS,IAAI;IAClBR,KAAK,CAACE,IAAI,CAAC,IAAI,EAAER,WAAW,CAACgB,SAAS,CAAC,CAAC;EAC5C;EACA,IAAIX,OAAO,CAACc,OAAO,EACfb,KAAK,CAACE,IAAI,CAAC,IAAI,CAAC;EACpB,IAAIH,OAAO,CAACe,UAAU,EAClBd,KAAK,CAACE,IAAI,CAAC,cAAc,CAAC;EAC9BF,KAAK,CAACE,IAAI,CAACR,WAAW,CAACK,OAAO,CAACgB,GAAG,CAAC,CAAC;EACpC,OAAOf,KAAK,CAACgB,IAAI,CAAC,GAAG,CAAC;AAC1B","ignoreList":[]}

package/lib/module/HermesProfiler.js.map

@@ -1 +1,2 @@
-{"version":3,"names":["profileFetch","fn","outputPath","hermes","global","HermesInternal","result","path","Date","now","enableSamplingProfiler","profilePath","disableSamplingProfiler","dumpSamplingProfiler"],"sourceRoot":"../../src","sources":["HermesProfiler.ts"],"mappings":";;AAaA,OAAO,eAAeA,YAAYA,CAChCC,EAAoB,EACpBC,UAAmB,EACQ;EAC3B,MAAMC,MAAM,GAAGC,MAAM,CAACC,cAAc;EACpC,IAAI,CAACF,MAAM,EAAE;IACX,MAAMG,MAAM,GAAG,MAAML,EAAE,CAAC,CAAC;IACzB,OAAO;MAAEK;IAAO,CAAC;EACnB;EAEA,MAAMC,IAAI,GAAGL,UAAU,IAAI,2BAA2BM,IAAI,CAACC,GAAG,CAAC,CAAC,aAAa;EAC7EN,MAAM,CAACO,sBAAsB,CAAC,CAAC;EAC/B,IAAI;IACF,MAAMJ,MAAM,GAAG,MAAML,EAAE,CAAC,CAAC;IACzB,OAAO;MAAEK,MAAM;MAAEK,WAAW,EAAEJ;IAAK,CAAC;EACtC,CAAC,SAAS;IACRJ,MAAM,CAACS,uBAAuB,CAAC,CAAC;IAChC,IAAI;MACFT,MAAM,CAACU,oBAAoB,CAACN,IAAI,CAAC;IACnC,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ;AACF","ignoreList":[]}
+{"version":3,"names":["profileFetch","fn","outputPath","hermes","global","HermesInternal","result","path","Date","now","enableSamplingProfiler","profilePath","disableSamplingProfiler","dumpSamplingProfiler"],"sourceRoot":"../../src","sources":["HermesProfiler.js"],"mappings":";;AAAA,OAAO,eAAeA,YAAYA,CAACC,EAAE,EAAEC,UAAU,EAAE;EAC/C,MAAMC,MAAM,GAAGC,MAAM,CAACC,cAAc;EACpC,IAAI,CAACF,MAAM,EAAE;IACT,MAAMG,MAAM,GAAG,MAAML,EAAE,CAAC,CAAC;IACzB,OAAO;MAAEK;IAAO,CAAC;EACrB;EACA,MAAMC,IAAI,GAAGL,UAAU,IAAI,2BAA2BM,IAAI,CAACC,GAAG,CAAC,CAAC,aAAa;EAC7EN,MAAM,CAACO,sBAAsB,CAAC,CAAC;EAC/B,IAAI;IACA,MAAMJ,MAAM,GAAG,MAAML,EAAE,CAAC,CAAC;IACzB,OAAO;MAAEK,MAAM;MAAEK,WAAW,EAAEJ;IAAK,CAAC;EACxC,CAAC,SACO;IACJJ,MAAM,CAACS,uBAAuB,CAAC,CAAC;IAChC,IAAI;MACAT,MAAM,CAACU,oBAAoB,CAACN,IAAI,CAAC;IACrC,CAAC,CACD,MAAM;MACF;IAAA;EAER;AACJ","ignoreList":[]}
+[]}

package/lib/module/NetworkInspector.js

@@ -53,9 +53,7 @@ class NetworkInspectorImpl {
       this._entries.shift();
     }
   }
-
   // --- HTTP recording ---
-
   _recordStart(id, url, method, headers, body) {
     if (!this._enabled) return;
     const bodySize = body ? body.length : 0;
@@ -106,9 +104,7 @@ class NetworkInspectorImpl {
     }
     this._notify(entry);
   }
-
   // --- WebSocket recording ---
-
   _recordWsOpen(id, url, protocols, headers) {
     if (!this._enabled) return;
     const entry = {