react-native-audio-browser 1.0.0-next.4 → 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 (239) 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 +41 -6
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
  5. package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
  6. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  7. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  8. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
  9. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
  10. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  12. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
  15. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
  16. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  17. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  18. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  19. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  20. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  21. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  22. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  23. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  24. package/android/src/main/res/values/strings.xml +5 -2
  25. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  26. package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
  27. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  28. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  30. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  31. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  32. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
  33. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
  34. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  35. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  36. package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
  37. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  38. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
  39. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
  40. package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
  41. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  42. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
  43. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
  44. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  45. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  46. package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
  47. package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
  48. package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
  49. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  50. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  51. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  52. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  53. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
  54. package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
  55. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  56. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  57. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  58. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  59. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  60. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  61. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  62. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  63. package/ios/AVPlayerEngine.swift +2 -2
  64. package/ios/Browser/BrowserPathHelper.swift +11 -9
  65. package/ios/Browser/PageResolver.swift +1 -1
  66. package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
  67. package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
  68. package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
  69. package/ios/CarPlay/SectionPresentation.swift +7 -0
  70. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  71. package/ios/HybridAudioBrowser+Player.swift +3 -2
  72. package/ios/HybridAudioBrowser.swift +1 -1
  73. package/ios/Model/NitroTypeStubs.swift +15 -0
  74. package/ios/Model/PlayerUpdateOptions.swift +2 -1
  75. package/ios/PlaybackEvent.swift +20 -0
  76. package/ios/Player/Player.swift +17 -3
  77. package/ios/Player/QueueManager.swift +23 -41
  78. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  79. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  80. package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
  81. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  82. package/ios/Tests/GenerationMemoTests.swift +136 -0
  83. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  84. package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
  85. package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
  86. package/ios/Tests/PlayerPolicyTests.swift +51 -28
  87. package/ios/Tests/PlayerProgressTests.swift +0 -2
  88. package/ios/Tests/PlayerTests.swift +54 -0
  89. package/ios/Tests/QueueManagerTests.swift +111 -78
  90. package/ios/Tests/RequestLayerTests.swift +11 -0
  91. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  92. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  93. package/ios/Tests/SectionPresentationTests.swift +13 -0
  94. package/ios/Tests/Support/TestTypes.swift +23 -1
  95. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  96. package/ios/Util/AwaitCallback.swift +16 -10
  97. package/ios/Util/GenerationMemo.swift +81 -17
  98. package/ios/Util/JSCallbackError.swift +23 -0
  99. package/ios/Util/OutputPicker.swift +25 -5
  100. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  101. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  102. package/lib/commonjs/features/browser-config.js +3 -2
  103. package/lib/commonjs/features/browser-config.js.map +1 -1
  104. package/lib/commonjs/features/browser.js +7 -8
  105. package/lib/commonjs/features/browser.js.map +1 -1
  106. package/lib/commonjs/features/output.js +7 -3
  107. package/lib/commonjs/features/output.js.map +1 -1
  108. package/lib/commonjs/features/player/options.js.map +1 -1
  109. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  110. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  111. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  112. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  114. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  115. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  116. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  117. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  118. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  119. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  120. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  121. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  122. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  123. package/lib/module/features/browser-config.js +3 -2
  124. package/lib/module/features/browser-config.js.map +1 -1
  125. package/lib/module/features/browser.js +7 -8
  126. package/lib/module/features/browser.js.map +1 -1
  127. package/lib/module/features/output.js +7 -3
  128. package/lib/module/features/output.js.map +1 -1
  129. package/lib/module/features/player/options.js.map +1 -1
  130. package/lib/module/web/NativeAudioBrowser.js +43 -2
  131. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  132. package/lib/module/web/browser/BrowserManager.js +37 -66
  133. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  134. package/lib/module/web/browser/SearchManager.js +1 -5
  135. package/lib/module/web/browser/SearchManager.js.map +1 -1
  136. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  137. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  138. package/lib/module/web/player/NowPlayingManager.js +3 -22
  139. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  140. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  141. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  142. package/lib/module/web/util/GenerationMemo.js +87 -0
  143. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  144. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  145. package/lib/typescript/src/features/browser.d.ts +7 -8
  146. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  147. package/lib/typescript/src/features/output.d.ts +8 -4
  148. package/lib/typescript/src/features/output.d.ts.map +1 -1
  149. package/lib/typescript/src/features/player/options.d.ts +19 -1
  150. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  151. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  152. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  153. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  154. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  155. package/lib/typescript/src/types/browser.d.ts +55 -8
  156. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  157. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  158. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  159. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  160. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  161. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  162. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  163. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  164. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  165. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  166. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  167. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  168. 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
  169. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  170. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  171. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  172. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  173. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  174. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  175. 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
  176. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  177. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  178. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  179. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  180. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  181. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  182. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  183. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
  184. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  185. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  186. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  187. 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
  188. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  189. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  190. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  191. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
  192. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  193. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  194. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  195. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  196. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  197. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  198. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  199. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  200. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  201. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  202. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  203. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  204. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
  205. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  206. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  207. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  208. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  209. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
  210. package/package.json +1 -1
  211. package/src/codegen-js-error-message.test.ts +78 -0
  212. package/src/features/browser-config.test.ts +7 -0
  213. package/src/features/browser-config.ts +3 -2
  214. package/src/features/browser.ts +7 -8
  215. package/src/features/output.ts +13 -5
  216. package/src/features/player/options.ts +19 -1
  217. package/src/specs/audio-browser.nitro.ts +16 -3
  218. package/src/types/browser-native.ts +4 -1
  219. package/src/types/browser.ts +60 -8
  220. package/src/web/NativeAudioBrowser.ts +43 -3
  221. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  222. package/src/web/browser/BrowserManager.ts +50 -79
  223. package/src/web/browser/SearchManager.ts +1 -8
  224. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  225. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  226. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  227. package/src/web/http/RequestConfigBuilder.ts +72 -57
  228. package/src/web/player/NowPlayingManager.test.ts +29 -0
  229. package/src/web/player/NowPlayingManager.ts +4 -27
  230. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  231. package/src/web/util/BrowserPathHelper.ts +6 -7
  232. package/src/web/util/GenerationMemo.test.ts +148 -0
  233. package/src/web/util/GenerationMemo.ts +103 -0
  234. package/website/guide/audio-output.md +34 -7
  235. package/website/guide/browser.md +21 -0
  236. package/website/guide/carplay.md +1 -1
  237. package/website/guide/configuration.md +10 -9
  238. package/website/guide/gate.md +1 -1
  239. package/website/guide/remote-controls.md +35 -0
