react-native-audio-browser 0.2.0-next.22 → 0.2.0-next.24

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

@@ -519,7 +519,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()
     }
   }
 

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/CPInterfaceController+Safe.swift

@@ -12,6 +12,10 @@ import os.log
 /// preconditions are checked up front, the underlying call always gets a
 /// completion, and every failure is logged, with an optional caller completion
 /// for call sites that chain on the result.
+///
+/// A push onto a full stack replaces the top template (`TopTemplateReplacer`).
+/// The stack mutations wait for that replacement to settle before they run,
+/// so none of them lands between its pop and its push.
 @MainActor
 extension CPInterfaceController {
   private static let stackLogger = Logger(subsystem: "com.audiobrowser", category: "TemplateStack")
@@ -26,9 +30,43 @@ extension CPInterfaceController {
   /// push — taking down the whole app, not just the CarPlay scene.
   private static let maximumStackDepth = 5
 
+  private static var topReplacerKey: UInt8 = 0
+
+  private var topReplacer: TopTemplateReplacer {
+    if let replacer = objc_getAssociatedObject(self, &Self.topReplacerKey) as? TopTemplateReplacer {
+      return replacer
+    }
+    let replacer = TopTemplateReplacer()
+    objc_setAssociatedObject(self, &Self.topReplacerKey, replacer, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+    return replacer
+  }
+
+  private func whenStackSettled(_ mutation: @escaping (CPInterfaceController) -> Void) {
+    topReplacer.whenSettled { [weak self] in
+      guard let self else { return }
+      mutation(self)
+    }
+  }
+
+  /// Pushes `template`, skipping the raise case (already in the hierarchy). At
+  /// the depth limit it replaces the top template.
+  func safePush(_ template: CPTemplate, animated: Bool, completion: ((Bool, Error?) -> Void)? = nil) {
+    whenStackSettled { controller in
+      let templates = controller.templates
+      guard templates.count >= Self.maximumStackDepth, !templates.contains(where: { $0 === template }) else {
+        controller.guardedPush(template, animated: animated, completion: completion)
+        return
+      }
+      controller.topReplacer.push(
+        template, replacingTopOf: GuardedTemplateStack(controller: controller), animated: animated,
+        completion: completion,
+      )
+    }
+  }
+
   /// Pushes `template`, skipping the raise cases (already in the hierarchy,
   /// stack at the depth limit).
-  func safePush(_ template: CPTemplate, animated: Bool, completion: ((Bool, Error?) -> Void)? = nil) {
+  fileprivate func guardedPush(_ template: CPTemplate, animated: Bool, completion: ((Bool, Error?) -> Void)?) {
     guard !templates.contains(where: { $0 === template }) else {
       Self.stackLogger.warning("push skipped: \(Self.name(of: template)) is already in the stack")
       completion?(false, nil)
@@ -48,7 +86,7 @@ extension CPInterfaceController {
   }
 
   /// Pops the top template, skipping the raise case (nothing above the root).
-  func safePop(animated: Bool, completion: ((Bool, Error?) -> Void)? = nil) {
+  fileprivate func guardedPop(animated: Bool, completion: ((Bool, Error?) -> Void)?) {
     guard templates.count > 1 else {
       Self.stackLogger.warning("pop skipped: already at the root template")
       completion?(false, nil)
@@ -62,41 +100,54 @@ extension CPInterfaceController {
     }
   }
 
+  /// Pops the top template, skipping the raise case (nothing above the root).
+  func safePop(animated: Bool, completion: ((Bool, Error?) -> Void)? = nil) {
+    whenStackSettled { controller in
+      controller.guardedPop(animated: animated, completion: completion)
+    }
+  }
+
   /// Pops back to `template`, skipping the raise case (not in the hierarchy).
   /// A no-op success when it is already the top template.
   func safePop(to template: CPTemplate, animated: Bool, completion: ((Bool, Error?) -> Void)? = nil) {
-    guard templates.contains(where: { $0 === template }) else {
-      Self.stackLogger.warning("pop(to:) skipped: \(Self.name(of: template)) is not in the stack")
-      completion?(false, nil)
-      return
-    }
-    guard topTemplate !== template else {
-      completion?(true, nil)
-      return
-    }
-    pop(to: template, animated: animated) { popped, error in
-      if let error {
-        Self.stackLogger.error("pop(to:) \(Self.name(of: template)) failed: \(error.localizedDescription)")
+    whenStackSettled { controller in
+      guard controller.templates.contains(where: { $0 === template }) else {
+        Self.stackLogger.warning("pop(to:) skipped: \(Self.name(of: template)) is not in the stack")
+        completion?(false, nil)
+        return
+      }
+      guard controller.topTemplate !== template else {
+        completion?(true, nil)
+        return
+      }
+      controller.pop(to: template, animated: animated) { popped, error in
+        if let error {
+          Self.stackLogger.error("pop(to:) \(Self.name(of: template)) failed: \(error.localizedDescription)")
+        }
+        completion?(popped, error)
       }
-      completion?(popped, error)
     }
   }
 
   func safePopToRoot(animated: Bool, completion: ((Bool, Error?) -> Void)? = nil) {
-    popToRootTemplate(animated: animated) { popped, error in
-      if let error {
-        Self.stackLogger.error("popToRootTemplate failed: \(error.localizedDescription)")
+    whenStackSettled { controller in
+      controller.popToRootTemplate(animated: animated) { popped, error in
+        if let error {
+          Self.stackLogger.error("popToRootTemplate failed: \(error.localizedDescription)")
+        }
+        completion?(popped, error)
       }
-      completion?(popped, error)
     }
   }
 
   func safeSetRoot(_ template: CPTemplate, animated: Bool, completion: ((Bool, Error?) -> Void)? = nil) {
-    setRootTemplate(template, animated: animated) { set, error in
-      if let error {
-        Self.stackLogger.error("setRootTemplate \(Self.name(of: template)) failed: \(error.localizedDescription)")
+    whenStackSettled { controller in
+      controller.setRootTemplate(template, animated: animated) { set, error in
+        if let error {
+          Self.stackLogger.error("setRootTemplate \(Self.name(of: template)) failed: \(error.localizedDescription)")
+        }
+        completion?(set, error)
       }
-      completion?(set, error)
     }
   }
 
@@ -124,3 +175,22 @@ extension CPInterfaceController {
     }
   }
 }
+
+/// The guarded pop and push a replacement is made of, so a push that still
+/// cannot fit skips and logs rather than raising.
+@MainActor
+private struct GuardedTemplateStack: TemplateStack {
+  let controller: CPInterfaceController
+
+  var templates: [CPTemplate] {
+    controller.templates
+  }
+
+  func popTop(completion: @escaping (Bool, Error?) -> Void) {
+    controller.guardedPop(animated: false, completion: completion)
+  }
+
+  func push(_ template: CPTemplate, animated: Bool, completion: @escaping (Bool, Error?) -> Void) {
+    controller.guardedPush(template, animated: animated, completion: completion)
+  }
+}

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/CarPlay/TopTemplateReplacer.swift

@@ -0,0 +1,96 @@
+import Foundation
+import os.log
+
+/// The stack mutations a top-template replacement is made of:
+/// `CPInterfaceController` in the app, a fake in tests.
+@MainActor
+protocol TemplateStack {
+  associatedtype Template: AnyObject
+
+  /// Root first.
+  var templates: [Template] { get }
+
+  /// Unanimated.
+  func popTop(completion: @escaping (Bool, Error?) -> Void)
+  func push(_ template: Template, animated: Bool, completion: @escaping (Bool, Error?) -> Void)
+}
+
+/// Pushes onto a full template stack by replacing its top template — an
+/// unanimated pop, then the push — and holds back every other stack mutation
+/// until both have completed. See "Template Depth" in
+/// `website/guide/carplay.md`.
+@MainActor
+final class TopTemplateReplacer {
+  private let logger = Logger(subsystem: "com.audiobrowser", category: "TemplateStack")
+  private var deferred: [() -> Void] = []
+
+  /// True from the pop until the push completes.
+  private(set) var isReplacing = false
+
+  /// Runs `mutation` now, or — while a replacement is in flight — once it has
+  /// settled, after the mutations that arrived before it.
+  func whenSettled(_ mutation: @escaping () -> Void) {
+    guard isReplacing else {
+      mutation()
+      return
+    }
+    deferred.append(mutation)
+  }
+
+  /// Pushes `template` onto `stack` in place of its top template. When the
+  /// push fails, the popped template is pushed back, so the user stays where
+  /// they were. `completion` reports the push of `template` itself.
+  ///
+  /// Refuses a stack with nothing above the root to replace, and a call made
+  /// while a replacement is in flight: route it through `whenSettled`.
+  func push<Stack: TemplateStack>(
+    _ template: Stack.Template,
+    replacingTopOf stack: Stack,
+    animated: Bool,
+    completion: ((Bool, Error?) -> Void)? = nil,
+  ) {
+    let templates = stack.templates
+    guard !isReplacing, templates.count > 1, let top = templates.last else {
+      logger.error("push skipped: \(Self.name(of: template)) has no template to replace (\(templates.count) templates)")
+      completion?(false, nil)
+      return
+    }
+    isReplacing = true
+    logger.info("push at the depth limit: replacing the top, \(Self.name(of: top)), with \(Self.name(of: template))")
+
+    stack.popTop { [self] popped, error in
+      guard popped else {
+        logger.error("replace abandoned: pop failed, \(Self.name(of: template)) not pushed (\(stack.templates.count) templates)")
+        settle(completion, pushed: false, error: error)
+        return
+      }
+      stack.push(template, animated: animated) { [self] pushed, error in
+        guard !pushed else {
+          settle(completion, pushed: true, error: error)
+          return
+        }
+        logger.error("replace failed: \(Self.name(of: template)) not pushed, restoring \(Self.name(of: top))")
+        stack.push(top, animated: false) { [self] restored, _ in
+          if !restored {
+            logger.error("replace failed: \(Self.name(of: top)) not restored (\(stack.templates.count) templates)")
+          }
+          settle(completion, pushed: false, error: error)
+        }
+      }
+    }
+  }
+
+  private func settle(_ completion: ((Bool, Error?) -> Void)?, pushed: Bool, error: Error?) {
+    // Still replacing here, so a mutation the completion issues queues behind
+    // the ones that arrived during the replacement.
+    completion?(pushed, error)
+    isReplacing = false
+    while !isReplacing, !deferred.isEmpty {
+      deferred.removeFirst()()
+    }
+  }
+
+  private static func name(of template: AnyObject) -> String {
+    String(describing: type(of: template))
+  }
+}

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/ios/Tests/TopTemplateReplacerTests.swift

@@ -0,0 +1,172 @@
+import Foundation
+import Testing
+
+@testable import AudioBrowserTestable
+
+private final class Page {
+  let name: String
+  init(_ name: String) { self.name = name }
+}
+
+/// A template stack whose mutations complete only when the test steps them,
+/// the way CarPlay's complete on a later run-loop turn.
+@MainActor
+private final class FakeStack: TemplateStack {
+  private(set) var templates: [Page]
+  private(set) var calls: [String] = []
+  var failingPushes: Set<String> = []
+  var failsPop = false
+  private var pending: [() -> Void] = []
+
+  init(_ names: String...) {
+    templates = names.map(Page.init)
+  }
+
+  var names: [String] {
+    templates.map(\.name)
+  }
+
+  func popTop(completion: @escaping (Bool, Error?) -> Void) {
+    calls.append("pop")
+    pending.append { [self] in
+      guard !failsPop else {
+        completion(false, nil)
+        return
+      }
+      templates.removeLast()
+      completion(true, nil)
+    }
+  }
+
+  func push(_ template: Page, animated: Bool, completion: @escaping (Bool, Error?) -> Void) {
+    calls.append("push \(template.name)\(animated ? " animated" : "")")
+    pending.append { [self] in
+      guard !failingPushes.contains(template.name) else {
+        completion(false, nil)
+        return
+      }
+      templates.append(template)
+      completion(true, nil)
+    }
+  }
+
+  func step() {
+    pending.removeFirst()()
+  }
+
+  func run() {
+    while !pending.isEmpty {
+      step()
+    }
+  }
+}
+
+@Suite("TopTemplateReplacer")
+@MainActor
+struct TopTemplateReplacerTests {
+  private let replacer = TopTemplateReplacer()
+  private let stack = FakeStack("tabs", "A", "B", "C", "D")
+
+  @Test func replacesTheTopPageAndKeepsTheRest() {
+    var result: Bool?
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true) { pushed, _ in result = pushed }
+    stack.run()
+
+    #expect(stack.names == ["tabs", "A", "B", "C", "E"])
+    #expect(stack.calls == ["pop", "push E animated"])
+    #expect(result == true)
+    #expect(!replacer.isReplacing)
+  }
+
+  @Test func thePushWaitsForThePopToComplete() {
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true)
+    #expect(stack.calls == ["pop"])
+    stack.step()
+    #expect(stack.calls == ["pop", "push E animated"])
+  }
+
+  @Test func aMutationArrivingMidReplacementRunsOnceItHasSettled() {
+    var seen: [[String]] = []
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true)
+    stack.step()
+    replacer.whenSettled { seen.append(stack.names) }
+    #expect(seen.isEmpty)
+    stack.run()
+
+    #expect(seen == [["tabs", "A", "B", "C", "E"]])
+  }
+
+  @Test func deferredMutationsRunInArrivalOrderBehindASecondReplacement() {
+    var order: [String] = []
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true)
+    replacer.whenSettled { [replacer, stack] in
+      order.append("F")
+      replacer.push(Page("F"), replacingTopOf: stack, animated: true)
+    }
+    replacer.whenSettled { order.append("after F: \(stack.names.last ?? "")") }
+    stack.run()
+
+    #expect(stack.names == ["tabs", "A", "B", "C", "F"])
+    #expect(order == ["F", "after F: F"])
+  }
+
+  @Test func aMutationIssuedByTheCompletionQueuesBehindEarlierArrivals() {
+    var order: [String] = []
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true) { [replacer] _, _ in
+      replacer.whenSettled { order.append("from completion") }
+    }
+    replacer.whenSettled { order.append("arrived mid-replacement") }
+    stack.run()
+
+    #expect(order == ["arrived mid-replacement", "from completion"])
+  }
+
+  @Test func aFailedPopLeavesTheStackAsItWas() {
+    stack.failsPop = true
+    var result: Bool?
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true) { pushed, _ in result = pushed }
+    stack.run()
+
+    #expect(stack.names == ["tabs", "A", "B", "C", "D"])
+    #expect(stack.calls == ["pop"])
+    #expect(result == false)
+    #expect(!replacer.isReplacing)
+  }
+
+  @Test func aFailedPushRestoresThePoppedPage() {
+    stack.failingPushes = ["E"]
+    let top = stack.templates[4]
+    var result: Bool?
+    var ranAfter = false
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true) { pushed, _ in result = pushed }
+    replacer.whenSettled { ranAfter = true }
+    stack.run()
+
+    #expect(stack.names == ["tabs", "A", "B", "C", "D"])
+    #expect(stack.templates[4] === top)
+    #expect(stack.calls == ["pop", "push E animated", "push D"])
+    #expect(result == false)
+    #expect(ranAfter)
+  }
+
+  @Test func aFailedRestoreStillSettles() {
+    stack.failingPushes = ["E", "D"]
+    var result: Bool?
+    replacer.push(Page("E"), replacingTopOf: stack, animated: true) { pushed, _ in result = pushed }
+    stack.run()
+
+    #expect(stack.names == ["tabs", "A", "B", "C"])
+    #expect(result == false)
+    #expect(!replacer.isReplacing)
+  }
+
+  @Test func refusesAStackWithNothingAboveTheRoot() {
+    let rootOnly = FakeStack("tabs")
+    var result: Bool?
+    replacer.push(Page("E"), replacingTopOf: rootOnly, animated: true) { pushed, _ in result = pushed }
+
+    #expect(rootOnly.calls.isEmpty)
+    #expect(result == false)
+    #expect(!replacer.isReplacing)
+  }
+}

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":[]}