@neoskola/auto-play 0.3.17 → 0.3.19

package/ios/scenes/AutoPlayInterfaceController.swift

@@ -7,6 +7,11 @@
 
 import CarPlay
 
+private struct NowPlayingPushResult {
+    let success: Bool
+    let errorDescription: String?
+}
+
 @MainActor
 class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
     let interfaceController: CPInterfaceController
@@ -61,11 +66,28 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
                 return true
             }
 
-            let success = await pushNowPlayingTemplateSafely(animated: animated)
-            if !success {
-                throw AutoPlayError.pushFailed("CPNowPlayingTemplate push failed")
+            let firstAttempt = await pushNowPlayingTemplateSafely(animated: animated)
+            if firstAttempt.success || interfaceController.topTemplate is CPNowPlayingTemplate {
+                return true
             }
-            return true
+
+            // CarPlay can reject pushes while handling list selection transitions.
+            // Retry once after a short delay to avoid transient failures.
+            try? await Task.sleep(nanoseconds: 250_000_000)
+            let secondAttempt = await pushNowPlayingTemplateSafely(animated: animated)
+            if secondAttempt.success || interfaceController.topTemplate is CPNowPlayingTemplate {
+                return true
+            }
+
+            let reason = secondAttempt.errorDescription
+                ?? firstAttempt.errorDescription
+                ?? "unknown reason"
+            let topTemplateDescription = interfaceController.topTemplate.map {
+                String(describing: type(of: $0))
+            } ?? "nil"
+            throw AutoPlayError.pushFailed(
+                "CPNowPlayingTemplate push failed (\(reason)). top=\(topTemplateDescription) stackCount=\(interfaceController.templates.count)"
+            )
         }
 
         return try await interfaceController.pushTemplate(
@@ -76,7 +98,7 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
 
     /// Pushes CPNowPlayingTemplate using ObjC @try/@catch to prevent crash from NSException.
     /// Uses a completion handler to confirm the push actually succeeded.
-    private func pushNowPlayingTemplateSafely(animated: Bool) async -> Bool {
+    private func pushNowPlayingTemplateSafely(animated: Bool) async -> NowPlayingPushResult {
         return await withCheckedContinuation { continuation in
             do {
                 try ObjCExceptionCatcher.push(
@@ -88,12 +110,22 @@ class AutoPlayInterfaceController: NSObject, CPInterfaceControllerDelegate {
                             print("[AutoPlay] CPNowPlayingTemplate push completion error: \(error.localizedDescription)")
                         }
                         print("[AutoPlay] CPNowPlayingTemplate push completion: success=\(success)")
-                        continuation.resume(returning: success)
+                        continuation.resume(
+                            returning: NowPlayingPushResult(
+                                success: success,
+                                errorDescription: error?.localizedDescription
+                            )
+                        )
                     }
                 )
             } catch {
                 print("[AutoPlay] CPNowPlayingTemplate push threw ObjC exception: \(error.localizedDescription)")
-                continuation.resume(returning: false)
+                continuation.resume(
+                    returning: NowPlayingPushResult(
+                        success: false,
+                        errorDescription: error.localizedDescription
+                    )
+                )
             }
         }
     }

package/ios/templates/NowPlayingTemplate.swift

@@ -2,7 +2,8 @@ import CarPlay
 import MediaPlayer
 import AVFoundation
 
-class NowPlayingTemplate: NSObject, AutoPlayTemplate {
+class NowPlayingTemplate: AutoPlayTemplate {
+    var template: CPListTemplate
     var config: NowPlayingTemplateConfig
     private var loadedImage: UIImage?
     private var isSetupComplete = false
@@ -27,33 +28,106 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
     }
 
     func getTemplate() -> CPTemplate {
-        return CPNowPlayingTemplate.shared
+        return template
     }
 
     init(config: NowPlayingTemplateConfig) {
         self.config = config
 
-        super.init()
+        // Custom player screen using CPListTemplate instead of CPNowPlayingTemplate.shared
+        let titleText = Parser.parseText(text: config.title) ?? "Now Playing"
+        let subtitleText = config.subtitle.flatMap { Parser.parseText(text: $0) } ?? ""
+
+        let infoItem = CPListItem(
+            text: titleText,
+            detailText: subtitleText,
+            image: UIImage(systemName: "music.note"),
+            accessoryImage: nil,
+            accessoryType: .none
+        )
+
+        let statusItem = CPListItem(
+            text: "Yükleniyor...",
+            detailText: nil,
+            image: UIImage(systemName: "arrow.down.circle"),
+            accessoryImage: nil,
+            accessoryType: .none
+        )
+
+        let section = CPListSection(
+            items: [infoItem, statusItem],
+            header: nil,
+            sectionIndexTitle: nil
+        )
+
+        template = CPListTemplate(
+            title: "Now Playing",
+            sections: [section],
+            assistantCellConfiguration: nil,
+            id: config.id
+        )
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            NowPlayingSessionManager.shared.ensureSessionActive()
+            self.setupRemoteCommandCenter()
+            self.updateNowPlayingInfo()
+            self.isSetupComplete = true
 
-        // Set the config ID on the shared singleton so TemplateStore can find it
-        initTemplate(template: CPNowPlayingTemplate.shared, id: config.id)
+            if let image = config.image {
+                self.loadImageAsync(image: image)
+            }
+        }
+    }
 
-        // Setup remote commands and now playing info synchronously
-        // so they're ready before CPNowPlayingTemplate.shared is pushed
-        NowPlayingSessionManager.shared.ensureSessionActive()
-        setupRemoteCommandCenter()
-        updateNowPlayingInfo()
+    // MARK: - Player UI
 
-        // Set playbackState before push so CarPlay sees an active now-playing session
-        if config.isPlaying {
-            MPNowPlayingInfoCenter.default().playbackState = .playing
-        }
+    private func updatePlayerUI() {
+        let titleText = Parser.parseText(text: config.title) ?? "Now Playing"
+        let subtitleText = config.subtitle.flatMap { Parser.parseText(text: $0) } ?? ""
 
-        isSetupComplete = true
+        let infoItem = CPListItem(
+            text: titleText,
+            detailText: subtitleText,
+            image: loadedImage ?? UIImage(systemName: "music.note"),
+            accessoryImage: nil,
+            accessoryType: .none
+        )
 
-        if let image = config.image {
-            loadImageAsync(image: image)
-        }
+        let statusText: String
+        let statusIcon: String
+        if config.isPlaying {
+            let elapsed = formatTime(currentElapsedTime)
+            let total = currentDuration > 0 ? formatTime(currentDuration) : "--:--"
+            statusText = "Playing  \(elapsed) / \(total)"
+            statusIcon = "play.circle.fill"
+        } else {
+            statusText = "Paused"
+            statusIcon = "pause.circle.fill"
+        }
+
+        let statusItem = CPListItem(
+            text: statusText,
+            detailText: nil,
+            image: UIImage(systemName: statusIcon),
+            accessoryImage: nil,
+            accessoryType: .none
+        )
+
+        let section = CPListSection(
+            items: [infoItem, statusItem],
+            header: nil,
+            sectionIndexTitle: nil
+        )
+
+        template.updateSections([section])
+    }
+
+    private func formatTime(_ seconds: Double) -> String {
+        guard !seconds.isNaN && !seconds.isInfinite && seconds >= 0 else { return "0:00" }
+        let mins = Int(seconds) / 60
+        let secs = Int(seconds) % 60
+        return String(format: "%d:%02d", mins, secs)
     }
 
     // MARK: - Native Audio Playback
@@ -73,6 +147,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         NowPlayingSessionManager.shared.ensureSessionActive()
         config.isPlaying = true
         updateNowPlayingInfo()
+        updatePlayerUI()
         MPNowPlayingInfoCenter.default().playbackState = .playing
 
         print("[NowPlayingTemplate] Downloading audio: \(url)")
@@ -131,6 +206,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
                 if !duration.isNaN && !duration.isInfinite && duration > 0 {
                     self.currentDuration = duration
                     self.updateNowPlayingInfo()
+                    self.updatePlayerUI()
                     print("[NowPlayingTemplate] Duration resolved via KVO: \(duration)s")
                 }
             }
