react-native-audio-browser 0.2.0-next.23 → 0.2.0-next.25

package/android/gradle.properties

@@ -3,4 +3,4 @@ AudioBrowser_minSdkVersion=23
 AudioBrowser_targetSdkVersion=35
 AudioBrowser_compileSdkVersion=35
 AudioBrowser_ndkVersion=27.1.12297006
-AudioBrowser_media3Version=1.11.0
+AudioBrowser_media3Version=1.11.1

package/android/src/main/java/com/audiobrowser/AudioBrowser.kt

@@ -87,6 +87,7 @@ import com.margelo.nitro.audiobrowser.TimedMetadata
 import com.margelo.nitro.audiobrowser.Track
 import com.margelo.nitro.audiobrowser.TrackMetadata
 import com.margelo.nitro.audiobrowser.TransformableRequestConfig
+import com.margelo.nitro.core.NullType
 import com.margelo.nitro.core.Promise
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference
@@ -519,7 +520,15 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     val default = defaultFormattedError(error)
     val formatter = _configuration.formatNavigationError ?: return default
     return formattedOrDefault(mainScope, default) {
-      formatter(FormatNavigationErrorParams(error, default, path)).await()
+      formatter(
+          FormatNavigationErrorParams(
+            error,
+            default,
+            path,
+            BrowserPathHelper.navigationErrorKind(path),
+          )
+        )
+        .await()
     }
   }
 
@@ -908,24 +917,27 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
   // ============================================================================
 
   override fun load(track: Track) {
+    // Throws without a player, as on iOS: a track asked for and silently dropped hides a mistake.
+    val player = player
     launchInScope { player.load(track) }
   }
 
-  override fun reset() = runBlockingOnMain {
-    player.stop()
-    player.clear()
-    // clear() while IDLE emits no engine event, so the state machine never
-    // leaves STOPPED — a reset queue is "nothing loaded".
-    player.setPlaybackState(PlaybackState.NONE)
-  }
+  override fun reset() =
+    commandPlayer("reset") { player ->
+      player.stop()
+      player.clear()
+      // clear() while IDLE emits no engine event, so the state machine never
+      // leaves STOPPED — a reset queue is "nothing loaded".
+      player.setPlaybackState(PlaybackState.NONE)
+    }
 
-  override fun play() = runBlockingOnMain { player.play() }
+  override fun play() = commandPlayer("play") { it.play() }
 
-  override fun pause() = runBlockingOnMain { player.pause() }
+  override fun pause() = commandPlayer("pause") { it.pause() }
 
-  override fun togglePlayback() = runBlockingOnMain { player.togglePlayback() }
+  override fun togglePlayback() = commandPlayer("togglePlayback") { it.togglePlayback() }
 
-  override fun stop() = runBlockingOnMain { player.stop() }
+  override fun stop() = commandPlayer("stop") { it.stop() }
 
   override fun setPlayWhenReady(playWhenReady: Boolean) = runBlockingOnMain {
     // Pre-setup this stages the intent for the player to come up with — never throws.
@@ -937,35 +949,41 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     connectedService?.player?.playWhenReady ?: pendingPlayWhenReady ?: false
   }
 
-  override fun seekTo(position: Double) = runBlockingOnMain {
-    player.seekTo((position * 1000).toLong(), TimeUnit.MILLISECONDS)
-  }
+  override fun seekTo(position: Double) =
+    commandPlayer("seekTo") { player ->
+      player.seekTo((position * 1000).toLong(), TimeUnit.MILLISECONDS)
+    }
 
-  override fun seekBy(offset: Double) = runBlockingOnMain {
-    player.seekBy((offset * 1000).toLong(), TimeUnit.MILLISECONDS)
-  }
+  override fun seekBy(offset: Double) =
+    commandPlayer("seekBy") { player ->
+      player.seekBy((offset * 1000).toLong(), TimeUnit.MILLISECONDS)
+    }
 
-  override fun seekToLiveEdge() = runBlockingOnMain { player.seekToLiveEdge() }
+  override fun seekToLiveEdge() = commandPlayer("seekToLiveEdge") { it.seekToLiveEdge() }
 
-  override fun setVolume(level: Double) = runBlockingOnMain { player.volume = level.toFloat() }
+  override fun setVolume(level: Double) = commandPlayer("setVolume") { it.volume = level.toFloat() }
 
-  override fun getVolume(): Double = runBlockingOnMain { player.volume.toDouble() }
+  override fun getVolume(): Double = readPlayer(1.0) { it.volume.toDouble() }
 
-  override fun setRate(rate: Double) = runBlockingOnMain { player.playbackSpeed = rate.toFloat() }
+  override fun setRate(rate: Double) =
+    commandPlayer("setRate") { it.playbackSpeed = rate.toFloat() }
 
-  override fun getRate(): Double = runBlockingOnMain { player.playbackSpeed.toDouble() }
+  override fun getRate(): Double = readPlayer(1.0) { it.playbackSpeed.toDouble() }
 
