react-native-audio-browser 1.0.0-next.5 → 1.0.0-next.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (192) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +14 -2
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
  5. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  6. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  7. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  8. package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
  9. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
  10. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  11. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  12. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  13. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  14. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  15. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  16. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  17. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  18. package/android/src/main/res/values/strings.xml +5 -2
  19. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  20. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  21. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  22. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  23. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  24. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  25. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  26. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  27. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  28. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  30. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  31. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  32. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  33. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  34. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  35. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  36. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  37. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  38. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  39. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  40. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  41. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  42. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  43. package/ios/AVPlayerEngine.swift +2 -2
  44. package/ios/Browser/BrowserPathHelper.swift +3 -2
  45. package/ios/Browser/PageResolver.swift +1 -1
  46. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  47. package/ios/HybridAudioBrowser+Player.swift +3 -2
  48. package/ios/HybridAudioBrowser.swift +1 -1
  49. package/ios/Player/Player.swift +4 -2
  50. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  51. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  52. package/ios/Tests/GenerationMemoTests.swift +136 -0
  53. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  54. package/ios/Tests/PlayerPolicyTests.swift +19 -28
  55. package/ios/Tests/PlayerProgressTests.swift +0 -2
  56. package/ios/Tests/RequestLayerTests.swift +5 -0
  57. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  58. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  59. package/ios/Tests/Support/TestTypes.swift +14 -0
  60. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  61. package/ios/Util/AwaitCallback.swift +16 -10
  62. package/ios/Util/GenerationMemo.swift +81 -17
  63. package/ios/Util/JSCallbackError.swift +23 -0
  64. package/ios/Util/OutputPicker.swift +25 -5
  65. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  66. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  67. package/lib/commonjs/features/browser-config.js +3 -2
  68. package/lib/commonjs/features/browser-config.js.map +1 -1
  69. package/lib/commonjs/features/browser.js +7 -8
  70. package/lib/commonjs/features/browser.js.map +1 -1
  71. package/lib/commonjs/features/output.js +7 -3
  72. package/lib/commonjs/features/output.js.map +1 -1
  73. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  74. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  75. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  76. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  77. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  78. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  79. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  80. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  81. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  82. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  83. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  84. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  85. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  86. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  87. package/lib/module/features/browser-config.js +3 -2
  88. package/lib/module/features/browser-config.js.map +1 -1
  89. package/lib/module/features/browser.js +7 -8
  90. package/lib/module/features/browser.js.map +1 -1
  91. package/lib/module/features/output.js +7 -3
  92. package/lib/module/features/output.js.map +1 -1
  93. package/lib/module/web/NativeAudioBrowser.js +43 -2
  94. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  95. package/lib/module/web/browser/BrowserManager.js +37 -66
  96. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  97. package/lib/module/web/browser/SearchManager.js +1 -5
  98. package/lib/module/web/browser/SearchManager.js.map +1 -1
  99. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  100. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  101. package/lib/module/web/player/NowPlayingManager.js +3 -22
  102. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  103. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  104. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  105. package/lib/module/web/util/GenerationMemo.js +87 -0
  106. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  107. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  108. package/lib/typescript/src/features/browser.d.ts +7 -8
  109. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  110. package/lib/typescript/src/features/output.d.ts +8 -4
  111. package/lib/typescript/src/features/output.d.ts.map +1 -1
  112. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  113. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  114. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  115. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  116. package/lib/typescript/src/types/browser.d.ts +55 -8
  117. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  118. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  119. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  120. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  121. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  122. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  123. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  124. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  125. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  126. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  127. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  128. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  129. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
  130. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  131. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  132. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  133. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  134. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  135. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  136. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
  137. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  138. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  139. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  140. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  141. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  142. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  143. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  144. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  145. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  146. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  147. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
  148. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  149. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  150. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  151. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  152. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  153. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  154. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  155. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  156. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  157. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  158. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  159. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  160. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  161. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  162. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  163. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  164. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  165. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  166. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  167. package/package.json +1 -1
  168. package/src/codegen-js-error-message.test.ts +78 -0
  169. package/src/features/browser-config.test.ts +7 -0
  170. package/src/features/browser-config.ts +3 -2
  171. package/src/features/browser.ts +7 -8
  172. package/src/features/output.ts +13 -5
  173. package/src/specs/audio-browser.nitro.ts +16 -3
  174. package/src/types/browser-native.ts +4 -1
  175. package/src/types/browser.ts +60 -8
  176. package/src/web/NativeAudioBrowser.ts +43 -3
  177. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  178. package/src/web/browser/BrowserManager.ts +50 -79
  179. package/src/web/browser/SearchManager.ts +1 -8
  180. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  181. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  182. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  183. package/src/web/http/RequestConfigBuilder.ts +72 -57
  184. package/src/web/player/NowPlayingManager.test.ts +29 -0
  185. package/src/web/player/NowPlayingManager.ts +4 -27
  186. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  187. package/src/web/util/BrowserPathHelper.ts +6 -7
  188. package/src/web/util/GenerationMemo.test.ts +148 -0
  189. package/src/web/util/GenerationMemo.ts +103 -0
  190. package/website/guide/audio-output.md +34 -7
  191. package/website/guide/browser.md +21 -0
  192. package/website/guide/gate.md +1 -1
