react-native-audio-browser 0.2.0-next.75 → 0.2.0-next.77

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.
Files changed (68) hide show
  1. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +20 -27
  2. package/android/src/main/java/com/audiobrowser/Service.kt +3 -0
  3. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +16 -8
  4. package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -3
  5. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +10 -2
  6. package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +9 -5
  7. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +71 -39
  8. package/android/src/main/java/com/audiobrowser/player/LiveStreamExtractor.kt +65 -0
  9. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +12 -3
  10. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +8 -0
  11. package/android/src/main/java/com/audiobrowser/player/Player.kt +85 -37
  12. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +38 -11
  13. package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +1 -1
  14. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +21 -0
  15. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +45 -0
  16. package/android/src/test/java/androidx/media3/session/SessionViews.kt +10 -0
  17. package/android/src/test/java/com/audiobrowser/GateDecisionTest.kt +128 -0
  18. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +93 -0
  19. package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +35 -0
  20. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +75 -5
  21. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +42 -0
  22. package/android/src/test/java/com/audiobrowser/browser/TrackLoadHandlerTest.kt +43 -0
  23. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +62 -0
  24. package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +31 -32
  25. package/android/src/test/java/com/audiobrowser/player/LiveStreamEndTest.kt +372 -0
  26. package/android/src/test/java/com/audiobrowser/player/NowPlayingFormatterTest.kt +75 -0
  27. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +25 -0
  28. package/android/src/test/java/com/audiobrowser/player/PlayFromSearchTest.kt +108 -0
  29. package/android/src/test/java/com/audiobrowser/player/PlayerSetupEndedTest.kt +221 -0
  30. package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +17 -7
  31. package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +183 -7
  32. package/android/src/test/java/com/audiobrowser/player/PlayerTrackChangeTest.kt +153 -0
  33. package/android/src/test/java/com/audiobrowser/player/SessionPlayTest.kt +236 -0
  34. package/android/src/test/java/com/audiobrowser/player/SessionViewRulesTest.kt +62 -0
  35. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +188 -0
  36. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +11 -0
  37. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +58 -0
  38. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +136 -0
  39. package/android/src/test/java/com/audiobrowser/util/JsPromise.kt +44 -0
  40. package/ios/AVPlayerEngine.swift +5 -1
  41. package/ios/Browser/BrowserManager.swift +2 -2
  42. package/ios/Browser/PageResolver.swift +14 -19
  43. package/ios/Browser/RequestPipeline.swift +6 -4
  44. package/ios/CarPlay/CarPlayNowPlayingManager.swift +1 -1
  45. package/ios/CarPlay/CarPlaySession+PageLoader.swift +1 -0
  46. package/ios/CarPlay/CarPlaySession+TabBar.swift +2 -0
  47. package/ios/Extension/Promise+AwaitCallback.swift +33 -0
  48. package/ios/HybridAudioBrowser+Player.swift +1 -1
  49. package/ios/HybridAudioBrowser.swift +1 -1
  50. package/ios/Player/MediaLoader.swift +1 -1
  51. package/ios/Player/PlaybackFailure.swift +3 -3
  52. package/ios/Player/Player.swift +67 -49
  53. package/ios/Player/PlayerEngine.swift +2 -0
  54. package/ios/Player/RetryLoop.swift +72 -12
  55. package/ios/Tests/AwaitCallbackTests.swift +210 -0
  56. package/ios/Tests/GenerationMemoTests.swift +57 -0
  57. package/ios/Tests/PlaybackFailureTests.swift +7 -0
  58. package/ios/Tests/PlayerPolicyTests.swift +346 -6
  59. package/ios/Tests/PlayerTests.swift +79 -1
  60. package/ios/Tests/RetryLoopTests.swift +30 -5
  61. package/ios/Tests/Support/TestTypes.swift +15 -7
  62. package/ios/Tests/Support/TimeLimit.swift +43 -0
  63. package/ios/Util/AwaitCallback.swift +80 -0
  64. package/ios/Util/GenerationMemo.swift +11 -4
  65. package/package.json +2 -1
  66. package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -63
  67. package/ios/Player/EndOfTrackJudgement.swift +0 -25
  68. package/ios/Tests/EndOfTrackJudgementTests.swift +0 -30
@@ -34,6 +34,8 @@ import com.audiobrowser.util.BrowserPathHelper
34
34
  import com.audiobrowser.util.OutputMonitor
35
35
  import com.audiobrowser.util.OutputSwitcher
36
36
  import com.audiobrowser.util.SystemVolumeMonitor
37
+ import com.audiobrowser.util.awaitNestedOrTimeout
38
+ import com.audiobrowser.util.awaitOrTimeout
37
39
  import com.facebook.proguard.annotations.DoNotStrip
38
40
  import com.google.common.util.concurrent.ListenableFuture
