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.
Files changed (192) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +14 -2
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
  5. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  6. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  7. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  8. package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
  9. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
  10. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  11. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  12. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  13. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  14. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  15. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  16. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  17. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  18. package/android/src/main/res/values/strings.xml +5 -2
  19. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  20. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  21. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  22. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  23. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  24. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  25. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  26. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  27. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  28. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  30. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  31. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  32. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  33. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  34. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  35. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  36. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  37. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  38. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  39. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  40. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  41. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  42. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  43. package/ios/AVPlayerEngine.swift +2 -2
  44. package/ios/Browser/BrowserPathHelper.swift +3 -2
  45. package/ios/Browser/PageResolver.swift +1 -1
  46. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  47. package/ios/HybridAudioBrowser+Player.swift +3 -2
  48. package/ios/HybridAudioBrowser.swift +1 -1
  49. package/ios/Player/Player.swift +4 -2
  50. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  51. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  52. package/ios/Tests/GenerationMemoTests.swift +136 -0
  53. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  54. package/ios/Tests/PlayerPolicyTests.swift +19 -28
  55. package/ios/Tests/PlayerProgressTests.swift +0 -2
  56. package/ios/Tests/RequestLayerTests.swift +5 -0
  57. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  58. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  59. package/ios/Tests/Support/TestTypes.swift +14 -0
  60. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  61. package/ios/Util/AwaitCallback.swift +16 -10
  62. package/ios/Util/GenerationMemo.swift +81 -17
  63. package/ios/Util/JSCallbackError.swift +23 -0
  64. package/ios/Util/OutputPicker.swift +25 -5
  65. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  66. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  67. package/lib/commonjs/features/browser-config.js +3 -2
  68. package/lib/commonjs/features/browser-config.js.map +1 -1
  69. package/lib/commonjs/features/browser.js +7 -8
  70. package/lib/commonjs/features/browser.js.map +1 -1
  71. package/lib/commonjs/features/output.js +7 -3
  72. package/lib/commonjs/features/output.js.map +1 -1
  73. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  74. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  75. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  76. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  77. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  78. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  79. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  80. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  81. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  82. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  83. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  84. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  85. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  86. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  87. package/lib/module/features/browser-config.js +3 -2
  88. package/lib/module/features/browser-config.js.map +1 -1
  89. package/lib/module/features/browser.js +7 -8
  90. package/lib/module/features/browser.js.map +1 -1
  91. package/lib/module/features/output.js +7 -3
  92. package/lib/module/features/output.js.map +1 -1
  93. package/lib/module/web/NativeAudioBrowser.js +43 -2
  94. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  95. package/lib/module/web/browser/BrowserManager.js +37 -66
  96. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  97. package/lib/module/web/browser/SearchManager.js +1 -5
  98. package/lib/module/web/browser/SearchManager.js.map +1 -1
  99. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  100. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  101. package/lib/module/web/player/NowPlayingManager.js +3 -22
  102. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  103. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  104. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  105. package/lib/module/web/util/GenerationMemo.js +87 -0
  106. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  107. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  108. package/lib/typescript/src/features/browser.d.ts +7 -8
  109. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  110. package/lib/typescript/src/features/output.d.ts +8 -4
  111. package/lib/typescript/src/features/output.d.ts.map +1 -1
  112. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  113. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  114. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  115. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  116. package/lib/typescript/src/types/browser.d.ts +55 -8
  117. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  118. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  119. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  120. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  121. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  122. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  123. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  124. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  125. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  126. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  127. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  128. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  129. 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
  130. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  131. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  132. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  133. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  134. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  135. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  136. 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
  137. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  138. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  139. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  140. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  141. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  142. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  143. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  144. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  145. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  146. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  147. 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
  148. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  149. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  150. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  151. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  152. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  153. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  154. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  155. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  156. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  157. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  158. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  159. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  160. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  161. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  162. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  163. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  164. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  165. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  166. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  167. package/package.json +1 -1
  168. package/src/codegen-js-error-message.test.ts +78 -0
  169. package/src/features/browser-config.test.ts +7 -0
  170. package/src/features/browser-config.ts +3 -2
  171. package/src/features/browser.ts +7 -8
  172. package/src/features/output.ts +13 -5
  173. package/src/specs/audio-browser.nitro.ts +16 -3
  174. package/src/types/browser-native.ts +4 -1
  175. package/src/types/browser.ts +60 -8
  176. package/src/web/NativeAudioBrowser.ts +43 -3
  177. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  178. package/src/web/browser/BrowserManager.ts +50 -79
  179. package/src/web/browser/SearchManager.ts +1 -8
  180. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  181. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  182. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  183. package/src/web/http/RequestConfigBuilder.ts +72 -57
  184. package/src/web/player/NowPlayingManager.test.ts +29 -0
  185. package/src/web/player/NowPlayingManager.ts +4 -27
  186. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  187. package/src/web/util/BrowserPathHelper.ts +6 -7
  188. package/src/web/util/GenerationMemo.test.ts +148 -0
  189. package/src/web/util/GenerationMemo.ts +103 -0
  190. package/website/guide/audio-output.md +34 -7
  191. package/website/guide/browser.md +21 -0
  192. package/website/guide/gate.md +1 -1