@@ -17,12 +17,14 @@ object TrackFactory {
17
17
  @Volatile var artworkRoutes: ArtworkRoutes? = null
18
18
 
19
19
  /**
20
- * The artwork URI the session publishes for [url]: [url] itself, except on Android Automotive OS,
21
- * whose car media app loads artwork only from `content://`, `android.resource://` and `file://`
22
- * URIs, where http(s) artwork is served through the provider.
20
+ * The artwork URI the session publishes for [url]: a `content://` URI from the provider for a
21
+ * `data:` URL, which would otherwise send its bytes to every controller; on Android Automotive
22
+ * OS, whose car media app loads artwork only from `content://`, `android.resource://` and
23
+ * `file://` URIs, for any URL the provider serves; else [url] itself.
23
24
  */
24
25
  fun sessionArtworkUri(url: String, headers: Map<String, String>?, isSvg: Boolean): String {
25
- val provider = artworkRoutes?.takeIf { Automotive.device } ?: return url
26
+ val provider = artworkRoutes ?: return url
27
+ if (!Automotive.device && !BrowserPathHelper.isDataUrl(url)) return url
26
28
  return provider.route(url, headers, isSvg, pinned = true)
27
29
  }
28
30
 
@@ -102,9 +104,10 @@ object TrackFactory {
102
104
  }
103
105
 
104
106
  /**
105
- * Routes http(s) artwork through the `content://` provider, registered in [registry], so headers
106
- * and SVG rendering apply in this process and no bytes cross the Binder. Other artwork
107
- * (`android.resource://` icons, `file://`) passes through unchanged, so vector icons survive.
107
+ * Routes [ArtworkUris.isServable] artwork through the `content://` provider, registered in
108
+ * [registry], so headers and SVG rendering apply in this process and no bytes cross the Binder.
109
+ * Other artwork (`android.resource://` icons, `file://`) passes through unchanged, so vector
110
+ * icons survive.
108
111
  */
109
112
  fun toBrowseMediaItem(
110
113
  track: Track,
@@ -20,11 +20,14 @@
20
20
  <!--
21
21
  The SessionError message a browse or search failure sends alongside its
22
22
  tile. The tiles themselves are worded by the app's `formatNavigationError`
23
- (ADR 0001), so these two are the library's only device-locale browse copy —
24
- kept because a SessionError carries a string, not a navigation error.
23
+ (ADR 0001), so these and the play error below are the library's only
24
+ device-locale copy — kept because a SessionError carries a string, not a
25
+ navigation error.
25
26
  Offline is distinct from the browse error: it is sent only when the network
26
27
  monitor says we are actually offline, so it may name the cause.
27
28
  -->
28
29
  <string name="audio_browser_offline_error">No internet connection</string>
29
30
  <string name="audio_browser_browse_error">Something went wrong</string>
31
+ <!-- The SessionError message a play request sends when its item cannot be resolved. -->
32
+ <string name="audio_browser_play_error">Couldn\'t play this</string>
30
33
  </resources>
@@ -36,3 +36,18 @@ internal fun MediaSession.countLegacyStateUpdates(): () -> Int {
36
36
  )
37
37
  return { count }
38
38
  }
39
+
40
+ /** Records each error legacy controllers are told from now on, with the state it came in. */
41
+ internal fun MediaSession.recordLegacyErrors(): () -> List<Pair<Int, String>> {
42
+ val errors = mutableListOf<Pair<Int, String>>()
43
+ impl.mediaSessionLegacyStub.sessionCompat.controller.registerCallback(
44
+ object : MediaControllerCompat.Callback() {
45
+ override fun onPlaybackStateChanged(state: PlaybackStateCompat?) {
46
+ val message = state?.errorMessage ?: return
47
+ errors += state.state to message.toString()
48
+ }
49
+ },
50
+ Handler(Looper.getMainLooper()),
51
+ )
52
+ return { errors.toList() }
53
+ }
@@ -93,6 +93,7 @@ class ContentRefreshNavigationErrorTest {
93
93
  carPlayLoadingTitle = null,
94
94
  resolveAlbumPath = null,
95
95
  formatNavigationError = null,
96
+ findTrack = null,
96
97
  ),
97
98
  )