39
41
  import com.margelo.nitro.NitroModules
@@ -91,7 +93,6 @@ import com.margelo.nitro.core.NullType
91
93
  import com.margelo.nitro.core.Promise
92
94
  import java.util.concurrent.TimeUnit
93
95
  import java.util.concurrent.atomic.AtomicReference
94
- import kotlin.time.Duration.Companion.seconds
95
96
  import kotlinx.coroutines.CancellationException
96
97
  import kotlinx.coroutines.CompletableDeferred
97
98
  import kotlinx.coroutines.CoroutineScope
@@ -99,13 +100,12 @@ import kotlinx.coroutines.CoroutineStart
99
100
  import kotlinx.coroutines.DelicateCoroutinesApi
100
101
  import kotlinx.coroutines.Job
101
102
  import kotlinx.coroutines.MainScope
102
- import kotlinx.coroutines.async
103
103
  import kotlinx.coroutines.cancel
104
104
  import kotlinx.coroutines.cancelChildren
105
+ import kotlinx.coroutines.currentCoroutineContext
105
106
  import kotlinx.coroutines.ensureActive
106
107
  import kotlinx.coroutines.launch
107
108
  import kotlinx.coroutines.runBlocking
108
- import kotlinx.coroutines.withTimeoutOrNull
109
109
  import timber.log.Timber
110
110
 
111
111
  @Keep
@@ -489,7 +489,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
489
489
  ): FormattedNavigationError {
490
490
  val default = defaultFormattedError(error)
491
491
  val formatter = _configuration.formatNavigationError ?: return default
492
- return formattedOrDefault(mainScope, default) {
492
+ return formattedOrDefault(default) {
493
493
  formatter(
494
494
  FormatNavigationErrorParams(
495
495
  error,
@@ -498,7 +498,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
498
498
  BrowserPathHelper.navigationErrorKind(path),
499
499
  )
500
500
  )
501
- .await()
501
+ .awaitOrTimeout()
502
502
  }
503
503
  }
504
504
 
@@ -749,15 +749,16 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
749
749
  * Whether [request] is gated, and with which chrome. No active gate allows; a gate without a
750
750
  * resolver gates with its stored chrome and never asks JS. A resolver that throws, rejects or
751
751
  * times out fails closed, gating rather than serving content; only a successful `gated: false`
752
- * allows. Chrome falls back from the resolver's to the stored one to [builtInGate].
752
+ * allows. Chrome falls back from the resolver's to the stored one to [builtInGate]. A caller
753
+ * cancelled while it waits gets the cancellation.
753
754
  */
754
755
  suspend fun gateDecision(request: NativeGateRequest): GateOutcome {
755
756
  val s = gateState
756
757
  if (!s.active) return GateOutcome(false, null)
757
758
  if (!s.hasResolver) return GateOutcome(true, s.chrome ?: builtInGate)
758
- val decision =
759
- runCatching { resolveGate(request).await().await() }.getOrNull()
760
- ?: return GateOutcome(true, s.chrome ?: builtInGate)
759
+ val result = runCatching { resolveGate(request).awaitNestedOrTimeout() }
760
+ currentCoroutineContext().ensureActive()
761
+ val decision = result.getOrNull() ?: return GateOutcome(true, s.chrome ?: builtInGate)
761
762
  if (!decision.gated) return GateOutcome(false, null)
762
763
  return GateOutcome(true, decision.gate ?: s.chrome ?: builtInGate)
763
764
  }
@@ -1158,7 +1159,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
1158
1159
  pendingRepeatMode = null
1159
1160
  }
1160
1161
  pendingPlayWhenReady?.let {
1161
- player.playWhenReady = it
1162
+ player.applySetupPlayWhenReady(it)
1162
1163
  pendingPlayWhenReady = null
1163
1164
  }
1164
1165
  }
@@ -1490,9 +1491,6 @@ private fun NativeRouteEntry.strippingJSCallbacks() =
1490
1491
  artwork = artwork?.strippingJSCallbacks(),
1491
1492
  )
1492
1493
 
