@neoskola/auto-play 0.3.4 → 0.3.5

package/ios/templates/NowPlayingTemplate.swift

@@ -3,7 +3,7 @@ import MediaPlayer
 import AVFoundation
 
 class NowPlayingTemplate: AutoPlayTemplate {
-    var template: CPNowPlayingTemplate
+    var template: CPListTemplate
     var config: NowPlayingTemplateConfig
     private var loadedImage: UIImage?
     private var isSetupComplete = false
@@ -34,19 +34,43 @@ class NowPlayingTemplate: AutoPlayTemplate {
     init(config: NowPlayingTemplateConfig) {
         self.config = config
 
-        template = CPNowPlayingTemplate.shared
-        initTemplate(template: template, id: config.id)
+        // 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
+        )
 
-        // Constructor runs on the JS thread. Dispatch all CarPlay UI setup to main thread.
-        // CPNowPlayingTemplate.shared is Apple's singleton — must be modified on main thread.
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
-
-            // Activate AVAudioSession FIRST — iOS needs this to recognize the app
-            // as a media player before MPNowPlayingInfoCenter metadata is meaningful.
             NowPlayingSessionManager.shared.ensureSessionActive()
-
-            self.setupNowPlayingButtons()
+            self.setupRemoteCommandCenter()
             self.updateNowPlayingInfo()
             self.isSetupComplete = true
 
@@ -56,6 +80,56 @@ class NowPlayingTemplate: AutoPlayTemplate {
         }
     }
 
+    // MARK: - Player UI
+
+    private func updatePlayerUI() {
+        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: loadedImage ?? UIImage(systemName: "music.note"),
+            accessoryImage: nil,
+            accessoryType: .none
+        )
+
+        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
 
     @MainActor
@@ -73,12 +147,11 @@ class NowPlayingTemplate: AutoPlayTemplate {
         NowPlayingSessionManager.shared.ensureSessionActive()
         config.isPlaying = true
         updateNowPlayingInfo()
+        updatePlayerUI()
         MPNowPlayingInfoCenter.default().playbackState = .playing
 
         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 }
 
@@ -92,7 +165,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
                 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")
 
@@ -121,7 +193,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
         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 {
@@ -135,6 +206,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
                 if !duration.isNaN && !duration.isInfinite && duration > 0 {
                     self.currentDuration = duration
                     self.updateNowPlayingInfo()
+                    self.updatePlayerUI()
                     print("[NowPlayingTemplate] Duration resolved via KVO: \(duration)s")
                 }
             }
@@ -147,7 +219,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
             player?.seek(to: time)
         }
 
-        // Periodic time observer (every 1 second) for MPNowPlayingInfoCenter updates
         let interval = CMTime(seconds: 1.0, preferredTimescale: 600)
         timeObserver = player?.addPeriodicTimeObserver(
             forInterval: interval,
@@ -156,7 +227,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
             self?.handleTimeUpdate(time: time)
         }
 
-        // Playback finished notification
         didFinishObserver = NotificationCenter.default.addObserver(
             forName: .AVPlayerItemDidPlayToEndTime,
             object: playerItem,
@@ -165,7 +235,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
             self?.handlePlaybackFinished()
         }
 
-        // Progress report timer (every 30 seconds) — calls JS callback for backend reporting
         progressReportTimer = Timer.scheduledTimer(
             withTimeInterval: 30.0,
             repeats: true
@@ -190,10 +259,8 @@ class NowPlayingTemplate: AutoPlayTemplate {
             currentDuration = duration
         }
 
-        // 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
@@ -209,6 +276,9 @@ class NowPlayingTemplate: 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
@@ -226,7 +296,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
     private func handlePlaybackFinished() {
         config.isPlaying = false
         MPNowPlayingInfoCenter.default().playbackState = .stopped
-        // Fire completion if not already fired
+        updatePlayerUI()
         if !completionFired {
             completionFired = true
             config.onComplete?()
@@ -239,6 +309,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
         player?.pause()
         config.isPlaying = false
         updatePlaybackState(isPlaying: false)
+        updatePlayerUI()
         reportProgress()
     }
 
@@ -248,6 +319,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
         player?.play()
         config.isPlaying = true
         updatePlaybackState(isPlaying: true)
+        updatePlayerUI()
     }
 
     @MainActor
@@ -272,6 +344,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
         cleanupPlayer()
         config.isPlaying = false
         MPNowPlayingInfoCenter.default().playbackState = .stopped
+        updatePlayerUI()
     }
 
     private func cleanupPlayer() {
@@ -298,29 +371,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
         }
     }
 
