expo-modules-core 1.5.4 → 1.5.5

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 1.5.5 — 2023-07-07
+
+### 🐛 Bug fixes
+
+- Improved the OkHttp network inspector stability on Android. ([#23350](https://github.com/expo/expo/pull/23350) by [@kudo](https://github.com/kudo))
+- [iOS] Fix conversion to `URL` type that failed despite receiving a string that contained a valid URL. ([#23331](https://github.com/expo/expo/pull/23331) by [@alanhughes](https://github.com/alanjhughes))
+
 ## 1.5.4 — 2023-07-04
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.4'
+version = '1.5.5'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -160,7 +160,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.5.4"
+    versionName "1.5.5"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

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

@@ -2,10 +2,13 @@
 
 package expo.modules.kotlin.devtools
 
+import android.util.Log
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 
+private const val TAG = "ExpoNetworkInspector"
+
 // Currently keeps the delegate fixed for ExpoRequestCdpInterceptor and be thread-safe
 internal val delegate: ExpoNetworkInspectOkHttpInterceptorsDelegate = ExpoRequestCdpInterceptor
 
@@ -16,19 +19,22 @@ internal val delegate: ExpoNetworkInspectOkHttpInterceptorsDelegate = ExpoReques
 class ExpoNetworkInspectOkHttpNetworkInterceptor : Interceptor {
   override fun intercept(chain: Interceptor.Chain): Response {
     val request = chain.request()
-    val redirectResponse = request.tag(RedirectResponse::class.java)
-    val requestId = redirectResponse?.requestId ?: request.hashCode().toString()
-    delegate.willSendRequest(requestId, request, redirectResponse?.priorResponse)
-
     val response = chain.proceed(request)
+    try {
+      val redirectResponse = request.tag(RedirectResponse::class.java)
+      val requestId = redirectResponse?.requestId ?: request.hashCode().toString()
+      delegate.willSendRequest(requestId, request, redirectResponse?.priorResponse)
 
-    if (response.isRedirect) {
-      response.request.tag(RedirectResponse::class.java)?.let {
-        it.requestId = requestId
-        it.priorResponse = response
+      if (response.isRedirect) {
+        response.request.tag(RedirectResponse::class.java)?.let {
+          it.requestId = requestId
+          it.priorResponse = response
+        }
+      } else {
+        delegate.didReceiveResponse(requestId, request, response)
       }
-    } else {
-      delegate.didReceiveResponse(requestId, request, response)
+    } catch (e: Exception) {
+      Log.e(TAG, "Failed to send network request CDP event", e)
     }
     return response
   }

package/ios/Swift/Arguments/Convertibles.swift

@@ -17,10 +17,9 @@ extension URL: Convertible {
       throw Conversions.ConvertingException<URL>(value)
     }
 
-    // Try to construct the URL object from the string as it came in.
-    if let url = URL(string: value) {
-      // If it has no scheme, we assume it was the file path which needs to be recreated to be recognized as the file url.
-      return url.scheme != nil ? url : URL(fileURLWithPath: value)
+    // First we try to create a URL without extra encoding, as it came.
+    if let url = convertToUrl(string: value) {
+      return url
     }
 
     // File path doesn't need to be percent-encoded.
@@ -29,8 +28,8 @@ extension URL: Convertible {
     }
 
     // If we get here, the string is not the file url and may require percent-encoding characters that are not URL-safe according to RFC 3986.
-    if let encodedValue = percentEncodeUrlString(value), let url = URL(string: encodedValue) {
-      return url.scheme != nil ? url : URL(fileURLWithPath: value)
+    if let encodedValue = percentEncodeUrlString(value), let url = convertToUrl(string: encodedValue) {
+      return url
     }
 
     // If it still fails to create the URL object, the string possibly contains characters that must be explicitly percent-encoded beforehand.

package/ios/Swift/Utilities.swift

@@ -58,3 +58,13 @@ internal func isFileUrlPath(_ path: String) -> Bool {
   }
   return URL(string: encodedPath)?.scheme == nil
 }
+
+internal func convertToUrl(string value: String) -> URL? {
+  // URLComponents parses and constructs URLs according to RFC 3986.
+  // For some unusual urls URL(string:) will fail incorrectly
+  guard let url = URLComponents(string: value)?.url ?? URL(string: value) else {
+    return nil
+  }
+  // If it has no scheme, we assume it was the file path which needs to be recreated to be recognized as the file url.
+  return url.scheme != nil ? url : URL(fileURLWithPath: value)
+}

package/ios/Tests/ConvertiblesSpec.swift

@@ -71,13 +71,6 @@ class ConvertiblesSpec: ExpoSpec {
         }
       }
 
-      it("throws when url contains percent alone") {
-        // The percent character alone must be percent-encoded to `%25` beforehand, otherwise it should throw an exception.
-        let urlString = "https://expo.dev/?param=%"
-
-        expect({ try URL.convert(from: urlString, appContext: appContext) }).to(throwError(errorType: UrlContainsInvalidCharactersException.self))
-      }
-
       it("converts from url containing the anchor") {
         // The hash is not allowed in the query (requires percent-encoding),
         // but we want it to be recognized as the beginning of the fragment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "cf90d5c30c2a08a6493ebfa8aa3791aa70666759"
+  "gitHead": "877ace22b823159ff94d02bacfb27e523263967c"
 }