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
@@ -0,0 +1,83 @@
1
+ ///
2
+ /// FindTrackParams.hpp
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ #pragma once
9
+
10
+ #if __has_include(<NitroModules/JSIConverter.hpp>)
11
+ #include <NitroModules/JSIConverter.hpp>
12
+ #else
13
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
14
+ #endif
15
+ #if __has_include(<NitroModules/NitroDefines.hpp>)
16
+ #include <NitroModules/NitroDefines.hpp>
17
+ #else
18
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
19
+ #endif
20
+ #if __has_include(<NitroModules/JSIHelpers.hpp>)
21
+ #include <NitroModules/JSIHelpers.hpp>
22
+ #else
23
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
24
+ #endif
25
+ #if __has_include(<NitroModules/PropNameIDCache.hpp>)
26
+ #include <NitroModules/PropNameIDCache.hpp>
27
+ #else
28
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
29
+ #endif
30
+
31
+
32
+
33
+ #include <string>
34
+
35
+ namespace margelo::nitro::audiobrowser {
36
+
37
+ /**
38
+ * A struct which can be represented as a JavaScript object (FindTrackParams).
39
+ */
40
+ struct FindTrackParams final {
41
+ public:
42
+ std::string id SWIFT_PRIVATE;
43
+
44
+ public:
45
+ FindTrackParams() = default;
46
+ explicit FindTrackParams(std::string id): id(id) {}
47
+
48
+ public:
49
+ friend bool operator==(const FindTrackParams& lhs, const FindTrackParams& rhs) = default;
50
+ };
51
+
52
+ } // namespace margelo::nitro::audiobrowser
53
+
54
+ namespace margelo::nitro {
55
+
56
+ // C++ FindTrackParams <> JS FindTrackParams (object)
57
+ template <>
58
+ struct JSIConverter<margelo::nitro::audiobrowser::FindTrackParams> final {
59
+ static inline margelo::nitro::audiobrowser::FindTrackParams fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
60
+ jsi::Object obj = arg.asObject(runtime);
61
+ return margelo::nitro::audiobrowser::FindTrackParams(
62
+ JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "id")))
63
+ );
64
+ }
65
+ static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::FindTrackParams& arg) {
66
+ jsi::Object obj(runtime);
67
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "id"), JSIConverter<std::string>::toJSI(runtime, arg.id));
68
+ return obj;
69
+ }
70
+ static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
71
+ if (!value.isObject()) {
72
+ return false;
73
+ }
74
+ jsi::Object obj = value.getObject(runtime);
75
+ if (!nitro::isPlainObject(runtime, obj)) {
76
+ return false;
77
+ }
78
+ if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "id")))) return false;
79
+ return true;
80
+ }
81
+ };
82
+
83
+ } // namespace margelo::nitro
@@ -97,6 +97,8 @@ namespace margelo::nitro::audiobrowser { enum class RepeatMode; }
97
97
  namespace margelo::nitro::audiobrowser { struct PlaybackError; }
98
98
  // Forward declaration of `NowPlayingUpdate` to properly resolve imports.
99
99
  namespace margelo::nitro::audiobrowser { struct NowPlayingUpdate; }
100
+ // Forward declaration of `OutputPickerAnchor` to properly resolve imports.
101
+ namespace margelo::nitro::audiobrowser { struct OutputPickerAnchor; }
100
102
  // Forward declaration of `BatteryOptimizationStatus` to properly resolve imports.
101
103
  namespace margelo::nitro::audiobrowser { enum class BatteryOptimizationStatus; }
102
104
 
@@ -149,6 +151,7 @@ namespace margelo::nitro::audiobrowser { enum class BatteryOptimizationStatus; }
149
151
  #include "RepeatMode.hpp"
150
152
  #include "PlaybackError.hpp"
151
153
  #include "NowPlayingUpdate.hpp"
154
+ #include "OutputPickerAnchor.hpp"
152
155
  #include "BatteryOptimizationStatus.hpp"
153
156
 
