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.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +14 -2
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
- package/android/src/main/res/values/strings.xml +5 -2
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
- package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
- package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
- package/ios/AVPlayerEngine.swift +2 -2
- package/ios/Browser/BrowserPathHelper.swift +3 -2
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Player/Player.swift +4 -2
- package/ios/Tests/AwaitCallbackTests.swift +8 -0
- package/ios/Tests/DataURLDecodingTests.swift +25 -0
- package/ios/Tests/GenerationMemoTests.swift +136 -0
- package/ios/Tests/JSCallbackErrorTests.swift +33 -0
- package/ios/Tests/PlayerPolicyTests.swift +19 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/RequestLayerTests.swift +5 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/Support/TestTypes.swift +14 -0
- package/ios/Util/ArtworkImageFetcher.swift +40 -16
- package/ios/Util/AwaitCallback.swift +16 -10
- package/ios/Util/GenerationMemo.swift +81 -17
- package/ios/Util/JSCallbackError.swift +23 -0
- package/ios/Util/OutputPicker.swift +25 -5
- package/ios/Util/RoutePickerSourceFrame.swift +17 -0
- package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
- package/lib/commonjs/features/browser-config.js +3 -2
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +7 -8
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/output.js +7 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +37 -65
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +1 -4
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/commonjs/web/util/GenerationMemo.js +92 -0
- package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
- package/lib/module/features/browser-config.js +3 -2
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +7 -8
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/output.js +7 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +43 -2
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +37 -66
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +1 -5
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js +53 -55
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +3 -22
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +5 -7
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/web/util/GenerationMemo.js +87 -0
- package/lib/module/web/util/GenerationMemo.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +7 -8
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -1
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +55 -8
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
- package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
- package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
- package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
- package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
- package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
- package/package.json +1 -1
- package/src/codegen-js-error-message.test.ts +78 -0
- package/src/features/browser-config.test.ts +7 -0
- package/src/features/browser-config.ts +3 -2
- package/src/features/browser.ts +7 -8
- package/src/features/output.ts +13 -5
- package/src/specs/audio-browser.nitro.ts +16 -3
- package/src/types/browser-native.ts +4 -1
- package/src/types/browser.ts +60 -8
- package/src/web/NativeAudioBrowser.ts +43 -3
- package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
- package/src/web/browser/BrowserManager.ts +50 -79
- package/src/web/browser/SearchManager.ts +1 -8
- package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
- package/src/web/http/RequestConfigBuilder.test.ts +151 -1
- package/src/web/http/RequestConfigBuilder.ts +72 -57
- package/src/web/player/NowPlayingManager.test.ts +29 -0
- package/src/web/player/NowPlayingManager.ts +4 -27
- package/src/web/util/BrowserPathHelper.test.ts +23 -0
- package/src/web/util/BrowserPathHelper.ts +6 -7
- package/src/web/util/GenerationMemo.test.ts +148 -0
- package/src/web/util/GenerationMemo.ts +103 -0
- package/website/guide/audio-output.md +34 -7
- package/website/guide/browser.md +21 -0
- package/website/guide/gate.md +1 -1
|
@@ -23,8 +23,6 @@ private func makePlaying(
|
|
|
23
23
|
) throws -> (Player, MockPlayerEngine, MockPlayerCallbacks) {
|
|
24
24
|
let (player, engine, callbacks) = try makeLoading(live: live, scheduler: scheduler)
|
|
25
25
|
player.setPlayWhenReady(true)
|
|
26
|
-
engine.hasItem = true
|
|
27
|
-
engine.hasLoadedAsset = true
|
|
28
26
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
29
27
|
player.transition(.avPlayerPlaying)
|
|
30
28
|
return (player, engine, callbacks)
|
|
@@ -40,8 +38,6 @@ private func makeStalling(givesUp: Bool = false) throws -> (Player, MockPlayerEn
|
|
|
40
38
|
let callbacks = MockPlayerCallbacks()
|
|
41
39
|
player.callbacks = callbacks
|
|
42
40
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], playWhenReady: true)
|
|
43
|
-
engine.hasItem = true
|
|
44
|
-
engine.hasLoadedAsset = true
|
|
45
41
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
46
42
|
player.transition(.avPlayerPlaying)
|
|
47
43
|
engine.emit(.stalled)
|
|
@@ -60,8 +56,6 @@ private func makeVirtual(online: Bool = true) throws -> (Player, MockPlayerEngin
|
|
|
60
56
|
let callbacks = MockPlayerCallbacks()
|
|
61
57
|
player.callbacks = callbacks
|
|
62
58
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T", live: true)], playWhenReady: true)
|
|
63
|
-
engine.hasItem = true
|
|
64
|
-
engine.hasLoadedAsset = true
|
|
65
59
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
66
60
|
return (player, engine, callbacks, clock)
|
|
67
61
|
}
|
|
@@ -93,8 +87,6 @@ struct PlayerSeekingTests {
|
|
|
93
87
|
player.seek(to: 30)
|
|
94
88
|
#expect(engine.seekCalls.isEmpty)
|
|
95
89
|
|
|
96
|
-
engine.hasItem = true
|
|
97
|
-
engine.hasLoadedAsset = true
|
|
98
90
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
99
91
|
#expect(engine.seekCalls == [30])
|
|
100
92
|
#expect(player.state == .loading)
|
|
@@ -103,8 +95,6 @@ struct PlayerSeekingTests {
|
|
|
103
95
|
@Test func theLoadBecomesReadyWhenTheDeferredSeekLands() throws {
|
|
104
96
|
let (player, engine, _) = try makeLoading()
|
|
105
97
|
player.seek(to: 30)
|
|
106
|
-
engine.hasItem = true
|
|
107
|
-
engine.hasLoadedAsset = true
|
|
108
98
|
engine.emit(.itemPrepared(likelyToKeepUp: false))
|
|
109
99
|
#expect(engine.seekCalls == [30])
|
|
110
100
|
#expect(player.state == .ready)
|
|
@@ -137,7 +127,6 @@ struct PlayerSeekingTests {
|
|
|
137
127
|
let player = makePlayer(engine: engine)
|
|
138
128
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
|
|
139
129
|
engine.seekResult = nil
|
|
140
|
-
engine.hasItem = true
|
|
141
130
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
142
131
|
|
|
143
132
|
player.reloadResolving(startFromCurrentTime: true)
|
|
@@ -156,7 +145,6 @@ struct PlayerSeekingTests {
|
|
|
156
145
|
let player = makePlayer(engine: engine)
|
|
157
146
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
|
|
158
147
|
engine.seekResult = nil
|
|
159
|
-
engine.hasItem = true
|
|
160
148
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
161
149
|
|
|
162
150
|
engine.completeSeeks(false)
|
|
@@ -172,7 +160,6 @@ struct PlayerSeekingTests {
|
|
|
172
160
|
let player = makePlayer(engine: engine)
|
|
173
161
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
|
|
174
162
|
engine.seekResult = nil
|
|
175
|
-
engine.hasItem = true
|
|
176
163
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
177
164
|
|
|
178
165
|
player.reloadResolving(startFromCurrentTime: false)
|
|
@@ -189,7 +176,6 @@ struct PlayerSeekingTests {
|
|
|
189
176
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
|
|
190
177
|
|
|
191
178
|
player.mediaServicesWereReset()
|
|
192
|
-
engine.hasItem = true
|
|
193
179
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
194
180
|
|
|
195
181
|
#expect(engine.seekCalls == [25])
|
|
@@ -200,7 +186,6 @@ struct PlayerSeekingTests {
|
|
|
200
186
|
let player = makePlayer(engine: engine)
|
|
201
187
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
|
|
202
188
|
engine.seekResult = nil
|
|
203
|
-
engine.hasItem = true
|
|
204
189
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
205
190
|
|
|
206
191
|
player.stop()
|
|
@@ -294,8 +279,6 @@ struct PlayerEngineEventTests {
|
|
|
294
279
|
@Test func aPauseWhileLoadingReachesTheEngine_aPlayDoesNot() throws {
|
|
295
280
|
let (player, engine, _) = try makeLoading()
|
|
296
281
|
player.setPlayWhenReady(true)
|
|
297
|
-
engine.hasItem = true
|
|
298
|
-
engine.hasLoadedAsset = true
|
|
299
282
|
engine.emit(.itemPrepared(likelyToKeepUp: false))
|
|
300
283
|
#expect(player.state == .loading)
|
|
301
284
|
let plays = engine.startPlaybackCallCount
|
|
@@ -353,6 +336,25 @@ struct PlayerEngineEventTests {
|
|
|
353
336
|
#expect(engine.shortStartBufferRequests == [false, true, false])
|
|
354
337
|
}
|
|
355
338
|
|
|
339
|
+
/// #299: with the ended item still in the AVPlayer, the next item reads a progressive stream's
|
|
340
|
+
/// new connection over two GETs at once. The carrier keeps the now-playing surface meanwhile.
|
|
341
|
+
@Test func aLiveEndsReconnectLoadsWithTheCarrierInTheEndedItemsPlace() async throws {
|
|
342
|
+
let (player, engine, _) = try makePlaying(live: true)
|
|
343
|
+
engine.emit(.playedToEnd)
|
|
344
|
+
await player.retry.pendingTask?.value
|
|
345
|
+
#expect(engine.resolveAndLoadCalls.count == 2)
|
|
346
|
+
#expect(engine.carrierAtLoad.last == true)
|
|
347
|
+
}
|
|
348
|
+
|
|
349
|
+
/// An on-demand item stays until the next is prepared: its duration and buffer still read from it.
|
|
350
|
+
@Test func anOnDemandReloadKeepsItsItem() throws {
|
|
351
|
+
let (player, engine, _) = try makePlaying()
|
|
352
|
+
player.retryNow()
|
|
353
|
+
#expect(engine.resolveAndLoadCalls.count == 2)
|
|
354
|
+
#expect(engine.carrierAtLoad.last == false)
|
|
355
|
+
#expect(engine.hasItem)
|
|
356
|
+
}
|
|
357
|
+
|
|
356
358
|
/// AVPlayer pauses an item at its end, so a seek within its window would leave it silent.
|
|
357
359
|
@Test func aLiveEndReconnectsEvenWithASeekableWindow() async throws {
|
|
358
360
|
let (player, engine, _) = try makePlaying(live: true)
|
|
@@ -371,7 +373,6 @@ struct PlayerEngineEventTests {
|
|
|
371
373
|
for _ in 0 ..< 20 where player.state != .error {
|
|
372
374
|
engine.emit(.playedToEnd)
|
|
373
375
|
await player.retry.pendingTask?.value
|
|
374
|
-
engine.hasLoadedAsset = true
|
|
375
376
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
376
377
|
}
|
|
377
378
|
// The first connection played, so its end starts the count: four that deliver nothing follow.
|
|
@@ -602,8 +603,6 @@ struct PlayerRecoveringTests {
|
|
|
602
603
|
/// Ready and waiting for AVPlayer to start: its waiting is a stall, watched in .buffering.
|
|
603
604
|
@Test func aConnectThatIsReadyIsNoLongerWatched() async throws {
|
|
604
605
|
let (player, engine, clock) = try makeConnecting()
|
|
605
|
-
engine.hasItem = true
|
|
606
|
-
engine.hasLoadedAsset = true
|
|
607
606
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
608
607
|
#expect(player.state == .ready)
|
|
609
608
|
await clock.run(until: 100_000)
|
|
@@ -954,8 +953,6 @@ struct PlayerRecoveringTests {
|
|
|
954
953
|
let engine = MockPlayerEngine()
|
|
955
954
|
let player = makePlayer(engine: engine, retry: makeRetryLoop(delay: 0.05))
|
|
956
955
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], playWhenReady: true)
|
|
957
|
-
engine.hasItem = true
|
|
958
|
-
engine.hasLoadedAsset = true
|
|
959
956
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
960
957
|
player.transition(.avPlayerPlaying)
|
|
961
958
|
#expect(player.retry.hasPlayed)
|
|
@@ -1224,7 +1221,6 @@ struct PlayerReviewRegressionTests {
|
|
|
1224
1221
|
let player = makePlayer(engine: engine)
|
|
1225
1222
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
|
|
1226
1223
|
engine.seekResult = nil
|
|
1227
|
-
engine.hasItem = true
|
|
1228
1224
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
1229
1225
|
// The failed item's own time.
|
|
1230
1226
|
engine.resumePosition = 0
|
|
@@ -1244,7 +1240,6 @@ struct PlayerReviewRegressionTests {
|
|
|
1244
1240
|
let player = makePlayer(engine: engine)
|
|
1245
1241
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
|
|
1246
1242
|
engine.seekResult = nil
|
|
1247
|
-
engine.hasItem = true
|
|
1248
1243
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
1249
1244
|
engine.emit(.failed(nil, httpStatusCode: 404))
|
|
1250
1245
|
#expect(player.state == .error)
|
|
@@ -1396,8 +1391,6 @@ struct PlayerReviewRegressionTests {
|
|
|
1396
1391
|
let engine = MockPlayerEngine()
|
|
1397
1392
|
let player = makePlayer(engine: engine, saveInterval: .milliseconds(10))
|
|
1398
1393
|
try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], playWhenReady: true)
|
|
1399
|
-
engine.hasItem = true
|
|
1400
|
-
engine.hasLoadedAsset = true
|
|
1401
1394
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
1402
1395
|
player.transition(.avPlayerPlaying)
|
|
1403
1396
|
engine.currentTime = 7
|
|
@@ -1485,8 +1478,6 @@ struct PlayerLivePauseTests {
|
|
|
1485
1478
|
#expect(engine.resolveAndLoadCalls.count == 2)
|
|
1486
1479
|
#expect(player.state == .loading)
|
|
1487
1480
|
|
|
1488
|
-
engine.hasItem = true
|
|
1489
|
-
engine.hasLoadedAsset = true
|
|
1490
1481
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
1491
1482
|
#expect(engine.seekCalls.isEmpty)
|
|
1492
1483
|
}
|
|
@@ -25,8 +25,6 @@ private func makePlayingFirstOfThree() throws -> (Player, MockPlayerEngine, Mock
|
|
|
25
25
|
|
|
26
26
|
@MainActor
|
|
27
27
|
private func playPreparedItem(_ player: Player, _ engine: MockPlayerEngine) {
|
|
28
|
-
engine.hasItem = true
|
|
29
|
-
engine.hasLoadedAsset = true
|
|
30
28
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
31
29
|
player.transition(.avPlayerPlaying)
|
|
32
30
|
}
|
|
@@ -118,6 +118,11 @@ struct RequestLayerTests {
|
|
|
118
118
|
#expect(RequestLayer.buildUrl(Config(path: "/a", baseUrl: "https://host", query: ["q": "x"])) == "https://host/a?q=x")
|
|
119
119
|
}
|
|
120
120
|
|
|
121
|
+
@Test func buildUrlLeavesQueryOffDataUrl() {
|
|
122
|
+
let dataUrl = "data:image/png;base64,iVBORw0KGgo="
|
|
123
|
+
#expect(RequestLayer.buildUrl(Config(path: dataUrl, baseUrl: "https://host", query: ["w": "512"])) == dataUrl)
|
|
124
|
+
}
|
|
125
|
+
|
|
121
126
|
@Test func buildUrlLeavesFileSrcOutOfSharedBaseUrl() {
|
|
122
127
|
let file = "file:///var/mobile/Containers/Data/Application/x/Documents/a.mp3"
|
|
123
128
|
let merged = RequestLayer.merge(Config.base(path: file), Config(baseUrl: "https://api.example.com"))
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import CoreGraphics
|
|
2
|
+
import Testing
|
|
3
|
+
|
|
4
|
+
@testable import AudioBrowserTestable
|
|
5
|
+
|
|
6
|
+
@Suite("RoutePickerSourceFrame")
|
|
7
|
+
struct RoutePickerSourceFrameTests {
|
|
8
|
+
@Test("without an anchor the source is 1x1 at the window's top-left corner")
|
|
9
|
+
func noAnchor() {
|
|
10
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: nil) == CGRect(x: 0, y: 0, width: 1, height: 1))
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
@Test("the source takes the anchor's whole rect")
|
|
14
|
+
func followsAnchor() {
|
|
15
|
+
let anchor = CGRect(x: 16, y: 520, width: 358, height: 44)
|
|
16
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: anchor) == anchor)
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
@Test("an anchor with no area still gives the source 1x1 at its origin")
|
|
20
|
+
func emptyAnchor() {
|
|
21
|
+
let anchor = CGRect(x: 40, y: 300, width: 0, height: 0)
|
|
22
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: anchor) == CGRect(x: 40, y: 300, width: 1, height: 1))
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
@Test("an anchor with a negative size is read as the rect it covers")
|
|
26
|
+
func negativeSize() {
|
|
27
|
+
let anchor = CGRect(x: 100, y: 200, width: -50, height: -20)
|
|
28
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: anchor) == CGRect(x: 50, y: 180, width: 50, height: 20))
|
|
29
|
+
}
|
|
30
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import Testing
|
|
2
|
+
|
|
3
|
+
@testable import AudioBrowserTestable
|
|
4
|
+
|
|
5
|
+
@MainActor
|
|
6
|
+
@Suite("RoutePickerSourceLifetime")
|
|
7
|
+
struct RoutePickerSourceLifetimeTests {
|
|
8
|
+
final class Source {}
|
|
9
|
+
|
|
10
|
+
@MainActor
|
|
11
|
+
final class Removals {
|
|
12
|
+
var removed: [ObjectIdentifier] = []
|
|
13
|
+
lazy var lifetime = RoutePickerSourceLifetime<Source> { [unowned self] in
|
|
14
|
+
removed.append(ObjectIdentifier($0))
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
func wasRemoved(_ source: Source) -> Bool {
|
|
18
|
+
removed.contains(ObjectIdentifier(source))
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
@Test("a source stays while its picker shows past the settle time")
|
|
23
|
+
func staysWhilePresenting() {
|
|
24
|
+
let removals = Removals()
|
|
25
|
+
let source = Source()
|
|
26
|
+
removals.lifetime.added(source)
|
|
27
|
+
removals.lifetime.willBeginPresenting(source)
|
|
28
|
+
removals.lifetime.settled(source)
|
|
29
|
+
#expect(!removals.wasRemoved(source))
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
@Test("a source goes when its picker ends")
|
|
33
|
+
func goesWhenPickerEnds() {
|
|
34
|
+
let removals = Removals()
|
|
35
|
+
let source = Source()
|
|
36
|
+
removals.lifetime.added(source)
|
|
37
|
+
removals.lifetime.willBeginPresenting(source)
|
|
38
|
+
removals.lifetime.settled(source)
|
|
39
|
+
removals.lifetime.didEndPresenting(source)
|
|
40
|
+
#expect(removals.wasRemoved(source))
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
@Test("a source whose picker never began goes when it settles")
|
|
44
|
+
func goesWhenNeverPresented() {
|
|
45
|
+
let removals = Removals()
|
|
46
|
+
let source = Source()
|
|
47
|
+
removals.lifetime.added(source)
|
|
48
|
+
removals.lifetime.settled(source)
|
|
49
|
+
#expect(removals.wasRemoved(source))
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
@Test("a picker that never ends keeps its source until the next is added")
|
|
53
|
+
func nextSourceReplacesOneThatNeverEnded() {
|
|
54
|
+
let removals = Removals()
|
|
55
|
+
let first = Source()
|
|
56
|
+
removals.lifetime.added(first)
|
|
57
|
+
removals.lifetime.willBeginPresenting(first)
|
|
58
|
+
removals.lifetime.settled(first)
|
|
59
|
+
#expect(!removals.wasRemoved(first))
|
|
60
|
+
|
|
61
|
+
let second = Source()
|
|
62
|
+
removals.lifetime.added(second)
|
|
63
|
+
#expect(removals.wasRemoved(first))
|
|
64
|
+
#expect(!removals.wasRemoved(second))
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
@Test("an earlier picker ending leaves the showing one's source")
|
|
68
|
+
func earlierEndLeavesCurrentPresenting() {
|
|
69
|
+
let removals = Removals()
|
|
70
|
+
let first = Source()
|
|
71
|
+
let second = Source()
|
|
72
|
+
removals.lifetime.added(first)
|
|
73
|
+
removals.lifetime.added(second)
|
|
74
|
+
removals.lifetime.willBeginPresenting(second)
|
|
75
|
+
removals.lifetime.didEndPresenting(first)
|
|
76
|
+
removals.lifetime.settled(second)
|
|
77
|
+
#expect(!removals.wasRemoved(second))
|
|
78
|
+
}
|
|
79
|
+
}
|
|
@@ -30,7 +30,13 @@ func makeMetadataItem(
|
|
|
30
30
|
final class MockPlayerEngine: PlayerEngine {
|
|
31
31
|
var onEvent: (@MainActor (EngineEvent) -> Void)?
|
|
32
32
|
|
|
33
|
+
/// As AVPlayerEngine: a prepared item is in the player before its event goes out.
|
|
33
34
|
func emit(_ event: EngineEvent) {
|
|
35
|
+
if case .itemPrepared = event {
|
|
36
|
+
hasItem = true
|
|
37
|
+
hasLoadedAsset = true
|
|
38
|
+
itemIsCarrier = false
|
|
39
|
+
}
|
|
34
40
|
onEvent?(event)
|
|
35
41
|
}
|
|
36
42
|
|
|
@@ -49,6 +55,8 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
49
55
|
|
|
50
56
|
var resolveAndLoadCalls: [String] = []
|
|
51
57
|
var shortStartBufferRequests: [Bool] = []
|
|
58
|
+
var itemIsCarrier = false
|
|
59
|
+
var carrierAtLoad: [Bool] = []
|
|
52
60
|
var cancelLoadingCount = 0
|
|
53
61
|
var dropAssetCount = 0
|
|
54
62
|
var clearItemCount = 0
|
|
@@ -62,6 +70,7 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
62
70
|
func resolveAndLoad(src: String, track _: Track, shortStartBuffer: Bool) {
|
|
63
71
|
resolveAndLoadCalls.append(src)
|
|
64
72
|
shortStartBufferRequests.append(shortStartBuffer)
|
|
73
|
+
carrierAtLoad.append(itemIsCarrier)
|
|
65
74
|
}
|
|
66
75
|
|
|
67
76
|
func cancelLoading() { cancelLoadingCount += 1 }
|
|
@@ -73,6 +82,7 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
73
82
|
func clearItem() {
|
|
74
83
|
clearItemCount += 1
|
|
75
84
|
hasItem = false
|
|
85
|
+
itemIsCarrier = false
|
|
76
86
|
hasLoadedAsset = false
|
|
77
87
|
resumePosition = nil
|
|
78
88
|
}
|
|
@@ -81,8 +91,12 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
81
91
|
carrierCount += 1
|
|
82
92
|
pauseAndCarrierOrder.append(.carrier)
|
|
83
93
|
hasItem = true
|
|
94
|
+
itemIsCarrier = true
|
|
84
95
|
hasLoadedAsset = false
|
|
85
96
|
resumePosition = nil
|
|
97
|
+
currentTime = 0
|
|
98
|
+
duration = 0
|
|
99
|
+
bufferedPosition = 0
|
|
86
100
|
liveEdge = nil
|
|
87
101
|
liveWindowSeconds = nil
|
|
88
102
|
}
|
|
@@ -47,6 +47,29 @@ enum ArtworkImageFetcher {
|
|
|
47
47
|
processor = nil
|
|
48
48
|
}
|
|
49
49
|
if let processor { options.append(.processor(processor)) }
|
|
50
|
+
|
|
51
|
+
let result: Result<UIImage, any Error> = if url.scheme?.lowercased() == "data" {
|
|
52
|
+
await retrieve(.provider(DataURLProvider(url: url)), options: options + [.cacheMemoryOnly], freshnessKey: nil)
|
|
53
|
+
} else {
|
|
54
|
+
await fetch(url, options: options, processor: processor, waitsForConnectivity: waitsForConnectivity)
|
|
55
|
+
}
|
|
56
|
+
switch result {
|
|
57
|
+
case let .success(image):
|
|
58
|
+
return image
|
|
59
|
+
case let .failure(error):
|
|
60
|
+
logger.error("Failed to load artwork from \(source.uri.prefix(200)): \(error.localizedDescription)")
|
|
61
|
+
return nil
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/// Fetches `url` from the cache while its HTTP freshness lasts, else past the cache.
|
|
66
|
+
@MainActor
|
|
67
|
+
private static func fetch(
|
|
68
|
+
_ url: URL,
|
|
69
|
+
options: KingfisherOptionsInfo,
|
|
70
|
+
processor: (any ImageProcessor)?,
|
|
71
|
+
waitsForConnectivity: Bool,
|
|
72
|
+
) async -> Result<UIImage, any Error> {
|
|
50
73
|
let retry: KingfisherOptionsInfo = waitsForConnectivity ? [.retryStrategy(ConnectivityRetry())] : []
|
|
51
74
|
|
|
52
75
|
// Each processed variant is fresh on its own: a variant cached before the image changed
|
|
@@ -54,18 +77,11 @@ enum ArtworkImageFetcher {
|
|
|
54
77
|
let key = url.absoluteString + (processor?.identifier ?? "")
|
|
55
78
|
// Only HTTP fetches record a lifetime, so any other scheme would otherwise refetch on every call.
|
|
56
79
|
let isFresh = if ["http", "https"].contains(url.scheme?.lowercased()) { await freshness.isFresh(key) } else { true }
|
|
57
|
-
|
|
58
|
-
await retrieve(url, options: options + retry, freshnessKey: key)
|
|
80
|
+
return if isFresh {
|
|
81
|
+
await retrieve(.network(url), options: options + retry, freshnessKey: key)
|
|
59
82
|
} else {
|
|
60
83
|
await refetch(url, options: options, retry: retry, freshnessKey: key)
|
|
61
84
|
}
|
|
62
|
-
switch result {
|
|
63
|
-
case let .success(image):
|
|
64
|
-
return image
|
|
65
|
-
case let .failure(error):
|
|
66
|
-
logger.error("Failed to load artwork from \(source.uri): \(error.localizedDescription)")
|
|
67
|
-
return nil
|
|
68
|
-
}
|
|
69
85
|
}
|
|
70
86
|
|
|
71
87
|
private static let freshness = FreshnessStore()
|
|
@@ -80,26 +96,26 @@ enum ArtworkImageFetcher {
|
|
|
80
96
|
retry: KingfisherOptionsInfo,
|
|
81
97
|
freshnessKey: String,
|
|
82
98
|
) async -> Result<UIImage, any Error> {
|
|
83
|
-
let fetched = await retrieve(url, options: options + [.forceRefresh], freshnessKey: freshnessKey)
|
|
99
|
+
let fetched = await retrieve(.network(url), options: options + [.forceRefresh], freshnessKey: freshnessKey)
|
|
84
100
|
guard case let .failure(error) = fetched else { return fetched }
|
|
85
101
|
if let cached = try? await KingfisherManager.shared.retrieveImage(with: url, options: options + [.onlyFromCache]) {
|
|
86
102
|
return .success(cached.image)
|
|
87
103
|
}
|
|
88
104
|
guard !retry.isEmpty, (error as? KingfisherError)?.isConnectivity == true else { return fetched }
|
|
89
|
-
return await retrieve(url, options: options + [.forceRefresh] + retry, freshnessKey: freshnessKey)
|
|
105
|
+
return await retrieve(.network(url), options: options + [.forceRefresh] + retry, freshnessKey: freshnessKey)
|
|
90
106
|
}
|
|
91
107
|
|
|
92
|
-
/// Fetches through Kingfisher and records the freshness lifetime of an image that was downloaded.
|
|
108
|
+
/// Fetches through Kingfisher and, given a `freshnessKey`, records the freshness lifetime of an image that was downloaded.
|
|
93
109
|
@MainActor
|
|
94
110
|
private static func retrieve(
|
|
95
|
-
_
|
|
111
|
+
_ source: Source,
|
|
96
112
|
options: KingfisherOptionsInfo,
|
|
97
|
-
freshnessKey: String
|
|
113
|
+
freshnessKey: String?,
|
|
98
114
|
) async -> Result<UIImage, any Error> {
|
|
99
115
|
do {
|
|
100
|
-
let result = try await KingfisherManager.shared.retrieveImage(with:
|
|
116
|
+
let result = try await KingfisherManager.shared.retrieveImage(with: source, options: options)
|
|
101
117
|
// `.none` also covers an image re-processed from the cached original; only metrics mark a download.
|
|
102
|
-
if result.cacheType == .none, let metrics = result.metrics {
|
|
118
|
+
if let freshnessKey, result.cacheType == .none, let metrics = result.metrics {
|
|
103
119
|
let responses = metrics.rawMetrics.transactionMetrics.compactMap { $0.response as? HTTPURLResponse }
|
|
104
120
|
await freshness.record(freshnessKey, lifetime: ArtworkFreshness.lifetime(of: responses))
|
|
105
121
|
}
|
|
@@ -110,6 +126,14 @@ enum ArtworkImageFetcher {
|
|
|
110
126
|
}
|
|
111
127
|
}
|
|
112
128
|
|
|
129
|
+
/// A data: URL's bytes: Kingfisher's downloader fails any response that is not an HTTPURLResponse,
|
|
130
|
+
/// and a data: URL's is not.
|
|
131
|
+
private struct DataURLProvider: ImageDataProvider {
|
|
132
|
+
let url: URL
|
|
133
|
+
var cacheKey: String { url.absoluteString }
|
|
134
|
+
func data() async throws -> Data { try Data(contentsOf: url) }
|
|
135
|
+
}
|
|
136
|
+
|
|
113
137
|
/// Cache keys whose image is still fresh, each stored on disk with its lifetime as expiry.
|
|
114
138
|
private actor FreshnessStore {
|
|
115
139
|
private let storage = try? DiskStorage.Backend<Data>(
|
|
@@ -13,8 +13,12 @@ typealias CallbackSubscription<T> = (_ deliver: @escaping @Sendable (Result<T, E
|
|
|
13
13
|
|
|
14
14
|
/// The result `subscribe` delivers. Unlike Nitro's `Promise.await`, a cancelled caller throws
|
|
15
15
|
/// `CancellationError` at once, and with a `timeout`, a silent callback throws
|
|
16
|
-
/// `CallbackTimeoutError` once it elapses.
|
|
17
|
-
|
|
16
|
+
/// `CallbackTimeoutError` once it elapses. `subscribe` runs on the caller's actor.
|
|
17
|
+
func awaitCallback<T>(
|
|
18
|
+
timeout: Duration? = nil,
|
|
19
|
+
isolation: isolated (any Actor)? = #isolation,
|
|
20
|
+
_ subscribe: CallbackSubscription<T>,
|
|
21
|
+
) async throws -> T {
|
|
18
22
|
let once = ResumeOnce<T>()
|
|
19
23
|
let timer = timeout.map { timeout in
|
|
20
24
|
Task {
|
|
@@ -23,14 +27,16 @@ nonisolated(nonsending) func awaitCallback<T>(timeout: Duration? = nil, _ subscr
|
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
29
|
defer { timer?.cancel() }
|
|
26
|
-
return try await withTaskCancellationHandler
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
return try await withTaskCancellationHandler(
|
|
31
|
+
operation: {
|
|
32
|
+
try await withCheckedThrowingContinuation(isolation: isolation) { continuation in
|
|
33
|
+
once.start(continuation)
|
|
34
|
+
subscribe { once.resume($0) }
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
onCancel: { once.resume(.failure(CancellationError())) },
|
|
38
|
+
isolation: isolation,
|
|
39
|
+
)
|
|
34
40
|
}
|
|
35
41
|
|
|
36
42
|
/// Resumes its continuation with the first result only, whichever thread sends it and whether it
|
|
@@ -1,43 +1,107 @@
|
|
|
1
|
-
/// A value
|
|
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
|
|
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
|
|
22
|
-
|
|
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
|
|
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
|
+
}
|