-  override fun getProgress(): Progress = runBlockingOnMain {
-    Progress(
-      duration = player.duration.toSeconds(),
-      position = player.position.toSeconds(),
-      buffered = player.bufferedPosition.toSeconds(),
-    )
-  }
+  override fun getProgress(): Progress =
+    readPlayer(Progress(duration = 0.0, position = 0.0, buffered = 0.0)) { player ->
+      Progress(
+        duration = player.duration.toSeconds(),
+        position = player.position.toSeconds(),
+        buffered = player.bufferedPosition.toSeconds(),
+      )
+    }
 
-  override fun getPlayback(): Playback = runBlockingOnMain { player.getPlayback() }
+  override fun getPlayback(): Playback =
+    readPlayer(Playback(PlaybackState.NONE, null)) { it.getPlayback() }
 
-  override fun getPlayingState(): PlayingState = runBlockingOnMain { player.getPlayingState() }
+  override fun getPlayingState(): PlayingState =
+    readPlayer(PlayingState(playing = false, buffering = false)) { it.getPlayingState() }
 
   override fun getRepeatMode(): RepeatMode = runBlockingOnMain {
     connectedService?.player?.repeatMode ?: pendingRepeatMode ?: RepeatMode.OFF
@@ -976,121 +994,121 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     connectedService?.player?.let { it.repeatMode = mode } ?: run { pendingRepeatMode = mode }
   }
 
-  override fun getShuffleEnabled(): Boolean = runBlockingOnMain { player.shuffleMode }
+  override fun getShuffleEnabled(): Boolean = readPlayer(false) { it.shuffleMode }
 
-  override fun setShuffleEnabled(enabled: Boolean) = runBlockingOnMain {
-    player.shuffleMode = enabled
-  }
+  override fun setShuffleEnabled(enabled: Boolean) =
+    commandPlayer("setShuffleEnabled") { player -> player.shuffleMode = enabled }
 
-  override fun setPlaybackIntervalEnabled(enabled: Boolean) = runBlockingOnMain {
-    player.setPlaybackIntervalEnabled(enabled)
-  }
+  override fun setPlaybackIntervalEnabled(enabled: Boolean) =
+    commandPlayer("setPlaybackIntervalEnabled") { player ->
+      player.setPlaybackIntervalEnabled(enabled)
+    }
 
-  override fun getPlaybackError(): PlaybackError? = runBlockingOnMain { player.playbackError }
+  override fun getPlaybackError(): PlaybackError? = readPlayer(null) { it.playbackError }
 
-  override fun retry() = runBlockingOnMain { player.prepare() }
+  override fun retry() = commandPlayer("retry") { it.prepare() }
 
   // ============================================================================
   // MARK: Queue Management
   // ============================================================================
 
-  override fun add(tracks: Array<Track>, insertBeforeIndex: Double?) = runBlockingOnMain {
-    val inputIndex = insertBeforeIndex?.toInt() ?: -1
-    player.add(tracks, inputIndex)
-  }
+  override fun add(tracks: Array<Track>, insertBeforeIndex: Double?) =
+    commandPlayer("add") { player ->
+      val inputIndex = insertBeforeIndex?.toInt() ?: -1
+      player.add(tracks, inputIndex)
+    }
 
-  override fun move(fromIndex: Double, toIndex: Double) = runBlockingOnMain {
-    player.move(fromIndex.toInt(), toIndex.toInt())
-  }
+  override fun move(fromIndex: Double, toIndex: Double) =
+    commandPlayer("move") { player -> player.move(fromIndex.toInt(), toIndex.toInt()) }
 
-  override fun remove(indexes: DoubleArray) = runBlockingOnMain {
-    val indexList = indexes.map { it.toInt() }
-    player.remove(indexList)
-  }
+  override fun remove(indexes: DoubleArray) =
+    commandPlayer("remove") { player ->
+      val indexList = indexes.map { it.toInt() }
+      player.remove(indexList)
+    }
 
-  override fun removeUpcomingTracks() = runBlockingOnMain { player.removeUpcomingTracks() }
+  override fun removeUpcomingTracks() =
+    commandPlayer("removeUpcomingTracks") { it.removeUpcomingTracks() }
 