154
157
  namespace margelo::nitro::audiobrowser {
@@ -363,7 +366,7 @@ namespace margelo::nitro::audiobrowser {
363
366
  virtual double getSystemVolume() = 0;
364
367
  virtual void setSystemVolume(double volume) = 0;
365
368
  virtual std::optional<Output> getOutput() = 0;
366
- virtual void openOutputPicker() = 0;
369
+ virtual void openOutputPicker(const std::optional<OutputPickerAnchor>& anchor) = 0;
367
370
  virtual bool supportsOutputSwitcher() = 0;
368
371
  virtual std::optional<EqualizerSettings> getEqualizerSettings() = 0;
369
372
  virtual void setEqualizerEnabled(bool enabled) = 0;
@@ -44,6 +44,8 @@ namespace margelo::nitro::audiobrowser { struct Track; }
44
44
  namespace margelo::nitro::audiobrowser { struct FormattedNavigationError; }
45
45
  // Forward declaration of `FormatNavigationErrorParams` to properly resolve imports.
46
46
  namespace margelo::nitro::audiobrowser { struct FormatNavigationErrorParams; }
47
+ // Forward declaration of `FindTrackParams` to properly resolve imports.
48
+ namespace margelo::nitro::audiobrowser { struct FindTrackParams; }
47
49
 
48
50
  #include <string>
49
51
  #include <optional>
@@ -58,6 +60,7 @@ namespace margelo::nitro::audiobrowser { struct FormatNavigationErrorParams; }
58
60
  #include "Track.hpp"
59
61
  #include "FormattedNavigationError.hpp"
60
62
  #include "FormatNavigationErrorParams.hpp"
63
+ #include "FindTrackParams.hpp"
61
64
 
62
65
  namespace margelo::nitro::audiobrowser {
63
66
 
@@ -82,13 +85,14 @@ namespace margelo::nitro::audiobrowser {
82
85
  std::optional<std::string> carPlayLoadingTitle SWIFT_PRIVATE;
83
86
  std::optional<std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const Track& /* track */)>> resolveAlbumPath SWIFT_PRIVATE;
84
87
  std::optional<std::function<std::shared_ptr<Promise<std::optional<FormattedNavigationError>>>(const FormatNavigationErrorParams& /* params */)>> formatNavigationError SWIFT_PRIVATE;
88
+ std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>(const FindTrackParams& /* params */)>> findTrack SWIFT_PRIVATE;
85
89
 
86
90
  public:
87
91
  NativeBrowserConfiguration() = default;
88
- explicit NativeBrowserConfiguration(std::optional<std::string> path, std::optional<TransformableRequestConfig> request, std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<TransformableRequestConfig>>>>()>> requestResolver, std::optional<TransformableRequestConfig> browse, std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<TransformableRequestConfig>>>>()>> browseResolver, std::optional<MediaRequestConfig> media, std::optional<ArtworkRequestConfig> artwork, std::optional<ArtworkRequestConfig> nowPlayingArtwork, std::optional<std::vector<NativeRouteEntry>> routes, std::optional<bool> singleTrack, std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<void>>>>(const TrackLoadEvent& /* event */)>> handleTrackLoad, std::optional<bool> androidControllerOfflineError, std::optional<std::function<std::shared_ptr<Promise<std::string>>()>> viewMoreTitle, std::optional<std::string> carPlayLoadingTitle, std::optional<std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const Track& /* track */)>> resolveAlbumPath, std::optional<std::function<std::shared_ptr<Promise<std::optional<FormattedNavigationError>>>(const FormatNavigationErrorParams& /* params */)>> formatNavigationError): path(path), request(request), requestResolver(requestResolver), browse(browse), browseResolver(browseResolver), media(media), artwork(artwork), nowPlayingArtwork(nowPlayingArtwork), routes(routes), singleTrack(singleTrack), handleTrackLoad(handleTrackLoad), androidControllerOfflineError(androidControllerOfflineError), viewMoreTitle(viewMoreTitle), carPlayLoadingTitle(carPlayLoadingTitle), resolveAlbumPath(resolveAlbumPath), formatNavigationError(formatNavigationError) {}
92
+ explicit NativeBrowserConfiguration(std::optional<std::string> path, std::optional<TransformableRequestConfig> request, std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<TransformableRequestConfig>>>>()>> requestResolver, std::optional<TransformableRequestConfig> browse, std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<TransformableRequestConfig>>>>()>> browseResolver, std::optional<MediaRequestConfig> media, std::optional<ArtworkRequestConfig> artwork, std::optional<ArtworkRequestConfig> nowPlayingArtwork, std::optional<std::vector<NativeRouteEntry>> routes, std::optional<bool> singleTrack, std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<void>>>>(const TrackLoadEvent& /* event */)>> handleTrackLoad, std::optional<bool> androidControllerOfflineError, std::optional<std::function<std::shared_ptr<Promise<std::string>>()>> viewMoreTitle, std::optional<std::string> carPlayLoadingTitle, std::optional<std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const Track& /* track */)>> resolveAlbumPath, std::optional<std::function<std::shared_ptr<Promise<std::optional<FormattedNavigationError>>>(const FormatNavigationErrorParams& /* params */)>> formatNavigationError, std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>(const FindTrackParams& /* params */)>> findTrack): path(path), request(request), requestResolver(requestResolver), browse(browse), browseResolver(browseResolver), media(media), artwork(artwork), nowPlayingArtwork(nowPlayingArtwork), routes(routes), singleTrack(singleTrack), handleTrackLoad(handleTrackLoad), androidControllerOfflineError(androidControllerOfflineError), viewMoreTitle(viewMoreTitle), carPlayLoadingTitle(carPlayLoadingTitle), resolveAlbumPath(resolveAlbumPath), formatNavigationError(formatNavigationError), findTrack(findTrack) {}
89
93
 
90
94
  public:
91
- // NativeBrowserConfiguration is not equatable because these properties are not equatable: request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, handleTrackLoad, viewMoreTitle, resolveAlbumPath, formatNavigationError
95
+ // NativeBrowserConfiguration is not equatable because these properties are not equatable: request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, handleTrackLoad, viewMoreTitle, resolveAlbumPath, formatNavigationError, findTrack
92
96
  };