1493
- // The budget [Player.awaitBrowser] gives JS, the other JS wait a browse serve blocks on.
1494
- private val FORMATTER_TIMEOUT = 10.seconds
1495
-
1496
1494
  /**
1497
1495
  * The navigation error [e] raises, shared by failed navigations, the rejection
1498
1496
  * [AudioBrowser.search] hands JS and the Android Auto browse-error tile, so one failure is named
@@ -1559,23 +1557,18 @@ internal fun defaultFormattedError(error: NavigationError): FormattedNavigationE
1559
1557
  return FormattedNavigationError(title, error.message.takeIf { it.isNotEmpty() })
1560
1558
  }
1561
1559
 
1562
- /**
1563
- * The app's formatted error from [format], or [default] when it returns null, throws, or outruns
1564
- * [FORMATTER_TIMEOUT].
1565
- *
1566
- * [format] runs in [scope] and is awaited through the Deferred because Nitro's `Promise.await`
1567
- * parks in a plain `suspendCoroutine` that cancellation does not unpark; awaiting the Deferred is
1568
- * cancellable, so the timeout releases the caller instead of holding it until JS answers, which for
1569
- * a browse serve may be never.
1570
- */
1560
+ /** The app's formatted error from [format], or [default] when it returns null or throws. */
1571
1561
  internal suspend fun formattedOrDefault(
1572
- scope: CoroutineScope,
1573
1562
  default: FormattedNavigationError,
1574
1563
  format: suspend () -> FormattedNavigationError?,
1575
- ): FormattedNavigationError {
1576
- val hop = scope.async { runCatching { format() }.getOrNull() }
1577
- return withTimeoutOrNull(FORMATTER_TIMEOUT) { hop.await() } ?: default
1578
- }
1564
+ ): FormattedNavigationError =
1565
+ try {
1566
+ format()
1567
+ } catch (e: CancellationException) {
1568
+ throw e
1569
+ } catch (e: Exception) {
1570
+ null
1571
+ } ?: default
1579
1572
 
1580
1573
  /**
1581
1574
  * Runs [run] in this scope and hands its outcome to [settle] once. Unlike Nitro's `Promise.async`,
@@ -37,6 +37,7 @@ import kotlinx.coroutines.Dispatchers
37
37
  import kotlinx.coroutines.MainScope
38
38
  import kotlinx.coroutines.SupervisorJob
39
39
  import kotlinx.coroutines.cancel
40
+ import kotlinx.coroutines.cancelChildren
40
41
  import kotlinx.coroutines.isActive
41
42
  import timber.log.Timber
42
43
 
@@ -271,6 +272,8 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
271
272
  } else {
272
273
  Timber.d("No car connected - stopping playback, moduleBound = $moduleBound")
273
274
  stopPlaybackAndRemoveNotification()
275
+ // Ends a waiting play-from-search, also while AudioBrowser is bound.
276
+ scope.coroutineContext.cancelChildren()
274
277
  // AudioBrowser keeps the player. Otherwise tear down now: a media controller still bound
275
278
  // keeps the service alive after stopSelf().
276
279
  if (!moduleBound) tearDown()
@@ -8,8 +8,12 @@ import com.audiobrowser.extension.identity
8
8
  import com.audiobrowser.http.HttpClient
9
9
  import com.audiobrowser.http.RequestConfigBuilder
10
10
  import com.audiobrowser.util.BrowserPathHelper
11
+ import com.audiobrowser.util.FALLBACK_TIMEOUT
11
12
  import com.audiobrowser.util.TrackFactory
12
13
  import com.audiobrowser.util.artworkOf
14
+ import com.audiobrowser.util.awaitCancellable
15
+ import com.audiobrowser.util.awaitNested
16
+ import com.audiobrowser.util.awaitOrTimeout
13
17
  import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
14
18
  import com.margelo.nitro.audiobrowser.BrowserSourceCallbackParam
15
19
  import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____
@@ -25,6 +29,7 @@ import com.margelo.nitro.audiobrowser.StyleDisplay
25
29
  import com.margelo.nitro.audiobrowser.Track
26
30
  import com.margelo.nitro.audiobrowser.TransformableRequestConfig
27
31
  import com.margelo.nitro.core.Promise
32
+ import kotlinx.coroutines.CancellationException
28
33
  import kotlinx.coroutines.Dispatchers
29
34
  import kotlinx.coroutines.async
30
35
  import kotlinx.coroutines.awaitAll
@@ -677,6 +682,8 @@ class BrowserManager {
677
682
  "singleTrack=false - returning ${playableTracks.size} playable tracks (from ${sectionTracks.size} in section), starting at index $selectedIndex"
678
683
  )
679
684
  return Pair(playableTracks.toTypedArray(), selectedIndex)
685
+ } catch (e: CancellationException) {
686
+ throw e
680
687
  } catch (e: Exception) {
681
688
  Timber.e(e, "Error expanding queue from contextual path: $contextualPath")
682
689
  return null
@@ -962,13 +969,13 @@ class BrowserManager {
962
969
  // Nitro flattens `(ResolvedTrack | BrowseError) | Promise<BrowseResult>` into three arms.
963
970
  return callback
964
971
  .invoke(param)
965
- .await()
972
+ .awaitCancellable()
966
973
  .match(
967
974
  first = { resolvedTrack -> resolvedTrack },
968
975
  second = { browseError -> throw CallbackException(browseError.error) },
969
976
  third = { promise ->
970
977
  promise
971
- .await()
978
+ .awaitCancellable()
972
979
  .match(
973
980
  first = { resolvedTrack -> resolvedTrack },
974
981
  second = { browseError -> throw CallbackException(browseError.error) },
@@ -1001,9 +1008,7 @@ class BrowserManager {
1001
1008
 
1002
1009
  searchEntry.searchCallback?.let { callback ->
1003
1010
  Timber.d("Resolving search via callback")
1004
- val promise = callback.invoke(params)
1005
- val innerPromise = promise.await()
1006
- return innerPromise.await()
1011
+ return callback.invoke(params).awaitNested()
1007
1012
  }
1008
1013
 
1009
1014
  searchEntry.searchConfig?.let { apiConfig ->
@@ -1036,7 +1041,7 @@ class BrowserManager {
1036
1041
  ): TransformableRequestConfig? {
1037
1042
  if (resolver == null) return staticConfig
1038
1043
  // The TS layer wraps the thunk in Promise.resolve: await the bridge promise, then the JS one.
1039
- return resolver.invoke().await().await()
1044
+ return resolver.invoke().awaitNested()
1040
1045
  }
1041
1046
 
1042
1047
  // No in-flight dedupe: concurrent first requests may both resolve, which is harmless, and a
@@ -1064,14 +1069,17 @@ class BrowserManager {
1064
1069
  /**
1065
1070
  * The title of the "view more" row appended to a pathed section where the header can't be tapped
1066
1071
  * (Android Auto). Re-read once per generation, so invalidateAllContent picks up a new language.
1067
- * Falls back to [DEFAULT_VIEW_MORE_TITLE] when unset, blank or throwing.
1072
+ * Falls back to [DEFAULT_VIEW_MORE_TITLE] when unset, blank, throwing or outrunning
1073
+ * [FALLBACK_TIMEOUT].
1068
1074
  */
