Skip to content

Commit 072a5b8

Browse files
authored
Encode fetch responses for DevTools only when a debugger is attached (#59717)
1 parent 13684b0 commit 072a5b8

2 files changed

Lines changed: 46 additions & 5 deletions

File tree

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,14 @@ internal object NetworkEventUtil {
139139
data: WritableMap,
140140
rawData: ByteArray,
141141
) {
142-
InspectorNetworkReporter.maybeStoreResponseBody(
143-
devToolsRequestId,
144-
Base64.encodeToString(rawData, Base64.NO_WRAP),
145-
true,
146-
)
142+
if (InspectorNetworkReporter.isDebuggingEnabled()) {
143+
val encodedData = Base64.encodeToString(rawData, Base64.NO_WRAP)
144+
InspectorNetworkReporter.maybeStoreResponseBody(
145+
devToolsRequestId,
146+
encodedData,
147+
true,
148+
)
149+
}
147150
reactContext?.emitDeviceEvent(
148151
"didReceiveNetworkData",
149152
Arguments.createArray().apply {

‎packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkEventUtilTest.kt‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99

1010
package com.facebook.react.modules.network
1111

12+
import android.util.Base64
1213
import com.facebook.react.bridge.Arguments
1314
import com.facebook.react.bridge.ReactApplicationContext
1415
import com.facebook.react.bridge.WritableArray
1516
import com.facebook.react.bridge.WritableMap
17+
import com.facebook.react.common.annotations.UnstableReactNativeAPI
1618
import com.facebook.testutils.shadows.ShadowArguments
1719
import com.facebook.testutils.shadows.ShadowInspectorNetworkReporter
1820
import com.facebook.testutils.shadows.ShadowSoLoader
@@ -26,6 +28,7 @@ import org.junit.Before
2628
import org.junit.Test
2729
import org.junit.runner.RunWith
2830
import org.mockito.ArgumentCaptor
31+
import org.mockito.Mockito.mockStatic
2932
import org.mockito.kotlin.any
3033
import org.mockito.kotlin.mock
3134
import org.mockito.kotlin.never
@@ -173,6 +176,41 @@ class NetworkEventUtilTest {
173176
assertThat(args.getMap(1)).isEqualTo(data)
174177
}
175178

179+
@Test
180+
fun testOnDataReceivedMapDoesNotEncodeBodyWithoutDebugger() {
181+
mockStatic(Base64::class.java).use { base64 ->
182+
NetworkEventUtil.onDataReceived(
183+
reactContext,
184+
1,
185+
"devToolsRequestId",
186+
Arguments.createMap(),
187+
byteArrayOf(1, 2, 3),
188+
)
189+
190+
base64.verifyNoInteractions()
191+
}
192+
}
193+
194+
@OptIn(UnstableReactNativeAPI::class)
195+
@Test
196+
fun testOnDataReceivedMapStoresEncodedBodyWithDebugger() {
197+
mockStatic(InspectorNetworkReporter::class.java).use { reporter ->
198+
reporter.`when`<Boolean> { InspectorNetworkReporter.isDebuggingEnabled() }.thenReturn(true)
199+
200+
NetworkEventUtil.onDataReceived(
201+
reactContext,
202+
1,
203+
"devToolsRequestId",
204+
Arguments.createMap(),
205+
byteArrayOf(1, 2, 3),
206+
)
207+
208+
reporter.verify {
209+
InspectorNetworkReporter.maybeStoreResponseBody("devToolsRequestId", "AQID", true)
210+
}
211+
}
212+
}
213+
176214
@Test
177215
fun testOnRequestError() {
178216
val requestId = 1

0 commit comments

Comments
 (0)