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
@@ -26,6 +26,7 @@ import com.margelo.nitro.audiobrowser.Playback
26
26
  import com.margelo.nitro.audiobrowser.PlaybackState
27
27
  import java.io.IOException
28
28
  import java.net.ServerSocket
29
+ import java.net.Socket
29
30
  import java.time.Duration
30
31
  import java.util.concurrent.CopyOnWriteArrayList
31
32
  import java.util.concurrent.CountDownLatch
@@ -46,9 +47,11 @@ import org.junit.Rule
46
47
  import org.junit.Test
47
48
  import org.junit.rules.TemporaryFolder
48
49
  import org.junit.runner.RunWith
50
+ import org.mockito.ArgumentMatchers.notNull
49
51
  import org.mockito.Mockito.mock
50
52
  import org.mockito.Mockito.mockingDetails
51
53
  import org.mockito.Mockito.never
54
+ import org.mockito.Mockito.times
52
55
  import org.mockito.Mockito.verify
53
56
  import org.robolectric.RobolectricTestRunner
54
57
  import org.robolectric.RuntimeEnvironment
@@ -184,9 +187,15 @@ class PlayerRetryTest {
184
187
  shadowOf(Looper.getMainLooper()).idle()
185
188
 
186
189
  player.seekToLiveEdge()
187
- shadowOf(Looper.getMainLooper()).idle()
190
+ // ExoPlayer schedules its next step on the clock, which stands still unless advanced.
191
+ idleUntil("the edge loaded while paused") {
192
+ ShadowSystemClock.advanceBy(Duration.ofMillis(10))
193
+ // The player's state can still hold a READY from before the seek; the engine's drops to
194
+ // BUFFERING at once.
195
+ player.exoPlayer.playbackState == MediaPlayer.STATE_READY &&
196
+ player.playbackState == PlaybackState.READY
197
+ }
188
198
  assertEquals(edge, player.exoPlayer.currentPosition)
189
- assertPausedInPlace()
190
199
  }
191
200
 
192
201
  @Test
@@ -585,6 +594,87 @@ class PlayerRetryTest {
585
594
  server.close()
586
595
  }
587
596
 
597
+ @Test
598
+ fun `an engine error that arrives after a stop is not terminal`() {
599
+ goOnline(context)
600
+ play("https://127.0.0.1:9/stream", retryPolicy = RetryPolicy.Infinite())
601
+ awaitRetry("a pending retry")
602
+ player.stop()
603
+ shadowOf(Looper.getMainLooper()).idle()
604
+
605
+ deliverLateEngineError()
606
+
607
+ assertEquals(Playback(PlaybackState.STOPPED, null), player.getPlayback())
608
+ verify(callbacks, never()).onPlaybackError(notNull())
609
+ }
610
+
611
+ @Test
612
+ fun `an engine error that arrives after a live pause is not terminal`() {
613
+ goOnline(context)
614
+ play(
615
+ folder.silentWavUri(Duration.ofMinutes(1)),
616
+ retryPolicy = RetryPolicy.Infinite(),
617
+ live = true,
618
+ )
619
+ idleUntil("playing") { player.playbackState == PlaybackState.PLAYING }
620
+ player.pause()
621
+ shadowOf(Looper.getMainLooper()).idle()
622
+ assertEquals(MediaPlayer.STATE_IDLE, player.exoPlayer.playbackState)
623
+
624
+ deliverLateEngineError()
625
+
626
+ assertEquals(Playback(PlaybackState.PAUSED, null), player.getPlayback())
627
+ verify(callbacks, never()).onPlaybackError(notNull())
628
+ }
629
+
630
+ @Test
631
+ fun `an engine error that arrives after a pause cancelled its reconnect is not terminal`() {
632
+ goOnline(context)
633
+ val server = ServerSocket(0)
634
+ servers += server
635
+ val connections = AtomicInteger()
636
+ // Ends the first connection unanswered, then holds each reconnect open without an answer.
637
+ thread(isDaemon = true) {
638
+ val held = mutableListOf<Socket>()
639
+ while (!server.isClosed) {
640
+ try {
641
+ val socket = server.accept()
642
+ if (connections.incrementAndGet() == 1) socket.close() else held += socket
643
+ } catch (_: IOException) {
644
+ held.forEach { it.close() }
645
+ return@thread
646
+ }
647
+ }
648
+ }
649
+ play("http://127.0.0.1:${server.localPort}/live", retryPolicy = RetryPolicy.Infinite())
650
+ awaitRetry("a pending retry")
651
+ idleUntil("a reconnect in flight") {
652
+ ShadowSystemClock.advanceBy(Duration.ofMillis(100))
653
+ connections.get() >= 2
654
+ }
655
+
656
+ // The connection's failure report, posted before the pause and dropped by it.
657
+ player.onLoadFailure(IOException("refused"), inPlace = false)
658
+ player.pause()
659
+ shadowOf(Looper.getMainLooper()).idle()
660
+ assertEquals(MediaPlayer.STATE_IDLE, player.exoPlayer.playbackState)
661
+ deliverLateEngineError()
662
+
663
+ assertEquals(Playback(PlaybackState.PAUSED, null), player.getPlayback())
664
+ verify(callbacks, never()).onPlaybackError(notNull())
665
+ }
666
+
667
+ @Test
668
+ fun `an engine error that arrives after a give-up is not a second terminal error`() {
669
+ failTerminally()
670
+ val error = player.playbackError
671
+
672
+ deliverLateEngineError()
673
+
674
+ assertEquals(Playback(PlaybackState.ERROR, error), player.getPlayback())
675
+ verify(callbacks, times(1)).onPlaybackError(notNull())
676
+ }
677
+
588
678
  @Test
