react-native-tvos 0.85.3-0 → 0.86.0-0rc2

package/Libraries/Utilities/codegenNativeComponent.js

@@ -23,7 +23,7 @@ type NativeComponentOptions = Readonly<{
   excludedPlatforms?: ReadonlyArray<'iOS' | 'android'>,
 }>;
 
-export type NativeComponentType<T: {...}> = HostComponent<T>;
+export type NativeComponentType<T extends {...}> = HostComponent<T>;
 
 // If this function runs then that means the view configs were not
 // generated at build time using `GenerateViewConfigJs.js`. Thus
@@ -31,7 +31,7 @@ export type NativeComponentType<T: {...}> = HostComponent<T>;
 // `requireNativeComponent` is not available in Bridgeless mode.
 // e.g. This function runs at runtime if `codegenNativeComponent` was not called
 // from a file suffixed with NativeComponent.js.
-function codegenNativeComponent<Props: {...}>(
+function codegenNativeComponent<Props extends {...}>(
   componentName: string,
   options?: NativeComponentOptions,
 ): NativeComponentType<Props> {
@@ -64,10 +64,10 @@ function codegenNativeComponent<Props: {...}>(
     }
   }
 
-  return (requireNativeComponent<Props>(
+  return requireNativeComponent<Props>(
     // $FlowFixMe[incompatible-type]
     componentNameInUse,
-  ): HostComponent<Props>);
+  ) as HostComponent<Props>;
 }
 
 export default codegenNativeComponent;

package/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js

@@ -27,7 +27,7 @@
  * Freezing the object and adding the throw mechanism is expensive and will
  * only be used in DEV.
  */
