Skip to content

Encode fetch responses for DevTools only when a debugger is attached #59717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hryhoriiK97 wants to merge 1 commit into
base: main
Choose a base branch
from
+45 −5
Open

Encode fetch responses for DevTools only when a debugger is attached #59717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,13 @@ internal object NetworkEventUtil {
data: WritableMap,
rawData: ByteArray,
) {
InspectorNetworkReporter.maybeStoreResponseBody(
devToolsRequestId,
Base64.encodeToString(rawData, Base64.NO_WRAP),
true,
)
if (InspectorNetworkReporter.isDebuggingEnabled()) {
InspectorNetworkReporter.maybeStoreResponseBody(
devToolsRequestId,
Base64.encodeToString(rawData, Base64.NO_WRAP),
true,
)
}
reactContext?.emitDeviceEvent(
"didReceiveNetworkData",
Arguments.createArray().apply {
Expand Down
38 changes: 38 additions & 0 deletions ...ive/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkEventUtilTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@

package com.facebook.react.modules.network

import android.util.Base64
import com.facebook.react.bridge.Arguments
import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.bridge.WritableArray
import com.facebook.react.bridge.WritableMap
import com.facebook.react.common.annotations.UnstableReactNativeAPI
import com.facebook.testutils.shadows.ShadowArguments
import com.facebook.testutils.shadows.ShadowInspectorNetworkReporter
import com.facebook.testutils.shadows.ShadowSoLoader
Expand All @@ -26,6 +28,7 @@ import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
import org.mockito.Mockito.mockStatic
import org.mockito.kotlin.any
import org.mockito.kotlin.mock
import org.mockito.kotlin.never
Expand Down Expand Up @@ -173,6 +176,41 @@ class NetworkEventUtilTest {
assertThat(args.getMap(1)).isEqualTo(data)
}

@Test
fun testOnDataReceivedMapDoesNotEncodeBodyWithoutDebugger() {
mockStatic(Base64::class.java).use { base64 ->
NetworkEventUtil.onDataReceived(
reactContext,
1,
"devToolsRequestId",
Arguments.createMap(),
byteArrayOf(1, 2, 3),
)

base64.verifyNoInteractions()
}
}

@OptIn(UnstableReactNativeAPI::class)
@Test
fun testOnDataReceivedMapStoresEncodedBodyWithDebugger() {
mockStatic(InspectorNetworkReporter::class.java).use { reporter ->
reporter.`when`<Boolean> { InspectorNetworkReporter.isDebuggingEnabled() }.thenReturn(true)

NetworkEventUtil.onDataReceived(
reactContext,
1,
"devToolsRequestId",
Arguments.createMap(),
byteArrayOf(1, 2, 3),
)

reporter.verify {
InspectorNetworkReporter.maybeStoreResponseBody("devToolsRequestId", "AQID", true)
}
}
}

@Test
fun testOnRequestError() {
val requestId = 1
Expand Down
Loading