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.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +41 -6
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
- package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
- package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
- package/android/src/main/res/values/strings.xml +5 -2
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
- package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
- package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
- package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
- package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
- package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
- package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
- package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
- package/ios/AVPlayerEngine.swift +2 -2
- package/ios/Browser/BrowserPathHelper.swift +11 -9
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
- package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
- package/ios/CarPlay/SectionPresentation.swift +7 -0
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Model/NitroTypeStubs.swift +15 -0
- package/ios/Model/PlayerUpdateOptions.swift +2 -1
- package/ios/PlaybackEvent.swift +20 -0
- package/ios/Player/Player.swift +17 -3
- package/ios/Player/QueueManager.swift +23 -41
- package/ios/Tests/AwaitCallbackTests.swift +8 -0
- package/ios/Tests/BrowserPathHelperTests.swift +18 -0
- package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
- package/ios/Tests/DataURLDecodingTests.swift +25 -0
- package/ios/Tests/GenerationMemoTests.swift +136 -0
- package/ios/Tests/JSCallbackErrorTests.swift +33 -0
- package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
- package/ios/Tests/PlayerPolicyTests.swift +51 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/PlayerTests.swift +54 -0
- package/ios/Tests/QueueManagerTests.swift +111 -78
- package/ios/Tests/RequestLayerTests.swift +11 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/SectionPresentationTests.swift +13 -0
- package/ios/Tests/Support/TestTypes.swift +23 -1
- package/ios/Util/ArtworkImageFetcher.swift +40 -16
- package/ios/Util/AwaitCallback.swift +16 -10
- package/ios/Util/GenerationMemo.swift +81 -17
- package/ios/Util/JSCallbackError.swift +23 -0
- package/ios/Util/OutputPicker.swift +25 -5
- package/ios/Util/RoutePickerSourceFrame.swift +17 -0
- package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
- package/lib/commonjs/features/browser-config.js +3 -2
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +7 -8
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/output.js +7 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +37 -65
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +1 -4
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/commonjs/web/util/GenerationMemo.js +92 -0
- package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
- package/lib/module/features/browser-config.js +3 -2
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +7 -8
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/output.js +7 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +43 -2
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +37 -66
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +1 -5
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js +53 -55
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +3 -22
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +5 -7
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/web/util/GenerationMemo.js +87 -0
- package/lib/module/web/util/GenerationMemo.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +7 -8
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +19 -1
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -1
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +55 -8
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
- 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
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
- 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
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
- package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
- 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
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
- package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
- package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
- package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
- package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
- package/package.json +1 -1
- package/src/codegen-js-error-message.test.ts +78 -0
- package/src/features/browser-config.test.ts +7 -0
- package/src/features/browser-config.ts +3 -2
- package/src/features/browser.ts +7 -8
- package/src/features/output.ts +13 -5
- package/src/features/player/options.ts +19 -1
- package/src/specs/audio-browser.nitro.ts +16 -3
- package/src/types/browser-native.ts +4 -1
- package/src/types/browser.ts +60 -8
- package/src/web/NativeAudioBrowser.ts +43 -3
- package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
- package/src/web/browser/BrowserManager.ts +50 -79
- package/src/web/browser/SearchManager.ts +1 -8
- package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
- package/src/web/http/RequestConfigBuilder.test.ts +151 -1
- package/src/web/http/RequestConfigBuilder.ts +72 -57
- package/src/web/player/NowPlayingManager.test.ts +29 -0
- package/src/web/player/NowPlayingManager.ts +4 -27
- package/src/web/util/BrowserPathHelper.test.ts +23 -0
- package/src/web/util/BrowserPathHelper.ts +6 -7
- package/src/web/util/GenerationMemo.test.ts +148 -0
- package/src/web/util/GenerationMemo.ts +103 -0
- package/website/guide/audio-output.md +34 -7
- package/website/guide/browser.md +21 -0
- package/website/guide/carplay.md +1 -1
- package/website/guide/configuration.md +10 -9
- package/website/guide/gate.md +1 -1
- package/website/guide/remote-controls.md +35 -0
|
@@ -7,14 +7,14 @@ import com.audiobrowser.browser.ResolvedArtwork
|
|
|
7
7
|
/** Routes artwork URLs through the [ArtworkContentProvider] at [authority], via its [registry]. */
|
|
8
8
|
class ArtworkRoutes(val registry: BrowseArtworkRegistry, val authority: String) {
|
|
9
9
|
/**
|
|
10
|
-
* Registers
|
|
11
|
-
* URL comes back unchanged. [pinned] artwork survives
|
|
12
|
-
* of this provider's own URIs re-pins the artwork it
|
|
10
|
+
* Registers an [ArtworkUris.isServable] [url] and returns the `content://` URI the provider
|
|
11
|
+
* serves it at; any other URL comes back unchanged. [pinned] artwork survives
|
|
12
|
+
* [BrowseArtworkRegistry.clear]; pinning one of this provider's own URIs re-pins the artwork it
|
|
13
|
+
* already holds.
|
|
13
14
|
*/
|
|
14
15
|
fun route(url: String, headers: Map<String, String>?, isSvg: Boolean, pinned: Boolean): String {
|
|
15
16
|
val uri = Uri.parse(url)
|
|
16
|
-
|
|
17
|
-
if (scheme != "http" && scheme != "https") {
|
|
17
|
+
if (!ArtworkUris.isServable(uri)) {
|
|
18
18
|
if (pinned && uri.authority == authority) {
|
|
19
19
|
ArtworkUris.parseToken(uri)?.let { token ->
|
|
20
20
|
registry.lookup(token)?.let { registry.pin(token, it) }
|
|
@@ -11,6 +11,11 @@ object ArtworkUris {
|
|
|
11
11
|
|
|
12
12
|
fun authorityFor(packageName: String): String = "$packageName.$AUTHORITY_SUFFIX"
|
|
13
13
|
|
|
14
|
+
/** Whether the provider serves artwork at [uri]: http(s), or `data:` decoded in this process. */
|
|
15
|
+
fun isServable(uri: Uri): Boolean = uri.scheme?.lowercase() in SERVABLE_SCHEMES
|
|
16
|
+
|
|
17
|
+
private val SERVABLE_SCHEMES = setOf("http", "https", "data")
|
|
18
|
+
|
|
14
19
|
/** A stable token for [url] that does not reveal it to whoever sees the URI (SHA-256 hex). */
|
|
15
20
|
fun tokenFor(url: String): String {
|
|
16
21
|
val digest = MessageDigest.getInstance("SHA-256").digest(url.toByteArray(Charsets.UTF_8))
|
|
@@ -4,6 +4,7 @@ import com.margelo.nitro.core.Promise
|
|
|
4
4
|
import java.util.concurrent.TimeoutException
|
|
5
5
|
import kotlin.coroutines.resume
|
|
6
6
|
import kotlin.coroutines.resumeWithException
|
|
7
|
+
import kotlin.time.Duration
|
|
7
8
|
import kotlin.time.Duration.Companion.seconds
|
|
8
9
|
import kotlinx.coroutines.TimeoutCancellationException
|
|
9
10
|
import kotlinx.coroutines.currentCoroutineContext
|
|
@@ -17,29 +18,52 @@ internal val FALLBACK_TIMEOUT = 10.seconds
|
|
|
17
18
|
/** Awaits this JS promise. Unlike Nitro's `await`, a cancelled caller resumes at once. */
|
|
18
19
|
internal suspend fun <T> Promise<T>.awaitCancellable(): T = settled()
|
|
19
20
|
|
|
21
|
+
/**
|
|
22
|
+
* [awaitCancellable] for a promise a JS callback returned, whose rejection Nitro gives as `Name:
|
|
23
|
+
* message`: it fails with the message alone when `Name` is a JS error name.
|
|
24
|
+
*/
|
|
25
|
+
internal suspend fun <T> Promise<T>.awaitJsPromise(): T = settled(::withoutErrorName)
|
|
26
|
+
|
|
20
27
|
/** [awaitCancellable] for a JS callback that returns a promise, behind Nitro's bridge promise. */
|
|
21
|
-
internal suspend fun <T> Promise<Promise<T>>.awaitNested(): T = settled().
|
|
28
|
+
internal suspend fun <T> Promise<Promise<T>>.awaitNested(): T = settled().awaitJsPromise()
|
|
22
29
|
|
|
23
30
|
/**
|
|
24
31
|
* [awaitCancellable], failing with a [TimeoutException], which is not a cancellation, after
|
|
25
32
|
* [FALLBACK_TIMEOUT].
|
|
26
33
|
*/
|
|
27
|
-
internal suspend fun <T> Promise<T>.awaitOrTimeout(): T =
|
|
34
|
+
internal suspend fun <T> Promise<T>.awaitOrTimeout(): T =
|
|
35
|
+
withTimeoutAsFailure(FALLBACK_TIMEOUT, "JS callback") { settled() }
|
|
28
36
|
|
|
29
37
|
/** [awaitNested], failing as [awaitOrTimeout] does; the timeout covers both promises. */
|
|
30
|
-
internal suspend fun <T> Promise<Promise<T>>.awaitNestedOrTimeout(): T =
|
|
31
|
-
|
|
32
|
-
}
|
|
38
|
+
internal suspend fun <T> Promise<Promise<T>>.awaitNestedOrTimeout(): T =
|
|
39
|
+
withTimeoutAsFailure(FALLBACK_TIMEOUT, "JS callback") { awaitNested() }
|
|
33
40
|
|
|
34
|
-
|
|
41
|
+
/**
|
|
42
|
+
* [withTimeout], failing with a [TimeoutException] rather than cancelling: a caller's `future` then
|
|
43
|
+
* fails, where a cancellation would end it without a word. [what] names it in the message.
|
|
44
|
+
*/
|
|
45
|
+
internal suspend fun <T> withTimeoutAsFailure(
|
|
46
|
+
timeout: Duration,
|
|
47
|
+
what: String,
|
|
48
|
+
block: suspend () -> T,
|
|
49
|
+
): T =
|
|
35
50
|
try {
|
|
36
|
-
withTimeout(
|
|
51
|
+
withTimeout(timeout) { block() }
|
|
37
52
|
} catch (e: TimeoutCancellationException) {
|
|
38
53
|
currentCoroutineContext().ensureActive()
|
|
39
|
-
throw TimeoutException("
|
|
54
|
+
throw TimeoutException("$what outran $timeout")
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
private suspend fun <T> Promise<T>.settled(rejection: (Throwable) -> Throwable = { it }): T =
|
|
58
|
+
suspendCancellableCoroutine { c ->
|
|
59
|
+
then { c.resume(it) }
|
|
60
|
+
catch { c.resumeWithException(rejection(it)) }
|
|
40
61
|
}
|
|
41
62
|
|
|
42
|
-
private
|
|
43
|
-
|
|
44
|
-
|
|
63
|
+
private val JS_ERROR_NAME = Regex("""^(?:[A-Za-z_$][A-Za-z0-9_$]*)?Error: """)
|
|
64
|
+
|
|
65
|
+
private fun withoutErrorName(rejection: Throwable): Throwable {
|
|
66
|
+
val message = rejection.message ?: return rejection
|
|
67
|
+
val name = JS_ERROR_NAME.find(message) ?: return rejection
|
|
68
|
+
return RuntimeException(message.substring(name.range.last + 1), rejection)
|
|
45
69
|
}
|
|
@@ -131,4 +131,15 @@ object BrowserPathHelper {
|
|
|
131
131
|
}
|
|
132
132
|
|
|
133
133
|
private fun isAbsoluteUrl(url: String): Boolean = ABSOLUTE_URL.containsMatchIn(url)
|
|
134
|
+
|
|
135
|
+
/** An http(s) URL, which plays as it is. */
|
|
136
|
+
fun isHttpUrl(mediaId: String): Boolean =
|
|
137
|
+
mediaId.startsWith("http://") || mediaId.startsWith("https://")
|
|
138
|
+
|
|
139
|
+
/** A mediaId that is neither blank, a browse path, nor an http(s) URL: a track's `id` alone. */
|
|
140
|
+
fun isBareId(mediaId: String): Boolean =
|
|
141
|
+
mediaId.isNotBlank() && !mediaId.startsWith("/") && !isHttpUrl(mediaId)
|
|
142
|
+
|
|
143
|
+
/** Whether [url] is a `data:` URL, whose bytes are the URL itself. */
|
|
144
|
+
fun isDataUrl(url: String): Boolean = url.startsWith("data:", ignoreCase = true)
|
|
134
145
|
}
|
|
@@ -17,12 +17,14 @@ object TrackFactory {
|
|
|
17
17
|
@Volatile var artworkRoutes: ArtworkRoutes? = null
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
|
-
* The artwork URI the session publishes for [url]:
|
|
21
|
-
*
|
|
22
|
-
*
|
|
20
|
+
* The artwork URI the session publishes for [url]: a `content://` URI from the provider for a
|
|
21
|
+
* `data:` URL, which would otherwise send its bytes to every controller; on Android Automotive
|
|
22
|
+
* OS, whose car media app loads artwork only from `content://`, `android.resource://` and
|
|
23
|
+
* `file://` URIs, for any URL the provider serves; else [url] itself.
|
|
23
24
|
*/
|
|
24
25
|
fun sessionArtworkUri(url: String, headers: Map<String, String>?, isSvg: Boolean): String {
|
|
25
|
-
val provider = artworkRoutes
|
|
26
|
+
val provider = artworkRoutes ?: return url
|
|
27
|
+
if (!Automotive.device && !BrowserPathHelper.isDataUrl(url)) return url
|
|
26
28
|
return provider.route(url, headers, isSvg, pinned = true)
|
|
27
29
|
}
|
|
28
30
|
|
|
@@ -102,9 +104,10 @@ object TrackFactory {
|
|
|
102
104
|
}
|
|
103
105
|
|
|
104
106
|
/**
|
|
105
|
-
* Routes
|
|
106
|
-
* and SVG rendering apply in this process and no bytes cross the Binder.
|
|
107
|
-
* (`android.resource://` icons, `file://`) passes through unchanged, so vector
|
|
107
|
+
* Routes [ArtworkUris.isServable] artwork through the `content://` provider, registered in
|
|
108
|
+
* [registry], so headers and SVG rendering apply in this process and no bytes cross the Binder.
|
|
109
|
+
* Other artwork (`android.resource://` icons, `file://`) passes through unchanged, so vector
|
|
110
|
+
* icons survive.
|
|
108
111
|
*/
|
|
109
112
|
fun toBrowseMediaItem(
|
|
110
113
|
track: Track,
|
|
@@ -20,11 +20,14 @@
|
|
|
20
20
|
<!--
|
|
21
21
|
The SessionError message a browse or search failure sends alongside its
|
|
22
22
|
tile. The tiles themselves are worded by the app's `formatNavigationError`
|
|
23
|
-
(ADR 0001), so these
|
|
24
|
-
kept because a SessionError carries a string, not a
|
|
23
|
+
(ADR 0001), so these and the play error below are the library's only
|
|
24
|
+
device-locale copy — kept because a SessionError carries a string, not a
|
|
25
|
+
navigation error.
|
|
25
26
|
Offline is distinct from the browse error: it is sent only when the network
|
|
26
27
|
monitor says we are actually offline, so it may name the cause.
|
|
27
28
|
-->
|
|
28
29
|
<string name="audio_browser_offline_error">No internet connection</string>
|
|
29
30
|
<string name="audio_browser_browse_error">Something went wrong</string>
|
|
31
|
+
<!-- The SessionError message a play request sends when its item cannot be resolved. -->
|
|
32
|
+
<string name="audio_browser_play_error">Couldn\'t play this</string>
|
|
30
33
|
</resources>
|
|
@@ -36,3 +36,18 @@ internal fun MediaSession.countLegacyStateUpdates(): () -> Int {
|
|
|
36
36
|
)
|
|
37
37
|
return { count }
|
|
38
38
|
}
|
|
39
|
+
|
|
40
|
+
/** Records each error legacy controllers are told from now on, with the state it came in. */
|
|
41
|
+
internal fun MediaSession.recordLegacyErrors(): () -> List<Pair<Int, String>> {
|
|
42
|
+
val errors = mutableListOf<Pair<Int, String>>()
|
|
43
|
+
impl.mediaSessionLegacyStub.sessionCompat.controller.registerCallback(
|
|
44
|
+
object : MediaControllerCompat.Callback() {
|
|
45
|
+
override fun onPlaybackStateChanged(state: PlaybackStateCompat?) {
|
|
46
|
+
val message = state?.errorMessage ?: return
|
|
47
|
+
errors += state.state to message.toString()
|
|
48
|
+
}
|
|
49
|
+
},
|
|
50
|
+
Handler(Looper.getMainLooper()),
|
|
51
|
+
)
|
|
52
|
+
return { errors.toList() }
|
|
53
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
package com.audiobrowser
|
|
2
|
+
|
|
3
|
+
import com.audiobrowser.TestFixtures.browseTrack
|
|
4
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
5
|
+
import kotlinx.coroutines.CompletableDeferred
|
|
6
|
+
import kotlinx.coroutines.CoroutineScope
|
|
7
|
+
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
|
8
|
+
import kotlinx.coroutines.SupervisorJob
|
|
9
|
+
import kotlinx.coroutines.test.StandardTestDispatcher
|
|
10
|
+
import kotlinx.coroutines.test.TestScope
|
|
11
|
+
import kotlinx.coroutines.test.advanceUntilIdle
|
|
12
|
+
import kotlinx.coroutines.test.runTest
|
|
13
|
+
import org.junit.Assert.assertEquals
|
|
14
|
+
import org.junit.Assert.assertTrue
|
|
15
|
+
import org.junit.Test
|
|
16
|
+
|
|
17
|
+
@OptIn(ExperimentalCoroutinesApi::class)
|
|
18
|
+
class ConfigurationStartTest {
|
|
19
|
+
|
|
20
|
+
private fun TestScope.mainScope() =
|
|
21
|
+
CoroutineScope(SupervisorJob() + StandardTestDispatcher(testScheduler))
|
|
22
|
+
|
|
23
|
+
@Test
|
|
24
|
+
fun `a configured path still queries the tabs`() = runTest {
|
|
25
|
+
var queried = false
|
|
26
|
+
val navigated = mutableListOf<String>()
|
|
27
|
+
|
|
28
|
+
mainScope().launchConfigurationStart("/home", { arrayOf<Track>().also { queried = true } }) {
|
|
29
|
+
navigated += it
|
|
30
|
+
}
|
|
31
|
+
advanceUntilIdle()
|
|
32
|
+
|
|
33
|
+
assertTrue(queried)
|
|
34
|
+
assertEquals(listOf("/home"), navigated)
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
@Test
|
|
38
|
+
fun `a navigation that supersedes the start leaves the tabs query running`() = runTest {
|
|
39
|
+
val response = CompletableDeferred<Array<Track>>()
|
|
40
|
+
var resolved = false
|
|
41
|
+
|
|
42
|
+
val start =
|
|
43
|
+
mainScope().launchConfigurationStart(null, { response.await().also { resolved = true } }) {}
|
|
44
|
+
start.cancel()
|
|
45
|
+
response.complete(arrayOf(browseTrack(path = "/t")))
|
|
46
|
+
advanceUntilIdle()
|
|
47
|
+
|
|
48
|
+
assertTrue(resolved)
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
@Test
|
|
52
|
+
fun `without a configured path the start is the first tab's`() = runTest {
|
|
53
|
+
val navigated = mutableListOf<String>()
|
|
54
|
+
|
|
55
|
+
mainScope().launchConfigurationStart(null, { arrayOf(browseTrack(path = "/t")) }) {
|
|
56
|
+
navigated += it
|
|
57
|
+
}
|
|
58
|
+
advanceUntilIdle()
|
|
59
|
+
|
|
60
|
+
assertEquals(listOf("/t"), navigated)
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
@Test
|
|
64
|
+
fun `without a configured path or tabs the start is the root`() = runTest {
|
|
65
|
+
val navigated = mutableListOf<String>()
|
|
66
|
+
|
|
67
|
+
mainScope().launchConfigurationStart(null, { error("tabs route failed") }) { navigated += it }
|
|
68
|
+
advanceUntilIdle()
|
|
69
|
+
|
|
70
|
+
assertEquals(listOf("/"), navigated)
|
|
71
|
+
}
|
|
72
|
+
}
|
|
@@ -90,21 +90,23 @@ object TestFixtures {
|
|
|
90
90
|
userAgent = null,
|
|
91
91
|
)
|
|
92
92
|
|
|
93
|
-
/**
|
|
94
|
-
|
|
93
|
+
/**
|
|
94
|
+
* A layer `transform` whose JS promise rejects with a [name] error of [message]: Nitro gives the
|
|
95
|
+
* rejection as `name: message`.
|
|
96
|
+
*/
|
|
97
|
+
fun throwingTransform(message: String, name: String = "Error") =
|
|
95
98
|
Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__ {
|
|
96
99
|
_,
|
|
97
100
|
_ ->
|
|
98
|
-
val js = JsPromise<RequestConfig>().apply { reject(Exception(message)) }
|
|
101
|
+
val js = JsPromise<RequestConfig>().apply { reject(Exception("$name: $message")) }
|
|
99
102
|
JsPromise<Promise<RequestConfig>>().apply { resolve(js.promise) }.promise
|
|
100
103
|
}
|
|
101
104
|
|
|
102
|
-
|
|
103
|
-
fun throwingTransformSync(what: String) =
|
|
105
|
+
fun throwingTransformSync(message: String) =
|
|
104
106
|
Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__ {
|
|
105
107
|
_,
|
|
106
108
|
_ ->
|
|
107
|
-
JsPromise<RequestConfig>().apply { reject(Exception(
|
|
109
|
+
JsPromise<RequestConfig>().apply { reject(Exception(message)) }.promise
|
|
108
110
|
}
|
|
109
111
|
|
|
110
112
|
fun mediaConfig(
|
|
@@ -208,6 +210,7 @@ object TestFixtures {
|
|
|
208
210
|
carPlayLoadingTitle = null,
|
|
209
211
|
resolveAlbumPath = null,
|
|
210
212
|
formatNavigationError = null,
|
|
213
|
+
findTrack = null,
|
|
211
214
|
)
|
|
212
215
|
|
|
213
216
|
/**
|
|
@@ -36,4 +36,23 @@ class BrowseArtworkRegistryTest {
|
|
|
36
36
|
assertNull(reg.lookup("a"))
|
|
37
37
|
assertEquals("https://x/c", reg.lookup("c")?.finalUrl)
|
|
38
38
|
}
|
|
39
|
+
|
|
40
|
+
@Test
|
|
41
|
+
fun `evicts oldest beyond the character budget, keeping the newest`() {
|
|
42
|
+
val reg = BrowseArtworkRegistry(maxUrlChars = 10)
|
|
43
|
+
reg.register("a", ResolvedArtwork("data:aaaa", null, false))
|
|
44
|
+
reg.register("b", ResolvedArtwork("data:bbbbbbbbbbbbbbbb", null, false))
|
|
45
|
+
assertNull(reg.lookup("a"))
|
|
46
|
+
assertEquals("data:bbbbbbbbbbbbbbbb", reg.lookup("b")?.finalUrl)
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
@Test
|
|
50
|
+
fun `a replaced entry gives back its characters`() {
|
|
51
|
+
val reg = BrowseArtworkRegistry(maxUrlChars = 21)
|
|
52
|
+
reg.register("a", ResolvedArtwork("data:aaaa", null, false))
|
|
53
|
+
reg.register("b", ResolvedArtwork("data:bbbbbb", null, false))
|
|
54
|
+
reg.register("b", ResolvedArtwork("data:b", null, false))
|
|
55
|
+
reg.register("c", ResolvedArtwork("data:c", null, false))
|
|
56
|
+
assertEquals("data:aaaa", reg.lookup("a")?.finalUrl)
|
|
57
|
+
}
|
|
39
58
|
}
|
|
@@ -179,6 +179,64 @@ class BrowserManagerFavoritesTest {
|
|
|
179
179
|
)
|
|
180
180
|
}
|
|
181
181
|
|
|
182
|
+
@Test
|
|
183
|
+
fun `setFavorites restamps the content on screen and emits it`() = runBlocking {
|
|
184
|
+
servePage(
|
|
185
|
+
"/home",
|
|
186
|
+
track(title = "A", id = "stable-a", src = "https://s/a.mp3"),
|
|
187
|
+
track(title = "B", id = "stable-b", src = "https://s/b.mp3"),
|
|
188
|
+
)
|
|
189
|
+
browserManager.setFavoriteEnabled(true)
|
|
190
|
+
browserManager.setFavorites(listOf("stable-b"))
|
|
191
|
+
browserManager.navigate("/home")
|
|
192
|
+
val emitted = mutableListOf<Map<String, Boolean?>?>()
|
|
193
|
+
browserManager.setOnContentChanged {
|
|
194
|
+
emitted.add(favoritedByTitle(it?.flattenedChildren?.toTypedArray()))
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
browserManager.setFavorites(listOf("stable-a"))
|
|
198
|
+
|
|
199
|
+
val expected = mapOf("A" to true, "B" to false)
|
|
200
|
+
assertEquals(
|
|
201
|
+
expected,
|
|
202
|
+
favoritedByTitle(browserManager.getContent()?.flattenedChildren?.toTypedArray()),
|
|
203
|
+
)
|
|
204
|
+
assertEquals(listOf(expected), emitted)
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
@Test
|
|
208
|
+
fun `setFavorites that changes no track on screen emits nothing`() = runBlocking {
|
|
209
|
+
servePage("/home", track(title = "A", id = "stable-a", src = "https://s/a.mp3"))
|
|
210
|
+
browserManager.setFavoriteEnabled(true)
|
|
211
|
+
browserManager.setFavorites(listOf("stable-a"))
|
|
212
|
+
browserManager.navigate("/home")
|
|
213
|
+
var emits = 0
|
|
214
|
+
browserManager.setOnContentChanged { emits++ }
|
|
215
|
+
|
|
216
|
+
browserManager.setFavorites(listOf("stable-a", "elsewhere"))
|
|
217
|
+
|
|
218
|
+
assertEquals(0, emits)
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
@Test
|
|
222
|
+
fun `a removed favorite does not come back through the track cache`() = runBlocking {
|
|
223
|
+
servePage(
|
|
224
|
+
"/home",
|
|
225
|
+
track(title = "A", id = "stable-a", src = "https://s/a.mp3", favorited = true),
|
|
226
|
+
)
|
|
227
|
+
browserManager.setFavoriteEnabled(true)
|
|
228
|
+
browserManager.setFavorites(listOf("stable-a"))
|
|
229
|
+
browserManager.resolve("/home")
|
|
230
|
+
|
|
231
|
+
browserManager.setFavorites(emptyList())
|
|
232
|
+
// A content-cache hit, as Android Auto serves the page again, re-keys the track cache.
|
|
233
|
+
val served = browserManager.resolve("/home")
|
|
234
|
+
|
|
235
|
+
assertEquals(mapOf("A" to false), favoritedByTitle(served.flattenedChildren?.toTypedArray()))
|
|
236
|
+
assertEquals(false, browserManager.getCachedTrack("stable-a")?.favorited)
|
|
237
|
+
assertEquals(false, browserManager.getCachedTrack("https://s/a.mp3")?.favorited)
|
|
238
|
+
}
|
|
239
|
+
|
|
182
240
|
@Test
|
|
183
241
|
fun `getCachedTrack re-hydrates favorites by identity`() = runBlocking {
|
|
184
242
|
servePage("/home", track(title = "A", id = "stable-a", src = "https://s/a.mp3"))
|
|
@@ -2,6 +2,7 @@ package com.audiobrowser.browser
|
|
|
2
2
|
|
|
3
3
|
import com.audiobrowser.TestFixtures.transformableConfig
|
|
4
4
|
import com.margelo.nitro.audiobrowser.NativeRouteEntry
|
|
5
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
5
6
|
import java.util.concurrent.CountDownLatch
|
|
6
7
|
import java.util.concurrent.TimeUnit
|
|
7
8
|
import kotlinx.coroutines.Dispatchers
|
|
@@ -160,6 +161,20 @@ class BrowserManagerInvalidationTest {
|
|
|
160
161
|
assertEquals("en", runBlocking { browserManager.resolve("/page") }.title)
|
|
161
162
|
}
|
|
162
163
|
|
|
164
|
+
@Test
|
|
165
|
+
fun `tabs queried for a configuration without them are empty, and emitted once`() = runBlocking {
|
|
166
|
+
browserManager.queryTabs()
|
|
167
|
+
val emitted = mutableListOf<List<Track>>()
|
|
168
|
+
browserManager.setOnTabsChanged { emitted += it.toList() }
|
|
169
|
+
|
|
170
|
+
browserManager.config = config().copy(routes = emptyArray())
|
|
171
|
+
browserManager.clearContentCache()
|
|
172
|
+
browserManager.queryTabs()
|
|
173
|
+
|
|
174
|
+
assertEquals(0, browserManager.getTabs()?.size)
|
|
175
|
+
assertEquals(listOf(emptyList<Track>()), emitted)
|
|
176
|
+
}
|
|
177
|
+
|
|
163
178
|
@Test
|
|
164
179
|
fun `a failed tabs re-query keeps the previous tabs`() = runBlocking {
|
|
165
180
|
browserManager.queryTabs()
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
package com.audiobrowser.browser
|
|
2
|
+
|
|
3
|
+
import androidx.media3.common.MediaItem
|
|
4
|
+
import com.audiobrowser.TestFixtures.transformableConfig
|
|
5
|
+
import com.audiobrowser.navigationErrorFor
|
|
6
|
+
import com.margelo.nitro.audiobrowser.NativeRouteEntry
|
|
7
|
+
import com.margelo.nitro.audiobrowser.NavigationError
|
|
8
|
+
import com.margelo.nitro.audiobrowser.NavigationErrorType
|
|
9
|
+
import kotlinx.coroutines.runBlocking
|
|
10
|
+
import okhttp3.mockwebserver.MockResponse
|
|
11
|
+
import okhttp3.mockwebserver.MockWebServer
|
|
12
|
+
import okhttp3.mockwebserver.SocketPolicy
|
|
13
|
+
import org.junit.After
|
|
14
|
+
import org.junit.Assert.assertEquals
|
|
15
|
+
import org.junit.Assert.assertNull
|
|
16
|
+
import org.junit.Assert.assertThrows
|
|
17
|
+
import org.junit.Before
|
|
18
|
+
import org.junit.Test
|
|
19
|
+
import org.junit.runner.RunWith
|
|
20
|
+
import org.robolectric.RobolectricTestRunner
|
|
21
|
+
|
|
22
|
+
/** A search through the search route's HTTP config that the server fails. */
|
|
23
|
+
@RunWith(RobolectricTestRunner::class)
|
|
24
|
+
class BrowserManagerSearchFailureTest {
|
|
25
|
+
|
|
26
|
+
private lateinit var server: MockWebServer
|
|
27
|
+
private lateinit var browserManager: BrowserManager
|
|
28
|
+
|
|
29
|
+
@Before
|
|
30
|
+
fun setup() {
|
|
31
|
+
server = MockWebServer()
|
|
32
|
+
server.start()
|
|
33
|
+
browserManager = BrowserManager()
|
|
34
|
+
browserManager.config =
|
|
35
|
+
BrowserConfig(
|
|
36
|
+
request = transformableConfig(baseUrl = server.url("/").toString().trimEnd('/')),
|
|
37
|
+
routes =
|
|
38
|
+
arrayOf(
|
|
39
|
+
NativeRouteEntry(
|
|
40
|
+
path = BrowserManager.SEARCH_ROUTE_PATH,
|
|
41
|
+
browseCallback = null,
|
|
42
|
+
browseConfig = null,
|
|
43
|
+
browseStatic = null,
|
|
44
|
+
searchCallback = null,
|
|
45
|
+
searchConfig = transformableConfig(path = "/search"),
|
|
46
|
+
media = null,
|
|
47
|
+
artwork = null,
|
|
48
|
+
)
|
|
49
|
+
),
|
|
50
|
+
)
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
@After
|
|
54
|
+
fun tearDown() {
|
|
55
|
+
server.shutdown()
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
private fun navigationErrorOfSearch(response: MockResponse): NavigationError {
|
|
59
|
+
server.enqueue(response)
|
|
60
|
+
return navigationErrorFor(
|
|
61
|
+
assertThrows(Exception::class.java) { runBlocking { browserManager.search("jazz") } }
|
|
62
|
+
)
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
private fun tappedSearchResult(mediaId: String) =
|
|
66
|
+
MediaItem.Builder()
|
|
67
|
+
.setMediaId(mediaId)
|
|
68
|
+
.setRequestMetadata(MediaItem.RequestMetadata.Builder().setSearchQuery("jazz").build())
|
|
69
|
+
.build()
|
|
70
|
+
|
|
71
|
+
@Test
|
|
72
|
+
fun `a non-2xx search is an http-error with its status`() {
|
|
73
|
+
val error = navigationErrorOfSearch(MockResponse().setResponseCode(503))
|
|
74
|
+
|
|
75
|
+
assertEquals(NavigationErrorType.HTTP_ERROR, error.code)
|
|
76
|
+
assertEquals(503.0, error.statusCode!!, 0.0)
|
|
77
|
+
assertEquals(false, error.statusCodeSuccess)
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
@Test
|
|
81
|
+
fun `a search whose request fails is a network-error`() {
|
|
82
|
+
val error =
|
|
83
|
+
navigationErrorOfSearch(MockResponse().setSocketPolicy(SocketPolicy.DISCONNECT_AT_START))
|
|
84
|
+
|
|
85
|
+
assertEquals(NavigationErrorType.NETWORK_ERROR, error.code)
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
@Test
|
|
89
|
+
fun `a 2xx search body that is not a track array is an http-error with a successful status`() {
|
|
90
|
+
val error = navigationErrorOfSearch(MockResponse().setBody("<html>Sign in</html>"))
|
|
91
|
+
|
|
92
|
+
assertEquals(NavigationErrorType.HTTP_ERROR, error.code)
|
|
93
|
+
assertEquals(200.0, error.statusCode!!, 0.0)
|
|
94
|
+
assertEquals(true, error.statusCodeSuccess)
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
@Test
|
|
98
|
+
fun `a search whose request is malformed is an unknown-error, not a network-error`() {
|
|
99
|
+
browserManager.config =
|
|
100
|
+
browserManager.config.copy(request = transformableConfig(baseUrl = "ftp://example.com"))
|
|
101
|
+
|
|
102
|
+
val error =
|
|
103
|
+
navigationErrorFor(
|
|
104
|
+
assertThrows(Exception::class.java) { runBlocking { browserManager.search("jazz") } }
|
|
105
|
+
)
|
|
106
|
+
|
|
107
|
+
assertEquals(NavigationErrorType.UNKNOWN_ERROR, error.code)
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
@Test
|
|
111
|
+
fun `a failed search does not become the cached search`() {
|
|
112
|
+
server.enqueue(MockResponse().setResponseCode(500))
|
|
113
|
+
|
|
114
|
+
runCatching { runBlocking { browserManager.search("jazz") } }
|
|
115
|
+
|
|
116
|
+
assertNull(browserManager.getCachedSearchResults("jazz"))
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
@Test
|
|
120
|
+
fun `a 2xx empty array is a search with no results`() {
|
|
121
|
+
server.enqueue(MockResponse().setBody("[]"))
|
|
122
|
+
|
|
123
|
+
val results = runBlocking { browserManager.searchPlayable("jazz") }
|
|
124
|
+
|
|
125
|
+
assertNull(results)
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
@Test
|
|
129
|
+
fun `a tapped search result plays the cached results without searching again`() {
|
|
130
|
+
server.enqueue(
|
|
131
|
+
MockResponse()
|
|
132
|
+
.setBody(
|
|
133
|
+
"""[{"title":"A","src":"https://s/a.mp3"},{"title":"B","src":"https://s/b.mp3"}]"""
|
|
134
|
+
)
|
|
135
|
+
)
|
|
136
|
+
runBlocking { browserManager.search("jazz") }
|
|
137
|
+
|
|
138
|
+
val playback = runBlocking {
|
|
139
|
+
browserManager.resolveMediaItemsForPlayback(
|
|
140
|
+
listOf(tappedSearchResult("https://s/b.mp3")),
|
|
141
|
+
0,
|
|
142
|
+
0,
|
|
143
|
+
)
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
assertEquals(
|
|
147
|
+
listOf("https://s/a.mp3", "https://s/b.mp3"),
|
|
148
|
+
playback.mediaItems.map { it.mediaId },
|
|
149
|
+
)
|
|
150
|
+
assertEquals(1, playback.startIndex)
|
|
151
|
+
assertEquals(1, server.requestCount)
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
@Test
|
|
155
|
+
fun `a tapped search result whose search fails plays on its own`() {
|
|
156
|
+
server.enqueue(MockResponse().setResponseCode(503))
|
|
157
|
+
|
|
158
|
+
val playback = runBlocking {
|
|
159
|
+
browserManager.resolveMediaItemsForPlayback(
|
|
160
|
+
listOf(tappedSearchResult("https://s/b.mp3")),
|
|
161
|
+
0,
|
|
162
|
+
0,
|
|
163
|
+
)
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
assertEquals(listOf("https://s/b.mp3"), playback.mediaItems.map { it.mediaId })
|
|
167
|
+
}
|
|
168
|
+
}
|
|
@@ -9,6 +9,7 @@ import com.audiobrowser.TestFixtures.staticRoute
|
|
|
9
9
|
import com.audiobrowser.TestFixtures.track
|
|
10
10
|
import com.audiobrowser.util.BrowserPathHelper
|
|
11
11
|
import com.audiobrowser.util.JsPromise
|
|
12
|
+
import com.margelo.nitro.audiobrowser.BrowseResult
|
|
12
13
|
import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam
|
|
13
14
|
import com.margelo.nitro.audiobrowser.Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_
|
|
14
15
|
import kotlin.time.Duration.Companion.seconds
|
|
@@ -123,6 +124,37 @@ class BrowserManagerTest {
|
|
|
123
124
|
assertEquals("/library", browserManager.getPath())
|
|
124
125
|
}
|
|
125
126
|
|
|
127
|
+
@Test
|
|
128
|
+
fun `a browse callback's rejected promise fails with its message alone`() = runBlocking {
|
|
129
|
+
val rejected = JsPromise<BrowseResult>().apply { reject(RuntimeException("Error: Offline")) }
|
|
130
|
+
browserManager.config =
|
|
131
|
+
BrowserConfig(
|
|
132
|
+
routes =
|
|
133
|
+
arrayOf(
|
|
134
|
+
staticRoute("/home", resolvedTrack(path = "/home"))
|
|
135
|
+
.copy(
|
|
136
|
+
browseStatic = null,
|
|
137
|
+
browseCallback =
|
|
138
|
+
Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam {
|
|
139
|
+
JsPromise<Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_>()
|
|
140
|
+
.apply {
|
|
141
|
+
resolve(
|
|
142
|
+
Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.create(
|
|
143
|
+
rejected.promise
|
|
144
|
+
)
|
|
145
|
+
)
|
|
146
|
+
}
|
|
147
|
+
.promise
|
|
148
|
+
},
|
|
149
|
+
)
|
|
150
|
+
)
|
|
151
|
+
)
|
|
152
|
+
|
|
153
|
+
val failure = runCatching { browserManager.navigate("/home") }.exceptionOrNull()
|
|
154
|
+
|
|
155
|
+
assertEquals("Offline", failure?.message)
|
|
156
|
+
}
|
|
157
|
+
|
|
126
158
|
// MARK: - expandQueueFromContextualPath
|
|
127
159
|
|
|
128
160
|
@Test
|