93
97
 
94
98
  } // namespace margelo::nitro::audiobrowser
@@ -116,7 +120,8 @@ namespace margelo::nitro {
116
120
  JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::string>>()>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "viewMoreTitle"))),
117
121
  JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "carPlayLoadingTitle"))),
118
122
  JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const margelo::nitro::audiobrowser::Track&)>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "resolveAlbumPath"))),
119
- JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::optional<margelo::nitro::audiobrowser::FormattedNavigationError>>>(const margelo::nitro::audiobrowser::FormatNavigationErrorParams&)>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "formatNavigationError")))
123
+ JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::optional<margelo::nitro::audiobrowser::FormattedNavigationError>>>(const margelo::nitro::audiobrowser::FormatNavigationErrorParams&)>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "formatNavigationError"))),
124
+ JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<margelo::nitro::audiobrowser::Track>>>>>(const margelo::nitro::audiobrowser::FindTrackParams&)>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "findTrack")))
120
125
  );
121
126
  }
122
127
  static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::NativeBrowserConfiguration& arg) {
@@ -137,6 +142,7 @@ namespace margelo::nitro {
137
142
  obj.setProperty(runtime, PropNameIDCache::get(runtime, "carPlayLoadingTitle"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.carPlayLoadingTitle));
138
143
  obj.setProperty(runtime, PropNameIDCache::get(runtime, "resolveAlbumPath"), JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const margelo::nitro::audiobrowser::Track&)>>>::toJSI(runtime, arg.resolveAlbumPath));
139
144
  obj.setProperty(runtime, PropNameIDCache::get(runtime, "formatNavigationError"), JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::optional<margelo::nitro::audiobrowser::FormattedNavigationError>>>(const margelo::nitro::audiobrowser::FormatNavigationErrorParams&)>>>::toJSI(runtime, arg.formatNavigationError));
145
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "findTrack"), JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<margelo::nitro::audiobrowser::Track>>>>>(const margelo::nitro::audiobrowser::FindTrackParams&)>>>::toJSI(runtime, arg.findTrack));
140
146
  return obj;
141
147
  }
142
148
  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -163,6 +169,7 @@ namespace margelo::nitro {
163
169
  if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "carPlayLoadingTitle")))) return false;
164
170
  if (!JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const margelo::nitro::audiobrowser::Track&)>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "resolveAlbumPath")))) return false;
165
171
  if (!JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::optional<margelo::nitro::audiobrowser::FormattedNavigationError>>>(const margelo::nitro::audiobrowser::FormatNavigationErrorParams&)>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "formatNavigationError")))) return false;
172
+ if (!JSIConverter<std::optional<std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<margelo::nitro::audiobrowser::Track>>>>>(const margelo::nitro::audiobrowser::FindTrackParams&)>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "findTrack")))) return false;
166
173
  return true;
