react-native-tvos 0.83.2-0 → 0.83.4-0

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -30,6 +30,7 @@
 #import <React/RCTTVRemoteHandler.h>
 #import <React/RCTTVNavigationEventNotification.h>
 #import "React/RCTI18nUtil.h"
+#import "RCTViewComponentView.h"
 #endif
 
 using namespace facebook::react;
@@ -40,6 +41,7 @@ static NSString *kOnScrollEndEvent = @"onScrollEnded";
 
 static const CGFloat kClippingLeeway = 44.0;
 static const float TV_DEFAULT_SWIPE_DURATION = 0.3;
+static const CGPoint NO_PREFERRED_CONTENT_OFFSET = CGPointMake(CGFLOAT_MIN, CGFLOAT_MIN);
 
 static UIScrollViewKeyboardDismissMode RCTUIKeyboardDismissModeFromProps(const ScrollViewProps &props)
 {
@@ -97,6 +99,8 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
     RCTScrollableProtocol,
     RCTEnhancedScrollViewOverridingDelegate>
 
+@property (nonatomic, assign) CGPoint preferredContentOffset;
+
 @end
 
 @implementation RCTScrollViewComponentView {
@@ -172,6 +176,7 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
     _endDraggingSensitivityMultiplier = 1;
       
     _tvRemoteGestureRecognizers = [NSMutableDictionary new];
+    _preferredContentOffset = NO_PREFERRED_CONTENT_OFFSET;
   }
 
   return self;
@@ -465,6 +470,12 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     scrollView.keyboardDismissMode = RCTUIKeyboardDismissModeFromProps(newScrollViewProps);
   }
 