589
679
  fun `a failure report that arrives after a reconnect is not the new connection's`() {
590
680
  goOnline(context)
@@ -631,6 +721,22 @@ class PlayerRetryTest {
631
721
  assertEquals(null, player.playbackError)
632
722
  }
633
723
 
724
+ @Test
725
+ fun `a failure report that arrives after a new queue is not its track's`() {
726
+ goOnline(context)
727
+ val wav = folder.silentWavUri(Duration.ofMinutes(1))
728
+ play(wav, retryPolicy = RetryPolicy.Infinite())
729
+ idleUntil("playing") { player.playbackState == PlaybackState.PLAYING }
730
+
731
+ // Posted from the playback thread before the new queue, run after it.
732
+ player.onLoadFailure(IOException("dropped"), inPlace = false)
733
+ player.setQueue(arrayOf(TestFixtures.track(title = "next", src = wav)))
734
+ shadowOf(Looper.getMainLooper()).idle()
735
+
736
+ assertFalse(player.retryLoop!!.failurePending)
737
+ assertEquals(null, player.playbackError)
738
+ }
739
+
634
740
  @Test
635
741
  fun `with retry, a stuck engine reconnects and never ends in an error`() {
636
742
  goOnline(context)
@@ -673,6 +779,13 @@ class PlayerRetryTest {
673
779
  assertEquals("playback-stalled", player.playbackError?.code)
674
780
  }
675
781
 
782
+ private fun deliverLateEngineError() {
783
+ player.playerListener.onPlayerError(
784
+ PlaybackException("refused", null, PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED)
785
+ )
786
+ shadowOf(Looper.getMainLooper()).idle()
787
+ }
788
+
676
789
  private fun stuck() =
677
790
  PlaybackException(
678
791
  "stuck",
@@ -0,0 +1,98 @@
1
+ package com.audiobrowser.player
2
+
3
+ import android.os.Bundle
4
+ import android.os.Looper
5
+ import androidx.media3.common.C
6
+ import androidx.media3.common.MediaItem
7
+ import androidx.media3.session.MediaLibraryService
8
+ import androidx.media3.session.MediaSession
9
+ import androidx.media3.session.SessionError
10
+ import com.audiobrowser.model.PlayerSetupOptions
11
+ import com.audiobrowser.util.BrowserPathHelper
12
+ import java.util.concurrent.ExecutionException
13
+ import java.util.concurrent.TimeUnit
14
+ import kotlin.time.Duration.Companion.milliseconds
15
+ import org.junit.After
16
+ import org.junit.Assert.assertEquals
17
+ import org.junit.Assert.assertThrows
18
+ import org.junit.Test
19
+ import org.junit.runner.RunWith
20
+ import org.mockito.Mockito.mock
21
+ import org.mockito.Mockito.mockingDetails
22
+ import org.robolectric.RobolectricTestRunner
23
+ import org.robolectric.RuntimeEnvironment
24
+ import org.robolectric.Shadows.shadowOf
25
+
26
+ /** A play, browse or item lookup whose configuration never arrives fails, not hangs or vanishes. */
27
+ @RunWith(RobolectricTestRunner::class)
28
+ class SessionBrowserNeverConfiguredTest {
29
+
30
+ private val player =
31
+ Player(RuntimeEnvironment.getApplication(), browserRegistrationTimeout = 100.milliseconds)
32
+ .apply { setup(PlayerSetupOptions()) }
33
+ private val car =
34
+ MediaSession.ControllerInfo.createTestOnlyControllerInfo(
35
+ "car",
36
+ 0,
37
+ 0,
38
+ MediaSession.ControllerInfo.LEGACY_CONTROLLER_VERSION,
39
+ MediaSession.ControllerInfo.LEGACY_CONTROLLER_INTERFACE_VERSION,
40
+ false,
41
+ Bundle.EMPTY,
42
+ false,
43
+ )
44
+ private val session = mock(MediaLibraryService.MediaLibrarySession::class.java)
45
+
46
+ @After fun release() = player.exoPlayer.release()
47
+
48
+ /** The error codes sent to the car, waiting up to 5 s for the first. */
49
+ private fun errorsSentToTheCar(): List<Int> {
50
+ repeat(250) {
51
+ shadowOf(Looper.getMainLooper()).idle()
52
+ val sent =
53
+ mockingDetails(session).invocations.filter {
54
+ it.method.name == "sendError" && it.arguments[0] == car
55
+ }
56
+ if (sent.isNotEmpty()) return sent.map { (it.arguments[1] as SessionError).code }
57
+ Thread.sleep(20)
58
+ }
59
+ return emptyList()
60
+ }
61
+
62
+ @Test
63
+ fun `a play whose browser is never configured fails and tells the car`() {
64
+ val request =
65
+ player
66
+ .getMediaSessionCallback()
67
+ .onSetMediaItems(
68
+ session,
69
+ car,
70
+ mutableListOf(MediaItem.Builder().setMediaId("U1eRRwaa").build()),
71
+ C.INDEX_UNSET,
72
+ C.TIME_UNSET,
73
+ )
74
+
75
+ assertThrows(ExecutionException::class.java) { request.get(5, TimeUnit.SECONDS) }
76
+ assertEquals(listOf(SessionError.ERROR_UNKNOWN), errorsSentToTheCar())
77
+ }
78
+
79
+ @Test
80
+ fun `a browse whose browser is never configured serves the error tile and tells the car`() {
81
+ val result =
82
+ player
83
+ .getMediaSessionCallback()
84
+ .onGetChildren(session, car, "/library", 0, 100, null)
85
+ .get(5, TimeUnit.SECONDS)
86
+
87
+ assertEquals(BrowserPathHelper.ERROR_PATH, result.value!!.single().mediaId)
88
+ assertEquals(listOf(SessionError.ERROR_UNKNOWN), errorsSentToTheCar())
89
+ }
90
+
91
+ @Test
92
+ fun `an item lookup whose browser is never configured answers an error`() {
93
+ val result =
94
+ player.getMediaSessionCallback().onGetItem(session, car, "/library").get(5, TimeUnit.SECONDS)
95
+
96
+ assertEquals(SessionError.ERROR_UNKNOWN, result.resultCode)
97
+ }
98
+ }
@@ -0,0 +1,396 @@
1
+ package com.audiobrowser.player
2
+
3
+ import android.os.Bundle
4
+ import android.os.Looper
5
+ import androidx.media3.common.C
6
+ import androidx.media3.common.MediaItem
7
+ import androidx.media3.session.LibraryResult
8
+ import androidx.media3.session.MediaSession
9
+ import androidx.media3.session.SessionError
10
+ import com.audiobrowser.AudioBrowser
11
+ import com.audiobrowser.TestFixtures
12
+ import com.audiobrowser.browser.BrowserConfig
13
+ import com.audiobrowser.browser.BrowserManager
14
+ import com.audiobrowser.buildService
15
+ import com.audiobrowser.session
16
+ import com.google.common.util.concurrent.ListenableFuture
17
+ import com.margelo.nitro.audiobrowser.NativeRouteEntry
18
+ import com.margelo.nitro.audiobrowser.Track
19
+ import java.util.concurrent.CancellationException
20
+ import java.util.concurrent.ExecutionException
21
+ import java.util.concurrent.TimeUnit
22
+ import kotlinx.coroutines.CompletableDeferred
23
+ import org.junit.After
24
+ import org.junit.Assert.assertEquals
25
+ import org.junit.Assert.assertFalse
26
+ import org.junit.Assert.assertNull
27
+ import org.junit.Assert.assertThrows
28
+ import org.junit.Test
29
+ import org.junit.runner.RunWith
30
+ import org.mockito.Mockito.RETURNS_DEFAULTS
31
+ import org.mockito.Mockito.mock
32
+ import org.mockito.Mockito.mockingDetails
33
+ import org.mockito.stubbing.Answer
34
+ import org.robolectric.RobolectricTestRunner
35
+ import org.robolectric.Shadows.shadowOf
36
+
37
+ /**
38
+ * A controller can send an id this process never browsed: a car resuming its last track after the
39
+ * process died. The id is a bare stable id, with no uri, so only the consumer can say what it
40
+ * plays.
41
+ */
42
+ @RunWith(RobolectricTestRunner::class)
43
+ class SessionUncachedIdTest {
44
+
45
+ private val controller = buildService()
46
+ private val service = controller.get()
47
+ private val player = service.player
48
+ private val car =
49
+ MediaSession.ControllerInfo.createTestOnlyControllerInfo(
50
+ "car",
51
+ 0,
52
+ 0,
53
+ MediaSession.ControllerInfo.LEGACY_CONTROLLER_VERSION,
54
+ MediaSession.ControllerInfo.LEGACY_CONTROLLER_INTERFACE_VERSION,
55
+ false,
56
+ Bundle.EMPTY,
57
+ false,
58
+ )
59
+ private val session = mock(MediaSession::class.java)
60
+
61
+ private val asked = mutableListOf<String>()
62
+
63
+ @After
64
+ fun destroy() {
65
+ controller.destroy()
66
+ }
67
+
68
+ private fun station(id: String) =
69
+ TestFixtures.track(title = "Station", id = id, src = "https://s/$id.mp3")
70
+
71
+ private lateinit var browserManager: BrowserManager
72
+
73
+ private fun browserWith(
74
+ ready: Boolean = true,
75
+ routes: Array<NativeRouteEntry>? = null,
76
+ findTrack: (suspend (String) -> Track?)?,
77
+ ) {
78
+ browserManager =
79
+ BrowserManager().apply {
80
+ config =
81
+ BrowserConfig(
82
+ routes = routes,
83
+ findTrack =
84
+ findTrack?.let { find ->
85
+ val asking: suspend (String) -> Track? = { id ->
86
+ asked += id
87
+ find(id)
88
+ }
89
+ asking
90
+ },
91
+ )
92
+ }
93
+ val configuration = TestFixtures.browserConfiguration()
94
+ player.browser =
95
+ mock(
96
+ AudioBrowser::class.java,
97
+ Answer {
98
+ when {
99
+ it.method.name == "getConfiguration" -> configuration
100
+ it.method.name.startsWith("getBrowserManager") -> browserManager
101
+ else -> RETURNS_DEFAULTS.answer(it)
102
+ }
103
+ },
104
+ )
105
+ if (ready) player.notifyBrowserConfigurationReady()
106
+ }
107
+
108
+ /** What Media3 sets for the legacy `playFromMediaId(id)`: an id, no uri, no metadata. */
109
+ private fun requestPlay(
110
+ mediaId: String
111
+ ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> =
112
+ player
113
+ .getMediaSessionCallback()
114
+ .onSetMediaItems(
115
+ session,
116
+ car,
117
+ mutableListOf(MediaItem.Builder().setMediaId(mediaId).build()),
118
+ C.INDEX_UNSET,
119
+ C.TIME_UNSET,
120
+ )
121
+
122
+ private fun playFromMediaId(mediaId: String) = requestPlay(mediaId).get(5, TimeUnit.SECONDS)
123
+
124
+ private fun getItem(mediaId: String): LibraryResult<MediaItem> =
125
+ player
126
+ .getMediaSessionCallback()
127
+ .onGetItem(service.session, car, mediaId)
128
+ .get(5, TimeUnit.SECONDS)
129
+
130
+ /**
131
+ * The error codes sent to the car, waiting up to [waitMs] for the first. The library reports from
132
+ * the thread that failed the future, then posts to Main, so the report can land after `get()`
133
+ * returns.
134
+ */
135
+ private fun errorsSentToTheCar(waitMs: Long = 5_000): List<Int> {
136
+ repeat((waitMs / 20).toInt()) {
137
+ shadowOf(Looper.getMainLooper()).idle()
138
+ val sent =
139
+ mockingDetails(session).invocations.filter {
140
+ it.method.name == "sendError" && it.arguments[0] == car
141
+ }
142
+ if (sent.isNotEmpty()) return sent.map { (it.arguments[1] as SessionError).code }
143
+ Thread.sleep(20)
144
+ }
145
+ return emptyList()
146
+ }
147
+
148
+ private fun assertPlayFailsAndTellsTheCar(mediaId: String) {
149
+ val request = requestPlay(mediaId)
150
+ assertThrows(ExecutionException::class.java) { request.get(5, TimeUnit.SECONDS) }
151
+ assertEquals(listOf(SessionError.ERROR_UNKNOWN), errorsSentToTheCar())
152
+ }
153
+
154
+ @Test
155
+ fun `an id never browsed plays the track the consumer finds for it`() {
156
+ browserWith { id -> station(id) }
157
+
158
+ val item = playFromMediaId("U1eRRwaa").mediaItems.single()
159
+
160
+ assertEquals(listOf("U1eRRwaa"), asked)
161
+ assertEquals("Station", item.mediaMetadata.title.toString())
162
+ assertEquals("https://s/U1eRRwaa.mp3", item.localConfiguration?.uri.toString())
163
+ }
164
+
165
+ @Test
166
+ fun `a found track plays under the id the controller sent`() {
167
+ browserWith { TestFixtures.track(title = "Station", id = "other", src = "https://s/a.mp3") }
168
+
169
+ assertEquals("U1eRRwaa", playFromMediaId("U1eRRwaa").mediaItems.single().mediaId)
170
+ }
171
+
172
+ @Test
173
+ fun `a found track is remembered, so a second play does not ask again`() {
174
+ browserWith { id -> station(id) }
175
+
176
+ playFromMediaId("U1eRRwaa")
177
+ playFromMediaId("U1eRRwaa")
178
+
179
+ assertEquals(listOf("U1eRRwaa"), asked)
180
+ }
181
+
182
+ @Test
183
+ fun `an item lookup for an id never browsed answers the track the consumer finds`() {
184
+ browserWith { id -> station(id) }
185
+
186
+ val result = getItem("U1eRRwaa")
187
+
188
+ assertEquals(LibraryResult.RESULT_SUCCESS, result.resultCode)
189
+ assertEquals("Station", result.value?.mediaMetadata?.title.toString())
190
+ assertEquals(listOf("U1eRRwaa"), asked)
191
+ }
192
+
193
+ @Test
194
+ fun `a browse path or a url is never asked of the consumer`() {
195
+ browserWith { id -> station(id) }
196
+
197
+ getItem("/library/missing")
198
+ assertThrows(ExecutionException::class.java) { playFromMediaId("/library/missing") }
199
+ playFromMediaId("https://s/a.mp3")
200
+ getItem("https://example.invalid/a.mp3")
201
+
202
+ assertEquals(emptyList<String>(), asked)
203
+ }
204
+
205
+ @Test
206
+ fun `an id with a scheme-like prefix is asked of the consumer`() {
207
+ browserWith { id -> station(id) }
208
+
209
+ playFromMediaId("station:123")
210
+
211
+ assertEquals(listOf("station:123"), asked)
212
+ }
213
+
214
+ @Test
215
+ fun `an id the consumer does not know fails the play and tells the controller`() {
216
+ browserWith { null }
217
+
218
+ assertPlayFailsAndTellsTheCar("gone")
219
+ assertEquals(listOf("gone"), asked)
220
+ }
221
+
222
+ @Test
223
+ fun `a found track without a src fails the play and tells the controller`() {
224
+ browserWith { id -> TestFixtures.track(title = "Page", id = id, src = null) }
225
+
226
+ assertPlayFailsAndTellsTheCar("U1eRRwaa")
227
+ assertEquals(listOf("U1eRRwaa"), asked)
228
+ }
229
+
230
+ @Test
231
+ fun `a find that throws fails the play and tells the controller`() {
232
+ browserWith { throw IllegalStateException("offline") }
233
+
234
+ assertPlayFailsAndTellsTheCar("U1eRRwaa")
235
+ assertEquals(listOf("U1eRRwaa"), asked)
236
+ }
237
+
238
+ @Test
239
+ fun `without findTrack an id never browsed fails the play and tells the controller`() {
240
+ browserWith(findTrack = null)
241
+
242
+ assertPlayFailsAndTellsTheCar("U1eRRwaa")
243
+ }
244
+
245
+ @Test
246
+ fun `a play that arrives before the browser is configured plays once it is`() {
247
+ browserWith(ready = false) { id -> station(id) }
248
+
249
+ val request = requestPlay("U1eRRwaa")
250
+ assertFalse(request.isDone)
251
+ player.notifyBrowserConfigurationReady()
252
+
253
+ assertEquals(
254
+ "Station",
255
+ request.get(5, TimeUnit.SECONDS).mediaItems.single().mediaMetadata.title.toString(),
256
+ )
257
+ }
258
+
259
+ @Test
260
+ fun `a play and an item lookup for the same id in flight ask the consumer once`() {
261
+ val answer = CompletableDeferred<Track>()
262
+ browserWith { answer.await() }
263
+
264
+ val lookup = player.getMediaSessionCallback().onGetItem(service.session, car, "U1eRRwaa")
265
+ val play = requestPlay("U1eRRwaa")
266
+ waitUntil { asked.isNotEmpty() }
267
+ answer.complete(station("U1eRRwaa"))
268
+
269
+ assertEquals(LibraryResult.RESULT_SUCCESS, lookup.get(5, TimeUnit.SECONDS).resultCode)
270
+ assertEquals("U1eRRwaa", play.get(5, TimeUnit.SECONDS).mediaItems.single().mediaId)
271
+ assertEquals(listOf("U1eRRwaa"), asked)
272
+ }
273
+
274
+ @Test
275
+ fun `a found track is remembered under the id only, not its path or src`() {
276
+ browserWith {
277
+ TestFixtures.track(title = "Station", id = "x", src = "https://s/a.mp3")
278
+ .copy(path = "/page/a")
279
+ }
280
+
281
+ playFromMediaId("U1eRRwaa")
282
+
283
+ assertNull(browserManager.getCachedTrack("/page/a"))
284
+ assertNull(browserManager.getCachedTrack("https://s/a.mp3"))
285
+ }
286
+
287
+ @Test
288
+ fun `an item lookup for an id the consumer does not know is not browsed as a path`() {
289
+ browserWith(
290
+ routes =
291
+ arrayOf(
292
+ TestFixtures.staticRoute(BrowserManager.DEFAULT_ROUTE_PATH, TestFixtures.resolvedTrack())
293
+ )
294
+ ) {
295
+ null
296
+ }
297
+
298
+ assertEquals(SessionError.ERROR_BAD_VALUE, getItem("U1eRRwaa").resultCode)
299
+ }
300
+
301
+ @Test
302
+ fun `a newer play cancels an earlier one still finding its track`() {
303
+ val answer = CompletableDeferred<Track>()
304
+ browserWith { answer.await() }
305
+
306
+ val earlier = requestPlay("U1eRRwaa")
307
+ waitUntil { asked.isNotEmpty() }
308
+ val newer =
309
+ player
310
+ .getMediaSessionCallback()
311
+ .onSetMediaItems(
312
+ session,
313
+ car,
314
+ mutableListOf(
315
+ MediaItem.Builder()
316
+ .setMediaId("B")
317
+ .setRequestMetadata(
318
+ MediaItem.RequestMetadata.Builder()
319
+ .setMediaUri(android.net.Uri.parse("https://s/b.mp3"))
320
+ .build()
321
+ )
322
+ .build()
323
+ ),
324
+ C.INDEX_UNSET,
325
+ C.TIME_UNSET,
326
+ )
327
+
328
+ assertEquals("B", newer.get(5, TimeUnit.SECONDS).mediaItems.single().mediaId)
329
+ answer.complete(station("U1eRRwaa"))
330
+ assertThrows(CancellationException::class.java) { earlier.get(5, TimeUnit.SECONDS) }
331
+ assertEquals(emptyList<Int>(), errorsSentToTheCar(waitMs = 200))
332
+ }
333
+
334
+ @Test
335
+ fun `a play from the app while a car's play is finding its track is not replaced by it`() {
336
+ val answer = CompletableDeferred<Track>()
337
+ browserWith { answer.await() }
338
+
339
+ val carPlay = requestPlay("U1eRRwaa")
340
+ waitUntil { asked.isNotEmpty() }
341
+ player.load(station("app"))
342
+ shadowOf(Looper.getMainLooper()).idle()
343
+ answer.complete(station("U1eRRwaa"))
344
+
345
+ assertThrows(CancellationException::class.java) { carPlay.get(5, TimeUnit.SECONDS) }
346
+ assertEquals(emptyList<Int>(), errorsSentToTheCar(waitMs = 200))
347
+ }
348
+
349
+ @Test
350
+ fun `a new queue from the app while a car's play is finding its track drops the car's play`() {
351
+ val answer = CompletableDeferred<Track>()
352
+ browserWith { answer.await() }
353
+
354
+ val carPlay = requestPlay("U1eRRwaa")
355
+ waitUntil { asked.isNotEmpty() }
356
+ player.setQueue(arrayOf(station("app")))
357
+ shadowOf(Looper.getMainLooper()).idle()
358
+ answer.complete(station("U1eRRwaa"))
359
+
360
+ assertThrows(CancellationException::class.java) { carPlay.get(5, TimeUnit.SECONDS) }
361
+ }
362
+
363
+ @Test
364
+ fun `a favorite restamp while a car's play is finding its track does not drop it`() {
365
+ assertCarPlaySurvives { player.replaceTrack(0, station("app").copy(favorited = true)) }
366
+ }
367
+
368
+ @Test
369
+ fun `an up-next add while a car's play is finding its track does not drop it`() {
370
+ assertCarPlaySurvives { player.add(station("next")) }
371
+ }
372
+
373
+ /** A car play of an unbrowsed id plays, though [meanwhile] edits the queue during its find. */
374
+ private fun assertCarPlaySurvives(meanwhile: () -> Unit) {
375
+ val answer = CompletableDeferred<Track>()
376
+ browserWith { answer.await() }
377
+ player.load(station("app"))
378
+ shadowOf(Looper.getMainLooper()).idle()
379
+
380
+ val carPlay = requestPlay("U1eRRwaa")
381
+ waitUntil { asked.isNotEmpty() }
382
+ meanwhile()
383
+ shadowOf(Looper.getMainLooper()).idle()
384
+ answer.complete(station("U1eRRwaa"))
385
+
386
+ assertEquals("U1eRRwaa", carPlay.get(5, TimeUnit.SECONDS).mediaItems.single().mediaId)
387
+ }
388
+
389
+ private fun waitUntil(condition: () -> Boolean) {
390
+ repeat(250) {
391
+ if (condition()) return
392
+ Thread.sleep(20)
393
+ }
394
+ throw AssertionError("condition not met within 5 s")
395
+ }
396
+ }
@@ -138,7 +138,7 @@ class SessionViewTest {
138
138
  }
139
139
 
140
140
  @Test
141
- fun `a reconnect attempt tells the session nothing it was already told`() {
141
+ fun `a reconnect attempt's events tell the session nothing it was already told`() {
142
142
  val server = ServerSocket(0)
143
143
  val connections = AtomicInteger()
144
144
  val drop = CountDownLatch(1)
@@ -205,7 +205,11 @@ class SessionViewTest {
205
205
  goOnline(context)
206
206
  player.setup(PlayerSetupOptions(retryPolicy = retryPolicy))
207
207
  player.setCallbacks(callbacks)
208
- session = MediaSession.Builder(context, player.forwardingPlayer).build()
208
+ // Media3's 3 s re-sends run while the engine loads: a slow connection adds them to the counts.
209
+ session =
210
+ MediaSession.Builder(context, player.forwardingPlayer)
211
+ .setPeriodicPositionUpdateEnabled(false)
212
+ .build()
209
213
  player.setMediaSession(session)
210
214
  player.exoPlayer.trackSelectionParameters =
211
215
  player.exoPlayer.trackSelectionParameters