@neoskola/auto-play 0.3.3 → 0.3.4

package/ios/templates/NowPlayingTemplate.swift

@@ -19,6 +19,9 @@ class NowPlayingTemplate: AutoPlayTemplate {
     private var didFinishObserver: NSObjectProtocol?
     private var statusObservation: NSKeyValueObservation?
     private var completionFired = false
+    private var downloadTask: URLSessionDownloadTask?
+    private var localAudioFileURL: URL?
+    private var pendingStartFrom: Double = 0
 
     var autoDismissMs: Double? {
         return config.autoDismissMs
@@ -60,6 +63,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
         cleanupPlayer()
         completionFired = false
         lastReportedSecond = Int(startFrom)
+        pendingStartFrom = startFrom
 
         guard let audioURL = URL(string: url) else {
             print("[NowPlayingTemplate] Invalid audio URL: \(url)")
@@ -71,8 +75,50 @@ class NowPlayingTemplate: AutoPlayTemplate {
         updateNowPlayingInfo()
         MPNowPlayingInfoCenter.default().playbackState = .playing
 
-        // Direct AVPlayer streaming — URL now has correct headers from backend
-        let asset = AVURLAsset(url: audioURL)
+        print("[NowPlayingTemplate] Downloading audio: \(url)")
+
+        // Download file first, then play from local — R2/Cloudflare CDN streaming
+        // causes FigFilePlayer errors with AVPlayer, local playback is reliable
+        downloadTask = URLSession.shared.downloadTask(with: audioURL) { [weak self] tempURL, response, error in
+            guard let self = self else { return }
+
+            if let error = error {
+                print("[NowPlayingTemplate] Download failed: \(error.localizedDescription)")
+                return
+            }
+
+            guard let tempURL = tempURL else {
+                print("[NowPlayingTemplate] Download returned no file")
+                return
+            }
+
+            // Move to a persistent temp location (URLSession deletes the file after this block)
+            let localURL = FileManager.default.temporaryDirectory
+                .appendingPathComponent("carplay_audio_\(UUID().uuidString).mp3")
+
+            do {
+                if let oldFile = self.localAudioFileURL {
+                    try? FileManager.default.removeItem(at: oldFile)
+                }
+                try FileManager.default.moveItem(at: tempURL, to: localURL)
+                self.localAudioFileURL = localURL
+                print("[NowPlayingTemplate] Audio downloaded to: \(localURL.lastPathComponent)")
+            } catch {
+                print("[NowPlayingTemplate] Failed to move downloaded file: \(error)")
+                return
+            }
+
+            DispatchQueue.main.async { [weak self] in
+                self?.startPlaybackFromLocalFile(localURL: localURL, startFrom: self?.pendingStartFrom ?? 0)
+            }
+        }
+        downloadTask?.resume()
+
+        return true
+    }
+
+    private func startPlaybackFromLocalFile(localURL: URL, startFrom: Double) {
+        let asset = AVURLAsset(url: localURL)
         playerItem = AVPlayerItem(asset: asset)
 
         // KVO: detect duration as soon as asset loads (critical for progress bar)
@@ -96,14 +142,11 @@ class NowPlayingTemplate: AutoPlayTemplate {
 
         player = AVPlayer(playerItem: playerItem)
 
-        // Seek to start position
         if startFrom > 0 {
             let time = CMTime(seconds: startFrom, preferredTimescale: 600)
             player?.seek(to: time)
         }
 
-        player?.play()
-
         // Periodic time observer (every 1 second) for MPNowPlayingInfoCenter updates
         let interval = CMTime(seconds: 1.0, preferredTimescale: 600)
         timeObserver = player?.addPeriodicTimeObserver(
@@ -113,14 +156,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
             self?.handleTimeUpdate(time: time)
         }
 
-        // Progress report timer (every 30 seconds) — calls JS callback for backend reporting
-        progressReportTimer = Timer.scheduledTimer(
-            withTimeInterval: 30.0,
-            repeats: true
-        ) { [weak self] _ in
-            self?.reportProgress()
-        }
-
         // Playback finished notification
         didFinishObserver = NotificationCenter.default.addObserver(
             forName: .AVPlayerItemDidPlayToEndTime,
@@ -130,8 +165,18 @@ class NowPlayingTemplate: AutoPlayTemplate {
             self?.handlePlaybackFinished()
         }
 
-        print("[NowPlayingTemplate] Streaming playback started: \(url)")
-        return true
+        // Progress report timer (every 30 seconds) — calls JS callback for backend reporting
+        progressReportTimer = Timer.scheduledTimer(
+            withTimeInterval: 30.0,
+            repeats: true
+        ) { [weak self] _ in
+            self?.reportProgress()
+        }
+
+        player?.play()
+        MPNowPlayingInfoCenter.default().playbackState = .playing
+
+        print("[NowPlayingTemplate] Playback started from local file")
     }
 
     private func handleTimeUpdate(time: CMTime) {
@@ -230,6 +275,8 @@ class NowPlayingTemplate: AutoPlayTemplate {
     }
 
     private func cleanupPlayer() {
+        downloadTask?.cancel()
+        downloadTask = nil
         statusObservation?.invalidate()
         statusObservation = nil
         if let timeObserver = timeObserver {
@@ -245,6 +292,10 @@ class NowPlayingTemplate: AutoPlayTemplate {
         player?.pause()
         player = nil
         playerItem = nil
+        if let localFile = localAudioFileURL {
+            try? FileManager.default.removeItem(at: localFile)
+            localAudioFileURL = nil
+        }
     }
 
     // MARK: - CarPlay UI

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neoskola/auto-play",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",