1069
1075
  internal suspend fun viewMoreTitle(): String {
1070
1076
  val generation = layerGeneration
1071
1077
  if (resolvedViewMoreTitleGeneration == generation) return resolvedViewMoreTitle
1072
1078
  val title =
1073
1079
  try {
1074
- config.viewMoreTitle?.invoke()?.await()?.takeIf { it.isNotBlank() }
1080
+ config.viewMoreTitle?.invoke()?.awaitOrTimeout()?.takeIf { it.isNotBlank() }
1081
+ } catch (e: CancellationException) {
1082
+ throw e
1075
1083
  } catch (e: Exception) {
1076
1084
  Timber.e(e, "viewMoreTitle callback failed; falling back to the default")
1077
1085
  null
@@ -1,8 +1,10 @@
1
1
  package com.audiobrowser.browser
2
2
 
3
+ import com.audiobrowser.util.awaitNested
3
4
  import com.margelo.nitro.audiobrowser.Track
4
5
  import com.margelo.nitro.audiobrowser.TrackLoadEvent
5
6
  import com.margelo.nitro.core.Promise
7
+ import kotlinx.coroutines.CancellationException
6
8
  import timber.log.Timber
7
9
 
8
10
  /**
@@ -23,9 +25,9 @@ suspend fun <T> handleTrackLoad(
23
25
  if (handler != null) {
24
26
  val event = TrackLoadEvent(track, queue, startIndex)
25
27
  try {
26
- val outerPromise = handler(event)
27
- val innerPromise = outerPromise.await()
28
- innerPromise.await()
28
+ handler(event).awaitNested()
29
+ } catch (e: CancellationException) {
30
+ throw e
29
31
  } catch (e: Exception) {
30
32
  Timber.e(e, "handleTrackLoad failed")
31
33
  }
@@ -1,6 +1,8 @@
1
1
  package com.audiobrowser.http
2
2
 
3
3
  import com.audiobrowser.util.BrowserPathHelper
4
+ import com.audiobrowser.util.awaitCancellable
5
+ import com.audiobrowser.util.awaitNested
4
6
  import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
5
7
  import com.margelo.nitro.audiobrowser.MediaRequestConfig
6
8
  import com.margelo.nitro.audiobrowser.RequestConfig
@@ -8,6 +10,7 @@ import com.margelo.nitro.audiobrowser.Track
8
10
  import com.margelo.nitro.audiobrowser.TransformableRequestConfig
9
11
  import com.margelo.nitro.core.Promise
10
12
  import java.net.URLEncoder
13
+ import kotlinx.coroutines.CancellationException
11
14
  import kotlinx.coroutines.Dispatchers
12
15
  import kotlinx.coroutines.withContext
13
16
  import timber.log.Timber
@@ -58,9 +61,10 @@ object RequestConfigBuilder {
58
61
  * JS promise); awaiting it once hands a Promise downstream as the config.
59
62
  */
60
63
  suspend fun awaitAsyncConfig(promise: Promise<Promise<RequestConfig>>): RequestConfig =
61
- promise.await().await()
64
+ promise.awaitNested()
62
65
 
63
- suspend fun awaitSyncConfig(promise: Promise<RequestConfig>): RequestConfig = promise.await()
66
+ suspend fun awaitSyncConfig(promise: Promise<RequestConfig>): RequestConfig =
67
+ promise.awaitCancellable()
64
68
 
65
69
  private fun MediaRequestConfig.withRequestFields(c: RequestConfig) =
66
70
  MediaRequestConfig(
@@ -104,6 +108,8 @@ object RequestConfigBuilder {
104
108
  override.transform?.let { result = awaitAsyncConfig(it.invoke(result, routeParams)) }
105
109
  override.transformSync?.let { result = awaitSyncConfig(it.invoke(result, routeParams)) }
106
110
  result
111
+ } catch (e: CancellationException) {
112
+ throw e
107
113
  } catch (e: Exception) {
108
114
  Timber.e(e, "Failed to apply transform function, using base config")
109
115
  base
@@ -147,6 +153,8 @@ object RequestConfigBuilder {
147
153
  val asyncResolved = layered.resolve?.let { awaitAsyncConfig(it.invoke(track)) }
148
154
  val syncResolved = layered.resolveSync?.let { awaitSyncConfig(it.invoke(track)) }
149
155
  composeResolved(asyncResolved, syncResolved) ?: return layered
156
+ } catch (e: CancellationException) {
157
+ throw e
150
158
  } catch (e: Exception) {
151
159
  Timber.e(e, "Failed to apply media.resolve, using layered config")
152
160
  return layered
@@ -15,8 +15,8 @@ internal data class EnginePlayback(
15
15
  val mediaItems: List<MediaItem>,
16
16
  val index: Int,
17
17
  /**
18
- * [C.TIME_UNSET] for a live item, so it resumes at the live edge, and for 0, which is also what a
19
- * live item reports before it has loaded.
18
+ * [C.TIME_UNSET] for a live item, so it resumes at the live edge, for 0, which is also what a
19
+ * live item reports before it has loaded, and after the end, so a play restarts the track.
20
20
  */
21
21
  val positionMs: Long,
22
22
  val prepared: Boolean,
@@ -48,9 +48,13 @@ internal data class EnginePlayback(
48
48
  mediaItems = (0 until exoPlayer.mediaItemCount).map { exoPlayer.getMediaItemAt(it) },
49
49
  index = exoPlayer.currentMediaItemIndex,
50
50
  positionMs =
51
- exoPlayer.currentPosition.takeUnless { exoPlayer.isCurrentMediaItemLive || it == 0L }
52
- ?: C.TIME_UNSET,
53
- prepared = exoPlayer.playbackState != MediaPlayer.STATE_IDLE,
51
+ exoPlayer.currentPosition.takeUnless {
52
+ exoPlayer.isCurrentMediaItemLive ||
53
+ it == 0L ||
54
+ exoPlayer.playbackState == MediaPlayer.STATE_ENDED
55
+ } ?: C.TIME_UNSET,
56
+ prepared =
57
+ exoPlayer.playbackState !in setOf(MediaPlayer.STATE_IDLE, MediaPlayer.STATE_ENDED),
54
58
  playWhenReady = exoPlayer.playWhenReady,
55
59
  repeatMode = exoPlayer.repeatMode,
56
60
  shuffleModeEnabled = exoPlayer.shuffleModeEnabled,
@@ -1,40 +1,61 @@
1
1
  package com.audiobrowser.player
2
2
 
3
3
  import androidx.media3.common.ForwardingPlayer
4
+ import androidx.media3.common.PlaybackException
4
5
  import androidx.media3.common.Player as MediaPlayer
5
6
  import com.audiobrowser.Callbacks
6
7
  import com.audiobrowser.model.PlayerUpdateOptions
8
+ import com.margelo.nitro.audiobrowser.PlaybackState
7
9
  import com.margelo.nitro.audiobrowser.RemoteJumpBackwardEvent
8
10
  import com.margelo.nitro.audiobrowser.RemoteJumpForwardEvent
9
11
  import com.margelo.nitro.audiobrowser.RemoteSeekEvent
10
12
 
11
13
  /**
12
- * With `keepAlive`, a terminal error (idle with an error) or a pause that cancelled a retry (idle
13
- * in PAUSED) reads as paused and ready to the platform session rather than STATE_NONE, which
14
- * Android Auto takes for "nothing playing": it closes the now-playing screen and its next/previous
15
- * buttons with it.
14
+ * What the platform session reads of an idle engine. Android Auto takes STATE_IDLE for "nothing
15
+ * playing": it closes the now-playing screen and its next/previous buttons with it. So an ended
16
+ * queue reads ended, as on an ended engine (a rebuild carries an ended engine idle), and with
17
+ * `keepAlive` a terminal error (the engine's, or ERROR once a rebuild dropped it) and a pause that
18
+ * cancelled a retry (PAUSED) read as paused and ready.
16
19
  */
17
- internal object SessionErrorMask {
18
- fun playbackState(state: Int, hasError: Boolean, keepAlive: Boolean): Int =
19
- if (keepAlive && state == MediaPlayer.STATE_IDLE && hasError) MediaPlayer.STATE_READY else state
20
+ internal object SessionView {
21
+ private val PARKED_STATES = setOf(PlaybackState.PAUSED, PlaybackState.ERROR)
22
+ private val SETTLED_STATES = setOf(PlaybackState.STOPPED, PlaybackState.NONE)
23
+
24
+ fun playbackState(
25
+ engineState: Int,
26
+ state: PlaybackState,
27
+ engineFailed: Boolean,
28
+ keepAlive: Boolean,
29
+ ): Int =
30
+ when {
31
+ engineState != MediaPlayer.STATE_IDLE -> engineState
32
+ state == PlaybackState.ENDED -> MediaPlayer.STATE_ENDED
33
+ !keepAlive -> engineState
34
+ state in PARKED_STATES -> MediaPlayer.STATE_READY
35
+ // The engine keeps its error through a stop or an emptied queue, until its next prepare. It
36
+ // counts until the player's state reaches ERROR, which follows the engine's IDLE event.
37
+ engineFailed && state !in SETTLED_STATES -> MediaPlayer.STATE_READY
38
+ else -> engineState
39
+ }
20
40
 
21
- fun playWhenReady(raw: Boolean, state: Int, hasError: Boolean, keepAlive: Boolean): Boolean =
22
- if (keepAlive && state == MediaPlayer.STATE_IDLE && hasError) false else raw
41
+ /** An idle engine read as anything else isn't loading, so it can't be about to play. */
42
+ fun playWhenReady(raw: Boolean, engineState: Int, view: Int): Boolean =
43
+ raw && (engineState != MediaPlayer.STATE_IDLE || view == MediaPlayer.STATE_IDLE)
23
44
  }
24
45
 
25
46
  /**
26
47
  * The player the MediaSession sees. Offers each transport command from an external surface (lock
27
48
  * screen, notification, Bluetooth, Android Auto) to the app's `handleRemote*` callback first: true
28
- * consumes it, anything else runs the default. Masks a terminal error and a cancelled retry from
29
- * the session (see [SessionErrorMask]); the error still reaches JS through `onPlaybackError` and
30
- * `playbackState`.
49
+ * consumes it, anything else runs the default. Shows the session the [SessionView] of an idle
50
+ * engine; the error still reaches JS through `onPlaybackError` and `playbackState`.
31
51
  */
32
52
  internal class InterceptingPlayer(
33
53
  player: MediaPlayer,
34
54
  private val callbacksProvider: () -> Callbacks?,
35
55
  private val optionsProvider: () -> PlayerUpdateOptions,
36
56
  private val keepSessionAliveOnError: Boolean,
37
- private val isPaused: () -> Boolean,
57
+ private val playerState: () -> PlaybackState,
58
+ private val playPlayer: () -> Unit,
38
59
  private val stopPlayer: () -> Unit,
39
60
  ) : ForwardingPlayer(player) {
40
61
 
@@ -50,40 +71,50 @@ internal class InterceptingPlayer(
50
71
  super.removeListener(listener)
51
72
  }
52
73
 
53
- /** Call when [isPaused] changes: on an idle engine the masked state moves with no event. */
54
- fun onPausedChanged() {
55
- if (keepSessionAliveOnError && super.getPlaybackState() == MediaPlayer.STATE_IDLE) {
56
- listeners.toList().forEach { it.onPlaybackStateChanged(playbackState) }
57
- }
74
+ /**
75
+ * Call when the player's state changes from [old]: on an idle engine the view can move with no
76
+ * engine event.
77
+ */
78
+ fun onStateChanged(old: PlaybackState) {
79
+ val view = playbackState
80
+ val was =
81
+ SessionView.playbackState(
82
+ super.getPlaybackState(),
83
+ old,
84
+ engineFailed,
85
+ keepSessionAliveOnError,
86
+ )
87
+ if (view != was) listeners.toList().forEach { it.onPlaybackStateChanged(view) }
58
88
  }
59
89
 
60
- private val parked: Boolean
61
- get() = super.getPlayerError() != null || isPaused()
62
-
63
90
  // Media3 maps a player error to the legacy STATE_ERROR, which Android Auto and the notification
64
91
  // show as a disruptive error. Hidden whatever keepSessionAliveOnError says.
65
- override fun getPlayerError(): androidx.media3.common.PlaybackException? = null
92
+ override fun getPlayerError(): PlaybackException? = null
93
+
94
+ private val engineFailed: Boolean
95
+ get() = super.getPlayerError() != null
66
96
 
67
- // The masks read super's error: this player's getPlayerError() is always null.
68
97
  override fun getPlaybackState(): Int =
69
- SessionErrorMask.playbackState(
98
+ SessionView.playbackState(
70
99
  super.getPlaybackState(),
71
- hasError = parked,
72
- keepAlive = keepSessionAliveOnError,
100
+ playerState(),
101
+ engineFailed,
102
+ keepSessionAliveOnError,
73
103
  )
74
104
 
75
105
  override fun getPlayWhenReady(): Boolean =
76
- SessionErrorMask.playWhenReady(
77
- super.getPlayWhenReady(),
78
- super.getPlaybackState(),
79
- hasError = parked,
80
- keepAlive = keepSessionAliveOnError,
81
- )
82
-
83
- // After a terminal error or a cancelled retry the player is idle, and the default play/skip only
84
- // move playWhenReady or the index; prepare() restarts it. prepare() is a no-op unless idle.
85
- private fun recoverFromErrorIfNeeded() {
86
- if (keepSessionAliveOnError && parked) {
106
+ SessionView.playWhenReady(super.getPlayWhenReady(), super.getPlaybackState(), playbackState)
107
+
108
+ // After a terminal error, a cancelled retry or a rebuild in ENDED the engine is idle, and the
109
+ // default skips only move the index. An ended queue that stayed put stays ended, as on an ended
110
+ // engine.
111
+ private fun loadIdleEngine(fromIndex: Int) {
112
+ if (super.getPlaybackState() != MediaPlayer.STATE_IDLE) return
113
+ val view = playbackState
114
+ if (
115
+ view == MediaPlayer.STATE_READY ||
116
+ view == MediaPlayer.STATE_ENDED && currentMediaItemIndex != fromIndex
117
+ ) {
87
118
  prepare()
88
119
  }
89
120
  }
@@ -94,11 +125,12 @@ internal class InterceptingPlayer(
94
125
  fallback: () -> Unit,
95
126
  ) {
96
127
  if (callbacksProvider()?.let(handler) == true) return
128
+ val index = currentMediaItemIndex
97
129
  fallback()
98
- if (recover) recoverFromErrorIfNeeded()
130
+ if (recover) loadIdleEngine(index)
99
131
  }
100
132
 
101
- override fun play() = intercept({ it.handleRemotePlay() }, recover = true) { super.play() }
133
+ override fun play() = intercept({ it.handleRemotePlay() }) { playPlayer() }
102
134
 
103
135
  override fun pause() = intercept({ it.handleRemotePause() }) { super.pause() }
104
136
 
@@ -0,0 +1,65 @@
1
+ package com.audiobrowser.player
2
+
3
+ import android.net.Uri
4
+ import androidx.media3.common.C
5
+ import androidx.media3.common.PlaybackException
6
+ import androidx.media3.datasource.DataSourceException
7
+ import androidx.media3.extractor.Extractor
8
+ import androidx.media3.extractor.ExtractorInput
9
+ import androidx.media3.extractor.ExtractorOutput
10
+ import androidx.media3.extractor.ExtractorsFactory
11
+ import androidx.media3.extractor.ForwardingExtractor
12
+ import androidx.media3.extractor.ForwardingExtractorOutput
13
+ import androidx.media3.extractor.ForwardingExtractorsFactory
14
+ import androidx.media3.extractor.PositionHolder
15
+ import androidx.media3.extractor.SeekMap
16
+
17
+ /**
18
+ * Extracts a live track's progressive stream, which never ends: once its format is recognised, an
19
+ * end of a stream with neither a length nor a duration (media3's own test for live) is a dropped
20
+ * connection, thrown for the load error policy to reconnect. An end during the sniff stays the
21
+ * unrecognised format error, and a stream with a length or a declared end ends there.
22
+ */
23
+ class LiveStreamExtractor(extractor: Extractor) : ForwardingExtractor(extractor) {
24
+ @Volatile private var durationKnown = false
25
+
26
+ override fun init(output: ExtractorOutput) {
27
+ super.init(
28
+ object : ForwardingExtractorOutput(output) {
29
+ override fun seekMap(seekMap: SeekMap) {
30
+ durationKnown = seekMap.durationUs != C.TIME_UNSET
31
+ super.seekMap(seekMap)
32
+ }
33
+ }
34
+ )
35
+ }
36
+
37
+ override fun read(input: ExtractorInput, seekPosition: PositionHolder): Int {
38
+ val result = super.read(input, seekPosition)
39
+ if (
40
+ result == Extractor.RESULT_END_OF_INPUT &&
41
+ input.length == C.LENGTH_UNSET.toLong() &&
42
+ !durationKnown
43
+ ) {
44
+ throw DataSourceException(
45
+ "The server ended a live stream",
46
+ null,
47
+ PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
48
+ )
49
+ }
50
+ return result
51
+ }
52
+
53
+ /** Wraps every extractor [factory] makes. */
54
+ class Factory(factory: ExtractorsFactory) : ForwardingExtractorsFactory(factory) {
55
+ override fun createExtractors(): Array<Extractor> = wrap(super.createExtractors())
56
+
57
+ override fun createExtractors(
58
+ uri: Uri,
59
+ responseHeaders: Map<String, List<String>>,
60
+ ): Array<Extractor> = wrap(super.createExtractors(uri, responseHeaders))
61
+
62
+ private fun wrap(extractors: Array<Extractor>): Array<Extractor> =
63
+ Array(extractors.size) { LiveStreamExtractor(extractors[it]) }
64
+ }
65
+ }
@@ -13,6 +13,7 @@ import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
13
13
  import androidx.media3.exoplayer.source.MediaSource
14
14
  import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy
15
15
  import androidx.media3.extractor.DefaultExtractorsFactory
16
+ import androidx.media3.extractor.ExtractorsFactory
16
17
  import com.audiobrowser.model.RetryPolicy
17
18
  import com.audiobrowser.util.TrackFactory
18
19
  import com.margelo.nitro.audiobrowser.MediaRequestConfig
@@ -75,11 +76,15 @@ class MediaFactory(
75
76
  )
76
77
  }
77
78
 
78
- private val mediaFactory =
79
- DefaultMediaSourceFactory(context, extractorsFactory).apply {
79
+ private fun mediaSourceFactory(extractors: ExtractorsFactory) =
80
+ DefaultMediaSourceFactory(context, extractors).apply {
80
81
  customRetryPolicy?.let { setLoadErrorHandlingPolicy(it) }
81
82
  }
82
83
 
84
+ private val mediaFactory = mediaSourceFactory(extractorsFactory)
85
+
86
+ private val liveMediaFactory = mediaSourceFactory(LiveStreamExtractor.Factory(extractorsFactory))
87
+
83
88
  /** Restarts the retry policy's time budgets. */
84
89
  fun resetRetryTimer() {
85
90
  customRetryPolicy?.reset()
@@ -88,12 +93,14 @@ class MediaFactory(
88
93
  override fun setDrmSessionManagerProvider(
89
94
  drmSessionManagerProvider: DrmSessionManagerProvider
90
95
  ): MediaSource.Factory {
96
+ liveMediaFactory.setDrmSessionManagerProvider(drmSessionManagerProvider)
91
97
  return mediaFactory.setDrmSessionManagerProvider(drmSessionManagerProvider)
92
98
  }
93
99
 
94
100
  override fun setLoadErrorHandlingPolicy(
95
101
  loadErrorHandlingPolicy: LoadErrorHandlingPolicy
96
102
  ): MediaSource.Factory {
103
+ liveMediaFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
97
104
  return mediaFactory.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
98
105
  }
99
106
 
@@ -132,6 +139,8 @@ class MediaFactory(
132
139
  .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
133
140
  } ?: transformingFactory
134
141
 
135
- return mediaFactory.setDataSourceFactory(dataSourceFactory).createMediaSource(mediaItem)
142
+ return (if (track.live == true) liveMediaFactory else mediaFactory)
143
+ .setDataSourceFactory(dataSourceFactory)
144
+ .createMediaSource(mediaItem)
136
145
  }
137
146
  }
@@ -10,6 +10,7 @@ import com.margelo.nitro.audiobrowser.PlaybackState
10
10
  import com.margelo.nitro.audiobrowser.StallReason
11
11
  import com.margelo.nitro.audiobrowser.TimedMetadata
12
12
  import com.margelo.nitro.audiobrowser.Track
13
+ import kotlinx.coroutines.CancellationException
13
14
  import kotlinx.coroutines.CoroutineScope
14
15
  import kotlinx.coroutines.Job
15
16
  import kotlinx.coroutines.cancel
@@ -189,6 +190,11 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
189
190
  forgetPublished()
190
191
  }
191
192
 
193
+ /** Call when the stream stops: its title no longer applies. The caller renders. */
194
+ fun clearTimedMetadata() {
195
+ timedMetadata = null
196
+ }
197
+
192
198
  /** Records live (ICY/ID3) metadata; re-renders only when a formatter would use it. */
193
199
  fun onTimedMetadataReceived(timed: TimedMetadata) {
194
200
  timedMetadata = timed
@@ -255,6 +261,8 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
255
261
  val formatted =
256
262
  try {
257
263
  activeFormatter(params)
264
+ } catch (e: CancellationException) {
265
+ throw e
258
266
  } catch (e: Exception) {
259
267
  Timber.e(e, "NowPlaying formatter threw; using default")
260
268
  null