167
174
  }
168
175
  };
@@ -0,0 +1,95 @@
1
+ ///
2
+ /// OutputPickerAnchor.hpp
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ #pragma once
9
+
10
+ #if __has_include(<NitroModules/JSIConverter.hpp>)
11
+ #include <NitroModules/JSIConverter.hpp>
12
+ #else
13
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
14
+ #endif
15
+ #if __has_include(<NitroModules/NitroDefines.hpp>)
16
+ #include <NitroModules/NitroDefines.hpp>
17
+ #else
18
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
19
+ #endif
20
+ #if __has_include(<NitroModules/JSIHelpers.hpp>)
21
+ #include <NitroModules/JSIHelpers.hpp>
22
+ #else
23
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
24
+ #endif
25
+ #if __has_include(<NitroModules/PropNameIDCache.hpp>)
26
+ #include <NitroModules/PropNameIDCache.hpp>
27
+ #else
28
+ #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
29
+ #endif
30
+
31
+
32
+
33
+
34
+
35
+ namespace margelo::nitro::audiobrowser {
36
+
37
+ /**
38
+ * A struct which can be represented as a JavaScript object (OutputPickerAnchor).
39
+ */
40
+ struct OutputPickerAnchor final {
41
+ public:
42
+ double x SWIFT_PRIVATE;
43
+ double y SWIFT_PRIVATE;
44
+ double width SWIFT_PRIVATE;
45
+ double height SWIFT_PRIVATE;
46
+
47
+ public:
48
+ OutputPickerAnchor() = default;
49
+ explicit OutputPickerAnchor(double x, double y, double width, double height): x(x), y(y), width(width), height(height) {}
50
+
51
+ public:
52
+ friend bool operator==(const OutputPickerAnchor& lhs, const OutputPickerAnchor& rhs) = default;
53
+ };
54
+
55
+ } // namespace margelo::nitro::audiobrowser
56
+
57
+ namespace margelo::nitro {
58
+
59
+ // C++ OutputPickerAnchor <> JS OutputPickerAnchor (object)
60
+ template <>
61
+ struct JSIConverter<margelo::nitro::audiobrowser::OutputPickerAnchor> final {
62
+ static inline margelo::nitro::audiobrowser::OutputPickerAnchor fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
63
+ jsi::Object obj = arg.asObject(runtime);
64
+ return margelo::nitro::audiobrowser::OutputPickerAnchor(
65
+ JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "x"))),
66
+ JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "y"))),
67
+ JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width"))),
68
+ JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height")))
69
+ );
70
+ }
71
+ static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::OutputPickerAnchor& arg) {
72
+ jsi::Object obj(runtime);
73
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "x"), JSIConverter<double>::toJSI(runtime, arg.x));
74
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "y"), JSIConverter<double>::toJSI(runtime, arg.y));
75
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "width"), JSIConverter<double>::toJSI(runtime, arg.width));
76
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "height"), JSIConverter<double>::toJSI(runtime, arg.height));
77
+ return obj;
78
+ }
79
+ static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
80
+ if (!value.isObject()) {
81
+ return false;
82
+ }
83
+ jsi::Object obj = value.getObject(runtime);
84
+ if (!nitro::isPlainObject(runtime, obj)) {
85
+ return false;
86
+ }
87
+ if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "x")))) return false;
88
+ if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "y")))) return false;
89
+ if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "width")))) return false;
90
+ if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "height")))) return false;
91
+ return true;
92
+ }
93
+ };
94
+
95
+ } // namespace margelo::nitro
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-audio-browser",
3
- "version": "1.0.0-next.5",
3
+ "version": "1.0.0-next.6",
4
4
  "description": "React Native audio playback with a browsable media tree, CarPlay, Android Auto and lock-screen controls, built on Nitro Modules.",
