expo-modules-core 1.5.2 → 1.5.4

package/CHANGELOG.md

@@ -10,6 +10,22 @@
 
 ### 💡 Others
 
+## 1.5.4 — 2023-07-04
+
+### 🐛 Bug fixes
+
+- Fix the `View cannot be cast to ViewGroup` exception on Android. ([#23264](https://github.com/expo/expo/pull/23264) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
+
+- Changed Objective-C names for `ExpoReactDelegate` and `ExpoReactDelegateHandler` to fix issues with versioning in Expo Go. ([#23229](https://github.com/expo/expo/pull/23229) by [@tsapeta](https://github.com/tsapeta))
+
+## 1.5.3 — 2023-06-24
+
+### 🎉 New features
+
+- Supported other network CDP types like `Image` and `Media` rather than `Fetch`. ([#23058](https://github.com/expo/expo/pull/23058) by [@kudo](https://github.com/kudo))
+
 ## 1.5.2 — 2023-06-24
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.2'
+version = '1.5.4'
 
 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.2"
+    versionName "1.5.4"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

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

@@ -21,7 +21,16 @@ enum class ResourceType(val value: String) {
   FONT("Font"),
   SCRIPT("Script"),
   FETCH("Fetch"),
-  OTHER("Other")
+  OTHER("Other");
+
+  companion object {
+    fun fromMimeType(mimeType: String): ResourceType = when {
+      mimeType.startsWith("image/") -> IMAGE
+      mimeType.startsWith("audio") || mimeType.startsWith("video") -> MEDIA
+      mimeType.startsWith("font") -> FONT
+      else -> OTHER
+    }
+  }
 }
 
 interface JsonSerializable {
@@ -120,7 +129,7 @@ data class RequestWillBeSentParams(
     wallTime = now,
     redirectHasExtraInfo = redirectResponse != null,
     redirectResponse = redirectResponse?.let { Response(it) },
-    type = ResourceType.FETCH,
+    type = ResourceType.OTHER,
   )
 
   override fun toJSONObject(): JSONObject {
@@ -172,11 +181,11 @@ data class ResponseReceivedParams(
   val response: Response,
   val hasExtraInfo: Boolean = false,
 ) : JsonSerializable {
-  constructor(now: BigDecimal, requestId: RequestId, request: okhttp3.Request, repsonse: okhttp3.Response) : this(
+  constructor(now: BigDecimal, requestId: RequestId, request: okhttp3.Request, okhttpResponse: okhttp3.Response) : this(
     requestId = requestId,
     timestamp = now,
-    type = ResourceType.FETCH,
-    response = Response(repsonse),
+    type = ResourceType.fromMimeType(okhttpResponse.header("Content-Type", "") ?: ""),
+    response = Response(okhttpResponse),
   )
 
   override fun toJSONObject(): JSONObject {

package/android/src/main/java/expo/modules/kotlin/views/ErrorViewGroup.kt

@@ -0,0 +1,11 @@
+package expo.modules.kotlin.views
+
+import android.content.Context
+import android.view.ViewGroup
+
+/**
+ * A NOOP view group, which is used when an error occurs.
+ */
+class ErrorViewGroup(context: Context) : ViewGroup(context) {
+  override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) = Unit
+}

package/android/src/main/java/expo/modules/kotlin/views/ViewDefinitionBuilder.kt

@@ -334,7 +334,12 @@ class ViewDefinitionBuilder<T : View>(
         UnexpectedException(e)
       }
     )
-    return View(context)
+
+    return if (ViewGroup::class.java.isAssignableFrom(viewClass.java)) {
+      ErrorViewGroup(context)
+    } else {
+      View(context)
+    }
   }
 
   private fun getPrimaryConstructor(): KFunction<T>? {

package/build/sweet/setUpErrorManager.fx.js

@@ -10,5 +10,5 @@ if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
     });
 }
 // We have to export `CodedError` via global object to use in later in the C++ code.
-global.ExpoModulesCore_CodedError = CodedError;
+globalThis.ExpoModulesCore_CodedError = CodedError;
 //# sourceMappingURL=setUpErrorManager.fx.js.map

package/build/sweet/setUpErrorManager.fx.js.map

@@ -1 +1 @@
-{"version":3,"file":"setUpErrorManager.fx.js","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,IAAI,OAAO,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,IAAI,kBAAkB,EAAE;IAC9D,MAAM,cAAc,GAAG,4CAA4C,CAAC;IACpE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAE1D,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC5E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;CACJ;AAED,oFAAoF;AACpF,MAAM,CAAC,0BAA0B,GAAG,UAAU,CAAC","sourcesContent":["import { EventEmitter } from '../EventEmitter';\nimport Platform from '../Platform';\nimport { CodedError } from '../errors/CodedError';\nimport NativeErrorManager from './NativeErrorManager';\n\nif (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {\n  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';\n  const eventEmitter = new EventEmitter(NativeErrorManager);\n\n  eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {\n    console.error(message);\n  });\n}\n\n// We have to export `CodedError` via global object to use in later in the C++ code.\nglobal.ExpoModulesCore_CodedError = CodedError;\n"]}
+{"version":3,"file":"setUpErrorManager.fx.js","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,IAAI,OAAO,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,IAAI,kBAAkB,EAAE;IAC9D,MAAM,cAAc,GAAG,4CAA4C,CAAC;IACpE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAE1D,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;QAC5E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;CACJ;AAED,oFAAoF;AACpF,UAAU,CAAC,0BAA0B,GAAG,UAAU,CAAC","sourcesContent":["import { EventEmitter } from '../EventEmitter';\nimport Platform from '../Platform';\nimport { CodedError } from '../errors/CodedError';\nimport NativeErrorManager from './NativeErrorManager';\n\nif (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {\n  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';\n  const eventEmitter = new EventEmitter(NativeErrorManager);\n\n  eventEmitter.addListener(onNewException, ({ message }: { message: string }) => {\n    console.error(message);\n  });\n}\n\n// We have to export `CodedError` via global object to use in later in the C++ code.\nglobalThis.ExpoModulesCore_CodedError = CodedError;\n"]}

package/ios/ReactDelegates/EXReactDelegateWrapper+Private.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface EXReactDelegateWrapper(Private)
 
-- (instancetype)initWithExpoReactDelegate:(ExpoReactDelegate *)expoReactDelegate;
+- (instancetype)initWithExpoReactDelegate:(EXReactDelegate *)expoReactDelegate;
 
 @end
 

package/ios/ReactDelegates/EXReactDelegateWrapper.m

@@ -7,13 +7,13 @@
 
 @interface EXReactDelegateWrapper()
 
-@property (nonatomic, weak) ExpoReactDelegate *expoReactDelegate;
+@property (nonatomic, weak) EXReactDelegate *expoReactDelegate;
 
 @end
 
 @implementation EXReactDelegateWrapper
 
-- (instancetype)initWithExpoReactDelegate:(ExpoReactDelegate *)expoReactDelegate
+- (instancetype)initWithExpoReactDelegate:(EXReactDelegate *)expoReactDelegate
 {
   if (self = [super init]) {
     _expoReactDelegate = expoReactDelegate;

package/ios/ReactDelegates/ExpoReactDelegate.swift

@@ -3,7 +3,7 @@
 /**
  An extensible react instance creation delegate. This class will loop through each `ExpoReactDelegateHandler` to determine the winner to create the instance.
  */
-@objc
+@objc(EXReactDelegate)
 public class ExpoReactDelegate: NSObject {
   private let handlers: [ExpoReactDelegateHandler]
 

package/ios/ReactDelegates/ExpoReactDelegateHandler.swift

@@ -5,7 +5,7 @@ import React
 /**
  The handler for `ExpoReactDelegate`. A module can implement a handler to process react instance creation.
  */
-@objc
+@objc(EXReactDelegateHandler)
 open class ExpoReactDelegateHandler: NSObject {
   public override required init() {}
 

package/ios/Swift/DevTools/CdpNetworkTypes.swift

@@ -17,6 +17,19 @@ struct CdpNetwork {
     case script = "Script"
     case fetch = "Fetch"
     case other = "Other"
+
+    static func fromMimeType(_ mimeType: String) -> ResourceType {
+      if mimeType.starts(with: "image/") {
+        return image
+      }
+      if mimeType.starts(with: "audio/") || mimeType.starts(with: "video/") {
+        return media
+      }
+      if mimeType.starts(with: "font/") {
+        return font
+      }
+      return other
+    }
   }
 
   struct ConnectTiming: Encodable {
@@ -91,7 +104,7 @@ struct CdpNetwork {
       } else {
         self.redirectResponse = nil
       }
-      self.type = ResourceType.fetch
+      self.type = ResourceType.other
     }
   }
 
@@ -119,8 +132,8 @@ struct CdpNetwork {
     init(now: TimeInterval, requestId: RequestId, request: URLRequest, response: HTTPURLResponse) {
       self.requestId = requestId
       self.timestamp = now
-      self.type = ResourceType.fetch
       self.response = Response(response)
+      self.type = ResourceType.fromMimeType(self.response.mimeType)
     }
   }
 

package/ios/Tests/ExpoRequestCdpInterceptorSpec.swift

@@ -161,5 +161,31 @@ final class ExpoRequestCdpInterceptorSpec: ExpoSpec {
         }.resume()
       }
     }
+
+
+    it("respect image mimeType to CDP event") {
+      waitUntil(timeout: .seconds(2)) { done in
+        self.session.dataTask(with: URL(string: "https://avatars.githubusercontent.com/u/12504344")!) { (data, response, error) in
+          DispatchQueue.main.async {
+            expect(self.mockDelegate.events.count).to(equal(5))
+
+            // Network.requestWillBeSent
+            // Network.requestWillBeSentExtraInfo
+
+            // Network.responseReceived
+            let json = self.parseJSON(data: self.mockDelegate.events[2])
+            let method = json["method"] as! String
+            let params = json["params"] as! [String: Any]
+            let response = params["response"] as! [String: Any]
+            expect(method).to(equal("Network.responseReceived"))
+            expect(response["status"] as? Int).to(equal(200))
+            expect(response["mimeType"] as? String).to(equal("image/png"))
+            expect(params["type"] as? String).to(equal("Image"))
+
+            done()
+          }
+        }.resume()
+      }
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "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": "0efde1d91bcf609c94a9f9b57f47afd9ef315e2d"
+  "gitHead": "cf90d5c30c2a08a6493ebfa8aa3791aa70666759"
 }

package/src/sweet/setUpErrorManager.fx.ts

@@ -13,4 +13,4 @@ if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
 }
 
 // We have to export `CodedError` via global object to use in later in the C++ code.
-global.ExpoModulesCore_CodedError = CodedError;
+globalThis.ExpoModulesCore_CodedError = CodedError;