react-native-audio-browser 0.2.0-next.8 → 0.2.0

package/ios/Model/NitroTypeStubs.swift

@@ -1,303 +1,228 @@
 #if !canImport(NitroModules)
-  /// Lightweight stand-ins for NitroModules types used by the testable target.
-  /// Only compiled when NitroModules is unavailable (SPM test builds).
-  ///
-  /// These stubs declare `Equatable` for test ergonomics — the generated
-  /// Nitro types do NOT. Shared `ios/` sources must not rely on conformances
-  /// that exist only here: `swift test` compiles, the app build breaks.
-
-  struct ArtworkVariants: Equatable {
-    var light: String
-    var dark: String
-  }
-
-  @frozen enum Variant_String_ArtworkVariants {
-    case first(String)
-    case second(ArtworkVariants)
-  }
-
-  struct TrackRequest: Equatable {
-    var userAgent: String?
-    var headers: [String: String]?
-    var query: [String: String]?
-  }
-
-  struct Track: Equatable {
-    var id: String
-    var url: String?
-    var src: String?
-    var request: TrackRequest?
-    var title: String = ""
-    var artist: String?
-    var albumUrl: String?
-    var album: String?
-    var live: Bool?
-    var artwork: Variant_String_ArtworkVariants?
-    var artworkSource: ImageSource?
-    var groupTitle: String?
-    var imageRow: [ImageRowItem]?
-  }
-
-  struct TrackLoadEvent {
-    var track: Track
-    var queue: [Track]
-    var startIndex: Double
-  }
-
-  enum RepeatMode {
-    case off
-    case track
-    case queue
-  }
-
-  enum CarPlaySiriListButtonPosition {
-    case top
-    case bottom
-
-    init?(fromString string: String) {
-      switch string {
-      case "top": self = .top
-      case "bottom": self = .bottom
-      default: return nil
-      }
-    }
-  }
-
-  struct ImageSource: Equatable {
-    var uri: String
-    var method: String?
-    var headers: [String: String]?
-    var body: String?
-  }
-
-  enum TrackStyle {
-    case list
-    case grid
-
-    init?(fromString string: String) {
-      switch string {
-      case "list": self = .list
-      case "grid": self = .grid
-      default: return nil
-      }
-    }
-  }
-
-  struct ImageRowItem: Equatable {
-    var id: String?
-    var url: String?
-    var src: String?
-    var artwork: String?
-    var artworkSource: ImageSource?
-    var title: String
-  }
-
-  struct ResolvedTrack: Equatable {
-    var url: String
-    var children: [Track]?
-    var carPlaySiriListButton: CarPlaySiriListButtonPosition?
-    var id: String?
-    var src: String?
-    var artwork: Variant_String_ArtworkVariants?
-    var artworkSource: ImageSource?
-    var request: TrackRequest?
-    var artworkCarPlayTinted: Bool?
-    var title: String
-    var subtitle: String?
-    var artist: String?
-    var albumUrl: String?
-    var album: String?
-    var description: String?
-    var genre: String?
-    var duration: Double?
-    var style: TrackStyle?
-    var childrenStyle: TrackStyle?
-    var favorited: Bool?
-    var groupTitle: String?
-    var live: Bool?
-    var imageRow: [ImageRowItem]?
-  }
-
-  enum PlaybackState: Equatable {
-    case none
-    case ready
-    case playing
-    case paused
-    case stopped
-    case loading
-    case buffering
-    case error
-    case ended
-  }
-
-  struct TrackMetadata: Equatable {
-    var title: String?
-    var artist: String?
-    var albumTitle: String?
-    var subtitle: String?
-    var description: String?
-    var artworkUri: String?
-    var trackNumber: String?
-    var composer: String?
-    var conductor: String?
-    var genre: String?
-    var compilation: String?
-    var station: String?
-    var mediaType: String?
-    var creationDate: String?
-    var creationYear: String?
-    var url: String?
-
-    init(
-      title: String? = nil, artist: String? = nil, albumTitle: String? = nil,
-      subtitle: String? = nil, description: String? = nil, artworkUri: String? = nil,
-      trackNumber: String? = nil, composer: String? = nil, conductor: String? = nil,
-      genre: String? = nil, compilation: String? = nil, station: String? = nil,
-      mediaType: String? = nil, creationDate: String? = nil, creationYear: String? = nil,
-      url: String? = nil,
-    ) {
-      self.title = title
-      self.artist = artist
-      self.albumTitle = albumTitle
-      self.subtitle = subtitle
-      self.description = description
-      self.artworkUri = artworkUri
-      self.trackNumber = trackNumber
-      self.composer = composer
-      self.conductor = conductor
-      self.genre = genre
-      self.compilation = compilation
-      self.station = station
-      self.mediaType = mediaType
-      self.creationDate = creationDate
-      self.creationYear = creationYear
-      self.url = url
+/// Lightweight stand-ins for NitroModules types used by the testable target.
+/// Only compiled when NitroModules is unavailable (SPM test builds).
+
+struct Track: Equatable {
+  var id: String
+  var url: String? = nil
+  var src: String? = nil
+  var title: String = ""
+  var artist: String? = nil
+  var album: String? = nil
+  var live: Bool? = nil
+}
+
+struct TrackLoadEvent {
+  var track: Track
+  var queue: [Track]
+  var startIndex: Double
+}
+
+enum RepeatMode {
+  case off
+  case track
+  case queue
+}
+
+enum CarPlaySiriListButtonPosition {
+  case top
+  case bottom
+}
+
+struct ImageSource: Equatable {
+  var uri: String
+  var method: String? = nil
+  var headers: [String: String]? = nil
+  var body: String? = nil
+}
+
+enum TrackStyle {
+  case list
+  case grid
+}
+
+struct ImageRowItem: Equatable {
+  var url: String? = nil
+  var artwork: String? = nil
+  var artworkSource: ImageSource? = nil
+  var title: String
+}
+
+struct ResolvedTrack: Equatable {
+  var url: String
+  var children: [Track]? = nil
+  var carPlaySiriListButton: CarPlaySiriListButtonPosition? = nil
+  var src: String? = nil
+  var artwork: String? = nil
+  var artworkSource: ImageSource? = nil
+  var artworkCarPlayTinted: Bool? = nil
+  var title: String
+  var subtitle: String? = nil
+  var artist: String? = nil
+  var album: String? = nil
+  var description: String? = nil
+  var genre: String? = nil
+  var duration: Double? = nil
+  var style: TrackStyle? = nil
+  var childrenStyle: TrackStyle? = nil
+  var favorited: Bool? = nil
+  var groupTitle: String? = nil
+  var live: Bool? = nil
+  var imageRow: [ImageRowItem]? = nil
+}
+
+enum PlaybackState: Equatable {
+  case none
+  case ready
+  case playing
+  case paused
+  case stopped
+  case loading
+  case buffering
+  case error
+  case ended
+}
+
+struct TrackMetadata: Equatable {
+  var title: String?
+  var artist: String?
+  var albumTitle: String?
+  var subtitle: String?
+  var description: String?
+  var artworkUri: String?
+  var trackNumber: String?
+  var composer: String?
+  var conductor: String?
+  var genre: String?
+  var compilation: String?
+  var station: String?
+  var mediaType: String?
+  var creationDate: String?
+  var creationYear: String?
+  var url: String?
+
+  init(
+    title: String? = nil, artist: String? = nil, albumTitle: String? = nil,
+    subtitle: String? = nil, description: String? = nil, artworkUri: String? = nil,
+    trackNumber: String? = nil, composer: String? = nil, conductor: String? = nil,
+    genre: String? = nil, compilation: String? = nil, station: String? = nil,
+    mediaType: String? = nil, creationDate: String? = nil, creationYear: String? = nil,
+    url: String? = nil
+  ) {
+    self.title = title
+    self.artist = artist
+    self.albumTitle = albumTitle
+    self.subtitle = subtitle
+    self.description = description
+    self.artworkUri = artworkUri
+    self.trackNumber = trackNumber
+    self.composer = composer
+    self.conductor = conductor
+    self.genre = genre
+    self.compilation = compilation
+    self.station = station
+    self.mediaType = mediaType
+    self.creationDate = creationDate
+    self.creationYear = creationYear
+    self.url = url
+  }
+}
+
+struct TimedMetadata: Equatable {
+  var title: String?
+  var artist: String?
+  var album: String?
+  var date: String?
+  var genre: String?
+
+  init(
+    title: String? = nil, artist: String? = nil, album: String? = nil,
+    date: String? = nil, genre: String? = nil
+  ) {
+    self.title = title
+    self.artist = artist
+    self.album = album
+    self.date = date
+    self.genre = genre
+  }
+}
+
+struct ChapterMetadata: Equatable {
+  var startTime: Double
+  var endTime: Double
+  var title: String?
+  var url: String?
+
+  init(startTime: Double, endTime: Double, title: String? = nil, url: String? = nil) {
+    self.startTime = startTime
+    self.endTime = endTime
+    self.title = title
+    self.url = url
+  }
+}
+
+// MARK: - Playback Event Types (used by PlaybackCoordinator)
+
+struct PlaybackError: Equatable {
+  var code: String
+  var message: String
+}
+
+struct Playback: Equatable {
+  var state: PlaybackState
+  var error: PlaybackError?
+}
+
+struct PlaybackErrorEvent {
+  var error: PlaybackError?
+}
+
+struct PlaybackActiveTrackChangedEvent {
+  var lastIndex: Double?
+  var lastTrack: Track?
+  var lastPosition: Double
+  var index: Double?
+  var track: Track?
+}
+
+struct PlaybackProgressUpdatedEvent {
+  var track: Double
+  var position: Double
+  var duration: Double
+  var buffered: Double
+}
+
+struct PlayingState: Equatable {
+  var playing: Bool
+  var buffering: Bool
+}
+
+struct PlaybackQueueEndedEvent {
+  var track: Double
+  var position: Double
+}
+
+struct RepeatModeChangedEvent {
+  var repeatMode: RepeatMode
+}
+
+// MARK: - TrackPlayerError.PlaybackError Nitro Conversion Stub
+
+extension TrackPlayerError.PlaybackError {
+  func toNitroError() -> PlaybackError {
+    let code = switch self {
+    case .failedToLoadKeyValue:
+      "failed_to_load"
+    case .invalidSourceUrl:
+      "invalid_source_url"
+    case .notConnectedToInternet:
+      "not_connected_to_internet"
+    case .playbackFailed:
+      "playback_failed"
+    case .trackWasUnplayable:
+      "track_unplayable"
     }
+    return PlaybackError(code: code, message: errorDescription ?? "Unknown error")
   }
-
-  struct TimedMetadata: Equatable {
-    var title: String?
-    var artist: String?
-    var album: String?
-    var date: String?
-    var genre: String?
-
-    init(
-      title: String? = nil, artist: String? = nil, album: String? = nil,
-      date: String? = nil, genre: String? = nil,
-    ) {
-      self.title = title
-      self.artist = artist
-      self.album = album
-      self.date = date
-      self.genre = genre
-    }
-  }
-
-  struct ChapterMetadata: Equatable {
-    var startTime: Double
-    var endTime: Double
-    var title: String?
-    var url: String?
-
-    init(startTime: Double, endTime: Double, title: String? = nil, url: String? = nil) {
-      self.startTime = startTime
-      self.endTime = endTime
-      self.title = title
-      self.url = url
-    }
-  }
-
-  // MARK: - Playback Event Types (used by PlaybackCoordinator)
-
-  /// Public to match the generated Nitro enum, which `TrackPlayerError`
-  /// exposes from a public property.
-  public enum PlaybackErrorKind {
-    case offline
-    case unreachable
-    case notFound
-    case rejected
-    case serverError
-    case unplayable
-    case stalled
-    case unknown
-  }
-
-  struct RetryConfig {
-    var maxRetries: Double?
-    var maxRetryDurationMs: Double?
-    var firstConnectMaxRetryDurationMs: Double?
-  }
-
-  @frozen enum Variant_Bool_RetryConfig {
-    case first(Bool)
-    case second(RetryConfig)
-  }
-
-  struct PlaybackError: Equatable {
-    var kind: PlaybackErrorKind
-    var code: String
-    var message: String
-    var statusCode: Double?
-    var retrying: Bool?
-  }
-
-  struct Playback: Equatable {
-    var state: PlaybackState
-    var error: PlaybackError?
-  }
-
-  struct PlaybackErrorEvent {
-    var error: PlaybackError?
-  }
-
-  struct PlaybackActiveTrackChangedEvent {
-    var lastIndex: Double?
-    var lastTrack: Track?
-    var lastPosition: Double
-    var index: Double?
-    var track: Track?
-  }
-
-  struct PlaybackProgressUpdatedEvent {
-    var track: Double
-    var position: Double
-    var duration: Double
-    var buffered: Double
-  }
-
-  struct PlayingState: Equatable {
-    var playing: Bool
-    var buffering: Bool
-  }
-
-  struct PlaybackQueueEndedEvent {
-    var track: Double
-    var position: Double
-  }
-
-  struct RepeatModeChangedEvent {
-    var repeatMode: RepeatMode
-  }
-
-  // MARK: - Sleep Timer Variant Stubs
-
-  enum NullType: Equatable {
-    case null
-  }
-
-  struct SleepTimerTime: Equatable {
-    var time: Double
-  }
-
-  struct SleepTimerEndOfTrack: Equatable {
-    var sleepWhenPlayedToEnd: Bool
-  }
-
-  indirect enum SleepTimer: Equatable {
-    case first(NullType)
-    case second(SleepTimerTime)
-    case third(SleepTimerEndOfTrack)
-  }
-
+}
 #endif

package/ios/Model/PlayerUpdateOptions.swift

@@ -23,15 +23,12 @@ class PlayerUpdateOptions {
     shuffleMode: nil, repeatMode: nil, playbackRate: nil,
   )
 
+  /// Repeat mode
+  var repeatMode: RepeatMode = .off
+
   /// Supported playback rates for the playback-rate capability
   var playbackRates: [Double] = [0.5, 1.0, 1.5, 2.0]
 
-  /// Enable the "Up Next" button on the CarPlay Now Playing screen
-  var carPlayUpNextButton: Bool = true
-
-  /// Custom buttons for the CarPlay Now Playing screen
-  var carPlayNowPlayingButtons: [CarPlayNowPlayingButton] = []
-
   // MARK: - Initialization
 
   init() {}
@@ -63,21 +60,13 @@ class PlayerUpdateOptions {
       capabilities = mergeCapabilities(existing: capabilities, incoming: caps)
     }
 
-    // Update iOS player-UI options (nested under `ios` on the wire)
-    if let ios = options.ios {
-      if let rates = ios.playbackRates {
-        playbackRates = rates
-      }
-      if let upNext = ios.carPlayUpNextButton {
-        carPlayUpNextButton = upNext
-      }
-      if let buttons = ios.carPlayNowPlayingButtons {
-        carPlayNowPlayingButtons = buttons
-      }
+    // Update playback rates
+    if let rates = options.iosPlaybackRates {
+      playbackRates = rates
     }
   }
 
-  /// The resolved options in their wire shape (what getOptions/onOptionsChanged report).
+  /// Convert to Nitro Options struct (full options with all required fields)
   func toOptions() -> Options {
     // Convert Double? to Variant_NullType_Double?
     let progressInterval: Variant_NullType_Double? = progressUpdateEventInterval.map { .second($0) }
@@ -88,11 +77,22 @@ class PlayerUpdateOptions {
       backwardJumpInterval: backwardJumpInterval,
       progressUpdateEventInterval: progressInterval,
       capabilities: capabilities,
-      ios: IOSOptions(
-        playbackRates: playbackRates,
-        carPlayUpNextButton: carPlayUpNextButton,
-        carPlayNowPlayingButtons: carPlayNowPlayingButtons,
-      ),
+      repeatMode: repeatMode,
+    )
+  }
+
+  /// Convert to Nitro UpdateOptions struct (partial options for getOptions())
+  func toUpdateOptions() -> UpdateOptions {
+    // Convert Double? to Variant_NullType_Double?
+    let progressInterval: Variant_NullType_Double? = progressUpdateEventInterval.map { .second($0) }
+
+    return UpdateOptions(
+      android: nil,
+      forwardJumpInterval: forwardJumpInterval,
+      backwardJumpInterval: backwardJumpInterval,
+      progressUpdateEventInterval: progressInterval,
+      capabilities: capabilities,
+      iosPlaybackRates: playbackRates,
     )
   }
 

package/ios/Model/RemoteCommand.swift

@@ -1,10 +1,6 @@
 import Foundation
 
-// Internal on purpose: nothing outside the module uses this, and a public
-// declaration gets printed into the generated -Swift.h C++ interop section,
-// where the [NSNumber] associated values don't compile for plain-C++
-// consumers of the header (Xcode 26.2 / Swift 6.2).
-enum RemoteCommand: CustomStringConvertible, Equatable {
+public enum RemoteCommand: CustomStringConvertible, Equatable {
   case play
 
   case pause
@@ -23,13 +19,15 @@ enum RemoteCommand: CustomStringConvertible, Equatable {
 
   case skipBackward(preferredIntervals: [NSNumber])
 
+  case like(isActive: Bool, localizedTitle: String, localizedShortTitle: String)
+
   case changeRepeatMode
 
   case changeShuffleMode
 
   case changePlaybackRate(supportedPlaybackRates: [NSNumber])
 
-  var description: String {
+  public var description: String {
     switch self {
     case .play: "play"
     case .pause: "pause"
@@ -40,6 +38,7 @@ enum RemoteCommand: CustomStringConvertible, Equatable {
     case .changePlaybackPosition: "changePlaybackPosition"
     case .skipForward: "skipForward"
     case .skipBackward: "skipBackward"
+    case .like: "like"
     case .changeRepeatMode: "changeRepeatMode"
     case .changeShuffleMode: "changeShuffleMode"
     case .changePlaybackRate: "changePlaybackRate"
@@ -48,24 +47,6 @@ enum RemoteCommand: CustomStringConvertible, Equatable {
 
   var key: String { description }
 
-  /**
-   Commands in `self` that are absent from `next` and so should be disabled.
-
-   Compared by `key`, not by `==`. `RemoteCommand` is `Equatable` including its
-   associated values, but every case with associated values maps onto a single
-   `MPRemoteCommand` addressed by `key`: `.skipForward([15])` and
-   `.skipForward([30])` are two different values of one command. Diffing by `==`
-   would report the old interval as removed and disable the command that the new
-   interval had just re-enabled.
-   */
-  static func commandsToDisable(
-    enabled: [RemoteCommand],
-    replacedBy next: [RemoteCommand],
-  ) -> [RemoteCommand] {
-    let nextKeys = Set(next.map(\.key))
-    return enabled.filter { !nextKeys.contains($0.key) }
-  }
-
   /**
    All values in an array for convenience.
    Don't use for associated values.
@@ -81,6 +62,7 @@ enum RemoteCommand: CustomStringConvertible, Equatable {
       .changePlaybackPosition,
       .skipForward(preferredIntervals: []),
       .skipBackward(preferredIntervals: []),
+      .like(isActive: false, localizedTitle: "", localizedShortTitle: ""),
       .changeRepeatMode,
       .changeShuffleMode,
       .changePlaybackRate(supportedPlaybackRates: []),