react-native-audio-browser 1.0.0-next.5 → 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 +14 -2
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
- 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/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
- 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/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/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- 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/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/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 +3 -2
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Player/Player.swift +4 -2
- package/ios/Tests/AwaitCallbackTests.swift +8 -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/PlayerPolicyTests.swift +19 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/RequestLayerTests.swift +5 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/Support/TestTypes.swift +14 -0
- 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/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/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/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++/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/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/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/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/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/gate.md +1 -1
|
@@ -19,6 +19,7 @@ import androidx.media3.datasource.cache.SimpleCache
|
|
|
19
19
|
import androidx.media3.exoplayer.ExoPlayer
|
|
20
20
|
import androidx.media3.session.MediaLibraryService
|
|
21
21
|
import androidx.media3.session.MediaSession
|
|
22
|
+
import androidx.media3.session.SessionError
|
|
22
23
|
import com.audiobrowser.AudioBrowser
|
|
23
24
|
import com.audiobrowser.Callbacks
|
|
24
25
|
import com.audiobrowser.browser.FavoriteChange
|
|
@@ -32,6 +33,7 @@ import com.audiobrowser.extension.identity
|
|
|
32
33
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
33
34
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
34
35
|
import com.audiobrowser.model.RetryPolicy
|
|
36
|
+
import com.audiobrowser.navigationErrorFor
|
|
35
37
|
import com.audiobrowser.remote.RemoteOutputsController
|
|
36
38
|
import com.audiobrowser.remote.RemotePlayback
|
|
37
39
|
import com.audiobrowser.remote.RemoteUrls
|
|
@@ -49,6 +51,7 @@ import com.audiobrowser.util.TrackFactory
|
|
|
49
51
|
import com.audiobrowser.util.TrackFactory.setFavorite
|
|
50
52
|
import com.audiobrowser.util.awaitOrTimeout
|
|
51
53
|
import com.audiobrowser.util.isAutomotive
|
|
54
|
+
import com.audiobrowser.util.withTimeoutAsFailure
|
|
52
55
|
import com.margelo.nitro.audiobrowser.AppKilledPlaybackBehavior
|
|
53
56
|
import com.margelo.nitro.audiobrowser.FavoriteChangedEvent
|
|
54
57
|
import com.margelo.nitro.audiobrowser.GateEvent
|
|
@@ -56,6 +59,8 @@ import com.margelo.nitro.audiobrowser.GateReason
|
|
|
56
59
|
import com.margelo.nitro.audiobrowser.ImageContext
|
|
57
60
|
import com.margelo.nitro.audiobrowser.ImageSource
|
|
58
61
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
62
|
+
import com.margelo.nitro.audiobrowser.NavigationError
|
|
63
|
+
import com.margelo.nitro.audiobrowser.NavigationErrorType
|
|
59
64
|
import com.margelo.nitro.audiobrowser.NowPlayingMetadata
|
|
60
65
|
import com.margelo.nitro.audiobrowser.Playback
|
|
61
66
|
import com.margelo.nitro.audiobrowser.PlaybackError
|
|
@@ -70,16 +75,17 @@ import com.margelo.nitro.audiobrowser.Track
|
|
|
70
75
|
import java.io.File
|
|
71
76
|
import java.io.IOException
|
|
72
77
|
import java.util.concurrent.TimeUnit
|
|
78
|
+
import java.util.concurrent.TimeoutException
|
|
79
|
+
import kotlin.time.Duration
|
|
73
80
|
import kotlin.time.Duration.Companion.seconds
|
|
81
|
+
import kotlinx.coroutines.CancellationException
|
|
74
82
|
import kotlinx.coroutines.CompletableDeferred
|
|
75
83
|
import kotlinx.coroutines.CoroutineScope
|
|
76
84
|
import kotlinx.coroutines.Dispatchers
|
|
77
85
|
import kotlinx.coroutines.MainScope
|
|
78
|
-
import kotlinx.coroutines.TimeoutCancellationException
|
|
79
86
|
import kotlinx.coroutines.currentCoroutineContext
|
|
80
87
|
import kotlinx.coroutines.ensureActive
|
|
81
88
|
import kotlinx.coroutines.withContext
|
|
82
|
-
import kotlinx.coroutines.withTimeout
|
|
83
89
|
import timber.log.Timber
|
|
84
90
|
|
|
85
91
|
/**
|
|
@@ -107,9 +113,15 @@ internal constructor(
|
|
|
107
113
|
internal val context: Context,
|
|
108
114
|
castRemote: (Context, String?) -> RemotePlayback?,
|
|
109
115
|
sonosRemote: (Context, CoroutineScope) -> RemotePlayback,
|
|
116
|
+
private val browserRegistrationTimeout: Duration = 10.seconds,
|
|
110
117
|
) {
|
|
111
118
|
constructor(context: Context) : this(context, ::createCastRemote, ::SonosRemote)
|
|
112
119
|
|
|
120
|
+
internal constructor(
|
|
121
|
+
context: Context,
|
|
122
|
+
browserRegistrationTimeout: Duration,
|
|
123
|
+
) : this(context, ::createCastRemote, ::SonosRemote, browserRegistrationTimeout)
|
|
124
|
+
|
|
113
125
|
val appKilledPlaybackBehavior: AppKilledPlaybackBehavior
|
|
114
126
|
get() = options.appKilledPlaybackBehavior
|
|
115
127
|
|
|
@@ -225,7 +237,7 @@ internal constructor(
|
|
|
225
237
|
PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
|
|
226
238
|
)
|
|
227
239
|
)
|
|
228
|
-
|
|
240
|
+
stopEngine()
|
|
229
241
|
}
|
|
230
242
|
}
|
|
231
243
|
|
|
@@ -317,13 +329,15 @@ internal constructor(
|
|
|
317
329
|
/**
|
|
318
330
|
* The browser [notifyBrowserConfigurationReady] registered, waiting for it if none is.
|
|
319
331
|
*
|
|
320
|
-
* @throws
|
|
332
|
+
* @throws TimeoutException if it is not registered within [browserRegistrationTimeout]
|
|
321
333
|
*/
|
|
322
334
|
suspend fun awaitBrowser(): AudioBrowser =
|
|
323
335
|
try {
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
336
|
+
withTimeoutAsFailure(browserRegistrationTimeout, "Browser registration") {
|
|
337
|
+
browserRegistered.await()
|
|
338
|
+
}
|
|
339
|
+
} catch (e: TimeoutException) {
|
|
340
|
+
Timber.e(e)
|
|
327
341
|
throw e
|
|
328
342
|
}
|
|
329
343
|
|
|
@@ -507,6 +521,14 @@ internal constructor(
|
|
|
507
521
|
var queueVersion = 0
|
|
508
522
|
private set
|
|
509
523
|
|
|
524
|
+
/**
|
|
525
|
+
* Moves whenever the app replaces what plays: a new queue, a load, a skip or a clear. Not on an
|
|
526
|
+
* edit that leaves the playing item playing, such as adding up next or restamping a track.
|
|
527
|
+
*/
|
|
528
|
+
@Volatile
|
|
529
|
+
internal var playGeneration = 0
|
|
530
|
+
private set
|
|
531
|
+
|
|
510
532
|
private var reportedTracks = emptyList<Track>()
|
|
511
533
|
|
|
512
534
|
/**
|
|
@@ -639,6 +661,7 @@ internal constructor(
|
|
|
639
661
|
loadControl = engine.loadControl
|
|
640
662
|
mediaFactory = engine.mediaFactory
|
|
641
663
|
exoPlayer = engine.exoPlayer
|
|
664
|
+
exoPlayer.addListener(engineTrackChanges)
|
|
642
665
|
// A reconnect the old loop held between connections: the engine is carried idle and unprepared.
|
|
643
666
|
val heldIdle = retryLoop?.reconnecting == true && localEngine.isActive
|
|
644
667
|
retryLoop?.suspend()
|
|
@@ -725,6 +748,7 @@ internal constructor(
|
|
|
725
748
|
|
|
726
749
|
/** Replaces the current track, keeping the rest of the queue; on an empty queue, adds it. */
|
|
727
750
|
fun load(track: Track) {
|
|
751
|
+
playGeneration++
|
|
728
752
|
if (sessionPlayer.mediaItemCount == 0) {
|
|
729
753
|
add(track)
|
|
730
754
|
} else {
|
|
@@ -746,6 +770,7 @@ internal constructor(
|
|
|
746
770
|
fun add(tracks: Array<Track>, atIndex: Int = -1) {
|
|
747
771
|
validateInsertIndex(atIndex)
|
|
748
772
|
val count = sessionPlayer.mediaItemCount
|
|
773
|
+
if (count == 0) playGeneration++
|
|
749
774
|
sessionPlayer.addMediaItems(
|
|
750
775
|
if (atIndex == -1) count else atIndex,
|
|
751
776
|
TrackFactory.toMedia3(tracks),
|
|
@@ -774,6 +799,7 @@ internal constructor(
|
|
|
774
799
|
* rebuild carries an ended engine idle, and it stays ended as an ended engine does.
|
|
775
800
|
*/
|
|
776
801
|
private inline fun loadAfter(move: () -> Unit) {
|
|
802
|
+
playGeneration++
|
|
777
803
|
val index = sessionPlayer.currentMediaItemIndex
|
|
778
804
|
move()
|
|
779
805
|
if (playbackState == PlaybackState.ENDED && sessionPlayer.currentMediaItemIndex == index) return
|
|
@@ -793,6 +819,7 @@ internal constructor(
|
|
|
793
819
|
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
794
820
|
fun skipTo(index: Int) {
|
|
795
821
|
validateIndex(index)
|
|
822
|
+
playGeneration++
|
|
796
823
|
sessionPlayer.seekTo(index, C.TIME_UNSET)
|
|
797
824
|
sessionPlayer.prepare()
|
|
798
825
|
}
|
|
@@ -803,6 +830,7 @@ internal constructor(
|
|
|
803
830
|
startPositionMs: Long = 0,
|
|
804
831
|
sourcePath: String? = null,
|
|
805
832
|
) {
|
|
833
|
+
playGeneration++
|
|
806
834
|
val mediaItems = TrackFactory.toMedia3(tracks).toMutableList()
|
|
807
835
|
sessionPlayer.setMediaItems(mediaItems, startIndex, startPositionMs)
|
|
808
836
|
leadShuffleOrder(startIndex, mediaItems.size)
|
|
@@ -1079,7 +1107,8 @@ internal constructor(
|
|
|
1079
1107
|
browserManager.displayArtworkSource(uri, imageContext)?.let {
|
|
1080
1108
|
return it
|
|
1081
1109
|
}
|
|
1082
|
-
//
|
|
1110
|
+
// The queue may publish provider URIs (see sessionArtworkUri); the resolutions are keyed by
|
|
1111
|
+
// URL.
|
|
1083
1112
|
TrackFactory.artworkRoutes
|
|
1084
1113
|
?.publicUrl(uri.toUri())
|
|
1085
1114
|
?.takeIf { it != uri }
|
|
@@ -1134,11 +1163,15 @@ internal constructor(
|
|
|
1134
1163
|
*/
|
|
1135
1164
|
suspend fun playFromSearch(params: SearchParams): Boolean {
|
|
1136
1165
|
return try {
|
|
1137
|
-
val tracks = voiceSearch(params)
|
|
1166
|
+
val tracks = voiceSearch(params)
|
|
1138
1167
|
Timber.d("Found ${tracks.size} track(s), playing first: ${tracks[0].title}")
|
|
1139
1168
|
setQueue(tracks)
|
|
1140
1169
|
play()
|
|
1141
1170
|
true
|
|
1171
|
+
} catch (e: RequestGatedException) {
|
|
1172
|
+
false
|
|
1173
|
+
} catch (e: VoiceSearchFailedException) {
|
|
1174
|
+
false
|
|
1142
1175
|
} catch (e: Exception) {
|
|
1143
1176
|
currentCoroutineContext().ensureActive()
|
|
1144
1177
|
Timber.e(e, "Error handling voice search: ${params}")
|
|
@@ -1148,12 +1181,16 @@ internal constructor(
|
|
|
1148
1181
|
|
|
1149
1182
|
/**
|
|
1150
1183
|
* The playable results of a voice search, from the first. Gated like browsing, or voice search
|
|
1151
|
-
* would be a way around the gate.
|
|
1184
|
+
* would be a way around the gate. A search that finds nothing playable, or fails, tells
|
|
1185
|
+
* controllers why in the app's words for a search (ADR 0001), offline as offline, as a non-fatal
|
|
1186
|
+
* error: what played keeps playing.
|
|
1152
1187
|
*
|
|
1153
|
-
* @
|
|
1154
|
-
* @throws
|
|
1188
|
+
* @throws RequestGatedException when gated, after onGate
|
|
1189
|
+
* @throws VoiceSearchFailedException when nothing playable is found or the search fails, after
|
|
1190
|
+
* the SessionError
|
|
1191
|
+
* @throws Exception when the browser is not registered in time
|
|
1155
1192
|
*/
|
|
1156
|
-
suspend fun voiceSearch(params: SearchParams): Array<Track
|
|
1193
|
+
suspend fun voiceSearch(params: SearchParams): Array<Track> {
|
|
1157
1194
|
val audioBrowser = awaitBrowser()
|
|
1158
1195
|
val gateOutcome =
|
|
1159
1196
|
audioBrowser.gateDecision(
|
|
@@ -1162,14 +1199,45 @@ internal constructor(
|
|
|
1162
1199
|
if (gateOutcome.gated) {
|
|
1163
1200
|
Timber.i("Voice search refused: request is gated")
|
|
1164
1201
|
audioBrowser.onGate(GateEvent(GateReason.SEARCH))
|
|
1165
|
-
|
|
1202
|
+
throw RequestGatedException()
|
|
1166
1203
|
}
|
|
1167
1204
|
Timber.d(
|
|
1168
1205
|
"Executing voice search: mode=${params.mode}, query='${params.query}', artist='${params.artist}', album='${params.album}'"
|
|
1169
1206
|
)
|
|
1170
|
-
|
|
1171
|
-
|
|
1207
|
+
val tracks =
|
|
1208
|
+
try {
|
|
1209
|
+
audioBrowser.browserManager.searchPlayable(params)
|
|
1210
|
+
} catch (e: Exception) {
|
|
1211
|
+
if (e is CancellationException) throw e
|
|
1212
|
+
Timber.e(e, "Voice search failed: $params")
|
|
1213
|
+
sendSearchError(audioBrowser, params, offlineErrorOr { navigationErrorFor(e) })
|
|
1214
|
+
throw VoiceSearchFailedException("Voice search failed: $params", e)
|
|
1215
|
+
}
|
|
1216
|
+
if (tracks == null) {
|
|
1217
|
+
Timber.w("No tracks found for search: ${params}")
|
|
1218
|
+
// Offline, no result most likely means the search could not reach its source.
|
|
1219
|
+
sendSearchError(audioBrowser, params, offlineErrorOr { emptyContentError() })
|
|
1220
|
+
throw VoiceSearchFailedException("No playable result for: $params")
|
|
1172
1221
|
}
|
|
1222
|
+
return tracks
|
|
1223
|
+
}
|
|
1224
|
+
|
|
1225
|
+
private inline fun offlineErrorOr(error: () -> NavigationError): NavigationError =
|
|
1226
|
+
if (networkMonitor.isOnline.value) error() else offlineError()
|
|
1227
|
+
|
|
1228
|
+
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
|
|
1229
|
+
private suspend fun sendSearchError(
|
|
1230
|
+
audioBrowser: AudioBrowser,
|
|
1231
|
+
params: SearchParams,
|
|
1232
|
+
error: NavigationError,
|
|
1233
|
+
) {
|
|
1234
|
+
val formatted =
|
|
1235
|
+
audioBrowser.resolveFormattedError(error, BrowserPathHelper.createSearchPath(params.query))
|
|
1236
|
+
val message = listOfNotNull(formatted.title, formatted.message).joinToString("\n")
|
|
1237
|
+
val code =
|
|
1238
|
+
if (error.code == NavigationErrorType.NETWORK_ERROR) SessionError.ERROR_IO
|
|
1239
|
+
else SessionError.ERROR_UNKNOWN
|
|
1240
|
+
mainHandler.post { mediaSession.sendError(SessionError(code, message)) }
|
|
1173
1241
|
}
|
|
1174
1242
|
|
|
1175
1243
|
/** An ended queue stays ended, as on an ended engine. */
|
|
@@ -1201,13 +1269,14 @@ internal constructor(
|
|
|
1201
1269
|
playWhenReady = false
|
|
1202
1270
|
// The next play is a new Load.
|
|
1203
1271
|
retryLoop?.suspend()
|
|
1204
|
-
sessionPlayer
|
|
1272
|
+
stopEngine(sessionPlayer)
|
|
1205
1273
|
playerListener.fenceOutgoingMetadata()
|
|
1206
1274
|
// Idle at its end, the next prepare would end it again at once.
|
|
1207
1275
|
if (ended) sessionPlayer.seekToDefaultPosition()
|
|
1208
1276
|
}
|
|
1209
1277
|
|
|
1210
1278
|
fun clear() {
|
|
1279
|
+
playGeneration++
|
|
1211
1280
|
sessionPlayer.clearMediaItems()
|
|
1212
1281
|
queueSourcePath = null
|
|
1213
1282
|
}
|
|
@@ -1275,6 +1344,16 @@ internal constructor(
|
|
|
1275
1344
|
retryingErrorGeneration++
|
|
1276
1345
|
}
|
|
1277
1346
|
|
|
1347
|
+
/**
|
|
1348
|
+
* The engine's own transition, heard as the track is set and before it connects. The session's
|
|
1349
|
+
* can come after the connection started: a hand-back from a remote output prepares the engine
|
|
1350
|
+
* before the switch reports it.
|
|
1351
|
+
*/
|
|
1352
|
+
private val engineTrackChanges =
|
|
1353
|
+
object : MediaPlayer.Listener {
|
|
1354
|
+
override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) = dropFailureReports()
|
|
1355
|
+
}
|
|
1356
|
+
|
|
1278
1357
|
private fun showRetryingError(error: PlaybackError) {
|
|
1279
1358
|
// Paused, the retry would run unseen and its failure be terminal. STOPPED, ERROR and ENDED
|
|
1280
1359
|
// reach here only from a post that raced them.
|
|
@@ -1349,17 +1428,28 @@ internal constructor(
|
|
|
1349
1428
|
// Before the stop: the state machine holds PAUSED through the IDLE that follows.
|
|
1350
1429
|
setPlaybackState(PlaybackState.PAUSED)
|
|
1351
1430
|
clearRetryingError()
|
|
1352
|
-
|
|
1431
|
+
stopEngine()
|
|
1353
1432
|
// An engine the loop already holds idle leaves no IDLE for the listener to see.
|
|
1354
1433
|
retryLoop?.engineStopped()
|
|
1355
1434
|
}
|
|
1356
1435
|
|
|
1436
|
+
/** Stops [engine]; an error the local engine delivers before its next prepare is dropped. */
|
|
1437
|
+
private fun stopEngine(engine: MediaPlayer = exoPlayer) {
|
|
1438
|
+
playerListener.engineStopping()
|
|
1439
|
+
engine.stop()
|
|
1440
|
+
}
|
|
1441
|
+
|
|
1442
|
+
/** Drops the retrying error and the failure reports still on their way. */
|
|
1443
|
+
internal fun clearRetryingError() {
|
|
1444
|
+
dropFailureReports()
|
|
1445
|
+
hideRetryingError()
|
|
1446
|
+
}
|
|
1447
|
+
|
|
1357
1448
|
/**
|
|
1358
1449
|
* Drops the retrying error of a track that is gone. The new track may stay LOADING or BUFFERING
|
|
1359
1450
|
* with no state change to emit the clear.
|
|
1360
1451
|
*/
|
|
1361
|
-
internal fun
|
|
1362
|
-
dropFailureReports()
|
|
1452
|
+
internal fun hideRetryingError() {
|
|
1363
1453
|
if (playbackError?.retrying != true) return
|
|
1364
1454
|
playbackError = null
|
|
1365
1455
|
callbacks?.onPlaybackChanged(Playback(playbackState, null))
|
|
@@ -1597,3 +1687,10 @@ internal constructor(
|
|
|
1597
1687
|
var lastQueueVersion = 0
|
|
1598
1688
|
}
|
|
1599
1689
|
}
|
|
1690
|
+
|
|
1691
|
+
/** A request the consumer's gate refused: app state, which onGate reports, not a failure. */
|
|
1692
|
+
internal class RequestGatedException : IllegalStateException("Request is gated")
|
|
1693
|
+
|
|
1694
|
+
/** A voice search that played nothing, whose SessionError has already told controllers why. */
|
|
1695
|
+
internal class VoiceSearchFailedException(message: String, cause: Throwable? = null) :
|
|
1696
|
+
IllegalStateException(message, cause)
|
|
@@ -30,6 +30,12 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
30
30
|
|
|
31
31
|
@MediaPlayer.State private var lastEngineState = MediaPlayer.STATE_IDLE
|
|
32
32
|
|
|
33
|
+
/**
|
|
34
|
+
* From the library's stop of the local engine until the engine leaves idle. An error it delivers
|
|
35
|
+
* meanwhile is the ended connection's: its playback thread was still failing it at the stop.
|
|
36
|
+
*/
|
|
37
|
+
private var connectionEnded = false
|
|
38
|
+
|
|
33
39
|
/**
|
|
34
40
|
* Set from an app-started command that ends the stream until the playback thread has handled it.
|
|
35
41
|
* Until then every metadata delivery is the outgoing stream's: its renderer posted them to the
|
|
@@ -126,7 +132,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
126
132
|
player.startRetryLoad()
|
|
127
133
|
|
|
128
134
|
// Emits on its own: the incoming track may hold LOADING/BUFFERING and emit no state change.
|
|
129
|
-
player.
|
|
135
|
+
player.hideRetryingError()
|
|
130
136
|
|
|
131
137
|
player.playbackStateStore.save()
|
|
132
138
|
player.playbackStateStore.resetPeriodicSave()
|
|
@@ -137,9 +143,14 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
137
143
|
player.retryLoop?.isPlayingChanged(isPlaying && !player.retryMasksPlaying)
|
|
138
144
|
}
|
|
139
145
|
|
|
146
|
+
internal fun engineStopping() {
|
|
147
|
+
if (player.localEngine.isActive) connectionEnded = true
|
|
148
|
+
}
|
|
149
|
+
|
|
140
150
|
/** A new engine or session player is attached: what this listener knew of the old one is gone. */
|
|
141
151
|
internal fun engineAttached() {
|
|
142
152
|
lastEngineState = player.exoPlayer.playbackState
|
|
153
|
+
connectionEnded = false
|
|
143
154
|
localActive = player.localEngine.isActive
|
|
144
155
|
}
|
|
145
156
|
|
|
@@ -179,6 +190,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
179
190
|
val engineState = player.sessionPlayer.playbackState
|
|
180
191
|
val left = lastEngineState == MediaPlayer.STATE_IDLE && engineState != MediaPlayer.STATE_IDLE
|
|
181
192
|
lastEngineState = engineState
|
|
193
|
+
if (left) connectionEnded = false
|
|
182
194
|
val loop = player.retryLoop
|
|
183
195
|
// A prepare: the retry's reconnect, or the listener's play, which after a give-up or a stop is
|
|
184
196
|
// a new Load.
|
|
@@ -243,6 +255,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
243
255
|
}
|
|
244
256
|
|
|
245
257
|
override fun onPlayerError(error: PlaybackException) {
|
|
258
|
+
if (connectionEnded) return
|
|
246
259
|
if (player.localEngine.isActive && recoverLocally(error)) return
|
|
247
260
|
surface(error)
|
|
248
261
|
}
|
|
@@ -58,7 +58,7 @@ internal class RetryLoop(
|
|
|
58
58
|
|
|
59
59
|
/**
|
|
60
60
|
* Whether the policy reported the current connection's end. Outlives [failedAtMs] when the engine
|
|
61
|
-
* is stopped
|
|
61
|
+
* is stopped: a report still on its way is the stopped connection's.
|
|
62
62
|
*/
|
|
63
63
|
private var endReported = false
|
|
64
64
|
|
|
@@ -8,6 +8,7 @@ import androidx.media3.common.Metadata
|
|
|
8
8
|
import androidx.media3.common.PlaybackException
|
|
9
9
|
import androidx.media3.common.Player as MediaPlayer
|
|
10
10
|
import androidx.media3.common.SimpleBasePlayer
|
|
11
|
+
import androidx.media3.common.SimpleBasePlayer.PositionSupplier
|
|
11
12
|
import androidx.media3.common.Timeline
|
|
12
13
|
import com.google.common.util.concurrent.Futures
|
|
13
14
|
import com.google.common.util.concurrent.ListenableFuture
|
|
@@ -98,8 +99,14 @@ internal class RemoteSwitchingPlayer(
|
|
|
98
99
|
/** [item] went to the receiver, which doesn't report holding it yet. */
|
|
99
100
|
class Sent(val item: MediaItem, val positionMs: Long) : Load
|
|
100
101
|
|
|
101
|
-
/**
|
|
102
|
-
|
|
102
|
+
/**
|
|
103
|
+
* The receiver holds [item]: what it reports is the current item's. [lastPosition] is where it
|
|
104
|
+
* last reported [item] loaded, running on while it played; until then, where it was sent from.
|
|
105
|
+
*/
|
|
106
|
+
class Playing(val item: MediaItem, var lastPosition: PositionSupplier) : Load {
|
|
107
|
+
/** Whether the receiver has reported [item] past its first buffering. */
|
|
108
|
+
var wasReady = false
|
|
109
|
+
}
|
|
103
110
|
|
|
104
111
|
class Failed(val error: PlaybackException, val positionMs: Long) : Load
|
|
105
112
|
|
|
@@ -172,11 +179,42 @@ internal class RemoteSwitchingPlayer(
|
|
|
172
179
|
val remote = remoteRoute ?: return
|
|
173
180
|
if (player !== remote.receiver) return
|
|
174
181
|
val changed = followReceiver(remote)
|
|
182
|
+
noteReport(remote)
|
|
175
183
|
if (remote.startTimeout != null && started(remote)) disarmStart(remote)
|
|
176
184
|
if (changed) invalidateState()
|
|
177
185
|
}
|
|
178
186
|
}
|
|
179
187
|
|
|
188
|
+
private fun noteReport(remote: Route.Remote) {
|
|
189
|
+
val load = remote.load as? Load.Playing ?: return
|
|
190
|
+
if (!reportsPosition(remote, load)) {
|
|
191
|
+
// Where it stopped reporting is the last it can be known to have played to.
|
|
192
|
+
load.lastPosition = PositionSupplier.getConstant(load.lastPosition.get())
|
|
193
|
+
return
|
|
194
|
+
}
|
|
195
|
+
val receiver = remote.receiver
|
|
196
|
+
// Cast reports a load buffering at 0 before its first PLAYING or PAUSED (Media3's ready) at
|
|
197
|
+
// the position it was sent from.
|
|
198
|
+
if (receiver.playbackState != STATE_BUFFERING) load.wasReady = true
|
|
199
|
+
else if (!load.wasReady) return
|
|
200
|
+
val running =
|
|
201
|
+
PositionSupplier.getExtrapolating(
|
|
202
|
+
receiver.currentPosition,
|
|
203
|
+
if (receiver.isPlaying) receiver.playbackParameters.speed else 0f,
|
|
204
|
+
)
|
|
205
|
+
val durationMs = receiver.duration
|
|
206
|
+
load.lastPosition =
|
|
207
|
+
if (durationMs == C.TIME_UNSET) running
|
|
208
|
+
else PositionSupplier { minOf(running.get(), durationMs) }
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
/**
|
|
212
|
+
* Whether the receiver holds [load]'s item, not idle, so that its position is the item's. Cast's
|
|
213
|
+
* player takes a failed status, idle at 0, before the failure is reported.
|
|
214
|
+
*/
|
|
215
|
+
private fun reportsPosition(remote: Route.Remote, load: Load.Playing): Boolean =
|
|
216
|
+
receiverHolds(remote, load.item) && remote.receiver.playbackState != STATE_IDLE
|
|
217
|
+
|
|
180
218
|
private fun enter(remote: Route.Remote, load: Load) {
|
|
181
219
|
remote.load = load
|
|
182
220
|
route = remote
|
|
@@ -317,8 +355,11 @@ internal class RemoteSwitchingPlayer(
|
|
|
317
355
|
is Load.Sent -> load.positionMs
|
|
318
356
|
is Load.Failed -> load.positionMs
|
|
319
357
|
is Load.Playing ->
|
|
320
|
-
|
|
321
|
-
|
|
358
|
+
when {
|
|
359
|
+
load.item.isRemoteLive -> C.TIME_UNSET
|
|
360
|
+
reportsPosition(remote, load) -> remote.receiver.currentPosition
|
|
361
|
+
else -> load.lastPosition.get()
|
|
362
|
+
}
|
|
322
363
|
is Load.Ended -> C.TIME_UNSET
|
|
323
364
|
}
|
|
324
365
|
|
|
@@ -445,6 +486,8 @@ internal class RemoteSwitchingPlayer(
|
|
|
445
486
|
private fun onReceiverPlaying() {
|
|
446
487
|
val remote = remoteRoute ?: return
|
|
447
488
|
val changed = followReceiver(remote)
|
|
489
|
+
// Sonos reports each poll this way, a seek made in its own app included.
|
|
490
|
+
noteReport(remote)
|
|
448
491
|
when (remote.load) {
|
|
449
492
|
is Load.Playing -> {
|
|
450
493
|
remote.reportedPlaying = true
|
|
@@ -541,7 +584,9 @@ internal class RemoteSwitchingPlayer(
|
|
|
541
584
|
.setContentPositionMs(position(load.positionMs))
|
|
542
585
|
is Load.Ended ->
|
|
543
586
|
setPlaybackState(STATE_ENDED).setContentPositionMs(position(load.positionMs))
|
|
544
|
-
is Load.Playing ->
|
|
587
|
+
is Load.Playing ->
|
|
588
|
+
if (!holds)
|
|
589
|
+
setPlaybackState(STATE_IDLE).setContentPositionMs(position(positionOn(remote)))
|
|
545
590
|
}
|
|
546
591
|
if (queue.isEmpty) setPlaybackState(STATE_IDLE)
|
|
547
592
|
if (pendingAutoTransition) {
|
|
@@ -574,7 +619,7 @@ internal class RemoteSwitchingPlayer(
|
|
|
574
619
|
when (val load = remote.load) {
|
|
575
620
|
is Load.Sent ->
|
|
576
621
|
if (receiverHolds(remote, load.item)) {
|
|
577
|
-
remote.load = Load.Playing(load.item)
|
|
622
|
+
remote.load = Load.Playing(load.item, PositionSupplier.getConstant(load.positionMs))
|
|
578
623
|
playIntent = remote.receiver.playWhenReady
|
|
579
624
|
if (remote.reportedPlaying) disarmStart(remote)
|
|
580
625
|
return true
|
|
@@ -608,7 +653,7 @@ internal class RemoteSwitchingPlayer(
|
|
|
608
653
|
when (val load = remote.load) {
|
|
609
654
|
is Load.Idle -> load(remote, load.positionMs)
|
|
610
655
|
is Load.Failed -> load(remote, load.positionMs)
|
|
611
|
-
is Load.Playing -> if (!receiverHolds(remote, load.item)) load(remote,
|
|
656
|
+
is Load.Playing -> if (!receiverHolds(remote, load.item)) load(remote, positionOn(remote))
|
|
612
657
|
else -> Unit
|
|
613
658
|
}
|
|
614
659
|
return done()
|
|
@@ -19,7 +19,7 @@ import timber.log.Timber
|
|
|
19
19
|
* Serves browse artwork to Android Auto and AAOS as PNG files. It is exported because both run in
|
|
20
20
|
* another uid and Media3 issues no URI grant. So it never fetches a URL the caller supplies: the
|
|
21
21
|
* URI carries an opaque token, and only a token in [com.audiobrowser.browser.BrowseArtworkRegistry]
|
|
22
|
-
* whose URL is
|
|
22
|
+
* whose URL is [ArtworkUris.isServable] resolves; anything else returns null.
|
|
23
23
|
*
|
|
24
24
|
* The response is an on-disk file in [ARTWORK_SUBDIR], not a pipe: the car's image loader seeks and
|
|
25
25
|
* reads statSize, which a pipe reports as -1. The file doubles as the cache, keyed by token.
|
|
@@ -36,8 +36,7 @@ class ArtworkContentProvider : ContentProvider() {
|
|
|
36
36
|
val token = ArtworkUris.parseToken(uri) ?: return null
|
|
37
37
|
val deps = CoilArtworkLoaderHolder.get() ?: return null
|
|
38
38
|
val art: ResolvedArtwork = deps.registry.lookup(token) ?: return null
|
|
39
|
-
|
|
40
|
-
if (scheme != "http" && scheme != "https") return null
|
|
39
|
+
if (!ArtworkUris.isServable(Uri.parse(art.finalUrl))) return null
|
|
41
40
|
|
|
42
41
|
val artworkDir = File(context!!.cacheDir, ARTWORK_SUBDIR)
|
|
43
42
|
val file = File(artworkDir, "$token.png")
|
|
@@ -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
|
}
|