expo-video 3.0.12-canary-20251008-f2d1b4a → 3.0.12-canary-20251013-623c5a6

package/CHANGELOG.md

@@ -9,6 +9,7 @@
 ### 🐛 Bug fixes
 
 - Fix `FOREGROUND_SERVICE_MEDIA_PLAYBACK` being always present in the manifest. ([#40074](https://github.com/expo/expo/pull/40074) by [@behenate](https://github.com/behenate))
+- [iOS] Fix crashes when rapidly replacing HLS sources. ([#40265](https://github.com/expo/expo/pull/40265) by [@behenate](https://github.com/behenate))
 
 ### 💡 Others
 

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '3.0.12-canary-20251008-f2d1b4a'
+version = '3.0.12-canary-20251013-623c5a6'
 
 android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '3.0.12-canary-20251008-f2d1b4a'
+    versionName '3.0.12-canary-20251013-623c5a6'
   }
 }
 

package/expo-module.config.json

@@ -8,7 +8,7 @@
     "publication": {
       "groupId": "host.exp.exponent",
       "artifactId": "expo.modules.video",
-      "version": "3.0.12-canary-20251008-f2d1b4a",
+      "version": "3.0.12-canary-20251013-623c5a6",
       "repository": "local-maven-repo"
     }
   }

package/ios/VideoPlayer.swift

@@ -268,9 +268,10 @@ internal final class VideoPlayer: SharedRef<AVPlayer>, Hashable, VideoPlayerObse
   }
 
   private func clearCurrentItem() {
-    DispatchQueue.main.async { [ref, videoSourceLoader, dangerousPropertiesStore] in
+    videoSourceLoader.cancelCurrentTask()
+
+    DispatchQueue.main.async { [ref, dangerousPropertiesStore] in
       ref.replaceCurrentItem(with: nil)
-      videoSourceLoader.cancelCurrentTask()
       dangerousPropertiesStore.reset()
       dangerousPropertiesStore.ownerIsReplacing = false
     }

package/ios/VideoPlayerItem.swift

@@ -49,6 +49,10 @@ class VideoPlayerItem: AVPlayerItem {
     self.createTracksLoadingTask()
   }
 
+  deinit {
+    tracksLoadingTask?.cancel()
+  }
+
   func createTracksLoadingTask() {
     tracksLoadingTask = Task { [weak self] in
       var tracks: [VideoTrack] = []

package/ios/VideoPlayerObserver.swift

@@ -157,6 +157,8 @@ class VideoPlayerObserver: VideoSourceLoaderListener {
   private var currentSubtitlesObserver: NSObjectProtocol?
   private var currentAudioTracksObserver: NSObjectProtocol?
 
+  private var videoTrackUpdateTask: Task<Void, Never>?
+
   init(owner: VideoPlayer, videoSourceLoader: VideoSourceLoader) {
     self.owner = owner
     self.videoSourceLoader = videoSourceLoader
@@ -239,24 +241,36 @@ class VideoPlayerObserver: VideoSourceLoaderListener {
       // For HLS sources AVPlayer doesn't provide the tracks when they change
       // But it does call this event when they are loaded and when the current track changes.
       // We have to extract the necessary information ourselves.
-      Task { [weak self] in
+        self?.videoTrackUpdateTask?.cancel()
+        self?.videoTrackUpdateTask = Task { [weak self, playerItem] in
         // For HLS sources
         if let videoPlayerItem = playerItem as? VideoPlayerItem, videoPlayerItem.isHls {
           guard let itemUri = videoPlayerItem.videoSource.uri else {
             return
           }
-          let lastLog = playerItem.accessLog()?.events.last(where: { $0.uri != nil })
-          self?.currentVideoTrack = lastLog?.matchToVideoTrack(videoTracks: await videoPlayerItem.videoTracks, itemUrl: itemUri)
+          let lastLog = item.accessLog()?.events.last(where: { $0.uri != nil })
+          let tracks = await videoPlayerItem.videoTracks
+
+          guard let self, !Task.isCancelled else {
+            return
+          }
+
+          self.currentVideoTrack = lastLog?.matchToVideoTrack(videoTracks: tracks, itemUrl: itemUri)
           return
         }
 
-        // For "regular sources
+        // For non-HLS sources
         // The track which is currently playing will be first
         let currentTrack = try? await item.asset.loadTracks(withMediaType: .video).first
 
-        if let currentTrack {
-          let oldVideoTrack = self?.currentVideoTrack
-          self?.currentVideoTrack = await VideoTrack.from(assetTrack: currentTrack)
+        if let currentTrack, !Task.isCancelled {
+          let newVideoTrack = await VideoTrack.from(assetTrack: currentTrack)
+
+          guard let self, !Task.isCancelled else {
+            return
+          }
+
+          self.currentVideoTrack = newVideoTrack
         }
       }
     }
@@ -299,6 +313,10 @@ class VideoPlayerObserver: VideoSourceLoaderListener {
     playbackBufferEmptyObserver?.invalidate()
     playerItemStatusObserver?.invalidate()
     tracksObserver?.invalidate()
+
+    videoTrackUpdateTask?.cancel()
+    videoTrackUpdateTask = nil
+
     NotificationCenter.default.removeObserver(playerItemObserver as Any)
     NotificationCenter.default.removeObserver(currentSubtitlesObserver as Any)
     NotificationCenter.default.removeObserver(currentAudioTracksObserver as Any)

package/local-maven-repo/host/exp/exponent/expo.modules.video/{3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.module → 3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.video",
-    "version": "3.0.12-canary-20251008-f2d1b4a",
+    "version": "3.0.12-canary-20251013-623c5a6",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-3.0.12-canary-20251008-f2d1b4a.aar",
-          "url": "expo.modules.video-3.0.12-canary-20251008-f2d1b4a.aar",
+          "name": "expo.modules.video-3.0.12-canary-20251013-623c5a6.aar",
+          "url": "expo.modules.video-3.0.12-canary-20251013-623c5a6.aar",
           "size": 499962,
           "sha512": "e2d6ac5f2d3bad569c46687ea971a0e620551b5364afcebad3cea1b7c24cdab228421abb36abca9ce5794ec13bb2be8ab0103672761905494aa4ea789ee99a0c",
           "sha256": "ff210cba3dfc59e4839a53c3941b13a7fcb10feabbbd19c71a5510d9e8b37ea8",
@@ -113,8 +113,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.video-3.0.12-canary-20251008-f2d1b4a.aar",
-          "url": "expo.modules.video-3.0.12-canary-20251008-f2d1b4a.aar",
+          "name": "expo.modules.video-3.0.12-canary-20251013-623c5a6.aar",
+          "url": "expo.modules.video-3.0.12-canary-20251013-623c5a6.aar",
           "size": 499962,
           "sha512": "e2d6ac5f2d3bad569c46687ea971a0e620551b5364afcebad3cea1b7c24cdab228421abb36abca9ce5794ec13bb2be8ab0103672761905494aa4ea789ee99a0c",
           "sha256": "ff210cba3dfc59e4839a53c3941b13a7fcb10feabbbd19c71a5510d9e8b37ea8",
@@ -133,8 +133,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-3.0.12-canary-20251008-f2d1b4a-sources.jar",
-          "url": "expo.modules.video-3.0.12-canary-20251008-f2d1b4a-sources.jar",
+          "name": "expo.modules.video-3.0.12-canary-20251013-623c5a6-sources.jar",
+          "url": "expo.modules.video-3.0.12-canary-20251013-623c5a6-sources.jar",
           "size": 63322,
           "sha512": "919fc7ff706cc8cda229cd547b80eecf1aad9302e8aaca8021da18dfd5ccee94dc0091829c15897f064d26541c124251fea6962bb40561d16e99304722520a99",
           "sha256": "3358ccdcc90d5ad068c83e36cc08426695fa65591cbd5da681b3193fe2496637",

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.module.md5

@@ -0,0 +1 @@
+21ef7fabfc35c9ef3b8a5674f6693634

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.module.sha1

@@ -0,0 +1 @@
+d86d40c09e11fbd47d950a15495baef8283aeef6

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.module.sha256

@@ -0,0 +1 @@
+68374bdb82fe93d4e3ffe2f32a7a123f437479ad8e7b42846ec526e3d6a7d001

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.module.sha512

@@ -0,0 +1 @@
+d4447aa3a1c7e1c366280188e8fd333573ae088a5a0bf1c9b13957c87b5d33cc977336bcf4b52beb6ea078acb446f6a238a1d3076af6b48a5171690f29b70a21

package/local-maven-repo/host/exp/exponent/expo.modules.video/{3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.pom → 3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.video</artifactId>
-  <version>3.0.12-canary-20251008-f2d1b4a</version>
+  <version>3.0.12-canary-20251013-623c5a6</version>
   <packaging>aar</packaging>
   <name>expo.modules.video</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.pom.md5

@@ -0,0 +1 @@
+6bb9d10b67d604d4d8ec691c8c640a76

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.pom.sha1

@@ -0,0 +1 @@
+d228f97fb0351619f41f1c0aeeddb98bdf357d2f

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.pom.sha256

@@ -0,0 +1 @@
+0834535bf4da6fb57d29a53063b7742f108f04698c019e13d5b84cb0c57d8bfe

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251013-623c5a6/expo.modules.video-3.0.12-canary-20251013-623c5a6.pom.sha512

@@ -0,0 +1 @@
+c358f98a3f3b2ab87590183b7df4c5fabde7c7059547b95df9b483aa3241982fb965dfd159749a97a71b2894b0b4f7e960958cd3b585e685aac16be35d98ce97

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.video</artifactId>
   <versioning>
-    <latest>3.0.12-canary-20251008-f2d1b4a</latest>
-    <release>3.0.12-canary-20251008-f2d1b4a</release>
+    <latest>3.0.12-canary-20251013-623c5a6</latest>
+    <release>3.0.12-canary-20251013-623c5a6</release>
     <versions>
-      <version>3.0.12-canary-20251008-f2d1b4a</version>
+      <version>3.0.12-canary-20251013-623c5a6</version>
     </versions>
-    <lastUpdated>20251008205532</lastUpdated>
+    <lastUpdated>20251013170928</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.md5

@@ -1 +1 @@
-ea48f4b0d51cc53305a59a90be25fb1d
+79ec4fc2737af90832b06423fb23c155

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha1

@@ -1 +1 @@
-bde1f32912a48eac383ce322d93cbd2624e9b7e1
+8baaf12a7fc700b6b57b4de5e0b4fb96fb882c9e

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha256

@@ -1 +1 @@
-cd73073228cd8cdfa84937749e95adbfad7ad35b2c07f92d08f3164e0057f67e
+7bf1e3c38e9f40143769adfa1f3efcbef9774a6872343661eb3e5b37820eee85

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha512

@@ -1 +1 @@
-7ca8ae595f082226238626eb9ac7d3557f5b0210e8bcbc18fb3d33b545a8e42decb7c8f8772c2157d0d228dcfe30de52398f8035d2ccd9ccb2112128ca0e8b04
+385b4e58a0897b1fbb1106e98302b9f28ef4ec0a2b5fbfaa797c562c76eeb1c0ebab54329e857a50aec06225191a70eba59627e5f63f5e3b76281abb9af21eba

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-video",
   "title": "Expo Video",
-  "version": "3.0.12-canary-20251008-f2d1b4a",
+  "version": "3.0.12-canary-20251013-623c5a6",
   "description": "A cross-platform, performant video component for React Native and Expo with Web support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -31,10 +31,10 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "expo-module-scripts": "5.0.8-canary-20251008-f2d1b4a"
+    "expo-module-scripts": "5.0.8-canary-20251013-623c5a6"
   },
   "peerDependencies": {
-    "expo": "55.0.0-canary-20251008-f2d1b4a",
+    "expo": "55.0.0-canary-20251013-623c5a6",
     "react": "*",
     "react-native": "*"
   }

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.module.md5

@@ -1 +0,0 @@
-03602505389fa4b32fb695ed2d6f54df

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.module.sha1

@@ -1 +0,0 @@
-fc30806dbb20650680aebb4608f041fa9ac5c004

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.module.sha256

@@ -1 +0,0 @@
-8e1c315398fe530137e8a9acb0f574c3ccb7dbe0aca8e9ea989e010a2fed6b2e

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.module.sha512

@@ -1 +0,0 @@
-b182dfb7b2d8ee8fd05b1e8900c0c9d159a7d7fe650b997c6dee1884b1378302278f40a5b07e54201fde082378b0701df16db588d0397ee031ceb35c39e4c2ad

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.pom.md5

@@ -1 +0,0 @@
-c8c6708a8232b7668b76f8ce142c7f26

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.pom.sha1

@@ -1 +0,0 @@
-d68264f0568bb4b024ce6cd423348ee80f8d1575

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.pom.sha256

@@ -1 +0,0 @@
-7687e07870f5bc219534a3044698a1334f417bd36eaabe99823e781d4f565c87

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251008-f2d1b4a/expo.modules.video-3.0.12-canary-20251008-f2d1b4a.pom.sha512

@@ -1 +0,0 @@
-cfd190664b989491fdb7bada9681a4152736c559bf4736308af56b2a2b755ebae5da7568e18fe8e7a03d69ee55d012cf346ade12710920e7fff52ba2506b0b61