react-native-audio-browser 1.0.0-next.2 → 1.0.0-next.4
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.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +37 -14
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +38 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +6 -41
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +40 -34
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +6 -5
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +12 -7
- package/android/src/main/java/com/audiobrowser/extension/QueueIndex.kt +19 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -1
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +32 -18
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +2 -2
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +17 -16
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +11 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +5 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +28 -21
- package/android/src/main/java/com/audiobrowser/player/Player.kt +41 -31
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +4 -0
- package/android/src/main/java/com/audiobrowser/player/ResolvingOnReloadSource.kt +38 -0
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +34 -19
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +10 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +48 -4
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +32 -34
- package/android/src/main/java/com/audiobrowser/util/SearchParamsFactory.kt +64 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +236 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +116 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +41 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +21 -4
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerPageShapeTest.kt +93 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerUnparsableResponseTest.kt +82 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +27 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +7 -1
- package/android/src/test/java/com/audiobrowser/browser/JsonFavoritedTest.kt +34 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/extension/QueueIndexTest.kt +44 -0
- package/android/src/test/java/com/audiobrowser/http/HttpClientTest.kt +34 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +90 -7
- package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +19 -2
- package/android/src/test/java/com/audiobrowser/player/AutomaticBufferManagerTest.kt +17 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +39 -0
- package/android/src/test/java/com/audiobrowser/player/MediaUrlReloadTest.kt +212 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSeekSnapshotTest.kt +45 -0
- package/android/src/test/java/com/audiobrowser/player/SessionQueueShuffleOrderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +173 -0
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +127 -1
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +28 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +116 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +44 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +188 -0
- package/ios/Browser/BrowserError.swift +8 -0
- package/ios/Browser/BrowserManager.swift +29 -28
- package/ios/Browser/BrowserPathHelper.swift +26 -24
- package/ios/Browser/FavoriteSet.swift +16 -8
- package/ios/Browser/Favorites.swift +66 -0
- package/ios/Browser/JsonModels.swift +27 -7
- package/ios/Browser/NavigationErrorState.swift +18 -1
- package/ios/Browser/PageResolver.swift +2 -2
- package/ios/Browser/RequestLayer.swift +11 -4
- package/ios/Browser/RequestPipeline.swift +8 -4
- package/ios/Browser/TabBarEntries.swift +7 -0
- package/ios/CarPlay/CarPlayImageLoader.swift +3 -7
- package/ios/CarPlay/CarPlaySession+Navigator.swift +3 -1
- package/ios/CarPlay/IntentHandlers.swift +1 -7
- package/ios/CarPlay/MediaIntentCriteria.swift +4 -4
- package/ios/Extension/CGSize+AspectFit.swift +11 -0
- package/ios/Extension/Dictionary+Headers.swift +8 -0
- package/ios/Extension/NavigationError+Conversion.swift +4 -3
- package/ios/Extension/ResolvedTrack+Copying.swift +15 -0
- package/ios/Http/HttpClient.swift +37 -11
- package/ios/HybridAudioBrowser+Browser.swift +9 -16
- package/ios/HybridAudioBrowser+Options.swift +1 -0
- package/ios/HybridAudioBrowser+Player.swift +24 -23
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +1 -2
- package/ios/Model/NitroTypeStubs.swift +39 -0
- package/ios/Model/TrackPlayerError.swift +21 -2
- package/ios/Player/AudioSessionController.swift +2 -2
- package/ios/Player/MediaLoader.swift +1 -1
- package/ios/Player/PlaybackStateMachine.swift +1 -2
- package/ios/Player/Player.swift +59 -20
- package/ios/Player/PlayerEngine.swift +5 -0
- package/ios/Player/QueueManager.swift +21 -4
- package/ios/Tests/BrowserErrorTests.swift +21 -0
- package/ios/Tests/BrowserPathHelperTests.swift +18 -0
- package/ios/Tests/CGSizeAspectFitTests.swift +36 -0
- package/ios/Tests/ClampedVolumeTests.swift +26 -0
- package/ios/Tests/FavoriteSetTests.swift +68 -3
- package/ios/Tests/FavoritesTests.swift +102 -0
- package/ios/Tests/HttpClientUserAgentTests.swift +45 -0
- package/ios/Tests/JsonModelsTests.swift +74 -6
- package/ios/Tests/MediaIntentCriteriaTests.swift +11 -1
- package/ios/Tests/MediaLoaderAssetOptionsTests.swift +7 -0
- package/ios/Tests/NavigationErrorStateTests.swift +73 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +6 -4
- package/ios/Tests/PlayerPolicyTests.swift +38 -0
- package/ios/Tests/PlayerProgressTests.swift +109 -0
- package/ios/Tests/PlayerTests.swift +106 -0
- package/ios/Tests/QueueIndexTests.swift +43 -0
- package/ios/Tests/QueueManagerTests.swift +79 -15
- package/ios/Tests/RequestLayerTests.swift +22 -3
- package/ios/Tests/TabBarEntriesTests.swift +19 -0
- package/ios/Tests/TrackSelectorTests.swift +154 -0
- package/ios/Tests/UnparsableResponseTests.swift +91 -0
- package/ios/TrackSelector.swift +28 -8
- package/ios/Util/ArtworkImageFetcher.swift +9 -8
- package/ios/Util/SVGProcessor.swift +6 -17
- package/lib/commonjs/features/browser-config.js +6 -3
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/errors.js +12 -7
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js +9 -3
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +1 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +2 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +2 -2
- package/lib/commonjs/features/queue/activeTrack.js +4 -2
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +6 -5
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +2 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +2 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/callListener.js +23 -0
- package/lib/commonjs/utils/callListener.js.map +1 -0
- package/lib/module/features/browser-config.js +6 -3
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/errors.js +12 -7
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/nowPlaying.js +9 -3
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/playback/controls.js +1 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +2 -1
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/player/setup.js +2 -2
- package/lib/module/features/queue/activeTrack.js +4 -2
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/sleepTimer.js +6 -5
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +2 -1
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +2 -1
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/callListener.js +19 -0
- package/lib/module/utils/callListener.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts +8 -6
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +2 -1
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +1 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +2 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts +2 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +2 -1
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +3 -2
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/callListener.d.ts +7 -0
- package/lib/typescript/src/utils/callListener.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/features/browser-config.test.ts +15 -0
- package/src/features/browser-config.ts +6 -3
- package/src/features/errors.test.ts +83 -0
- package/src/features/errors.ts +12 -7
- package/src/features/hook-wiring.test.ts +11 -10
- package/src/features/nowPlaying.ts +9 -3
- package/src/features/playback/controls.ts +1 -2
- package/src/features/playback/trackPlaybackTime.test.ts +24 -1
- package/src/features/playback/trackPlaybackTime.ts +2 -1
- package/src/features/player/setup.ts +2 -2
- package/src/features/queue/activeTrack.test.ts +32 -0
- package/src/features/queue/activeTrack.ts +8 -2
- package/src/features/sleepTimer.test.ts +24 -0
- package/src/features/sleepTimer.ts +6 -5
- package/src/types/browser.ts +3 -2
- package/src/utils/LazyNativeEmitter.test.ts +32 -0
- package/src/utils/LazyNativeEmitter.ts +3 -1
- package/src/utils/NativeUpdatedValue.test.ts +32 -0
- package/src/utils/NativeUpdatedValue.ts +3 -1
- package/src/utils/callListener.ts +17 -0
- package/website/guide/configuration.md +3 -3
- package/website/guide/errors.md +3 -1
- package/website/guide/live-streams.md +22 -20
|
@@ -6,10 +6,15 @@ import androidx.media3.common.MediaItem
|
|
|
6
6
|
import androidx.media3.common.Player as MediaPlayer
|
|
7
7
|
import androidx.media3.common.Timeline
|
|
8
8
|
import androidx.media3.session.MediaSession
|
|
9
|
+
import com.audiobrowser.AudioBrowser
|
|
9
10
|
import com.audiobrowser.TestFixtures
|
|
11
|
+
import com.audiobrowser.browser.BrowserConfig
|
|
12
|
+
import com.audiobrowser.browser.BrowserManager
|
|
13
|
+
import com.audiobrowser.browser.flattenedChildren
|
|
10
14
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
11
15
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
12
16
|
import com.audiobrowser.util.TrackFactory
|
|
17
|
+
import kotlinx.coroutines.runBlocking
|
|
13
18
|
import org.junit.After
|
|
14
19
|
import org.junit.Assert.assertEquals
|
|
15
20
|
import org.junit.Assert.assertFalse
|
|
@@ -18,6 +23,8 @@ import org.junit.Assert.assertTrue
|
|
|
18
23
|
import org.junit.Before
|
|
19
24
|
import org.junit.Test
|
|
20
25
|
import org.junit.runner.RunWith
|
|
26
|
+
import org.mockito.Mockito.mock
|
|
27
|
+
import org.mockito.Mockito.`when`
|
|
21
28
|
import org.robolectric.RobolectricTestRunner
|
|
22
29
|
import org.robolectric.RuntimeEnvironment
|
|
23
30
|
import org.robolectric.Shadows.shadowOf
|
|
@@ -50,6 +57,18 @@ class FavoriteCapabilityTest {
|
|
|
50
57
|
|
|
51
58
|
private fun idle() = shadowOf(Looper.getMainLooper()).idle()
|
|
52
59
|
|
|
60
|
+
private fun browserWith(browserManager: BrowserManager): AudioBrowser =
|
|
61
|
+
mock(AudioBrowser::class.java).also { `when`(it.browserManager).thenReturn(browserManager) }
|
|
62
|
+
|
|
63
|
+
/** The `favorited` a browse row gets for a track the app has declared a favorite. */
|
|
64
|
+
private fun favoritedOnBrowseRow(browserManager: BrowserManager): Boolean? = runBlocking {
|
|
65
|
+
val favorite = TestFixtures.track(title = "A", src = "https://s/a.mp3")
|
|
66
|
+
val home = TestFixtures.resolvedTrack(path = "/home", children = arrayOf(favorite))
|
|
67
|
+
browserManager.config = BrowserConfig(routes = arrayOf(TestFixtures.staticRoute("/home", home)))
|
|
68
|
+
browserManager.setFavorites(listOf("https://s/a.mp3"))
|
|
69
|
+
browserManager.resolve("/home").flattenedChildren?.single()?.favorited
|
|
70
|
+
}
|
|
71
|
+
|
|
53
72
|
@Test
|
|
54
73
|
fun `turning favoriting on and off restamps each queued item's own heart rating`() {
|
|
55
74
|
player.add(
|
|
@@ -106,4 +125,26 @@ class FavoriteCapabilityTest {
|
|
|
106
125
|
assertEquals(1, player.exoPlayer.currentMediaItemIndex)
|
|
107
126
|
assertTrue(rating(1) is HeartRating)
|
|
108
127
|
}
|
|
128
|
+
|
|
129
|
+
@Test
|
|
130
|
+
fun `a browser assigned after the favorite capability is on hydrates favorites`() {
|
|
131
|
+
player.applyOptions(favorite(true))
|
|
132
|
+
val browserManager = BrowserManager()
|
|
133
|
+
|
|
134
|
+
player.browser = browserWith(browserManager)
|
|
135
|
+
|
|
136
|
+
assertEquals(true, favoritedOnBrowseRow(browserManager))
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
@Test
|
|
140
|
+
fun `a browser that replaces another hydrates favorites with the options unchanged`() {
|
|
141
|
+
player.browser = browserWith(BrowserManager())
|
|
142
|
+
player.applyOptions(favorite(true))
|
|
143
|
+
val replacement = BrowserManager()
|
|
144
|
+
|
|
145
|
+
player.applyOptions(favorite(true))
|
|
146
|
+
player.browser = browserWith(replacement)
|
|
147
|
+
|
|
148
|
+
assertEquals(true, favoritedOnBrowseRow(replacement))
|
|
149
|
+
}
|
|
109
150
|
}
|
|
@@ -6,6 +6,7 @@ import androidx.media3.exoplayer.source.MediaPeriod
|
|
|
6
6
|
import androidx.media3.exoplayer.source.MediaSource
|
|
7
7
|
import androidx.media3.exoplayer.upstream.DefaultAllocator
|
|
8
8
|
import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter
|
|
9
|
+
import com.audiobrowser.TestFixtures.mediaConfig
|
|
9
10
|
import com.audiobrowser.TestFixtures.track
|
|
10
11
|
import com.audiobrowser.model.RetryPolicy
|
|
11
12
|
import com.audiobrowser.util.TrackFactory
|
|
@@ -77,6 +78,44 @@ class MediaFactoryTest {
|
|
|
77
78
|
}
|
|
78
79
|
}
|
|
79
80
|
|
|
81
|
+
/** Every User-Agent line the media request carries when its config has [headers]/[userAgent]. */
|
|
82
|
+
private fun sentUserAgents(
|
|
83
|
+
headers: Map<String, String>,
|
|
84
|
+
userAgent: String? = null,
|
|
85
|
+
): List<String> =
|
|
86
|
+
MockWebServer().use { server ->
|
|
87
|
+
var agents = emptyList<String>()
|
|
88
|
+
server.enqueue(MockResponse().setBody("").setHeader("Content-Type", "audio/mpeg"))
|
|
89
|
+
val src = server.url("/s.mp3").toString()
|
|
90
|
+
val config = mediaConfig(path = src, headers = headers).copy(userAgent = userAgent)
|
|
91
|
+
loading(mediaFactory { _, _ -> config }, track(id = "ua", src = src)) {
|
|
92
|
+
val request =
|
|
93
|
+
checkNotNull(server.takeRequest(5, TimeUnit.SECONDS)) { "the media url never opened" }
|
|
94
|
+
agents = request.headers.values("User-Agent")
|
|
95
|
+
}
|
|
96
|
+
agents
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
@Test
|
|
100
|
+
fun `a user-agent header in any case wins over the default`() {
|
|
101
|
+
// Enough headers that media3's header map holds a second spelling before the default's key.
|
|
102
|
+
val others = mapOf("X-A" to "1", "X-B" to "1", "X-C" to "1")
|
|
103
|
+
for (name in listOf("User-Agent", "user-agent", "USER-AGENT")) {
|
|
104
|
+
assertEquals(name, listOf("MyApp/1.0"), sentUserAgents(others + (name to "MyApp/1.0")))
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
@Test
|
|
109
|
+
fun `the userAgent field wins over a user-agent header in any case`() {
|
|
110
|
+
for (name in listOf("User-Agent", "user-agent", "USER-AGENT")) {
|
|
111
|
+
assertEquals(
|
|
112
|
+
name,
|
|
113
|
+
listOf("Field/1.0"),
|
|
114
|
+
sentUserAgents(mapOf(name to "MyApp/1.0"), "Field/1.0"),
|
|
115
|
+
)
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
|
|
80
119
|
@Test
|
|
81
120
|
fun `a read from the start asks for an open-ended range, past a cross-origin redirect`() {
|
|
82
121
|
MockWebServer().use { stream ->
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
package com.audiobrowser.player
|
|
2
|
+
|
|
3
|
+
import android.os.Looper
|
|
4
|
+
import androidx.media3.common.PlaybackException
|
|
5
|
+
import androidx.media3.common.Player as MediaPlayer
|
|
6
|
+
import androidx.media3.exoplayer.ExoPlayer
|
|
7
|
+
import com.audiobrowser.TestFixtures.track
|
|
8
|
+
import com.audiobrowser.model.RetryPolicy
|
|
9
|
+
import com.audiobrowser.silentWavBytes
|
|
10
|
+
import com.audiobrowser.util.TrackFactory
|
|
11
|
+
import com.margelo.nitro.audiobrowser.MediaRequestConfig
|
|
12
|
+
import java.time.Duration
|
|
13
|
+
import java.util.concurrent.CopyOnWriteArrayList
|
|
14
|
+
import java.util.concurrent.atomic.AtomicInteger
|
|
15
|
+
import okhttp3.mockwebserver.Dispatcher
|
|
16
|
+
import okhttp3.mockwebserver.MockResponse
|
|
17
|
+
import okhttp3.mockwebserver.MockWebServer
|
|
18
|
+
import okhttp3.mockwebserver.RecordedRequest
|
|
19
|
+
import okhttp3.mockwebserver.SocketPolicy
|
|
20
|
+
import okio.Buffer
|
|
21
|
+
import org.junit.After
|
|
22
|
+
import org.junit.Assert.assertEquals
|
|
23
|
+
import org.junit.Assert.assertNull
|
|
24
|
+
import org.junit.Assert.fail
|
|
25
|
+
import org.junit.Test
|
|
26
|
+
import org.junit.runner.RunWith
|
|
27
|
+
import org.robolectric.RobolectricTestRunner
|
|
28
|
+
import org.robolectric.RuntimeEnvironment
|
|
29
|
+
import org.robolectric.Shadows.shadowOf
|
|
30
|
+
import org.robolectric.annotation.Config
|
|
31
|
+
import org.robolectric.shadows.ShadowSystemClock
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* An ExoPlayer loading through [MediaFactory] a track whose request config mints a new token each
|
|
35
|
+
* time it runs, from a server that records the token and status of every request.
|
|
36
|
+
*
|
|
37
|
+
* SDK 28: from 33, media3 asks AudioManager.getAudioDevicesForAttributes, which Robolectric answers
|
|
38
|
+
* with null.
|
|
39
|
+
*/
|
|
40
|
+
@RunWith(RobolectricTestRunner::class)
|
|
41
|
+
@Config(sdk = [28])
|
|
42
|
+
class MediaUrlReloadTest {
|
|
43
|
+
|
|
44
|
+
private val context = RuntimeEnvironment.getApplication()
|
|
45
|
+
private val server = MockWebServer()
|
|
46
|
+
private val minted = AtomicInteger()
|
|
47
|
+
|
|
48
|
+
/** Tokens up to this one get a 403. */
|
|
49
|
+
private val expired = AtomicInteger()
|
|
50
|
+
|
|
51
|
+
/** Tokens that get a body no extractor reads. */
|
|
52
|
+
private val unreadable = CopyOnWriteArrayList<Int>()
|
|
53
|
+
|
|
54
|
+
/** Tokens whose response the server cuts off halfway, expiring them as it does. */
|
|
55
|
+
private val dropped = CopyOnWriteArrayList<Int>()
|
|
56
|
+
|
|
57
|
+
/** The token and status of each request, in order. */
|
|
58
|
+
private val served = CopyOnWriteArrayList<Pair<Int, Int>>()
|
|
59
|
+
|
|
60
|
+
private var player: ExoPlayer? = null
|
|
61
|
+
private var error: PlaybackException? = null
|
|
62
|
+
|
|
63
|
+
init {
|
|
64
|
+
server.dispatcher =
|
|
65
|
+
object : Dispatcher() {
|
|
66
|
+
override fun dispatch(request: RecordedRequest): MockResponse {
|
|
67
|
+
val token = checkNotNull(request.requestUrl?.queryParameter("token")).toInt()
|
|
68
|
+
val response =
|
|
69
|
+
when {
|
|
70
|
+
token <= expired.get() -> MockResponse().setResponseCode(403)
|
|
71
|
+
token in unreadable -> MockResponse().setBody("not audio")
|
|
72
|
+
else ->
|
|
73
|
+
MockResponse()
|
|
74
|
+
.setHeader("Content-Type", "audio/wav")
|
|
75
|
+
.setBody(Buffer().write(silentWavBytes(Duration.ofSeconds(1))))
|
|
76
|
+
.apply {
|
|
77
|
+
if (token in dropped) {
|
|
78
|
+
expired.set(token)
|
|
79
|
+
setSocketPolicy(SocketPolicy.DISCONNECT_DURING_RESPONSE_BODY)
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
served += token to response.status.split(' ')[1].toInt()
|
|
84
|
+
return response
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
@After
|
|
90
|
+
fun shutdown() {
|
|
91
|
+
player?.release()
|
|
92
|
+
server.shutdown()
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
@Test
|
|
96
|
+
fun `a reload after a stop never requests the url that expired, with retry on`() {
|
|
97
|
+
assertReloadAfterStopResolvesAfresh(RetryPolicy.Infinite())
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
@Test
|
|
101
|
+
fun `a reload after a stop never requests the url that expired, with retry off`() {
|
|
102
|
+
assertReloadAfterStopResolvesAfresh(RetryPolicy.Default)
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
@Test
|
|
106
|
+
fun `a reload after an error resolves the url afresh`() {
|
|
107
|
+
unreadable += 1
|
|
108
|
+
val player = load(RetryPolicy.Default)
|
|
109
|
+
runUntil("the unreadable stream fails") { error != null }
|
|
110
|
+
error = null
|
|
111
|
+
|
|
112
|
+
player.prepare()
|
|
113
|
+
runUntil("the reload opens the stream") { served.size == 2 || error != null }
|
|
114
|
+
|
|
115
|
+
assertNull(error)
|
|
116
|
+
assertEquals(listOf(1 to 200, 2 to 200), served)
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
@Test
|
|
120
|
+
fun `an in-place retry after a dropped read never requests the url that expired`() {
|
|
121
|
+
dropped += 1
|
|
122
|
+
load(RetryPolicy.Infinite())
|
|
123
|
+
runUntil("the retry reopens the stream") { served.size == 2 || error != null }
|
|
124
|
+
|
|
125
|
+
assertNull(error)
|
|
126
|
+
assertEquals(listOf(1 to 200, 2 to 200), served)
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
@Test
|
|
130
|
+
fun `a return to a queue item never requests the url that expired`() {
|
|
131
|
+
val player =
|
|
132
|
+
load(RetryPolicy.Infinite(), "https://media.example/a.wav", "https://media.example/b.wav")
|
|
133
|
+
runUntil("the first track opens") { served.isNotEmpty() || error != null }
|
|
134
|
+
player.seekTo(1, 0)
|
|
135
|
+
runUntil("the second track opens") { served.size >= 2 || error != null }
|
|
136
|
+
expired.set(minted.get())
|
|
137
|
+
|
|
138
|
+
player.seekTo(0, 0)
|
|
139
|
+
runUntil("the first track opens again") { served.size >= 3 || error != null }
|
|
140
|
+
|
|
141
|
+
assertNull(error)
|
|
142
|
+
// The second track may load again afterwards, as the next item.
|
|
143
|
+
assertEquals(listOf(1 to 200, 2 to 200, 3 to 200), served.take(3))
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
private fun assertReloadAfterStopResolvesAfresh(retryPolicy: RetryPolicy) {
|
|
147
|
+
val player = load(retryPolicy)
|
|
148
|
+
runUntil("the stream opens") { served.isNotEmpty() || error != null }
|
|
149
|
+
expired.set(1)
|
|
150
|
+
|
|
151
|
+
player.stop()
|
|
152
|
+
player.prepare()
|
|
153
|
+
runUntil("the reload opens the stream") {
|
|
154
|
+
served.lastOrNull()?.second == 200 && served.size > 1 || error != null
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
assertNull(error)
|
|
158
|
+
assertEquals(listOf(1 to 200, 2 to 200), served)
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/** Prepares a player on a queue of tracks, paused: nothing here needs their audio. */
|
|
162
|
+
private fun load(
|
|
163
|
+
retryPolicy: RetryPolicy,
|
|
164
|
+
vararg srcs: String = arrayOf("https://media.example/stream.wav"),
|
|
165
|
+
): ExoPlayer {
|
|
166
|
+
val factory =
|
|
167
|
+
MediaFactory(
|
|
168
|
+
context,
|
|
169
|
+
cache = null,
|
|
170
|
+
retryPolicy,
|
|
171
|
+
getRequestConfig = { _, _ -> tokenConfig(minted.incrementAndGet()) },
|
|
172
|
+
)
|
|
173
|
+
val player = ExoPlayer.Builder(context).setMediaSourceFactory(factory).build()
|
|
174
|
+
this.player = player
|
|
175
|
+
player.addListener(
|
|
176
|
+
object : MediaPlayer.Listener {
|
|
177
|
+
override fun onPlayerError(e: PlaybackException) {
|
|
178
|
+
error = e
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
)
|
|
182
|
+
player.setMediaItems(srcs.map { TrackFactory.toMedia3(track(src = it)) })
|
|
183
|
+
player.prepare()
|
|
184
|
+
return player
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
private fun runUntil(what: String, done: () -> Boolean) {
|
|
188
|
+
val deadline = System.currentTimeMillis() + 10_000
|
|
189
|
+
while (!done()) {
|
|
190
|
+
if (System.currentTimeMillis() > deadline) fail("never: $what; served $served")
|
|
191
|
+
ShadowSystemClock.advanceBy(Duration.ofMillis(10))
|
|
192
|
+
shadowOf(Looper.getMainLooper()).idle()
|
|
193
|
+
Thread.sleep(1)
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
private fun tokenConfig(token: Int) =
|
|
198
|
+
MediaRequestConfig(
|
|
199
|
+
resolve = null,
|
|
200
|
+
resolveSync = null,
|
|
201
|
+
transform = null,
|
|
202
|
+
transformSync = null,
|
|
203
|
+
method = null,
|
|
204
|
+
path = "/stream.wav",
|
|
205
|
+
baseUrl = server.url("/").toString().trimEnd('/'),
|
|
206
|
+
headers = null,
|
|
207
|
+
query = mapOf("token" to token.toString()),
|
|
208
|
+
body = null,
|
|
209
|
+
contentType = null,
|
|
210
|
+
userAgent = null,
|
|
211
|
+
)
|
|
212
|
+
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
package com.audiobrowser.player
|
|
2
|
+
|
|
3
|
+
import android.os.Looper
|
|
4
|
+
import com.audiobrowser.TestFixtures
|
|
5
|
+
import com.audiobrowser.model.PlayerSetupOptions
|
|
6
|
+
import com.audiobrowser.util.TrackFactory
|
|
7
|
+
import java.util.concurrent.TimeUnit
|
|
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
|
+
@RunWith(RobolectricTestRunner::class)
|
|
18
|
+
class PlayerSeekSnapshotTest {
|
|
19
|
+
|
|
20
|
+
private val player = Player(RuntimeEnvironment.getApplication())
|
|
21
|
+
|
|
22
|
+
@Before
|
|
23
|
+
fun load() {
|
|
24
|
+
player.setup(PlayerSetupOptions())
|
|
25
|
+
player.sessionPlayer.setMediaItems(
|
|
26
|
+
listOf(TrackFactory.toMedia3(TestFixtures.track(title = "a", src = "https://s/a.mp3"))),
|
|
27
|
+
0,
|
|
28
|
+
120_000,
|
|
29
|
+
)
|
|
30
|
+
player.sessionPlayer.prepare()
|
|
31
|
+
shadowOf(Looper.getMainLooper()).idle()
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
@After fun destroy() = player.destroy()
|
|
35
|
+
|
|
36
|
+
@Test
|
|
37
|
+
fun aSeekWhilePausedSavesWhereItLands() {
|
|
38
|
+
player.playbackStateStore.save()
|
|
39
|
+
|
|
40
|
+
player.seekTo(30_000, TimeUnit.MILLISECONDS)
|
|
41
|
+
shadowOf(Looper.getMainLooper()).idle()
|
|
42
|
+
|
|
43
|
+
assertEquals(30_000L, player.playbackStateStore.get()?.positionMs)
|
|
44
|
+
}
|
|
45
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
package com.audiobrowser.player
|
|
2
|
+
|
|
3
|
+
import com.audiobrowser.TestFixtures
|
|
4
|
+
import com.audiobrowser.model.PlayerSetupOptions
|
|
5
|
+
import com.audiobrowser.util.TrackFactory
|
|
6
|
+
import org.junit.After
|
|
7
|
+
import org.junit.Assert.assertEquals
|
|
8
|
+
import org.junit.Test
|
|
9
|
+
import org.junit.runner.RunWith
|
|
10
|
+
import org.robolectric.RobolectricTestRunner
|
|
11
|
+
import org.robolectric.RuntimeEnvironment
|
|
12
|
+
|
|
13
|
+
/** A queue the session sets, as for an Android Auto pick or playback resumption, shuffle on. */
|
|
14
|
+
@RunWith(RobolectricTestRunner::class)
|
|
15
|
+
class SessionQueueShuffleOrderTest {
|
|
16
|
+
|
|
17
|
+
private val player = Player(RuntimeEnvironment.getApplication())
|
|
18
|
+
private val items =
|
|
19
|
+
(0 until 20).map {
|
|
20
|
+
TrackFactory.toMedia3(TestFixtures.track(title = "$it", src = "https://s/$it.mp3"))
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
@After fun release() = player.exoPlayer.release()
|
|
24
|
+
|
|
25
|
+
@Test
|
|
26
|
+
fun `the start index leads the shuffle order`() {
|
|
27
|
+
player.setup(PlayerSetupOptions())
|
|
28
|
+
player.shuffleMode = true
|
|
29
|
+
|
|
30
|
+
// A random order leads with the start index once in 20: ten in a row is no accident.
|
|
31
|
+
repeat(10) {
|
|
32
|
+
player.forwardingPlayer.setMediaItems(items, 3, 0)
|
|
33
|
+
|
|
34
|
+
assertEquals(3, player.exoPlayer.currentMediaItemIndex)
|
|
35
|
+
assertEquals(3, player.exoPlayer.currentTimeline.getFirstWindowIndex(true))
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
package com.audiobrowser.player
|
|
2
|
+
|
|
3
|
+
import android.os.Bundle
|
|
4
|
+
import android.provider.MediaStore
|
|
5
|
+
import androidx.media3.common.C
|
|
6
|
+
import androidx.media3.common.MediaItem
|
|
7
|
+
import androidx.media3.session.MediaSession
|
|
8
|
+
import com.audiobrowser.AudioBrowser
|
|
9
|
+
import com.audiobrowser.TestFixtures
|
|
10
|
+
import com.audiobrowser.browser.BrowserConfig
|
|
11
|
+
import com.audiobrowser.browser.BrowserManager
|
|
12
|
+
import com.audiobrowser.buildService
|
|
13
|
+
import com.audiobrowser.session
|
|
14
|
+
import com.audiobrowser.util.JsPromise
|
|
15
|
+
import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams
|
|
16
|
+
import com.margelo.nitro.audiobrowser.Gate
|
|
17
|
+
import com.margelo.nitro.audiobrowser.GateEvent
|
|
18
|
+
import com.margelo.nitro.audiobrowser.GateReason
|
|
19
|
+
import com.margelo.nitro.audiobrowser.SearchMode
|
|
20
|
+
import com.margelo.nitro.audiobrowser.SearchParams
|
|
21
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
22
|
+
import com.margelo.nitro.core.Promise
|
|
23
|
+
import java.util.concurrent.ExecutionException
|
|
24
|
+
import java.util.concurrent.TimeUnit
|
|
25
|
+
import org.junit.After
|
|
26
|
+
import org.junit.Assert.assertEquals
|
|
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.stubbing.Answer
|
|
33
|
+
import org.robolectric.RobolectricTestRunner
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Media3 turns a legacy controller's `playFromSearch` into a set of one media item that has the
|
|
37
|
+
* query and the request's extras, and no media id. Robolectric cannot route a MediaControllerCompat
|
|
38
|
+
* to the session, so these call that callback directly.
|
|
39
|
+
*/
|
|
40
|
+
@RunWith(RobolectricTestRunner::class)
|
|
41
|
+
class SessionVoiceSearchTest {
|
|
42
|
+
|
|
43
|
+
private val controller = buildService()
|
|
44
|
+
private val service = controller.get()
|
|
45
|
+
private val player = service.player
|
|
46
|
+
private val legacyController =
|
|
47
|
+
MediaSession.ControllerInfo.createTestOnlyControllerInfo(
|
|
48
|
+
"legacy",
|
|
49
|
+
0,
|
|
50
|
+
0,
|
|
51
|
+
MediaSession.ControllerInfo.LEGACY_CONTROLLER_VERSION,
|
|
52
|
+
MediaSession.ControllerInfo.LEGACY_CONTROLLER_INTERFACE_VERSION,
|
|
53
|
+
false,
|
|
54
|
+
Bundle.EMPTY,
|
|
55
|
+
false,
|
|
56
|
+
)
|
|
57
|
+
|
|
58
|
+
private val searches = mutableListOf<SearchParams>()
|
|
59
|
+
private val gateEvents = mutableListOf<GateEvent>()
|
|
60
|
+
|
|
61
|
+
@After
|
|
62
|
+
fun destroy() {
|
|
63
|
+
controller.destroy()
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
private fun browserWhoseSearchAnswers(vararg results: Track, gated: Boolean = false) {
|
|
67
|
+
val answer = JsPromise<Array<Track>>().apply { resolve(arrayOf(*results)) }
|
|
68
|
+
val bridge = JsPromise<Promise<Array<Track>>>().apply { resolve(answer.promise) }
|
|
69
|
+
val browserManager =
|
|
70
|
+
BrowserManager().apply {
|
|
71
|
+
config =
|
|
72
|
+
BrowserConfig(
|
|
73
|
+
routes =
|
|
74
|
+
arrayOf(
|
|
75
|
+
TestFixtures.staticRoute(
|
|
76
|
+
BrowserManager.SEARCH_ROUTE_PATH,
|
|
77
|
+
TestFixtures.resolvedTrack(path = BrowserManager.SEARCH_ROUTE_PATH),
|
|
78
|
+
)
|
|
79
|
+
.copy(
|
|
80
|
+
browseStatic = null,
|
|
81
|
+
searchCallback =
|
|
82
|
+
Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams {
|
|
83
|
+
searches += it
|
|
84
|
+
bridge.promise
|
|
85
|
+
},
|
|
86
|
+
)
|
|
87
|
+
)
|
|
88
|
+
)
|
|
89
|
+
}
|
|
90
|
+
val configuration = TestFixtures.browserConfiguration()
|
|
91
|
+
val onGate: (GateEvent) -> Unit = { gateEvents += it }
|
|
92
|
+
player.browser =
|
|
93
|
+
mock(
|
|
94
|
+
AudioBrowser::class.java,
|
|
95
|
+
Answer {
|
|
96
|
+
when {
|
|
97
|
+
it.method.name == "gateDecision" ->
|
|
98
|
+
AudioBrowser.GateOutcome(gated, Gate("Gated", null).takeIf { gated })
|
|
99
|
+
it.method.name == "getOnGate" -> onGate
|
|
100
|
+
it.method.name == "getConfiguration" -> configuration
|
|
101
|
+
it.method.name.startsWith("getBrowserManager") -> browserManager
|
|
102
|
+
else -> RETURNS_DEFAULTS.answer(it)
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
)
|
|
106
|
+
player.notifyBrowserConfigurationReady()
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/** What Media3 sets for the legacy `playFromSearch(query, extras)`. */
|
|
110
|
+
private fun playFromSearch(
|
|
111
|
+
query: String,
|
|
112
|
+
extras: Bundle? = null,
|
|
113
|
+
): MediaSession.MediaItemsWithStartPosition {
|
|
114
|
+
val item =
|
|
115
|
+
MediaItem.Builder()
|
|
116
|
+
.setMediaId(MediaItem.DEFAULT_MEDIA_ID)
|
|
117
|
+
.setRequestMetadata(
|
|
118
|
+
MediaItem.RequestMetadata.Builder().setSearchQuery(query).setExtras(extras).build()
|
|
119
|
+
)
|
|
120
|
+
.build()
|
|
121
|
+
return player
|
|
122
|
+
.getMediaSessionCallback()
|
|
123
|
+
.onSetMediaItems(
|
|
124
|
+
service.session,
|
|
125
|
+
legacyController,
|
|
126
|
+
mutableListOf(item),
|
|
127
|
+
C.INDEX_UNSET,
|
|
128
|
+
C.TIME_UNSET,
|
|
129
|
+
)
|
|
130
|
+
.get(5, TimeUnit.SECONDS)
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
@Test
|
|
134
|
+
fun `a search that names no item queues the playable results from the first`() {
|
|
135
|
+
browserWhoseSearchAnswers(
|
|
136
|
+
TestFixtures.track(title = "unavailable", src = "https://s/x.mp3", disabled = true),
|
|
137
|
+
TestFixtures.track(title = "a", src = "https://s/a.mp3"),
|
|
138
|
+
TestFixtures.track(title = "b", src = "https://s/b.mp3"),
|
|
139
|
+
)
|
|
140
|
+
|
|
141
|
+
val result = playFromSearch("jazz")
|
|
142
|
+
|
|
143
|
+
assertEquals(listOf("a", "b"), result.mediaItems.map { it.mediaMetadata.title.toString() })
|
|
144
|
+
assertEquals(0, result.startIndex)
|
|
145
|
+
assertEquals(listOf("jazz"), searches.map { it.query })
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
@Test
|
|
149
|
+
fun `a search's extras reach the search source as the filters they name`() {
|
|
150
|
+
browserWhoseSearchAnswers(TestFixtures.track(title = "a"))
|
|
151
|
+
|
|
152
|
+
playFromSearch(
|
|
153
|
+
"kind of blue",
|
|
154
|
+
Bundle().apply {
|
|
155
|
+
putString(MediaStore.EXTRA_MEDIA_FOCUS, "vnd.android.cursor.item/audio")
|
|
156
|
+
putString(MediaStore.EXTRA_MEDIA_ARTIST, "miles davis")
|
|
157
|
+
},
|
|
158
|
+
)
|
|
159
|
+
|
|
160
|
+
assertEquals(listOf(SearchMode.SONG), searches.map { it.mode })
|
|
161
|
+
assertEquals(listOf<String?>("miles davis"), searches.map { it.artist })
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
@Test
|
|
165
|
+
fun `a gated search is refused before it runs, and reports the gate`() {
|
|
166
|
+
browserWhoseSearchAnswers(TestFixtures.track(title = "a"), gated = true)
|
|
167
|
+
|
|
168
|
+
assertThrows(ExecutionException::class.java) { playFromSearch("jazz") }
|
|
169
|
+
|
|
170
|
+
assertEquals(listOf(GateEvent(GateReason.SEARCH)), gateEvents)
|
|
171
|
+
assertEquals(emptyList<SearchParams>(), searches)
|
|
172
|
+
}
|
|
173
|
+
}
|