@@ -200,6 +276,9 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
         MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
 
+        // Update custom player UI
+        updatePlayerUI()
+
         // 95% completion check
         if !completionFired && currentDuration > 0 && currentTime / currentDuration >= 0.95 {
             completionFired = true
@@ -217,6 +296,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
     private func handlePlaybackFinished() {
         config.isPlaying = false
         MPNowPlayingInfoCenter.default().playbackState = .stopped
+        updatePlayerUI()
         if !completionFired {
             completionFired = true
             config.onComplete?()
@@ -229,6 +309,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         player?.pause()
         config.isPlaying = false
         updatePlaybackState(isPlaying: false)
+        updatePlayerUI()
         reportProgress()
     }
 
@@ -238,6 +319,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         player?.play()
         config.isPlaying = true
         updatePlaybackState(isPlaying: true)
+        updatePlayerUI()
     }
 
     @MainActor
@@ -262,6 +344,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         cleanupPlayer()
         config.isPlaying = false
         MPNowPlayingInfoCenter.default().playbackState = .stopped
+        updatePlayerUI()
     }
 
     private func cleanupPlayer() {
@@ -307,10 +390,11 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
             nowPlayingInfo[MPMediaItemPropertyArtwork] = artwork
         }
 
+        nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentElapsedTime
+        nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
+
         if currentDuration > 0 {
             nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = currentDuration
-            nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentElapsedTime
-            nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
         }
 
         MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
@@ -378,6 +462,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
             self.player?.seek(to: time)
             self.currentElapsedTime = positionEvent.positionTime
             self.updateNowPlayingInfo()
+            self.updatePlayerUI()
             return .success
         }
     }
@@ -393,6 +478,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
                 DispatchQueue.main.async {
                     self.loadedImage = uiImage
                     self.updateNowPlayingInfo()
+                    self.updatePlayerUI()
                 }
             }.resume()
         }
@@ -402,6 +488,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
 
     @MainActor
     func invalidate() {
+        updatePlayerUI()
         updateNowPlayingInfo()
 
         if loadedImage == nil, let image = config.image {
@@ -448,6 +535,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         NowPlayingSessionManager.shared.ensureSessionActive()
 
         if !isSetupComplete {
+            updatePlayerUI()
             updateNowPlayingInfo()
             isSetupComplete = true
         }
@@ -474,6 +562,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         config.title = AutoText(text: title, distance: nil, duration: nil)
         config.subtitle = AutoText(text: subtitle, distance: nil, duration: nil)
         updateNowPlayingInfo()
+        updatePlayerUI()
     }
 
     @MainActor
@@ -495,5 +584,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate {
         nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = elapsedTime
         nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
         MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
+
+        updatePlayerUI()
     }
 }

package/package.json

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