react-native-tvos 0.83.1-0 → 0.84.0-0rc0

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -7,7 +7,6 @@
 
 package com.facebook.react.bridge;
 
-import static com.facebook.infer.annotation.Assertions.assertCondition;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
@@ -39,7 +38,6 @@ import com.facebook.systrace.TraceListener;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -88,7 +86,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
   // Access from any thread
   private final ReactQueueConfigurationImpl mReactQueueConfiguration;
-  private final CopyOnWriteArrayList<NotThreadSafeBridgeIdleDebugListener> mBridgeIdleListeners;
   private final AtomicInteger mPendingJSCalls = new AtomicInteger(0);
   private final String mJsPendingCallsTitleForTrace =
       "pending_js_calls_instance" + sNextInstanceIdForTrace.getAndIncrement();
@@ -121,15 +118,12 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
   public native NativeMethodCallInvokerHolderImpl getNativeMethodCallInvokerHolder();
 
-  private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
-
   private CatalystInstanceImpl(
       final ReactQueueConfigurationSpec reactQueueConfigurationSpec,
       final JavaScriptExecutor jsExecutor,
       final NativeModuleRegistry nativeModuleRegistry,
       final JSBundleLoader jsBundleLoader,
-      JSExceptionHandler jSExceptionHandler,
-      @Nullable ReactInstanceManagerInspectorTarget inspectorTarget) {
+      JSExceptionHandler jSExceptionHandler) {
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
     Systrace.beginSection(TRACE_TAG_REACT, "createCatalystInstanceImpl");
 
@@ -138,14 +132,12 @@ public class CatalystInstanceImpl implements CatalystInstance {
     mReactQueueConfiguration =
         ReactQueueConfigurationImpl.create(
             reactQueueConfigurationSpec, new NativeExceptionHandler());
-    mBridgeIdleListeners = new CopyOnWriteArrayList<>();
     mNativeModuleRegistry = nativeModuleRegistry;
     mJSModuleRegistry = new JavaScriptModuleRegistry();
     mJSBundleLoader = jsBundleLoader;
     mJSExceptionHandler = jSExceptionHandler;
     mNativeModulesQueueThread = mReactQueueConfiguration.getNativeModulesQueueThread();
     mTraceListener = new JSProfilerTraceListener(this);
-    mInspectorTarget = inspectorTarget;
     Systrace.endSection(TRACE_TAG_REACT);
 
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
@@ -156,9 +148,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
         jsExecutor,
         mReactQueueConfiguration.getJSQueueThread(),
         mNativeModulesQueueThread,
-        mNativeModuleRegistry.getJavaModules(this),
-        mNativeModuleRegistry.getCxxModules(),
-        mInspectorTarget);
+        mNativeModuleRegistry.getJavaModules(this));
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
     Systrace.endSection(TRACE_TAG_REACT);
 
@@ -176,16 +166,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
       mOuter = new WeakReference<>(outer);
     }
 
-    public void onBatchComplete() {
-      CatalystInstanceImpl impl = mOuter.get();
-      if (impl != null) {
-        impl.mNativeModulesQueueThread.runOnQueue(
-            () -> {
-              impl.mNativeModuleRegistry.onBatchComplete();
-            });
-      }
-    }
-
     public void incrementPendingJSCalls() {
       CatalystInstanceImpl impl = mOuter.get();
       if (impl != null) {
@@ -212,22 +192,18 @@ public class CatalystInstanceImpl implements CatalystInstance {
     // Extend the Java-visible registry of modules
     mNativeModuleRegistry.registerModules(modules);
     Collection<JavaModuleWrapper> javaModules = modules.getJavaModules(this);
-    Collection<ModuleHolder> cxxModules = modules.getCxxModules();
     // Extend the Cxx-visible registry of modules wrapped in appropriate interfaces
-    jniExtendNativeModules(javaModules, cxxModules);
+    jniExtendNativeModules(javaModules);
   }
 
-  private native void jniExtendNativeModules(
-      Collection<JavaModuleWrapper> javaModules, Collection<ModuleHolder> cxxModules);
+  private native void jniExtendNativeModules(Collection<JavaModuleWrapper> javaModules);
 
   private native void initializeBridge(
       InstanceCallback callback,
       JavaScriptExecutor jsExecutor,
       MessageQueueThread jsQueue,
       MessageQueueThread moduleQueue,
-      Collection<JavaModuleWrapper> javaModules,
-      Collection<ModuleHolder> cxxModules,
-      @Nullable ReactInstanceManagerInspectorTarget inspectorTarget);
+      Collection<JavaModuleWrapper> javaModules);
 
   @Override
   public void setSourceURLs(String deviceURL, String remoteURL) {
@@ -358,13 +334,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
       return;
     }
 
-    if (mInspectorTarget != null) {
-      assertCondition(
-          mInspectorTarget.isValid(),
-          "ReactInstanceManager inspector target destroyed before instance was unregistered");
-    }
-    unregisterFromInspector();
-
     // TODO: tell all APIs to shut down
     ReactMarker.logMarker(ReactMarkerConstants.DESTROY_CATALYST_INSTANCE_START);
     mDestroyed = true;
@@ -376,14 +345,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
             mFabricUIManager.invalidate();
           }
           boolean wasIdle = (mPendingJSCalls.getAndSet(0) == 0);
