@neoskola/auto-play 0.3.0 → 0.3.2

package/ios/templates/NowPlayingTemplate.swift

@@ -17,7 +17,11 @@ class NowPlayingTemplate: AutoPlayTemplate {
     private var progressReportTimer: Timer?
     private var lastReportedSecond: Int = 0
     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 +64,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)")
@@ -69,8 +74,77 @@ class NowPlayingTemplate: AutoPlayTemplate {
         // Ensure AVAudioSession is active
         NowPlayingSessionManager.shared.ensureSessionActive()
 
-        let asset = AVURLAsset(url: audioURL)
+        // Update NowPlaying UI immediately (before download completes)
+        config.isPlaying = true
+        updateNowPlayingInfo()
+        MPNowPlayingInfoCenter.default().playbackState = .playing
+
+        print("[NowPlayingTemplate] Downloading audio: \(url)")
+
+        // Download file first, then play from local — avoids FigFilePlayer streaming errors
+        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 {
+                // Remove old file if exists
+                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
+            }
+
+            // Start playback on main thread
+            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)
+        statusObservation = playerItem?.observe(\.status, options: [.new]) { [weak self] item, _ in
+            guard item.status == .readyToPlay else {
+                if item.status == .failed {
+                    print("[NowPlayingTemplate] AVPlayerItem failed: \(item.error?.localizedDescription ?? "unknown")")
+                }
+                return
+            }
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                let duration = CMTimeGetSeconds(item.duration)
+                if !duration.isNaN && !duration.isInfinite && duration > 0 {
+                    self.currentDuration = duration
+                    self.updateNowPlayingInfo()
+                    print("[NowPlayingTemplate] Duration resolved via KVO: \(duration)s")
+                }
+            }
+        }
+
         player = AVPlayer(playerItem: playerItem)
 
         // Seek to start position
@@ -107,14 +181,9 @@ class NowPlayingTemplate: AutoPlayTemplate {
 
         // Play
         player?.play()
-
-        // Update NowPlaying UI
-        config.isPlaying = true
-        updateNowPlayingInfo()
         MPNowPlayingInfoCenter.default().playbackState = .playing
 
-        print("[NowPlayingTemplate] Native audio playback started: \(url)")
-        return true
+        print("[NowPlayingTemplate] Native audio playback started from local file")
     }
 
     private func handleTimeUpdate(time: CMTime) {
@@ -124,20 +193,29 @@ class NowPlayingTemplate: AutoPlayTemplate {
         guard !currentTime.isNaN else { return }
 
         currentElapsedTime = currentTime
-        if !duration.isNaN && duration > 0 {
+        if !duration.isNaN && !duration.isInfinite && duration > 0 {
             currentDuration = duration
         }
 
-        // Update MPNowPlayingInfoCenter — no JS roundtrip needed
-        if var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo {
-            if currentDuration > 0 {
-                nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = currentDuration
+        // Use existing info or create fresh if nil (race condition safety)
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+
+        // Ensure title/artist are present if this is a fresh dictionary
+        if nowPlayingInfo[MPMediaItemPropertyTitle] == nil {
+            let titleText = Parser.parseText(text: config.title) ?? ""
+            nowPlayingInfo[MPMediaItemPropertyTitle] = titleText
+            if let subtitle = config.subtitle {
+                nowPlayingInfo[MPMediaItemPropertyArtist] = Parser.parseText(text: subtitle)
             }
-            nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentElapsedTime
-            nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
-            MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
         }
 
+        if currentDuration > 0 {
+            nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = currentDuration
+        }
+        nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentElapsedTime
+        nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+
         // 95% completion check
         if !completionFired && currentDuration > 0 && currentTime / currentDuration >= 0.95 {
             completionFired = true
@@ -204,6 +282,10 @@ class NowPlayingTemplate: AutoPlayTemplate {
     }
 
     private func cleanupPlayer() {
+        downloadTask?.cancel()
+        downloadTask = nil
+        statusObservation?.invalidate()
+        statusObservation = nil
         if let timeObserver = timeObserver {
             player?.removeTimeObserver(timeObserver)
             self.timeObserver = nil
@@ -217,6 +299,11 @@ class NowPlayingTemplate: AutoPlayTemplate {
         player?.pause()
         player = nil
         playerItem = nil
+        // Clean up temp audio file
+        if let localFile = localAudioFileURL {
+            try? FileManager.default.removeItem(at: localFile)
+            localAudioFileURL = nil
+        }
     }
 
     // MARK: - CarPlay UI
@@ -342,6 +429,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
 
     // MARK: - AutoPlayTemplate Protocol
 
+    @MainActor
     func invalidate() {
         setupNowPlayingButtons()
         updateNowPlayingInfo()
@@ -398,13 +486,21 @@ class NowPlayingTemplate: AutoPlayTemplate {
             isSetupComplete = true
         }
 
-        // Update playback rate in existing nowPlayingInfo
-        if var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo {
-            nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = isPlaying ? 1.0 : 0.0
-            nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentElapsedTime
-            MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+        // Update playback rate — use existing info or create fresh if nil
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+
+        if nowPlayingInfo[MPMediaItemPropertyTitle] == nil {
+            let titleText = Parser.parseText(text: config.title) ?? ""
+            nowPlayingInfo[MPMediaItemPropertyTitle] = titleText
+            if let subtitle = config.subtitle {
+                nowPlayingInfo[MPMediaItemPropertyArtist] = Parser.parseText(text: subtitle)
+            }
         }
 
+        nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = isPlaying ? 1.0 : 0.0
+        nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentElapsedTime
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+
         MPNowPlayingInfoCenter.default().playbackState = isPlaying ? .playing : .paused
     }
 
@@ -420,12 +516,20 @@ class NowPlayingTemplate: AutoPlayTemplate {
         self.currentElapsedTime = elapsedTime
         self.currentDuration = duration
 
-        // Update only time-related fields without rebuilding everything
-        if var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo {
-            nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = duration
-            nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = elapsedTime
-            nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
-            MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+        // Update time-related fields — use existing info or create fresh if nil
+        var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
+
+        if nowPlayingInfo[MPMediaItemPropertyTitle] == nil {
+            let titleText = Parser.parseText(text: config.title) ?? ""
+            nowPlayingInfo[MPMediaItemPropertyTitle] = titleText
+            if let subtitle = config.subtitle {
+                nowPlayingInfo[MPMediaItemPropertyArtist] = Parser.parseText(text: subtitle)
+            }
         }
+
+        nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = duration
+        nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = elapsedTime
+        nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
     }
 }

package/package.json

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