@stepincto/expo-video 1.0.0 → 1.0.3

package/ios/Cache/CachableRequest.swift

@@ -17,6 +17,8 @@ class CachableRequest: Equatable, Hashable {
   var response: URLResponse?
   private(set) var receivedData = Data()
   private let dataOffset: Int64
+  private static var fileLocks: [String: NSLock] = [:]
+  private static let fileLocksQueue = DispatchQueue(label: "expo-video-cache-file-locks")
 
   init(loadingRequest: AVAssetResourceLoadingRequest, dataTask: URLSessionDataTask, dataRequest: AVAssetResourceLoadingDataRequest) {
     self.loadingRequest = loadingRequest
@@ -30,8 +32,41 @@ class CachableRequest: Equatable, Hashable {
   }
 
   func saveData(to cachedResource: CachedResource) {
-    // Disabled: Player is now read-only with respect to the cache.
-    // Do nothing.
+    // 1. Check if file is fully cached
+    if let mediaInfo = cachedResource.mediaInfo {
+      let expectedLength = Int(mediaInfo.expectedContentLength)
+      let ranges = mediaInfo.loadedDataRanges
+      if ranges.count == 1, ranges[0].0 == 0, ranges[0].1 == expectedLength - 1 {
+        // Already fully cached, do not write
+        return
+      }
+    }
+
+    // 2. Acquire per-file lock
+    let filePath = cachedResource.dataPath
+    let lock: NSLock = Self.fileLocksQueue.sync {
+      if let l = Self.fileLocks[filePath] { return l }
+      let l = NSLock()
+      Self.fileLocks[filePath] = l
+      return l
+    }
+    if !lock.try() {
+      // Another writer is active, skip this write
+      return
+    }
+    defer { lock.unlock() }
+
+    // 3. Write only missing data
+    let offset = dataOffset
+    let length = receivedData.count
+    let end = offset + Int64(length) - 1
+    if cachedResource.canRespondWithData(from: offset, to: end) {
+      // This range is already cached, skip
+      return
+    }
+    Task {
+      await cachedResource.writeData(data: receivedData, offset: offset)
+    }
   }
 
   static func == (lhs: CachableRequest, rhs: CachableRequest) -> Bool {

package/ios/Cache/CachedResource.swift

@@ -10,7 +10,7 @@ import ExpoModulesCore
  */
 class CachedResource {
   private let url: URL
-  private let dataPath: String
+  internal let dataPath: String
   private let fileHandle: MediaFileHandle
   private(set) var mediaInfo: MediaInfo?
 

package/ios/Cache/VideoCacheManager.swift

@@ -210,6 +210,15 @@ extension VideoCacheManager {
     let fileUrl = URL(fileURLWithPath: saveFilePath)
     let mediaInfoPath = saveFilePath + VideoCacheManager.mediaInfoSuffix
 
+    // Ensure parent directory exists before writing file
+    let parentDir = fileUrl.deletingLastPathComponent()
+    do {
+      try FileManager.default.createDirectory(at: parentDir, withIntermediateDirectories: true)
+    } catch {
+      print("[expo-video] Failed to create parent directory for cache file: \(error)")
+      throw error
+    }
+
     let (data, response) = try await URLSession.shared.data(from: url)
     try data.write(to: fileUrl, options: .atomic)
 
@@ -253,10 +262,13 @@ extension VideoCacheManager {
     let fileUrl = URL(fileURLWithPath: saveFilePath)
     let mediaInfoPath = saveFilePath + VideoCacheManager.mediaInfoSuffix
 
-    // Ensure the cache directory exists (same as VideoAsset)
-    if let cacheDir = try? FileManager.default.url(for: .cachesDirectory, in: .userDomainMask, appropriateFor: nil, create: true) {
-        let videoCacheDir = cacheDir.appendingPathComponent(VideoCacheManager.expoVideoCacheScheme, isDirectory: true)
-        try? FileManager.default.createDirectory(at: videoCacheDir, withIntermediateDirectories: true)
+    // Ensure parent directory exists before writing file
+    let parentDir = fileUrl.deletingLastPathComponent()
+    do {
+      try FileManager.default.createDirectory(at: parentDir, withIntermediateDirectories: true)
+    } catch {
+      print("[expo-video] Failed to create parent directory for cache file: \(error)")
+      throw error
     }
 
     // Ensure the file exists before opening for writing

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stepincto/expo-video",
   "title": "Expo Video",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "originalUpstreamVersion": "2.2.2", 
   "description": "A cross-platform, performant video component for React Native and Expo with Web support",
   "main": "build/index.js",