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
|
@@ -8,14 +8,27 @@ import com.audiobrowser.remote.RemotePlayback
|
|
|
8
8
|
import com.google.android.gms.cast.CastStatusCodes
|
|
9
9
|
import com.google.android.gms.cast.framework.CastSession
|
|
10
10
|
import com.google.android.gms.cast.framework.SessionManagerListener
|
|
11
|
+
import com.google.android.gms.cast.framework.media.RemoteMediaClient
|
|
12
|
+
import com.google.android.gms.cast.framework.media.RemoteMediaClient.MediaChannelResult
|
|
13
|
+
import com.google.android.gms.common.api.CommonStatusCodes
|
|
11
14
|
import com.google.android.gms.common.api.GoogleApiClient
|
|
15
|
+
import com.google.android.gms.common.api.PendingResult
|
|
16
|
+
import com.google.android.gms.common.api.ResultCallback
|
|
17
|
+
import com.google.android.gms.common.api.Status
|
|
18
|
+
import java.util.concurrent.TimeUnit
|
|
12
19
|
import org.junit.Assert.assertEquals
|
|
13
20
|
import org.junit.Assert.assertFalse
|
|
14
21
|
import org.junit.Assert.assertTrue
|
|
15
22
|
import org.junit.Test
|
|
16
23
|
import org.junit.runner.RunWith
|
|
17
24
|
import org.mockito.ArgumentCaptor
|
|
25
|
+
import org.mockito.ArgumentMatchers.any
|
|
26
|
+
import org.mockito.ArgumentMatchers.anyBoolean
|
|
27
|
+
import org.mockito.ArgumentMatchers.anyLong
|
|
28
|
+
import org.mockito.ArgumentMatchers.eq
|
|
18
29
|
import org.mockito.Mockito.mock
|
|
30
|
+
import org.mockito.Mockito.never
|
|
31
|
+
import org.mockito.Mockito.times
|
|
19
32
|
import org.mockito.Mockito.verify
|
|
20
33
|
import org.mockito.Mockito.`when`
|
|
21
34
|
import org.robolectric.RobolectricTestRunner
|
|
@@ -34,13 +47,34 @@ class SdkCastRemoteTest {
|
|
|
34
47
|
|
|
35
48
|
private val cast = mock(Cast::class.java)
|
|
36
49
|
private val player = mock(RemoteCastPlayer::class.java)
|
|
37
|
-
private val
|
|
50
|
+
private val client = mock(RemoteMediaClient::class.java)
|
|
51
|
+
private val session = mock(CastSession::class.java).also {
|
|
52
|
+
`when`(it.remoteMediaClient).thenReturn(client)
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** The status requests sent, oldest first. */
|
|
56
|
+
private val requests = mutableListOf<PendingResult<MediaChannelResult>>()
|
|
57
|
+
|
|
58
|
+
init {
|
|
59
|
+
`when`(client.requestStatus()).thenAnswer {
|
|
60
|
+
@Suppress("UNCHECKED_CAST")
|
|
61
|
+
(mock(PendingResult::class.java) as PendingResult<MediaChannelResult>).also { requests += it }
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
private var networkRegained: (() -> Unit)? = null
|
|
66
|
+
private var networkWatched = false
|
|
38
67
|
|
|
39
68
|
/** [RemotePlayback.isSessionAvailable] as each session change the listener heard of saw it. */
|
|
40
69
|
private val seen = mutableListOf<Boolean>()
|
|
41
70
|
|
|
42
71
|
private val remote =
|
|
43
|
-
SdkCastRemote(cast, player)
|
|
72
|
+
SdkCastRemote(cast, player) { onRegained ->
|
|
73
|
+
networkRegained = onRegained
|
|
74
|
+
networkWatched = true
|
|
75
|
+
return@SdkCastRemote { networkWatched = false }
|
|
76
|
+
}
|
|
77
|
+
.apply {
|
|
44
78
|
setListener(
|
|
45
79
|
object : RemotePlayback.Listener {
|
|
46
80
|
override fun onSessionChanged() {
|
|
@@ -184,5 +218,156 @@ class SdkCastRemoteTest {
|
|
|
184
218
|
assertFalse(remote.isSessionAvailable)
|
|
185
219
|
assertFalse(remote.isSuspended)
|
|
186
220
|
assertEquals(listOf(false), seen)
|
|
221
|
+
verify(client).unregisterCallback(any())
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
// After a loss it reports neither as a suspension nor as an end, the SDK can give up on the
|
|
225
|
+
// session it holds with a failed start; the player only logs that, and keeps the session.
|
|
226
|
+
@Test
|
|
227
|
+
fun `a held session whose start fails is gone, and the listener hears of it`() {
|
|
228
|
+
startSession(First.PLAYER)
|
|
229
|
+
seen.clear()
|
|
230
|
+
|
|
231
|
+
toRemote.onSessionStartFailed(session, CastStatusCodes.NETWORK_ERROR)
|
|
232
|
+
|
|
233
|
+
assertFalse(remote.isSessionAvailable)
|
|
234
|
+
assertEquals(listOf(false), seen)
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
@Test
|
|
238
|
+
fun `a suspended session whose start fails is gone, and the listener hears of it`() {
|
|
239
|
+
startSession(First.PLAYER)
|
|
240
|
+
suspendSession(First.PLAYER)
|
|
241
|
+
seen.clear()
|
|
242
|
+
|
|
243
|
+
toRemote.onSessionStartFailed(session, CastStatusCodes.NETWORK_ERROR)
|
|
244
|
+
|
|
245
|
+
assertFalse(remote.isSessionAvailable)
|
|
246
|
+
assertFalse(remote.isSuspended)
|
|
247
|
+
assertEquals(listOf(false), seen)
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
@Test
|
|
251
|
+
fun `a start that fails without a session tells the listener nothing`() {
|
|
252
|
+
toRemote.onSessionStartFailed(session, CastStatusCodes.NETWORK_ERROR)
|
|
253
|
+
|
|
254
|
+
assertFalse(remote.isSessionAvailable)
|
|
255
|
+
assertEquals(emptyList<Boolean>(), seen)
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
/** Answers the last status request as the SDK does: [statusCode], or a timeout for no answer. */
|
|
259
|
+
private fun answer(statusCode: Int) {
|
|
260
|
+
@Suppress("UNCHECKED_CAST")
|
|
261
|
+
val captor =
|
|
262
|
+
ArgumentCaptor.forClass(ResultCallback::class.java)
|
|
263
|
+
as ArgumentCaptor<ResultCallback<MediaChannelResult>>
|
|
264
|
+
verify(requests.last()).setResultCallback(captor.capture(), anyLong(), eq(TimeUnit.MILLISECONDS))
|
|
265
|
+
val result = mock(MediaChannelResult::class.java)
|
|
266
|
+
`when`(result.status).thenReturn(Status(statusCode))
|
|
267
|
+
captor.value.onResult(result)
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
@Test
|
|
271
|
+
fun `a session whose receiver no longer answers once the network is back is gone, and ended`() {
|
|
272
|
+
startSession(First.PLAYER)
|
|
273
|
+
seen.clear()
|
|
274
|
+
|
|
275
|
+
networkRegained!!()
|
|
276
|
+
answer(CommonStatusCodes.TIMEOUT)
|
|
277
|
+
|
|
278
|
+
assertFalse(remote.isSessionAvailable)
|
|
279
|
+
assertEquals(listOf(false), seen)
|
|
280
|
+
verify(cast).endCurrentSession(false)
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
@Test
|
|
284
|
+
fun `a session whose receiver answers once the network is back stays`() {
|
|
285
|
+
startSession(First.PLAYER)
|
|
286
|
+
seen.clear()
|
|
287
|
+
|
|
288
|
+
networkRegained!!()
|
|
289
|
+
answer(CommonStatusCodes.SUCCESS)
|
|
290
|
+
|
|
291
|
+
assertTrue(remote.isSessionAvailable)
|
|
292
|
+
assertEquals(emptyList<Boolean>(), seen)
|
|
293
|
+
verify(cast, never()).endCurrentSession(anyBoolean())
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
// A request fails at once while suspended, and is replaced or cancelled by others: only a
|
|
297
|
+
// receiver's silence tells of the quiet reconnect.
|
|
298
|
+
@Test
|
|
299
|
+
fun `a request that fails without the receiver's silence leaves the session`() {
|
|
300
|
+
startSession(First.PLAYER)
|
|
301
|
+
|
|
302
|
+
for (statusCode in
|
|
303
|
+
listOf(CommonStatusCodes.ERROR, CastStatusCodes.REPLACED, CastStatusCodes.CANCELED)) {
|
|
304
|
+
networkRegained!!()
|
|
305
|
+
answer(statusCode)
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
assertTrue(remote.isSessionAvailable)
|
|
309
|
+
verify(cast, never()).endCurrentSession(anyBoolean())
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
@Test
|
|
313
|
+
fun `the network's return asks nothing of a suspended session, which the SDK resumes or ends`() {
|
|
314
|
+
startSession(First.PLAYER)
|
|
315
|
+
suspendSession(First.PLAYER)
|
|
316
|
+
|
|
317
|
+
networkRegained!!()
|
|
318
|
+
|
|
319
|
+
verify(client, never()).requestStatus()
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
@Test
|
|
323
|
+
fun `no answer from a session that suspended meanwhile leaves it to the SDK`() {
|
|
324
|
+
startSession(First.PLAYER)
|
|
325
|
+
networkRegained!!()
|
|
326
|
+
|
|
327
|
+
suspendSession(First.PLAYER)
|
|
328
|
+
answer(CommonStatusCodes.TIMEOUT)
|
|
329
|
+
|
|
330
|
+
assertTrue(remote.isSessionAvailable)
|
|
331
|
+
verify(cast, never()).endCurrentSession(anyBoolean())
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
@Test
|
|
335
|
+
fun `no answer from a session that suspended and resumed meanwhile leaves it`() {
|
|
336
|
+
startSession(First.PLAYER)
|
|
337
|
+
networkRegained!!()
|
|
338
|
+
|
|
339
|
+
suspendSession(First.PLAYER)
|
|
340
|
+
resumeSession(First.PLAYER)
|
|
341
|
+
answer(CommonStatusCodes.TIMEOUT)
|
|
342
|
+
|
|
343
|
+
assertTrue(remote.isSessionAvailable)
|
|
344
|
+
verify(cast, never()).endCurrentSession(anyBoolean())
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
@Test
|
|
348
|
+
fun `the network's return asks nothing without a session`() {
|
|
349
|
+
networkRegained!!()
|
|
350
|
+
|
|
351
|
+
verify(client, never()).requestStatus()
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
@Test
|
|
355
|
+
fun `the network returning again asks nothing more while the receiver has yet to answer`() {
|
|
356
|
+
startSession(First.PLAYER)
|
|
357
|
+
|
|
358
|
+
networkRegained!!()
|
|
359
|
+
networkRegained!!()
|
|
360
|
+
verify(client, times(1)).requestStatus()
|
|
361
|
+
|
|
362
|
+
answer(CommonStatusCodes.SUCCESS)
|
|
363
|
+
networkRegained!!()
|
|
364
|
+
verify(client, times(2)).requestStatus()
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
@Test
|
|
368
|
+
fun `release stops watching the network`() {
|
|
369
|
+
remote.release()
|
|
370
|
+
|
|
371
|
+
assertFalse(networkWatched)
|
|
187
372
|
}
|
|
188
373
|
}
|
package/ios/AVPlayerEngine.swift
CHANGED
|
@@ -367,8 +367,8 @@ final class AVPlayerEngine: PlayerEngine {
|
|
|
367
367
|
// `MPNowPlayingSession` publishes only through the linked player's current item, so a load that
|
|
368
368
|
// fails before an item exists (a dead host on a cold start) shows nothing on the lock screen or
|
|
369
369
|
// CarPlay. The failed asset's item carries the publishing, unobserved so its `.failed` status
|
|
370
|
-
// cannot re-report the loader's error. A successful load replaces it; a retry
|
|
371
|
-
// place, so the surface doesn't flicker.
|
|
370
|
+
// cannot re-report the loader's error. A successful load replaces it; a retry keeps a carrier
|
|
371
|
+
// in its place, so the surface doesn't flicker.
|
|
372
372
|
private func attachPublishingCarrierItemIfNeeded() {
|
|
373
373
|
guard avPlayer.currentItem == nil, let asset = mediaLoader.asset else { return }
|
|
374
374
|
logger.notice("Attaching publishing-carrier item for failed load")
|
|
@@ -92,9 +92,10 @@ enum BrowserPathHelper {
|
|
|
92
92
|
return raw.removingPercentEncoding ?? String(raw)
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
-
/// Percent-encodes keys and values, so pass them unencoded.
|
|
95
|
+
/// Percent-encodes keys and values, so pass them unencoded. A `data:` URL comes back unchanged:
|
|
96
|
+
/// what follows its comma is the payload.
|
|
96
97
|
static func appendQuery(_ query: [String: String], to url: String) -> String {
|
|
97
|
-
guard !query.isEmpty else { return url }
|
|
98
|
+
guard !query.isEmpty, url.prefix(5).lowercased() != "data:" else { return url }
|
|
98
99
|
|
|
99
100
|
let queryString = query.keys.sorted()
|
|
100
101
|
.map { key in
|
|
@@ -108,14 +109,11 @@ enum BrowserPathHelper {
|
|
|
108
109
|
return "\(url)\(separator)\(queryString)"
|
|
109
110
|
}
|
|
110
111
|
|
|
111
|
-
/// `path` joined to `baseUrl` with one slash; `path` alone when it
|
|
112
|
-
/// there is no base, and the base alone when `path`
|
|
112
|
+
/// `path` joined to `baseUrl` with one slash; `path` alone when it has a scheme (`file:`,
|
|
113
|
+
/// `data:`, `HTTPS:`, …), starts with `//` or there is no base, and the base alone when `path`
|
|
114
|
+
/// is empty or only slashes.
|
|
113
115
|
static func buildUrl(baseUrl: String?, path: String) -> String {
|
|
114
|
-
|
|
115
|
-
return path
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
guard let baseUrl else {
|
|
116
|
+
guard let baseUrl, !isAbsoluteUrl(path) else {
|
|
119
117
|
return path
|
|
120
118
|
}
|
|
121
119
|
|
|
@@ -135,6 +133,10 @@ enum BrowserPathHelper {
|
|
|
135
133
|
|
|
136
134
|
return "\(normalizedBase)/\(normalizedPath)"
|
|
137
135
|
}
|
|
136
|
+
|
|
137
|
+
private static func isAbsoluteUrl(_ url: String) -> Bool {
|
|
138
|
+
url.range(of: "^([A-Za-z][A-Za-z0-9+.-]*:|//)", options: .regularExpression) != nil
|
|
139
|
+
}
|
|
138
140
|
}
|
|
139
141
|
|
|
140
142
|
extension BrowserPathHelper {
|
|
@@ -82,7 +82,7 @@ final class PageResolver {
|
|
|
82
82
|
case let .second(browseError):
|
|
83
83
|
throw BrowserError.callbackError(browseError.error)
|
|
84
84
|
case let .third(promise):
|
|
85
|
-
switch try await promise.
|
|
85
|
+
switch try await promise.awaitJSPromise() {
|
|
86
86
|
case let .first(resolvedTrack):
|
|
87
87
|
return resolvedTrack
|
|
88
88
|
case let .second(browseError):
|
|
@@ -320,11 +320,11 @@ final class CarPlayListItemFactory {
|
|
|
320
320
|
|
|
321
321
|
// Keeps a disabled tile inert even if the surface delivers the tap.
|
|
322
322
|
item.listImageRowHandler = { [onItemSelected] _, index, completion in
|
|
323
|
-
guard
|
|
323
|
+
guard let track = SectionPresentation.tappedTile(at: index, in: tracks) else {
|
|
324
324
|
completion()
|
|
325
325
|
return
|
|
326
326
|
}
|
|
327
|
-
onItemSelected(
|
|
327
|
+
onItemSelected(track, completion)
|
|
328
328
|
}
|
|
329
329
|
|
|
330
330
|
for (index, track) in tracks.enumerated() {
|
|
@@ -28,6 +28,14 @@ final class CarPlayNowPlayingManager {
|
|
|
28
28
|
|
|
29
29
|
private var builtRow: BuiltButtonRow?
|
|
30
30
|
|
|
31
|
+
/// An open list is rebuilt only when this changes: a rebuild reloads every row's artwork.
|
|
32
|
+
private struct BuiltUpNext: Equatable {
|
|
33
|
+
let queueVersion: Int
|
|
34
|
+
let indices: [Int]
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
private var builtUpNext: BuiltUpNext?
|
|
38
|
+
|
|
31
39
|
/// Resolved on track change, not on tap, so the album line shows only when a destination exists.
|
|
32
40
|
private var albumArtistDestination: String?
|
|
33
41
|
private let albumPathResolution = SupersedingTask<String, String>()
|
|
@@ -68,9 +76,15 @@ final class CarPlayNowPlayingManager {
|
|
|
68
76
|
audioBrowser.playerOptionsChangedEmitter.subscribeOnMain { [weak self] in self?.refresh() },
|
|
69
77
|
browserManager.favoritesChanged.subscribeOnMain { [weak self] in self?.refreshButtons() },
|
|
70
78
|
audioBrowser.favoriteChangedEmitter.subscribeOnMain { [weak self] _ in self?.refreshButtons() },
|
|
71
|
-
audioBrowser.repeatModeChangedEmitter.subscribeOnMain { [weak self] _ in
|
|
72
|
-
|
|
73
|
-
|
|
79
|
+
audioBrowser.repeatModeChangedEmitter.subscribeOnMain { [weak self] _ in
|
|
80
|
+
self?.refreshButtons()
|
|
81
|
+
self?.refreshUpNext()
|
|
82
|
+
},
|
|
83
|
+
audioBrowser.shuffleChangedEmitter.subscribeOnMain { [weak self] _ in
|
|
84
|
+
self?.refreshButtons()
|
|
85
|
+
self?.refreshUpNext()
|
|
86
|
+
},
|
|
87
|
+
audioBrowser.queueChangedEmitter.subscribeOnMain { [weak self] _ in self?.refreshUpNext() },
|
|
74
88
|
audioBrowser.showNowPlayingRequestedEmitter.subscribeOnMain { [weak self] in self?.showNowPlaying() },
|
|
75
89
|
audioBrowser.activeTrackChangedEmitter.subscribeOnMain { [weak self] _ in
|
|
76
90
|
// The player's current track is authoritative again.
|
|
@@ -91,7 +105,7 @@ final class CarPlayNowPlayingManager {
|
|
|
91
105
|
}
|
|
92
106
|
|
|
93
107
|
func refresh() {
|
|
94
|
-
|
|
108
|
+
refreshUpNext()
|
|
95
109
|
refreshButtons()
|
|
96
110
|
updateAlbumArtistDestination()
|
|
97
111
|
}
|
|
@@ -226,14 +240,6 @@ final class CarPlayNowPlayingManager {
|
|
|
226
240
|
}
|
|
227
241
|
}
|
|
228
242
|
|
|
229
|
-
// MARK: - Queue Changes
|
|
230
|
-
|
|
231
|
-
private func queueChanged(_ tracks: [Track]) {
|
|
232
|
-
updateUpNextButton()
|
|
233
|
-
guard let upNextTemplate else { return }
|
|
234
|
-
upNextTemplate.updateSections([createUpNextSection(tracks: tracks)])
|
|
235
|
-
}
|
|
236
|
-
|
|
237
243
|
// MARK: - Private - Button Handlers
|
|
238
244
|
|
|
239
245
|
private func favoriteButtonImage(isFavorited: Bool) -> UIImage {
|
|
@@ -290,47 +296,74 @@ final class CarPlayNowPlayingManager {
|
|
|
290
296
|
navigate(destination, title)
|
|
291
297
|
}
|
|
292
298
|
|
|
293
|
-
private func
|
|
294
|
-
|
|
299
|
+
private func refreshUpNext() {
|
|
300
|
+
let indices = player?.upNextIndices ?? []
|
|
301
|
+
let options = audioBrowser.playerOptions
|
|
302
|
+
CPNowPlayingTemplate.shared.isUpNextButtonEnabled = NowPlayingButtonRules.upNextEnabled(
|
|
303
|
+
option: options.carPlayUpNextButton,
|
|
304
|
+
skipToQueueItem: options.capabilities.skipToQueueItem,
|
|
305
|
+
upNextCount: indices.count,
|
|
306
|
+
)
|
|
307
|
+
guard let upNextTemplate else { return }
|
|
308
|
+
let built = BuiltUpNext(queueVersion: player?.queueVersion ?? 0, indices: indices)
|
|
309
|
+
guard built != builtUpNext else { return }
|
|
310
|
+
builtUpNext = built
|
|
311
|
+
upNextTemplate.updateSections([createUpNextSection(built)])
|
|
295
312
|
}
|
|
296
313
|
|
|
297
314
|
fileprivate func handleUpNextButtonTapped() {
|
|
298
|
-
let
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
logger.debug("No tracks in queue for Up Next")
|
|
315
|
+
let indices = player?.upNextIndices ?? []
|
|
316
|
+
guard !indices.isEmpty else {
|
|
317
|
+
logger.debug("No tracks after the current one for Up Next")
|
|
302
318
|
return
|
|
303
319
|
}
|
|
304
320
|
|
|
305
|
-
logger.info("Showing Up Next queue with \(tracks.count) tracks")
|
|
306
|
-
|
|
307
321
|
// System-localized, or what the app set.
|
|
308
322
|
let upNextTitle = CPNowPlayingTemplate.shared.upNextTitle
|
|
323
|
+
let built = BuiltUpNext(queueVersion: player?.queueVersion ?? 0, indices: indices)
|
|
309
324
|
let template = CPListTemplate(
|
|
310
325
|
title: upNextTitle.isEmpty ? "Up Next" : upNextTitle,
|
|
311
|
-
sections: [createUpNextSection(
|
|
326
|
+
sections: [createUpNextSection(built)],
|
|
312
327
|
)
|
|
313
328
|
|
|
314
329
|
upNextTemplate = template
|
|
330
|
+
builtUpNext = built
|
|
315
331
|
|
|
316
332
|
interfaceController.safePush(template, animated: true)
|
|
317
333
|
}
|
|
318
334
|
|
|
319
|
-
private func createUpNextSection(
|
|
335
|
+
private func createUpNextSection(_ built: BuiltUpNext) -> CPListSection {
|
|
336
|
+
let tracks = player?.tracks ?? []
|
|
320
337
|
let maxItems = CPListTemplate.maximumItemCount
|
|
321
|
-
if
|
|
322
|
-
logger.info("Up Next
|
|
338
|
+
if built.indices.count > maxItems {
|
|
339
|
+
logger.info("Up Next has \(built.indices.count) tracks, clamping to CarPlay's limit of \(maxItems)")
|
|
323
340
|
}
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
listItem(track) { [weak self] _, completion in
|
|
327
|
-
|
|
341
|
+
let items = built.indices.prefix(maxItems).map { index -> CPListItem in
|
|
342
|
+
let track = tracks[index]
|
|
343
|
+
return listItem(track) { [weak self] _, completion in
|
|
344
|
+
defer { completion() }
|
|
345
|
+
guard let self else { return }
|
|
346
|
+
// The list can outlive the capability: it stays pushed when the button turns off.
|
|
347
|
+
switch NowPlayingButtonRules.queueItemPick(
|
|
348
|
+
skipToQueueItem: audioBrowser.playerOptions.capabilities.skipToQueueItem,
|
|
349
|
+
rowQueueVersion: built.queueVersion,
|
|
350
|
+
queueVersion: player?.queueVersion,
|
|
351
|
+
) {
|
|
352
|
+
case .skip:
|
|
353
|
+
break
|
|
354
|
+
case .refuse:
|
|
355
|
+
return
|
|
356
|
+
case .rebuild:
|
|
357
|
+
logger.info("Up Next pick of \(track.title) came after a queue change; rebuilding the list")
|
|
358
|
+
refreshUpNext()
|
|
359
|
+
return
|
|
360
|
+
}
|
|
361
|
+
logger.info("Skipping to track at index \(index): \(track.title)")
|
|
328
362
|
do {
|
|
329
|
-
try
|
|
363
|
+
try player?.skipTo(index, playWhenReady: true)
|
|
330
364
|
} catch {
|
|
331
|
-
|
|
365
|
+
logger.error("Failed to skip to track: \(error.localizedDescription)")
|
|
332
366
|
}
|
|
333
|
-
completion()
|
|
334
367
|
}
|
|
335
368
|
}
|
|
336
369
|
return CPListSection(items: items)
|
|
@@ -14,6 +14,32 @@ enum NowPlayingButtonRules {
|
|
|
14
14
|
return Array(buttons.prefix(maximumButtonCount))
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
+
/// Whether a pick in the Up Next list may change the track: an unset `skipToQueueItem`
|
|
18
|
+
/// capability counts as on.
|
|
19
|
+
static func queueItemPickAllowed(_ skipToQueueItem: Bool?) -> Bool {
|
|
20
|
+
skipToQueueItem != false
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
enum QueueItemPick: Equatable {
|
|
24
|
+
case skip
|
|
25
|
+
case refuse
|
|
26
|
+
/// The queue changed after the row was built, so its index may name another track.
|
|
27
|
+
case rebuild
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/// What a pick of an Up Next row built for `rowQueueVersion` does, against the queue's
|
|
31
|
+
/// `queueVersion` now (nil without a player).
|
|
32
|
+
static func queueItemPick(skipToQueueItem: Bool?, rowQueueVersion: Int, queueVersion: Int?) -> QueueItemPick {
|
|
33
|
+
guard queueItemPickAllowed(skipToQueueItem), let queueVersion else { return .refuse }
|
|
34
|
+
return queueVersion == rowQueueVersion ? .skip : .rebuild
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/// Whether the Up Next button is on: the option allows it, a pick is allowed, and a track
|
|
38
|
+
/// follows the current one.
|
|
39
|
+
static func upNextEnabled(option: Bool, skipToQueueItem: Bool?, upNextCount: Int) -> Bool {
|
|
40
|
+
option && queueItemPickAllowed(skipToQueueItem) && upNextCount > 0
|
|
41
|
+
}
|
|
42
|
+
|
|
17
43
|
static func repeatMode(after mode: RepeatMode) -> RepeatMode {
|
|
18
44
|
switch mode {
|
|
19
45
|
case .off: .track
|
|
@@ -64,4 +64,11 @@ enum SectionPresentation: Equatable {
|
|
|
64
64
|
case .plain, nil: .rowElements
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
+
|
|
68
|
+
/// The track an image row's tile tap at `index` selects: nil when the index is outside
|
|
69
|
+
/// `tracks` or the track is disabled.
|
|
70
|
+
static func tappedTile(at index: Int, in tracks: [Track]) -> Track? {
|
|
71
|
+
guard tracks.indices.contains(index), tracks[index].disabled != true else { return nil }
|
|
72
|
+
return tracks[index]
|
|
73
|
+
}
|
|
67
74
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import NitroModules
|
|
2
2
|
|
|
3
3
|
/// Awaits for JS callbacks in place of Nitro's `await()`, which ignores cancellation: see
|
|
4
|
-
/// `awaitCallback`. The nested forms are for a callback
|
|
5
|
-
/// bridge as `Promise<Promise<U>>`.
|
|
4
|
+
/// `awaitCallback`. A rejection throws a `JSCallbackError`. The nested forms are for a callback
|
|
5
|
+
/// returning a promise, which crosses the bridge as `Promise<Promise<U>>`.
|
|
6
6
|
extension Promise {
|
|
7
7
|
func awaitCancellable() async throws -> T {
|
|
8
8
|
try await awaitCallback(subscribe)
|
|
@@ -14,6 +14,11 @@ extension Promise {
|
|
|
14
14
|
try await awaitCallback(timeout: callbackFallbackTimeout, subscribe)
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
+
/// `awaitCancellable` for a promise a JS callback returned.
|
|
18
|
+
func awaitJSPromise() async throws -> T {
|
|
19
|
+
try await awaitCallback(subscribeJS)
|
|
20
|
+
}
|
|
21
|
+
|
|
17
22
|
func awaitNested<U>() async throws -> U where T == Promise<U> {
|
|
18
23
|
try await awaitCallback(subscribeNested)
|
|
19
24
|
}
|
|
@@ -24,10 +29,14 @@ extension Promise {
|
|
|
24
29
|
}
|
|
25
30
|
|
|
26
31
|
private func subscribe(_ deliver: @escaping @Sendable (Result<T, Error>) -> Void) {
|
|
27
|
-
then { deliver(.success($0)) }.catch { deliver(.failure($0)) }
|
|
32
|
+
then { deliver(.success($0)) }.catch { deliver(.failure(JSCallbackError($0))) }
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
private func subscribeJS(_ deliver: @escaping @Sendable (Result<T, Error>) -> Void) {
|
|
36
|
+
then { deliver(.success($0)) }.catch { deliver(.failure(JSCallbackError(jsPromiseRejection: $0))) }
|
|
28
37
|
}
|
|
29
38
|
|
|
30
39
|
private func subscribeNested<U>(_ deliver: @escaping @Sendable (Result<U, Error>) -> Void) where T == Promise<U> {
|
|
31
|
-
then { $0.
|
|
40
|
+
then { $0.subscribeJS(deliver) }.catch { deliver(.failure(JSCallbackError($0))) }
|
|
32
41
|
}
|
|
33
42
|
}
|
|
@@ -346,7 +346,8 @@ public extension HybridAudioBrowser {
|
|
|
346
346
|
true
|
|
347
347
|
}
|
|
348
348
|
|
|
349
|
-
func openOutputPicker() throws {
|
|
350
|
-
|
|
349
|
+
func openOutputPicker(anchor: OutputPickerAnchor?) throws {
|
|
350
|
+
let rect = anchor.map { CGRect(x: $0.x, y: $0.y, width: $0.width, height: $0.height) }
|
|
351
|
+
DispatchQueue.main.async { OutputPicker.present(anchor: rect) }
|
|
351
352
|
}
|
|
352
353
|
}
|
|
@@ -116,7 +116,7 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
116
116
|
path: nil, request: nil, requestResolver: nil, browse: nil, browseResolver: nil, media: nil, artwork: nil, nowPlayingArtwork: nil, routes: nil,
|
|
117
117
|
singleTrack: nil, handleTrackLoad: nil,
|
|
118
118
|
androidControllerOfflineError: nil, viewMoreTitle: nil, carPlayLoadingTitle: nil, resolveAlbumPath: nil,
|
|
119
|
-
formatNavigationError: nil,
|
|
119
|
+
formatNavigationError: nil, findTrack: nil,
|
|
120
120
|
) {
|
|
121
121
|
didSet {
|
|
122
122
|
// Copied on the setter's thread: the Task below outlives this call, and Nitro can reassign
|
|
@@ -62,6 +62,7 @@
|
|
|
62
62
|
var seekTo: Bool?
|
|
63
63
|
var skipToNext: Bool?
|
|
64
64
|
var skipToPrevious: Bool?
|
|
65
|
+
var skipToQueueItem: Bool?
|
|
65
66
|
var jumpForward: Bool?
|
|
66
67
|
var jumpBackward: Bool?
|
|
67
68
|
var favorite: Bool?
|
|
@@ -402,6 +403,20 @@
|
|
|
402
403
|
case buffering
|
|
403
404
|
case error
|
|
404
405
|
case ended
|
|
406
|
+
|
|
407
|
+
var stringValue: String {
|
|
408
|
+
switch self {
|
|
409
|
+
case .none: "none"
|
|
410
|
+
case .ready: "ready"
|
|
411
|
+
case .playing: "playing"
|
|
412
|
+
case .paused: "paused"
|
|
413
|
+
case .stopped: "stopped"
|
|
414
|
+
case .loading: "loading"
|
|
415
|
+
case .buffering: "buffering"
|
|
416
|
+
case .error: "error"
|
|
417
|
+
case .ended: "ended"
|
|
418
|
+
}
|
|
419
|
+
}
|
|
405
420
|
}
|
|
406
421
|
|
|
407
422
|
struct TrackMetadata: Equatable {
|
|
@@ -14,7 +14,7 @@ class PlayerUpdateOptions {
|
|
|
14
14
|
// commands start explicitly disabled.
|
|
15
15
|
var capabilities: PlayerCapabilities = .init(
|
|
16
16
|
play: nil, pause: nil, stop: nil, seekTo: nil,
|
|
17
|
-
skipToNext: nil, skipToPrevious: nil,
|
|
17
|
+
skipToNext: nil, skipToPrevious: nil, skipToQueueItem: nil,
|
|
18
18
|
jumpForward: false, jumpBackward: false,
|
|
19
19
|
favorite: nil,
|
|
20
20
|
shuffleMode: nil, repeatMode: nil, playbackRate: nil,
|
|
@@ -99,6 +99,7 @@ class PlayerUpdateOptions {
|
|
|
99
99
|
seekTo: incoming.seekTo ?? existing.seekTo,
|
|
100
100
|
skipToNext: incoming.skipToNext ?? existing.skipToNext,
|
|
101
101
|
skipToPrevious: incoming.skipToPrevious ?? existing.skipToPrevious,
|
|
102
|
+
skipToQueueItem: incoming.skipToQueueItem ?? existing.skipToQueueItem,
|
|
102
103
|
jumpForward: incoming.jumpForward ?? existing.jumpForward,
|
|
103
104
|
jumpBackward: incoming.jumpBackward ?? existing.jumpBackward,
|
|
104
105
|
favorite: incoming.favorite ?? existing.favorite,
|
package/ios/PlaybackEvent.swift
CHANGED
|
@@ -15,3 +15,23 @@ enum PlaybackEvent {
|
|
|
15
15
|
/// A pause cancelled a pending retry.
|
|
16
16
|
case retryCancelled
|
|
17
17
|
}
|
|
18
|
+
|
|
19
|
+
extension PlaybackEvent {
|
|
20
|
+
/// The event for a public log line: no URL, title or track. A failure omits the URL it may carry.
|
|
21
|
+
var logDescription: String {
|
|
22
|
+
switch self {
|
|
23
|
+
case .stopped: "stopped"
|
|
24
|
+
case .trackLoading: "trackLoading"
|
|
25
|
+
case .trackUnloaded: "trackUnloaded"
|
|
26
|
+
case .trackEndedNaturally: "trackEndedNaturally"
|
|
27
|
+
case .loadSeekCompleted: "loadSeekCompleted"
|
|
28
|
+
case let .avPlayerPaused(hasAsset): "avPlayerPaused(hasAsset: \(hasAsset))"
|
|
29
|
+
case .avPlayerWaiting: "avPlayerWaiting"
|
|
30
|
+
case .avPlayerPlaying: "avPlayerPlaying"
|
|
31
|
+
case .audioFrameDecoded: "audioFrameDecoded"
|
|
32
|
+
case .bufferingSufficient: "bufferingSufficient"
|
|
33
|
+
case .errorOccurred: "errorOccurred"
|
|
34
|
+
case .retryCancelled: "retryCancelled"
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|