@neoskola/auto-play 0.3.0 → 0.3.1

package/ios/templates/NowPlayingTemplate.swift

@@ -17,6 +17,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
     private var progressReportTimer: Timer?
     private var lastReportedSecond: Int = 0
     private var didFinishObserver: NSObjectProtocol?
+    private var statusObservation: NSKeyValueObservation?
     private var completionFired = false
 
     var autoDismissMs: Double? {
@@ -71,6 +72,26 @@ class NowPlayingTemplate: AutoPlayTemplate {
 
         let asset = AVURLAsset(url: audioURL)
         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
@@ -124,20 +145,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 +234,8 @@ class NowPlayingTemplate: AutoPlayTemplate {
     }
 
     private func cleanupPlayer() {
+        statusObservation?.invalidate()
+        statusObservation = nil
         if let timeObserver = timeObserver {
             player?.removeTimeObserver(timeObserver)
             self.timeObserver = nil
@@ -342,6 +374,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
 
     // MARK: - AutoPlayTemplate Protocol
 
+    @MainActor
     func invalidate() {
         setupNowPlayingButtons()
         updateNowPlayingInfo()
@@ -398,13 +431,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 +461,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.1",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",