@@ -87,6 +87,17 @@ class TrackFactoryRatingTest {
87
87
  assertEquals("https://a/1.png", item.mediaMetadata.artworkUri.toString())
88
88
  }
89
89
 
90
+ @Test
91
+ fun `a phone serves data artwork through the provider, and maps it back to its URL`() {
92
+ val registry = BrowseArtworkRegistry()
93
+ TrackFactory.artworkRoutes = ArtworkRoutes(registry, "app.artwork")
94
+ val item = TrackFactory.toMedia3(TestFixtures.track(artwork = "data:image/png;base64,AAAA"))
95
+ val uri = item.mediaMetadata.artworkUri!!
96
+ assertEquals("content", uri.scheme)
97
+ registry.clear()
98
+ assertEquals("data:image/png;base64,AAAA", TrackFactory.artworkRoutes!!.publicUrl(uri))
99
+ }
100
+
90
101
  @Test
91
102
  fun `Android Automotive OS keeps non-http artwork as it is`() {
92
103
  automotive()
@@ -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 session = mock(CastSession::class.java)
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).apply {
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
  }
@@ -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 leaves it in
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
@@ -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.awaitCancellable() {
85
+ switch try await promise.awaitJSPromise() {
86
86
  case let .first(resolvedTrack):
87
87
  return resolvedTrack
88
88
  case let .second(browseError):
@@ -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 returning a promise, which crosses the
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.subscribe(deliver) }.catch { deliver(.failure($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
- DispatchQueue.main.async { OutputPicker.present() }
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
@@ -119,8 +119,8 @@ final class Player {
119
119
  !awaitingItem && load?.itemPrepared == true
120
120
  }
121
121
 
122
- /// Whether the engine's item is one of this Load's, which a reload of the track keeps until the
123
- /// next is prepared.
122
+ /// Whether the engine's item is one of this Load's, which a reload of an on-demand track keeps
123
+ /// until the next is prepared; a live track's gives way to the now-playing carrier.
124
124
  private var engineItemIsCurrent: Bool {
125
125
  load?.itemPrepared == true
126
126
  }
@@ -931,6 +931,8 @@ final class Player {
931
931
  engine.cancelLoading()
932
932
  engine.stopObservingItem()
933
933
  engine.pause()
934
+ // Without a loaded asset the item is already the carrier: a parked stream's.
935
+ if currentTrack?.live == true, engine.hasLoadedAsset { engine.replaceItemWithNowPlayingCarrier() }
934
936
  }
935
937
  if let target { deferredSeek.capture(target) }
936
938
  transition(.trackLoading)
@@ -49,6 +49,14 @@ struct AwaitCallbackTests {
49
49
  #expect(result == 7)
50
50
  }
51
51
 
52
+ @MainActor
53
+ @Test func subscribeRunsOnTheCallersActor() async throws {
54
+ let onMainThread = try await awaitCallback { deliver in
55
+ deliver(.success(Thread.isMainThread))
56
+ }
57
+ #expect(onMainThread)
58
+ }
59
+
52
60
  @Test func aRejectionThrowsIt() async throws {
53
61
  let callback = FakeCallback()
54
62
  await #expect(throws: Rejected.self) {
@@ -0,0 +1,25 @@
1
+ import Foundation
2
+ import Testing
3
+
4
+ /// What ArtworkImageFetcher's data: URL provider relies on: Foundation decodes an RFC 2397 URL.
5
+ @Suite("data: URL decoding")
6
+ struct DataURLDecodingTests {
7
+ private static let png1x1 =
8
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg=="
9
+
10
+ private func decoded(_ uri: String) throws -> Data {
11
+ try Data(contentsOf: #require(URL(string: uri)))
12
+ }
13
+
14
+ @Test func aBase64PayloadAfterMediaTypeParametersDecodesToItsBytes() throws {
15
+ #expect(try decoded("data:image/png;name=a.png;base64,\(Self.png1x1)") == Data(base64Encoded: Self.png1x1))
16
+ }
17
+
18
+ @Test func aPlainPayloadIsPercentDecoded() throws {
19
+ #expect(try decoded("data:image/svg+xml,%3Csvg%20xmlns%3D%22a%22%2F%3E") == Data(#"<svg xmlns="a"/>"#.utf8))
20
+ }
21
+
22
+ @Test func anInvalidBase64PayloadThrows() {
23
+ #expect(throws: (any Error).self) { try decoded("data:image/png;base64,not*base64") }
24
+ }
25
+ }
@@ -175,4 +175,140 @@ struct GenerationMemoTests {
175
175
  gate.release()
176
176
  #expect(try await withinTimeLimit { try await later.value } == 7)
177
177
  }
178
+
179
+ /// Runs that each suspend until released on their own, numbered from 0 in start order.
180
+ @MainActor
181
+ final class Runs {
182
+ private var waiters: [CheckedContinuation<Result<Int, Error>, Never>?] = []
183
+ var count: Int { waiters.count }
184
+
185
+ func run() async throws -> Int {
186
+ try await withCheckedContinuation { waiters.append($0) }.get()
187
+ }
188
+
189
+ func release(_ index: Int, _ result: Result<Int, Error>) {
190
+ guard waiters.indices.contains(index) else {
191
+ Issue.record("no run \(index)")
192
+ return
193
+ }
194
+ waiters[index]?.resume(returning: result)
195
+ waiters[index] = nil
196
+ }
197
+
198
+ func waitForRuns(_ count: Int, sourceLocation: SourceLocation = #_sourceLocation) async {
199
+ for _ in 0 ..< 1000 where self.count < count {
200
+ await Task.yield()
201
+ }
202
+ if self.count < count {
203
+ Issue.record("expected \(count) runs, saw \(self.count)", sourceLocation: sourceLocation)
204
+ }
205
+ }
206
+ }
207
+
208
+ @MainActor
209
+ final class TestClock {
210
+ var now = ContinuousClock.now
211
+ }
212
+
213
+ @Test func aCallerPastTheBoundStartsAnotherRunWhoseValueReleasesEveryCaller() async throws {
214
+ let clock = TestClock()
215
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
216
+ let runs = Runs()
217
+ let early = Task { try await memo.value { try await runs.run() } }
218
+ await runs.waitForRuns(1)
219
+ clock.now += .seconds(11)
220
+ let late = Task { try await memo.value { try await runs.run() } }
221
+ await runs.waitForRuns(2)
222
+ runs.release(1, .success(2))
223
+ #expect(try await withinTimeLimit { try await late.value } == 2)
224
+ #expect(try await withinTimeLimit { try await early.value } == 2)
225
+ runs.release(0, .success(1))
226
+ }
227
+
228
+ @Test func aCallerWithinTheBoundJoinsTheRun() async throws {
229
+ let clock = TestClock()
230
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
231
+ let runs = Runs()
232
+ let early = Task { try await memo.value { try await runs.run() } }
233
+ await runs.waitForRuns(1)
234
+ clock.now += .seconds(9)
235
+ let late = Task { try await memo.value { try await runs.run() } }
236
+ for _ in 0 ..< 100 {
237
+ await Task.yield()
238
+ }
239
+ #expect(runs.count == 1)
240
+ runs.release(0, .success(1))
241
+ #expect(try await withinTimeLimit { try await late.value } == 1)
242
+ #expect(try await withinTimeLimit { try await early.value } == 1)
243
+ }
244
+
245
+ @Test func theBoundCountsFromTheNewestRun() async throws {
246
+ let clock = TestClock()
247
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
248
+ let runs = Runs()
249
+ let first = Task { try await memo.value { try await runs.run() } }
250
+ await runs.waitForRuns(1)
251
+ clock.now += .seconds(11)
252
+ let second = Task { try await memo.value { try await runs.run() } }
253
+ await runs.waitForRuns(2)
254
+ clock.now += .seconds(5)
255
+ let third = Task { try await memo.value { try await runs.run() } }
256
+ for _ in 0 ..< 100 {
257
+ await Task.yield()
258
+ }
259
+ #expect(runs.count == 2)
260
+ runs.release(1, .success(2))
261
+ #expect(try await withinTimeLimit { try await third.value } == 2)
262
+ #expect(try await withinTimeLimit { try await first.value } == 2)
263
+ _ = try await second.value
264
+ runs.release(0, .success(1))
265
+ }
266
+
267
+ @Test func theFirstValueOfAGenerationIsKeptOverALaterRunsValue() async throws {
268
+ let clock = TestClock()
269
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
270
+ let runs = Runs()
271
+ let early = Task { try await memo.value { try await runs.run() } }
272
+ await runs.waitForRuns(1)
273
+ clock.now += .seconds(11)
274
+ let late = Task { try await memo.value { try await runs.run() } }
275
+ await runs.waitForRuns(2)
276
+ runs.release(1, .success(2))
277
+ _ = try await withinTimeLimit { try await late.value }
278
+ _ = try await withinTimeLimit { try await early.value }
279
+ runs.release(0, .success(1))
280
+ for _ in 0 ..< 100 {
281
+ await Task.yield()
282
+ }
283
+ #expect(try await memo.value { 3 } == 2)
284
+ }
285
+
286
+ @Test func aLaterRunsFailureLeavesTheEarlierRunsCallersWaiting() async throws {
287
+ let clock = TestClock()
288
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
289
+ let runs = Runs()
290
+ let early = Task { try await memo.value { try await runs.run() } }
291
+ await runs.waitForRuns(1)
292
+ clock.now += .seconds(11)
293
+ let late = Task { try await memo.value { try await runs.run() } }
294
+ await runs.waitForRuns(2)
295
+ runs.release(1, .failure(Failure()))
296
+ await #expect(throws: Failure.self) { try await withinTimeLimit { try await late.value } }
297
+ runs.release(0, .success(1))
298
+ #expect(try await withinTimeLimit { try await early.value } == 1)
299
+ }
300
+
301
+ @Test func aNewGenerationsValueReleasesTheCallersOfAnEarlierSilentRun() async throws {
302
+ let memo = GenerationMemo<Int>()
303
+ let runs = Runs()
304
+ let early = Task { try await memo.value { try await runs.run() } }
305
+ await runs.waitForRuns(1)
306
+ memo.invalidate()
307
+ let late = Task { try await memo.value { try await runs.run() } }
308
+ await runs.waitForRuns(2)
309
+ runs.release(1, .success(2))
310
+ #expect(try await withinTimeLimit { try await late.value } == 2)
311
+ #expect(try await withinTimeLimit { try await early.value } == 2)
312
+ runs.release(0, .success(1))
313
+ }
178
314
  }
@@ -0,0 +1,33 @@
1
+ import Testing
2
+
3
+ @testable import AudioBrowserTestable
4
+
5
+ @Suite("JSCallbackError")
6
+ struct JSCallbackErrorTests {
7
+ /// Nitro's `RuntimeError` before 0.37.2: an `Error` whose message is only its `description`.
8
+ struct NitroRuntimeError: Error, CustomStringConvertible {
9
+ let description: String
10
+ }
11
+
12
+ @Test func givesARejectionsMessageAsItsLocalizedDescription() {
13
+ let error = JSCallbackError(NitroRuntimeError(description: "token expired"))
14
+ #expect(error.localizedDescription == "token expired")
15
+ }
16
+
17
+ @Test func keepsASyncThrowsMessageWhole() {
18
+ let error = JSCallbackError(NitroRuntimeError(description: "Error: token expired"))
19
+ #expect(error.localizedDescription == "Error: token expired")
20
+ }
21
+
22
+ @Test func leavesOutAJSPromiseRejectionsErrorName() {
23
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "Error: token expired")).message == "token expired")
24
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "TypeError: bad header")).message == "bad header")
25
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "Error: upstream: 503")).message == "upstream: 503")
26
+ }
27
+
28
+ @Test func keepsAJSPromiseRejectionsNameThatIsNotAnErrorName() {
29
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "Timeout: took 30s")).message == "Timeout: took 30s")
30
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "ErrorCode: 7")).message == "ErrorCode: 7")
31
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "token expired")).message == "token expired")
32
+ }
33
+ }