-function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<unknown>>(
+function deepFreezeAndThrowOnMutationInDev<T extends {...} | Array<unknown>>(
   object: T,
 ): T {
   if (__DEV__) {
@@ -43,7 +43,7 @@ function deepFreezeAndThrowOnMutationInDev<T: {...} | Array<unknown>>(
     }
 
     // $FlowFixMe[not-an-object] `object` can be an array, but Object.keys works with arrays too
-    const keys = Object.keys((object: {...} | Array<unknown>));
+    const keys = Object.keys(object as {...} | Array<unknown>);
     // $FlowFixMe[method-unbinding] added when improving typing for this parameters
     const hasOwnProperty = Object.prototype.hasOwnProperty;
 

package/Libraries/Utilities/stringifySafe.js

@@ -64,7 +64,7 @@ export function createStringifySafeWithLimits(limits: {
         retval = `{ ... object with ${keys.length} keys ... }`;
       } else if (keys.length > maxObjectKeysLimit) {
         // Return a sample of the keys.
-        retval = ({}: {[string]: unknown});
+        retval = {} as {[string]: unknown};
         for (let k of keys.slice(0, maxObjectKeysLimit)) {
           retval[k] = value[k];
         }

package/Libraries/promiseRejectionTrackingOptions.js

@@ -39,7 +39,7 @@ const rejectionTrackingOptions: NonNullable<Parameters<enable>[0]> = {
         message =
           typeof rejection === 'string'
             ? rejection
-            : JSON.stringify((rejection: $FlowFixMe));
+            : JSON.stringify(rejection as $FlowFixMe);
       }
     }
 

package/Libraries/vendor/core/ErrorUtils.js

@@ -10,22 +10,22 @@
 
 // From @react-native/js-polyfills
 type ErrorHandler = (error: unknown, isFatal: boolean) => void;
-type Fn<Args: ReadonlyArray<unknown>, Return> = (...Args) => Return;
+type Fn<Args extends ReadonlyArray<unknown>, Return> = (...Args) => Return;
 export type ErrorUtils = {
-  applyWithGuard<TArgs: ReadonlyArray<unknown>, TOut>(
+  applyWithGuard<TArgs extends ReadonlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
     context?: unknown,
     args?: ?TArgs,
     unused_onError?: null,
     unused_name?: ?string,
   ): ?TOut,
-  applyWithGuardIfNeeded<TArgs: ReadonlyArray<unknown>, TOut>(
+  applyWithGuardIfNeeded<TArgs extends ReadonlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
     context?: unknown,
     args?: ?TArgs,
   ): ?TOut,
   getGlobalHandler(): ErrorHandler,
-  guard<TArgs: ReadonlyArray<unknown>, TOut>(
+  guard<TArgs extends ReadonlyArray<unknown>, TOut>(
     fun: Fn<TArgs, TOut>,
     name?: ?string,
     context?: unknown,

package/Libraries/vendor/emitter/EventEmitter.js

@@ -16,22 +16,28 @@ export interface EventSubscription {
 }
 
 export interface IEventEmitter<
-  TEventToArgsMap: Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
+  TEventToArgsMap extends Readonly<
+    Record<string, ReadonlyArray<UnsafeEventObject>>,
+  >,
 > {
-  addListener<TEvent: keyof TEventToArgsMap>(
+  addListener<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     listener: (...args: TEventToArgsMap[TEvent]) => unknown,
     context?: unknown,
   ): EventSubscription;
 
-  emit<TEvent: keyof TEventToArgsMap>(
+  emit<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     ...args: TEventToArgsMap[TEvent]
   ): void;
 
-  removeAllListeners<TEvent: keyof TEventToArgsMap>(eventType?: ?TEvent): void;
+  removeAllListeners<TEvent extends keyof TEventToArgsMap>(
+    eventType?: ?TEvent,
+  ): void;
 
-  listenerCount<TEvent: keyof TEventToArgsMap>(eventType: TEvent): number;
+  listenerCount<TEvent extends keyof TEventToArgsMap>(
+    eventType: TEvent,
+  ): number;
 }
 
 interface Registration<TArgs> {
@@ -41,7 +47,9 @@ interface Registration<TArgs> {
 }
 
 type Registry<
-  TEventToArgsMap: Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
+  TEventToArgsMap extends Readonly<
+    Record<string, ReadonlyArray<UnsafeEventObject>>,
+  >,
 > = {
   [K in keyof TEventToArgsMap]: Set<Registration<TEventToArgsMap[K]>>,
 };
@@ -67,7 +75,7 @@ type Registry<
  *
  */
 export default class EventEmitter<
-  TEventToArgsMap: Readonly<
+  TEventToArgsMap extends Readonly<
     Record<string, ReadonlyArray<UnsafeEventObject>>,
   > = Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
 > implements IEventEmitter<TEventToArgsMap>
@@ -83,7 +91,7 @@ export default class EventEmitter<
    * Registers a listener that is called when the supplied event is emitted.
    * Returns a subscription that has a `remove` method to undo registration.
    */
-  addListener<TEvent: keyof TEventToArgsMap>(
+  addListener<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     listener: (...args: TEventToArgsMap[TEvent]) => unknown,
     context: unknown,
@@ -116,7 +124,7 @@ export default class EventEmitter<
    * If a listener modifies the listeners registered for the same event, those
    * changes will not be reflected in the current invocation of `emit`.
    */
-  emit<TEvent: keyof TEventToArgsMap>(
+  emit<TEvent extends keyof TEventToArgsMap>(
     eventType: TEvent,
     ...args: TEventToArgsMap[TEvent]
   ): void {
@@ -134,7 +142,9 @@ export default class EventEmitter<
   /**
    * Removes all registered listeners.
    */
-  removeAllListeners<TEvent: keyof TEventToArgsMap>(eventType?: ?TEvent): void {
+  removeAllListeners<TEvent extends keyof TEventToArgsMap>(
+    eventType?: ?TEvent,
+  ): void {
     if (eventType == null) {
       // $FlowFixMe[incompatible-type]
       this.#registry = {};
@@ -146,7 +156,9 @@ export default class EventEmitter<
   /**
    * Returns the number of registered listeners for the supplied event.
    */
-  listenerCount<TEvent: keyof TEventToArgsMap>(eventType: TEvent): number {
+  listenerCount<TEvent extends keyof TEventToArgsMap>(
+    eventType: TEvent,
+  ): number {
     const registrations: ?Set<Registration<TEventToArgsMap[TEvent]>> =
       this.#registry[eventType];
     return registrations == null ? 0 : registrations.size;
@@ -154,8 +166,10 @@ export default class EventEmitter<
 }
 
 function allocate<
-  TEventToArgsMap: Readonly<Record<string, ReadonlyArray<UnsafeEventObject>>>,
-  TEvent: keyof TEventToArgsMap,
+  TEventToArgsMap extends Readonly<
+    Record<string, ReadonlyArray<UnsafeEventObject>>,
+  >,
+  TEvent extends keyof TEventToArgsMap,
 >(
   registry: Registry<TEventToArgsMap>,
   eventType: TEvent,

package/React/Base/RCTBundleURLProvider.h

@@ -7,8 +7,9 @@
 
 #import <Foundation/Foundation.h>
 
+#import <React/RCTDefines.h>
+
 #import "RCTBundleManager.h"
-#import "RCTDefines.h"
 
 RCT_EXTERN NSString *_Nonnull const RCTBundleURLProviderUpdatedNotification;
 RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
@@ -57,6 +58,23 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *__nullable)scheme;
 
+/**
+ * Asynchronously checks if there's a packager running at the given host:port.
+ * The port is optional, if not specified, kRCTBundleURLProviderDefaultPort will be used
+ * The completion handler is called on an arbitrary queue.
+ */
++ (void)isPackagerRunningAsync:(NSString *)hostPort completion:(void (^)(BOOL isRunning))completion;
+
+/**
+ * Asynchronously checks if there's a packager running at the given scheme://host:port.
+ * The port is optional, if not specified, kRCTBundleURLProviderDefaultPort will be used
+ * The scheme is also optional, if not specified, a default http protocol will be used
+ * The completion handler is called on an arbitrary queue.
+ */
++ (void)isPackagerRunningAsync:(NSString *)hostPort
+                        scheme:(NSString *__nullable)scheme
+                    completion:(void (^)(BOOL isRunning))completion;
+
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.

package/React/Base/RCTBundleURLProvider.mm

@@ -94,6 +94,9 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
   }
 
   NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
+  if (url == nil) {
+    return NO;
+  }
 
   NSURLSession *session = [NSURLSession sharedSession];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url
@@ -133,6 +136,73 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
   return isRunning;
 }
 
++ (void)isPackagerRunningAsync:(NSString *)hostPort completion:(void (^)(BOOL isRunning))completion
+{
+  [RCTBundleURLProvider isPackagerRunningAsync:hostPort scheme:nil completion:completion];
+}
+
++ (void)isPackagerRunningAsync:(NSString *)hostPort
+                        scheme:(NSString *)scheme
+                    completion:(void (^)(BOOL isRunning))completion
+{
+  if (!kRCTAllowPackagerAccess) {
+    completion(NO);
+    return;
+  }
+
+  NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
+  if (url == nil) {
+    completion(NO);
+    return;
+  }
+
+  NSURLSession *session = [NSURLSession sharedSession];
+  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url
+                                                         cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                                     timeoutInterval:kRCTPackagerStatusRequestTimeout];
+  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
+
+  __block BOOL hasCompleted = NO;
+  NSObject *lock = [[NSObject alloc] init];
+
+  void (^safeCompletion)(BOOL) = ^(BOOL isRunning) {
+    @synchronized(lock) {
+      if (!hasCompleted) {
+        hasCompleted = YES;
+        completion(isRunning);
+      }
+    }
+  };
+
+  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
+                                          completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
+                                            if (error != nil || data == nil) {
+                                              safeCompletion(NO);
+                                              return;
+                                            }
+                                            NSString *status = [[NSString alloc] initWithData:data
+                                                                                     encoding:NSUTF8StringEncoding];
+                                            BOOL isRunning = [status isEqualToString:@"packager-status:running"];
+                                            safeCompletion(isRunning);
+                                          }];
+  [task resume];
+
+  dispatch_after(
+      dispatch_time(
+          DISPATCH_TIME_NOW,
+          (int64_t)((kRCTPackagerStatusRequestTimeout + kRCTPackagerStatusRequestTimeoutGraceTime) * NSEC_PER_SEC)),
+      dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+      ^{
+        @synchronized(lock) {
+          if (!hasCompleted) {
+            hasCompleted = YES;
+            [task cancel];
+            completion(NO);
+          }
+        }
+      });
+}
+
 - (NSString *)guessPackagerHost
 {
   static NSString *ipGuess;
@@ -160,6 +230,18 @@ static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 {
   return false;
 }
+
++ (void)isPackagerRunningAsync:(NSString *)hostPort completion:(void (^)(BOOL isRunning))completion
+{
+  completion(NO);
+}
+
++ (void)isPackagerRunningAsync:(NSString *)hostPort
+                        scheme:(NSString *)scheme
+                    completion:(void (^)(BOOL isRunning))completion
+{
+  completion(NO);
+}
 #endif
 
 - (NSString *)packagerServerHost

package/React/Base/RCTDefines.h

@@ -67,7 +67,7 @@
 #endif
 
 #ifndef RCT_ENABLE_INSPECTOR
-#if (RCT_DEV || RCT_REMOTE_PROFILE) && __has_include(<React/RCTInspectorDevServerHelper.h>)
+#if (RCT_DEV || RCT_REMOTE_PROFILE)
 #define RCT_ENABLE_INSPECTOR 1
 #else
 #define RCT_ENABLE_INSPECTOR 0

package/React/Base/RCTMultipartDataTask.h

@@ -17,7 +17,7 @@ typedef void (^RCTMultipartDataTaskCallback)(
     NSError *error,
     BOOL done);
 
-typedef NSURLRequest * _Nullable (^RCTMultipartDataTaskRequestInterceptor)(NSURLRequest *request);
+typedef NSURLRequest *_Nullable (^RCTMultipartDataTaskRequestInterceptor)(NSURLRequest *request);
 /**
  * The block provided via this function can inspect/modify multipart data task
  * requests before they are sent. Return a modified request to override, or nil

package/React/Base/RCTMultipartDataTask.m

@@ -14,8 +14,6 @@ void RCTSetCustomMultipartDataTaskRequestInterceptor(RCTMultipartDataTaskRequest
   multipartRequestInterceptor = interceptor;
 }
 
-#import "RCTDevSupportHttpHeaders.h"
-
 @interface RCTMultipartDataTask () <NSURLSessionDataDelegate, NSURLSessionDataDelegate>
 
 @end
@@ -49,7 +47,6 @@ void RCTSetCustomMultipartDataTaskRequestInterceptor(RCTMultipartDataTaskRequest
                                                    delegateQueue:nil];
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:_url];
   [request addValue:@"multipart/mixed" forHTTPHeaderField:@"Accept"];
-  [[RCTDevSupportHttpHeaders sharedInstance] applyHeadersToRequest:request];
   NSURLRequest *finalRequest = request;
   if (multipartRequestInterceptor != nil) {
     NSURLRequest *intercepted = multipartRequestInterceptor(request);

package/React/Base/RCTRootView.h

@@ -54,6 +54,8 @@ extern
  * like any ordinary UIView. You can have multiple RCTRootViews on screen at
  * once, all controlled by the same JavaScript application.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wdeprecated"
 __attribute__((deprecated("This API will be removed along with the legacy architecture.")))
 #if TARGET_OS_TV
 @interface RCTRootView : UIView <RCTTVRemoteSelectHandlerDelegate>
@@ -190,4 +192,6 @@ __attribute__((deprecated("This API will be removed along with the legacy archit
 
 @end
 
+#pragma clang diagnostic pop
+
 NS_ASSUME_NONNULL_END

package/React/Base/RCTRootViewDelegate.h

@@ -6,8 +6,7 @@
  */
 
 #import <Foundation/Foundation.h>
-
-@class RCTRootView;
+#import <React/RCTRootView.h>
 
 @protocol RCTRootViewDelegate <NSObject>
 
@@ -25,6 +24,10 @@
  * The new intrinsic content size is available via the `intrinsicContentSize`
  * property of the root view. The view will not resize itself.
  */
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
 - (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView;
+#pragma clang diagnostic pop
 
 @end

package/React/Base/RCTVersion.m

@@ -22,9 +22,9 @@ NSDictionary* RCTGetReactNativeVersion(void)
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(85),
-                  RCTVersionPatch: @(3),
-                  RCTVersionPrerelease: @"0",
+                  RCTVersionMinor: @(86),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: @"0rc2",
                   };
   });
   return __rnVersion;

package/React/Base/Surface/RCTSurface.h

@@ -32,8 +32,11 @@ NS_ASSUME_NONNULL_BEGIN
  *  * ability to create a UIView instance on demand (later);
  *  * ability to communicate the current stage of the surface granularly.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wdeprecated"
 __deprecated_msg("This API will be removed along with the legacy architecture.") @interface RCTSurface
     : NSObject<RCTSurfaceProtocol>
+#pragma clang diagnostic pop
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName

package/React/Base/Surface/RCTSurfaceDelegate.h

@@ -7,12 +7,11 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTSurface.h>
 #import <React/RCTSurfaceStage.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class RCTSurface;
-
 @protocol RCTSurfaceDelegate <NSObject>
 
 @optional
@@ -21,13 +20,18 @@ NS_ASSUME_NONNULL_BEGIN
  * Notifies a receiver that a surface transitioned to a new stage.
  * See `RCTSurfaceStage` for more details.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
 - (void)surface:(RCTSurface *)surface didChangeStage:(RCTSurfaceStage)stage;
-
+#pragma clang diagnostic pop
 /**
  * Notifies a receiver that root view got a new (intrinsic) size during the last
  * layout pass.
  */
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
 - (void)surface:(RCTSurface *)surface didChangeIntrinsicSize:(CGSize)intrinsicSize;
+#pragma clang diagnostic pop
 
 @end
 

package/React/Base/Surface/RCTSurfaceRootView.mm

@@ -7,7 +7,7 @@
 
 #import "RCTSurfaceRootView.h"
 
-#import "RCTDefines.h"
+#import <React/RCTDefines.h>
 
 @implementation RCTSurfaceRootView
 

package/React/Base/Surface/RCTSurfaceView.mm

@@ -8,7 +8,8 @@
 #import "RCTSurfaceView.h"
 #import "RCTSurfaceView+Internal.h"
 
-#import "RCTDefines.h"
+#import <React/RCTDefines.h>
+
 #import "RCTSurface.h"
 #import "RCTSurfaceProtocol.h"
 #import "RCTSurfaceRootView.h"

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm

@@ -182,6 +182,8 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 #if TARGET_OS_TV
      self.tvRemoteHandler = [[RCTTVRemoteHandler alloc] initWithView:[self contentView]];
      self.tvRemoteSelectHandler = [[RCTTVRemoteSelectHandler alloc] initWithView:self];
+     [self setNeedsFocusUpdate];
+     [self updateFocusIfNeeded];
 #endif
     });
   }

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h

@@ -12,9 +12,6 @@
 #import <React/RCTSurfaceSizeMeasureMode.h>
 #import <React/RCTSurfaceStage.h>
 
-@class RCTBridge;
-@class RCTSurface;
-
 typedef UIView *_Nullable (^RCTSurfaceHostingViewActivityIndicatorViewFactory)(void);
 
 NS_ASSUME_NONNULL_BEGIN

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

@@ -6,8 +6,10 @@
  */
 
 #import "RCTSurfaceHostingView.h"
+
+#import <React/RCTDefines.h>
+
 #import "RCTConstants.h"
-#import "RCTDefines.h"
 #import "RCTSurface.h"
 #import "RCTSurfaceDelegate.h"
 #import "RCTSurfaceView.h"

package/React/CoreModules/RCTDevMenuConfigurationDecorator.h

@@ -15,8 +15,8 @@
 
 @property (nonatomic, strong, readonly) RCTDevMenuConfiguration *__nullable devMenuConfiguration;
 
-- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
-- (void)decorate:(id<RCTBridgeModule>)devMenuModule;
+- (instancetype _Nonnull)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
+- (void)decorate:(id<RCTBridgeModule> _Nonnull)devMenuModule;
 
 #endif
 

package/React/CoreModules/RCTRedBox2AnsiParser.mm

@@ -29,7 +29,7 @@ static UIColor *RCTUIColorFromAnsiColor(const AnsiColor &c)
   }
 
   auto spans = parseAnsi(text.UTF8String);
-  NSMutableAttributedString *result =[NSMutableAttributedString new];
+  NSMutableAttributedString *result = [NSMutableAttributedString new];
   NSDictionary *baseAttributes = @{NSFontAttributeName : font, NSForegroundColorAttributeName : color};
 
   for (const auto &span : spans) {

package/React/CoreModules/RCTWebSocketModule.mm

@@ -10,6 +10,7 @@
 #import <objc/runtime.h>
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
+#import <React/RCTAssert.h>
 #import <React/RCTConvert.h>
 #import <React/RCTUtils.h>
 #import <SocketRocket/SRWebSocket.h>
@@ -73,6 +74,12 @@ RCT_EXPORT_METHOD(
     connect : (NSURL *)URL protocols : (NSArray *)protocols options : (JS::NativeWebSocketModule::SpecConnectOptions &)
         options socketID : (double)socketID)
 {
+  if (URL == nil || URL.absoluteString.length == 0u) {
+    RCTAssert(NO, @"RCTWebSocketModule: Invalid WebSocket URL passed to connect");
+    [self sendEventWithName:@"websocketFailed" body:@{@"message" : @"Invalid WebSocket URL", @"id" : @(socketID)}];
+    return;
+  }
+
   NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
 
   // We load cookies from sharedHTTPCookieStorage (shared with XHR and
@@ -84,14 +91,33 @@ RCT_EXPORT_METHOD(
   }
 
   // Load and set the cookie header.
-  NSArray<NSHTTPCookie *> *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:components.URL];
-  request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
+  if (components != nil && components.URL != nil) {
+    NSArray<NSHTTPCookie *> *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:components.URL];
+    request.allHTTPHeaderFields = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
+  } else {
+    RCTLogError(@"RCTWebSocketModule: Invalid URL components - components or components.URL is nil");
+  }
 
   // Load supplied headers
   if ([options.headers() isKindOfClass:NSDictionary.class]) {
     NSDictionary *headers = (NSDictionary *)options.headers();
-    [headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
-      [request addValue:[RCTConvert NSString:value] forHTTPHeaderField:key];
+    [headers enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
+      NSString *headerKey = [RCTConvert NSString:key];
+      NSString *headerValue = [RCTConvert NSString:value];
+
+      if (headerKey == nil || headerValue == nil) {
+        RCTLogError(
+            @"RCTWebSocketModule: Invalid header key and/or value types. "
+             "Expected NSString for both, got key of type %@ and value of type %@.",
+            NSStringFromClass([key class]),
+            NSStringFromClass([value class]));
+      }
+
+      if (headerKey == nil) {
+        return;
+      }
+
+      [request addValue:headerValue == nil ? @"" : headerValue forHTTPHeaderField:headerKey];
     }];
   }
 
@@ -153,6 +179,9 @@ RCT_EXPORT_METHOD(close : (double)code reason : (NSString *)reason socketID : (d
   NSString *type;
 
   NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   id contentHandler = _contentHandlers[socketID];
   if (contentHandler) {
     message = [contentHandler processWebsocketMessage:message forSocketID:socketID withType:&type];
@@ -165,18 +194,25 @@ RCT_EXPORT_METHOD(close : (double)code reason : (NSString *)reason socketID : (d
     }
   }
 
-  [self sendEventWithName:@"websocketMessage" body:@{@"data" : message, @"type" : type, @"id" : webSocket.reactTag}];
+  [self sendEventWithName:@"websocketMessage" body:@{@"data" : message, @"type" : type, @"id" : socketID}];
 }
 
 - (void)webSocketDidOpen:(SRWebSocket *)webSocket
 {
+  NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   [self sendEventWithName:@"websocketOpen"
-                     body:@{@"id" : webSocket.reactTag, @"protocol" : webSocket.protocol ? webSocket.protocol : @""}];
+                     body:@{@"id" : socketID, @"protocol" : webSocket.protocol ? webSocket.protocol : @""}];
 }
 
 - (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error
 {
   NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   _contentHandlers[socketID] = nil;
   _sockets[socketID] = nil;
   NSDictionary *body =
@@ -190,6 +226,9 @@ RCT_EXPORT_METHOD(close : (double)code reason : (NSString *)reason socketID : (d
             wasClean:(BOOL)wasClean
 {
   NSNumber *socketID = [webSocket reactTag];
+  if (!socketID) {
+    return;
+  }
   _contentHandlers[socketID] = nil;
   _sockets[socketID] = nil;
   [self sendEventWithName:@"websocketClosed"

package/React/CxxLogUtils/RCTDefaultCxxLogFunction.mm

@@ -28,7 +28,6 @@ void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message)
       break;
     case ReactNativeLogLevelFatal:
       LOG(FATAL) << message;
-      break;
   }
 }