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.
Files changed (239) 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 +41 -6
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
  5. package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
  6. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  7. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  8. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
  9. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
  10. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  12. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
  15. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
  16. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  17. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  18. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  19. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  20. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  21. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  22. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  23. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  24. package/android/src/main/res/values/strings.xml +5 -2
  25. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  26. package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
  27. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  28. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  30. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  31. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  32. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
  33. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
  34. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  35. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  36. package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
  37. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  38. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
  39. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
  40. package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
  41. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  42. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
  43. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
  44. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  45. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  46. package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
  47. package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
  48. package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
  49. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  50. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  51. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  52. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  53. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
  54. package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
  55. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  56. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  57. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  58. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  59. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  60. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  61. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  62. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  63. package/ios/AVPlayerEngine.swift +2 -2
  64. package/ios/Browser/BrowserPathHelper.swift +11 -9
  65. package/ios/Browser/PageResolver.swift +1 -1
  66. package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
  67. package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
  68. package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
  69. package/ios/CarPlay/SectionPresentation.swift +7 -0
  70. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  71. package/ios/HybridAudioBrowser+Player.swift +3 -2
  72. package/ios/HybridAudioBrowser.swift +1 -1
  73. package/ios/Model/NitroTypeStubs.swift +15 -0
  74. package/ios/Model/PlayerUpdateOptions.swift +2 -1
  75. package/ios/PlaybackEvent.swift +20 -0
  76. package/ios/Player/Player.swift +17 -3
  77. package/ios/Player/QueueManager.swift +23 -41
  78. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  79. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  80. package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
  81. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  82. package/ios/Tests/GenerationMemoTests.swift +136 -0
  83. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  84. package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
  85. package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
  86. package/ios/Tests/PlayerPolicyTests.swift +51 -28
  87. package/ios/Tests/PlayerProgressTests.swift +0 -2
  88. package/ios/Tests/PlayerTests.swift +54 -0
  89. package/ios/Tests/QueueManagerTests.swift +111 -78
  90. package/ios/Tests/RequestLayerTests.swift +11 -0
  91. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  92. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  93. package/ios/Tests/SectionPresentationTests.swift +13 -0
  94. package/ios/Tests/Support/TestTypes.swift +23 -1
  95. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  96. package/ios/Util/AwaitCallback.swift +16 -10
  97. package/ios/Util/GenerationMemo.swift +81 -17
  98. package/ios/Util/JSCallbackError.swift +23 -0
  99. package/ios/Util/OutputPicker.swift +25 -5
  100. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  101. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  102. package/lib/commonjs/features/browser-config.js +3 -2
  103. package/lib/commonjs/features/browser-config.js.map +1 -1
  104. package/lib/commonjs/features/browser.js +7 -8
  105. package/lib/commonjs/features/browser.js.map +1 -1
  106. package/lib/commonjs/features/output.js +7 -3
  107. package/lib/commonjs/features/output.js.map +1 -1
  108. package/lib/commonjs/features/player/options.js.map +1 -1
  109. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  110. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  111. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  112. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  114. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  115. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  116. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  117. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  118. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  119. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  120. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  121. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  122. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  123. package/lib/module/features/browser-config.js +3 -2
  124. package/lib/module/features/browser-config.js.map +1 -1
  125. package/lib/module/features/browser.js +7 -8
  126. package/lib/module/features/browser.js.map +1 -1
  127. package/lib/module/features/output.js +7 -3
  128. package/lib/module/features/output.js.map +1 -1
  129. package/lib/module/features/player/options.js.map +1 -1
  130. package/lib/module/web/NativeAudioBrowser.js +43 -2
  131. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  132. package/lib/module/web/browser/BrowserManager.js +37 -66
  133. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  134. package/lib/module/web/browser/SearchManager.js +1 -5
  135. package/lib/module/web/browser/SearchManager.js.map +1 -1
  136. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  137. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  138. package/lib/module/web/player/NowPlayingManager.js +3 -22
  139. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  140. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  141. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  142. package/lib/module/web/util/GenerationMemo.js +87 -0
  143. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  144. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  145. package/lib/typescript/src/features/browser.d.ts +7 -8
  146. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  147. package/lib/typescript/src/features/output.d.ts +8 -4
  148. package/lib/typescript/src/features/output.d.ts.map +1 -1
  149. package/lib/typescript/src/features/player/options.d.ts +19 -1
  150. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  151. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  152. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  153. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  154. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  155. package/lib/typescript/src/types/browser.d.ts +55 -8
  156. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  157. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  158. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  159. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  160. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  161. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  162. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  163. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  164. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  165. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  166. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  167. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  168. 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
  169. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  170. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  171. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  172. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  173. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  174. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  175. 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
  176. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  177. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  178. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  179. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  180. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  181. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  182. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  183. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
  184. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  185. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  186. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  187. 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
  188. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  189. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  190. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  191. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
  192. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  193. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  194. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  195. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  196. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  197. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  198. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  199. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  200. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  201. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  202. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  203. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  204. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
  205. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  206. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  207. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  208. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  209. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
  210. package/package.json +1 -1
  211. package/src/codegen-js-error-message.test.ts +78 -0
  212. package/src/features/browser-config.test.ts +7 -0
  213. package/src/features/browser-config.ts +3 -2
  214. package/src/features/browser.ts +7 -8
  215. package/src/features/output.ts +13 -5
  216. package/src/features/player/options.ts +19 -1
  217. package/src/specs/audio-browser.nitro.ts +16 -3
  218. package/src/types/browser-native.ts +4 -1
  219. package/src/types/browser.ts +60 -8
  220. package/src/web/NativeAudioBrowser.ts +43 -3
  221. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  222. package/src/web/browser/BrowserManager.ts +50 -79
  223. package/src/web/browser/SearchManager.ts +1 -8
  224. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  225. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  226. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  227. package/src/web/http/RequestConfigBuilder.ts +72 -57
  228. package/src/web/player/NowPlayingManager.test.ts +29 -0
  229. package/src/web/player/NowPlayingManager.ts +4 -27
  230. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  231. package/src/web/util/BrowserPathHelper.ts +6 -7
  232. package/src/web/util/GenerationMemo.test.ts +148 -0
  233. package/src/web/util/GenerationMemo.ts +103 -0
  234. package/website/guide/audio-output.md +34 -7
  235. package/website/guide/browser.md +21 -0
  236. package/website/guide/carplay.md +1 -1
  237. package/website/guide/configuration.md +10 -9
  238. package/website/guide/gate.md +1 -1
  239. package/website/guide/remote-controls.md +35 -0
