react-native-tvos 0.82.1-0 → 0.83.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -18,6 +18,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.common.network.OkHttpCallUtil
 import com.facebook.react.module.annotations.ReactModule
@@ -25,6 +26,7 @@ import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.util.ArrayList
 import java.util.HashSet
+import java.util.UUID
 import java.util.concurrent.TimeUnit
 import okhttp3.Call
 import okhttp3.Callback
@@ -208,6 +210,17 @@ public class NetworkingModule(
     responseHandlers.remove(handler)
   }
 
+  private fun extractOrGenerateDevToolsRequestId(
+      data: ReadableMap?,
+  ): String =
+      (if (
+          data != null &&
+              data.hasKey(REQUEST_DATA_KEY_DEVTOOLS_REQUEST_ID) &&
+              data.getType(REQUEST_DATA_KEY_DEVTOOLS_REQUEST_ID) == ReadableType.String
+      )
+          data.getString(REQUEST_DATA_KEY_DEVTOOLS_REQUEST_ID)
+      else null) ?: UUID.randomUUID().toString()
+
   override fun sendRequest(
       method: String,
       url: String,
@@ -221,8 +234,9 @@ public class NetworkingModule(
   ) {
     val requestId = requestIdAsDouble.toInt()
     val timeout = timeoutAsDouble.toInt()
+    val devToolsRequestId = extractOrGenerateDevToolsRequestId(data)
     try {
-      sendRequestInternal(
+      sendRequestInternalReal(
           method,
           url,
           requestId,
@@ -232,6 +246,7 @@ public class NetworkingModule(
           useIncrementalUpdates,
           timeout,
           withCredentials,
+          devToolsRequestId,
       )
     } catch (th: Throwable) {
       FLog.e(TAG, "Failed to send url request: $url", th)
@@ -239,12 +254,14 @@ public class NetworkingModule(
       NetworkEventUtil.onRequestError(
           getReactApplicationContextIfActiveOrWarn(),
           requestId,
+          devToolsRequestId,
           th.message,
           th,
       )
     }
   }
 
+  @Deprecated("""sendRequestInternal is internal and will be made private in a future release.""")
   /** @param timeout value of 0 results in no timeout */
   public fun sendRequestInternal(
       method: String,
@@ -256,6 +273,33 @@ public class NetworkingModule(
       useIncrementalUpdates: Boolean,
       timeout: Int,
       withCredentials: Boolean,
+  ) {
+    sendRequestInternalReal(
+        method,
+        url,
+        requestId,
+        headers,
+        data,
+        responseType,
+        useIncrementalUpdates,
+        timeout,
+        withCredentials,
+        extractOrGenerateDevToolsRequestId(data),
+    )
+  }
+
+  /** @param timeout value of 0 results in no timeout */
+  private fun sendRequestInternalReal(
+      method: String,
+      url: String?,
+      requestId: Int,
+      headers: ReadableArray?,
+      data: ReadableMap?,
+      responseType: String,
+      useIncrementalUpdates: Boolean,
+      timeout: Int,
+      withCredentials: Boolean,
+      devToolsRequestId: String,
   ) {
     val reactApplicationContext = getReactApplicationContextIfActiveOrWarn()
     try {
@@ -275,18 +319,37 @@ public class NetworkingModule(
                   .code(200)
                   .message("OK")
                   .build()
-          NetworkEventUtil.onResponseReceived(reactApplicationContext, requestId, url, response)
-          NetworkEventUtil.onDataReceived(reactApplicationContext, requestId, res, rawBody)
+          NetworkEventUtil.onResponseReceived(
+              reactApplicationContext,
+              requestId,
+              devToolsRequestId,
+              url,
+              response,
+          )
+          NetworkEventUtil.onDataReceived(
+              reactApplicationContext,
+              requestId,
+              devToolsRequestId,
+              res,
+              rawBody,
+          )
           NetworkEventUtil.onRequestSuccess(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               encodedDataLength.toLong(),
           )
           return
         }
       }
     } catch (e: IOException) {
-      NetworkEventUtil.onRequestError(reactApplicationContext, requestId, e.message, e)
+      NetworkEventUtil.onRequestError(
+          reactApplicationContext,
+          requestId,
+          devToolsRequestId,
+          e.message,
+          e,
+      )
       return
     }
 
@@ -294,7 +357,13 @@ public class NetworkingModule(
     try {
       requestBuilder = Request.Builder().url(url.orEmpty())
     } catch (e: Exception) {
-      NetworkEventUtil.onRequestError(reactApplicationContext, requestId, e.message, e)
+      NetworkEventUtil.onRequestError(
+          reactApplicationContext,
+          requestId,
+          devToolsRequestId,
+          e.message,
+          e,
+      )
       return
     }
 
@@ -361,6 +430,7 @@ public class NetworkingModule(
       NetworkEventUtil.onRequestError(
           reactApplicationContext,
           requestId,
+          devToolsRequestId,
           "Unrecognized headers format",
           null,
       )
@@ -391,6 +461,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Payload is set but no content-type header specified",
               null,
           )
@@ -407,6 +478,7 @@ public class NetworkingModule(
             NetworkEventUtil.onRequestError(
                 reactApplicationContext,
                 requestId,
+                devToolsRequestId,
                 "Failed to gzip request body",
                 null,
             )
@@ -426,6 +498,7 @@ public class NetworkingModule(
             NetworkEventUtil.onRequestError(
                 reactApplicationContext,
                 requestId,
+                devToolsRequestId,
                 "Received request but body was empty",
                 null,
             )
@@ -440,6 +513,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Payload is set but no content-type header specified",
               null,
           )
@@ -453,6 +527,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Invalid content type specified: $contentType",
               null,
           )
@@ -463,6 +538,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Request body base64 string was invalid",
               null,
           )
@@ -476,6 +552,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Payload is set but no content-type header specified",
               null,
           )
@@ -486,6 +563,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Request body URI field was set but null",
               null,
           )
@@ -496,6 +574,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Could not retrieve file for uri $uri",
               null,
           )
@@ -512,12 +591,14 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Received request but form data was empty",
               null,
           )
           return
         }