+#if TARGET_OS_TV
+  if (oldScrollViewProps.snapToAlignment != newScrollViewProps.snapToAlignment) {
+    scrollView.scrollSnapEnabled = newScrollViewProps.snapToAlignment == ScrollViewSnapToAlignment::Item;
+  }
+#endif
+
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -722,7 +733,10 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
                      withVelocity:(CGPoint)velocity
               targetContentOffset:(inout CGPoint *)targetContentOffset
 {
-  if (fabs(_endDraggingSensitivityMultiplier - 1) > 0.0001f) {
+    if (!CGPointEqualToPoint(self.preferredContentOffset, NO_PREFERRED_CONTENT_OFFSET))
+    {
+        *targetContentOffset = self.preferredContentOffset;
+    } else if (fabs(_endDraggingSensitivityMultiplier - 1) > 0.0001f) {
     if (targetContentOffset->y > 0) {
       const CGFloat travel = targetContentOffset->y - scrollView.contentOffset.y;
       targetContentOffset->y = scrollView.contentOffset.y + travel * _endDraggingSensitivityMultiplier;
@@ -1137,19 +1151,109 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 #pragma mark Apple TV swipe and focus handling
 
 #if TARGET_OS_TV
+// Focus marker helper: traverses view hierarchy to find scrollSnapAlign prop
+// Returns the view that has the property via the output parameter
+- (NSString *)findScrollSnapAlignInView:(UIView *)view foundView:(UIView **)outView
+{
+    UIView *testView = view;
+    UIView *snapTarget;
+    NSString *marker;
+
+    while (testView && testView != self) {
+        if (![testView isKindOfClass:RCTViewComponentView.class])
+        {
+            testView = [testView superview];
+            continue;
+        }
+        RCTViewComponentView *componentView = (RCTViewComponentView *)testView;
+
+        const auto &viewProps = static_cast<const facebook::react::BaseViewProps &>(*componentView.props);
+        if (viewProps.scrollSnapAlign.has_value() && !viewProps.scrollSnapAlign.value().empty()) {
+            marker = [NSString stringWithUTF8String:viewProps.scrollSnapAlign.value().c_str()];
+            snapTarget = componentView;
+        }
+
+        testView = [testView superview];
+    }
+    *outView = snapTarget;
+    return marker;
+}
+
+- (void)_handleScrollSnapForFocusedView:(UIView *)focusedView
+{
+    const auto &scrollProps = static_cast<const ScrollViewProps &>(*_props);
+    UIView *snapAlignView = nil;
+    NSString *scrollSnapAlign = [self findScrollSnapAlignInView:focusedView foundView:&snapAlignView];
+    if (scrollSnapAlign == nil || snapAlignView == nil) {
+        return;
+    }
+
+    RCTEnhancedScrollView *scrollView = (RCTEnhancedScrollView *)_scrollView;
+    CGRect focusedFrame = [snapAlignView convertRect:snapAlignView.bounds toView:_scrollView];
+    CGFloat targetOffset;
+    CGFloat snapToItemPadding = scrollProps.snapToItemPadding;
+
+    BOOL isHorizontalSnap = _scrollView.contentSize.width > self.frame.size.width;
+    // Determine axis-specific properties
+    CGFloat viewportSize, focusedOrigin, focusedSize, currentOffset, maxContentSize;
+    if (isHorizontalSnap) {
+        viewportSize = scrollView.bounds.size.width;
+        focusedOrigin = focusedFrame.origin.x;
+        focusedSize = focusedFrame.size.width;
+        currentOffset = scrollView.contentOffset.x;
+        maxContentSize = scrollView.contentSize.width;
+    } else {
+        viewportSize = scrollView.bounds.size.height;
+        focusedOrigin = focusedFrame.origin.y;
+        focusedSize = focusedFrame.size.height;
+        currentOffset = scrollView.contentOffset.y;
+        maxContentSize = scrollView.contentSize.height;
+    }
+    // Calculate target offset based on scrollSnapAlign (unified for both axes)
+    if ([scrollSnapAlign isEqualToString:@"start"]) {
+        targetOffset = focusedOrigin - snapToItemPadding;
+    } else if ([scrollSnapAlign isEqualToString:@"center"]) {
+        CGFloat viewportCenter = viewportSize / 2;
+        CGFloat focusedCenter = focusedOrigin + (focusedSize / 2);
+        targetOffset = focusedCenter - viewportCenter + (snapToItemPadding / 2);
+    } else if ([scrollSnapAlign isEqualToString:@"end"]) {
+        targetOffset = (focusedOrigin + focusedSize) - viewportSize + snapToItemPadding;
+    } else {
+        targetOffset = currentOffset;
+    }
+
+    // Apply snap-to-interval if configured
+    if (scrollView.snapToInterval > 0) {
+        CGFloat interval = scrollView.snapToInterval;
+        targetOffset = floor(targetOffset / interval) * interval;
+    }
+
+    // Clamp to valid range
+    CGFloat maxOffset = MAX(maxContentSize - viewportSize, 0);
+    targetOffset = MAX(0, MIN(targetOffset, maxOffset));
+    CGPoint targetContentOffset = isHorizontalSnap
+        ? CGPointMake(targetOffset, scrollView.contentOffset.y)
+        : CGPointMake(scrollView.contentOffset.x, targetOffset);
+    self.preferredContentOffset = targetContentOffset;
+    [_scrollView setContentOffset:targetContentOffset animated:YES];
+}
+
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
        withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
 {
-    if (context.previouslyFocusedView == context.nextFocusedView || !_props->isTVSelectable) {
+    self.preferredContentOffset = NO_PREFERRED_CONTENT_OFFSET;
+    const auto &scrollProps = static_cast<const ScrollViewProps &>(*_props);
+    BOOL hasItemSnapAlignment = scrollProps.snapToAlignment == ScrollViewSnapToAlignment::Item;
+    if (context.previouslyFocusedView == context.nextFocusedView || (!_props->isTVSelectable && !hasItemSnapAlignment)) {
         return;
     }
-    if (context.nextFocusedView == self) {
+    if (_props->isTVSelectable && context.nextFocusedView == self) {
         [self becomeFirstResponder];
         [self addSwipeGestureRecognizers];
         // if we enter the scroll view from different view then block first touch event since it is the event that triggered the focus
         _blockFirstTouch = (unsigned long)context.focusHeading != 0;
         [self addArrowsListeners];
-    } else if (context.previouslyFocusedView == self) {
+    } else if (_props->isTVSelectable && context.previouslyFocusedView == self) {
         [self removeArrowsListeners];
         [self removeSwipeGestureRecognizers];
         [self resignFirstResponder];
@@ -1171,6 +1275,8 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
                 [self scrollToHorizontalOffset:scrollView.contentSize.width];
             }
         }
+    } else if ([context.nextFocusedView isDescendantOfView:_scrollView]) {
+        [self _handleScrollSnapForFocusedView:context.nextFocusedView];
     }
 }
 

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h

@@ -80,6 +80,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, nullable) UIFocusGuide *focusGuideLeft;
 @property(nonatomic, nullable) UIFocusGuide *focusGuideRight;
 @property(nonatomic, nullable, strong) RCTTVRemoteSelectHandler *tvRemoteSelectHandler;
+
+- (NSString *)scrollSnapAlign;
 #endif
 
 /**

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -87,7 +87,9 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   BOOL _trapFocusRight;
   NSArray* _focusDestinations;
   id<UIFocusItem> _previouslyFocusedItem;
+  NSString *_scrollSnapAlign;
   RCTSwiftUIContainerViewWrapper *_swiftUIWrapper;
+  BOOL _shouldFocusOnMount;
 }
 
 #ifdef RCT_DYNAMIC_FRAMEWORKS
@@ -113,6 +115,8 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
     _tvParallaxProperties.pressMagnification = 1.0f;
     _tvParallaxProperties.pressDuration = 0.3f;
     _tvParallaxProperties.pressDelay = 0.0f;
+    
+    _shouldFocusOnMount = false;
 #else
     self.multipleTouchEnabled = YES;
 #endif
@@ -170,6 +174,15 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
 
 #pragma mark - Apple TV methods
 
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+
+  if (self->_shouldFocusOnMount) {
+    self->_shouldFocusOnMount = false;
+    [self focusSelf];
+  }
+}
+
 - (RCTSurfaceHostingProxyRootView *)containingRootView
 {
   UIView *rootview = self;
@@ -205,10 +218,8 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   if (!focusedSync) {
     // `focusSelf` function relies on `rootView` which may not be present on the first render.
     // `focusSelf` fails and returns `false` in that case. We try re-executing the same action
-    // by putting it to the main queue to make sure it runs after UI creation is completed.
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self focusSelf];
-    });
+    // when the view has moved to the window. This is tracked by the `_shouldFocusOnMount` flag.
+    self->_shouldFocusOnMount = true;
   }
 }
 
@@ -431,6 +442,13 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   _motionEffectsAdded = NO;
 }
 
+- (NSString *)scrollSnapAlign
+{
+#if TARGET_OS_TV
+  return _scrollSnapAlign;
+#endif
+  return nil;
+}
 
 - (BOOL)isTVFocusGuide
 {
@@ -1160,6 +1178,15 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   _trapFocusDown = newViewProps.trapFocusDown;
   _trapFocusLeft = newViewProps.trapFocusLeft;
   _trapFocusRight = newViewProps.trapFocusRight;
+
+  // `scrollSnapAlign`
+  if (oldViewProps.scrollSnapAlign != newViewProps.scrollSnapAlign) {
+    if (newViewProps.scrollSnapAlign.has_value()) {
+      _scrollSnapAlign = [[NSString alloc] initWithUTF8String:newViewProps.scrollSnapAlign.value().c_str()];
+    } else {
+      _scrollSnapAlign = nil;
+    }
+  }
 #endif
 
   _needsInvalidateLayer = _needsInvalidateLayer || needsInvalidateLayer;

package/React/Inspector/RCTCxxInspectorWebSocketAdapter.mm

@@ -9,6 +9,7 @@
 
 #if RCT_DEV || RCT_REMOTE_PROFILE
 
+#import <React/RCTDevSupportHttpHeaders.h>
 #import <React/RCTInspector.h>
 #import <React/RCTInspectorPackagerConnection.h>
 #import <React/RCTLog.h>
@@ -36,7 +37,10 @@ NSString *NSStringFromUTF8StringView(std::string_view view)
 {
   if ((self = [super init]) != nullptr) {
     _delegate = delegate;
-    _webSocket = [[SRWebSocket alloc] initWithURL:[NSURL URLWithString:NSStringFromUTF8StringView(url)]];
+    NSURL *requestURL = [NSURL URLWithString:NSStringFromUTF8StringView(url)];
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:requestURL];
+    [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
+    _webSocket = [[SRWebSocket alloc] initWithURLRequest:request];
     _webSocket.delegate = self;
     [_webSocket open];
   }

package/ReactAndroid/api/ReactAndroid.api

@@ -2129,6 +2129,7 @@ public final class com/facebook/react/devsupport/StackTraceHelper$StackFrameImpl
 	public fun toJSON ()Lorg/json/JSONObject;
 }
 
+
 public abstract interface class com/facebook/react/devsupport/interfaces/BundleLoadCallback {
 	public fun onError (Ljava/lang/Exception;)V
 	public abstract fun onSuccess ()V

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.83.2-0
+VERSION_NAME=0.83.4-0
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

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

@@ -12,10 +12,9 @@ import android.os.Looper
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.proguard.annotations.DoNotStripAny
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.soloader.SoLoader
 import java.io.Closeable
-import java.util.concurrent.TimeUnit
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
@@ -78,12 +77,7 @@ internal class CxxInspectorPackagerConnection(
 
   /** Java implementation of the C++ InspectorPackagerConnectionDelegate interface. */
   private class DelegateImpl {
-    private val httpClient =
-        OkHttpClient.Builder()
-            .connectTimeout(10, TimeUnit.SECONDS)
-            .writeTimeout(10, TimeUnit.SECONDS)
-            .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
-            .build()
+    private val httpClient = DevSupportHttpClient.websocketClient
 
     private val handler = Handler(Looper.getMainLooper())
 

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

@@ -21,6 +21,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.devsupport.InspectorFlags.getFuseboxEnabled
 import com.facebook.react.devsupport.InspectorFlags.getIsProfilingBuild
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings
@@ -39,7 +40,6 @@ import java.io.UnsupportedEncodingException
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.OkHttpClient
@@ -79,19 +79,15 @@ public open class DevServerHelper(
   }
 
   public val websocketProxyURL: String
-    get() = "ws://${packagerConnectionSettings.debugServerHost}/debugger-proxy?role=client"
+    get() =
+        "${DevSupportHttpClient.wsScheme(packagerConnectionSettings.debugServerHost)}://${packagerConnectionSettings.debugServerHost}/debugger-proxy?role=client"
 
   private enum class BundleType(val typeID: String) {
     BUNDLE("bundle"),
     MAP("map"),
   }
 
-  private val client: OkHttpClient =
-      OkHttpClient.Builder()
-          .connectTimeout(HTTP_CONNECT_TIMEOUT_MS.toLong(), TimeUnit.MILLISECONDS)
-          .readTimeout(0, TimeUnit.MILLISECONDS)
-          .writeTimeout(0, TimeUnit.MILLISECONDS)
-          .build()
+  private val client: OkHttpClient = DevSupportHttpClient.httpClient
   private val bundleDownloader: BundleDownloader = BundleDownloader(client)
   private val packagerStatusCheck: PackagerStatusCheck = PackagerStatusCheck(client)
   private val packageName: String = applicationContext.packageName
@@ -129,7 +125,8 @@ public open class DevServerHelper(
     get() =
         String.format(
             Locale.US,
-            "http://%s/inspector/device?name=%s&app=%s&device=%s&profiling=%b",
+            "%s://%s/inspector/device?name=%s&app=%s&device=%s&profiling=%b",
+            DevSupportHttpClient.httpScheme(packagerConnectionSettings.debugServerHost),
             packagerConnectionSettings.debugServerHost,
             Uri.encode(getFriendlyDeviceName()),
             Uri.encode(packageName),
@@ -292,7 +289,8 @@ public open class DevServerHelper(
     }
     return (String.format(
         Locale.US,
-        "http://%s/%s.%s?platform=android&dev=%s&lazy=%s&minify=%s&app=%s&modulesOnly=%s&runModule=%s",
+        "%s://%s/%s.%s?platform=android&dev=%s&lazy=%s&minify=%s&app=%s&modulesOnly=%s&runModule=%s",
+        DevSupportHttpClient.httpScheme(host),
         host,
         mainModuleID,
         type.typeID,
@@ -367,7 +365,8 @@ public open class DevServerHelper(
     requestUrlBuilder.append(
         String.format(
             Locale.US,
-            "http://%s/open-debugger?device=%s",
+            "%s://%s/open-debugger?device=%s",
+            DevSupportHttpClient.httpScheme(packagerConnectionSettings.debugServerHost),
             packagerConnectionSettings.debugServerHost,
             Uri.encode(inspectorDeviceId),
         )
@@ -397,7 +396,6 @@ public open class DevServerHelper(
   }
 
   private companion object {
-    private const val HTTP_CONNECT_TIMEOUT_MS = 5000
     private const val DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }"
 
     private fun getSHA256(string: String): String {
@@ -446,7 +444,13 @@ public open class DevServerHelper(
         FLog.w(ReactConstants.TAG, "Resource path should not begin with `/`, removing it.")
         resourcePath = resourcePath.substring(1)
       }
-      return String.format(Locale.US, "http://%s/%s", host, resourcePath)
+      return String.format(
+          Locale.US,
+          "%s://%s/%s",
+          DevSupportHttpClient.httpScheme(host),
+          host,
+          resourcePath,
+      )
     }
   }
 }

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

@@ -11,10 +11,10 @@ package com.facebook.react.devsupport
 
 import com.facebook.common.logging.FLog
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback
 import java.io.IOException
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.OkHttpClient
@@ -22,22 +22,9 @@ import okhttp3.Request
 import okhttp3.Response
 
 /** Use this class to check if the JavaScript packager is running on the provided host. */
-internal class PackagerStatusCheck {
+internal class PackagerStatusCheck(private val client: OkHttpClient) {
 
-  private val client: OkHttpClient
-
-  constructor() {
-    client =
-        OkHttpClient.Builder()
-            .connectTimeout(HTTP_CONNECT_TIMEOUT_MS.toLong(), TimeUnit.MILLISECONDS)
-            .readTimeout(0, TimeUnit.MILLISECONDS)
-            .writeTimeout(0, TimeUnit.MILLISECONDS)
-            .build()
-  }
-
-  constructor(client: OkHttpClient) {
-    this.client = client
-  }
+  constructor() : this(DevSupportHttpClient.httpClient)
 
   fun run(host: String, callback: PackagerStatusCallback) {
     val statusURL = createPackagerStatusURL(host)
@@ -92,10 +79,14 @@ internal class PackagerStatusCheck {
 
   private companion object {
     private const val PACKAGER_OK_STATUS = "packager-status:running"
-    private const val HTTP_CONNECT_TIMEOUT_MS = 5_000
-    private const val PACKAGER_STATUS_URL_TEMPLATE = "http://%s/status"
+    private const val PACKAGER_STATUS_URL_TEMPLATE = "%s://%s/status"
 
     private fun createPackagerStatusURL(host: String): String =
-        String.format(Locale.US, PACKAGER_STATUS_URL_TEMPLATE, host)
+        String.format(
+            Locale.US,
+            PACKAGER_STATUS_URL_TEMPLATE,
+            DevSupportHttpClient.httpScheme(host),
+            host,
+        )
   }
 }

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

@@ -33,12 +33,12 @@ import android.widget.TextView
 import com.facebook.common.logging.FLog
 import com.facebook.react.R
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.devsupport.interfaces.ErrorType
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
 import com.facebook.react.devsupport.interfaces.StackFrame
 import okhttp3.MediaType
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
 import org.json.JSONObject
@@ -165,7 +165,7 @@ internal class RedBoxContentView(
                 .query(null)
                 .build()
                 .toString()
-        val client = OkHttpClient()
+        val client = DevSupportHttpClient.httpClient
         for (frame in stackFrames) {
           val payload = stackFrameToJson(checkNotNull(frame)).toString()
           val body: RequestBody = RequestBody.create(JSON, payload)

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

@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+@file:Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
+
+package com.facebook.react.devsupport.inspector
+
+import com.facebook.react.modules.network.OkHttpClientProvider
+import java.util.concurrent.TimeUnit
+import okhttp3.OkHttpClient
+
+/**
+ * Shared [OkHttpClient] instances for devsupport networking. Uses a single connection pool and
+ * dispatcher across all dev support HTTP and WebSocket usage.
+ */
+internal object DevSupportHttpClient {
+  /** Client for HTTP requests: connect=5s, write=disabled, read=disabled. */
+  internal val httpClient: OkHttpClient =
+      OkHttpClientProvider.getOkHttpClient()
+          .newBuilder()
+          .connectTimeout(5, TimeUnit.SECONDS)
+          .writeTimeout(0, TimeUnit.MILLISECONDS)
+          .readTimeout(0, TimeUnit.MINUTES)
+          .build()
+
+  /** Client for WebSocket connections: connect=10s, write=10s, read=disabled. */
+  internal val websocketClient: OkHttpClient =
+      httpClient
+          .newBuilder()
+          .connectTimeout(10, TimeUnit.SECONDS)
+          .writeTimeout(10, TimeUnit.SECONDS)
+          .build()
+
+  /**
+   * Returns the appropriate HTTP scheme ("http" or "https") for the given host. Uses "https" when
+   * the host specifies port 443 explicitly (e.g. "example.com:443").
+   */
+  internal fun httpScheme(host: String): String = if (host.endsWith(":443")) "https" else "http"
+
+  /**
+   * Returns the appropriate WebSocket scheme ("ws" or "wss") for the given host. Uses "wss" when
+   * the host specifies port 443 explicitly (e.g. "example.com:443").
+   */
+  internal fun wsScheme(host: String): String = if (host.endsWith(":443")) "wss" else "ws"
+}

package/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 {

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -14,7 +14,7 @@ public object ReactNativeVersion {
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
     "minor" to 83,
-    "patch" to 2,
+    "patch" to 4,
     "prerelease" to "0"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt

@@ -22,6 +22,7 @@ import com.facebook.react.common.ReactConstants
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.network.CustomClientBuilder
 import com.facebook.react.modules.network.ForwardingCookieHandler
+import com.facebook.react.modules.network.OkHttpClientProvider
 import java.io.IOException
 import java.net.URI
 import java.net.URISyntaxException
@@ -80,7 +81,8 @@ public class WebSocketModule(context: ReactApplicationContext) :
   ) {
     val id = socketID.toInt()
     val okHttpBuilder =
-        OkHttpClient.Builder()
+        OkHttpClientProvider.getOkHttpClient()
+            .newBuilder()
             .connectTimeout(10, TimeUnit.SECONDS)
             .writeTimeout(10, TimeUnit.SECONDS)
             .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
@@ -198,9 +200,6 @@ public class WebSocketModule(context: ReactApplicationContext) :
           }
         },
     )
-
-    // Trigger shutdown of the dispatcher's executor so this process can exit cleanly
-    client.dispatcher().executorService().shutdown()
   }
 
   override fun close(code: Double, reason: String?, socketID: Double) {

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.kt

@@ -9,6 +9,7 @@ package com.facebook.react.packagerconnection
 
 import android.net.Uri
 import com.facebook.common.logging.FLog
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName
 import com.facebook.react.packagerconnection.ReconnectingWebSocket.MessageCallback
 import okio.ByteString
@@ -28,7 +29,7 @@ public constructor(
   init {
     val url =
         Uri.Builder()
-            .scheme("ws")
+            .scheme(DevSupportHttpClient.wsScheme(settings.debugServerHost))
             .encodedAuthority(settings.debugServerHost)
             .appendPath("message")
             .appendQueryParameter("device", getFriendlyDeviceName())

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.kt

@@ -10,10 +10,9 @@ package com.facebook.react.packagerconnection
 import android.os.Handler
 import android.os.Looper
 import com.facebook.common.logging.FLog
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import java.io.IOException
 import java.nio.channels.ClosedChannelException
-import java.util.concurrent.TimeUnit
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
@@ -40,12 +39,7 @@ public class ReconnectingWebSocket(
   }
 
   private val handler = Handler(Looper.getMainLooper())
-  private val okHttpClient: OkHttpClient =
-      OkHttpClient.Builder()
-          .connectTimeout(10, TimeUnit.SECONDS)
-          .writeTimeout(10, TimeUnit.SECONDS)
-          .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
-          .build()
+  private val okHttpClient = DevSupportHttpClient.websocketClient
   private var closed = false
   private var suppressConnectionErrors = false
   private var webSocket: WebSocket? = null