diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index e311662879f..e94080b44e3 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -2101,6 +2101,14 @@ public final class com/facebook/react/devsupport/StackTraceHelper$StackFrameImpl public fun toJSON ()Lorg/json/JSONObject; } +public final class com/facebook/react/devsupport/inspector/DevSupportHttpClient { + public static final field INSTANCE Lcom/facebook/react/devsupport/inspector/DevSupportHttpClient; + public static final fun addRequestHeader (Ljava/lang/String;Ljava/lang/String;)V + public final fun getHttpClient ()Lokhttp3/OkHttpClient; + public final fun getWebsocketClient ()Lokhttp3/OkHttpClient; + public static final fun removeRequestHeader (Ljava/lang/String;)V +} + public abstract interface class com/facebook/react/devsupport/interfaces/BundleLoadCallback { public fun onError (Ljava/lang/Exception;)V public abstract fun onSuccess ()V @@ -2184,13 +2192,6 @@ public abstract interface class com/facebook/react/devsupport/interfaces/DevSupp public abstract fun onResume ()V } -public final class com/facebook/react/devsupport/interfaces/DevSupportRequestHeaders { - public static final field INSTANCE Lcom/facebook/react/devsupport/interfaces/DevSupportRequestHeaders; - public static final fun addRequestHeader (Ljava/lang/String;Ljava/lang/String;)V - public static final fun allHeaders ()Ljava/util/Map; - public static final fun removeRequestHeader (Ljava/lang/String;)V -} - public abstract interface class com/facebook/react/devsupport/interfaces/ErrorCustomizer { public abstract fun customizeErrorInfo (Landroid/util/Pair;)Landroid/util/Pair; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/DevSupportHttpClient.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/DevSupportHttpClient.kt index 1bf6b402731..3c9f9ff8764 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/DevSupportHttpClient.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/DevSupportHttpClient.kt @@ -9,33 +9,29 @@ package com.facebook.react.devsupport.inspector -import com.facebook.react.devsupport.interfaces.DevSupportRequestHeaders +import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit import okhttp3.Interceptor import okhttp3.OkHttpClient /** * Shared [OkHttpClient] instances for devsupport networking. Uses a single connection pool and - * dispatcher across all dev support HTTP and WebSocket usage. Injects custom request headers - * registered via [DevSupportRequestHeaders] into every outgoing request. + * dispatcher across all dev support HTTP and WebSocket usage. Supports injecting custom request + * headers that are applied to every outgoing request via an OkHttp interceptor. */ -internal object DevSupportHttpClient { +public object DevSupportHttpClient { + private val customHeaders = ConcurrentHashMap() + private val headerInterceptor = Interceptor { chain -> - val originalRequest = chain.request() - val headers = DevSupportRequestHeaders.allHeaders() - if (headers.isEmpty()) { - chain.proceed(originalRequest) - } else { - val builder = originalRequest.newBuilder() - for ((name, value) in headers) { - builder.header(name, value) - } - chain.proceed(builder.build()) + val builder = chain.request().newBuilder() + for ((name, value) in customHeaders) { + builder.header(name, value) } + chain.proceed(builder.build()) } /** Client for HTTP requests: connect=5s, write=disabled, read=disabled. */ - val httpClient: OkHttpClient = + public val httpClient: OkHttpClient = OkHttpClient.Builder() .addInterceptor(headerInterceptor) .connectTimeout(5, TimeUnit.SECONDS) @@ -44,10 +40,22 @@ internal object DevSupportHttpClient { .build() /** Client for WebSocket connections: connect=10s, write=10s, read=disabled. */ - val websocketClient: OkHttpClient = + public val websocketClient: OkHttpClient = httpClient .newBuilder() .connectTimeout(10, TimeUnit.SECONDS) .writeTimeout(10, TimeUnit.SECONDS) .build() + + /** Add a custom header to be included in all requests made through both clients. */ + @JvmStatic + public fun addRequestHeader(name: String, value: String) { + customHeaders[name] = value + } + + /** Remove a previously added custom header. */ + @JvmStatic + public fun removeRequestHeader(name: String) { + customHeaders.remove(name) + } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportRequestHeaders.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportRequestHeaders.kt deleted file mode 100644 index c0adbcda312..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportRequestHeaders.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.devsupport.interfaces - -import java.util.concurrent.ConcurrentHashMap - -/** - * Thread-safe singleton for registering custom HTTP headers that will be applied to all React - * Native dev-support network traffic (bundle fetches, packager status checks, inspector - * connections, HMR WebSocket upgrades). - * - * Headers are stored globally and survive across React Host re-creations, so they can be set before - * the first app load. - */ -public object DevSupportRequestHeaders { - - private val headers = ConcurrentHashMap() - - /** Adds (or replaces) a custom request header. */ - @JvmStatic - public fun addRequestHeader(name: String, value: String) { - headers[name] = value - } - - /** Removes a previously added custom request header. */ - @JvmStatic - public fun removeRequestHeader(name: String) { - headers.remove(name) - } - - /** Returns a snapshot of all currently registered headers. */ - @JvmStatic public fun allHeaders(): Map = HashMap(headers) -}