expo-video 3.0.12-canary-20251009-9919e08 → 3.0.12-canary-20251015-a6a1272

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-20251009-9919e08'
+version = '3.0.12-canary-20251015-a6a1272'
 
 android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '3.0.12-canary-20251009-9919e08'
+    versionName '3.0.12-canary-20251015-a6a1272'
   }
 }
 

package/expo-module.config.json

@@ -8,7 +8,7 @@
     "publication": {
       "groupId": "host.exp.exponent",
       "artifactId": "expo.modules.video",
-      "version": "3.0.12-canary-20251009-9919e08",
+      "version": "3.0.12-canary-20251015-a6a1272",
       "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-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.module → 3.0.12-canary-20251015-a6a1272/expo.modules.video-3.0.12-canary-20251015-a6a1272.module}

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

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

@@ -0,0 +1 @@
+f4c11ac9cbd707198dcda0b6402868ec

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

@@ -0,0 +1 @@
+f9d6c51651537dd487f331c00979ac61dbb2ce82

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

@@ -0,0 +1 @@
+8183baebf2018d9224279316100f43b16716881748f38c93e9cb860648fa2d86

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

@@ -0,0 +1 @@
+40a0f3a1609c253c266138c62cd2871e2ef8eebe3d70e9ba2c2513885494afa7baaf14bd292ea250837a56c9c047874f12ab749c011f2e0049a36934b72c1dba

package/local-maven-repo/host/exp/exponent/expo.modules.video/{3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.pom → 3.0.12-canary-20251015-a6a1272/expo.modules.video-3.0.12-canary-20251015-a6a1272.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-20251009-9919e08</version>
+  <version>3.0.12-canary-20251015-a6a1272</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-20251015-a6a1272/expo.modules.video-3.0.12-canary-20251015-a6a1272.pom.md5

@@ -0,0 +1 @@
+acf7d9fae32005bed077c029a7543049

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

@@ -0,0 +1 @@
+58e37b77aebd87a9583a00434288114c4d10202d

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

@@ -0,0 +1 @@
+9cbd78f647b012d07415f7a04958beb4d625772ef0ae2818ce1656e6de144034

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

@@ -0,0 +1 @@
+615167fcab21d654da2fa3d12c8eb1017889a5a134ff33dd6db790c45bbe516219055b7937276765de3597808f806c9b374cfb792bf3998732c2541f4c34f1a9

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-20251009-9919e08</latest>
-    <release>3.0.12-canary-20251009-9919e08</release>
+    <latest>3.0.12-canary-20251015-a6a1272</latest>
+    <release>3.0.12-canary-20251015-a6a1272</release>
     <versions>
-      <version>3.0.12-canary-20251009-9919e08</version>
+      <version>3.0.12-canary-20251015-a6a1272</version>
     </versions>
-    <lastUpdated>20251009122847</lastUpdated>
+    <lastUpdated>20251015164320</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-f8c163a460edbdbbbcdfb8b1a774ed1d
+8ea2c91d58ccd9a06ff2052aafeedbb4

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

@@ -1 +1 @@
-d554b8c83cc950fbab13d2bd47f0789efeff7405
+5fc595595aa726bb7e9c8827bbb2ef79c736f235

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

@@ -1 +1 @@
-6ddb533723ebdba071d5876ea8f5b97e691b4191efce44273c1a30ad36e0200c
+e218786f002c304f6a246039cc164980e82bab387fd3d3ae1042e7ba51c3d306

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

@@ -1 +1 @@
-1d18a2966ce1fcab2f9e5f09d7583feb57841b82d84c55e8ab7cfb22930807dfce275cefce87d16fe106365aa58cb18ac0c0b349a1e389b49474e043b2efc091
+59816712340f4b90f5c95ad46b9e5d8b9248999a8011ae93aeb3840824b975ee5a08fb2750df8e672e832fa2ebbacf27f31d98017cf271939c440dce66e44e9f

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-video",
   "title": "Expo Video",
-  "version": "3.0.12-canary-20251009-9919e08",
+  "version": "3.0.12-canary-20251015-a6a1272",
   "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-20251009-9919e08"
+    "expo-module-scripts": "5.0.8-canary-20251015-a6a1272"
   },
   "peerDependencies": {
-    "expo": "55.0.0-canary-20251009-9919e08",
+    "expo": "55.0.0-canary-20251015-a6a1272",
     "react": "*",
     "react-native": "*"
   }

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.module.md5

@@ -1 +0,0 @@
-830ea6e823c0e437ed6ca7b159cdb10e

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.module.sha1

@@ -1 +0,0 @@
-cae1a94ade8b05b3d2a69406b7f3cc6bd77c7bc4

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.module.sha256

@@ -1 +0,0 @@
-d44fb146963c1b79da110bcfc79aa0ae75c739019fd3aef164d096d3d2f82dd9

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.module.sha512

@@ -1 +0,0 @@
-6d2c1c7cfd2d8ab552a8a77b9f29e35afa6bfe76200410dc084b1d00a0728ff9303cadb3340ce36eaca73cdf38d7528a2aafe768a05b5fd8908bf10246f6fe6c

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.pom.md5

@@ -1 +0,0 @@
-00c4632c78f4821db076fa1c52ff4ddb

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.pom.sha1

@@ -1 +0,0 @@
-6d8775c08e8471876e7bdb6cf753fb7314bb1e8b

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.pom.sha256

@@ -1 +0,0 @@
-1f6b850117e513ea0dc7714ed19cf4615e094b09f8c982c1c59c23f15f62167b

package/local-maven-repo/host/exp/exponent/expo.modules.video/3.0.12-canary-20251009-9919e08/expo.modules.video-3.0.12-canary-20251009-9919e08.pom.sha512

@@ -1 +0,0 @@
-907a04eacfd023cb106c1fc13822d62df899354476a40fc44313fb8c5bb0254af219debca4b9783e82fa2c6f2b236a4fff1cd7269a98f5daff0eaac8945a15bb