-        val multipartBuilder = constructMultipartBody(parts, contentType, requestId) ?: return
+        val multipartBuilder =
+            constructMultipartBody(parts, contentType, requestId, devToolsRequestId) ?: return
         requestBody = multipartBuilder.build()
       }
       else -> {
@@ -530,7 +611,7 @@ public class NetworkingModule(
 
     addRequest(requestId)
     val request = requestBuilder.build()
-    NetworkEventUtil.onCreateRequest(requestId, request)
+    NetworkEventUtil.onCreateRequest(devToolsRequestId, request)
 
     client
         .newCall(request)
@@ -543,7 +624,13 @@ public class NetworkingModule(
                 removeRequest(requestId)
                 val errorMessage =
                     e.message ?: ("Error while executing request: ${e.javaClass.simpleName}")
-                NetworkEventUtil.onRequestError(reactApplicationContext, requestId, errorMessage, e)
+                NetworkEventUtil.onRequestError(
+                    reactApplicationContext,
+                    requestId,
+                    devToolsRequestId,
+                    errorMessage,
+                    e,
+                )
               }
 
               @Throws(IOException::class)
@@ -556,6 +643,7 @@ public class NetworkingModule(
                 NetworkEventUtil.onResponseReceived(
                     reactApplicationContext,
                     requestId,
+                    devToolsRequestId,
                     url,
                     response,
                 )
@@ -580,6 +668,7 @@ public class NetworkingModule(
                     NetworkEventUtil.onRequestError(
                         reactApplicationContext,
                         requestId,
+                        devToolsRequestId,
                         "Response body is null",
                         null,
                     )
@@ -606,12 +695,14 @@ public class NetworkingModule(
                       NetworkEventUtil.onDataReceived(
                           reactApplicationContext,
                           requestId,
+                          devToolsRequestId,
                           res,
                           responseData,
                       )
                       NetworkEventUtil.onRequestSuccess(
                           reactApplicationContext,
                           requestId,
+                          devToolsRequestId,
                           responseBody.contentLength(),
                       )
                       return
@@ -622,10 +713,11 @@ public class NetworkingModule(
                   // response,
                   // periodically send response data updates to JS.
                   if (useIncrementalUpdates && responseType == "text") {
-                    readWithProgress(requestId, responseBody)
+                    readWithProgress(requestId, devToolsRequestId, responseBody)
                     NetworkEventUtil.onRequestSuccess(
                         reactApplicationContext,
                         requestId,
+                        devToolsRequestId,
                         responseBody.contentLength(),
                     )
                     return
@@ -647,6 +739,7 @@ public class NetworkingModule(
                         NetworkEventUtil.onRequestError(
                             reactApplicationContext,
                             requestId,
+                            devToolsRequestId,
                             e.message,
                             e,
                         )
@@ -658,16 +751,24 @@ public class NetworkingModule(
                   NetworkEventUtil.onDataReceived(
                       reactApplicationContext,
                       requestId,
+                      devToolsRequestId,
                       responseString,
                       responseType,
                   )
                   NetworkEventUtil.onRequestSuccess(
                       reactApplicationContext,
                       requestId,
+                      devToolsRequestId,
                       responseBody.contentLength(),
                   )
                 } catch (e: IOException) {
-                  NetworkEventUtil.onRequestError(reactApplicationContext, requestId, e.message, e)
+                  NetworkEventUtil.onRequestError(
+                      reactApplicationContext,
+                      requestId,
+                      devToolsRequestId,
+                      e.message,
+                      e,
+                  )
                 }
               }
             }
@@ -704,7 +805,11 @@ public class NetworkingModule(
   }
 
   @Throws(IOException::class)
-  private fun readWithProgress(requestId: Int, responseBody: ResponseBody) {
+  private fun readWithProgress(
+      requestId: Int,
+      devToolsRequestId: String,
+      responseBody: ResponseBody,
+  ) {
     var totalBytesRead: Long = -1
     var contentLength: Long = -1
     try {
@@ -733,6 +838,7 @@ public class NetworkingModule(
         NetworkEventUtil.onIncrementalDataReceived(
             reactApplicationContext,
             requestId,
+            devToolsRequestId,
             streamDecoder.decodeNext(buffer, read),
             totalBytesRead,
             contentLength,
@@ -784,6 +890,7 @@ public class NetworkingModule(
       body: ReadableArray,
       contentType: String,
       requestId: Int,
+      devToolsRequestId: String,
   ): MultipartBody.Builder? {
     val reactApplicationContext = getReactApplicationContextIfActiveOrWarn()
     val multipartBuilder = MultipartBody.Builder()
@@ -792,6 +899,7 @@ public class NetworkingModule(
       NetworkEventUtil.onRequestError(
           reactApplicationContext,
           requestId,
+          devToolsRequestId,
           "Invalid media type.",
           null,
       )
@@ -805,6 +913,7 @@ public class NetworkingModule(
         NetworkEventUtil.onRequestError(
             reactApplicationContext,
             requestId,
+            devToolsRequestId,
             "Unrecognized FormData part.",
             null,
         )
@@ -818,6 +927,7 @@ public class NetworkingModule(
         NetworkEventUtil.onRequestError(
             reactApplicationContext,
             requestId,
+            devToolsRequestId,
             "Missing or invalid header format for FormData part.",
             null,
         )
@@ -846,6 +956,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Binary FormData part needs a content-type header.",
               null,
           )
@@ -856,6 +967,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Body must have a valid file uri",
               null,
           )
@@ -867,6 +979,7 @@ public class NetworkingModule(
           NetworkEventUtil.onRequestError(
               reactApplicationContext,
               requestId,
+              devToolsRequestId,
               "Could not retrieve file for uri $fileContentUriStr",
               null,
           )
@@ -877,6 +990,7 @@ public class NetworkingModule(
         NetworkEventUtil.onRequestError(
             reactApplicationContext,
             requestId,
+            devToolsRequestId,
             "Unrecognized FormData part.",
             null,
         )
@@ -930,6 +1044,7 @@ public class NetworkingModule(
     private const val REQUEST_BODY_KEY_URI = "uri"
     private const val REQUEST_BODY_KEY_FORMDATA = "formData"
     private const val REQUEST_BODY_KEY_BASE64 = "base64"
+    private const val REQUEST_DATA_KEY_DEVTOOLS_REQUEST_ID = "devToolsRequestId"
     private const val USER_AGENT_HEADER_NAME = "user-agent"
     private const val CHUNK_TIMEOUT_NS = 100 * 1_000_000 // 100ms
     private const val MAX_CHUNK_SIZE_BETWEEN_FLUSHES = 8 * 1_024 // 8K

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt

@@ -23,6 +23,10 @@ internal class ProgressRequestBody(
 ) : RequestBody() {
   private var contentLength = 0L
 
+  companion object {
+    private const val MAX_BODY_PREVIEW_SIZE = 1024 * 1024 // 1MB
+  }
+
   override fun contentType(): MediaType? {
     return requestBody.contentType()
   }
@@ -78,4 +82,20 @@ internal class ProgressRequestBody(
         }
     )
   }
+
+  fun getBodyPreview(): String {
+    return try {
+      val buffer = okio.Buffer()
+      requestBody.writeTo(buffer)
+      val size = buffer.size()
+      if (size <= MAX_BODY_PREVIEW_SIZE) {
+        buffer.readUtf8()
+      } else {
+        buffer.readUtf8(MAX_BODY_PREVIEW_SIZE.toLong()) +
+            "\n... [truncated, showing $MAX_BODY_PREVIEW_SIZE of $size bytes]"
+      }
+    } catch (e: Exception) {
+      ""
+    }
+  }
 }

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

@@ -85,7 +85,7 @@ public object AndroidInfoHelpers {
   private fun getReactNativeVersionString(): String {
     val version = ReactNativeVersion.VERSION
     return "${version["major"]}.${version["minor"]}.${version["patch"]}" +
-        (version["prerelease"]?.let { "-$it" } ?: "")
+        (version["prerelease"]?.let { "-$it" }.orEmpty())
   }
 
   private fun getDevServerPort(context: Context): Int =
@@ -123,7 +123,7 @@ public object AndroidInfoHelpers {
       var lastLine = ""
       var line: String?
       while (reader.readLine().also { line = it } != null) {
-        lastLine = line ?: ""
+        lastLine = line.orEmpty()
       }
       metroHostPropValue = lastLine
     } catch (e: Exception) {
@@ -133,6 +133,6 @@ public object AndroidInfoHelpers {
       reader?.close()
       process?.destroy()
     }
-    return metroHostPropValue ?: ""
+    return metroHostPropValue.orEmpty()
   }
 }

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

@@ -55,7 +55,7 @@ public class AndroidInfoModule(reactContext: ReactApplicationContext) :
       constants["ServerHost"] =
           AndroidInfoHelpers.getServerHost(reactApplicationContext.applicationContext)
     }
-    constants["isTesting"] = "true" == System.getProperty(IS_TESTING) || isRunningScreenshotTest()
+    constants["isTesting"] = "true" == System.getProperty(IS_TESTING)
     val isDisableAnimations = System.getProperty(IS_DISABLE_ANIMATIONS)
     if (isDisableAnimations != null) {
       constants["isDisableAnimations"] = "true" == isDisableAnimations
@@ -71,15 +71,6 @@ public class AndroidInfoModule(reactContext: ReactApplicationContext) :
 
   override fun invalidate() {}
 
-  private fun isRunningScreenshotTest(): Boolean {
-    return try {
-      Class.forName("com.facebook.testing.react.screenshots.ReactAppScreenshotTestActivity")
-      true
-    } catch (ignored: ClassNotFoundException) {
-      false
-    }
-  }
-
   public companion object {
     public const val NAME: String = NativePlatformConstantsAndroidSpec.NAME
     private const val IS_TESTING = "IS_TESTING"

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

@@ -13,8 +13,8 @@ public object ReactNativeVersion {
   @JvmField
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
-    "minor" to 82,
-    "patch" to 1,
+    "minor" to 83,
+    "patch" to 0,
     "prerelease" to "0"
   )
 }

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

@@ -20,15 +20,22 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
       PreferenceManager.getDefaultSharedPreferences(appContext)
   public val packageName: String = appContext.packageName
   private val _additionalOptionsForPackager: MutableMap<String, String> = mutableMapOf()
+  private var _packagerOptionsUpdater: (Map<String, String>) -> Map<String, String> = { it }
+  private var cachedHost: String? = null
 
   public open var debugServerHost: String
     get() {
-      // Check host setting first. If empty try to detect emulator type and use default
+      // Check cached host first. If empty try to detect emulator type and use default
       // hostname for those
+      cachedHost?.let {
+        return it
+      }
+
       val hostFromSettings = preferences.getString(PREFS_DEBUG_SERVER_HOST_KEY, null)
       if (!hostFromSettings.isNullOrEmpty()) {
         return hostFromSettings
       }
+
       val host = AndroidInfoHelpers.getServerHost(appContext)
       if (host == AndroidInfoHelpers.DEVICE_LOCALHOST) {
         FLog.w(
@@ -36,20 +43,29 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
             "You seem to be running on device. Run '${AndroidInfoHelpers.getAdbReverseTcpCommand(appContext)}' to forward the debug server's port to the device.",
         )
       }
+
+      cachedHost = host
       return host
     }
     set(host) {
       if (host.isEmpty()) {
-        preferences.edit().remove(PREFS_DEBUG_SERVER_HOST_KEY).apply()
+        cachedHost = null
       } else {
-        preferences.edit().putString(PREFS_DEBUG_SERVER_HOST_KEY, host).apply()
+        cachedHost = host
       }
     }
 
   public open fun resetDebugServerHost() {
-    preferences.edit().remove(PREFS_DEBUG_SERVER_HOST_KEY).apply()
+    cachedHost = null
   }
 
+  public fun setPackagerOptionsUpdater(queryMapper: (Map<String, String>) -> Map<String, String>) {
+    _packagerOptionsUpdater = queryMapper
+  }
+
+  public fun updatePackagerOptions(options: Map<String, String>): Map<String, String> =
+      _packagerOptionsUpdater(options)
+
   public fun setAdditionalOptionForPackager(key: String, value: String) {
     _additionalOptionsForPackager[key] = value
   }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.JavaScriptModuleRegistry
 import com.facebook.react.bridge.NativeArray
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactSoftExceptionLogger.logSoftException
 import com.facebook.react.bridge.UIManager
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
@@ -30,6 +31,8 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.uimanager.events.EventDispatcherProvider
+import com.facebook.react.uimanager.events.RCTEventEmitter
+import java.lang.IllegalArgumentException
 import java.lang.reflect.InvocationHandler
 import java.lang.reflect.Method
 import java.lang.reflect.Proxy
@@ -123,8 +126,16 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
   }
 
   override fun <T : JavaScriptModule> getJSModule(jsInterface: Class<T>): T? {
-    mInteropModuleRegistry?.getInteropModule(jsInterface)?.let {
-      return it
+    mInteropModuleRegistry?.getInteropModule(jsInterface)?.let { interopModule ->
+      if (jsInterface == RCTEventEmitter::class.java) {
+        logSoftException(
+            TAG,
+            IllegalArgumentException(
+                "getJSModule(RCTEventEmitter) is not recommended in the new architecture and will stop working with interop disabled. Please use UIManagerHelper.getEventDispatcher or UIManagerHelper.getEventDispatcherForReactTag instead"
+            ),
+        )
+      }
+      return interopModule
     }
 
     // TODO T189052462: ReactContext caches JavaScriptModule instances

package/ReactAndroid/src/main/java/com/facebook/react/runtime/JSTimerExecutor.kt

@@ -7,15 +7,20 @@
 
 package com.facebook.react.runtime
 
-import com.facebook.jni.HybridData
-import com.facebook.jni.annotations.DoNotStripAny
+import com.facebook.jni.HybridClassBase
+import com.facebook.jni.annotations.DoNotStrip
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.modules.core.JavaScriptTimerExecutor
 import com.facebook.soloader.SoLoader
 
-@DoNotStripAny
-internal class JSTimerExecutor(private val mHybridData: HybridData) : JavaScriptTimerExecutor {
+@DoNotStrip
+internal class JSTimerExecutor() : HybridClassBase(), JavaScriptTimerExecutor {
+  init {
+    initHybrid()
+  }
+
+  private external fun initHybrid()
 
   private external fun callTimers(timerIDs: WritableNativeArray)