@@ -1,43 +1,107 @@
1
- /// A value computed at most once per generation and shared by every caller of that generation.
1
+ /// A value kept per generation and shared by its callers.
2
2
  ///
3
3
  /// `invalidate()` starts a new generation. A caller whose computation finishes or fails after
4
4
  /// an invalidation computes again, so `value(_:)` never returns a stale result; `compute` must
5
5
  /// therefore read the state it depends on when it runs, not capture it. A failure is not kept:
6
6
  /// the next caller of the same generation tries again. A cancelled caller leaves at once and stops
7
7
  /// retrying; the computation runs on for the others.
8
+ ///
9
+ /// A caller joins the newest run of its generation only while that run is younger than
10
+ /// `shareFor`; past that it starts another, so one silent computation does not hold every later
11
+ /// caller. The current generation's first value releases the callers of every run, earlier
12
+ /// generations' included; a run's failure releases only its own.
8
13
  @MainActor
9
14
  final class GenerationMemo<Value: Sendable> {
15
+ private final class Run {
16
+ let generation: Int
17
+ let started: ContinuousClock.Instant
18
+ private var result: Result<Value, Error>?
19
+ private var waiters: [@Sendable (Result<Value, Error>) -> Void] = []
20
+
21
+ init(generation: Int, started: ContinuousClock.Instant) {
22
+ self.generation = generation
23
+ self.started = started
24
+ }
25
+
26
+ func subscribe(_ deliver: @escaping @Sendable (Result<Value, Error>) -> Void) {
27
+ if let result { deliver(result) } else { waiters.append(deliver) }
28
+ }
29
+
30
+ func settle(_ result: Result<Value, Error>) {
31
+ guard self.result == nil else { return }
32
+ self.result = result
33
+ let waiters = waiters
34
+ self.waiters = []
35
+ for waiter in waiters {
36
+ waiter(result)
37
+ }
38
+ }
39
+ }
40
+
41
+ private let shareFor: Duration
42
+ private let now: @MainActor @Sendable () -> ContinuousClock.Instant
10
43
  private var generation = 0
11
- private var current: (generation: Int, task: Task<Value, Error>)?
44
+ private var kept: Value?
45
+ /// Runs of every generation still computing and not yet released, oldest first.
46
+ private var running: [Run] = []
47
+
48
+ nonisolated init(
49
+ shareFor: Duration = callbackFallbackTimeout,
50
+ now: @escaping @MainActor @Sendable () -> ContinuousClock.Instant = { ContinuousClock.now },
51
+ ) {
52
+ self.shareFor = shareFor
53
+ self.now = now
54
+ }
12
55
 
13
56
  func invalidate() {
14
57
  generation += 1
58
+ kept = nil
15
59
  }
16
60
 
17
61
  func value(_ compute: @escaping @MainActor () async throws -> Value) async throws -> Value {
18
62
  while true {
19
63
  try Task.checkCancellation()
64
+ if let kept { return kept }
20
65
  let generation = generation
21
- let task: Task<Value, Error>
22
- if let current, current.generation == generation {
23
- task = current.task
24
- } else {
25
- task = Task {
26
- do {
27
- return try await compute()
28
- } catch {
29
- if self.current?.generation == generation { self.current = nil }
30
- throw error
31
- }
32
- }
33
- current = (generation, task)
34
- }
66
+ let newest = running.last { $0.generation == generation }
67
+ let run = newest.flatMap { now() - $0.started < shareFor ? $0 : nil } ?? start(compute)
35
68
  do {
36
- let value = try await awaitCallback { deliver in Task { await deliver(task.result) } }
69
+ let value = try await awaitCallback { deliver in
70
+ MainActor.assumeIsolated { run.subscribe(deliver) }
71
+ }
37
72
  if generation == self.generation { return value }
38
73
  } catch {
39
74
  if generation == self.generation { throw error }
40
75
  }
41
76
  }
42
77
  }
78
+
79
+ private func start(_ compute: @escaping @MainActor () async throws -> Value) -> Run {
80
+ let run = Run(generation: generation, started: now())
81
+ running.append(run)
82
+ Task { [weak self] in
83
+ let result: Result<Value, Error>
84
+ do {
85
+ result = try await .success(compute())
86
+ } catch {
87
+ result = .failure(error)
88
+ }
89
+ self?.finish(run, result)
90
+ }
91
+ return run
92
+ }
93
+
94
+ private func finish(_ run: Run, _ result: Result<Value, Error>) {
95
+ guard run.generation == generation, kept == nil, case let .success(value) = result else {
96
+ running.removeAll { $0 === run }
97
+ run.settle(result)
98
+ return
99
+ }
100
+ kept = value
101
+ let released = running
102
+ running = []
103
+ for run in released {
104
+ run.settle(.success(value))
105
+ }
106
+ }
43
107
  }
