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
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
package com.audiobrowser.cast
|
|
2
2
|
|
|
3
3
|
import android.content.Context
|
|
4
|
+
import android.net.ConnectivityManager
|
|
5
|
+
import android.net.Network
|
|
6
|
+
import android.os.Handler
|
|
7
|
+
import android.os.Looper
|
|
4
8
|
import androidx.media3.cast.Cast
|
|
5
9
|
import androidx.media3.cast.CastParams
|
|
6
10
|
import androidx.media3.cast.DefaultMediaItemConverter
|
|
@@ -18,6 +22,9 @@ import com.google.android.gms.cast.framework.SessionManagerListener
|
|
|
18
22
|
import com.google.android.gms.cast.framework.media.RemoteMediaClient
|
|
19
23
|
import com.google.android.gms.common.ConnectionResult
|
|
20
24
|
import com.google.android.gms.common.GoogleApiAvailability
|
|
25
|
+
import com.google.android.gms.common.api.CommonStatusCodes
|
|
26
|
+
import com.google.android.gms.common.api.PendingResult
|
|
27
|
+
import java.util.concurrent.TimeUnit
|
|
21
28
|
import timber.log.Timber
|
|
22
29
|
|
|
23
30
|
private fun receiverOrDefault(receiverApplicationId: String?) =
|
|
@@ -58,22 +65,42 @@ internal fun createCastRemote(context: Context, receiverApplicationId: String?):
|
|
|
58
65
|
RemoteCastPlayer.Builder(context)
|
|
59
66
|
.setMediaItemConverter(SendingMediaItemConverter())
|
|
60
67
|
.build()
|
|
61
|
-
return SdkCastRemote(Cast.getSingletonInstance(context), player)
|
|
68
|
+
return SdkCastRemote(Cast.getSingletonInstance(context), player) { onRegained ->
|
|
69
|
+
val connectivity = context.getSystemService(ConnectivityManager::class.java)
|
|
70
|
+
val callback =
|
|
71
|
+
object : ConnectivityManager.NetworkCallback() {
|
|
72
|
+
override fun onAvailable(network: Network) = onRegained()
|
|
73
|
+
}
|
|
74
|
+
connectivity.registerDefaultNetworkCallback(callback, Handler(Looper.getMainLooper()))
|
|
75
|
+
return@SdkCastRemote { connectivity.unregisterNetworkCallback(callback) }
|
|
76
|
+
}
|
|
62
77
|
}
|
|
63
78
|
|
|
64
|
-
internal
|
|
65
|
-
|
|
79
|
+
internal fun interface NetworkWatch {
|
|
80
|
+
/** Calls [onRegained] on the main thread as each default network arrives; returns the stop. */
|
|
81
|
+
fun start(onRegained: () -> Unit): () -> Unit
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
internal class SdkCastRemote(
|
|
85
|
+
private val cast: Cast,
|
|
86
|
+
override val player: RemoteCastPlayer,
|
|
87
|
+
networkWatch: NetworkWatch,
|
|
88
|
+
) : RemotePlayback {
|
|
66
89
|
private var listener: RemotePlayback.Listener? = null
|
|
67
90
|
private var client: RemoteMediaClient? = null
|
|
68
91
|
|
|
69
92
|
/**
|
|
70
93
|
* Kept through a suspension, while the receiver plays on out of reach: [player] lets go of its
|
|
71
|
-
* session then as it does at an end, so only the SDK's own end or failed resume clears
|
|
94
|
+
* session then as it does at an end, so only the SDK's own end or failed resume or start clears
|
|
95
|
+
* this.
|
|
72
96
|
*/
|
|
73
97
|
private var hasSession = player.isCastSessionAvailable
|
|
74
98
|
|
|
75
99
|
private val ends = CastEnds()
|
|
76
100
|
|
|
101
|
+
/** The status request [askReceiver] waits on the answer to. */
|
|
102
|
+
private var asking: PendingResult<RemoteMediaClient.MediaChannelResult>? = null
|
|
103
|
+
|
|
77
104
|
private val statusCallback =
|
|
78
105
|
object : RemoteMediaClient.Callback() {
|
|
79
106
|
override fun onStatusUpdated() {
|
|
@@ -100,24 +127,26 @@ internal class SdkCastRemote(private val cast: Cast, override val player: Remote
|
|
|
100
127
|
|
|
101
128
|
override fun onSessionResumed(session: CastSession, wasSuspended: Boolean) = watch(session)
|
|
102
129
|
|
|
103
|
-
override fun onSessionEnded(session: CastSession, error: Int)
|
|
104
|
-
watch(null)
|
|
105
|
-
sessionGone()
|
|
106
|
-
}
|
|
130
|
+
override fun onSessionEnded(session: CastSession, error: Int) = letGo()
|
|
107
131
|
|
|
108
132
|
override fun onSessionStarting(session: CastSession) = Unit
|
|
109
133
|
|
|
110
|
-
|
|
134
|
+
/** Also how the SDK gives up on the held session after a loss it reported nothing of. */
|
|
135
|
+
override fun onSessionStartFailed(session: CastSession, error: Int) {
|
|
136
|
+
if (hasSession) letGo()
|
|
137
|
+
}
|
|
111
138
|
|
|
112
139
|
override fun onSessionEnding(session: CastSession) = sessionGone()
|
|
113
140
|
|
|
114
141
|
override fun onSessionResuming(session: CastSession, sessionId: String) = Unit
|
|
115
142
|
|
|
116
|
-
override fun onSessionResumeFailed(session: CastSession, error: Int) =
|
|
143
|
+
override fun onSessionResumeFailed(session: CastSession, error: Int) = letGo()
|
|
117
144
|
|
|
118
145
|
override fun onSessionSuspended(session: CastSession, reason: Int) = Unit
|
|
119
146
|
}
|
|
120
147
|
|
|
148
|
+
private val stopWatchingNetwork = networkWatch.start(::askReceiver)
|
|
149
|
+
|
|
121
150
|
init {
|
|
122
151
|
cast.addSessionManagerListener(sessions)
|
|
123
152
|
watch(cast.currentCastSession)
|
|
@@ -135,6 +164,37 @@ internal class SdkCastRemote(private val cast: Cast, override val player: Remote
|
|
|
135
164
|
)
|
|
136
165
|
}
|
|
137
166
|
|
|
167
|
+
/**
|
|
168
|
+
* Gives up the session, here and in the SDK, if its receiver doesn't answer a status request: the
|
|
169
|
+
* SDK can reconnect after a loss without telling the session, which then reports itself connected
|
|
170
|
+
* while nothing reaches the receiver.
|
|
171
|
+
*/
|
|
172
|
+
private fun askReceiver() {
|
|
173
|
+
val asked = client ?: return
|
|
174
|
+
if (!hasSession || isSuspended || asking != null) return
|
|
175
|
+
val request = asked.requestStatus()
|
|
176
|
+
asking = request
|
|
177
|
+
request.setResultCallback(
|
|
178
|
+
{ result ->
|
|
179
|
+
// A resume, as any session change, clears [asking]: this answer is then the old connection's.
|
|
180
|
+
if (asking !== request) return@setResultCallback
|
|
181
|
+
asking = null
|
|
182
|
+
if (result.status.statusCode != CommonStatusCodes.TIMEOUT || isSuspended) {
|
|
183
|
+
return@setResultCallback
|
|
184
|
+
}
|
|
185
|
+
letGo()
|
|
186
|
+
cast.endCurrentSession(false)
|
|
187
|
+
},
|
|
188
|
+
RECEIVER_ANSWER_TIMEOUT_MS,
|
|
189
|
+
TimeUnit.MILLISECONDS,
|
|
190
|
+
)
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
private fun letGo() {
|
|
194
|
+
watch(null)
|
|
195
|
+
sessionGone()
|
|
196
|
+
}
|
|
197
|
+
|
|
138
198
|
private fun sessionGone() {
|
|
139
199
|
if (!hasSession) return
|
|
140
200
|
hasSession = false
|
|
@@ -143,6 +203,7 @@ internal class SdkCastRemote(private val cast: Cast, override val player: Remote
|
|
|
143
203
|
|
|
144
204
|
private fun watch(session: CastSession?) {
|
|
145
205
|
ends.reset()
|
|
206
|
+
asking = null
|
|
146
207
|
client?.unregisterCallback(statusCallback)
|
|
147
208
|
client = session?.remoteMediaClient
|
|
148
209
|
client?.registerCallback(statusCallback)
|
|
@@ -160,12 +221,16 @@ internal class SdkCastRemote(private val cast: Cast, override val player: Remote
|
|
|
160
221
|
}
|
|
161
222
|
|
|
162
223
|
override fun release() {
|
|
224
|
+
stopWatchingNetwork()
|
|
163
225
|
cast.removeSessionManagerListener(sessions)
|
|
164
226
|
watch(null)
|
|
165
227
|
player.release()
|
|
166
228
|
}
|
|
167
229
|
}
|
|
168
230
|
|
|
231
|
+
/** A receiver in reach answers a status request in well under a second. */
|
|
232
|
+
private const val RECEIVER_ANSWER_TIMEOUT_MS = 10_000L
|
|
233
|
+
|
|
169
234
|
/**
|
|
170
235
|
* The end or failure of each load a receiver's media statuses report, once. A load is told by its
|
|
171
236
|
* content id, which [SendingMediaItemConverter] makes its own; a failed load's status carries no
|
|
@@ -47,8 +47,10 @@ import com.margelo.nitro.audiobrowser.BatteryWarningPendingChangedEvent
|
|
|
47
47
|
import com.margelo.nitro.audiobrowser.ChapterMetadata
|
|
48
48
|
import com.margelo.nitro.audiobrowser.EqualizerSettings
|
|
49
49
|
import com.margelo.nitro.audiobrowser.FavoriteChangedEvent
|
|
50
|
+
import com.margelo.nitro.audiobrowser.FindTrackParams
|
|
50
51
|
import com.margelo.nitro.audiobrowser.FormatNavigationErrorParams
|
|
51
52
|
import com.margelo.nitro.audiobrowser.FormattedNavigationError
|
|
53
|
+
import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams
|
|
52
54
|
import com.margelo.nitro.audiobrowser.Gate
|
|
53
55
|
import com.margelo.nitro.audiobrowser.GateDecision
|
|
54
56
|
import com.margelo.nitro.audiobrowser.GateEvent
|
|
@@ -66,6 +68,7 @@ import com.margelo.nitro.audiobrowser.NowPlayingMetadata
|
|
|
66
68
|
import com.margelo.nitro.audiobrowser.NowPlayingUpdate
|
|
67
69
|
import com.margelo.nitro.audiobrowser.Options
|
|
68
70
|
import com.margelo.nitro.audiobrowser.Output
|
|
71
|
+
import com.margelo.nitro.audiobrowser.OutputPickerAnchor
|
|
69
72
|
import com.margelo.nitro.audiobrowser.Playback
|
|
70
73
|
import com.margelo.nitro.audiobrowser.PlaybackActiveTrackChangedEvent
|
|
71
74
|
import com.margelo.nitro.audiobrowser.PlaybackError
|
|
@@ -101,6 +104,7 @@ import kotlinx.coroutines.CoroutineStart
|
|
|
101
104
|
import kotlinx.coroutines.DelicateCoroutinesApi
|
|
102
105
|
import kotlinx.coroutines.Job
|
|
103
106
|
import kotlinx.coroutines.MainScope
|
|
107
|
+
import kotlinx.coroutines.async
|
|
104
108
|
import kotlinx.coroutines.cancel
|
|
105
109
|
import kotlinx.coroutines.cancelChildren
|
|
106
110
|
import kotlinx.coroutines.currentCoroutineContext
|
|
@@ -205,13 +209,17 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
205
209
|
carPlayLoadingTitle = null,
|
|
206
210
|
resolveAlbumPath = null,
|
|
207
211
|
formatNavigationError = null,
|
|
212
|
+
findTrack = null,
|
|
208
213
|
)
|
|
209
214
|
|
|
210
215
|
internal val browserManager =
|
|
211
216
|
BrowserManager().apply {
|
|
212
217
|
setOnPathChanged { path -> onPathChanged(path) }
|
|
213
218
|
setOnContentChanged { content -> onContentChanged(content) }
|
|
214
|
-
setOnTabsChanged { tabs ->
|
|
219
|
+
setOnTabsChanged { tabs ->
|
|
220
|
+
onTabsChanged(tabs)
|
|
221
|
+
connectedService?.player?.notifyTabsChanged()
|
|
222
|
+
}
|
|
215
223
|
setOnArtworkRegistriesCleared { connectedService?.player?.browseArtworkRegistry?.clear() }
|
|
216
224
|
}
|
|
217
225
|
|
|
@@ -351,6 +359,11 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
351
359
|
// MARK: Browser Configuration
|
|
352
360
|
// ============================================================================
|
|
353
361
|
|
|
362
|
+
private fun awaitingFindTrack(
|
|
363
|
+
findTrack:
|
|
364
|
+
Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams
|
|
365
|
+
): suspend (String) -> Track? = { id -> findTrack(FindTrackParams(id)).awaitNestedOrTimeout() }
|
|
366
|
+
|
|
354
367
|
internal fun buildConfig(): BrowserConfig {
|
|
355
368
|
return BrowserConfig(
|
|
356
369
|
request = _configuration.request,
|
|
@@ -364,6 +377,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
364
377
|
singleTrack = _configuration.singleTrack ?: false,
|
|
365
378
|
androidControllerOfflineError = _configuration.androidControllerOfflineError ?: true,
|
|
366
379
|
viewMoreTitle = _configuration.viewMoreTitle,
|
|
380
|
+
findTrack = _configuration.findTrack?.let(::awaitingFindTrack),
|
|
367
381
|
)
|
|
368
382
|
}
|
|
369
383
|
|
|
@@ -460,8 +474,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
460
474
|
navigationJob?.cancel()
|
|
461
475
|
|
|
462
476
|
navigationJob =
|
|
463
|
-
mainScope.
|
|
464
|
-
val path = value.path ?: getDefaultPath() ?: return@launch
|
|
477
|
+
mainScope.launchConfigurationStart(value.path, browserManager::queryTabs) { path ->
|
|
465
478
|
try {
|
|
466
479
|
browserManager.navigate(path)
|
|
467
480
|
} catch (e: CancellationException) {
|
|
@@ -489,7 +502,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
489
502
|
path: String,
|
|
490
503
|
): FormattedNavigationError {
|
|
491
504
|
val default = defaultFormattedError(error)
|
|
492
|
-
val formatter =
|
|
505
|
+
val formatter = configuration.formatNavigationError ?: return default
|
|
493
506
|
return formattedOrDefault(default) {
|
|
494
507
|
formatter(
|
|
495
508
|
FormatNavigationErrorParams(
|
|
@@ -739,7 +752,10 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
739
752
|
}
|
|
740
753
|
|
|
741
754
|
override fun setFavorites(favorites: Array<String>) {
|
|
742
|
-
|
|
755
|
+
runBlockingOnMain {
|
|
756
|
+
val change = browserManager.setFavorites(favorites.toList()) ?: return@runBlockingOnMain
|
|
757
|
+
connectedPlayer?.applyFavoriteChange(change)
|
|
758
|
+
}
|
|
743
759
|
}
|
|
744
760
|
|
|
745
761
|
// MARK: Gate
|
|
@@ -1063,7 +1079,8 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1063
1079
|
|
|
1064
1080
|
override fun supportsOutputSwitcher(): Boolean = OutputSwitcher.isSupported()
|
|
1065
1081
|
|
|
1066
|
-
|
|
1082
|
+
// The Output Switcher is a system dialog with no position.
|
|
1083
|
+
override fun openOutputPicker(anchor: OutputPickerAnchor?) {
|
|
1067
1084
|
OutputSwitcher.open(context)
|
|
1068
1085
|
}
|
|
1069
1086
|
|
|
@@ -1498,6 +1515,7 @@ private fun NativeBrowserConfiguration.strippingJSCallbacks() =
|
|
|
1498
1515
|
viewMoreTitle = null,
|
|
1499
1516
|
resolveAlbumPath = null,
|
|
1500
1517
|
formatNavigationError = null,
|
|
1518
|
+
findTrack = null,
|
|
1501
1519
|
request = request?.strippingJSCallbacks(),
|
|
1502
1520
|
browse = browse?.strippingJSCallbacks(),
|
|
1503
1521
|
media = media?.strippingJSCallbacks(),
|
|
@@ -1636,3 +1654,20 @@ private fun httpStatusText(statusCode: Int): String {
|
|
|
1636
1654
|
else -> "Server Error"
|
|
1637
1655
|
}
|
|
1638
1656
|
}
|
|
1657
|
+
|
|
1658
|
+
/**
|
|
1659
|
+
* Starts a configuration: queries the tabs, and navigates to [configuredPath], else the first
|
|
1660
|
+
* tab's, else "/". A failed tabs query keeps the previous tabs and falls back as if there were
|
|
1661
|
+
* none. Cancelling the returned navigation, as a later navigation does, leaves the tabs query
|
|
1662
|
+
* running.
|
|
1663
|
+
*/
|
|
1664
|
+
internal fun CoroutineScope.launchConfigurationStart(
|
|
1665
|
+
configuredPath: String?,
|
|
1666
|
+
queryTabs: suspend () -> Array<Track>,
|
|
1667
|
+
navigate: suspend (String) -> Unit,
|
|
1668
|
+
): Job {
|
|
1669
|
+
val tabs = async {
|
|
1670
|
+
runCatching { queryTabs() }.onFailure { Timber.e(it, "Querying the tabs failed") }.getOrNull()
|
|
1671
|
+
}
|
|
1672
|
+
return launch { navigate(configuredPath ?: tabs.await()?.firstOrNull()?.path ?: "/") }
|
|
1673
|
+
}
|
|
@@ -5,14 +5,14 @@ package com.audiobrowser.browser
|
|
|
5
5
|
* serves. Thread-safe: written from browse coroutines, read from the provider's IO scope.
|
|
6
6
|
*/
|
|
7
7
|
class BrowseArtworkRegistry(
|
|
8
|
-
// Entries hold plain data, no JS closures (unlike [ArtworkResolutionRegistry]), so they are cheap
|
|
9
|
-
// to keep many of.
|
|
10
8
|
private val maxEntries: Int = 2048,
|
|
11
9
|
private val maxPinnedEntries: Int = 2048,
|
|
10
|
+
// A `data:` URL is its own payload, so entries are also bounded by the characters they hold.
|
|
11
|
+
private val maxUrlChars: Int = 4_000_000,
|
|
12
12
|
) {
|
|
13
13
|
|
|
14
|
-
private val entries =
|
|
15
|
-
private val pinned =
|
|
14
|
+
private val entries = Lru(maxEntries, maxUrlChars)
|
|
15
|
+
private val pinned = Lru(maxPinnedEntries, maxUrlChars)
|
|
16
16
|
|
|
17
17
|
@Synchronized
|
|
18
18
|
fun register(token: String, artwork: ResolvedArtwork) {
|
|
@@ -33,13 +33,29 @@ class BrowseArtworkRegistry(
|
|
|
33
33
|
/** Drops the [register]ed entries; [pin]ned ones stay. */
|
|
34
34
|
@Synchronized fun clear() = entries.clear()
|
|
35
35
|
|
|
36
|
-
|
|
36
|
+
/** Least recently used first out, past [maxEntries] or [maxUrlChars]; the newest always stays. */
|
|
37
|
+
private class Lru(private val maxEntries: Int, private val maxUrlChars: Int) {
|
|
37
38
|
// Access order, so a lookup keeps an entry from eviction.
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
private val map = LinkedHashMap<String, ResolvedArtwork>(16, 0.75f, true)
|
|
40
|
+
private var urlChars = 0L
|
|
41
|
+
|
|
42
|
+
operator fun get(token: String): ResolvedArtwork? = map[token]
|
|
43
|
+
|
|
44
|
+
operator fun set(token: String, artwork: ResolvedArtwork) {
|
|
45
|
+
map.put(token, artwork)?.let { urlChars -= it.finalUrl.length }
|
|
46
|
+
urlChars += artwork.finalUrl.length
|
|
47
|
+
val eldest = map.entries.iterator()
|
|
48
|
+
while (map.size > 1 && (map.size > maxEntries || urlChars > maxUrlChars)) {
|
|
49
|
+
urlChars -= eldest.next().value.finalUrl.length
|
|
50
|
+
eldest.remove()
|
|
51
|
+
}
|
|
42
52
|
}
|
|
53
|
+
|
|
54
|
+
fun clear() {
|
|
55
|
+
map.clear()
|
|
56
|
+
urlChars = 0
|
|
57
|
+
}
|
|
58
|
+
}
|
|
43
59
|
}
|
|
44
60
|
|
|
45
61
|
/** Everything the provider needs to fetch one artwork. */
|