-          if (!mBridgeIdleListeners.isEmpty()) {
-            for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-              if (!wasIdle) {
-                listener.onTransitionToBridgeIdle();
-              }
-              listener.onBridgeDestroyed();
-            }
-          }
 
           getReactQueueConfiguration()
               .getJSQueueThread()
@@ -525,30 +486,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
     jniHandleMemoryPressure(level);
   }
 
-  /**
-   * Adds a idle listener for this Catalyst instance. The listener will receive notifications
-   * whenever the bridge transitions from idle to busy and vice-versa, where the busy state is
-   * defined as there being some non-zero number of calls to JS that haven't resolved via a
-   * onBatchComplete call. The listener should be purely passive and not affect application logic.
-   *
-   * @noinspection deprecation
-   */
-  @Override
-  public void addBridgeIdleDebugListener(NotThreadSafeBridgeIdleDebugListener listener) {
-    mBridgeIdleListeners.add(listener);
-  }
-
-  /**
-   * Removes a NotThreadSafeBridgeIdleDebugListener previously added with {@link
-   * #addBridgeIdleDebugListener}
-   *
-   * @noinspection deprecation
-   */
-  @Override
-  public void removeBridgeIdleDebugListener(NotThreadSafeBridgeIdleDebugListener listener) {
-    mBridgeIdleListeners.remove(listener);
-  }
-
   @Override
   public native void setGlobalVariable(String propName, String jsonValue);
 
@@ -565,16 +502,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
   private void incrementPendingJSCalls() {
     int oldPendingCalls = mPendingJSCalls.getAndIncrement();
-    boolean wasIdle = oldPendingCalls == 0;
     Systrace.traceCounter(TRACE_TAG_REACT, mJsPendingCallsTitleForTrace, oldPendingCalls + 1);
-    if (wasIdle && !mBridgeIdleListeners.isEmpty()) {
-      mNativeModulesQueueThread.runOnQueue(
-          () -> {
-            for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-              listener.onTransitionToBridgeBusy();
-            }
-          });
-    }
   }
 
   @Override
@@ -596,17 +524,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
     int newPendingCalls = mPendingJSCalls.decrementAndGet();
     // TODO(9604406): handle case of web workers injecting messages to main thread
     // Assertions.assertCondition(newPendingCalls >= 0);
-    boolean isNowIdle = newPendingCalls == 0;
     Systrace.traceCounter(TRACE_TAG_REACT, mJsPendingCallsTitleForTrace, newPendingCalls);