98
99
  browser.onNavigationError = { errorEvents += it.error }
@@ -66,6 +66,7 @@ class NavigateTrackTest {
66
66
  carPlayLoadingTitle = null,
67
67
  resolveAlbumPath = null,
68
68
  formatNavigationError = null,
69
+ findTrack = null,
69
70
  ),
70
71
  )
71
72
  }
@@ -46,6 +46,7 @@ class ResolveFormattedErrorTest {
46
46
  Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams {
47
47
  js.promise
48
48
  },
49
+ findTrack = null,
49
50
  )
50
51
  AudioBrowser::class
51
52
  .java
@@ -90,21 +90,23 @@ object TestFixtures {
90
90
  userAgent = null,
91
91
  )
92
92
 
93
- /** A layer `transform` whose JS promise rejects with [message]. */
94
- fun throwingTransform(message: String) =
93
+ /**
94
+ * A layer `transform` whose JS promise rejects with a [name] error of [message]: Nitro gives the
95
+ * rejection as `name: message`.
96
+ */
97
+ fun throwingTransform(message: String, name: String = "Error") =
95
98
  Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__ {
96
99
  _,
97
100
  _ ->
98
- val js = JsPromise<RequestConfig>().apply { reject(Exception(message)) }
101
+ val js = JsPromise<RequestConfig>().apply { reject(Exception("$name: $message")) }
99
102
  JsPromise<Promise<RequestConfig>>().apply { resolve(js.promise) }.promise
100
103
  }
101
104
 
102
- /** A layer `transformSync` whose JS call throws: Nitro rejects with the JSError's `what()`. */
103
- fun throwingTransformSync(what: String) =
105
+ fun throwingTransformSync(message: String) =
104
106
  Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__ {
105
107
  _,
106
108
  _ ->
107
- JsPromise<RequestConfig>().apply { reject(Exception(what)) }.promise
109
+ JsPromise<RequestConfig>().apply { reject(Exception(message)) }.promise
108
110
  }
109
111
 