5
5
  "keywords": [
6
6
  "android",
@@ -0,0 +1,78 @@
1
+ import { readdirSync, readFileSync } from 'node:fs'
2
+ import { join } from 'node:path'
3
+ import { describe, it, expect } from 'vitest'
4
+ import { KotlinCxxBridgedType } from '../codegen/syntax/kotlin/KotlinCxxBridgedType.js'
5
+ import { createSwiftCxxHelpers } from '../codegen/syntax/swift/SwiftCxxTypeHelper.js'
6
+ import { ErrorType } from '../codegen/syntax/types/ErrorType.js'
7
+ import { FunctionType } from '../codegen/syntax/types/FunctionType.js'
8
+ import { NamedWrappingType } from '../codegen/syntax/types/NamedWrappingType.js'
9
+ import { PromiseType } from '../codegen/syntax/types/PromiseType.js'
10
+ import { StringType } from '../codegen/syntax/types/StringType.js'
11
+ import { VoidType } from '../codegen/syntax/types/VoidType.js'
12
+
13
+ // The vendored nitrogen's JSError unwrap (see codegen/syntax/c++/withoutJSStack.js).
14
+ const ANDROID = join(process.cwd(), 'nitrogen/generated/android/c++')
15
+ const IOS_BRIDGE = join(
16
+ process.cwd(),
17
+ 'nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp'
18
+ )
19
+ const UNWRAP =
20
+ /^\[\]\(const std::exception_ptr& __error\) -> std::exception_ptr \{\n.*catch \(const facebook::jsi::JSError& /s
21
+
22
+ /** What each C++ error is converted from on its way to Kotlin. */
23
+ const toKotlin = (code: string) =>
24
+ code.split('jni::getJavaExceptionForCppException(').slice(1)
25
+
26
+ /** What each C++ error is converted from on its way to a Swift closure. */
27
+ const toSwift = (code: string) =>
28
+ [
29
+ ...code.matchAll(
30
+ /const std::exception_ptr& error\) mutable -> void \{\n\s*swiftClosure\.call\(([\s\S]*?)\);\n\s*\};/g
31
+ )
32
+ ].map(([, argument]) => argument ?? '')
33
+
34
+ const unwrapped = (argument: string) => UNWRAP.test(argument.trim())
35
+
36
+ describe('codegen: a JS error crossing to Kotlin or Swift', () => {
37
+ it('reaches Kotlin without its stack from a rejected C++ Promise', () => {
38
+ const code = new KotlinCxxBridgedType(
39
+ new PromiseType(new StringType())
40
+ ).parseFromCppToKotlin('promise', 'c++')
41
+ expect(toKotlin(code)).toHaveLength(1)
42
+ expect(toKotlin(code).every(unwrapped)).toBe(true)
43
+ })
44
+
45
+ it('reaches Kotlin without its stack as a value', () => {
46
+ const code = new KotlinCxxBridgedType(new ErrorType()).parseFromCppToKotlin(
47
+ 'error',
48
+ 'c++'
49
+ )
50
+ expect(toKotlin(code).every(unwrapped)).toBe(true)
51
+ })
52
+
53
+ it('reaches a Swift closure without its stack', () => {
54
+ const rejecter = new FunctionType(new VoidType(), [
55
+ new NamedWrappingType('error', new ErrorType())
56
+ ])
57
+ const code = createSwiftCxxHelpers(rejecter)?.cxxImplementation?.code ?? ''
58
+ expect(toSwift(code)).toHaveLength(1)
59
+ expect(toSwift(code).every(unwrapped)).toBe(true)
60
+ })
61
+
62
+ describe('in the committed bridge', () => {
63
+ const android = readdirSync(ANDROID)
64
+ .filter((file) => file.endsWith('.hpp'))
65
+ .flatMap((file) => toKotlin(readFileSync(join(ANDROID, file), 'utf8')))
66
+ const ios = toSwift(readFileSync(IOS_BRIDGE, 'utf8'))
67
+
68
+ it('are all read', () => {
69
+ expect(android.length).toBeGreaterThan(0)
70
+ expect(ios.length).toBeGreaterThan(0)
71
+ })
72
+
73
+ it('reach Kotlin and Swift without their stack', () => {
74
+ expect(android.filter((a) => !unwrapped(a))).toEqual([])
75
+ expect(ios.filter((a) => !unwrapped(a))).toEqual([])
76
+ })
77
+ })
78
+ })
@@ -79,6 +79,13 @@ describe('toNativeConfig route classification', () => {
79
79
  })
80
80
  })
81
81
 
