From 21d7efaad40830decb8a81b84e52c11f1451fe73 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Wed, 18 Feb 2026 07:38:50 -0800 Subject: [PATCH] Fix thread-safety race in InspectorNetworkHelper (#55579) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55579 InspectorNetworkHelper used a lateinit var with an isInitialized check to lazily create an OkHttpClient. This pattern is not thread-safe — concurrent calls to loadNetworkResource could race on the initialization. Replace with the shared DevSupportHttpClient.websocketClient singleton, which is initialized at class load time and is inherently safe. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D93480252 fbshipit-source-id: fefb144b3b26670954a77aa27c9b7f637290f21b --- .../devsupport/inspector/InspectorNetworkHelper.kt | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkHelper.kt index f8459b4b51e..5b6198b5d8a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkHelper.kt @@ -10,26 +10,15 @@ package com.facebook.react.devsupport.inspector import java.io.IOException -import java.util.concurrent.TimeUnit import okhttp3.Call import okhttp3.Callback -import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response internal object InspectorNetworkHelper { - private lateinit var client: OkHttpClient @JvmStatic fun loadNetworkResource(url: String, listener: InspectorNetworkRequestListener) { - if (!::client.isInitialized) { - client = - OkHttpClient.Builder() - .connectTimeout(10, TimeUnit.SECONDS) - .writeTimeout(10, TimeUnit.SECONDS) - .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read - .build() - } val request = try { @@ -40,7 +29,7 @@ internal object InspectorNetworkHelper { } // TODO(T196951523): Assign cancel function to listener - val call = client.newCall(request) + val call = DevSupportHttpClient.httpClient.newCall(request) call.enqueue( object : Callback {