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

package/ios/CarPlay/RNABMediaIntentHandler.swift

@@ -2,69 +2,59 @@ import Foundation
 import Intents
 import os.log
 
-/// In-app INPlayMediaIntent handler (Siri / CarPlay voice). Internal so Intents
-/// types stay out of the generated header; exposed to the ObjC runtime via
-/// `@objc(RNABMediaIntentHandler)` and vended from `RNABAudioBrowser.handlerForIntent(_:)`.
+/// Handles INPlayMediaIntent for Siri voice search (e.g. from CarPlay).
+///
+/// The class is internal (not public) to avoid exposing Intents types in the
+/// generated AudioBrowser-Swift.h header, but is registered with the ObjC
+/// runtime via `@objc(RNABMediaIntentHandler)` for NSClassFromString lookup.
+///
+/// Host apps call the static method from `application(_:handle:completionHandler:)`:
+/// ```swift
+/// @objc private protocol RNABMediaIntentHandling {
+///   static func handleMediaIntent(_ intent: INIntent, completionHandler: @escaping (INIntentResponse) -> Void)
+/// }
+///
+/// func application(_ application: UIApplication, handle intent: INIntent, completionHandler: @escaping (INIntentResponse) -> Void) {
+///   (NSClassFromString("RNABMediaIntentHandler") as? RNABMediaIntentHandling.Type)?
+///     .handleMediaIntent(intent, completionHandler: completionHandler)
+/// }
+/// ```
 @objc(RNABMediaIntentHandler)
 class RNABMediaIntentHandler: NSObject, INPlayMediaIntentHandling {
   private static let logger = Logger(subsystem: "com.audiobrowser", category: "MediaIntentHandler")
 
-  // MARK: - INPlayMediaIntentHandling
-
-  func handle(intent: INPlayMediaIntent, completion: @escaping @Sendable (INPlayMediaIntentResponse) -> Void) {
-    let s = intent.mediaSearch
-    let criteria = MediaIntentCriteria.from(
-      mediaName: s?.mediaName,
-      genreNames: s?.genreNames ?? [],
-      artistName: s?.artistName,
-      albumName: s?.albumName,
-      mediaTypeMode: Self.mediaTypeMode(s?.mediaType ?? .unknown),
-      reference: Self.reference(s?.reference ?? .unknown),
-      hasMediaType: (s?.mediaType ?? .unknown) != .unknown,
-      appName: Self.hostAppName(),
-    )
-    Self.logger.info("Play media intent — query=\(criteria.query) matchesApp=\(criteria.matchesAppName) resume=\(criteria.isResume)")
+  // MARK: - Static Entry Point
 
-    // Static + gate-waiting, so it works even before the shared instance exists
-    // (background intent launch, RN not booted yet).
-    HybridAudioBrowser.handlePlayMediaIntent(criteria: criteria) { success in
-      completion(INPlayMediaIntentResponse(code: success ? .success : .failure, userActivity: nil))
+  /// Convenience entry point for host apps. Handles the full INPlayMediaIntent flow:
+  /// type checking, search, queue, and playback.
+  @objc static func handleMediaIntent(_ intent: INIntent, completionHandler: @escaping @Sendable (INIntentResponse) -> Void) {
+    guard let playIntent = intent as? INPlayMediaIntent else {
+      completionHandler(INPlayMediaIntentResponse(code: .failure, userActivity: nil))
+      return
     }
-  }
-
-  /// Collapse `INMediaItemType` to a `SearchMode` string (the container
-  /// vertical), or nil for filter-only / unclassified types. `genre`/`artist`/
-  /// `album` are filters, not verticals — they yield no mode.
-  private static func mediaTypeMode(_ type: INMediaItemType) -> String? {
-    switch type {
-    case .station, .radioStation, .algorithmicRadioStation, .musicStation: "station"
-    case .podcastShow, .podcastEpisode, .podcastPlaylist, .podcastStation: "podcast"
-    case .audioBook: "audiobook"
-    case .news: "news"
-    case .music: "music"
-    case .song: "song"
-    case .playlist: "playlist"
-    case .musicVideo: "music-video"
-    case .movie: "movie"
-    case .tvShow: "tv-show"
-    case .tvShowEpisode: "tv-show-episode"
-    default: nil // album/artist/genre/unknown
+    let handler = RNABMediaIntentHandler()
+    handler.handle(intent: playIntent) { response in
+      completionHandler(response)
     }
   }
 
-  /// Map the SiriKit reference to the pure criteria enum. `.currentlyPlaying`
-  /// routes to native resume; `.my` to the consumer; everything else is unknown.
-  private static func reference(_ ref: INMediaReference) -> MediaIntentCriteria.Reference {
-    switch ref {
-    case .currentlyPlaying: .currentlyPlaying
-    case .my: .my
-    default: .unknown
+  // MARK: - INPlayMediaIntentHandling
+
+  func handle(intent: INPlayMediaIntent, completion: @escaping @Sendable (INPlayMediaIntentResponse) -> Void) {
+    let searchTerm = intent.mediaSearch?.mediaName ?? ""
+    Self.logger.info("Handling play media intent with search term: \(searchTerm)")
+
+    guard let browser = HybridAudioBrowser.shared else {
+      Self.logger.error("HybridAudioBrowser.shared is nil — app may not be initialized yet")
+      completion(INPlayMediaIntentResponse(code: .failureRequiringAppLaunch, userActivity: nil))
+      return
     }
-  }
 
-  /// Host app's display name, used to recognise "Play «app»" as a resume.
-  private static func hostAppName() -> String? {
-    let info = Bundle.main.infoDictionary
-    return (info?["CFBundleDisplayName"] as? String) ?? (info?["CFBundleName"] as? String)
+    browser.handlePlayMediaIntent(searchTerm: searchTerm) { success in
+      completion(INPlayMediaIntentResponse(
+        code: success ? .success : .failure,
+        userActivity: nil,
+      ))
+    }
   }
 }

package/ios/CarPlay/Track+CarPlay.swift

@@ -0,0 +1,63 @@
+import CarPlay
+import Foundation
+import NitroModules
+
+// MARK: - Track CarPlay Extensions
+
+extension Track {
+  /// Returns the best artwork URL for CarPlay display.
+  var carPlayArtworkUrl: URL? {
+    if let artworkSource {
+      let uri = artworkSource.uri
+      return URL(string: uri)
+    }
+    if let artwork {
+      return URL(string: artwork)
+    }
+    return nil
+  }
+
+  /// Returns whether this track is playable (has a media source).
+  var isPlayable: Bool {
+    src != nil
+  }
+
+  /// Returns whether this track is browsable (has a navigation URL).
+  var isBrowsable: Bool {
+    url != nil && src == nil
+  }
+
+  /// Returns the display subtitle for CarPlay.
+  /// Uses subtitle if available, falls back to artist.
+  var carPlaySubtitle: String? {
+    subtitle ?? artist
+  }
+}
+
+// MARK: - ImageRowItem → Track Conversion
+
+extension ImageRowItem {
+  /// Creates a minimal Track from an ImageRowItem for reuse with item selection and artwork loading.
+  func toTrack() -> Track {
+    Track(
+      url: url, src: nil, artwork: artwork, artworkSource: artworkSource,
+      artworkCarPlayTinted: nil, title: title, subtitle: nil, artist: nil,
+      album: nil, description: nil, genre: nil, duration: nil, style: nil,
+      childrenStyle: nil, favorited: nil, groupTitle: nil, live: nil, imageRow: nil
+    )
+  }
+}
+
+// MARK: - ResolvedTrack CarPlay Extensions
+
+extension ResolvedTrack {
+  /// Returns playable children only (tracks with src).
+  var playableChildren: [Track] {
+    children?.filter { $0.src != nil } ?? []
+  }
+
+  /// Returns browsable children only (tracks with url but no src).
+  var browsableChildren: [Track] {
+    children?.filter { $0.url != nil && $0.src == nil } ?? []
+  }
+}

package/ios/Extension/Capability+RemoteCommand.swift

@@ -48,13 +48,15 @@ extension PlayerCapabilities {
       ))
     }
 
-    // NOTE: We deliberately do NOT register MPRemoteCommandCenter.likeCommand for the
-    // `favorite` capability. That MPFeedbackCommand had a single system surface — a
-    // pre-iOS-15 lock-screen menu shown in place of the previous-track button — which
-    // Apple silently removed. On the iOS 16+ target it can never be invoked: CarPlay
-    // uses its own CPNowPlayingButton heart, and Siri "I like this" routes through
-    // INUpdateMediaAffinityIntent. The `favorite` capability still drives the
-    // favorites-match row indicators via setFavoriteMatch. See issues #67 / #71.
+    // TODO: Investigate where localizedTitle/localizedShortTitle are displayed
+    // (possibly only for accessibility/VoiceOver). See TODO.md for details.
+    if favorite != false {
+      commands.append(.like(
+        isActive: false,
+        localizedTitle: "Favorite",
+        localizedShortTitle: "Favorite",
+      ))
+    }
 
     // Mode controls
     if shuffleMode != false {

package/ios/Extension/ChapterMetadata+AVFoundation.swift

@@ -1,7 +1,7 @@
 import AVFoundation
 
 #if canImport(NitroModules)
-  import NitroModules
+import NitroModules
 #endif
 
 extension ChapterMetadata {

package/ios/Extension/NavigationError+Conversion.swift

@@ -43,14 +43,7 @@ extension NavigationError {
       "Error"
     case .unknownError:
       "Error"
-    case .emptyContent:
-      // Not a failure — a container that resolved with no children. Neutral copy;
-      // the message (carried on the NavigationError) is typically empty. See ADR 0001.
-      "Nothing here"
-    case .timeout:
-      "Couldn't load"
     }
-    // Omit an empty message so it renders as title-only (e.g. the empty-content case).
-    return FormattedNavigationError(title: title, message: message.isEmpty ? nil : message)
+    return FormattedNavigationError(title: title, message: message)
   }
 }

package/ios/Extension/ResolvedTrack+Copying.swift

@@ -1,5 +1,5 @@
 #if canImport(NitroModules)
-  import NitroModules
+import NitroModules
 #endif
 
 extension ResolvedTrack {
@@ -15,16 +15,13 @@ extension ResolvedTrack {
     url: String? = nil,
     children: [Track]?? = nil,
     carPlaySiriListButton: CarPlaySiriListButtonPosition?? = nil,
-    id: String?? = nil,
     src: String?? = nil,
-    artwork: Variant_String_ArtworkVariants?? = nil,
+    artwork: String?? = nil,
     artworkSource: ImageSource?? = nil,
-    request: TrackRequest?? = nil,
     artworkCarPlayTinted: Bool?? = nil,
     title: String? = nil,
     subtitle: String?? = nil,
     artist: String?? = nil,
-    albumUrl: String?? = nil,
     album: String?? = nil,
     description: String?? = nil,
     genre: String?? = nil,
@@ -34,22 +31,19 @@ extension ResolvedTrack {
     favorited: Bool?? = nil,
     groupTitle: String?? = nil,
     live: Bool?? = nil,
-    imageRow: [ImageRowItem]?? = nil,
+    imageRow: [ImageRowItem]?? = nil
   ) -> ResolvedTrack {
     ResolvedTrack(
       url: url ?? self.url,
       children: children ?? self.children,
       carPlaySiriListButton: carPlaySiriListButton ?? self.carPlaySiriListButton,
-      id: id ?? self.id,
       src: src ?? self.src,
       artwork: artwork ?? self.artwork,
       artworkSource: artworkSource ?? self.artworkSource,
-      request: request ?? self.request,
       artworkCarPlayTinted: artworkCarPlayTinted ?? self.artworkCarPlayTinted,
       title: title ?? self.title,
       subtitle: subtitle ?? self.subtitle,
       artist: artist ?? self.artist,
-      albumUrl: albumUrl ?? self.albumUrl,
       album: album ?? self.album,
       description: description ?? self.description,
       genre: genre ?? self.genre,
@@ -59,7 +53,7 @@ extension ResolvedTrack {
       favorited: favorited ?? self.favorited,
       groupTitle: groupTitle ?? self.groupTitle,
       live: live ?? self.live,
-      imageRow: imageRow ?? self.imageRow,
+      imageRow: imageRow ?? self.imageRow
     )
   }
 }

package/ios/Extension/TimedMetadata+AVFoundation.swift

@@ -1,7 +1,7 @@
 import AVFoundation
 
 #if canImport(NitroModules)
-  import NitroModules
+import NitroModules
 #endif
 
 extension TimedMetadata {

package/ios/Extension/Track+AVPlayer.swift

@@ -23,11 +23,11 @@ extension Track {
   /// Builds an `ImageSource` from the track's artwork fields, skipping SF Symbol strings.
   var artworkImageSource: ImageSource? {
     if let source = artworkSource {
-      source
-    } else if let artwork = artwork?.url, !SFSymbolRenderer.isSFSymbol(artwork) {
-      ImageSource(uri: artwork, method: nil, headers: nil, body: nil)
+      return source
+    } else if let artwork, !SFSymbolRenderer.isSFSymbol(artwork) {
+      return ImageSource(uri: artwork, method: nil, headers: nil, body: nil)
     } else {
-      nil
+      return nil
     }
   }
 }

package/ios/Extension/Track+Copying.swift

@@ -10,17 +10,14 @@ extension Track {
   ///
   /// `title` uses single-optional (`String?`) since it is non-optional on Track.
   func copying(
-    id: String?? = nil,
     url: String?? = nil,
     src: String?? = nil,
-    artwork: Variant_String_ArtworkVariants?? = nil,
+    artwork: String?? = nil,
     artworkSource: ImageSource?? = nil,
-    request: TrackRequest?? = nil,
     artworkCarPlayTinted: Bool?? = nil,
     title: String? = nil,
     subtitle: String?? = nil,
     artist: String?? = nil,
-    albumUrl: String?? = nil,
     album: String?? = nil,
     description: String?? = nil,
     genre: String?? = nil,
@@ -30,20 +27,17 @@ extension Track {
     favorited: Bool?? = nil,
     groupTitle: String?? = nil,
     live: Bool?? = nil,
-    imageRow: [ImageRowItem]?? = nil,
+    imageRow: [ImageRowItem]?? = nil
   ) -> Track {
     Track(
-      id: id ?? self.id,
       url: url ?? self.url,
       src: src ?? self.src,
       artwork: artwork ?? self.artwork,
       artworkSource: artworkSource ?? self.artworkSource,
-      request: request ?? self.request,
       artworkCarPlayTinted: artworkCarPlayTinted ?? self.artworkCarPlayTinted,
       title: title ?? self.title,
       subtitle: subtitle ?? self.subtitle,
       artist: artist ?? self.artist,
-      albumUrl: albumUrl ?? self.albumUrl,
       album: album ?? self.album,
       description: description ?? self.description,
       genre: genre ?? self.genre,
@@ -53,7 +47,7 @@ extension Track {
       favorited: favorited ?? self.favorited,
       groupTitle: groupTitle ?? self.groupTitle,
       live: live ?? self.live,
-      imageRow: imageRow ?? self.imageRow,
+      imageRow: imageRow ?? self.imageRow
     )
   }
 }

package/ios/Extension/TrackMetadata+AVFoundation.swift

@@ -1,7 +1,7 @@
 import AVFoundation
 
 #if canImport(NitroModules)
-  import NitroModules
+import NitroModules
 #endif
 
 extension TrackMetadata {