Fix multipart/form-data request payload previews on Android (#54804)

huntie · meta-codesync[bot] · commit 38513f72d7c4 · 2025-12-08T02:15:37.000-08:00
Summary: Pull Request resolved: #54804 Resolves #54796 (comment). Fixes a bug where for `multipart/form-data` requests on Android, request payload previews were not using a correctly serialized preview string in React Native DevTools. Changelog: [Internal] Reviewed By: vzaidman Differential Revision: D88495615 fbshipit-source-id: 757487b3588372404fa45f980e0bcfae5c7c6457
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt
@@ -35,7 +35,8 @@ internal object NetworkEventUtil {
           request.url().toString(),
           request.method(),
           headersMap,
-          request.body()?.toString().orEmpty(),
+          (request.body() as? ProgressRequestBody)?.getBodyPreview()
+              ?: request.body()?.toString().orEmpty(),
           request.body()?.contentLength() ?: 0,
       )
       InspectorNetworkReporter.reportConnectionTiming(devToolsRequestId, headersMap)
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt
@@ -23,6 +23,10 @@ internal class ProgressRequestBody(
 ) : RequestBody() {
   private var contentLength = 0L
 
+  companion object {
+    private const val MAX_BODY_PREVIEW_SIZE = 1024 * 1024 // 1MB
+  }
+
   override fun contentType(): MediaType? {
     return requestBody.contentType()
   }
@@ -78,4 +82,20 @@ internal class ProgressRequestBody(
         }
     )
   }
+
+  fun getBodyPreview(): String {
+    return try {
+      val buffer = okio.Buffer()
+      requestBody.writeTo(buffer)
+      val size = buffer.size()
+      if (size <= MAX_BODY_PREVIEW_SIZE) {
+        buffer.readUtf8()
+      } else {
+        buffer.readUtf8(MAX_BODY_PREVIEW_SIZE.toLong()) +
+            "\n... [truncated, showing $MAX_BODY_PREVIEW_SIZE of $size bytes]"
+      }
+    } catch (e: Exception) {
+      ""
+    }
+  }
 }
