@5stones/react-native-audio-browser 0.1.6 → 0.3.0

package/ios/TrackPlayer.swift

@@ -176,36 +176,38 @@ class TrackPlayer {
   final class LoadSeekCoordinator {
     enum State {
       case idle
-      case pendingSeek(time: TimeInterval, completion: (@Sendable (Bool) -> Void)?)
-      case seekInFlight
+      case pendingSeek(time: TimeInterval)
+      case seekInFlight(time: TimeInterval)
     }
 
     private let logger = Logger(subsystem: "com.audiobrowser", category: "LoadSeekCoordinator")
     private(set) var state: State = .idle
 
-    /// The pending seek time, if any. Used by `seekBy()` to offset from the deferred position.
+    /// The deferred seek time, if any. Used by `seekBy()` to offset from the deferred position.
     var pendingTime: TimeInterval? {
-      if case let .pendingSeek(time, _) = state { return time }
-      return nil
+      switch state {
+      case let .pendingSeek(time): time
+      case let .seekInFlight(time): time
+      case .idle: nil
+      }
     }
 
     /// Whether to suppress state transitions to `.ready`.
     /// True when a seek is pending or in-flight during the loading phase.
     var shouldDeferReadyTransition: Bool {
       switch state {
-      case .idle: return false
-      case .pendingSeek, .seekInFlight: return true
+      case .idle: false
+      case .pendingSeek, .seekInFlight: true
       }
     }
 
     /// Called from `seekTo()` when `TrackPlayer.state == .loading`.
-    /// Cancels any previous pending seek before storing the new one.
-    func capture(position: Double, completion: (@Sendable (Bool) -> Void)?) {
-      // Cancel previous pending seek if any
-      if case let .pendingSeek(_, oldCompletion) = state {
-        oldCompletion?(false)
+    /// Supersedes any previous pending or in-flight seek.
+    func capture(position: Double) {
+      if case .seekInFlight = state {
+        logger.debug("overriding in-flight seek with new target \(position)s")
       }
-      state = .pendingSeek(time: position, completion: completion)
+      state = .pendingSeek(time: position)
       logger.debug("captured pending seek to \(position)s")
     }
 
@@ -214,10 +216,10 @@ class TrackPlayer {
     ///
     /// Returns `true` if a seek was initiated — caller should NOT transition to `.ready` yet.
     func executeIfPending(on player: AVPlayer, delegate: TrackPlayer?) -> Bool {
-      guard case let .pendingSeek(time, completion) = state else { return false }
+      guard case let .pendingSeek(time) = state else { return false }
 
       logger.debug("executing deferred seek to \(time)s")
-      state = .seekInFlight
+      state = .seekInFlight(time: time)
 
       let cmTime = CMTime(seconds: time, preferredTimescale: 1000)
       player
@@ -225,26 +227,34 @@ class TrackPlayer {
           Task { @MainActor in
             delegate?.handleSeekCompleted(to: time, didFinish: finished)
           }
-          completion?(finished)
         }
 
       return true
     }
 
     /// Called from `handleSeekCompleted`.
-    /// Returns `true` if this was a load-seek (caller should transition `.loading` → `.ready`).
-    func seekDidComplete() -> Bool {
-      guard case .seekInFlight = state else { return false }
-      logger.debug("seek landed, clearing coordinator")
-      state = .idle
-      return true
+    /// Returns `true` if the coordinator is done and the caller should transition
+    /// `.loading` → `.ready`. Returns `false` if a new seek was queued while the
+    /// previous one was in-flight (caller should NOT transition yet).
+    func seekDidComplete(on player: AVPlayer, delegate: TrackPlayer?) -> Bool {
+      switch state {
+      case .seekInFlight:
+        logger.debug("seek landed, clearing coordinator")
+        state = .idle
+        return true
+      case .pendingSeek:
+        // A new seek arrived while the previous one was in-flight.
+        // Execute it now — don't transition to .ready yet.
+        logger.debug("seek landed, but a new seek is pending — re-executing")
+        _ = executeIfPending(on: player, delegate: delegate)
+        return false
+      case .idle:
+        return false
+      }
     }
 
     /// Reset when track changes or item is cleared.
     func reset() {
-      if case let .pendingSeek(_, completion) = state {
-        completion?(false)
-      }
       state = .idle
     }
   }
@@ -502,10 +512,12 @@ class TrackPlayer {
       if playWhenReady == true, state == .error || state == .stopped {
         reload(startFromCurrentTime: state == .error)
       }
-      if playWhenReady {
-        startPlayback()
-      } else {
-        pausePlayback()
+      if state != .loading {
+        if playWhenReady {
+          startPlayback()
+        } else {
+          pausePlayback()
+        }
       }
 
       if oldValue != playWhenReady {
@@ -606,7 +618,7 @@ class TrackPlayer {
         tracks.append(track)
         currentIndex = 0
       } else {
-        setTrack(at: currentIndex, track)
+        replace(currentIndex, track)
       }
       handleCurrentTrackChanged()
     }
@@ -692,7 +704,10 @@ class TrackPlayer {
   func seekTo(_ seconds: TimeInterval, completion: @escaping @Sendable (Bool) -> Void) {
     // If a track is currently being loaded asynchronously, defer the seek until it's ready.
     if state == .loading {
-      loadSeekCoordinator.capture(position: seconds, completion: completion)
+      loadSeekCoordinator.capture(position: seconds)
+      // The coordinator executes the deferred seek once the item is ready; replay() is the
+      // only caller that uses completion, and it's never called during loading.
+      completion(false)
     } else if avPlayer.currentItem != nil {
       let time = CMTime(seconds: seconds, preferredTimescale: 1000)
       let seekSeconds = seconds
@@ -792,6 +807,13 @@ class TrackPlayer {
     nowPlayingInfoController.clear()
   }
 
+  /// Tears down the player completely, stopping audio and removing all remote command targets.
+  /// Called when the HybridAudioBrowser is being replaced (e.g., JS runtime reload).
+  func destroy() {
+    clear()
+    remoteCommandController.disableAll()
+  }
+
   // MARK: - Private
 
   private func setNowPlayingCurrentTime(seconds: Double) {
@@ -846,11 +868,6 @@ class TrackPlayer {
   private func loadImage(from imageSource: ImageSource) async -> UIImage? {
     guard let url = URL(string: imageSource.uri) else { return nil }
 
-    if url.isFileURL {
-      return UIImage(contentsOfFile: url.path)
-    }
-
-    // Build Kingfisher options with headers if provided
     var options: KingfisherOptionsInfo = []
     if let headers = imageSource.headers, !headers.isEmpty {
       let modifier = AnyModifier { request in
@@ -1061,13 +1078,6 @@ class TrackPlayer {
                 self.avItemDidUpdatePlaybackLikelyToKeepUp(true)
               }
             }
-
-            // If the item is already buffered (e.g., cached HTTP response), KVO
-            // with [.new] won't fire because isPlaybackLikelyToKeepUp never
-            // changed. Transition state explicitly so it doesn't stay .loading.
-            if avItem.isPlaybackLikelyToKeepUp {
-              self.avItemDidUpdatePlaybackLikelyToKeepUp(true)
-            }
           }
         } catch {
           guard !Task.isCancelled else { return }
@@ -1106,7 +1116,8 @@ class TrackPlayer {
 
   private func handleSeekCompleted(to seconds: Double, didFinish: Bool) {
     // If this was a deferred load-seek, transition out of .loading state
-    if loadSeekCoordinator.seekDidComplete(), state == .loading {
+    // (unless a new seek was queued while this one was in-flight)
+    if loadSeekCoordinator.seekDidComplete(on: avPlayer, delegate: self), state == .loading {
       logger.debug("[loadSeek] seek landed at \(seconds)s (finished=\(didFinish)) → .ready")
       state = .ready
     }
@@ -1275,13 +1286,12 @@ class TrackPlayer {
   // MARK: - Queue Methods
 
   /**
-   Set the track at a specific index.
+   Replace the track at a specific index.
 
-   - parameter index: The index of the track to set.
-   - parameter track: The track to set.
+   - parameter index: The index of the track to replace.
+   - parameter track: The replacement track.
    */
-  func setTrack(at index: Int, _ track: Track) {
-    guard index >= 0, index < tracks.count else { return }
+  func replace(_ index: Int, _ track: Track) {
     tracks[index] = track
   }
 
@@ -1578,6 +1588,18 @@ class TrackPlayer {
     let lastPosition = currentTime
     let shouldContinuePlayback = playWhenReady
     if let currentTrack {
+      // Cancel in-flight loading from previous track and clear old item
+      // to prevent stale audio during async URL resolution.
+      metadataLoadTask?.cancel()
+      playableLoadTask?.cancel()
+      pausePlayback()
+      stopObservingAVPlayerItem()
+      avPlayer.replaceCurrentItem(with: nil)
+
+      // Set loading state before playWhenReady so the setter's guard
+      // prevents a no-op startPlayback() on the now-nil item.
+      state = .loading
+
       // Ensure playWhenReady is set before loading to preserve playback state
       playWhenReady = shouldContinuePlayback
 
@@ -1604,10 +1626,6 @@ class TrackPlayer {
       logger.debug("  track.url: \(currentTrack.url ?? "nil")")
       logger.debug("  track.src: \(src)")
 
-      // Set loading state early so seekTo calls during async URL resolution
-      // are captured as pending seeks rather than silently dropped
-      state = .loading
-
       // Check if it's already a full URL (http/https) or local file
       if src.hasPrefix("http://") || src.hasPrefix("https://") || src.hasPrefix("file://") {
         // Already a full URL, use directly (may still need transform for headers)

package/ios/Util/NetworkMonitor.swift

@@ -11,15 +11,12 @@ final class NetworkMonitor: @unchecked Sendable {
   private let monitor: NWPathMonitor
   private let queue = DispatchQueue(label: "com.audiobrowser.networkmonitor")
 
-  /// Current network connectivity state
+  /// Current network connectivity state. Must only be set on main thread.
   private(set) var isOnline: Bool = false {
     didSet {
       if oldValue != isOnline {
         logger.info("Network status changed: \(oldValue) -> \(self.isOnline)")
-        DispatchQueue.main.async { [weak self] in
-          guard let self else { return }
-          onChanged?(isOnline)
-        }
+        onChanged?(isOnline)
       }
     }
   }
@@ -35,7 +32,7 @@ final class NetworkMonitor: @unchecked Sendable {
     // Set up handler before starting
     monitor.pathUpdateHandler = { [weak self] path in
       let newStatus = path.status == .satisfied
-      DispatchQueue.main.async {
+      DispatchQueue.main.async { [weak self] in
         self?.isOnline = newStatus
       }
     }

package/ios/Util/SFSymbolRenderer.swift

@@ -0,0 +1,142 @@
+import os.log
+import UIKit
+
+/// Renders SF Symbols to PNG files in the caches directory.
+/// Returns `file://` URIs usable by both React Native's `<Image>` and native image loaders.
+///
+/// Artwork format: `sf:symbol.name?bg=#RRGGBB&fg=#RRGGBB`
+/// - `bg`: background color (default: transparent)
+/// - `fg`: foreground/symbol color (default: #000000)
+final class SFSymbolRenderer: @unchecked Sendable {
+  @MainActor static let shared = SFSymbolRenderer()
+  static let defaultCanvasSize = CGSize(width: 200, height: 200)
+
+  private let logger = Logger(subsystem: "com.audiobrowser", category: "SFSymbolRenderer")
+  private let scale: CGFloat
+  private let cacheDirectory: URL
+
+  @MainActor
+  private init() {
+    scale = UIScreen.main.scale
+
+    let caches = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)[0]
+    cacheDirectory = caches.appendingPathComponent("sf-symbols", isDirectory: true)
+    try? FileManager.default.createDirectory(at: cacheDirectory, withIntermediateDirectories: true)
+  }
+
+  /// Renders an SF Symbol to a PNG file and returns its `file://` URI.
+  ///
+  /// Skips rendering if the file already exists on disk.
+  ///
+  /// - Parameters:
+  ///   - artworkValue: The artwork string (e.g. "sf:heart.fill?bg=#000&fg=#fff" or "heart.fill")
+  ///   - canvasSize: The canvas size in points (rendered at device scale)
+  /// - Returns: A file URI string, or nil if the symbol doesn't exist or rendering fails
+  func render(_ artworkValue: String, canvasSize: CGSize = defaultCanvasSize) -> String? {
+    let (symbolName, backgroundColor, symbolColor) = Self.parseArtwork(artworkValue)
+
+    // Validate symbol exists before any filesystem work
+    let symbolPointSize = min(canvasSize.width, canvasSize.height) * 0.45
+    let config = UIImage.SymbolConfiguration(pointSize: symbolPointSize, weight: .medium)
+    guard let symbol = UIImage(systemName: symbolName, withConfiguration: config) else {
+      return nil
+    }
+
+    let safeArtwork = artworkValue.unicodeScalars
+      .filter { CharacterSet.alphanumerics.contains($0) || $0 == "_" }
+      .map(String.init).joined()
+    let fileName = "\(safeArtwork)_\(Int(canvasSize.width))x\(Int(canvasSize.height))_\(Int(scale))x"
+    let fileURL = cacheDirectory.appendingPathComponent("\(fileName).png")
+
+    if FileManager.default.fileExists(atPath: fileURL.path) {
+      return fileURL.absoluteString
+    }
+
+    let renderer = UIGraphicsImageRenderer(size: canvasSize, format: {
+      let fmt = UIGraphicsImageRendererFormat()
+      fmt.scale = scale
+      return fmt
+    }())
+
+    let pngData = renderer.pngData { _ in
+      if let backgroundColor {
+        backgroundColor.setFill()
+        UIRectFill(CGRect(origin: .zero, size: canvasSize))
+      }
+
+      let symbolSize = symbol.size
+      let x = (canvasSize.width - symbolSize.width) / 2
+      let y = (canvasSize.height - symbolSize.height) / 2
+
+      (symbolColor ?? .black).set()
+      symbol.withRenderingMode(.alwaysTemplate)
+        .draw(in: CGRect(x: x, y: y, width: symbolSize.width, height: symbolSize.height))
+    }
+
+    do {
+      try pngData.write(to: fileURL, options: .atomic)
+    } catch {
+      logger.error("Failed to write SF Symbol PNG: \(error.localizedDescription)")
+      return nil
+    }
+
+    return fileURL.absoluteString
+  }
+
+  /// Whether the given artwork string is an SF Symbol reference.
+  static func isSFSymbol(_ artwork: String) -> Bool {
+    artwork.hasPrefix("sf:")
+  }
+
+  /// Parses an SF Symbol artwork string into symbol name and resolved colors.
+  /// `"sf:heart.fill?bg=#000&fg=#fff"` → `("heart.fill", bg: black, fg: white)`
+  static func parseArtwork(_ value: String) -> (symbolName: String, backgroundColor: UIColor?, symbolColor: UIColor?) {
+    let (symbolName, params) = parseArtworkValue(value)
+    let bg = params["bg"].map { UIColor(hex: $0) }
+    let fg = params["fg"].map { UIColor(hex: $0) }
+    return (symbolName, bg, fg)
+  }
+
+  /// Parses an SF Symbol artwork string, stripping the `sf:` prefix if present.
+  /// `"sf:heart.fill?bg=#000&fg=#fff"` → `("heart.fill", ["bg": "000", "fg": "fff"])`
+  private static func parseArtworkValue(_ value: String) -> (symbolName: String, params: [String: String]) {
+    let stripped = value.hasPrefix("sf:") ? String(value.dropFirst(3)) : value
+    guard let questionMark = stripped.firstIndex(of: "?") else {
+      return (stripped, [:])
+    }
+    let symbolName = String(stripped[..<questionMark])
+    let queryString = String(stripped[stripped.index(after: questionMark)...])
+    var params: [String: String] = [:]
+    for pair in queryString.split(separator: "&") {
+      let parts = pair.split(separator: "=", maxSplits: 1)
+      guard parts.count == 2 else { continue }
+      let key = String(parts[0])
+      let val = String(parts[1]).replacingOccurrences(of: "#", with: "")
+      params[key] = val
+    }
+    return (symbolName, params)
+  }
+}
+
+extension UIColor {
+  convenience init(hex: String) {
+    let hex = hex.trimmingCharacters(in: CharacterSet(charactersIn: "#"))
+    var rgb: UInt64 = 0
+    Scanner(string: hex).scanHexInt64(&rgb)
+
+    switch hex.count {
+    case 3:
+      let r = CGFloat((rgb >> 8) & 0xF) / 15
+      let g = CGFloat((rgb >> 4) & 0xF) / 15
+      let b = CGFloat(rgb & 0xF) / 15
+      self.init(red: r, green: g, blue: b, alpha: 1)
+    case 6:
+      let r = CGFloat((rgb >> 16) & 0xFF) / 255
+      let g = CGFloat((rgb >> 8) & 0xFF) / 255
+      let b = CGFloat(rgb & 0xFF) / 255
+      self.init(red: r, green: g, blue: b, alpha: 1)
+    default:
+      self.init(white: 0, alpha: 1)
+    }
+  }
+}

package/lib/commonjs/features/browser.js

@@ -164,6 +164,7 @@ function toNativeConfig(config) {
     artwork: config.artwork,
     routes: flattenRoutes(config.routes, config.browse, config.tabs, config.search),
     singleTrack: config.singleTrack,
+    handleTrackLoad: config.handleTrackLoad,
     androidControllerOfflineError: config.androidControllerOfflineError,
     carPlayUpNextButton: config.carPlayUpNextButton,
     carPlayNowPlayingButtons: config.carPlayNowPlayingButtons,

package/lib/commonjs/features/browser.js.map

@@ -1 +1 @@
-{"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","isCallback","source","isTransformableRequestConfig","obj","isRouteConfig","flattenBrowseSource","browseCallback","browseConfig","browseStatic","searchSourceToRouteEntry","path","SEARCH_ROUTE_PATH","searchCallback","searchConfig","wrapTracksAsResolvedTrack","tracks","url","TABS_ROUTE_PATH","title","children","tabsSourceToRouteEntry","Array","isArray","wrappedCallback","flattenRouteEntry","browse","media","artwork","DEFAULT_ROUTE_PATH","flattenRoutes","routes","rootBrowse","tabs","search","entries","Object","push","length","undefined","toNativeConfig","config","request","singleTrack","androidControllerOfflineError","carPlayUpNextButton","carPlayNowPlayingButtons","formatNavigationError","configureBrowser","configuration","nativeBrowser","navigate","pathOrTrack","navigatePath","navigateTrack","getPath","onPathChanged","exports","NativeUpdatedValue","emitterize","cb","usePath","useNativeUpdatedValue","getContent","onContentChanged","useContent","getTabs","onTabsChanged","useTabs","notifyContentChanged","hasSearch","searchRoute","find","r","query","onSearch"],"sourceRoot":"../../../src","sources":["features/browser.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","isCallback","source","isTransformableRequestConfig","obj","isRouteConfig","flattenBrowseSource","browseCallback","browseConfig","browseStatic","searchSourceToRouteEntry","path","SEARCH_ROUTE_PATH","searchCallback","searchConfig","wrapTracksAsResolvedTrack","tracks","url","TABS_ROUTE_PATH","title","children","tabsSourceToRouteEntry","Array","isArray","wrappedCallback","flattenRouteEntry","browse","media","artwork","DEFAULT_ROUTE_PATH","flattenRoutes","routes","rootBrowse","tabs","search","entries","Object","push","length","undefined","toNativeConfig","config","request","singleTrack","handleTrackLoad","androidControllerOfflineError","carPlayUpNextButton","carPlayNowPlayingButtons","formatNavigationError","configureBrowser","configuration","nativeBrowser","navigate","pathOrTrack","navigatePath","navigateTrack","getPath","onPathChanged","exports","NativeUpdatedValue","emitterize","cb","usePath","useNativeUpdatedValue","getContent","onContentChanged","useContent","getTabs","onTabsChanged","useTabs","notifyContentChanged","hasSearch","searchRoute","find","r","query","onSearch"],"sourceRoot":"../../../src","sources":["features/browser.ts"],"mappings":";;;;;;;;;;;;;;;;AAgBA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AAEA;AACA;AACA;;AAEA,SAASG,UAAUA,CACjBC,MAAe,EAC4B;EAC3C,OAAO,OAAOA,MAAM,KAAK,UAAU;AACrC;AAEA,SAASC,4BAA4BA,CACnCD,MAAe,EACuB;EACtC,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,EAAE,OAAO,KAAK;EAC/D,MAAME,GAAG,GAAGF,MAAiC;EAC7C;EACA,OACE,SAAS,IAAIE,GAAG,IAChB,MAAM,IAAIA,GAAG,IACb,SAAS,IAAIA,GAAG,IAChB,OAAO,IAAIA,GAAG,IACd,WAAW,IAAIA,GAAG;AAEtB;AAEA,SAASC,aAAaA,CAACH,MAAe,EAAyB;EAC7D,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,IAAI,EAAE,OAAO,KAAK;EAC/D,MAAME,GAAG,GAAGF,MAAiC;EAC7C;EACA,OAAO,QAAQ,IAAIE,GAAG,IAAK,OAAO,IAAIA,GAAG,IAAI,EAAE,SAAS,IAAIA,GAAG,CAAE;AACnE;AAEA,SAASE,mBAAmBA,CAACJ,MAAiC,EAI5D;EACA,IAAI,CAACA,MAAM,EAAE,OAAO,CAAC,CAAC;EACtB,IAAID,UAAU,CAACC,MAAM,CAAC,EACpB,OAAO;IAAEK,cAAc,EAAEL;EAA6C,CAAC;EACzE,IAAIC,4BAA4B,CAACD,MAAM,CAAC,EACtC,OAAO;IAAEM,YAAY,EAAEN;EAA2C,CAAC;EACrE,OAAO;IAAEO,YAAY,EAAEP;EAA2C,CAAC;AACrE;;AAEA;AACA;AACA;AACA,SAASQ,wBAAwBA,CAACR,MAAoB,EAAoB;EACxE,IAAID,UAAU,CAACC,MAAM,CAAC,EAAE;IACtB,OAAO;MACLS,IAAI,EAAEC,iBAAiB;MACvBC,cAAc,EAAEX;IAClB,CAAC;EACH;EACA,OAAO;IACLS,IAAI,EAAEC,iBAAiB;IACvBE,YAAY,EAAEZ;EAChB,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA,SAASa,yBAAyBA,CAACC,MAAe,EAAiB;EACjE,OAAO;IACLC,GAAG,EAAEC,eAAe;IACpBC,KAAK,EAAE,MAAM;IACbC,QAAQ,EAAEJ;EACZ,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA,SAASK,sBAAsBA,CAACnB,MAAkB,EAAoB;EACpE,IAAIoB,KAAK,CAACC,OAAO,CAACrB,MAAM,CAAC,EAAE;IACzB;IACA,OAAO;MACLS,IAAI,EAAEO,eAAe;MACrBT,YAAY,EAAEM,yBAAyB,CAACb,MAAM;IAChD,CAAC;EACH;EAEA,IAAID,UAAU,CAACC,MAAM,CAAC,EAAE;IACtB;IACA,MAAMsB,eAAsC,GAAG,MAAAA,CAAA,KAAY;MACzD,MAAMR,MAAM,GAAG,MAAMd,MAAM,CAAC,CAAC;MAC7B,OAAOa,yBAAyB,CAACC,MAAM,CAAC;IAC1C,CAAC;IACD,OAAO;MACLL,IAAI,EAAEO,eAAe;MACrBX,cAAc,EAAEiB;IAClB,CAAC;EACH;;EAEA;EACA,OAAO;IACLb,IAAI,EAAEO,eAAe;IACrBV,YAAY,EAAEN;EAChB,CAAC;AACH;AAEA,SAASuB,iBAAiBA,CACxBd,IAAY,EACZT,MAAmC,EACjB;EAClB,IAAIG,aAAa,CAACH,MAAM,CAAC,EAAE;IACzB,OAAO;MACLS,IAAI;MACJ,GAAGL,mBAAmB,CAACJ,MAAM,CAACwB,MAAM,CAAC;MACrCC,KAAK,EAAEzB,MAAM,CAACyB,KAAK;MACnBC,OAAO,EAAE1B,MAAM,CAAC0B;IAClB,CAAC;EACH;EACA,OAAO;IAAEjB,IAAI;IAAE,GAAGL,mBAAmB,CAACJ,MAAM;EAAE,CAAC;AACjD;;AAEA;AACA,MAAM2B,kBAAkB,GAAG,aAAa;;AAExC;AACA,MAAMX,eAAe,GAAG,UAAU;;AAElC;AACA,MAAMN,iBAAiB,GAAG,YAAY;AAEtC,SAASkB,aAAaA,CACpBC,MAA+D,EAC/DC,UAAqC,EACrCC,IAA4B,EAC5BC,MAAgC,EACA;EAChC,MAAMC,OAA2B,GAAG,EAAE;;EAEtC;EACA,IAAIJ,MAAM,EAAE;IACV,KAAK,MAAM,CAACpB,IAAI,EAAET,MAAM,CAAC,IAAIkC,MAAM,CAACD,OAAO,CAACJ,MAAM,CAAC,EAAE;MACnDI,OAAO,CAACE,IAAI,CAACZ,iBAAiB,CAACd,IAAI,EAAET,MAAM,CAAC,CAAC;IAC/C;EACF;;EAEA;EACA,IAAI8B,UAAU,EAAE;IACdG,OAAO,CAACE,IAAI,CAACZ,iBAAiB,CAACI,kBAAkB,EAAEG,UAAU,CAAC,CAAC;EACjE;;EAEA;EACA,IAAIC,IAAI,EAAE;IACRE,OAAO,CAACE,IAAI,CAAChB,sBAAsB,CAACY,IAAI,CAAC,CAAC;EAC5C;;EAEA;EACA,IAAIC,MAAM,EAAE;IACVC,OAAO,CAACE,IAAI,CAAC3B,wBAAwB,CAACwB,MAAM,CAAC,CAAC;EAChD;EAEA,OAAOC,OAAO,CAACG,MAAM,GAAG,CAAC,GAAGH,OAAO,GAAGI,SAAS;AACjD;AAEA,SAASC,cAAcA,CACrBC,MAA4B,EACA;EAC5B,OAAO;IACL9B,IAAI,EAAE8B,MAAM,CAAC9B,IAAI;IACjB+B,OAAO,EAAED,MAAM,CAACC,OAAO;IACvBf,KAAK,EAAEc,MAAM,CAACd,KAAK;IACnBC,OAAO,EAAEa,MAAM,CAACb,OAAO;IACvBG,MAAM,EAAED,aAAa,CACnBW,MAAM,CAACV,MAAM,EACbU,MAAM,CAACf,MAAM,EACbe,MAAM,CAACR,IAAI,EACXQ,MAAM,CAACP,MACT,CAAC;IACDS,WAAW,EAAEF,MAAM,CAACE,WAAW;IAC/BC,eAAe,EAAEH,MAAM,CAACG,eAAe;IACvCC,6BAA6B,EAAEJ,MAAM,CAACI,6BAA6B;IACnEC,mBAAmB,EAAEL,MAAM,CAACK,mBAAmB;IAC/CC,wBAAwB,EAAEN,MAAM,CAACM,wBAAwB;IACzDC,qBAAqB,EAAEP,MAAM,CAACO;EAChC,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,gBAAgBA,CAACC,aAAmC,EAAQ;EAC1EC,qBAAa,CAACD,aAAa,GAAGV,cAAc,CAACU,aAAa,CAAC;AAC7D;AAEO,SAASE,QAAQA,CAACC,WAA2B,EAAE;EACpD,IAAI,OAAOA,WAAW,KAAK,QAAQ,EAAE;IACnC,OAAOF,qBAAa,CAACG,YAAY,CAACD,WAAW,CAAC;EAChD,CAAC,MAAM;IACL,OAAOF,qBAAa,CAACI,aAAa,CAACF,WAAW,CAAC;EACjD;AACF;AAEO,SAASG,OAAOA,CAAA,EAAG;EACxB,OAAOL,qBAAa,CAACxC,IAAI;AAC3B;AAEO,MAAM8C,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAGE,sCAAkB,CAACC,UAAU,CACvDC,EAAE,IAAMV,qBAAa,CAACM,aAAa,GAAGI,EACzC,CAAC;AAEM,SAASC,OAAOA,CAAA,EAAuB;EAC5C,OAAO,IAAAC,4CAAqB,EAACP,OAAO,EAAEC,aAAa,CAAC;AACtD;AAEO,SAASO,UAAUA,CAAA,EAA8B;EACtD,OAAOb,qBAAa,CAACa,UAAU,CAAC,CAAC;AACnC;AAEO,MAAMC,gBAAgB,GAAAP,OAAA,CAAAO,gBAAA,GAAGN,sCAAkB,CAACC,UAAU,CAE1DC,EAAE,IAAMV,qBAAa,CAACc,gBAAgB,GAAGJ,EAAG,CAAC;AAEzC,SAASK,UAAUA,CAAA,EAA8B;EACtD,OAAO,IAAAH,4CAAqB,EAACC,UAAU,EAAEC,gBAAgB,CAAC;AAC5D;AACO,SAASE,OAAOA,CAAA,EAAwB;EAC7C,OAAOhB,qBAAa,CAAClB,IAAI;AAC3B;AAEO,MAAMmC,aAAa,GAAAV,OAAA,CAAAU,aAAA,GAAGT,sCAAkB,CAACC,UAAU,CACvDC,EAAE,IAAMV,qBAAa,CAACiB,aAAa,GAAGP,EACzC,CAAC;AAEM,SAASQ,OAAOA,CAAA,EAAwB;EAC7C,OAAO,IAAAN,4CAAqB,EAACI,OAAO,EAAEC,aAAa,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAME,oBAAoB,GAAI3D,IAAY,IAAW;EAC1DwC,qBAAa,CAACmB,oBAAoB,CAAC3D,IAAI,CAAC;AAC1C,CAAC;;AAED;AACA;AACA;AAFA+C,OAAA,CAAAY,oBAAA,GAAAA,oBAAA;AAGO,SAASC,SAASA,CAAA,EAAY;EACnC,MAAM9B,MAAM,GAAGU,qBAAa,CAACD,aAAa;EAC1C,MAAMsB,WAAW,GAAG/B,MAAM,CAACV,MAAM,EAAE0C,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAAC/D,IAAI,KAAKC,iBAAiB,CAAC;EAC5E,OAAO,CAAC,EAAE4D,WAAW,EAAE3D,cAAc,IAAI2D,WAAW,EAAE1D,YAAY,CAAC;AACrE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,eAAeoB,MAAMA,CAACyC,KAAa,EAAoB;EAC5D,OAAOxB,qBAAa,CAACyB,QAAQ,CAACD,KAAK,CAAC;AACtC","ignoreList":[]}

package/lib/commonjs/web/NativeAudioBrowser.js

@@ -247,6 +247,27 @@ class NativeAudioBrowser extends _TrackPlayer.PlaylistPlayer {
     void this.navigateTrackAsync(track, url);
   }
 
+  /**
+   * Centralizes handleTrackLoad interception logic.
+   * If handleTrackLoad is set on configuration, calls it (intercepted). Otherwise runs defaultBehavior.
+   *
+   * @returns true if the handler intercepted, false if defaultBehavior ran
+   */
+  async handleLoad(track, queue, startIndex, defaultBehavior) {
+    const handler = this.configuration.handleTrackLoad;
+    if (handler) {
+      const event = {
+        track,
+        queue,
+        startIndex
+      };
+      await handler(event);
+      return true;
+    }
+    defaultBehavior();
+    return false;
+  }
+
   /**
    * Attempts to skip to a track already in the current queue.
    * Used as an optimization to avoid re-expanding the queue.
@@ -255,7 +276,7 @@ class NativeAudioBrowser extends _TrackPlayer.PlaylistPlayer {
    * @param parentPath The parent path to check against queueSourcePath
    * @returns true if successfully skipped to existing track, false otherwise
    */
-  trySkipToExistingQueueTrack(trackId, parentPath) {
+  async trySkipToExistingQueueTrack(trackId, parentPath) {
     if (parentPath !== this.browserManager.queueSourcePath) {
       return false;
     }
@@ -264,8 +285,10 @@ class NativeAudioBrowser extends _TrackPlayer.PlaylistPlayer {
     if (index < 0) {
       return false;
     }
-    this.skip(index);
-    this.play();
+    await this.handleLoad(queue[index], queue, index, () => {
+      this.skip(index);
+      this.play();
+    });
     return true;
   }
 
@@ -280,7 +303,9 @@ class NativeAudioBrowser extends _TrackPlayer.PlaylistPlayer {
     if (result.tracks.length === 0) {
       return false;
     }
-    this.setQueue(result.tracks, result.startIndex);
+    await this.handleLoad(track, result.tracks, result.startIndex, () => {
+      this.setQueue(result.tracks, result.startIndex);
+    });
     return true;
   }
 
@@ -296,7 +321,7 @@ class NativeAudioBrowser extends _TrackPlayer.PlaylistPlayer {
         const trackId = _BrowserPathHelper.BrowserPathHelper.extractTrackId(url);
 
         // Optimization: skip to track if already in current queue
-        if (trackId && this.trySkipToExistingQueueTrack(trackId, parentPath)) {
+        if (trackId && (await this.trySkipToExistingQueueTrack(trackId, parentPath))) {
           return;
         }
 
@@ -306,7 +331,7 @@ class NativeAudioBrowser extends _TrackPlayer.PlaylistPlayer {
         }
 
         // Fallback: load single track if expansion fails
-        this.load(track);
+        await this.handleLoad(track, [track], 0, () => this.load(track));
         return;
       }
 
@@ -320,7 +345,7 @@ class NativeAudioBrowser extends _TrackPlayer.PlaylistPlayer {
 
       // Handle playable track (has src but no URL)
       if (track.src) {
-        this.load(track);
+        await this.handleLoad(track, [track], 0, () => this.load(track));
         return;
       }
       throw new Error("Track must have either 'url' or 'src' property");