From 8a9a3592a7c31b3bdd13612b894454a3114313d7 Mon Sep 17 00:00:00 2001 From: Alex Hunt Date: Mon, 8 Dec 2025 02:15:37 -0800 Subject: [PATCH] Fix multipart/form-data request payload previews on Android (#54804) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54804 Resolves https://github.com/facebook/react-native/issues/54796#issuecomment-3616644916. 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 --- .../react/modules/network/NetworkEventUtil.kt | 3 ++- .../modules/network/ProgressRequestBody.kt | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) 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 index 94c99112156..c0ed0c96584 100644 --- 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 index df98bd7eefc..f935b7309b8 100644 --- 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) { + "" + } + } }