110
112
  fun mediaConfig(
@@ -208,6 +210,7 @@ object TestFixtures {
208
210
  carPlayLoadingTitle = null,
209
211
  resolveAlbumPath = null,
210
212
  formatNavigationError = null,
213
+ findTrack = null,
211
214
  )
212
215
 
213
216
  /**
@@ -36,4 +36,23 @@ class BrowseArtworkRegistryTest {
36
36
  assertNull(reg.lookup("a"))
37
37
  assertEquals("https://x/c", reg.lookup("c")?.finalUrl)
38
38
  }
39
+
40
+ @Test
41
+ fun `evicts oldest beyond the character budget, keeping the newest`() {
42
+ val reg = BrowseArtworkRegistry(maxUrlChars = 10)
43
+ reg.register("a", ResolvedArtwork("data:aaaa", null, false))
44
+ reg.register("b", ResolvedArtwork("data:bbbbbbbbbbbbbbbb", null, false))
45
+ assertNull(reg.lookup("a"))
46
+ assertEquals("data:bbbbbbbbbbbbbbbb", reg.lookup("b")?.finalUrl)
47
+ }
48
+
49
+ @Test
50
+ fun `a replaced entry gives back its characters`() {
51
+ val reg = BrowseArtworkRegistry(maxUrlChars = 21)
52
+ reg.register("a", ResolvedArtwork("data:aaaa", null, false))
53
+ reg.register("b", ResolvedArtwork("data:bbbbbb", null, false))
54
+ reg.register("b", ResolvedArtwork("data:b", null, false))
55
+ reg.register("c", ResolvedArtwork("data:c", null, false))
56
+ assertEquals("data:aaaa", reg.lookup("a")?.finalUrl)
57
+ }
39
58
  }
@@ -0,0 +1,168 @@
1
+ package com.audiobrowser.browser
2
+
3
+ import androidx.media3.common.MediaItem
4
+ import com.audiobrowser.TestFixtures.transformableConfig
5
+ import com.audiobrowser.navigationErrorFor
6
+ import com.margelo.nitro.audiobrowser.NativeRouteEntry
7
+ import com.margelo.nitro.audiobrowser.NavigationError
8
+ import com.margelo.nitro.audiobrowser.NavigationErrorType
9
+ import kotlinx.coroutines.runBlocking
10
+ import okhttp3.mockwebserver.MockResponse
11
+ import okhttp3.mockwebserver.MockWebServer
12
+ import okhttp3.mockwebserver.SocketPolicy
13
+ import org.junit.After
14
+ import org.junit.Assert.assertEquals
15
+ import org.junit.Assert.assertNull
16
+ import org.junit.Assert.assertThrows
17
+ import org.junit.Before
18
+ import org.junit.Test
19
+ import org.junit.runner.RunWith
20
+ import org.robolectric.RobolectricTestRunner
21
+
22
+ /** A search through the search route's HTTP config that the server fails. */
23
+ @RunWith(RobolectricTestRunner::class)
24
+ class BrowserManagerSearchFailureTest {
25
+
26
+ private lateinit var server: MockWebServer
27
+ private lateinit var browserManager: BrowserManager
28
+
29
+ @Before
30
+ fun setup() {
31
+ server = MockWebServer()
32
+ server.start()
33
+ browserManager = BrowserManager()
34
+ browserManager.config =
35
+ BrowserConfig(
36
+ request = transformableConfig(baseUrl = server.url("/").toString().trimEnd('/')),
37
+ routes =
38
+ arrayOf(
39
+ NativeRouteEntry(
40
+ path = BrowserManager.SEARCH_ROUTE_PATH,
41
+ browseCallback = null,
42
+ browseConfig = null,
43
+ browseStatic = null,
44
+ searchCallback = null,
45
+ searchConfig = transformableConfig(path = "/search"),
46
+ media = null,
47
+ artwork = null,
48
+ )
49
+ ),
50
+ )
51
+ }
52
+
53
+ @After
54
+ fun tearDown() {
55
+ server.shutdown()
56
+ }
57
+
58
+ private fun navigationErrorOfSearch(response: MockResponse): NavigationError {
59
+ server.enqueue(response)
60
+ return navigationErrorFor(
61
+ assertThrows(Exception::class.java) { runBlocking { browserManager.search("jazz") } }
62
+ )
63
+ }
64
+
65
+ private fun tappedSearchResult(mediaId: String) =
66
+ MediaItem.Builder()
67
+ .setMediaId(mediaId)
68
+ .setRequestMetadata(MediaItem.RequestMetadata.Builder().setSearchQuery("jazz").build())
69
+ .build()
70
+
71
+ @Test
72
+ fun `a non-2xx search is an http-error with its status`() {
73
+ val error = navigationErrorOfSearch(MockResponse().setResponseCode(503))
74
+
75
+ assertEquals(NavigationErrorType.HTTP_ERROR, error.code)
76
+ assertEquals(503.0, error.statusCode!!, 0.0)
77
+ assertEquals(false, error.statusCodeSuccess)
78
+ }
79
+
80
+ @Test
81
+ fun `a search whose request fails is a network-error`() {
82
+ val error =
83
+ navigationErrorOfSearch(MockResponse().setSocketPolicy(SocketPolicy.DISCONNECT_AT_START))
84
+
85
+ assertEquals(NavigationErrorType.NETWORK_ERROR, error.code)
86
+ }
87
+
88
+ @Test
89
+ fun `a 2xx search body that is not a track array is an http-error with a successful status`() {
90
+ val error = navigationErrorOfSearch(MockResponse().setBody("<html>Sign in</html>"))
91
+
92
+ assertEquals(NavigationErrorType.HTTP_ERROR, error.code)
93
+ assertEquals(200.0, error.statusCode!!, 0.0)
94
+ assertEquals(true, error.statusCodeSuccess)
95
+ }
96
+
97
+ @Test
98
+ fun `a search whose request is malformed is an unknown-error, not a network-error`() {
99
+ browserManager.config =
100
+ browserManager.config.copy(request = transformableConfig(baseUrl = "ftp://example.com"))
101
+
102
+ val error =
103
+ navigationErrorFor(
104
+ assertThrows(Exception::class.java) { runBlocking { browserManager.search("jazz") } }
105
+ )
106
+
107
+ assertEquals(NavigationErrorType.UNKNOWN_ERROR, error.code)
108
+ }
109
+
110
+ @Test
111
+ fun `a failed search does not become the cached search`() {
112
+ server.enqueue(MockResponse().setResponseCode(500))
113
+
114
+ runCatching { runBlocking { browserManager.search("jazz") } }
115
+
116
+ assertNull(browserManager.getCachedSearchResults("jazz"))
117
+ }
118
+
119
+ @Test
120
+ fun `a 2xx empty array is a search with no results`() {
121
+ server.enqueue(MockResponse().setBody("[]"))
122
+
123
+ val results = runBlocking { browserManager.searchPlayable("jazz") }
124
+
125
+ assertNull(results)
126
+ }
127
+
128
+ @Test
129
+ fun `a tapped search result plays the cached results without searching again`() {
130
+ server.enqueue(
131
+ MockResponse()
132
+ .setBody(
133
+ """[{"title":"A","src":"https://s/a.mp3"},{"title":"B","src":"https://s/b.mp3"}]"""
134
+ )
135
+ )
136
+ runBlocking { browserManager.search("jazz") }
137
+
138
+ val playback = runBlocking {
139
+ browserManager.resolveMediaItemsForPlayback(
140
+ listOf(tappedSearchResult("https://s/b.mp3")),
141
+ 0,
142
+ 0,
143
+ )
144
+ }
145
+
146
+ assertEquals(
147
+ listOf("https://s/a.mp3", "https://s/b.mp3"),
148
+ playback.mediaItems.map { it.mediaId },
149
+ )
150
+ assertEquals(1, playback.startIndex)
151
+ assertEquals(1, server.requestCount)
152
+ }
153
+
154
+ @Test
155
+ fun `a tapped search result whose search fails plays on its own`() {
156
+ server.enqueue(MockResponse().setResponseCode(503))
157
+
158
+ val playback = runBlocking {
159
+ browserManager.resolveMediaItemsForPlayback(
160
+ listOf(tappedSearchResult("https://s/b.mp3")),
161
+ 0,
162
+ 0,
163
+ )
164
+ }
165
+
166
+ assertEquals(listOf("https://s/b.mp3"), playback.mediaItems.map { it.mediaId })
167
+ }
168
+ }
@@ -9,6 +9,7 @@ import com.audiobrowser.TestFixtures.staticRoute
9
9
  import com.audiobrowser.TestFixtures.track
10
10
  import com.audiobrowser.util.BrowserPathHelper
11
11
  import com.audiobrowser.util.JsPromise
12
+ import com.margelo.nitro.audiobrowser.BrowseResult
12
13
  import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam
13
14
  import com.margelo.nitro.audiobrowser.Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_
14
15
  import kotlin.time.Duration.Companion.seconds
@@ -123,6 +124,37 @@ class BrowserManagerTest {
123
124
  assertEquals("/library", browserManager.getPath())
124
125
  }
125
126
 
127
+ @Test
128
+ fun `a browse callback's rejected promise fails with its message alone`() = runBlocking {
129
+ val rejected = JsPromise<BrowseResult>().apply { reject(RuntimeException("Error: Offline")) }
130
+ browserManager.config =
131
+ BrowserConfig(
132
+ routes =
133
+ arrayOf(
134
+ staticRoute("/home", resolvedTrack(path = "/home"))
135
+ .copy(
136
+ browseStatic = null,
137
+ browseCallback =
138
+ Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam {
139
+ JsPromise<Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_>()
140
+ .apply {
141
+ resolve(
142
+ Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.create(
143
+ rejected.promise
144
+ )
145
+ )
146
+ }
147
+ .promise
148
+ },
149
+ )
150
+ )
151
+ )
152
+
153
+ val failure = runCatching { browserManager.navigate("/home") }.exceptionOrNull()
154
+
155
+ assertEquals("Offline", failure?.message)
156
+ }
157
+
126
158
  // MARK: - expandQueueFromContextualPath
127
159
 
128
160
  @Test
@@ -248,6 +248,24 @@ class RequestConfigBuilderTest {
248
248
  assertEquals("https://api.example.com/albums", result.url)
249
249
  }
250
250
 
251
+ @Test
252
+ fun `buildUrl leaves the query off a data URL`() {
253
+ val dataUrl = "data:image/png;base64,iVBORw0KGgo="
254
+ val config =
255
+ RequestConfig(
256
+ method = null,
257
+ path = dataUrl,
258
+ baseUrl = "https://api.example.com",
259
+ headers = null,
260
+ query = mapOf("w" to "512"),
261
+ body = null,
262
+ contentType = null,
263
+ userAgent = null,
264
+ )
265
+
266
+ assertEquals(dataUrl, RequestConfigBuilder.buildUrl(config))
267
+ }
268
+
251
269
  @Test
252
270
  fun `buildUrl joins the query with an ampersand when the path already has one`() = runTest {
253
271
  val relative =
@@ -354,25 +372,32 @@ class RequestConfigBuilderTest {
354
372
  }
355
373
 
356
374
  @Test
357
- fun `a throwing transformSync's CallbackException carries its message without the JS stack`() =
358
- runTest {
359
- val base =
360
- RequestConfig(null, "/library", "https://api.example.com", null, null, null, null, null)
361
- val layer =
362
- transformableConfig()
363
- .copy(
364
- transformSync =
365
- throwingTransformSync(
366
- "token expired\n\nError: token expired\n at transformSync (:11:92)"
367
- )
368
- )
369
- try {
370
- RequestConfigBuilder.mergeConfig(base, layer, emptyMap())
371
- fail("expected CallbackException")
372
- } catch (e: CallbackException) {
373
- assertEquals("token expired", e.message)
374
- }
375
+ fun `a throwing transformSync's CallbackException keeps its message whole`() = runTest {
376
+ val base =
377
+ RequestConfig(null, "/library", "https://api.example.com", null, null, null, null, null)
378
+ val message = "Error: token expired\n\nsign in again"
379
+ val layer = transformableConfig().copy(transformSync = throwingTransformSync(message))
380
+ try {
381
+ RequestConfigBuilder.mergeConfig(base, layer, emptyMap())
382
+ fail("expected CallbackException")
383
+ } catch (e: CallbackException) {
384
+ assertEquals(message, e.message)
385
+ }
386
+ }
387
+
388
+ @Test
389
+ fun `a transform rejecting with a TypeError gives its message alone`() = runTest {
390
+ val base =
391
+ RequestConfig(null, "/library", "https://api.example.com", null, null, null, null, null)
392
+ val layer =
393
+ transformableConfig().copy(transform = throwingTransform("bad header", name = "TypeError"))
394
+ try {
395
+ RequestConfigBuilder.mergeConfig(base, layer, emptyMap())
396
+ fail("expected CallbackException")
397
+ } catch (e: CallbackException) {
398
+ assertEquals("bad header", e.message)
375
399
  }
400
+ }
376
401
 
377
402
  @Test
378
403
  fun `mergeConfigOrBase skips a layer whose transform throws`() = runTest {
@@ -93,6 +93,7 @@ class HandleTrackLoadSeekTest {
93
93
  carPlayLoadingTitle = null,
94
94
  resolveAlbumPath = null,
95
95
  formatNavigationError = null,
96
+ findTrack = null,
96
97
  )
97
98
  val browserManager = BrowserManager()
98
99
  player.browser =
@@ -6,11 +6,14 @@ import androidx.media3.common.Player as MediaPlayer
6
6
  import com.audiobrowser.Callbacks
7
7
  import com.audiobrowser.TestFixtures
8
8
  import com.audiobrowser.model.PlayerSetupOptions
9
+ import com.audiobrowser.model.RetryPolicy
9
10
  import com.audiobrowser.remote.FakeReceiver
10
11
  import com.audiobrowser.remote.FakeRemote
11
12
  import com.audiobrowser.util.TrackFactory
12
13
  import com.margelo.nitro.audiobrowser.PlaybackState
13
14
  import com.margelo.nitro.audiobrowser.RemoteOutputsOptions
15
+ import java.net.ServerSocket
16
+ import java.net.UnknownHostException
14
17
  import java.time.Duration
15
18
  import org.junit.After
16
19
  import org.junit.Assert.assertEquals
@@ -48,8 +51,9 @@ class PlayerCastTest {
48
51
  fun cast() {
49
52
  player.setup(
50
53
  PlayerSetupOptions(
54
+ retryPolicy = RetryPolicy.Infinite(),
51
55
  remoteOutputs =
52
- RemoteOutputsOptions(cast = true, castReceiverApplicationId = null, sonos = null)
56
+ RemoteOutputsOptions(cast = true, castReceiverApplicationId = null, sonos = null),
53
57
  )
54
58
  )
55
59
  player.setCallbacks(callbacks)
@@ -155,6 +159,41 @@ class PlayerCastTest {
155
159
  assertFalse(receiver.loads.last().autoplay)
156
160
  }
157
161
 
162
+ @Test
163
+ fun `a connection that fails before the hand-back is heard is retried, not an error`() {
164
+ // Answers nothing, so the only failure report is the one the listener below makes.
165
+ ServerSocket(0).use { silent ->
166
+ player.load(TestFixtures.track(title = "b", src = "http://127.0.0.1:${silent.localPort}/a"))
167
+ idleUntil("the track on the receiver") { receiver.loads.size == 2 }
168
+ // The playback thread can fail an offline load before the main thread hears of the
169
+ // hand-back that prepared it. Robolectric starts offline.
170
+ player.exoPlayer.addListener(
171
+ object : MediaPlayer.Listener {
172
+ override fun onPlaybackStateChanged(playbackState: Int) {
173
+ if (playbackState != MediaPlayer.STATE_BUFFERING) return
174
+ player.exoPlayer.removeListener(this)
175
+ player.onLoadFailure(UnknownHostException(), inPlace = false)
176
+ }
177
+ }
178
+ )
179
+
180
+ remote.endSession()
181
+ idle()
182
+ player.playerListener.onPlayerError(
183
+ PlaybackException(
184
+ "offline",
185
+ null,
186
+ PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
187
+ )
188
+ )
189
+ idle()
190
+
191
+ assertNotEquals(PlaybackState.ERROR, player.playbackState)
192
+ assertEquals(true, player.getPlayback().error?.retrying)
193
+ assertTrue("the loop holds the engine to reconnect it", player.retryLoop!!.reconnecting)
194
+ }
195
+ }
196
+
158
197
  private fun calls(name: String) =
159
198
  mockingDetails(callbacks).invocations.filter { it.method.name == name }
160
199