@@ -0,0 +1,40 @@
1
+ package com.audiobrowser.player
2
+
3
+ import com.margelo.nitro.audiobrowser.RemoteOutputsOptions
4
+ import org.junit.Assert.fail
5
+ import org.junit.runner.RunWith
6
+ import org.robolectric.RobolectricTestRunner
7
+ import org.robolectric.annotation.Config
8
+
9
+ // SDK 28: from 33, media3 asks AudioManager.getAudioDevicesForAttributes, which Robolectric
10
+ // answers with null.
11
+
12
+ @RunWith(RobolectricTestRunner::class)
13
+ @Config(sdk = [28])
14
+ class QueueEventOnEngineTest : QueueEventTest() {
15
+ override val remoteOutputs: RemoteOutputsOptions? = null
16
+ }
17
+
18
+ @RunWith(RobolectricTestRunner::class)
19
+ @Config(sdk = [28])
20
+ class QueueEventOnRemoteSwitchingPlayerTest : QueueEventTest() {
21
+ override val remoteOutputs: RemoteOutputsOptions? =
22
+ RemoteOutputsOptions(cast = null, castReceiverApplicationId = null, sonos = true)
23
+ }
24
+
25
+ @RunWith(RobolectricTestRunner::class)
26
+ @Config(sdk = [28])
27
+ class QueueEventWhileCastingTest : QueueEventTest() {
28
+ override val remoteOutputs: RemoteOutputsOptions? =
29
+ RemoteOutputsOptions(cast = true, castReceiverApplicationId = null, sonos = null)
30
+
31
+ override fun route() {
32
+ castRemote.startSession()
33
+ repeat(500) {
34
+ if (!player.localEngine.isActive) return
35
+ Thread.sleep(10)
36
+ idle()
37
+ }
38
+ fail("never handed over to the receiver")
39
+ }
40
+ }
@@ -0,0 +1,153 @@
1
+ package com.audiobrowser.player
2
+
3
+ import android.os.Looper
4
+ import androidx.media3.session.MediaSession
5
+ import com.audiobrowser.Callbacks
6
+ import com.audiobrowser.TestFixtures
7
+ import com.audiobrowser.browser.FavoriteChange
8
+ import com.audiobrowser.model.PlayerSetupOptions
9
+ import com.audiobrowser.model.PlayerUpdateOptions
10
+ import com.audiobrowser.remote.FakeRemote
11
+ import com.audiobrowser.remote.RemoteSwitchingPlayer
12
+ import com.audiobrowser.util.TrackFactory
13
+ import com.margelo.nitro.audiobrowser.NowPlayingUpdate
14
+ import com.margelo.nitro.audiobrowser.RemoteOutputsOptions
15
+ import com.margelo.nitro.audiobrowser.Track
16
+ import org.junit.After
17
+ import org.junit.Assert.assertEquals
18
+ import org.junit.Assert.assertNotEquals
19
+ import org.junit.Before
20
+ import org.junit.Test
21
+ import org.mockito.Mockito.clearInvocations
22
+ import org.mockito.Mockito.mock
23
+ import org.mockito.Mockito.mockingDetails
24
+ import org.robolectric.RuntimeEnvironment
25
+ import org.robolectric.Shadows.shadowOf
26
+
27
+ /**
28
+ * What JS hears of an in-place replace of queued items. The engine reports it as a playlist change,
29
+ * but [RemoteSwitchingPlayer] reports it as a source update, playing locally or casting, so each
30
+ * session player runs every test.
31
+ */
32
+ abstract class QueueEventTest {
33
+ /** Null for the bare engine as the session player. */
34
+ abstract val remoteOutputs: RemoteOutputsOptions?
35
+
36
+ /** Runs once the queue is set, before the test. */
37
+ open fun route() {}
38
+
39
+ protected val looper: Looper = Looper.getMainLooper()
40
+ internal val castRemote = FakeRemote(looper)
41
+ private val app = RuntimeEnvironment.getApplication()
42
+ internal val player =
43
+ Player(app, castRemote = { _, _ -> castRemote }, sonosRemote = { _, _ -> FakeRemote(looper) })
44
+ private val callbacks = mock(Callbacks::class.java)
45
+ private lateinit var session: MediaSession
46
+ private val a = TestFixtures.track(title = "a", src = "https://s/a.mp3", favorited = false)
47
+ private val b = TestFixtures.track(title = "b", src = "https://s/b.mp3", favorited = false)
48
+
49
+ @Before
50
+ fun setUp() {
51
+ player.setup(PlayerSetupOptions(remoteOutputs = remoteOutputs))
52
+ assertEquals(remoteOutputs != null, player.sessionPlayer is RemoteSwitchingPlayer)
53
+ session = MediaSession.Builder(app, player.sessionPlayer).build()
54
+ player.setMediaSession(session)
55
+ player.applyOptions(
56
+ PlayerUpdateOptions().let { it.copy(capabilities = it.capabilities.copy(favorite = true)) }
57
+ )
58
+ player.setCallbacks(callbacks)
59
+ player.setQueue(arrayOf(a, b))
60
+ idle()
61
+ route()
62
+ clearInvocations(callbacks)
63
+ }
64
+
65
+ @After
66
+ fun release() {
67
+ session.release()
68
+ player.destroy()
69
+ TrackFactory.favoriteEnabled = false
70
+ }
71
+
72
+ protected fun idle() = shadowOf(looper).idle()
73
+
74
+ private fun calls(name: String) =
75
+ mockingDetails(callbacks).invocations.filter { it.method.name == name }
76
+
77
+ /** Each queue JS was sent since the last check, as its tracks' titles and `favorited`. */
78
+ private fun queueEvents(): List<List<Pair<String, Boolean?>>> {
79
+ val queues =
80
+ calls("onPlaybackQueueChanged").map { call ->
81
+ (call.arguments[0] as Array<*>).map { (it as Track).let { t -> t.title to t.favorited } }
82
+ }
83
+ clearInvocations(callbacks)
84
+ return queues
85
+ }
86
+
87
+ private fun expectOneQueue(vararg tracks: Pair<String, Boolean?>, change: () -> Unit) {
88
+ val version = player.queueVersion
89
+ change()
90
+ idle()
91
+ assertEquals(listOf(tracks.toList()), queueEvents())
92
+ assertNotEquals(version, player.queueVersion)
93
+ }
94
+
95
+ @Test
96
+ fun `adding a favorite sends the restamped queue once and moves the queue version`() =
97
+ expectOneQueue("a" to true, "b" to false) {
98
+ player.applyFavoriteChange(FavoriteChange.between(emptySet(), setOf(a.src!!))!!)
99
+ }
100
+
101
+ @Test
102
+ fun `removing a favorite sends the restamped queue once and moves the queue version`() {
103
+ player.applyFavoriteChange(FavoriteChange.between(emptySet(), setOf(a.src!!))!!)
104
+ idle()
105
+ queueEvents()
106
+
107
+ expectOneQueue("a" to false, "b" to false) {
108
+ player.applyFavoriteChange(FavoriteChange.between(setOf(a.src!!), emptySet())!!)
109
+ }
110
+ }
111
+
112
+ @Test
113
+ fun `a toggle sends the restamped queue once and moves the queue version`() =
114
+ expectOneQueue("a" to true, "b" to false) { player.setActiveTrackFavorited(true) }
115
+
116
+ @Test
117
+ fun `a track replaced in place sends the queue once and moves the queue version`() =
118
+ expectOneQueue("x" to false, "b" to false) { player.replaceTrack(0, a.copy(title = "x")) }
119
+
120
+ @Test
121
+ fun `a favorite change that moves no queued track sends nothing`() {
122
+ val version = player.queueVersion
123
+
124
+ player.applyFavoriteChange(FavoriteChange.between(emptySet(), setOf("elsewhere"))!!)
125
+ idle()
126
+
127
+ assertEquals(emptyList<Any>(), queueEvents())
128
+ assertEquals(version, player.queueVersion)
129
+ }
130
+
131
+ @Test
132
+ fun `a now-playing restamp leaves the tracks, and sends nothing`() {
133
+ val version = player.queueVersion
134
+
135
+ player.nowPlaying.updateNowPlaying(
136
+ NowPlayingUpdate(title = "Song", artist = null, album = null)
137
+ )
138
+ idle()
139
+
140
+ assertEquals("Song", player.sessionPlayer.getMediaItemAt(0).mediaMetadata.title)
141
+ assertEquals(emptyList<Any>(), queueEvents())
142
+ assertEquals(version, player.queueVersion)
143
+ }
144
+
145
+ @Test
146
+ fun `the active track stays put`() {
147
+ player.applyFavoriteChange(FavoriteChange.between(emptySet(), setOf(a.src!!))!!)
148
+ idle()
149
+
150
+ assertEquals(0, calls("onPlaybackActiveTrackChanged").size)
151
+ assertEquals(0, player.sessionPlayer.currentMediaItemIndex)
152
+ }
153
+ }
@@ -0,0 +1,130 @@
1
+ package com.audiobrowser.player
2
+
3
+ import android.os.Looper
4
+ import androidx.media3.session.MediaSession
5
+ import com.audiobrowser.TestFixtures
6
+ import com.audiobrowser.model.PlayerSetupOptions
7
+ import com.audiobrowser.model.PlayerUpdateOptions
8
+ import org.junit.After
9
+ import org.junit.Assert.assertEquals
10
+ import org.junit.Before
11
+ import org.junit.Test
12
+ import org.junit.runner.RunWith
13
+ import org.robolectric.RobolectricTestRunner
14
+ import org.robolectric.RuntimeEnvironment
15
+ import org.robolectric.Shadows.shadowOf
16
+
17
+ /**
18
+ * What a controller's pick of a queue item does to the player the session wraps, with the
19
+ * `skipToQueueItem` capability on and off.
20
+ */
21
+ @RunWith(RobolectricTestRunner::class)
22
+ class QueueItemPickTest {
23
+
24
+ private val app = RuntimeEnvironment.getApplication()
25
+ private val player = Player(app)
26
+ private lateinit var session: MediaSession
27
+
28
+ @Before
29
+ fun setUp() {
30
+ player.setup(PlayerSetupOptions())
31
+ session = MediaSession.Builder(app, player.forwardingPlayer).build()
32
+ player.setMediaSession(session)
33
+ player.add(
34
+ arrayOf(
35
+ TestFixtures.track(title = "a", src = "https://s/a.mp3"),
36
+ TestFixtures.track(title = "b", src = "https://s/b.mp3"),
37
+ TestFixtures.track(title = "c", src = "https://s/c.mp3"),
38
+ )
39
+ )
40
+ idle()
41
+ }
42
+
43
+ @After
44
+ fun release() {
45
+ session.release()
46
+ player.exoPlayer.release()
47
+ }
48
+
49
+ private fun skipToQueueItem(enabled: Boolean?) =
50
+ player.applyOptions(
51
+ PlayerUpdateOptions().let {
52
+ it.copy(capabilities = it.capabilities.copy(skipToQueueItem = enabled))
53
+ }
54
+ )
55
+
56
+ private fun idle() = shadowOf(Looper.getMainLooper()).idle()
57
+
58
+ private val index
59
+ get() = player.exoPlayer.currentMediaItemIndex
60
+
61
+ @Test
62
+ fun `a pick of another item moves the queue by default`() {
63
+ player.forwardingPlayer.seekToDefaultPosition(2)
64
+ idle()
65
+ assertEquals(2, index)
66
+
67
+ player.forwardingPlayer.seekTo(1, 0)
68
+ idle()
69
+ assertEquals(1, index)
70
+ }
71
+
72
+ @Test
73
+ fun `a pick of another item is dropped while the capability is off`() {
74
+ skipToQueueItem(false)
75
+
76
+ player.forwardingPlayer.seekToDefaultPosition(2)
77
+ idle()
78
+ assertEquals(0, index)
79
+ }
80
+
81
+ @Test
82
+ fun `a seek into another item is dropped while the capability is off`() {
83
+ skipToQueueItem(false)
84
+
85
+ player.forwardingPlayer.seekTo(2, 0)
86
+ idle()
87
+ assertEquals(0, index)
88
+
89
+ player.forwardingPlayer.seekTo(1, 5_000)
90
+ idle()
91
+ assertEquals(0, index)
92
+ assertEquals(0L, player.exoPlayer.currentPosition)
93
+ }
94
+
95
+ @Test
96
+ fun `a seek within the current item goes through while the capability is off`() {
97
+ player.exoPlayer.seekTo(1, 0)
98
+ idle()
99
+ skipToQueueItem(false)
100
+
101
+ player.forwardingPlayer.seekTo(1, 5_000)
102
+ idle()
103
+ assertEquals(1, index)
104
+ assertEquals(5_000L, player.exoPlayer.currentPosition)
105
+
106
+ player.forwardingPlayer.seekToDefaultPosition(1)
107
+ idle()
108
+ assertEquals(1, index)
109
+ assertEquals(0L, player.exoPlayer.currentPosition)
110
+ }
111
+
112
+ @Test
113
+ fun `the app's own skip moves the queue while the capability is off`() {
114
+ skipToQueueItem(false)
115
+
116
+ player.skipTo(2)
117
+ idle()
118
+ assertEquals(2, index)
119
+ }
120
+
121
+ @Test
122
+ fun `turning the capability back on lets a pick through again`() {
123
+ skipToQueueItem(false)
124
+ skipToQueueItem(true)
125
+
126
+ player.forwardingPlayer.seekToDefaultPosition(2)
127
+ idle()
128
+ assertEquals(2, index)
129
+ }
130
+ }
@@ -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
+ }