82
+ describe('toNativeConfig callbacks', () => {
83
+ it('hands findTrack to native', () => {
84
+ const findTrack = async () => undefined
85
+ expect(toNativeConfig({ findTrack }).findTrack).toBe(findTrack)
86
+ })
87
+ })
88
+
82
89
  describe('validateBrowserConfiguration', () => {
83
90
  let warnings: string[]
84
91
 
@@ -85,7 +85,7 @@ function splitLayer(
85
85
  const resolve = layer as RequestConfigResolver
86
86
  // Normalize the sync-or-async resolver to Promise-only for the bridge so it
87
87
  // never sees a `T | Promise<T>` variant (which misreads the async case).
88
- // Resolvers run once per content generation, so the wrap costs nothing.
88
+ // Resolvers run rarely, so the wrap costs nothing.
89
89
  return { resolver: () => Promise.resolve(resolve()) }
90
90
  }
91
91
  return { config: layer as TransformableRequestConfig }
@@ -295,6 +295,7 @@ export function toNativeConfig(
295
295
  viewMoreTitle: config.viewMoreTitle,
296
296
  carPlayLoadingTitle: config.carPlayLoadingTitle,
297
297
  resolveAlbumPath: config.resolveAlbumPath,
298
- formatNavigationError: config.formatNavigationError
298
+ formatNavigationError: config.formatNavigationError,
299
+ findTrack: config.findTrack
299
300
  }
300
301
  }
@@ -191,15 +191,14 @@ export function hasSearch(): boolean {
191
191
  *
192
192
  * When a search source is configured, resolves `[]` only when it found
193
193
  * nothing; a failed search rejects, so a caller can tell "no results" from
194
- * "the request failed". Exception: on Android an HTTP search source
195
- * (`TransformableRequestConfig`) resolves `[]` on any failure (non-2xx,
196
- * network or decode error); a callback source still rejects there. With no
197
- * search source configured, Android and web resolve `[]` and iOS rejects;
198
- * call {@link hasSearch} first.
194
+ * "the request failed". With no search source configured, Android and web
195
+ * resolve `[]` and iOS rejects; call {@link hasSearch} first.
199
196
  *
200
- * The rejection's message describes the failure; on native platforms JS sees
201
- * only that message. On web, a failed search request's `Error` also carries a
202
- * `code`, the
197
+ * The rejection's message describes the failure; on iOS JS sees only that
198
+ * message. On Android the message starts with the Kotlin exception's class and
199
+ * ends with its stack trace
200
+ * (`com.audiobrowser.NavigationErrorException: <message>\n\tat …`).
201
+ * On web, a failed search request's `Error` also carries a `code`, the
203
202
  * {@link features/errors!NavigationErrorType | NavigationErrorType} the
204
203
  * browse path reports as a
205
204
  * {@link features/errors!NavigationError | NavigationError}
@@ -1,9 +1,13 @@
1
- import type { Output, OutputType } from '../specs/audio-browser.nitro'
1
+ import type {
2
+ Output,
3
+ OutputPickerAnchor,
4
+ OutputType
5
+ } from '../specs/audio-browser.nitro'
2
6
  import { nativeBrowser } from '../native'
3
7
  import { NativeUpdatedValue } from '../utils/NativeUpdatedValue'
4
8
  import { useNativeUpdatedValue } from '../utils/useNativeUpdatedValue'
5
9
 
6
- export type { Output, OutputType }
10
+ export type { Output, OutputPickerAnchor, OutputType }
7
11
 
8
12
  // MARK: - Actions
9
13
 
@@ -11,13 +15,17 @@ export type { Output, OutputType }
11
15
  * Presents the system audio output switcher so the listener can move playback to
12
16
  * another output. Cross-platform:
13
17
  * - **iOS** — the system route picker (Bluetooth, AirPlay / Sonos-via-AirPlay,
14
- * speaker). Always available.
18
+ * speaker). Always available. Its source view takes `anchor`, a rect in points
19
+ * in the key window's coordinates — pass the frame of the control that opened
20
+ * it — else sits at the window's top-left corner. A picker shown as a menu
21
+ * appears at its source view; a full-screen sheet does not move.
15
22
  * - **Android** — the system Output Switcher (Bluetooth / speaker / Cast list) on
16
23
  * Android 11+. No-op on older Android — gate on {@link supportsOutputSwitcher}.
24
+ * Ignores `anchor`.
17
25
  * - **Web** — no-op.
18
26
  */
19
- export function openOutputPicker(): void {
20
- nativeBrowser.openOutputPicker()
27
+ export function openOutputPicker(anchor?: OutputPickerAnchor): void {
28
+ nativeBrowser.openOutputPicker(anchor)
21
29
  }
22
30
 
23
31
  /**
@@ -102,6 +102,18 @@ export type Output = {
102
102
  external: boolean
103
103
  }
104
104
 
105
+ /**
106
+ * Where `openOutputPicker` places the system picker's source view: a rect in
107
+ * points, in the key window's coordinates. On iOS a picker shown as a menu
108
+ * appears at it; a full-screen sheet does not move. Android ignores it.
109
+ */
110
+ export type OutputPickerAnchor = {
111
+ x: number
112
+ y: number
113
+ width: number
114
+ height: number
115
+ }
116
+
105
117
  /**
106
118
  * The Nitro hybrid-object spec — the bridge surface itself. Not consumer API;
107
119
  * feature modules wrap every method.
@@ -361,12 +373,13 @@ export interface AudioBrowser extends HybridObject<{
361
373
  * to another output — Bluetooth, AirPlay/Sonos-via-AirPlay, speaker (iOS), or
362
374
  * the Bluetooth / speaker / Cast device list (Android). Cross-platform.
363
375
  *
364
- * iOS: the system route picker (always available).
376
+ * iOS: the system route picker (always available), from a source view at
377
+ * `anchor` when given, else at the window's top-left corner.
365
378
  * Android: the system Output Switcher (Android 11+); no-op below that — gate
366
- * on `supportsOutputSwitcher()`.
379
+ * on `supportsOutputSwitcher()`. Ignores `anchor`.
367
380
  * Web: no-op.
368
381
  */
369
- openOutputPicker(): void
382
+ openOutputPicker(anchor?: OutputPickerAnchor): void
370
383
  /**
371
384
  * Whether `openOutputPicker()` can present a system output switcher on this
372
385
  * device — surface the output control in the UI only when this is true.
@@ -9,6 +9,7 @@
9
9
  import type {
10
10
  ArtworkRequestConfig,
11
11
  BrowserSourceCallback,
12
+ FindTrackCallback,
12
13
  ResolveAlbumPathCallback,
13
14
  FormatNavigationErrorCallback,
14
15
  HandleTrackLoadCallback,
@@ -22,7 +23,7 @@ import type { ResolvedTrack } from './browser-nodes'
22
23
  // Native resolvers are Promise-only. The public `request`/`browse` resolver may
23
24
  // return its config sync OR async; `toNativeConfig` wraps it in Promise.resolve so
24
25
  // the bridge never sees a `T | Promise<T>` variant (which would misread the async
25
- // case). Resolvers run once per content generation, so the wrap is free.
26
+ // case). Resolvers run rarely, so the wrap is free.
26
27
  type NativeRequestConfigResolver = () => Promise<TransformableRequestConfig>
27
28
 
28
29
  /**
@@ -82,4 +83,6 @@ export interface NativeBrowserConfiguration {
82
83
  carPlayLoadingTitle?: string
83
84
  resolveAlbumPath?: ResolveAlbumPathCallback
84
85
  formatNavigationError?: FormatNavigationErrorCallback
86
+
87
+ findTrack?: FindTrackCallback
85
88
  }
@@ -721,11 +721,17 @@ export type BrowserConfiguration = {
721
721
  * defaults.
722
722
  *
723
723
  * Either a static {@link TransformableRequestConfig} (its optional `transform`
724
- * runs per request), or a {@link RequestConfigResolver} thunk resolved once per
725
- * content generation and re-resolved on `invalidateAllContent()`. Reach for the
726
- * resolver when a value changes rarely (a base URL, an auth host) so it is read
727
- * once per generation and merged natively — rather than recomputed on every
728
- * browse/search/media/artwork request via a `transform`.
724
+ * runs per request), or a {@link RequestConfigResolver} thunk whose answer is
725
+ * kept per content generation and re-resolved on `invalidateAllContent()`.
726
+ * Reach for the resolver when a value changes rarely (a base URL, an auth
727
+ * host) so its answer is kept for the generation and merged natively —
728
+ * rather than recomputed on every browse/search/media/artwork request via a
729
+ * `transform`.
730
+ *
731
+ * The resolver can be called more than once at a time. On Android each
732
+ * request that finds no kept answer calls it; on iOS and web a request joins
733
+ * a call already running while that call is younger than 10 seconds, and
734
+ * calls it again after that.
729
735
  */
730
736
  request?: TransformableRequestConfig | RequestConfigResolver
731
737
 
@@ -744,7 +750,8 @@ export type BrowserConfiguration = {
744
750
  * default with a callback / static / bespoke config.
745
751
  *
746
752
  * Like `request`, this may be a static {@link TransformableRequestConfig} or a
747
- * {@link RequestConfigResolver} thunk (resolved once per content generation) —
753
+ * {@link RequestConfigResolver} thunk (kept per content generation, and
754
+ * called as `request`'s is) —
748
755
  * e.g. a locale query param that only changes when `invalidateAllContent()` is
749
756
  * called. A resolver's `query` is merged additively into each browse request's
750
757
  * query, exactly as a static `query` would be.
@@ -805,8 +812,7 @@ export type BrowserConfiguration = {
805
812
  * prepended). For logic that can't be expressed as a template, use `resolve(track)`.
806
813
  *
807
814
  * The same `{id}` templating applies to every artwork config (`artwork`,
808
- * a route's `artwork`, `nowPlayingArtwork`) on iOS and Android. Neither
809
- * `{id}` nor `nowPlayingArtwork` is implemented by the web implementation.
815
+ * a route's `artwork`, `nowPlayingArtwork`).
810
816
  *
811
817
  * @example
812
818
  * // 302-redirect endpoint keyed by the track id:
@@ -1070,6 +1076,38 @@ export type BrowserConfiguration = {
1070
1076
  * ```
1071
1077
  */
1072
1078
  formatNavigationError?: FormatNavigationErrorCallback
1079
+
1080
+ /**
1081
+ * Finds the playable track for an `id` the library has not browsed in this
1082
+ * process. A car plays a row's `id` after the app's process died, as when it
1083
+ * resumes the last track or acts on a voice pick; only browsing remembers
1084
+ * which track an `id` names, so without this such a play fails.
1085
+ *
1086
+ * Called for an `id` that is neither browsed, a path, nor an http(s) URL,
1087
+ * for a play and for an item lookup. Return a {@link Track} with a `src`, or
1088
+ * `undefined` when the `id` names nothing playable. The answer plays under
1089
+ * the `id` asked about, whatever `id` it carries, and is remembered for the
1090
+ * process. A track without `src`, a throw, or no answer within 10 seconds
1091
+ * fails the play, and the car is told. Once this is set, such an `id` is
1092
+ * never browsed as a path. A queue the app sets, loads, skips or clears
1093
+ * while this answers wins, and the car's play is dropped, so don't restore
1094
+ * a queue at startup while a car may be playing.
1095
+ *
1096
+ * The Gate doesn't apply: a play by `id` is hearing, not finding, so the
1097
+ * resolver isn't asked and `onGate` doesn't fire. To refuse one, return
1098
+ * `undefined`; the play fails as for an unknown `id`.
1099
+ *
1100
+ * @example
1101
+ * ```typescript
1102
+ * findTrack: async ({ id }) => {
1103
+ * const item = await api.item(id)
1104
+ * return item && { id, title: item.name, src: item.audioUrl }
1105
+ * }
1106
+ * ```
1107
+ *
1108
+ * @platform android
1109
+ */
1110
+ findTrack?: FindTrackCallback
1073
1111
  }
1074
1112
 
1075
1113
  /**
@@ -1190,5 +1228,19 @@ export type FormatNavigationErrorCallback = (
1190
1228
  */
1191
1229
  export type ResolveAlbumPathCallback = (track: Track) => string | undefined
1192
1230
 
1231
+ /** The id a {@link FindTrackCallback} is asked about. */
1232
+ export interface FindTrackParams {
1233
+ /** The `id` of the row the car plays. */
1234
+ id: string
1235
+ }
1236
+
1237
+ /**
1238
+ * Finds the playable track for an id the library has not browsed. See
1239
+ * {@link BrowserConfiguration.findTrack | findTrack}.
1240
+ */
1241
+ export type FindTrackCallback = (
1242
+ params: FindTrackParams
1243
+ ) => Promise<Track | undefined>
1244
+
1193
1245
  /** Supplies the title of the appended "view more" row. See `viewMoreTitle`. */
1194
1246
  export type ViewMoreTitleCallback = () => string