@@ -0,0 +1,23 @@
1
+ import Foundation
2
+
3
+ /// A JS callback's failure, its message as `localizedDescription`. Nitro's `RuntimeError`, which
4
+ /// hands Swift the failure, is a `LocalizedError` only from 0.37.2: before, its message is only its
5
+ /// `description`.
6
+ struct JSCallbackError: LocalizedError {
7
+ let message: String
8
+ var errorDescription: String? { message }
9
+
10
+ init(_ rejection: Error) {
11
+ message = String(describing: rejection)
12
+ }
13
+
14
+ /// For the rejection of a promise a JS callback returned, which reaches Swift as `Name: message`.
15
+ init(jsPromiseRejection rejection: Error) {
16
+ message = withoutErrorName(String(describing: rejection))
17
+ }
18
+ }
19
+
20
+ private func withoutErrorName(_ message: String) -> String {
21
+ guard let name = message.prefixMatch(of: #/(?:[A-Za-z_$][A-Za-z0-9_$]*)?Error: /#) else { return message }
22
+ return String(message[name.range.upperBound...])
23
+ }
@@ -2,12 +2,14 @@ import AVKit
2
2
  import os.log
3
3
  import UIKit
4
4
 
5
- /// Presents the system audio route picker over the topmost view controller.
5
+ /// Presents the system audio route picker over the topmost view controller from a source view at
6
+ /// `anchor`, a rect in the key window's coordinates, or at the window's top-left corner without one.
6
7
  @MainActor
7
8
  enum OutputPicker {
8
9
  private static let logger = Logger(subsystem: "com.audiobrowser", category: "OutputPicker")
10
+ private static let delegate = SourceRemovingDelegate()
9
11
 
10
- static func present() {
12
+ static func present(anchor: CGRect?) {
11
13
  guard let windowScene = UIApplication.shared.activeWindowScene,
12
14
  let window = windowScene.windows.first(where: { $0.isKeyWindow }),
13
15
  var topController = window.rootViewController
@@ -22,9 +24,15 @@ enum OutputPicker {
22
24
  // AVRoutePickerView has no API to present its picker, so its internal button is tapped. The
23
25
  // view must be visible to the system (a hidden source view suppresses the picker), and the
24
26
  // button can sit below the top-level subviews.
25
- let routePicker = AVRoutePickerView(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
27
+ let routePicker = AVRoutePickerView(
28
+ frame: topController.view.convert(RoutePickerSourceFrame.inWindow(anchor: anchor), from: nil),
29
+ )
26
30
  routePicker.alpha = 0.01
31
+ // Sized to the anchor, the view would take the taps meant for what lies under it.
32
+ routePicker.isUserInteractionEnabled = false
33
+ routePicker.delegate = delegate
27
34
  topController.view.addSubview(routePicker)
35
+ delegate.lifetime.added(routePicker)
28
36
 
29
37
  if let button = firstButton(in: routePicker) {
30
38
  button.sendActions(for: .touchUpInside)
@@ -32,9 +40,8 @@ enum OutputPicker {
32
40
  logger.error("openOutputPicker: no UIButton found inside AVRoutePickerView")
33
41
  }
34
42
 
35
- // On iPad the picker's popover anchors to this view, so it outlives the tap.
36
43
  DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
37
- routePicker.removeFromSuperview()
44
+ delegate.lifetime.settled(routePicker)
38
45
  }
39
46
  }
40
47
 
@@ -46,3 +53,16 @@ enum OutputPicker {
46
53
  return nil
47
54
  }
48
55
  }
56
+
57
+ @MainActor
58
+ private final class SourceRemovingDelegate: NSObject, @preconcurrency AVRoutePickerViewDelegate {
59
+ let lifetime = RoutePickerSourceLifetime<AVRoutePickerView> { $0.removeFromSuperview() }
60
+
61
+ func routePickerViewWillBeginPresentingRoutes(_ routePicker: AVRoutePickerView) {
62
+ lifetime.willBeginPresenting(routePicker)
63
+ }
64
+
65
+ func routePickerViewDidEndPresentingRoutes(_ routePicker: AVRoutePickerView) {
66
+ lifetime.didEndPresenting(routePicker)
67
+ }
68
+ }
@@ -0,0 +1,17 @@
1
+ import CoreGraphics
2
+
3
+ /// The frame, in window coordinates, of the route picker's source view, which the picker points
4
+ /// at: the anchor, at least 1x1 since a source view with no area suppresses the picker, else 1x1
5
+ /// at the window's top-left corner.
6
+ enum RoutePickerSourceFrame {
7
+ static func inWindow(anchor: CGRect?) -> CGRect {
8
+ guard let anchor else { return CGRect(x: 0, y: 0, width: 1, height: 1) }
9
+ let rect = anchor.standardized
10
+ return CGRect(
11
+ x: rect.minX,
12
+ y: rect.minY,
13
+ width: max(rect.width, 1),
14
+ height: max(rect.height, 1),
15
+ )
16
+ }
17
+ }
@@ -0,0 +1,34 @@
1
+ /// Decides when the source view of the system route picker leaves the window.
2
+ ///
3
+ /// The picker closes when its source view leaves, so a source stays while its picker shows and
4
+ /// goes when the picker ends. A source whose picker has not begun showing by `settled(_:)` goes
5
+ /// then. A picker that begins but never ends (a simulator's) keeps its source until the next
6
+ /// source is added.
7
+ @MainActor
8
+ final class RoutePickerSourceLifetime<Source: AnyObject> {
9
+ private let remove: (Source) -> Void
10
+ private weak var current: Source?
11
+ private weak var presenting: Source?
12
+
13
+ init(remove: @escaping (Source) -> Void) {
14
+ self.remove = remove
15
+ }
16
+
17
+ func added(_ source: Source) {
18
+ if let current, current !== source { remove(current) }
19
+ current = source
20
+ }
21
+
22
+ func willBeginPresenting(_ source: Source) {
23
+ presenting = source
24
+ }
25
+
26
+ func didEndPresenting(_ source: Source) {
27
+ if presenting === source { presenting = nil }
28
+ remove(source)
29
+ }
30
+
31
+ func settled(_ source: Source) {
32
+ if presenting !== source { remove(source) }
33
+ }
34
+ }
@@ -49,7 +49,7 @@ function splitLayer(layer) {
49
49
  const resolve = layer;
50
50
  // Normalize the sync-or-async resolver to Promise-only for the bridge so it
51
51
  // never sees a `T | Promise<T>` variant (which misreads the async case).
52
- // Resolvers run once per content generation, so the wrap costs nothing.
52
+ // Resolvers run rarely, so the wrap costs nothing.
53
53
  return {
54
54
  resolver: () => Promise.resolve(resolve())
55
55
  };
@@ -228,7 +228,8 @@ function toNativeConfig(config) {
228
228
  viewMoreTitle: config.viewMoreTitle,
229
229
  carPlayLoadingTitle: config.carPlayLoadingTitle,
230
230
  resolveAlbumPath: config.resolveAlbumPath,
231
- formatNavigationError: config.formatNavigationError
231
+ formatNavigationError: config.formatNavigationError,
232
+ findTrack: config.findTrack
232
233
  };
233
234
  }
234
235
  //# sourceMappingURL=browser-config.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["isCallback","source","isObjectValue","value","isTransformableRequestConfig","isRouteConfig","artwork","splitLayer","layer","resolve","resolver","Promise","config","flattenBrowseSource","browseCallback","browseConfig","browseStatic","searchSourceToRouteEntry","path","SEARCH_ROUTE_PATH","searchCallback","searchConfig","wrapTracksAsResolvedTrack","tracks","TABS_ROUTE_PATH","title","children","tabsSourceToRouteEntry","Array","isArray","wrappedCallback","flattenRouteEntry","browse","media","DEFAULT_ROUTE_PATH","exports","flattenRoutes","routes","tabs","search","entries","Object","push","length","undefined","MAX_TABS","validateBrowserConfiguration","warn","message","console","startsWith","page","toNativeConfig","request","requestResolver","browseResolver","nowPlayingArtwork","singleTrack","handleTrackLoad","androidControllerOfflineError","viewMoreTitle","carPlayLoadingTitle","resolveAlbumPath","formatNavigationError"],"sourceRoot":"../../../src","sources":["features/browser-config.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["isCallback","source","isObjectValue","value","isTransformableRequestConfig","isRouteConfig","artwork","splitLayer","layer","resolve","resolver","Promise","config","flattenBrowseSource","browseCallback","browseConfig","browseStatic","searchSourceToRouteEntry","path","SEARCH_ROUTE_PATH","searchCallback","searchConfig","wrapTracksAsResolvedTrack","tracks","TABS_ROUTE_PATH","title","children","tabsSourceToRouteEntry","Array","isArray","wrappedCallback","flattenRouteEntry","browse","media","DEFAULT_ROUTE_PATH","exports","flattenRoutes","routes","tabs","search","entries","Object","push","length","undefined","MAX_TABS","validateBrowserConfiguration","warn","message","console","startsWith","page","toNativeConfig","request","requestResolver","browseResolver","nowPlayingArtwork","singleTrack","handleTrackLoad","androidControllerOfflineError","viewMoreTitle","carPlayLoadingTitle","resolveAlbumPath","formatNavigationError","findTrack"],"sourceRoot":"../../../src","sources":["features/browser-config.ts"],"mappings":"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","ignoreList":[]}
@@ -199,15 +199,14 @@ function hasSearch() {
199
199
  *
200
200
  * When a search source is configured, resolves `[]` only when it found
201
201
  * nothing; a failed search rejects, so a caller can tell "no results" from
202
- * "the request failed". Exception: on Android an HTTP search source
203
- * (`TransformableRequestConfig`) resolves `[]` on any failure (non-2xx,
204
- * network or decode error); a callback source still rejects there. With no
205
- * search source configured, Android and web resolve `[]` and iOS rejects;
206
- * call {@link hasSearch} first.
202
+ * "the request failed". With no search source configured, Android and web
203
+ * resolve `[]` and iOS rejects; call {@link hasSearch} first.
207
204
  *
208
- * The rejection's message describes the failure; on native platforms JS sees
209
- * only that message. On web, a failed search request's `Error` also carries a
210
- * `code`, the
205
+ * The rejection's message describes the failure; on iOS JS sees only that
206
+ * message. On Android the message starts with the Kotlin exception's class and
207
+ * ends with its stack trace
208
+ * (`com.audiobrowser.NavigationErrorException: <message>\n\tat …`).
209
+ * On web, a failed search request's `Error` also carries a `code`, the
211
210
  * {@link features/errors!NavigationErrorType | NavigationErrorType} the
212
211
  * browse path reports as a
213
212
  * {@link features/errors!NavigationError | NavigationError}
@@ -1 +1 @@
1
- {"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","_browserConfig","currentConfiguration","configureBrowser","configuration","__DEV__","validateBrowserConfiguration","nativeBrowser","toNativeConfig","getBrowserConfiguration","navigate","pathOrTrack","navigatePath","navigateTrack","getPath","path","onPathChanged","exports","NativeUpdatedValue","emitterize","cb","usePath","useNativeUpdatedValue","getContent","onContentChanged","useContent","getTabs","tabs","onTabsChanged","useTabs","notifyContentChanged","invalidateAllContent","hasSearch","config","searchRoute","routes","find","r","SEARCH_ROUTE_PATH","searchCallback","searchConfig","search","query"],"sourceRoot":"../../../src","sources":["features/browser.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","_browserConfig","currentConfiguration","configureBrowser","configuration","__DEV__","validateBrowserConfiguration","nativeBrowser","toNativeConfig","getBrowserConfiguration","navigate","pathOrTrack","navigatePath","navigateTrack","getPath","path","onPathChanged","exports","NativeUpdatedValue","emitterize","cb","usePath","useNativeUpdatedValue","getContent","onContentChanged","useContent","getTabs","tabs","onTabsChanged","useTabs","notifyContentChanged","invalidateAllContent","hasSearch","config","searchRoute","routes","find","r","SEARCH_ROUTE_PATH","searchCallback","searchConfig","search","query"],"sourceRoot":"../../../src","sources":["features/browser.ts"],"mappings":"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","ignoreList":[]}
@@ -17,13 +17,17 @@ var _useNativeUpdatedValue = require("../utils/useNativeUpdatedValue");
17
17
  * Presents the system audio output switcher so the listener can move playback to
18
18
  * another output. Cross-platform:
19
19
  * - **iOS** — the system route picker (Bluetooth, AirPlay / Sonos-via-AirPlay,
20
- * speaker). Always available.
20
+ * speaker). Always available. Its source view takes `anchor`, a rect in points
21
+ * in the key window's coordinates — pass the frame of the control that opened
22
+ * it — else sits at the window's top-left corner. A picker shown as a menu
23
+ * appears at its source view; a full-screen sheet does not move.
21
24
  * - **Android** — the system Output Switcher (Bluetooth / speaker / Cast list) on
22
25
  * Android 11+. No-op on older Android — gate on {@link supportsOutputSwitcher}.
26
+ * Ignores `anchor`.
23
27
  * - **Web** — no-op.
24
28
  */
25
- function openOutputPicker() {
26
- _native.nativeBrowser.openOutputPicker();
29
+ function openOutputPicker(anchor) {
30
+ _native.nativeBrowser.openOutputPicker(anchor);
27
31
  }
28
32
 
29
33
  /**
@@ -1 +1 @@
1
- {"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","openOutputPicker","nativeBrowser","supportsOutputSwitcher","getOutput","onOutputChanged","exports","NativeUpdatedValue","emitterize","cb","useOutput","useNativeUpdatedValue"],"sourceRoot":"../../../src","sources":["features/output.ts"],"mappings":";;;;;;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AAIA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASG,gBAAgBA,CAAA,EAAS;EACvCC,qBAAa,CAACD,gBAAgB,CAAC,CAAC;AAClC;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASE,sBAAsBA,CAAA,EAAY;EAChD,OAAOD,qBAAa,CAACC,sBAAsB,CAAC,CAAC;AAC/C;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,SAASA,CAAA,EAAuB;EAC9C,OAAOF,qBAAa,CAACE,SAAS,CAAC,CAAC;AAClC;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAGE,sCAAkB,CAACC,UAAU,CACzDC,EAAE,IAAMP,qBAAa,CAACG,eAAe,GAAGI,EAC3C,CAAC;;AAED;;AAEA;AACA;AACA;AACA;AACO,SAASC,SAASA,CAAA,EAAuB;EAC9C,OAAO,IAAAC,4CAAqB,EAACP,SAAS,EAAEC,eAAe,CAAC;AAC1D","ignoreList":[]}
1
+ {"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","openOutputPicker","anchor","nativeBrowser","supportsOutputSwitcher","getOutput","onOutputChanged","exports","NativeUpdatedValue","emitterize","cb","useOutput","useNativeUpdatedValue"],"sourceRoot":"../../../src","sources":["features/output.ts"],"mappings":";;;;;;;;;;AAKA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AAIA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASG,gBAAgBA,CAACC,MAA2B,EAAQ;EAClEC,qBAAa,CAACF,gBAAgB,CAACC,MAAM,CAAC;AACxC;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASE,sBAAsBA,CAAA,EAAY;EAChD,OAAOD,qBAAa,CAACC,sBAAsB,CAAC,CAAC;AAC/C;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,SAASA,CAAA,EAAuB;EAC9C,OAAOF,qBAAa,CAACE,SAAS,CAAC,CAAC;AAClC;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAGE,sCAAkB,CAACC,UAAU,CACzDC,EAAE,IAAMP,qBAAa,CAACG,eAAe,GAAGI,EAC3C,CAAC;;AAED;;AAEA;AACA;AACA;AACA;AACO,SAASC,SAASA,CAAA,EAAuB;EAC9C,OAAO,IAAAC,4CAAqB,EAACP,SAAS,EAAEC,eAAe,CAAC;AAC1D","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","_validateOptions","updateOptions","options","validateIOSUpdateOptions","ios","nativeBrowser","getOptions","onOptionsChanged","exports","NativeUpdatedValue","emitterize","cb","useOptions","useNativeUpdatedValue"],"sourceRoot":"../../../../src","sources":["features/player/options.ts"],"mappings":";;;;;;;;;AAIA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAyFA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAgDA;AACA;AACA;AACA;;AA6BA;AACA;AACA;AACA;;AA6BA;AACA;AACA;AACA;;AA6BA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;;AAqCA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAqDA;AACA;AACA;AACA;;AAoCA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASI,aAAaA,CAACC,OAAsB,EAAQ;EAC1D,IAAAC,yCAAwB,EAACD,OAAO,CAACE,GAAG,CAAC;EACrCC,qBAAa,CAACJ,aAAa,CAACC,OAAO,CAAC;AACtC;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASI,UAAUA,CAAA,EAAY;EACpC,OAAOD,qBAAa,CAACC,UAAU,CAAC,CAAC;AACnC;;AAEA;;AAEA;AACA;AACA;AACA;AACO,MAAMC,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAGE,sCAAkB,CAACC,UAAU,CAC1DC,EAAE,IAAMN,qBAAa,CAACE,gBAAgB,GAAGI,EAC5C,CAAC;;AAED;;AAEA;AACA;AACA;AACA;AACO,SAASC,UAAUA,CAAA,EAAY;EACpC,OAAO,IAAAC,4CAAqB,EAACP,UAAU,EAAEC,gBAAgB,CAAC;AAC5D","ignoreList":[]}
1
+ {"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","_validateOptions","updateOptions","options","validateIOSUpdateOptions","ios","nativeBrowser","getOptions","onOptionsChanged","exports","NativeUpdatedValue","emitterize","cb","useOptions","useNativeUpdatedValue"],"sourceRoot":"../../../../src","sources":["features/player/options.ts"],"mappings":";;;;;;;;;AAIA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AA0GA;AACA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAgDA;AACA;AACA;AACA;;AA6BA;AACA;AACA;AACA;;AA6BA;AACA;AACA;AACA;;AA6BA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;;AAsCA;AACA;AACA;AACA;;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAqDA;AACA;AACA;AACA;;AAoCA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASI,aAAaA,CAACC,OAAsB,EAAQ;EAC1D,IAAAC,yCAAwB,EAACD,OAAO,CAACE,GAAG,CAAC;EACrCC,qBAAa,CAACJ,aAAa,CAACC,OAAO,CAAC;AACtC;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASI,UAAUA,CAAA,EAAY;EACpC,OAAOD,qBAAa,CAACC,UAAU,CAAC,CAAC;AACnC;;AAEA;;AAEA;AACA;AACA;AACA;AACO,MAAMC,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAGE,sCAAkB,CAACC,UAAU,CAC1DC,EAAE,IAAMN,qBAAa,CAACE,gBAAgB,GAAGI,EAC5C,CAAC;;AAED;;AAEA;AACA;AACA;AACA;AACO,SAASC,UAAUA,CAAA,EAAY;EACpC,OAAO,IAAAC,4CAAqB,EAACP,UAAU,EAAEC,gBAAgB,CAAC;AAC5D","ignoreList":[]}
@@ -20,6 +20,9 @@ var _TrackPlayer = require("./TrackPlayer");
20
20
  var _PlaybackTimer = require("./TrackPlayer/PlaybackTimer");
21
21
  var _PlayingStateFactory = require("./TrackPlayer/PlayingStateFactory");
22
22
  var _BrowserPathHelper = require("./util/BrowserPathHelper");
23
+ /** Native's now-playing artwork size, so `imageQueryParams` ask for the same image. */
24
+ const SESSION_ARTWORK_SIZE_PX = 1200;
25
+
23
26
  /**
24
27
  * Web implementation of AudioBrowser (unified browser + player)
25
28
  */
@@ -44,6 +47,8 @@ class NativeAudioBrowser extends _TrackPlayer.QueuePlayer {
44
47
 
45
48
  // Managers
46
49
 
50
+ /** The current track's artwork for the OS media controls, once resolved. */
51
+
47
52
  // Player state
48
53
  progressTimer = new _PlaybackTimer.PlaybackTimer();
49
54
  intervalTimer = new _PlaybackTimer.PlaybackTimer();
@@ -241,7 +246,39 @@ class NativeAudioBrowser extends _TrackPlayer.QueuePlayer {
241
246
  */
242
247
  publishNowPlaying(metadata) {
243
248
  this.onNowPlayingChanged(metadata);
244
- this.remoteCommands.setMetadata(metadata);
249
+ this.publishSessionMetadata(metadata);
250
+ }
251
+
252
+ /**
253
+ * Shows no artwork until the current track's has resolved, as iOS does,
254
+ * rather than the raw `artwork`, which the config may not leave a loadable
255
+ * URL.
256
+ */
257
+ publishSessionMetadata(metadata) {
258
+ this.remoteCommands.setMetadata({
259
+ ...metadata,
260
+ artwork: this.sessionArtworkUri
261
+ });
262
+ }
263
+
264
+ /**
265
+ * Resolves `track`'s artwork at native's now-playing size, falling back to
266
+ * its own `artworkSource` as native does, then republishes the OS metadata
267
+ * if `track` is still current.
268
+ */
269
+ async resolveSessionArtwork(track) {
270
+ const {
271
+ nowPlayingArtwork,
272
+ artwork
273
+ } = this.browserManager.configuration;
274
+ const source = await this.browserManager.resolveArtworkSource(track, {
275
+ width: SESSION_ARTWORK_SIZE_PX,
276
+ height: SESSION_ARTWORK_SIZE_PX
277
+ }, nowPlayingArtwork ?? artwork);
278
+ if (this.current !== track) return;
279
+ this.sessionArtworkUri = source?.uri ?? track.artworkSource?.uri;
280
+ const nowPlaying = this.getNowPlaying();
281
+ if (nowPlaying) this.publishSessionMetadata(nowPlaying);
245
282
  }
246
283
  setupProgressUpdates(interval) {
247
284
  // Match Android: emit progress during loading, buffering, and playing.
@@ -554,6 +591,10 @@ class NativeAudioBrowser extends _TrackPlayer.QueuePlayer {
554
591
  // As Android's onMediaItemTransition does: a new item is a clean slate,
555
592
  // a retry of the same one keeps what the consumer set.
556
593
  this.nowPlayingManager.clearNowPlayingOverride();
594
+ this.sessionArtworkUri = undefined;
595
+ this.resolveSessionArtwork(track).catch(error => {
596
+ console.error('Failed to publish now-playing artwork:', error);
597
+ });
557
598
  try {
558
599
  this.onPlaybackActiveTrackChanged({
559
600
  lastTrack,
@@ -1025,7 +1066,7 @@ class NativeAudioBrowser extends _TrackPlayer.QueuePlayer {
1025
1066
  getOutput() {
1026
1067
  return undefined;
1027
1068
  }
1028
- openOutputPicker() {
1069
+ openOutputPicker(_anchor) {
1029
1070
  // No-op on web
1030
1071
  }
1031
1072
  supportsOutputSwitcher() {