expo-modules-core 1.12.14 → 1.12.16

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 1.12.16 — 2024-06-20
+
+### 🐛 Bug fixes
+
+- Fixed resource leakage from `ExpoRequestInterceptorProtocol`. ([#29798](https://github.com/expo/expo/pull/29798) by [@kudo](https://github.com/kudo))
+
+## 1.12.15 — 2024-06-13
+
+### 🐛 Bug fixes
+
+- Fixed reload crash on Android. ([#29593](https://github.com/expo/expo/pull/29593) by [@kudo](https://github.com/kudo))
+- [Android] Fixed converting from `null` to `Record` sometimes didn't work as expected. ([#29508](https://github.com/expo/expo/pull/29508) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.12.14 — 2024-06-06
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.12.14'
+version = '1.12.16'
 
 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.14"
+    versionName "1.12.16"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

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

@@ -93,11 +93,13 @@ JSIContext::JSIContext(jni::alias_ref<jhybridobject> jThis)
   : javaPart_(jni::make_global(jThis)) {}
 
 JSIContext::~JSIContext() {
-  unbindJSIContext(runtimeHolder->get());
-  // The runtime would be deallocated automatically.
-  // However, we need to enforce the order of deallocations.
-  // The runtime has to be deallocated before the JNI part.
-  runtimeHolder.reset();
+  if (runtimeHolder) {
+    unbindJSIContext(runtimeHolder->get());
+    // The runtime would be deallocated automatically.
+    // However, we need to enforce the order of deallocations.
+    // The runtime has to be deallocated before the JNI part.
+    runtimeHolder.reset();
+  }
 }
 
 void JSIContext::installJSI(

package/android/src/main/java/expo/modules/kotlin/types/TypeConverterProvider.kt

@@ -73,7 +73,7 @@ object TypeConverterProviderImpl : TypeConverterProvider {
   private val cachedConverters = createCachedConverters(false)
   private val nullableCachedConverters = createCachedConverters(true)
 
-  private val cachedRecordConverters = mutableMapOf<KClass<*>, TypeConverter<*>>()
+  private val cachedRecordConverters = mutableMapOf<KType, TypeConverter<*>>()
 
   private fun getCachedConverter(inputType: KType): TypeConverter<*>? {
     return if (inputType.isMarkedNullable) {
@@ -116,14 +116,14 @@ object TypeConverterProviderImpl : TypeConverterProvider {
       return EnumTypeConverter(kClass as KClass<Enum<*>>, type.isMarkedNullable)
     }
 
-    val cachedConverter = cachedRecordConverters[kClass]
+    val cachedConverter = cachedRecordConverters[type]
     if (cachedConverter != null) {
       return cachedConverter
     }
 
     if (Record::class.java.isAssignableFrom(jClass)) {
       val converter = RecordTypeConverter<Record>(this, type)
-      cachedRecordConverters[kClass] = converter
+      cachedRecordConverters[type] = converter
       return converter
     }
 

package/ios/DevTools/ExpoRequestCdpInterceptor.swift

@@ -9,7 +9,7 @@ import Foundation
 @objc(EXRequestCdpInterceptor)
 public final class ExpoRequestCdpInterceptor: NSObject, ExpoRequestInterceptorProtocolDelegate {
   private var delegate: ExpoRequestCdpInterceptorDelegate?
-  internal var dispatchQueue = DispatchQueue(label: "expo.requestCdpInterceptor")
+  public var dispatchQueue = DispatchQueue(label: "expo.requestCdpInterceptor")
 
   override private init() {}
 

package/ios/DevTools/ExpoRequestInterceptorProtocol.swift

@@ -7,13 +7,13 @@ import Foundation
  */
 @objc(EXRequestInterceptorProtocol)
 public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDelegate {
-  private static let REQUEST_ID = "ExpoRequestInterceptorProtocol.requestId"
-  private static var requestIdProvider = RequestIdProvider()
-  private lazy var urlSession = URLSession(
+  private static let sessionDelegateProxy = URLSessionSessionDelegateProxy()
+  private static let urlSession = URLSession(
     configuration: URLSessionConfiguration.default,
-    delegate: self,
+    delegate: sessionDelegateProxy,
     delegateQueue: nil
   )
+  private var requestId: String?
   private var dataTask_: URLSessionDataTask?
   private let responseBody = NSMutableData()
   private var responseBodyExceedsLimit = false
@@ -32,11 +32,10 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
     if !["http", "https"].contains(scheme) {
       return false
     }
-    let isNewRequest = URLProtocol.property(
-      forKey: Self.REQUEST_ID,
+    return URLProtocol.property(
+      forKey: REQUEST_ID,
       in: request
     ) == nil
-    return isNewRequest
   }
 
   override init(
@@ -48,13 +47,16 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
     // swiftlint:disable force_cast
     let mutableRequest = request as! NSMutableURLRequest
     // swiftlint:enable force_cast
-    let requestId = Self.requestIdProvider.create()
+    self.requestId = Self.sessionDelegateProxy.addDelegate(delegate: self)
+    guard let requestId else {
+      fatalError("requestId should not be nil.")
+    }
     URLProtocol.setProperty(
       requestId,
-      forKey: Self.REQUEST_ID,
+      forKey: REQUEST_ID,
       in: mutableRequest
     )
-    let dataTask = urlSession.dataTask(with: mutableRequest as URLRequest)
+    let dataTask = Self.urlSession.dataTask(with: mutableRequest as URLRequest)
     Self.delegate.willSendRequest(
       requestId: requestId,
       task: dataTask,
@@ -74,6 +76,9 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
 
   public override func stopLoading() {
     dataTask_?.cancel()
+    if let requestId {
+      Self.sessionDelegateProxy.removeDelegate(requestId: requestId)
+    }
   }
 
   // MARK: URLSessionDataDelegate implementations
@@ -91,12 +96,8 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
     if let error = error {
       client?.urlProtocol(self, didFailWithError: error)
     } else {
-      if let currentRequest = task.currentRequest,
-        let response = task.response as? HTTPURLResponse,
-        let requestId = URLProtocol.property(
-          forKey: Self.REQUEST_ID,
-          in: currentRequest
-        ) as? String {
+      if let response = task.response as? HTTPURLResponse,
+        let requestId {
         let contentType = response.value(forHTTPHeaderField: "Content-Type")
         let isText = (contentType?.starts(with: "text/") ?? false) || contentType == "application/json"
         Self.delegate.didReceiveResponse(
@@ -123,7 +124,7 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
     newRequest request: URLRequest,
     completionHandler: @escaping (URLRequest?) -> Void
   ) {
-    if let requestId = URLProtocol.property(forKey: Self.REQUEST_ID, in: request) as? String {
+    if let requestId {
       Self.delegate.willSendRequest(
         requestId: requestId,
         task: task,
@@ -141,6 +142,118 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
     let requestId: String
     let redirectResponse: HTTPURLResponse
   }
+}
+
+/**
+ The delegate to dispatch network request events
+ */
+@objc(EXRequestInterceptorProtocolDelegate)
+protocol ExpoRequestInterceptorProtocolDelegate {
+  @objc
+  func willSendRequest(requestId: String, task: URLSessionTask, request: URLRequest, redirectResponse: HTTPURLResponse?)
+
+  @objc
+  func didReceiveResponse(requestId: String, task: URLSessionTask, responseBody: Data, isText: Bool, responseBodyExceedsLimit: Bool)
+}
+
+/**
+ Shared URLSessionDataDelegate instance and delete calls back to ExpoRequestInterceptorProtocol instances.
+ */
+private class URLSessionSessionDelegateProxy: NSObject, URLSessionDataDelegate {
+  private var requestIdProvider = RequestIdProvider()
+  private var delegateMap: [String: URLSessionDataDelegate] = [:]
+  private let dispatchQueue = ExpoRequestCdpInterceptor.shared.dispatchQueue
+
+  func addDelegate(delegate: URLSessionDataDelegate) -> String {
+    let requestId = self.requestIdProvider.create()
+    self.dispatchQueue.async {
+      self.delegateMap[requestId] = delegate
+    }
+    return requestId
+  }
+
+  func removeDelegate(requestId: String) {
+    self.dispatchQueue.async {
+      self.delegateMap.removeValue(forKey: requestId)
+    }
+  }
+
+  private func getRequestId(task: URLSessionTask) -> String? {
+    if let currentRequest = task.currentRequest,
+      let requestId = URLProtocol.property(
+        forKey: REQUEST_ID,
+        in: currentRequest
+      ) as? String {
+      return requestId
+    }
+    return nil
+  }
+
+  private func getDelegate(requestId: String) -> URLSessionDataDelegate? {
+    return self.dispatchQueue.sync {
+      return self.delegateMap[requestId]
+    }
+  }
+
+  private func getDelegate(task: URLSessionTask) -> URLSessionDataDelegate? {
+    guard let requestId = self.getRequestId(task: task) else {
+      return nil
+    }
+    return self.getDelegate(requestId: requestId)
+  }
+
+  // MARK: URLSessionDataDelegate implementations
+
+  func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive: Data) {
+    if let delegate = getDelegate(task: dataTask) {
+      delegate.urlSession?(
+        session,
+        dataTask: dataTask,
+        didReceive: didReceive)
+    }
+  }
+
+  func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError: Error?) {
+    if let requestId = self.getRequestId(task: task), let delegate = getDelegate(requestId: requestId) {
+      delegate.urlSession?(
+        session,
+        task: task,
+        didCompleteWithError: didCompleteWithError)
+      self.removeDelegate(requestId: requestId)
+    }
+  }
+
+  func urlSession(
+    _ session: URLSession,
+    dataTask: URLSessionDataTask,
+    didReceive: URLResponse,
+    completionHandler: @escaping (URLSession.ResponseDisposition) -> Void
+  ) {
+    if let delegate = getDelegate(task: dataTask) {
+      delegate.urlSession?(
+        session,
+        dataTask: dataTask,
+        didReceive: didReceive,
+        completionHandler: completionHandler)
+    }
+  }
+
+  func urlSession(
+    _ session: URLSession,
+    task: URLSessionTask,
+    willPerformHTTPRedirection: HTTPURLResponse,
+    newRequest: URLRequest,
+    completionHandler: @escaping (URLRequest?) -> Void
+  ) {
+    if let delegate = getDelegate(task: task) {
+      delegate.urlSession?(
+        session,
+        task: task,
+        willPerformHTTPRedirection: willPerformHTTPRedirection,
+        newRequest: newRequest,
+        completionHandler: completionHandler)
+    }
+  }
 
   /**
    A helper class to create a unique request ID
@@ -157,14 +270,4 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
   }
 }
 
-/**
- The delegate to dispatch network request events
- */
-@objc(EXRequestInterceptorProtocolDelegate)
-protocol ExpoRequestInterceptorProtocolDelegate {
-  @objc
-  func willSendRequest(requestId: String, task: URLSessionTask, request: URLRequest, redirectResponse: HTTPURLResponse?)
-
-  @objc
-  func didReceiveResponse(requestId: String, task: URLSessionTask, responseBody: Data, isText: Bool, responseBodyExceedsLimit: Bool)
-}
+private let REQUEST_ID = "ExpoRequestInterceptorProtocol.requestId"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.12.14",
+  "version": "1.12.16",
   "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": "f424c7ea50d8787fa8d3354a33fe402160b63032"
+  "gitHead": "0d1a3567cb0fce9c54e1185654be88bd0c7842d4"
 }