-    // MARK: - CarPlay UI
-
-    private func setupNowPlayingButtons() {
-        var buttons: [CPNowPlayingButton] = []
-
-        let skipBackButton = CPNowPlayingImageButton(
-            image: UIImage(systemName: "gobackward.30")!
-        ) { [weak self] _ in
-            self?.seekBackward(seconds: 30)
-            self?.config.onSkipBackward?()
-        }
-        buttons.append(skipBackButton)
-
-        let skipForwardButton = CPNowPlayingImageButton(
-            image: UIImage(systemName: "goforward.30")!
-        ) { [weak self] _ in
-            self?.seekForward(seconds: 30)
-            self?.config.onSkipForward?()
-        }
-        buttons.append(skipForwardButton)
-
-        template.updateNowPlayingButtons(buttons)
-    }
+    // MARK: - Now Playing Info & Remote Commands
 
     private func updateNowPlayingInfo() {
         let titleText = Parser.parseText(text: config.title) ?? ""
@@ -339,7 +390,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
             nowPlayingInfo[MPMediaItemPropertyArtwork] = artwork
         }
 
-        // Include duration and elapsed time for the progress bar
         if currentDuration > 0 {
             nowPlayingInfo[MPMediaItemPropertyPlaybackDuration] = currentDuration
             nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentElapsedTime
@@ -347,8 +397,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
         }
 
         MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
-
-        setupRemoteCommandCenter()
     }
 
     private func setupRemoteCommandCenter() {
@@ -399,6 +447,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
             self.player?.seek(to: time)
             self.currentElapsedTime = positionEvent.positionTime
             self.updateNowPlayingInfo()
+            self.updatePlayerUI()
             return .success
         }
     }
@@ -414,6 +463,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
                 DispatchQueue.main.async {
                     self.loadedImage = uiImage
                     self.updateNowPlayingInfo()
+                    self.updatePlayerUI()
                 }
             }.resume()
         }
@@ -423,7 +473,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
 
     @MainActor
     func invalidate() {
-        setupNowPlayingButtons()
+        updatePlayerUI()
         updateNowPlayingInfo()
 
         if loadedImage == nil, let image = config.image {
@@ -458,7 +508,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
         commandCenter.skipBackwardCommand.removeTarget(nil)
         commandCenter.changePlaybackPositionCommand.removeTarget(nil)
 
-        // Clear now playing info so CarPlay hides the Now Playing bar
         MPNowPlayingInfoCenter.default().nowPlayingInfo = nil
         MPNowPlayingInfoCenter.default().playbackState = .stopped
     }
@@ -466,19 +515,14 @@ class NowPlayingTemplate: AutoPlayTemplate {
     @MainActor
     func updatePlaybackState(isPlaying: Bool) {
         config.isPlaying = isPlaying
-
-        // Ensure AVAudioSession is active — required for CarPlay Now Playing bar
         NowPlayingSessionManager.shared.ensureSessionActive()
 
-        // If constructor's DispatchQueue.main.async hasn't run yet,
-        // nowPlayingInfo could be nil. Set it up now to fix the race condition.
         if !isSetupComplete {
-            setupNowPlayingButtons()
+            updatePlayerUI()
             updateNowPlayingInfo()
             isSetupComplete = true
         }
 
-        // Update playback rate — use existing info or create fresh if nil
         var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
 
         if nowPlayingInfo[MPMediaItemPropertyTitle] == nil {
@@ -501,6 +545,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
         config.title = AutoText(text: title, distance: nil, duration: nil)
         config.subtitle = AutoText(text: subtitle, distance: nil, duration: nil)
         updateNowPlayingInfo()
+        updatePlayerUI()
     }
 
     @MainActor
@@ -508,7 +553,6 @@ class NowPlayingTemplate: AutoPlayTemplate {
         self.currentElapsedTime = elapsedTime
         self.currentDuration = duration
 
-        // Update time-related fields — use existing info or create fresh if nil
         var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()
 
         if nowPlayingInfo[MPMediaItemPropertyTitle] == nil {
@@ -523,5 +567,7 @@ class NowPlayingTemplate: 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.4",
+  "version": "0.3.5",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",