expo-modules-core 1.12.3 → 1.12.5

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 1.12.5 — 2024-05-01
+
+_This version does not introduce any user-facing changes._
+
+## 1.12.4 — 2024-04-29
+
+### 🐛 Bug fixes
+
+- [Android] Fixed gziped payload does not correctly shown in network inspector. ([#28486](https://github.com/expo/expo/pull/28486) by [@kudo](https://github.com/kudo))
+- [Android] Fixed crashes during the deallocation of shared objects. ([#28491](https://github.com/expo/expo/pull/28491) by [@lukmccall](https://github.com/lukmccall))
+- [iOS] Fix accessing the view registry to avoid infinite loop crash. ([#28531](https://github.com/expo/expo/pull/28531) by [@tsapeta](https://github.com/tsapeta))
+
 ## 1.12.3 — 2024-04-26
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.12.3'
+version = '1.12.5'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -63,7 +63,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.12.3"
+    versionName "1.12.5"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/cpp/JSIContext.cpp

@@ -29,6 +29,42 @@ namespace expo {
 
 #endif
 
+/*
+ * A wrapper for a global reference that can be deallocated on any thread.
+ * It should be used with smart pointer. That structure can't be copied or moved.
+ */
+template <typename T>
+class ThreadSafeJNIGlobalRef {
+public:
+  ThreadSafeJNIGlobalRef(jobject globalRef) : globalRef(globalRef) {}
+  ThreadSafeJNIGlobalRef(const ThreadSafeJNIGlobalRef &other) = delete;
+  ThreadSafeJNIGlobalRef(ThreadSafeJNIGlobalRef &&other) = delete;
+  ThreadSafeJNIGlobalRef &operator=(const ThreadSafeJNIGlobalRef &other) = delete;
+  ThreadSafeJNIGlobalRef &operator=(ThreadSafeJNIGlobalRef &&other) = delete;
+
+  void use(std::function<void(jni::alias_ref<T> globalRef)> &&action) {
+    if (globalRef == nullptr) {
+      throw std::runtime_error("ThreadSafeJNIGlobalRef: globalRef is null");
+    }
+
+    jni::ThreadScope::WithClassLoader([this, action = std::move(action)]() {
+      jni::alias_ref<jobject> aliasRef = jni::wrap_alias(globalRef);
+      jni::alias_ref<T> jsiContextRef = jni::static_ref_cast<T>(aliasRef);
+      action(jsiContextRef);
+    });
+  }
+
+  ~ThreadSafeJNIGlobalRef() {
+    if (globalRef != nullptr) {
+      jni::ThreadScope::WithClassLoader([this] {
+        jni::Environment::current()->DeleteGlobalRef(this->globalRef);
+      });
+    }
+  }
+
+  jobject globalRef;
+};
+
 jni::local_ref<JSIContext::jhybriddata>
 JSIContext::initHybrid(jni::alias_ref<jhybridobject> jThis) {
   return makeCxxInstance(jThis);
@@ -137,13 +173,17 @@ void JSIContext::prepareRuntime() {
 
   EventEmitter::installClass(runtime);
 
+  auto threadSafeRef = std::make_shared<ThreadSafeJNIGlobalRef<JSIContext::javaobject>>(
+    jni::Environment::current()->NewGlobalRef(javaPart_.get())
+  );
+
   SharedObject::installBaseClass(
     runtime,
     // We can't predict the order of deallocation of the JSIContext and the SharedObject.
     // So we need to pass a new ref to retain the JSIContext to make sure it's not deallocated before the SharedObject.
-    [javaObject = javaPart_](const SharedObject::ObjectId objectId) {
-      jni::ThreadScope::WithClassLoader([objectId = objectId, javaObject = std::move(javaObject)] {
-        JSIContext::deleteSharedObject(javaObject, objectId);
+    [threadSafeRef = std::move(threadSafeRef)](const SharedObject::ObjectId objectId) {
+      threadSafeRef->use([objectId](jni::alias_ref<JSIContext::javaobject> globalRef) {
+        JSIContext::deleteSharedObject(globalRef, objectId);
       });
     }
   );
@@ -169,7 +209,8 @@ void JSIContext::prepareRuntime() {
 jni::local_ref<JavaScriptModuleObject::javaobject>
 JSIContext::callGetJavaScriptModuleObjectMethod(const std::string &moduleName) const {
   if (javaPart_ == nullptr) {
-    throw std::runtime_error("getJavaScriptModuleObject: JSIContext was prepared to be deallocated.");
+    throw std::runtime_error(
+      "getJavaScriptModuleObject: JSIContext was prepared to be deallocated.");
   }
 
   const static auto method = expo::JSIContext::javaClassLocal()
@@ -270,7 +311,7 @@ void JSIContext::registerSharedObject(
 }
 
 void JSIContext::deleteSharedObject(
-  jni::global_ref<JSIContext::javaobject> javaObject,
+  jni::alias_ref<JSIContext::javaobject> javaObject,
   int objectId
 ) {
   if (javaObject == nullptr) {
@@ -324,13 +365,17 @@ void JSIContext::jniSetNativeStateForSharedObject(
   int id,
   jni::alias_ref<JavaScriptObject::javaobject> jsObject
 ) {
+  auto threadSafeRef = std::make_shared<ThreadSafeJNIGlobalRef<JSIContext::javaobject>>(
+    jni::Environment::current()->NewGlobalRef(javaPart_.get())
+  );
+
   auto nativeState = std::make_shared<expo::SharedObject::NativeState>(
     id,
     // We can't predict the order of deallocation of the JSIContext and the SharedObject.
     // So we need to pass a new ref to retain the JSIContext to make sure it's not deallocated before the SharedObject.
-    [javaObject = javaPart_](const SharedObject::ObjectId objectId) {
-      jni::ThreadScope::WithClassLoader([objectId = objectId, javaObject = std::move(javaObject)] {
-        JSIContext::deleteSharedObject(javaObject, objectId);
+    [threadSafeRef = std::move(threadSafeRef)](const SharedObject::ObjectId objectId) {
+      threadSafeRef->use([objectId](jni::alias_ref<JSIContext::javaobject> globalRef) {
+        JSIContext::deleteSharedObject(globalRef, objectId);
       });
     }
   );

package/android/src/main/cpp/JSIContext.h

@@ -123,7 +123,7 @@ public:
   );
 
   static void deleteSharedObject(
-    jni::global_ref<JSIContext::javaobject> javaObject,
+    jni::alias_ref<JSIContext::javaobject> javaObject,
     int objectId
   );
 

package/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt

@@ -6,6 +6,11 @@ import android.util.Log
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
+import okhttp3.ResponseBody
+import okhttp3.ResponseBody.Companion.asResponseBody
+import okio.GzipSource
+import okio.buffer
+import java.io.IOException
 
 private const val TAG = "ExpoNetworkInspector"
 
@@ -31,7 +36,9 @@ class ExpoNetworkInspectOkHttpNetworkInterceptor : Interceptor {
           it.priorResponse = response
         }
       } else {
-        delegate.didReceiveResponse(requestId, request, response)
+        val body = peekResponseBody(response)
+        delegate.didReceiveResponse(requestId, request, response, body)
+        body?.close()
       }
     } catch (e: Exception) {
       Log.e(TAG, "Failed to send network request CDP event", e)
@@ -62,9 +69,18 @@ class ExpoNetworkInspectOkHttpAppInterceptor : Interceptor {
  * The delegate to dispatch network request events
  */
 internal interface ExpoNetworkInspectOkHttpInterceptorsDelegate {
-  fun willSendRequest(requestId: String, request: Request, redirectResponse: Response?)
+  fun willSendRequest(
+    requestId: String,
+    request: Request,
+    redirectResponse: Response?
+  )
 
-  fun didReceiveResponse(requestId: String, request: Request, response: Response)
+  fun didReceiveResponse(
+    requestId: String,
+    request: Request,
+    response: Response,
+    body: ResponseBody?
+  )
 }
 
 /**
@@ -74,3 +90,36 @@ internal class RedirectResponse {
   var requestId: String? = null
   var priorResponse: Response? = null
 }
+
+/**
+ * Peek response body that could send to CDP delegate.
+ * Also uncompress gzip payload if necessary since OkHttp [Interceptor] does not uncompress payload for you.
+ * @return null if the response body exceeds [byteCount]
+ */
+internal fun peekResponseBody(
+  response: Response,
+  byteCount: Long = ExpoNetworkInspectOkHttpNetworkInterceptor.MAX_BODY_SIZE
+): ResponseBody? {
+  val body = response.body ?: return null
+  val peeked = body.source().peek()
+  try {
+    if (peeked.request(byteCount + 1)) {
+      // When the request() returns true,
+      // it means the source have more available bytes then [byteCount].
+      return null
+    }
+  } catch (_: IOException) {}
+
+  val encoding = response.header("Content-Encoding")
+  val source = when {
+    encoding.equals("gzip", ignoreCase = true) ->
+      GzipSource(peeked).buffer().apply {
+        request(byteCount)
+      }
+    else -> peeked
+  }
+
+  val buffer = okio.Buffer()
+  buffer.write(source, minOf(byteCount, source.buffer.size))
+  return buffer.asResponseBody(body.contentType(), buffer.size)
+}

package/android/src/main/java/expo/modules/kotlin/devtools/ExpoRequestCdpInterceptor.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import okhttp3.Request
 import okhttp3.Response
+import okhttp3.ResponseBody
 import java.math.BigDecimal
 import java.math.RoundingMode
 
@@ -38,7 +39,11 @@ object ExpoRequestCdpInterceptor : ExpoNetworkInspectOkHttpInterceptorsDelegate
 
   //region ExpoNetworkInspectOkHttpInterceptorsDelegate implementations
 
-  override fun willSendRequest(requestId: String, request: Request, redirectResponse: Response?) {
+  override fun willSendRequest(
+    requestId: String,
+    request: Request,
+    redirectResponse: Response?
+  ) {
     val now = BigDecimal(System.currentTimeMillis() / 1000.0).setScale(3, RoundingMode.CEILING)
 
     val params = RequestWillBeSentParams(now, requestId, request, redirectResponse)
@@ -48,14 +53,19 @@ object ExpoRequestCdpInterceptor : ExpoNetworkInspectOkHttpInterceptorsDelegate
     dispatchEvent(Event("Network.requestWillBeSentExtraInfo", params2))
   }
 
-  override fun didReceiveResponse(requestId: String, request: Request, response: Response) {
+  override fun didReceiveResponse(
+    requestId: String,
+    request: Request,
+    response: Response,
+    body: ResponseBody?
+  ) {
     val now = BigDecimal(System.currentTimeMillis() / 1000.0).setScale(3, RoundingMode.CEILING)
 
     val params = ResponseReceivedParams(now, requestId, request, response)
     dispatchEvent(Event("Network.responseReceived", params))
 
-    if (response.peekBody(ExpoNetworkInspectOkHttpNetworkInterceptor.MAX_BODY_SIZE + 1).contentLength() <= ExpoNetworkInspectOkHttpNetworkInterceptor.MAX_BODY_SIZE) {
-      val params2 = ExpoReceivedResponseBodyParams(now, requestId, request, response)
+    if (body != null) {
+      val params2 = ExpoReceivedResponseBodyParams(now, requestId, request, response, body)
       dispatchEvent(Event("Expo(Network.receivedResponseBody)", params2))
     }
 

package/android/src/main/java/expo/modules/kotlin/devtools/cdp/CdpNetworkTypes.kt

@@ -227,15 +227,20 @@ data class ExpoReceivedResponseBodyParams(
   var body: String,
   var base64Encoded: Boolean
 ) : JsonSerializable {
-  constructor(now: BigDecimal, requestId: RequestId, request: okhttp3.Request, response: okhttp3.Response) : this(
+  constructor(
+    now: BigDecimal,
+    requestId: RequestId,
+    request: okhttp3.Request,
+    response: okhttp3.Response,
+    body: okhttp3.ResponseBody
+  ) : this(
     requestId = requestId,
     body = "",
     base64Encoded = false
   ) {
-    val rawBody = response.peekBody(ExpoNetworkInspectOkHttpNetworkInterceptor.MAX_BODY_SIZE)
-    val contentType = rawBody.contentType()
+    val contentType = body.contentType()
     val isText = contentType?.type == "text" || (contentType?.type == "application" && contentType.subtype == "json")
-    val bodyString = if (isText) rawBody.string() else rawBody.source().readByteString().base64()
+    val bodyString = if (isText) body.string() else body.source().readByteString().base64()
 
     this.body = bodyString
     this.base64Encoded = !isText

package/ios/Legacy/Services/EXReactNativeAdapter.mm

@@ -296,7 +296,7 @@ EX_REGISTER_MODULE();
       UIView<RCTComponentViewProtocol> *componentView = [uiManager viewForReactTag:(NSNumber *)viewId];
       UIView *view = [(ExpoFabricViewObjC *)componentView contentView];
 #else
-      UIView *view = viewRegistry[viewId];
+      UIView *view = [uiManager viewForReactTag:(NSNumber *)viewId];
 #endif
       block(view);
     }];
@@ -313,7 +313,7 @@ EX_REGISTER_MODULE();
       UIView<RCTComponentViewProtocol> *componentView = [uiManager viewForReactTag:(NSNumber *)viewId];
       UIView *view = [(ExpoFabricViewObjC *)componentView contentView];
 #else
-      UIView *view = viewRegistry[viewId];
+      UIView *view = [uiManager viewForReactTag:(NSNumber *)viewId];
 #endif
       block(view);
     }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.12.3",
+  "version": "1.12.5",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "20f1765146f63f8fdc2543e8aba8b0e5140d1e05"
+  "gitHead": "470464ab5c25ae8bd45eb2a94d221ce51a8b2560"
 }