A cross platform Audiobookshelf client for Android and iOS
Dart
Polish iOS native player: multi-track, server sync, handler guards
Barnabase5b8e16ea4e4
diff --git a/ios/Runner/AbsorbPlayerCore.swift b/ios/Runner/AbsorbPlayerCore.swiftindex 84ca070a..f98b1fb3 100644--- a/ios/Runner/AbsorbPlayerCore.swift+++ b/ios/Runner/AbsorbPlayerCore.swift@@ -4,15 +4,14 @@ import Foundationimport MediaPlayerimport UIKit-/// Phase 1.7: native player core that drives downloaded AND streaming-/// audiobooks via AVPlayer, exposes lock-screen / Control Center / CarPlay-/// metadata via MPNowPlayingInfoCenter, and handles remote commands via-/// MPRemoteCommandCenter.+/// Native player core for iOS. Drives downloaded and streaming audiobooks+/// via AVPlayer when Flutter isn't alive, exposes lock-screen / Control+/// Center / CarPlay metadata, handles remote commands, and pushes progress+/// directly to ABS so the server stays in sync during widget-only sessions.///-/// Reads playback state from the iOS app group (`np_*` keys written by-/// `home_widget_service.dart`), respects the `audio_owner_alive_at`-/// heartbeat so it doesn't double-drive while Flutter is in charge, and-/// keeps Flutter in sync by writing position back as it plays.+/// State source: app group `np_*` keys written by `home_widget_service.dart`.+/// Hand-off: `audio_owner_alive_at` heartbeat - if recent, Flutter is in+/// charge and native bails on every entry point.final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Sendable {static let shared = AbsorbPlayerCore()@@ -20,17 +19,26 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Senprivate static let appGroup = "group.com.barnabas.absorb"- /// Serializes mutation of `_player` and friends across the various entry- /// points (intent perform(), remote commands, periodic timer).private let queue = DispatchQueue(label: "com.barnabas.absorb.nativecore")private var _player: AVPlayer?private var _currentItemId: String?private var _currentEpisodeId: String?++ // Multi-track state+ private var _trackUrls: [URL] = []+ private var _trackHeaders: [String: String] = [:]+ private var _trackOffsets: [Double] = [0]+ private var _trackIndex: Int = 0+private var _periodicObserver: Any?private var _itemEndObserver: NSObjectProtocol?private var _commandsConfigured = false+ // Server sync timer (separate from periodic position observer)+ private var _serverSyncTimer: Timer?+ private static let serverSyncIntervalSec: TimeInterval = 60.0+private override init() {super.init()emit("[NativeCore] init - host app process is alive")@@ -40,81 +48,101 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Senfunc play() {queue.async { [weak self] in- self?.ensureLoaded()- guard let p = self?._player else {- self?.emit("[NativeCore] play(): no player loaded")+ guard let self = self else { return }+ if self.flutterIsAlive() {+ self.emit("[NativeCore] play(): Flutter is alive, bailing")+ return+ }+ self.ensureLoaded()+ guard let p = self._player else {+ self.emit("[NativeCore] play(): no player loaded")return}- self?.activateAudioSession()+ self.activateAudioSession()p.play()- self?.applySpeed(to: p)- self?.emit("[NativeCore] play(): rate=\(p.rate)")- self?.startPositionTimer()- self?.updateNowPlayingInfo(rate: Double(p.rate))+ self.applySpeed(to: p)+ self.emit("[NativeCore] play(): rate=\(p.rate) trackIdx=\(self._trackIndex)")+ self.startServerSyncTimer()+ self.updateNowPlayingInfo(rate: Double(p.rate))}}func pause() {queue.async { [weak self] in- guard let p = self?._player else {- self?.emit("[NativeCore] pause(): no player")+ guard let self = self else { return }+ if self.flutterIsAlive() {+ self.emit("[NativeCore] pause(): Flutter is alive, bailing")+ return+ }+ guard let p = self._player else {+ self.emit("[NativeCore] pause(): no player")return}p.pause()- let pos = p.currentTime().seconds- self?.emit("[NativeCore] pause(): pos=\(pos)s")- self?.savePosition()- self?.updateNowPlayingInfo(rate: 0)+ self.emit("[NativeCore] pause(): pos=\(self.globalPosition())s")+ self.savePosition()+ self.pushProgressToServer()+ self.stopServerSyncTimer()+ self.updateNowPlayingInfo(rate: 0)}}func toggle() {queue.async { [weak self] in- self?.ensureLoaded()- guard let p = self?._player else {- self?.emit("[NativeCore] toggle(): no player loaded")+ guard let self = self else { return }+ if self.flutterIsAlive() {+ self.emit("[NativeCore] toggle(): Flutter is alive, bailing")+ return+ }+ self.ensureLoaded()+ guard let p = self._player else {+ self.emit("[NativeCore] toggle(): no player loaded")return}if p.rate > 0 {p.pause()- self?.emit("[NativeCore] toggle(): paused")- self?.savePosition()- self?.updateNowPlayingInfo(rate: 0)+ self.emit("[NativeCore] toggle(): paused at \(self.globalPosition())s")+ self.savePosition()+ self.pushProgressToServer()+ self.stopServerSyncTimer()+ self.updateNowPlayingInfo(rate: 0)} else {- self?.activateAudioSession()+ self.activateAudioSession()p.play()- self?.applySpeed(to: p)- self?.emit("[NativeCore] toggle(): playing rate=\(p.rate)")- self?.startPositionTimer()- self?.updateNowPlayingInfo(rate: Double(p.rate))+ self.applySpeed(to: p)+ self.emit("[NativeCore] toggle(): playing rate=\(p.rate) global=\(self.globalPosition())s")+ self.startServerSyncTimer()+ self.updateNowPlayingInfo(rate: Double(p.rate))}}}func skipForward(seconds: Int) {queue.async { [weak self] in- guard let p = self?._player else {- self?.emit("[NativeCore] skipForward: no player")+ guard let self = self else { return }+ if self.flutterIsAlive() {+ self.emit("[NativeCore] skipForward(\(seconds)): Flutter is alive, bailing")return}- let now = p.currentTime().seconds.isFinite ? p.currentTime().seconds : 0- let dur = self?.currentDuration() ?? 0+ let now = self.globalPosition()+ let dur = self.totalDuration()let target = min(dur > 0 ? dur : .greatestFiniteMagnitude, now + Double(seconds))- self?.seekInternal(to: target)- self?.emit("[NativeCore] skipForward(\(seconds)s) -> \(target)s")+ self.emit("[NativeCore] skipForward(\(seconds)s): \(now)s -> \(target)s")+ self.seekToGlobal(target)}}func skipBackward(seconds: Int) {queue.async { [weak self] in- guard let p = self?._player else {- self?.emit("[NativeCore] skipBackward: no player")+ guard let self = self else { return }+ if self.flutterIsAlive() {+ self.emit("[NativeCore] skipBackward(\(seconds)): Flutter is alive, bailing")return}- let now = p.currentTime().seconds.isFinite ? p.currentTime().seconds : 0+ let now = self.globalPosition()let target = max(0, now - Double(seconds))- self?.seekInternal(to: target)- self?.emit("[NativeCore] skipBackward(\(seconds)s) -> \(target)s")+ self.emit("[NativeCore] skipBackward(\(seconds)s): \(now)s -> \(target)s")+ self.seekToGlobal(target)}}@@ -122,10 +150,8 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Senemit(message)}- // MARK: - State plumbing+ // MARK: - Hand-off- /// Phase 1.4 hand-off check. Recent heartbeat means Flutter is alive and- /// owns playback - native bails so we don't double-drive.private func flutterIsAlive() -> Bool {let defaults = UserDefaults(suiteName: Self.appGroup)guard let aliveAt = defaults?.object(forKey: "audio_owner_alive_at") as? Int else {@@ -136,14 +162,11 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Senreturn ageMs >= 0 && ageMs < 30_000}- /// Lazily load AVPlayer from app group state. Caches the player; rebuilds- /// only when the active item changes. Picks downloaded file path or- /// streaming URL based on `np_is_downloaded`.+ // MARK: - State plumbing++ /// Build the URL list, track offsets, headers, and active-track index+ /// from app group state. Loads the AVPlayer to the right starting track.private func ensureLoaded() {- if flutterIsAlive() {- emit("[NativeCore] ensureLoaded: Flutter is alive, skipping native load")- return- }let defaults = UserDefaults(suiteName: Self.appGroup)guard let itemId = defaults?.string(forKey: "np_item_id") else {emit("[NativeCore] ensureLoaded: no np_item_id in app group")@@ -155,66 +178,161 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Sen}let isDownloaded = defaults?.bool(forKey: "np_is_downloaded") ?? false- let asset: AVURLAsset?+ let urls: [URL]+ let headers: [String: String]if isDownloaded,let pathsJson = defaults?.string(forKey: "np_audio_paths_json"),let pathsData = pathsJson.data(using: .utf8),let paths = try? JSONSerialization.jsonObject(with: pathsData) as? [String],- let firstPath = paths.first,- FileManager.default.fileExists(atPath: firstPath) {- asset = AVURLAsset(url: URL(fileURLWithPath: firstPath))- emit("[NativeCore] Loading downloaded \(itemId) from \(firstPath)")+ !paths.isEmpty {+ urls = paths+ .filter { FileManager.default.fileExists(atPath: $0) }+ .map { URL(fileURLWithPath: $0) }+ headers = [:]+ emit("[NativeCore] ensureLoaded: \(itemId) downloaded, \(urls.count) tracks")} else if let urlsJson = defaults?.string(forKey: "np_stream_urls_json"),let urlsData = urlsJson.data(using: .utf8),- let urls = try? JSONSerialization.jsonObject(with: urlsData) as? [String],- let firstUrl = urls.first,- let streamUrl = URL(string: firstUrl) {- var options: [String: Any] = [:]+ let urlStrings = try? JSONSerialization.jsonObject(with: urlsData) as? [String],+ !urlStrings.isEmpty {+ urls = urlStrings.compactMap { URL(string: $0) }+ var hh: [String: String] = [:]if let headersJson = defaults?.string(forKey: "np_stream_headers_json"),let headersData = headersJson.data(using: .utf8),- let headers = try? JSONSerialization.jsonObject(with: headersData) as? [String: String],- !headers.isEmpty {- // Private but long-standing key for passing custom HTTP headers- // through AVURLAsset; documented widely though not in the public- // SDK. Required for Cloudflare Access and similar reverse-proxy- // auth that can't ride in the URL.- options["AVURLAssetHTTPHeaderFieldsKey"] = headers+ let h = try? JSONSerialization.jsonObject(with: headersData) as? [String: String] {+ hh = h}- asset = AVURLAsset(url: streamUrl, options: options)- emit("[NativeCore] Loading stream \(itemId) from \(firstUrl)")+ headers = hh+ emit("[NativeCore] ensureLoaded: \(itemId) streaming, \(urls.count) tracks, \(headers.count) custom headers")} else {emit("[NativeCore] ensureLoaded: no playable source for \(itemId)")return}- guard let asset = asset else { return }- let item = AVPlayerItem(asset: asset)- let player = AVPlayer(playerItem: item)+ if urls.isEmpty {+ emit("[NativeCore] ensureLoaded: source list empty after filtering for \(itemId)")+ return+ }- let savedPos = defaults?.double(forKey: "np_position_s") ?? 0- if savedPos > 0 {- player.seek(to: CMTime(seconds: savedPos, preferredTimescale: 1000))+ // Track offsets (cumulative, length = urls.count + 1). Fall back to+ // [0, +inf] if the stash is missing or shorter than expected so we+ // still play track 0.+ var offsets: [Double] = [0]+ if let offsetsJson = defaults?.string(forKey: "np_track_offsets_json"),+ let offsetsData = offsetsJson.data(using: .utf8),+ let raw = try? JSONSerialization.jsonObject(with: offsetsData) as? [NSNumber],+ raw.count >= urls.count + 1 {+ offsets = raw.map { $0.doubleValue }+ } else {+ // Fallback: assume single track, or unknown durations -> can't seek+ // across tracks correctly but at least track 0 plays.+ offsets = [0]+ for _ in urls { offsets.append(.greatestFiniteMagnitude) }+ emit("[NativeCore] ensureLoaded: track offsets unknown, falling back to single-track logic")}- _player = player+ let savedPos = defaults?.double(forKey: "np_position_s") ?? 0+ let startTrackIndex = trackIndexForGlobal(savedPos, offsets: offsets)+ let localStart = savedPos - offsets[startTrackIndex]++ _trackUrls = urls+ _trackHeaders = headers+ _trackOffsets = offsets+ _trackIndex = startTrackIndex_currentItemId = itemId_currentEpisodeId = episodeId- observeItemEnd(item)- addPeriodicObserver(player: player)++ let player = AVPlayer()+ _player = player+ loadCurrentTrack(seekTo: localStart)configureRemoteCommandsIfNeeded()updateNowPlayingInfo(rate: 0)- emit("[NativeCore] Loaded \(itemId) at \(savedPos)s")+ emit("[NativeCore] ensureLoaded done: \(itemId) trackIdx=\(startTrackIndex)/\(urls.count) localStart=\(localStart)s globalStart=\(savedPos)s")}- private func currentDuration() -> Double {+ /// Build an AVPlayerItem for the current track (with auth headers if+ /// streaming) and assign it to the player. Sets up end-of-track observer+ /// so playback rolls onto the next track automatically.+ private func loadCurrentTrack(seekTo localSeconds: Double) {+ guard let p = _player, _trackIndex < _trackUrls.count else { return }+ let url = _trackUrls[_trackIndex]+ var options: [String: Any] = [:]+ if !_trackHeaders.isEmpty {+ options["AVURLAssetHTTPHeaderFieldsKey"] = _trackHeaders+ }+ let asset = AVURLAsset(url: url, options: options)+ let item = AVPlayerItem(asset: asset)+ p.replaceCurrentItem(with: item)+ if localSeconds > 0 {+ p.seek(to: CMTime(seconds: localSeconds, preferredTimescale: 1000))+ }+ observeItemEnd(item)+ addPeriodicObserver(player: p)+ emit("[NativeCore] loadCurrentTrack: idx=\(_trackIndex) url=\(url) localSeek=\(localSeconds)s")+ }++ private func trackIndexForGlobal(_ globalSeconds: Double, offsets: [Double]) -> Int {+ if globalSeconds <= 0 { return 0 }+ // offsets is [0, dur0, dur0+dur1, ..., total]. Find largest index i+ // where offsets[i] <= globalSeconds. Number of tracks = offsets.count - 1+ // so result must be in [0, offsets.count - 2].+ let trackCount = max(1, offsets.count - 1)+ for i in 0..<trackCount {+ let nextOffset = i + 1 < offsets.count ? offsets[i + 1] : .greatestFiniteMagnitude+ if globalSeconds < nextOffset {+ return i+ }+ }+ return trackCount - 1+ }++ /// Compute global position = trackOffset + position-within-current-track.+ /// Returns 0 if state hasn't loaded.+ private func globalPosition() -> Double {+ guard let p = _player else { return 0 }+ let local = p.currentTime().seconds+ guard local.isFinite else { return _trackOffsets.indices.contains(_trackIndex) ? _trackOffsets[_trackIndex] : 0 }+ let baseOffset = _trackOffsets.indices.contains(_trackIndex) ? _trackOffsets[_trackIndex] : 0+ return baseOffset + local+ }++ private func totalDuration() -> Double {let defaults = UserDefaults(suiteName: Self.appGroup)let stashed = defaults?.double(forKey: "np_total_s") ?? 0if stashed > 0 { return stashed }- if let dur = _player?.currentItem?.duration.seconds, dur.isFinite, dur > 0 {- return dur+ return _trackOffsets.last ?? 0+ }++ private func seekToGlobal(_ globalSeconds: Double) {+ guard !_trackOffsets.isEmpty else { return }+ let targetIndex = trackIndexForGlobal(globalSeconds, offsets: _trackOffsets)+ let localTarget = max(0, globalSeconds - _trackOffsets[targetIndex])++ if targetIndex == _trackIndex {+ // Same track, simple seek.+ _player?.seek(+ to: CMTime(seconds: localTarget, preferredTimescale: 1000),+ toleranceBefore: .zero, toleranceAfter: .zero+ ) { [weak self] _ in+ self?.queue.async {+ self?.savePosition()+ self?.updateNowPlayingInfo(rate: Double(self?._player?.rate ?? 0))+ self?.emit("[NativeCore] seekToGlobal in-track: \(globalSeconds)s")+ }+ }+ } else {+ // Cross-track seek: load the new track, then seek inside it.+ let wasPlaying = (_player?.rate ?? 0) > 0+ _trackIndex = targetIndex+ loadCurrentTrack(seekTo: localTarget)+ if wasPlaying {+ _player?.play()+ applySpeed(to: _player!)+ }+ savePosition()+ updateNowPlayingInfo(rate: Double(_player?.rate ?? 0))+ emit("[NativeCore] seekToGlobal cross-track: \(globalSeconds)s -> idx=\(targetIndex) local=\(localTarget)s")}- return 0}private func applySpeed(to player: AVPlayer) {@@ -223,15 +341,6 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Senplayer.rate = Float(speed > 0 ? speed : 1.0)}- private func seekInternal(to seconds: Double) {- guard let p = _player else { return }- p.seek(to: CMTime(seconds: seconds, preferredTimescale: 1000),- toleranceBefore: .zero, toleranceAfter: .zero) { [weak self] _ in- self?.savePosition()- self?.updateNowPlayingInfo(rate: Double(p.rate))- }- }-private func observeItemEnd(_ item: AVPlayerItem) {if let prev = _itemEndObserver {NotificationCenter.default.removeObserver(prev)@@ -242,13 +351,33 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Senqueue: nil) { [weak self] _ inself?.queue.async {- self?.emit("[NativeCore] AVPlayerItem reached end")- self?.savePosition()- self?.updateNowPlayingInfo(rate: 0)+ self?.handleTrackEnd()}}}+ private func handleTrackEnd() {+ let nextIndex = _trackIndex + 1+ if nextIndex < _trackUrls.count {+ emit("[NativeCore] track \(_trackIndex) ended, advancing to \(nextIndex)")+ _trackIndex = nextIndex+ loadCurrentTrack(seekTo: 0)+ let wasPlaying = (_player?.rate ?? 0) > 0+ if wasPlaying {+ _player?.play()+ if let p = _player { applySpeed(to: p) }+ }+ savePosition()+ updateNowPlayingInfo(rate: Double(_player?.rate ?? 0))+ } else {+ emit("[NativeCore] last track ended, stopping")+ savePosition()+ pushProgressToServer()+ stopServerSyncTimer()+ updateNowPlayingInfo(rate: 0)+ }+ }+private func addPeriodicObserver(player: AVPlayer) {if let prev = _periodicObserver {player.removeTimeObserver(prev)@@ -261,8 +390,6 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Sen}}- /// Activate the playback audio session so AVPlayer actually produces- /// sound. Belt-and-suspenders alongside the widget's own activation.private func activateAudioSession() {let session = AVAudioSession.sharedInstance()do {@@ -274,28 +401,89 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Sen}private func savePosition() {- guard let p = _player else { return }- let pos = p.currentTime().seconds+ let pos = globalPosition()if !pos.isFinite { return }let defaults = UserDefaults(suiteName: Self.appGroup)defaults?.set(pos, forKey: "np_position_s")- defaults?.set(p.rate > 0, forKey: "widget_is_playing")+ defaults?.set((_player?.rate ?? 0) > 0, forKey: "widget_is_playing")+ }++ // MARK: - Server sync++ private func startServerSyncTimer() {+ DispatchQueue.main.async { [weak self] in+ self?._serverSyncTimer?.invalidate()+ self?._serverSyncTimer = Timer.scheduledTimer(+ withTimeInterval: Self.serverSyncIntervalSec,+ repeats: true+ ) { _ in+ self?.queue.async { self?.pushProgressToServer() }+ }+ self?.emit("[NativeCore] server sync timer started (\(Int(Self.serverSyncIntervalSec))s)")+ }+ }++ private func stopServerSyncTimer() {+ DispatchQueue.main.async { [weak self] in+ self?._serverSyncTimer?.invalidate()+ self?._serverSyncTimer = nil+ }}- private func startPositionTimer() {- // Periodic time observer already saves position every 5s. Keeping this- // method as a no-op for symmetry with the previous AVAudioPlayer-based- // version; callers don't need to know which mechanism we're using.+ /// PATCH /api/me/progress/{itemId} so other clients (and the user's own+ /// app on relaunch) see the right position. Best-effort - no retry on+ /// failure since we'll try again on the next 60s tick.+ private func pushProgressToServer() {+ let defaults = UserDefaults(suiteName: Self.appGroup)+ guard let itemId = _currentItemId,+ let serverUrl = defaults?.string(forKey: "np_server_url"),+ let token = defaults?.string(forKey: "np_api_token"),+ !token.isEmpty+ else {+ emit("[NativeCore] pushProgressToServer: missing itemId/server/token")+ return+ }+ let pos = globalPosition()+ let cleanBase = serverUrl.hasSuffix("/")+ ? String(serverUrl.dropLast())+ : serverUrl+ let progressKey: String+ if let ep = _currentEpisodeId, !ep.isEmpty {+ progressKey = "\(itemId)-\(ep)"+ } else {+ progressKey = itemId+ }+ guard let url = URL(string: "\(cleanBase)/api/me/progress/\(progressKey)") else {+ emit("[NativeCore] pushProgressToServer: bad URL for \(progressKey)")+ return+ }++ var req = URLRequest(url: url)+ req.httpMethod = "PATCH"+ req.setValue("application/json", forHTTPHeaderField: "Content-Type")+ req.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")+ if let headersJson = defaults?.string(forKey: "np_stream_headers_json"),+ let headersData = headersJson.data(using: .utf8),+ let headers = try? JSONSerialization.jsonObject(with: headersData) as? [String: String] {+ for (k, v) in headers { req.setValue(v, forHTTPHeaderField: k) }+ }+ let body: [String: Any] = ["currentTime": pos]+ req.httpBody = try? JSONSerialization.data(withJSONObject: body)++ URLSession.shared.dataTask(with: req) { [weak self] _, response, error in+ let status = (response as? HTTPURLResponse)?.statusCode ?? -1+ if let error = error {+ self?.emit("[NativeCore] server sync error: \(error.localizedDescription)")+ } else {+ self?.emit("[NativeCore] server sync \(progressKey) currentTime=\(pos) status=\(status)")+ }+ }.resume()}// MARK: - MPNowPlayingInfoCenter- /// Push title / author / artwork / duration / elapsed / rate to the- /// system "Now Playing" so lock screen, Control Center, CarPlay, AirPods- /// long-press menu etc. all show what we're playing and let the user- /// pause/scrub from those surfaces.private func updateNowPlayingInfo(rate: Double) {- guard let p = _player else { return }+ guard _player != nil else { return }let defaults = UserDefaults(suiteName: Self.appGroup)let title = defaults?.string(forKey: "np_title")?? defaults?.string(forKey: "widget_title")@@ -305,8 +493,8 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Sen?? ""let coverPath = defaults?.string(forKey: "np_cover_path")?? defaults?.string(forKey: "widget_cover_path")- let duration = currentDuration()- let elapsed = p.currentTime().seconds.isFinite ? p.currentTime().seconds : 0+ let duration = totalDuration()+ let elapsed = globalPosition()var info: [String: Any] = [MPMediaItemPropertyTitle: title,@@ -327,25 +515,37 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Sen// MARK: - MPRemoteCommandCenter- /// Wire up lock screen / Control Center / AirPods / CarPlay remote- /// commands once. Each handler bounces back through the public- /// play/pause/skip API so flutter-alive coordination still applies.private func configureRemoteCommandsIfNeeded() {if _commandsConfigured { return }_commandsConfigured = truelet cc = MPRemoteCommandCenter.shared()+ // Each handler bails when Flutter is alive so audio_service handlers+ // win on the lock screen. When native is in charge, these drive the+ // AVPlayer directly.cc.playCommand.addTarget { [weak self] _ in+ if self?.flutterIsAlive() == true {+ self?.emit("[NativeCore] remote: play - Flutter is alive, deferring")+ return .success+ }self?.emit("[NativeCore] remote: play")self?.play()return .success}cc.pauseCommand.addTarget { [weak self] _ in+ if self?.flutterIsAlive() == true {+ self?.emit("[NativeCore] remote: pause - Flutter is alive, deferring")+ return .success+ }self?.emit("[NativeCore] remote: pause")self?.pause()return .success}cc.togglePlayPauseCommand.addTarget { [weak self] _ in+ if self?.flutterIsAlive() == true {+ self?.emit("[NativeCore] remote: toggle - Flutter is alive, deferring")+ return .success+ }self?.emit("[NativeCore] remote: toggle")self?.toggle()return .success@@ -354,12 +554,20 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Sencc.skipForwardCommand.preferredIntervals = [30]cc.skipForwardCommand.addTarget { [weak self] event inlet interval = (event as? MPSkipIntervalCommandEvent)?.interval ?? 30+ if self?.flutterIsAlive() == true {+ self?.emit("[NativeCore] remote: skipForward - Flutter is alive, deferring")+ return .success+ }self?.skipForward(seconds: Int(interval))return .success}cc.skipBackwardCommand.preferredIntervals = [10]cc.skipBackwardCommand.addTarget { [weak self] event inlet interval = (event as? MPSkipIntervalCommandEvent)?.interval ?? 10+ if self?.flutterIsAlive() == true {+ self?.emit("[NativeCore] remote: skipBackward - Flutter is alive, deferring")+ return .success+ }self?.skipBackward(seconds: Int(interval))return .success}@@ -368,12 +576,14 @@ final class AbsorbPlayerCore: NSObject, AbsorbPlayerCoreProtocol, @unchecked Senguard let event = event as? MPChangePlaybackPositionCommandEvent else {return .commandFailed}- self?.queue.async {- self?.seekInternal(to: event.positionTime)+ if self?.flutterIsAlive() == true {+ self?.emit("[NativeCore] remote: scrub - Flutter is alive, deferring")+ return .success}+ self?.queue.async { self?.seekToGlobal(event.positionTime) }return .success}- emit("[NativeCore] Remote command center wired")+ emit("[NativeCore] remote command center wired")}// MARK: - Loggingdiff --git a/lib/services/audio_player_service.dart b/lib/services/audio_player_service.dartindex 6a866ba6..b580e661 100644--- a/lib/services/audio_player_service.dart+++ b/lib/services/audio_player_service.dart@@ -821,6 +821,7 @@ class AudioPlayerService extends ChangeNotifier {// For ConcatenatingAudioSource, _player.position is track-relative.// We store cumulative start offsets so we can compute absolute book position.List<double> _trackStartOffsets = []; // [0, dur0, dur0+dur1, ...]+ List<double> get trackStartOffsets => _trackStartOffsets;int _currentTrackIndex = 0;int _lastNotifiedChapterIndex = -1;int _lastChapterCheckSec = -1;diff --git a/lib/services/home_widget_service.dart b/lib/services/home_widget_service.dartindex 7a5fa73e..0c5cc262 100644--- a/lib/services/home_widget_service.dart+++ b/lib/services/home_widget_service.dart@@ -461,6 +461,21 @@ class HomeWidgetService {await HomeWidget.saveWidgetData<String>('np_stream_headers_json', jsonEncode(player.activeStreamHeaders));+ // Multi-track support: cumulative track start offsets so the native+ // core can figure out which track contains a given absolute position+ // (e.g. saved-position 4500s in a 3-file book might fall in track 2).+ await HomeWidget.saveWidgetData<String>(+ 'np_track_offsets_json', jsonEncode(player.trackStartOffsets));++ // Server URL + API token so the native core can push progress updates+ // directly to ABS while Flutter is dead. Lets users listen for hours+ // via the widget without their server progress falling behind.+ final api = player.currentApi;+ if (api != null) {+ await HomeWidget.saveWidgetData<String>('np_server_url', api.baseUrl);+ await HomeWidget.saveWidgetData<String>('np_api_token', api.token);+ }+// Cover path piggybacks on the existing widget_cover_path entry, but// expose it under the np_ namespace too for clarity on the native side.final coverPath = await HomeWidget.getWidgetData<String>('widget_cover_path');@@ -471,6 +486,13 @@ class HomeWidgetService {'np_title', player.currentTitle ?? '');await HomeWidget.saveWidgetData<String>('np_author', player.currentAuthor ?? '');++ debugPrint('[WidgetDebug] [NativeCore] Stashed: item=$itemId ep=${player.currentEpisodeId} '+ 'pos=${posSec.toStringAsFixed(1)}s tot=${player.totalDuration.toStringAsFixed(0)}s '+ 'speed=${player.speed} dl=${paths.isNotEmpty} '+ 'streams=${player.activeStreamUrls.length} '+ 'tracks=${player.trackStartOffsets.length} '+ 'server=${api?.baseUrl ?? "none"}');}Future<void> _updateAllWidgets() async {