expo-modules-core 1.5.2 → 1.5.3

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 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.3'
 
 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.3"
     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/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.3",
   "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": "19e6561830e33168b1c963ec50b7248baafbb758"
 }