-
-    if (isNowIdle && !mBridgeIdleListeners.isEmpty()) {
-      mNativeModulesQueueThread.runOnQueue(
-          () -> {
-            for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-              listener.onTransitionToBridgeIdle();
-            }
-          });
-    }
   }
 
   private void onNativeException(Exception e) {
@@ -663,7 +581,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
     private @Nullable NativeModuleRegistry mRegistry;
     private @Nullable JavaScriptExecutor mJSExecutor;
     private @Nullable JSExceptionHandler mJSExceptionHandler;
-    private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
 
     public Builder setReactQueueConfigurationSpec(
         ReactQueueConfigurationSpec ReactQueueConfigurationSpec) {
@@ -691,20 +608,13 @@ public class CatalystInstanceImpl implements CatalystInstance {
       return this;
     }
 
-    public Builder setInspectorTarget(
-        @Nullable ReactInstanceManagerInspectorTarget inspectorTarget) {
-      mInspectorTarget = inspectorTarget;
-      return this;
-    }
-
     public CatalystInstanceImpl build() {
       return new CatalystInstanceImpl(
           Assertions.assertNotNull(mReactQueueConfigurationSpec),
           Assertions.assertNotNull(mJSExecutor),
           Assertions.assertNotNull(mRegistry),
           Assertions.assertNotNull(mJSBundleLoader),
-          Assertions.assertNotNull(mJSExceptionHandler),
-          mInspectorTarget);
+          Assertions.assertNotNull(mJSExceptionHandler));
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt

@@ -347,8 +347,23 @@ internal class JavaMethodWrapper(
               if (jsArguments.isNull(atIndex)) {
                 null
               } else {
-                val id = jsArguments.getDouble(atIndex).toInt()
-                @Suppress("DEPRECATION") CallbackImpl(jsInstance, id)
+                object : Callback {
+                  private var invoked = false
+
+                  override fun invoke(vararg args: Any?) {
+                    if (invoked) {
+                      error(
+                          "Illegal callback invocation from native module. This callback type only permits a single invocation from native code."
+                      )
+                    }
+                    @Suppress("UNCHECKED_CAST")
+                    jsInstance.invokeCallback(
+                        callbackID = jsArguments.getDouble(atIndex).toInt(),
+                        arguments = Arguments.fromJavaArgs(args as Array<Any?>),
+                    )
+                    invoked = true
+                  }
+                }
               }
         }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt

@@ -60,7 +60,7 @@ public class ModuleHolder {
             nativeModule.javaClass.simpleName,
             nativeModule.canOverrideExistingModule(),
             true,
-            CxxModuleWrapper::class.java.isAssignableFrom(nativeModule.javaClass),
+            false,
             ReactModuleInfo.classIsTurboModule(nativeModule.javaClass),
         )
 
@@ -108,7 +108,7 @@ public class ModuleHolder {
     get() = reactModuleInfo.isTurboModule
 
   public val isCxxModule: Boolean
-    get() = reactModuleInfo.isCxxModule
+    get() = false
 
   public val className: String
     get() = reactModuleInfo.className

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt

@@ -36,25 +36,10 @@ public class NativeModuleRegistry(
   @JvmName("getJavaModules") // This is needed because this method is accessed by JNI
   internal fun getJavaModules(jsInstance: JSInstance): List<JavaModuleWrapper> = buildList {
     for ((_, value) in modules) {
-      if (!value.isCxxModule) {
-        add(JavaModuleWrapper(jsInstance, value))
-      }
+      add(JavaModuleWrapper(jsInstance, value))
     }
   }
 
-  @get:JvmName(
-      "getCxxModules"
-  ) // This is needed till there are Java Consumer of this API inside React
-  // Native
-  internal val cxxModules: List<ModuleHolder>
-    get() = buildList {
-      for ((_, value) in modules) {
-        if (value.isCxxModule) {
-          add(value)
-        }
-      }
-    }
-
   /** Adds any new modules to the current module registry */
   @JvmName(
       "registerModules"
@@ -109,23 +94,6 @@ public class NativeModuleRegistry(
     }
   }
 
-  public fun onBatchComplete() {
-    // The only native module that uses the onBatchComplete is the UI Manager. Hence, instead of
-    // iterating over all the modules for find this one instance, and then calling it, we
-    // short-circuit
-    // the search, and simply call OnBatchComplete on the UI Manager.
-    // With Fabric, UIManager would no longer be a NativeModule, so this call would simply go away
-    assertLegacyArchitecture(
-        "NativeModuleRegistry.onBatchComplete()",
-        LegacyArchitectureLogLevel.WARNING,
-    )
-    modules["UIManager"]?.let {
-      if (it.hasInstance()) {
-        (it.module as OnBatchCompleteListener).onBatchComplete()
-      }
-    }
-  }
-
   public fun <T : NativeModule> hasModule(moduleInterface: Class<T>): Boolean {
     val annotation = moduleInterface.getAnnotation(ReactModule::class.java)
     requireNotNull(annotation) {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.kt

@@ -28,7 +28,7 @@ public interface Promise {
    * @param code String
    * @param message String
    */
-  public fun reject(code: String, message: String?)
+  public fun reject(code: String?, message: String?)
 
   /**
    * Report an exception with a custom code.
@@ -36,7 +36,7 @@ public interface Promise {
    * @param code String
    * @param throwable Throwable
    */
-  public fun reject(code: String, throwable: Throwable?)
+  public fun reject(code: String?, throwable: Throwable?)
 
   /**
    * Report an exception with a custom code and error message.
@@ -45,7 +45,7 @@ public interface Promise {
    * @param message String
    * @param throwable Throwable
    */
-  public fun reject(code: String, message: String?, throwable: Throwable?)
+  public fun reject(code: String?, message: String?, throwable: Throwable?)
 
   /**
    * Report an exception, with default error code. Useful in catch-all scenarios where it's unclear
@@ -73,7 +73,7 @@ public interface Promise {
    * @param code String
    * @param userInfo WritableMap
    */
-  public fun reject(code: String, userInfo: WritableMap)
+  public fun reject(code: String?, userInfo: WritableMap)
 
   /**
    * Report an exception with a custom code and userInfo.
@@ -82,7 +82,7 @@ public interface Promise {
    * @param throwable Throwable
    * @param userInfo WritableMap
    */
-  public fun reject(code: String, throwable: Throwable?, userInfo: WritableMap)
+  public fun reject(code: String?, throwable: Throwable?, userInfo: WritableMap)
 
   /**
    * Report an error with a custom code, error message and userInfo, an error not caused by an
@@ -92,7 +92,7 @@ public interface Promise {
    * @param message String
    * @param userInfo WritableMap
    */
-  public fun reject(code: String, message: String?, userInfo: WritableMap)
+  public fun reject(code: String?, message: String?, userInfo: WritableMap)
 
   /**
    * Report an exception with a custom code, error message and userInfo.

package/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.kt

@@ -38,7 +38,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param code String
    * @param message String
    */
-  override fun reject(code: String, message: String?) {
+  override fun reject(code: String?, message: String?) {
     reject(code, message, null, null)
   }
 
@@ -48,7 +48,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param code String
    * @param throwable Throwable
    */
-  override fun reject(code: String, throwable: Throwable?) {
+  override fun reject(code: String?, throwable: Throwable?) {
     reject(code, null, throwable, null)
   }
 
@@ -59,7 +59,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param message String
    * @param throwable Throwable
    */
-  override fun reject(code: String, message: String?, throwable: Throwable?) {
+  override fun reject(code: String?, message: String?, throwable: Throwable?) {
     reject(code, message, throwable, null)
   }
 
@@ -94,7 +94,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param code String
    * @param userInfo WritableMap
    */
-  override fun reject(code: String, userInfo: WritableMap) {
+  override fun reject(code: String?, userInfo: WritableMap) {
     reject(code, null, null, userInfo)
   }
 
@@ -105,7 +105,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param throwable Throwable
    * @param userInfo WritableMap
    */
-  override fun reject(code: String, throwable: Throwable?, userInfo: WritableMap) {
+  override fun reject(code: String?, throwable: Throwable?, userInfo: WritableMap) {
     reject(code, null, throwable, userInfo)
   }
 
@@ -117,7 +117,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param message String
    * @param userInfo WritableMap
    */
-  override fun reject(code: String, message: String?, userInfo: WritableMap) {
+  override fun reject(code: String?, message: String?, userInfo: WritableMap) {
     reject(code, message, null, userInfo)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt

@@ -8,7 +8,6 @@
 package com.facebook.react.bridge
 
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import java.util.ArrayList
 import java.util.Arrays
 import kotlin.jvm.JvmStatic
@@ -90,17 +89,7 @@ public open class ReadableNativeArray protected constructor() : NativeArray(), R
 
   override fun hashCode(): Int = localArray.hashCode()
 
-  override fun equals(other: Any?): Boolean {
-    if (other !is ReadableNativeArray) {
-      return false
-    }
-
-    return if (ReactNativeFeatureFlags.useNativeEqualsInNativeReadableArrayAndroid()) {
-      nativeEquals(other)
-    } else {
-      localArray.contentDeepEquals(other.localArray)
-    }
-  }
+  override fun equals(other: Any?): Boolean = (other is ReadableNativeArray) && nativeEquals(other)
 
   private external fun nativeEquals(other: ReadableNativeArray): Boolean
 

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt

@@ -10,12 +10,12 @@ package com.facebook.react.devsupport
 import android.content.Context
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.devsupport.inspector.TracingState
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
-import com.facebook.react.devsupport.interfaces.TracingState
 import com.facebook.react.packagerconnection.RequestHandler
 
 /**
@@ -23,9 +23,8 @@ import com.facebook.react.packagerconnection.RequestHandler
  * [DevSupportManagerBase] with some additional, more flexible APIs for asynchronously loading the
  * JS bundle.
  *
- * @constructor The primary constructor mirrors the same constructor we have for
- *   [BridgeDevSupportManager] and
- *     * is kept for backward compatibility.
+ * @constructor The primary constructor mirrors the same constructor we had for
+ *   `BridgeDevSupportManager` and is kept for backward compatibility.
  */
 internal class BridgelessDevSupportManager(
     applicationContext: Context,
@@ -83,6 +82,6 @@ internal class BridgelessDevSupportManager(
   }
 
   fun tracingState(): TracingState {
-    return TracingState.ENABLEDINCDPMODE
+    return TracingState.ENABLED_IN_CDP_MODE
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/ChangeBundleLocationDialog.kt

@@ -33,9 +33,6 @@ internal object ChangeBundleLocationDialog {
   ) {
     val settings = devSettings.packagerConnectionSettings
     val currentHost = settings.debugServerHost
-    settings.debugServerHost = ""
-    val defaultHost = settings.debugServerHost
-    settings.debugServerHost = currentHost
 
     val layout = LinearLayout(context)
     layout.orientation = LinearLayout.VERTICAL
@@ -60,11 +57,11 @@ internal object ChangeBundleLocationDialog {
     input.setTextColor(-0x1000000)
     input.setText(currentHost)
 
-    val defaultHostSuggestion = Button(context)
-    defaultHostSuggestion.text = defaultHost
-    defaultHostSuggestion.textSize = 12f
-    defaultHostSuggestion.isAllCaps = false
-    defaultHostSuggestion.setOnClickListener { input.setText(defaultHost) }
+    val currentHostSuggestion = Button(context)
+    currentHostSuggestion.text = currentHost
+    currentHostSuggestion.textSize = 12f
+    currentHostSuggestion.isAllCaps = false
+    currentHostSuggestion.setOnClickListener { input.setText(currentHost) }
 
     val networkHost = getDevServerNetworkIpAndPort(context)
     val networkHostSuggestion = Button(context)
@@ -80,8 +77,12 @@ internal object ChangeBundleLocationDialog {
             LinearLayout.LayoutParams.MATCH_PARENT,
             LinearLayout.LayoutParams.WRAP_CONTENT,
         )
-    suggestionRow.addView(defaultHostSuggestion)
-    suggestionRow.addView(networkHostSuggestion)
+    suggestionRow.addView(currentHostSuggestion)
+
+    if (currentHost != networkHost) {
+      // We don't want to display two buttons with the same host suggestion.
+      suggestionRow.addView(networkHostSuggestion)
+    }
 
     val instructions = TextView(context)
     instructions.text =

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt

@@ -9,11 +9,17 @@ package com.facebook.react.devsupport
 
 import android.os.Handler
 import android.os.Looper
+import com.facebook.common.logging.FLog
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.proguard.annotations.DoNotStripAny
+import com.facebook.react.common.annotations.VisibleForTesting
 import com.facebook.soloader.SoLoader
 import java.io.Closeable
+import java.nio.ByteBuffer
+import java.nio.charset.StandardCharsets
+import java.util.ArrayDeque
+import java.util.Queue
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -67,7 +73,7 @@ internal class CxxInspectorPackagerConnection(
    */
   @DoNotStripAny
   private interface IWebSocket : Closeable {
-    fun send(message: String)
+    fun send(chunk: ByteBuffer)
 
     /**
      * Close the WebSocket connection. NOTE: There is no close() method in the C++ interface.
@@ -76,6 +82,95 @@ internal class CxxInspectorPackagerConnection(
     override fun close()
   }
 
+  /**
+   * A simple WebSocket wrapper that prevents having more than 16MiB of messages queued
+   * simultaneously. This is done to stop OkHttp from closing the WebSocket connection.
+   *
+   * https://github.com/facebook/react-native/issues/39651.
+   * https://github.com/square/okhttp/blob/4e7dbec1ea6c9cf8d80422ac9d44b9b185c749a3/okhttp/src/commonJvmAndroid/kotlin/okhttp3/internal/ws/RealWebSocket.kt#L684.
+   */
+  private class InspectorPackagerWebSocketImpl(
+      private val nativeWebSocket: WebSocket,
+      private val handler: Handler,
+  ) : IWebSocket {
+    private val messageQueue: Queue<Pair<String, Int>> = ArrayDeque()
+    private val queueLock = Any()
+    private val drainRunnable =
+        object : Runnable {
+          override fun run() {
+            FLog.d(TAG, "Attempting to drain the message queue after ${drainDelayMs}ms")
+            tryDrainQueue()
+          }
+        }
+
+    /**
+     * We are providing a String to OkHttp's WebSocket, because there is no guarantee that all CDP
+     * clients will support binary data format.
+     */
+    override fun send(chunk: ByteBuffer) {
+      synchronized(queueLock) {
+        val messageSize = chunk.capacity()
+        val message = StandardCharsets.UTF_8.decode(chunk).toString()
+        val currentQueueSize = nativeWebSocket.queueSize()
+
+        if (currentQueueSize + messageSize > MAX_QUEUE_SIZE) {
+          FLog.d(TAG, "Reached queue size limit. Queueing the message.")
+          messageQueue.offer(Pair(message, messageSize))
+          scheduleDrain()
+        } else {
+          if (messageQueue.isEmpty()) {
+            nativeWebSocket.send(message)
+          } else {
+            messageQueue.offer(Pair(message, messageSize))
+            tryDrainQueue()
+          }
+        }
+      }
+    }
+
+    override fun close() {
+      synchronized(queueLock) {
+        handler.removeCallbacks(drainRunnable)
+        messageQueue.clear()
+        nativeWebSocket.close(1000, "End of session")
+      }
+    }
+
+    private fun tryDrainQueue() {
+      synchronized(queueLock) {
+        while (messageQueue.isNotEmpty()) {
+          val (nextMessage, nextMessageSize) = messageQueue.peek() ?: break
+          val currentQueueSize = nativeWebSocket.queueSize()
+
+          if (currentQueueSize + nextMessageSize <= MAX_QUEUE_SIZE) {
+            messageQueue.poll()
+            if (!nativeWebSocket.send(nextMessage)) {
+              // The WebSocket is closing, closed, or cancelled.
+              handler.removeCallbacks(drainRunnable)
+              messageQueue.clear()
+
+              break
+            }
+          } else {
+            scheduleDrain()
+            break
+          }
+        }
+      }
+    }
+
+    private fun scheduleDrain() {
+      FLog.d(TAG, "Scheduled a task to drain messages queue.")
+      handler.removeCallbacks(drainRunnable)
+      handler.postDelayed(drainRunnable, drainDelayMs)
+    }
+
+    companion object {
+      private val TAG: String = InspectorPackagerWebSocketImpl::class.java.simpleName
+      private const val drainDelayMs: Long = 100
+    }
+  }
+
   /** Java implementation of the C++ InspectorPackagerConnectionDelegate interface. */
   private class DelegateImpl {
     private val httpClient =
@@ -130,15 +225,8 @@ internal class CxxInspectorPackagerConnection(
                 }
               },
           )
-      return object : IWebSocket {
-        override fun send(message: String) {
-          webSocket.send(message)
-        }
 
-        override fun close() {
-          webSocket.close(1000, "End of session")
-        }
-      }
+      return InspectorPackagerWebSocketImpl(webSocket, handler)
     }
 
     @DoNotStrip
@@ -152,6 +240,8 @@ internal class CxxInspectorPackagerConnection(
       SoLoader.loadLibrary("react_devsupportjni")
     }
 
+    @VisibleForTesting internal const val MAX_QUEUE_SIZE = 16L * 1024 * 1024 // 16MiB
+
     @JvmStatic
     private external fun initHybrid(
         url: String,