-  override fun skip(index: Double, initialPosition: Double?) = runBlockingOnMain {
-    player.skipTo(index.toInt())
+  override fun skip(index: Double, initialPosition: Double?) =
+    commandPlayer("skip") { player ->
+      player.skipTo(index.toInt())
 
-    if (initialPosition != null && initialPosition >= 0) {
-      player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
+      if (initialPosition != null && initialPosition >= 0) {
+        player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
+      }
     }
-  }
 
-  override fun skipToNext(initialPosition: Double?) = runBlockingOnMain {
-    player.next()
+  override fun skipToNext(initialPosition: Double?) =
+    commandPlayer("skipToNext") { player ->
+      player.next()
 
-    if (initialPosition != null && initialPosition >= 0) {
-      player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
+      if (initialPosition != null && initialPosition >= 0) {
+        player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
+      }
     }
-  }
 
-  override fun skipToPrevious(initialPosition: Double?) = runBlockingOnMain {
-    player.previous()
+  override fun skipToPrevious(initialPosition: Double?) =
+    commandPlayer("skipToPrevious") { player ->
+      player.previous()
 
-    if (initialPosition != null && initialPosition >= 0) {
-      player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
+      if (initialPosition != null && initialPosition >= 0) {
+        player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
+      }
     }
-  }
 
   override fun setQueue(tracks: Array<Track>, startIndex: Double?, startPosition: Double?) =
-    runBlockingOnMain {
+    commandPlayer("setQueue") { player ->
       player.setQueue(tracks, startIndex?.toInt() ?: 0, ((startPosition ?: 0.0) * 1000).toLong())
     }
 
-  override fun setActiveTrackFavorited(favorited: Boolean): Unit = runBlockingOnMain {
-    // Applied-result is for MediaSession honesty; the JS API stays fire-and-forget.
-    player.setActiveTrackFavorited(favorited)
-    Unit
-  }
+  override fun setActiveTrackFavorited(favorited: Boolean): Unit =
+    commandPlayer("setActiveTrackFavorited") { player ->
+      // Applied-result is for MediaSession honesty; the JS API stays fire-and-forget.
+      player.setActiveTrackFavorited(favorited)
+    }
 
-  override fun toggleActiveTrackFavorited(): Unit = runBlockingOnMain {
-    player.toggleActiveTrackFavorited()
-    Unit
-  }
+  override fun toggleActiveTrackFavorited(): Unit =
+    commandPlayer("toggleActiveTrackFavorited") { it.toggleActiveTrackFavorited() }
 
-  override fun getQueue(): Array<Track> = runBlockingOnMain { player.tracks }
+  override fun getQueue(): Array<Track> = readPlayer(emptyArray()) { it.tracks }
 
-  override fun getTrack(index: Double): Track? = runBlockingOnMain {
-    try {
-      player.getTrack(index.toInt())
-    } catch (e: IllegalArgumentException) {
-      null
+  override fun getTrack(index: Double): Track? =
+    readPlayer(null) { player ->
+      try {
+        player.getTrack(index.toInt())
+      } catch (e: IllegalArgumentException) {
+        null
+      }
     }
-  }
 
-  override fun getActiveTrackIndex(): Double? = runBlockingOnMain {
-    player.currentIndex?.toDouble()
-  }
+  override fun getActiveTrackIndex(): Double? = readPlayer(null) { it.currentIndex?.toDouble() }
 
-  override fun getActiveTrack(): Track? = runBlockingOnMain { player.currentTrack }
+  override fun getActiveTrack(): Track? = readPlayer(null) { it.currentTrack }
 
   // ============================================================================
   // MARK: Now Playing Metadata
   // ============================================================================
 
-  override fun updateNowPlaying(update: NowPlayingUpdate?) = runBlockingOnMain {
-    player.nowPlaying.updateNowPlaying(update)
-  }
+  override fun updateNowPlaying(update: NowPlayingUpdate?) =
+    commandPlayer("updateNowPlaying") { player -> player.nowPlaying.updateNowPlaying(update) }
 
-  override fun flashNowPlaying(update: NowPlayingUpdate, durationMs: Double) = runBlockingOnMain {
-    player.nowPlaying.flashNowPlaying(update, durationMs)
-  }
+  override fun flashNowPlaying(update: NowPlayingUpdate, durationMs: Double) =
+    commandPlayer("flashNowPlaying") { player ->
+      player.nowPlaying.flashNowPlaying(update, durationMs)
+    }
 
-  override fun clearNowPlayingFlash() = runBlockingOnMain {
-    player.nowPlaying.clearNowPlayingFlash()
-  }
+  override fun clearNowPlayingFlash() =
+    commandPlayer("clearNowPlayingFlash") { player -> player.nowPlaying.clearNowPlayingFlash() }
 
-  override fun getNowPlaying(): NowPlayingMetadata? = runBlockingOnMain {
-    player.nowPlaying.getNowPlaying()
-  }
+  override fun getNowPlaying(): NowPlayingMetadata? =
+    readPlayer(null) { player -> player.nowPlaying.getNowPlaying() }
 
   // ============================================================================
   // MARK: Network Connectivity
   // ============================================================================
 
-  override fun getOnline(): Boolean = runBlockingOnMain { player.getOnline() }
+  override fun getOnline(): Boolean = readPlayer(true) { it.getOnline() }
 
   // ============================================================================
   // MARK: System Volume
@@ -1116,35 +1134,32 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
   // MARK: Equalizer (Android only)
   // ============================================================================
 
-  override fun getEqualizerSettings(): EqualizerSettings? = runBlockingOnMain {
-    player.equalizer.getSettings()
-  }
+  override fun getEqualizerSettings(): EqualizerSettings? =
+    readPlayer(null) { player -> player.equalizer.getSettings() }
 
-  override fun setEqualizerEnabled(enabled: Boolean) = runBlockingOnMain {
-    player.equalizer.setEnabled(enabled)
-  }
+  override fun setEqualizerEnabled(enabled: Boolean) =
+    commandPlayer("setEqualizerEnabled") { player -> player.equalizer.setEnabled(enabled) }
 
-  override fun setEqualizerPreset(preset: String) = runBlockingOnMain {
-    player.equalizer.setPreset(preset)
-  }
+  override fun setEqualizerPreset(preset: String) =
+    commandPlayer("setEqualizerPreset") { player -> player.equalizer.setPreset(preset) }
 
-  override fun setEqualizerLevels(levels: DoubleArray) = runBlockingOnMain {
-    player.equalizer.setLevels(levels)
-  }
+  override fun setEqualizerLevels(levels: DoubleArray) =
+    commandPlayer("setEqualizerLevels") { player -> player.equalizer.setLevels(levels) }
 
   // ============================================================================
   // MARK: Sleep Timer
   // ============================================================================
 
-  override fun getSleepTimer(): SleepTimer = runBlockingOnMain { player.sleepTimer.get() }
+  override fun getSleepTimer(): SleepTimer =
+    readPlayer(SleepTimer.create(NullType.NULL)) { it.sleepTimer.get() }
 
-  override fun setSleepTimer(seconds: Double, fadeDuration: Double?) = runBlockingOnMain {
-    player.sleepTimer.setAfter(seconds, fadeDuration)
-  }
+  override fun setSleepTimer(seconds: Double, fadeDuration: Double?) =
+    commandPlayer("setSleepTimer") { player -> player.sleepTimer.setAfter(seconds, fadeDuration) }
 
-  override fun setSleepTimerToEndOfTrack() = runBlockingOnMain { player.sleepTimer.setEndOfTrack() }
+  override fun setSleepTimerToEndOfTrack() =
+    commandPlayer("setSleepTimerToEndOfTrack") { it.sleepTimer.setEndOfTrack() }
 
-  override fun clearSleepTimer(): Boolean = runBlockingOnMain { player.sleepTimer.clear() }
+  override fun clearSleepTimer(): Boolean = readPlayer(false) { it.sleepTimer.clear() }
 
   // ============================================================================
   // MARK: Battery Optimization (Android only)
@@ -1285,6 +1300,29 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
   private val service: Service
     get() = connectedService ?: throw Exception("Player not initialized")
 
+  /**
+   * The player while its service is connected: not before setupPlayer, nor while the service
+   * restarts.
+   */
+  private val connectedPlayer: Player?
+    get() = connectedService?.player
+
+  /** What [read] gets from the player, or without one [fallback], the answer iOS gives then. */
+  private fun <T> readPlayer(fallback: T, read: suspend (Player) -> T): T = runBlockingOnMain {
+    val player = connectedPlayer ?: return@runBlockingOnMain fallback
+    read(player)
+  }
+
+  /** Runs [command] on the player; without one it is dropped with a warning, as iOS drops it. */
+  private fun commandPlayer(name: String, command: suspend (Player) -> Unit) = runBlockingOnMain {
+    val player = connectedPlayer
+    if (player == null) {
+      Timber.w("$name before the player is set up, or while its service restarts: ignored")
+    } else {
+      command(player)
+    }
+  }
+
   internal val player
     get() = service.player
 

package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt

@@ -2,6 +2,7 @@ package com.audiobrowser.util
 
 import android.net.Uri
 import androidx.core.net.toUri
+import com.margelo.nitro.audiobrowser.NavigationErrorKind
 import java.net.URLEncoder
 
 /**
@@ -49,6 +50,11 @@ object BrowserPathHelper {
   // Query parameter name for the tapped child's page position (tie-breaker)
   private const val CONTEXTUAL_INDEX_PARAM = "__index"
 
+  /** Whether a navigation error on this path came from a browse or a search */
+  fun navigationErrorKind(path: String): NavigationErrorKind =
+    if (path.startsWith("$SEARCH_PATH_PREFIX?")) NavigationErrorKind.SEARCH
+    else NavigationErrorKind.BROWSE
+
   /** Check if a path is a special system path (not a regular navigation path) */
   fun isSpecialPath(path: String): Boolean {
     return path == ROOT_PATH || path.startsWith("$SEARCH_PATH_PREFIX?")

package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt

@@ -1,5 +1,6 @@
 package com.audiobrowser.util
 
+import com.margelo.nitro.audiobrowser.NavigationErrorKind
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
@@ -50,4 +51,17 @@ class BrowserPathHelperTest {
     assertNull(BrowserPathHelper.extractIndex("/library?__trackId=song.mp3&__index=x"))
     assertNull(BrowserPathHelper.extractIndex("/library?__trackId=song.mp3&__index=-1"))
   }
+
+  @Test
+  fun `a search path is a search, anything else a browse`() {
+    assertEquals(
+      NavigationErrorKind.SEARCH,
+      BrowserPathHelper.navigationErrorKind(BrowserPathHelper.createSearchPath("jazz")),
+    )
+    assertEquals(
+      NavigationErrorKind.BROWSE,
+      BrowserPathHelper.navigationErrorKind("/search?q=jazz"),
+    )
+    assertEquals(NavigationErrorKind.BROWSE, BrowserPathHelper.navigationErrorKind("/__searchable"))
+  }
 }

package/ios/Browser/BrowserPathHelper.swift

@@ -44,8 +44,12 @@ enum BrowserPathHelper {
 
   /// Check if a path is a special system path (not a regular navigation path)
   static func isSpecialPath(_ path: String) -> Bool {
-    path == rootPath ||
-      path.hasPrefix("\(searchPathPrefix)?")
+    path == rootPath || isSearchPath(path)
+  }
+
+  /// Check if a path is a search path (`/__search?q=…`)
+  static func isSearchPath(_ path: String) -> Bool {
+    path.hasPrefix("\(searchPathPrefix)?")
   }
 
   /// Create a search path for a given query

package/ios/CarPlay/CarPlayController.swift

@@ -784,6 +784,7 @@ public final class RNABCarPlayController: NSObject {
     guard let formatter = config.formatNavigationError else { return fallback }
     let params = FormatNavigationErrorParams(
       error: navError, defaultFormatted: fallback, path: path,
+      kind: NavigationErrorKind(path: path),
     )
     do {
       let custom = try await formatter(params).await()
@@ -1317,7 +1318,10 @@ public final class RNABCarPlayController: NSObject {
     if let formatter = config.formatNavigationError {
       logger.debug("Calling formatNavigationError callback...")
       // Call the JS callback and handle result
-      let params = FormatNavigationErrorParams(error: error, defaultFormatted: defaultFormatted, path: path)
+      let params = FormatNavigationErrorParams(
+        error: error, defaultFormatted: defaultFormatted, path: path,
+        kind: NavigationErrorKind(path: path),
+      )
       // The result callbacks are @Sendable and hop back explicitly: Nitro resolves
       // its promises synchronously on the JS thread, so a plain closure would
       // inherit this type's MainActor isolation and trap on entry under Swift 6's

package/ios/Extension/NavigationError+Conversion.swift

@@ -54,3 +54,10 @@ extension NavigationError {
     return FormattedNavigationError(title: title, message: message.isEmpty ? nil : message)
   }
 }
+
+extension NavigationErrorKind {
+  /// The kind of request a navigation error on `path` came from.
+  init(path: String) {
+    self = BrowserPathHelper.isSearchPath(path) ? .search : .browse
+  }
+}

package/ios/HybridAudioBrowser.swift

@@ -465,7 +465,10 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
     // Format the error (async if using JS callback, sync for defaults)
     let defaultFormatted = navError.defaultFormatted()
     if let formatter = onMainActor({ browserManager.config.formatNavigationError }) {
-      let params = FormatNavigationErrorParams(error: navError, defaultFormatted: defaultFormatted, path: path)
+      let params = FormatNavigationErrorParams(
+        error: navError, defaultFormatted: defaultFormatted, path: path,
+        kind: NavigationErrorKind(path: path),
+      )
       // Dispatch to main thread for the Nitro bridge call to avoid C++ noexcept crashes.
       // The result callbacks are @Sendable: a plain closure would inherit MainActor
       // isolation from this block, and Nitro resolves its promises synchronously on the

package/ios/Tests/BrowserPathHelperTests.swift

@@ -166,3 +166,14 @@ import Testing
 @Test func isContextualReturnsTrueWithAmpersandSeparator() {
   #expect(BrowserPathHelper.isContextual("/lib?q=1&__trackId=x") == true)
 }
+
+// MARK: - isSearchPath
+
+@Test func isSearchPathMatchesCreatedSearchPaths() {
+  #expect(BrowserPathHelper.isSearchPath(BrowserPathHelper.createSearchPath("jazz")) == true)
+}
+
+@Test func isSearchPathRejectsBrowsePaths() {
+  #expect(BrowserPathHelper.isSearchPath("/search?q=jazz") == false)
+  #expect(BrowserPathHelper.isSearchPath("/__searchable") == false)
+}

package/lib/commonjs/web/browser/NavigationErrorManager.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NavigationErrorManager = void 0;
+var _BrowserPathHelper = require("../util/BrowserPathHelper");
 const ERROR_TITLES = {
   'network-error': 'Network Error',
   'http-error': 'Server Error',
@@ -77,7 +78,8 @@ class NavigationErrorManager {
         const customFormatted = this.formatCallback({
           error: navError,
           defaultFormatted,
-          path
+          path,
+          kind: _BrowserPathHelper.BrowserPathHelper.navigationErrorKind(path)
         });
         this._formattedNavigationError = customFormatted || defaultFormatted;
       } catch (error) {

package/lib/commonjs/web/browser/NavigationErrorManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","console","getNavigationError","getFormattedNavigationError","exports"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;;;;;AAQA,MAAMA,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE,OAAO;EACxB,eAAe,EAAE,cAAc;EAC/B,SAAS,EAAE;AACb,CAAC;;AAED;AACA;AACA;AACA;AACO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,GAEdA,CAAA,KAAM,CAAC,CAAC;;EAEpB;AACF;AACA;EACEC,iBAAiBA,CACfC,QAA6D,EACvD;IACN,IAAI,CAACC,cAAc,GAAGD,QAAQ;EAChC;;EAEA;AACF;AACA;EACEE,oBAAoBA,CAAA,EAAS;IAC3B,IACE,IAAI,CAACC,gBAAgB,KAAKC,SAAS,IACnC,IAAI,CAACC,yBAAyB,KAAKD,SAAS,EAC5C;MACA,IAAI,CAACD,gBAAgB,GAAGC,SAAS;MACjC,IAAI,CAACC,yBAAyB,GAAGD,SAAS;MAC1C,IAAI,CAACP,iBAAiB,CAAC;QAAES,KAAK,EAAEF;MAAU,CAAC,CAAC;MAC5C,IAAI,CAACN,0BAA0B,CAACM,SAAS,CAAC;IAC5C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,IAAyB,EACzBC,OAAe,EACfC,IAAa,EACbC,UAAmB,EACb;IACN,MAAMC,QAAyB,GAAG;MAChCJ,IAAI;MACJC,OAAO;MACPE,UAAU;MACVE,iBAAiB,EAAET;IACrB,CAAC;IACD,IAAI,CAACD,gBAAgB,GAAGS,QAAQ;IAChC,IAAI,CAACf,iBAAiB,CAAC;MAAES,KAAK,EAAEM;IAAS,CAAC,CAAC;;IAE3C;IACA,MAAME,gBAA0C,GAAG;MACjDC,KAAK,EAAEpB,YAAY,CAACa,IAAI,CAAC;MACzBC;IACF,CAAC;;IAED;IACA,IAAI,IAAI,CAACR,cAAc,IAAIS,IAAI,EAAE;MAC/B,IAAI;QACF,MAAMM,eAAe,GAAG,IAAI,CAACf,cAAc,CAAC;UAC1CK,KAAK,EAAEM,QAAQ;UACfE,gBAAgB;UAChBJ;QACF,CAAC,CAAC;QACF,IAAI,CAACL,yBAAyB,GAAGW,eAAe,IAAIF,gBAAgB;MACtE,CAAC,CAAC,OAAOR,KAAK,EAAE;QACdW,OAAO,CAACX,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;QAChE,IAAI,CAACD,yBAAyB,GAAGS,gBAAgB;MACnD;IACF,CAAC,MAAM;MACL,IAAI,CAACT,yBAAyB,GAAGS,gBAAgB;IACnD;IAEA,IAAI,CAAChB,0BAA0B,CAAC,IAAI,CAACO,yBAAyB,CAAC;EACjE;;EAEA;AACF;AACA;EACEa,kBAAkBA,CAAA,EAAgC;IAChD,OAAO,IAAI,CAACf,gBAAgB;EAC9B;;EAEA;AACF;AACA;EACEgB,2BAA2BA,CAAA,EAAyC;IAClE,OAAO,IAAI,CAACd,yBAAyB;EACvC;AACF;AAACe,OAAA,CAAAxB,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["_BrowserPathHelper","require","ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","kind","BrowserPathHelper","navigationErrorKind","console","getNavigationError","getFormattedNavigationError","exports"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;;;;;AAOA,IAAAA,kBAAA,GAAAC,OAAA;AAEA,MAAMC,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE,OAAO;EACxB,eAAe,EAAE,cAAc;EAC/B,SAAS,EAAE;AACb,CAAC;;AAED;AACA;AACA;AACA;AACO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,GAEdA,CAAA,KAAM,CAAC,CAAC;;EAEpB;AACF;AACA;EACEC,iBAAiBA,CACfC,QAA6D,EACvD;IACN,IAAI,CAACC,cAAc,GAAGD,QAAQ;EAChC;;EAEA;AACF;AACA;EACEE,oBAAoBA,CAAA,EAAS;IAC3B,IACE,IAAI,CAACC,gBAAgB,KAAKC,SAAS,IACnC,IAAI,CAACC,yBAAyB,KAAKD,SAAS,EAC5C;MACA,IAAI,CAACD,gBAAgB,GAAGC,SAAS;MACjC,IAAI,CAACC,yBAAyB,GAAGD,SAAS;MAC1C,IAAI,CAACP,iBAAiB,CAAC;QAAES,KAAK,EAAEF;MAAU,CAAC,CAAC;MAC5C,IAAI,CAACN,0BAA0B,CAACM,SAAS,CAAC;IAC5C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,IAAyB,EACzBC,OAAe,EACfC,IAAa,EACbC,UAAmB,EACb;IACN,MAAMC,QAAyB,GAAG;MAChCJ,IAAI;MACJC,OAAO;MACPE,UAAU;MACVE,iBAAiB,EAAET;IACrB,CAAC;IACD,IAAI,CAACD,gBAAgB,GAAGS,QAAQ;IAChC,IAAI,CAACf,iBAAiB,CAAC;MAAES,KAAK,EAAEM;IAAS,CAAC,CAAC;;IAE3C;IACA,MAAME,gBAA0C,GAAG;MACjDC,KAAK,EAAEpB,YAAY,CAACa,IAAI,CAAC;MACzBC;IACF,CAAC;;IAED;IACA,IAAI,IAAI,CAACR,cAAc,IAAIS,IAAI,EAAE;MAC/B,IAAI;QACF,MAAMM,eAAe,GAAG,IAAI,CAACf,cAAc,CAAC;UAC1CK,KAAK,EAAEM,QAAQ;UACfE,gBAAgB;UAChBJ,IAAI;UACJO,IAAI,EAAEC,oCAAiB,CAACC,mBAAmB,CAACT,IAAI;QAClD,CAAC,CAAC;QACF,IAAI,CAACL,yBAAyB,GAAGW,eAAe,IAAIF,gBAAgB;MACtE,CAAC,CAAC,OAAOR,KAAK,EAAE;QACdc,OAAO,CAACd,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;QAChE,IAAI,CAACD,yBAAyB,GAAGS,gBAAgB;MACnD;IACF,CAAC,MAAM;MACL,IAAI,CAACT,yBAAyB,GAAGS,gBAAgB;IACnD;IAEA,IAAI,CAAChB,0BAA0B,CAAC,IAAI,CAACO,yBAAyB,CAAC;EACjE;;EAEA;AACF;AACA;EACEgB,kBAAkBA,CAAA,EAAgC;IAChD,OAAO,IAAI,CAAClB,gBAAgB;EAC9B;;EAEA;AACF;AACA;EACEmB,2BAA2BA,CAAA,EAAyC;IAClE,OAAO,IAAI,CAACjB,yBAAyB;EACvC;AACF;AAACkB,OAAA,CAAA3B,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/commonjs/web/util/BrowserPathHelper.js

@@ -31,6 +31,12 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
   CONTEXTUAL_TRACK_PARAM: '__trackId',
   /** Query parameter name for the tapped child's page position (tie-breaker) */
   CONTEXTUAL_INDEX_PARAM: '__index',
+  /**
+   * Whether a navigation error on this path came from a browse or a search
+   */
+  navigationErrorKind(path) {
+    return path.startsWith(`${this.SEARCH_PATH_PREFIX}?`) ? 'search' : 'browse';
+  },
   /**
    * Create a search path for a given query
    */

package/lib/commonjs/web/util/BrowserPathHelper.js.map

@@ -1 +1 @@
-{"version":3,"names":["BrowserPathHelper","exports","SEARCH_PATH_PREFIX","CONTEXTUAL_TRACK_PARAM","CONTEXTUAL_INDEX_PARAM","createSearchPath","query","encodedQuery","encodeURIComponent","isContextual","path","includes","stripTrackId","url","isFullUrl","startsWith","urlObj","URL","undefined","searchParams","delete","toString","search","pathname","paramPattern","RegExp","result","replace","build","parentPath","trackId","index","separator","indexParam","extractTrackId","extractParam","extractIndex","raw","test","Number","parseInt","param","get","match","decodeURIComponent","buildUrl","baseUrl","normalizedBase","normalizedPath"],"sourceRoot":"../../../../src","sources":["web/util/BrowserPathHelper.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["BrowserPathHelper","exports","SEARCH_PATH_PREFIX","CONTEXTUAL_TRACK_PARAM","CONTEXTUAL_INDEX_PARAM","navigationErrorKind","path","startsWith","createSearchPath","query","encodedQuery","encodeURIComponent","isContextual","includes","stripTrackId","url","isFullUrl","urlObj","URL","undefined","searchParams","delete","toString","search","pathname","paramPattern","RegExp","result","replace","build","parentPath","trackId","index","separator","indexParam","extractTrackId","extractParam","extractIndex","raw","test","Number","parseInt","param","get","match","decodeURIComponent","buildUrl","baseUrl","normalizedBase","normalizedPath"],"sourceRoot":"../../../../src","sources":["web/util/BrowserPathHelper.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/browser/NavigationErrorManager.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { BrowserPathHelper } from '../util/BrowserPathHelper';
 const ERROR_TITLES = {
   'network-error': 'Network Error',
   'http-error': 'Server Error',
@@ -73,7 +74,8 @@ export class NavigationErrorManager {
         const customFormatted = this.formatCallback({
           error: navError,
           defaultFormatted,
-          path
+          path,
+          kind: BrowserPathHelper.navigationErrorKind(path)
         });
         this._formattedNavigationError = customFormatted || defaultFormatted;
       } catch (error) {

package/lib/module/web/browser/NavigationErrorManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","console","getNavigationError","getFormattedNavigationError"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;AAQA,MAAMA,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE,OAAO;EACxB,eAAe,EAAE,cAAc;EAC/B,SAAS,EAAE;AACb,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,GAEdA,CAAA,KAAM,CAAC,CAAC;;EAEpB;AACF;AACA;EACEC,iBAAiBA,CACfC,QAA6D,EACvD;IACN,IAAI,CAACC,cAAc,GAAGD,QAAQ;EAChC;;EAEA;AACF;AACA;EACEE,oBAAoBA,CAAA,EAAS;IAC3B,IACE,IAAI,CAACC,gBAAgB,KAAKC,SAAS,IACnC,IAAI,CAACC,yBAAyB,KAAKD,SAAS,EAC5C;MACA,IAAI,CAACD,gBAAgB,GAAGC,SAAS;MACjC,IAAI,CAACC,yBAAyB,GAAGD,SAAS;MAC1C,IAAI,CAACP,iBAAiB,CAAC;QAAES,KAAK,EAAEF;MAAU,CAAC,CAAC;MAC5C,IAAI,CAACN,0BAA0B,CAACM,SAAS,CAAC;IAC5C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,IAAyB,EACzBC,OAAe,EACfC,IAAa,EACbC,UAAmB,EACb;IACN,MAAMC,QAAyB,GAAG;MAChCJ,IAAI;MACJC,OAAO;MACPE,UAAU;MACVE,iBAAiB,EAAET;IACrB,CAAC;IACD,IAAI,CAACD,gBAAgB,GAAGS,QAAQ;IAChC,IAAI,CAACf,iBAAiB,CAAC;MAAES,KAAK,EAAEM;IAAS,CAAC,CAAC;;IAE3C;IACA,MAAME,gBAA0C,GAAG;MACjDC,KAAK,EAAEpB,YAAY,CAACa,IAAI,CAAC;MACzBC;IACF,CAAC;;IAED;IACA,IAAI,IAAI,CAACR,cAAc,IAAIS,IAAI,EAAE;MAC/B,IAAI;QACF,MAAMM,eAAe,GAAG,IAAI,CAACf,cAAc,CAAC;UAC1CK,KAAK,EAAEM,QAAQ;UACfE,gBAAgB;UAChBJ;QACF,CAAC,CAAC;QACF,IAAI,CAACL,yBAAyB,GAAGW,eAAe,IAAIF,gBAAgB;MACtE,CAAC,CAAC,OAAOR,KAAK,EAAE;QACdW,OAAO,CAACX,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;QAChE,IAAI,CAACD,yBAAyB,GAAGS,gBAAgB;MACnD;IACF,CAAC,MAAM;MACL,IAAI,CAACT,yBAAyB,GAAGS,gBAAgB;IACnD;IAEA,IAAI,CAAChB,0BAA0B,CAAC,IAAI,CAACO,yBAAyB,CAAC;EACjE;;EAEA;AACF;AACA;EACEa,kBAAkBA,CAAA,EAAgC;IAChD,OAAO,IAAI,CAACf,gBAAgB;EAC9B;;EAEA;AACF;AACA;EACEgB,2BAA2BA,CAAA,EAAyC;IAClE,OAAO,IAAI,CAACd,yBAAyB;EACvC;AACF","ignoreList":[]}
+{"version":3,"names":["BrowserPathHelper","ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","kind","navigationErrorKind","console","getNavigationError","getFormattedNavigationError"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;AAOA,SAASA,iBAAiB,QAAQ,2BAA2B;AAE7D,MAAMC,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE,OAAO;EACxB,eAAe,EAAE,cAAc;EAC/B,SAAS,EAAE;AACb,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,GAEdA,CAAA,KAAM,CAAC,CAAC;;EAEpB;AACF;AACA;EACEC,iBAAiBA,CACfC,QAA6D,EACvD;IACN,IAAI,CAACC,cAAc,GAAGD,QAAQ;EAChC;;EAEA;AACF;AACA;EACEE,oBAAoBA,CAAA,EAAS;IAC3B,IACE,IAAI,CAACC,gBAAgB,KAAKC,SAAS,IACnC,IAAI,CAACC,yBAAyB,KAAKD,SAAS,EAC5C;MACA,IAAI,CAACD,gBAAgB,GAAGC,SAAS;MACjC,IAAI,CAACC,yBAAyB,GAAGD,SAAS;MAC1C,IAAI,CAACP,iBAAiB,CAAC;QAAES,KAAK,EAAEF;MAAU,CAAC,CAAC;MAC5C,IAAI,CAACN,0BAA0B,CAACM,SAAS,CAAC;IAC5C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,IAAyB,EACzBC,OAAe,EACfC,IAAa,EACbC,UAAmB,EACb;IACN,MAAMC,QAAyB,GAAG;MAChCJ,IAAI;MACJC,OAAO;MACPE,UAAU;MACVE,iBAAiB,EAAET;IACrB,CAAC;IACD,IAAI,CAACD,gBAAgB,GAAGS,QAAQ;IAChC,IAAI,CAACf,iBAAiB,CAAC;MAAES,KAAK,EAAEM;IAAS,CAAC,CAAC;;IAE3C;IACA,MAAME,gBAA0C,GAAG;MACjDC,KAAK,EAAEpB,YAAY,CAACa,IAAI,CAAC;MACzBC;IACF,CAAC;;IAED;IACA,IAAI,IAAI,CAACR,cAAc,IAAIS,IAAI,EAAE;MAC/B,IAAI;QACF,MAAMM,eAAe,GAAG,IAAI,CAACf,cAAc,CAAC;UAC1CK,KAAK,EAAEM,QAAQ;UACfE,gBAAgB;UAChBJ,IAAI;UACJO,IAAI,EAAEvB,iBAAiB,CAACwB,mBAAmB,CAACR,IAAI;QAClD,CAAC,CAAC;QACF,IAAI,CAACL,yBAAyB,GAAGW,eAAe,IAAIF,gBAAgB;MACtE,CAAC,CAAC,OAAOR,KAAK,EAAE;QACda,OAAO,CAACb,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;QAChE,IAAI,CAACD,yBAAyB,GAAGS,gBAAgB;MACnD;IACF,CAAC,MAAM;MACL,IAAI,CAACT,yBAAyB,GAAGS,gBAAgB;IACnD;IAEA,IAAI,CAAChB,0BAA0B,CAAC,IAAI,CAACO,yBAAyB,CAAC;EACjE;;EAEA;AACF;AACA;EACEe,kBAAkBA,CAAA,EAAgC;IAChD,OAAO,IAAI,CAACjB,gBAAgB;EAC9B;;EAEA;AACF;AACA;EACEkB,2BAA2BA,CAAA,EAAyC;IAClE,OAAO,IAAI,CAAChB,yBAAyB;EACvC;AACF","ignoreList":[]}