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
|
@@ -10,6 +10,7 @@ import com.margelo.nitro.audiobrowser.MediaRequestConfig
|
|
|
10
10
|
import java.io.IOException
|
|
11
11
|
import org.junit.Assert.assertEquals
|
|
12
12
|
import org.junit.Assert.assertTrue
|
|
13
|
+
import org.junit.Assert.fail
|
|
13
14
|
import org.junit.Test
|
|
14
15
|
import org.junit.runner.RunWith
|
|
15
16
|
import org.robolectric.RobolectricTestRunner
|
|
@@ -23,6 +24,8 @@ class TransformingDataSourceTest {
|
|
|
23
24
|
|
|
24
25
|
private var failNextOpen = false
|
|
25
26
|
|
|
27
|
+
private var failNextRead = false
|
|
28
|
+
|
|
26
29
|
private inner class RecordingDataSource(
|
|
27
30
|
private val responseHeaders: Map<String, List<String>> = emptyMap()
|
|
28
31
|
) : DataSource {
|
|
@@ -36,7 +39,13 @@ class TransformingDataSourceTest {
|
|
|
36
39
|
return C.LENGTH_UNSET.toLong()
|
|
37
40
|
}
|
|
38
41
|
|
|
39
|
-
override fun read(buffer: ByteArray, offset: Int, length: Int): Int
|
|
42
|
+
override fun read(buffer: ByteArray, offset: Int, length: Int): Int {
|
|
43
|
+
if (failNextRead) {
|
|
44
|
+
failNextRead = false
|
|
45
|
+
throw IOException("simulated dropped connection")
|
|
46
|
+
}
|
|
47
|
+
return C.RESULT_END_OF_INPUT
|
|
48
|
+
}
|
|
40
49
|
|
|
41
50
|
override fun addTransferListener(transferListener: TransferListener) {}
|
|
42
51
|
|
|
@@ -124,6 +133,79 @@ class TransformingDataSourceTest {
|
|
|
124
133
|
)
|
|
125
134
|
}
|
|
126
135
|
|
|
136
|
+
@Test
|
|
137
|
+
fun `a reloaded track resolves the media url on its next open, and once`() {
|
|
138
|
+
var resolves = 0
|
|
139
|
+
val factory = TransformingDataSource.Factory(upstreamFactory) { tokenConfig(++resolves) }
|
|
140
|
+
val spec = DataSpec("/listen/abc/channel.mp3".toUri())
|
|
141
|
+
|
|
142
|
+
factory.resolveOnNextMediaOpen = true
|
|
143
|
+
factory.createDataSource().open(spec)
|
|
144
|
+
factory.createDataSource().open(spec)
|
|
145
|
+
factory.resolveOnNextMediaOpen = true
|
|
146
|
+
factory.createDataSource().open(spec)
|
|
147
|
+
factory.createDataSource().open(spec)
|
|
148
|
+
|
|
149
|
+
assertEquals(listOf(1, 1, 2, 2), openedUrls.map { it.substringAfter("token=").toInt() })
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
@Test
|
|
153
|
+
fun `a dropped read of the media url resolves it on the next open`() {
|
|
154
|
+
var resolves = 0
|
|
155
|
+
val factory = TransformingDataSource.Factory(upstreamFactory) { tokenConfig(++resolves) }
|
|
156
|
+
val spec = DataSpec("/listen/abc/channel.mp3".toUri())
|
|
157
|
+
|
|
158
|
+
readDropped(factory, spec)
|
|
159
|
+
factory.createDataSource().open(spec)
|
|
160
|
+
factory.createDataSource().open(spec)
|
|
161
|
+
|
|
162
|
+
assertEquals(listOf(1, 2, 2), openedUrls.map { it.substringAfter("token=").toInt() })
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
@Test
|
|
166
|
+
fun `a read that a cancelled load interrupts keeps the media url`() {
|
|
167
|
+
var resolves = 0
|
|
168
|
+
val factory = TransformingDataSource.Factory(upstreamFactory) { tokenConfig(++resolves) }
|
|
169
|
+
val spec = DataSpec("/listen/abc/channel.mp3".toUri())
|
|
170
|
+
|
|
171
|
+
Thread.currentThread().interrupt()
|
|
172
|
+
try {
|
|
173
|
+
readDropped(factory, spec)
|
|
174
|
+
} finally {
|
|
175
|
+
Thread.interrupted()
|
|
176
|
+
}
|
|
177
|
+
factory.createDataSource().open(spec)
|
|
178
|
+
|
|
179
|
+
assertEquals(listOf(1, 1), openedUrls.map { it.substringAfter("token=").toInt() })
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
@Test
|
|
183
|
+
fun `a dropped segment read does not trigger a media re-resolve`() {
|
|
184
|
+
var resolves = 0
|
|
185
|
+
val factory = TransformingDataSource.Factory(upstreamFactory) { tokenConfig(++resolves) }
|
|
186
|
+
val mediaUrl = "/listen/abc/playlist.m3u8".toUri()
|
|
187
|
+
|
|
188
|
+
factory.createDataSource().open(DataSpec(mediaUrl))
|
|
189
|
+
readDropped(factory, DataSpec("https://cdn.example.com/seg-1.ts".toUri()))
|
|
190
|
+
factory.createDataSource().open(DataSpec(mediaUrl))
|
|
191
|
+
|
|
192
|
+
assertTrue(
|
|
193
|
+
"media url stays token=1, got ${openedUrls.last()}",
|
|
194
|
+
openedUrls.last().contains("token=1"),
|
|
195
|
+
)
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
/** Opens [spec] and reads from it over a connection that drops. */
|
|
199
|
+
private fun readDropped(factory: TransformingDataSource.Factory, spec: DataSpec) {
|
|
200
|
+
val source = factory.createDataSource()
|
|
201
|
+
source.open(spec)
|
|
202
|
+
failNextRead = true
|
|
203
|
+
try {
|
|
204
|
+
source.read(ByteArray(1), 0, 1)
|
|
205
|
+
fail("the read should have dropped")
|
|
206
|
+
} catch (_: IOException) {}
|
|
207
|
+
}
|
|
208
|
+
|
|
127
209
|
@Test
|
|
128
210
|
fun `a failed segment load does not trigger a media re-resolve`() {
|
|
129
211
|
var resolves = 0
|
|
@@ -191,6 +273,17 @@ class TransformingDataSourceTest {
|
|
|
191
273
|
assertEquals(segment, openedUrls.last())
|
|
192
274
|
}
|
|
193
275
|
|
|
276
|
+
@Test
|
|
277
|
+
fun `a src with a scheme opens as it is under a base url`() {
|
|
278
|
+
val src = "content://media/external/audio/media/42"
|
|
279
|
+
val factory =
|
|
280
|
+
TransformingDataSource.Factory(upstreamFactory) { config("https://api.example.com", src) }
|
|
281
|
+
|
|
282
|
+
factory.createDataSource().open(DataSpec(src.toUri()))
|
|
283
|
+
|
|
284
|
+
assertEquals(src, openedUrls.last())
|
|
285
|
+
}
|
|
286
|
+
|
|
194
287
|
@Test
|
|
195
288
|
fun `a progressive read from the start asks for an open-ended range`() {
|
|
196
289
|
assertEquals(listOf("bytes=0-"), rangesOf(progressive()))
|
|
@@ -221,6 +314,39 @@ class TransformingDataSourceTest {
|
|
|
221
314
|
)
|
|
222
315
|
}
|
|
223
316
|
|
|
317
|
+
/** The User-Agent headers, in any case, a media open with [headers]/[userAgent] passes on. */
|
|
318
|
+
private fun userAgentsOf(headers: Map<String, String>, userAgent: String?): Map<String, String> {
|
|
319
|
+
val config =
|
|
320
|
+
config("https://cdn.example.com", "/s.mp3").copy(headers = headers, userAgent = userAgent)
|
|
321
|
+
TransformingDataSource.Factory(upstreamFactory) { config }
|
|
322
|
+
.createDataSource()
|
|
323
|
+
.open(progressive())
|
|
324
|
+
return openedHeaders.last().filterKeys { it.equals("User-Agent", ignoreCase = true) }
|
|
325
|
+
}
|
|
326
|
+
|
|
327
|
+
@Test
|
|
328
|
+
fun `a user-agent header in any case goes on under the exact name`() {
|
|
329
|
+
for (name in listOf("User-Agent", "user-agent", "USER-AGENT")) {
|
|
330
|
+
assertEquals(
|
|
331
|
+
name,
|
|
332
|
+
mapOf("User-Agent" to "MyApp/1.0"),
|
|
333
|
+
userAgentsOf(mapOf(name to "MyApp/1.0"), null),
|
|
334
|
+
)
|
|
335
|
+
assertEquals(
|
|
336
|
+
name,
|
|
337
|
+
mapOf("User-Agent" to "Field/1.0"),
|
|
338
|
+
userAgentsOf(mapOf(name to "MyApp/1.0"), "Field/1.0"),
|
|
339
|
+
)
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
@Test
|
|
344
|
+
fun `of two user-agent spellings the last one goes on`() {
|
|
345
|
+
val headers = mapOf("user-agent" to "first", "USER-AGENT" to "last")
|
|
346
|
+
assertEquals(mapOf("User-Agent" to "last"), userAgentsOf(headers, null))
|
|
347
|
+
assertEquals(mapOf("User-Agent" to "Field/1.0"), userAgentsOf(headers, "Field/1.0"))
|
|
348
|
+
}
|
|
349
|
+
|
|
224
350
|
@Test
|
|
225
351
|
fun `a range from the request config is kept`() {
|
|
226
352
|
val config =
|
|
@@ -151,6 +151,12 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
151
151
|
val seeks = mutableListOf<Long>()
|
|
152
152
|
val intents = mutableListOf<Boolean>()
|
|
153
153
|
|
|
154
|
+
/**
|
|
155
|
+
* While set, loads, play intents and stops are dropped, as a suspended session's player drops
|
|
156
|
+
* them.
|
|
157
|
+
*/
|
|
158
|
+
var unreachable = false
|
|
159
|
+
|
|
154
160
|
/** While set, a load is held back from the reported state until [catchUp], as a receiver lags. */
|
|
155
161
|
var lagging = false
|
|
156
162
|
private var held: MediaItem? = null
|
|
@@ -200,6 +206,7 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
200
206
|
startPositionMs: Long,
|
|
201
207
|
): ListenableFuture<*> {
|
|
202
208
|
val loaded = mediaItems.single()
|
|
209
|
+
if (unreachable) return done()
|
|
203
210
|
loads += SentLoad(loaded, startPositionMs, intent)
|
|
204
211
|
// A fresh uid makes a reload of the same item a new playlist entry to listeners.
|
|
205
212
|
uid = Any()
|
|
@@ -211,6 +218,7 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
211
218
|
}
|
|
212
219
|
|
|
213
220
|
override fun handleSetPlayWhenReady(playWhenReady: Boolean): ListenableFuture<*> {
|
|
221
|
+
if (unreachable) return done()
|
|
214
222
|
intent = playWhenReady
|
|
215
223
|
intents += playWhenReady
|
|
216
224
|
return done()
|
|
@@ -219,6 +227,7 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
219
227
|
override fun handlePrepare(): ListenableFuture<*> = done()
|
|
220
228
|
|
|
221
229
|
override fun handleStop(): ListenableFuture<*> {
|
|
230
|
+
if (unreachable) return done()
|
|
222
231
|
readiness = STATE_IDLE
|
|
223
232
|
stops++
|
|
224
233
|
return done()
|
|
@@ -262,6 +271,11 @@ internal class FakeRemote(private val looper: Looper) : RemotePlayback {
|
|
|
262
271
|
override val isSessionAvailable: Boolean
|
|
263
272
|
get() = receiver != null
|
|
264
273
|
|
|
274
|
+
private var suspended = false
|
|
275
|
+
|
|
276
|
+
override val isSuspended: Boolean
|
|
277
|
+
get() = suspended
|
|
278
|
+
|
|
265
279
|
override fun setListener(listener: RemotePlayback.Listener?) {
|
|
266
280
|
this.listener = listener
|
|
267
281
|
}
|
|
@@ -284,6 +298,20 @@ internal class FakeRemote(private val looper: Looper) : RemotePlayback {
|
|
|
284
298
|
|
|
285
299
|
fun endSession() {
|
|
286
300
|
receiver = null
|
|
301
|
+
suspended = false
|
|
302
|
+
listener?.onSessionChanged()
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
/** Keeps the session out of reach: [player] drops what is sent to it and plays on. */
|
|
306
|
+
fun suspendSession() {
|
|
307
|
+
suspended = true
|
|
308
|
+
player.unreachable = true
|
|
309
|
+
listener?.onSessionChanged()
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
fun resumeSession() {
|
|
313
|
+
suspended = false
|
|
314
|
+
player.unreachable = false
|
|
287
315
|
listener?.onSessionChanged()
|
|
288
316
|
}
|
|
289
317
|
|
|
@@ -993,6 +993,122 @@ class RemoteSwitchingPlayerTest {
|
|
|
993
993
|
assertTrue(remote.player.loads.isEmpty())
|
|
994
994
|
}
|
|
995
995
|
|
|
996
|
+
@Test
|
|
997
|
+
fun `a skip while the session is suspended goes to the receiver at the resume`() {
|
|
998
|
+
playLocally(listOf("a", "b"))
|
|
999
|
+
remote.startSession()
|
|
1000
|
+
idle()
|
|
1001
|
+
remote.playing()
|
|
1002
|
+
remote.suspendSession()
|
|
1003
|
+
|
|
1004
|
+
player.seekToNextMediaItem()
|
|
1005
|
+
idle()
|
|
1006
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(31))
|
|
1007
|
+
|
|
1008
|
+
assertTrue(player.isRemote)
|
|
1009
|
+
assertNull(player.playerError)
|
|
1010
|
+
assertEquals(listOf("a"), remote.player.loads.map { it.item.mediaId })
|
|
1011
|
+
|
|
1012
|
+
remote.resumeSession()
|
|
1013
|
+
idle()
|
|
1014
|
+
remote.playing()
|
|
1015
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(31))
|
|
1016
|
+
|
|
1017
|
+
assertEquals(listOf("a", "b"), remote.player.loads.map { it.item.mediaId })
|
|
1018
|
+
assertEquals("b", remote.player.currentMediaItem?.mediaId)
|
|
1019
|
+
assertNull(player.playerError)
|
|
1020
|
+
}
|
|
1021
|
+
|
|
1022
|
+
@Test
|
|
1023
|
+
fun `a load the receiver never showed before a suspension goes to it again at the resume`() {
|
|
1024
|
+
playLocally(listOf("a", "b"))
|
|
1025
|
+
remote.startSession()
|
|
1026
|
+
idle()
|
|
1027
|
+
remote.playing()
|
|
1028
|
+
remote.player.lagging = true
|
|
1029
|
+
player.seekToNextMediaItem()
|
|
1030
|
+
idle()
|
|
1031
|
+
|
|
1032
|
+
remote.suspendSession()
|
|
1033
|
+
shadowOf(looper).idleFor(Duration.ofSeconds(31))
|
|
1034
|
+
assertNull(player.playerError)
|
|
1035
|
+
remote.player.lagging = false
|
|
1036
|
+
remote.resumeSession()
|
|
1037
|
+
idle()
|
|
1038
|
+
|
|
1039
|
+
assertEquals(listOf("a", "b", "b"), remote.player.loads.map { it.item.mediaId })
|
|
1040
|
+
assertEquals("b", remote.player.currentMediaItem?.mediaId)
|
|
1041
|
+
}
|
|
1042
|
+
|
|
1043
|
+
@Test
|
|
1044
|
+
fun `a resume after the receiver took the item sends nothing more`() {
|
|
1045
|
+
playLocally(listOf("a"))
|
|
1046
|
+
remote.startSession()
|
|
1047
|
+
idle()
|
|
1048
|
+
remote.playing()
|
|
1049
|
+
|
|
1050
|
+
remote.suspendSession()
|
|
1051
|
+
remote.resumeSession()
|
|
1052
|
+
idle()
|
|
1053
|
+
|
|
1054
|
+
assertEquals(listOf("a"), remote.player.loads.map { it.item.mediaId })
|
|
1055
|
+
assertTrue(player.isRemote)
|
|
1056
|
+
}
|
|
1057
|
+
|
|
1058
|
+
@Test
|
|
1059
|
+
fun `a stop while the session is suspended stops the receiver at the resume`() {
|
|
1060
|
+
playLocally(listOf("a"))
|
|
1061
|
+
remote.startSession()
|
|
1062
|
+
idle()
|
|
1063
|
+
remote.playing()
|
|
1064
|
+
remote.suspendSession()
|
|
1065
|
+
|
|
1066
|
+
player.stop()
|
|
1067
|
+
idle()
|
|
1068
|
+
assertEquals(0, remote.player.stops)
|
|
1069
|
+
|
|
1070
|
+
remote.resumeSession()
|
|
1071
|
+
idle()
|
|
1072
|
+
|
|
1073
|
+
assertEquals(1, remote.player.stops)
|
|
1074
|
+
assertEquals(MediaPlayer.STATE_IDLE, player.playbackState)
|
|
1075
|
+
}
|
|
1076
|
+
|
|
1077
|
+
@Test
|
|
1078
|
+
fun `a resume stops nothing that wasn't stopped during the suspension`() {
|
|
1079
|
+
local.setMediaItems(items("a"))
|
|
1080
|
+
idle()
|
|
1081
|
+
remote.startSession()
|
|
1082
|
+
idle()
|
|
1083
|
+
remote.player.item = item("theirs")
|
|
1084
|
+
remote.player.update()
|
|
1085
|
+
|
|
1086
|
+
remote.suspendSession()
|
|
1087
|
+
remote.resumeSession()
|
|
1088
|
+
idle()
|
|
1089
|
+
|
|
1090
|
+
assertEquals(0, remote.player.stops)
|
|
1091
|
+
}
|
|
1092
|
+
|
|
1093
|
+
@Test
|
|
1094
|
+
fun `a load after a stop during the suspension replaces the stop`() {
|
|
1095
|
+
playLocally(listOf("a", "b"))
|
|
1096
|
+
remote.startSession()
|
|
1097
|
+
idle()
|
|
1098
|
+
remote.playing()
|
|
1099
|
+
remote.suspendSession()
|
|
1100
|
+
|
|
1101
|
+
player.stop()
|
|
1102
|
+
player.seekToNextMediaItem()
|
|
1103
|
+
player.prepare()
|
|
1104
|
+
idle()
|
|
1105
|
+
remote.resumeSession()
|
|
1106
|
+
idle()
|
|
1107
|
+
|
|
1108
|
+
assertEquals(0, remote.player.stops)
|
|
1109
|
+
assertEquals(listOf("a", "b"), remote.player.loads.map { it.item.mediaId })
|
|
1110
|
+
}
|
|
1111
|
+
|
|
996
1112
|
private fun playLocally(ids: List<String>, index: Int = 0, positionMs: Long = 0) {
|
|
997
1113
|
local.setMediaItems(items(*ids.toTypedArray()), index, positionMs)
|
|
998
1114
|
local.playWhenReady = true
|
|
@@ -35,6 +35,28 @@ class BrowserPathHelperTest {
|
|
|
35
35
|
assertEquals("/library", BrowserPathHelper.stripTrackId(url))
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
@Test
|
|
39
|
+
fun `build round-trips a parent that is not a canonical URL`() {
|
|
40
|
+
val identity = "id 1/é"
|
|
41
|
+
listOf(
|
|
42
|
+
"/genres/Hip Hop",
|
|
43
|
+
"/genres/Électro",
|
|
44
|
+
"/list?genre=hip+hop",
|
|
45
|
+
"/list?tag=c%2B%2B",
|
|
46
|
+
"/list?sort=a%2Fb",
|
|
47
|
+
"/list?ids=[1]",
|
|
48
|
+
"/sale/50%",
|
|
49
|
+
"/list?x=%E9",
|
|
50
|
+
"/page#top",
|
|
51
|
+
)
|
|
52
|
+
.forEach { parent ->
|
|
53
|
+
val url = BrowserPathHelper.build(parent, identity, 2)
|
|
54
|
+
assertEquals(url, parent, BrowserPathHelper.stripTrackId(url))
|
|
55
|
+
assertEquals(url, identity, BrowserPathHelper.extractTrackId(url))
|
|
56
|
+
assertEquals(url, 2, BrowserPathHelper.extractIndex(url))
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
38
60
|
@Test
|
|
39
61
|
fun `extractIndex returns null without a stamped index`() {
|
|
40
62
|
val url = BrowserPathHelper.build("/library", "song.mp3")
|
|
@@ -60,4 +82,26 @@ class BrowserPathHelperTest {
|
|
|
60
82
|
)
|
|
61
83
|
assertEquals(NavigationErrorKind.BROWSE, BrowserPathHelper.navigationErrorKind("/__searchable"))
|
|
62
84
|
}
|
|
85
|
+
|
|
86
|
+
@Test
|
|
87
|
+
fun `buildUrl returns a url with a scheme or a leading double slash without the base`() {
|
|
88
|
+
val base = "https://api.example.com"
|
|
89
|
+
val urls =
|
|
90
|
+
listOf(
|
|
91
|
+
"HTTPS://other.example.com/a.mp3",
|
|
92
|
+
"content://media/external/audio/media/42",
|
|
93
|
+
"file:///sdcard/Music/a.mp3",
|
|
94
|
+
"android.resource://com.example.app/raw/chime",
|
|
95
|
+
"data:image/png;base64,iVBORw0KGgo=",
|
|
96
|
+
"//cdn.example.com/a.mp3",
|
|
97
|
+
)
|
|
98
|
+
urls.forEach { assertEquals(it, BrowserPathHelper.buildUrl(base, it)) }
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
@Test
|
|
102
|
+
fun `buildUrl keeps a path with a colon after its first slash relative`() {
|
|
103
|
+
val base = "https://api.example.com"
|
|
104
|
+
assertEquals("$base/shows/a:b", BrowserPathHelper.buildUrl(base, "/shows/a:b"))
|
|
105
|
+
assertEquals("$base/shows/a:b", BrowserPathHelper.buildUrl(base, "shows/a:b"))
|
|
106
|
+
}
|
|
63
107
|
}
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
package com.audiobrowser.cast
|
|
2
|
+
|
|
3
|
+
import androidx.media3.cast.Cast
|
|
4
|
+
import androidx.media3.cast.RemoteCastPlayer
|
|
5
|
+
import androidx.media3.cast.SessionAvailabilityListener
|
|
6
|
+
import androidx.media3.common.PlaybackException
|
|
7
|
+
import com.audiobrowser.remote.RemotePlayback
|
|
8
|
+
import com.google.android.gms.cast.CastStatusCodes
|
|
9
|
+
import com.google.android.gms.cast.framework.CastSession
|
|
10
|
+
import com.google.android.gms.cast.framework.SessionManagerListener
|
|
11
|
+
import com.google.android.gms.common.api.GoogleApiClient
|
|
12
|
+
import org.junit.Assert.assertEquals
|
|
13
|
+
import org.junit.Assert.assertFalse
|
|
14
|
+
import org.junit.Assert.assertTrue
|
|
15
|
+
import org.junit.Test
|
|
16
|
+
import org.junit.runner.RunWith
|
|
17
|
+
import org.mockito.ArgumentCaptor
|
|
18
|
+
import org.mockito.Mockito.mock
|
|
19
|
+
import org.mockito.Mockito.verify
|
|
20
|
+
import org.mockito.Mockito.`when`
|
|
21
|
+
import org.robolectric.RobolectricTestRunner
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* The Cast SDK tells both [RemoteCastPlayer] and the remote of each session event, in an order it
|
|
25
|
+
* doesn't promise; the player then lets go of its session at an end, an ending and a suspension
|
|
26
|
+
* alike, and takes it up at a start and a resume.
|
|
27
|
+
*/
|
|
28
|
+
@RunWith(RobolectricTestRunner::class)
|
|
29
|
+
class SdkCastRemoteTest {
|
|
30
|
+
private enum class First {
|
|
31
|
+
PLAYER,
|
|
32
|
+
REMOTE,
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
private val cast = mock(Cast::class.java)
|
|
36
|
+
private val player = mock(RemoteCastPlayer::class.java)
|
|
37
|
+
private val session = mock(CastSession::class.java)
|
|
38
|
+
|
|
39
|
+
/** [RemotePlayback.isSessionAvailable] as each session change the listener heard of saw it. */
|
|
40
|
+
private val seen = mutableListOf<Boolean>()
|
|
41
|
+
|
|
42
|
+
private val remote =
|
|
43
|
+
SdkCastRemote(cast, player).apply {
|
|
44
|
+
setListener(
|
|
45
|
+
object : RemotePlayback.Listener {
|
|
46
|
+
override fun onSessionChanged() {
|
|
47
|
+
seen += isSessionAvailable
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
override fun onPlaying() = Unit
|
|
51
|
+
|
|
52
|
+
override fun onEnded() = Unit
|
|
53
|
+
|
|
54
|
+
override fun onFailed(error: PlaybackException) = Unit
|
|
55
|
+
}
|
|
56
|
+
)
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
private val toRemote: SessionManagerListener<CastSession> = run {
|
|
60
|
+
@Suppress("UNCHECKED_CAST")
|
|
61
|
+
val captor =
|
|
62
|
+
ArgumentCaptor.forClass(SessionManagerListener::class.java)
|
|
63
|
+
as ArgumentCaptor<SessionManagerListener<CastSession>>
|
|
64
|
+
verify(cast).addSessionManagerListener(captor.capture())
|
|
65
|
+
captor.value
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
private val fromPlayer: SessionAvailabilityListener = run {
|
|
69
|
+
val captor = ArgumentCaptor.forClass(SessionAvailabilityListener::class.java)
|
|
70
|
+
verify(player).setSessionAvailabilityListener(captor.capture())
|
|
71
|
+
captor.value
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
private fun playerTakesUpSession() {
|
|
75
|
+
`when`(player.isCastSessionAvailable).thenReturn(true)
|
|
76
|
+
fromPlayer.onCastSessionAvailable()
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
private fun playerLetsGoOfSession() {
|
|
80
|
+
`when`(player.isCastSessionAvailable).thenReturn(false)
|
|
81
|
+
fromPlayer.onCastSessionUnavailable()
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
private fun tell(first: First, thePlayer: () -> Unit, theRemote: () -> Unit) =
|
|
85
|
+
if (first == First.PLAYER) {
|
|
86
|
+
thePlayer()
|
|
87
|
+
theRemote()
|
|
88
|
+
} else {
|
|
89
|
+
theRemote()
|
|
90
|
+
thePlayer()
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
private fun startSession(first: First) =
|
|
94
|
+
tell(first, ::playerTakesUpSession) { toRemote.onSessionStarted(session, "session") }
|
|
95
|
+
|
|
96
|
+
private fun suspendSession(first: First) =
|
|
97
|
+
tell(first, ::playerLetsGoOfSession) {
|
|
98
|
+
toRemote.onSessionSuspended(session, GoogleApiClient.ConnectionCallbacks.CAUSE_NETWORK_LOST)
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
private fun resumeSession(first: First) =
|
|
102
|
+
tell(first, ::playerTakesUpSession) { toRemote.onSessionResumed(session, true) }
|
|
103
|
+
|
|
104
|
+
@Test
|
|
105
|
+
fun `a suspended session stays the session, out of reach, whichever hears of it first`() {
|
|
106
|
+
for (first in First.entries) {
|
|
107
|
+
startSession(first)
|
|
108
|
+
seen.clear()
|
|
109
|
+
|
|
110
|
+
suspendSession(first)
|
|
111
|
+
|
|
112
|
+
assertTrue("$first first", remote.isSessionAvailable)
|
|
113
|
+
assertTrue("$first first", remote.isSuspended)
|
|
114
|
+
assertFalse("$first first", false in seen)
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
@Test
|
|
119
|
+
fun `a session that resumes was never gone, and is in reach once the player takes it up`() {
|
|
120
|
+
for (first in First.entries) {
|
|
121
|
+
startSession(first)
|
|
122
|
+
seen.clear()
|
|
123
|
+
|
|
124
|
+
suspendSession(first)
|
|
125
|
+
resumeSession(first)
|
|
126
|
+
|
|
127
|
+
assertTrue("$first first", remote.isSessionAvailable)
|
|
128
|
+
assertFalse("$first first", remote.isSuspended)
|
|
129
|
+
assertFalse("$first first", false in seen)
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
@Test
|
|
134
|
+
fun `a resumed session is out of reach until the player takes it up`() {
|
|
135
|
+
startSession(First.PLAYER)
|
|
136
|
+
suspendSession(First.PLAYER)
|
|
137
|
+
seen.clear()
|
|
138
|
+
|
|
139
|
+
toRemote.onSessionResumed(session, true)
|
|
140
|
+
assertTrue(remote.isSuspended)
|
|
141
|
+
|
|
142
|
+
playerTakesUpSession()
|
|
143
|
+
assertFalse(remote.isSuspended)
|
|
144
|
+
assertEquals(listOf(true), seen)
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
@Test
|
|
148
|
+
fun `a session that ends is gone, whichever hears of it first`() {
|
|
149
|
+
for (first in First.entries) {
|
|
150
|
+
startSession(first)
|
|
151
|
+
seen.clear()
|
|
152
|
+
|
|
153
|
+
tell(first, ::playerLetsGoOfSession) {
|
|
154
|
+
toRemote.onSessionEnded(session, CastStatusCodes.SUCCESS)
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
assertFalse("$first first", remote.isSessionAvailable)
|
|
158
|
+
assertEquals("$first first", false, seen.last())
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
@Test
|
|
163
|
+
fun `a session that is ending is gone, whichever hears of it first`() {
|
|
164
|
+
for (first in First.entries) {
|
|
165
|
+
startSession(first)
|
|
166
|
+
seen.clear()
|
|
167
|
+
|
|
168
|
+
tell(first, ::playerLetsGoOfSession) { toRemote.onSessionEnding(session) }
|
|
169
|
+
|
|
170
|
+
assertFalse("$first first", remote.isSessionAvailable)
|
|
171
|
+
assertEquals("$first first", false, seen.last())
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
// The player only logs a failed resume: it let go of the session when that was suspended.
|
|
176
|
+
@Test
|
|
177
|
+
fun `a suspended session that fails to resume is gone, and the listener hears of it`() {
|
|
178
|
+
startSession(First.PLAYER)
|
|
179
|
+
suspendSession(First.PLAYER)
|
|
180
|
+
seen.clear()
|
|
181
|
+
|
|
182
|
+
toRemote.onSessionResumeFailed(session, CastStatusCodes.NETWORK_ERROR)
|
|
183
|
+
|
|
184
|
+
assertFalse(remote.isSessionAvailable)
|
|
185
|
+
assertFalse(remote.isSuspended)
|
|
186
|
+
assertEquals(listOf(false), seen)
|
|
187
|
+
}
|
|
188
|
+
}
|
|
@@ -13,3 +13,11 @@ enum BrowserError: LocalizedError {
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
+
|
|
17
|
+
extension BrowserError {
|
|
18
|
+
/// The error for a request that no layer gives a base URL. A path no route matches has
|
|
19
|
+
/// nowhere to be fetched from; a route that names a request is misconfigured.
|
|
20
|
+
static func missingBaseUrl(path: String, routed: Bool) -> BrowserError {
|
|
21
|
+
routed ? .invalidConfiguration("No URL configured for route") : .contentNotFound(path: path)
|
|
22
|
+
}
|
|
23
|
+
}
|