react-native-audio-browser 0.2.0-next.70 → 0.2.0-next.71
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/main/java/com/audiobrowser/Service.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/Player.kt +5 -0
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +8 -7
- package/android/src/test/java/com/audiobrowser/player/PlayerDestroyTest.kt +12 -0
- package/ios/Player/Player.swift +3 -3
- package/ios/Tests/PlayerTests.swift +27 -0
- package/package.json +1 -1
|
@@ -298,6 +298,8 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
298
298
|
}
|
|
299
299
|
|
|
300
300
|
private fun stopPlaybackAndRemoveNotification() {
|
|
301
|
+
// Before clear(), which leaves no track to save.
|
|
302
|
+
player.playbackStateStore.stopPeriodicSave()
|
|
301
303
|
// Before stop(), while a mid-ramp fade can still restore the volume.
|
|
302
304
|
player.sleepTimer.clear()
|
|
303
305
|
player.clear()
|
|
@@ -241,6 +241,8 @@ internal constructor(
|
|
|
241
241
|
|
|
242
242
|
private var cache: SimpleCache? = null
|
|
243
243
|
|
|
244
|
+
private var destroyed = false
|
|
245
|
+
|
|
244
246
|
private val progressTimer: PlaybackTimer by lazy {
|
|
245
247
|
PlaybackTimer(
|
|
246
248
|
isActive = {
|
|
@@ -950,7 +952,10 @@ internal constructor(
|
|
|
950
952
|
queueSourcePath = null
|
|
951
953
|
}
|
|
952
954
|
|
|
955
|
+
/** Idempotent. */
|
|
953
956
|
fun destroy() {
|
|
957
|
+
if (destroyed) return
|
|
958
|
+
destroyed = true
|
|
954
959
|
// stop() saves only if playing; before it, so its STOPPED doesn't defeat the ENDED guard.
|
|
955
960
|
playbackStateStore.stopPeriodicSave()
|
|
956
961
|
// An armed timer would fire pause() into the released player. Cleared before the release,
|
|
@@ -111,31 +111,32 @@ class ServiceTaskRemovedTest {
|
|
|
111
111
|
assertTrue(shadowOf(service).isStoppedBySelf)
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
private fun
|
|
114
|
+
private fun playAndSeekTo63sAfterAPeriodicSave() {
|
|
115
115
|
playTrack("a")
|
|
116
116
|
player.seekTo(61, TimeUnit.SECONDS)
|
|
117
117
|
shadowOf(Looper.getMainLooper())
|
|
118
118
|
.idleFor(Duration.ofMillis(PlaybackStateStore.PERIODIC_SAVE_INTERVAL_MS))
|
|
119
119
|
assertEquals(61_000L, player.playbackStateStore.get()?.positionMs)
|
|
120
|
+
player.seekTo(63, TimeUnit.SECONDS)
|
|
120
121
|
}
|
|
121
122
|
|
|
122
123
|
@Test
|
|
123
|
-
fun `a removed task
|
|
124
|
+
fun `a removed task saves the current position while AudioBrowser is bound`() {
|
|
124
125
|
controller.bind()
|
|
125
|
-
|
|
126
|
+
playAndSeekTo63sAfterAPeriodicSave()
|
|
126
127
|
|
|
127
128
|
removeTask()
|
|
128
129
|
|
|
129
|
-
assertEquals(
|
|
130
|
+
assertEquals(63_000L, player.playbackStateStore.get()?.positionMs)
|
|
130
131
|
}
|
|
131
132
|
|
|
132
133
|
@Test
|
|
133
|
-
fun `a removed task
|
|
134
|
-
|
|
134
|
+
fun `a removed task saves the current position when AudioBrowser never bound`() {
|
|
135
|
+
playAndSeekTo63sAfterAPeriodicSave()
|
|
135
136
|
|
|
136
137
|
removeTask()
|
|
137
138
|
|
|
138
|
-
assertEquals(
|
|
139
|
+
assertEquals(63_000L, player.playbackStateStore.get()?.positionMs)
|
|
139
140
|
}
|
|
140
141
|
|
|
141
142
|
@Test
|
|
@@ -10,6 +10,7 @@ import org.junit.Test
|
|
|
10
10
|
import org.junit.runner.RunWith
|
|
11
11
|
import org.robolectric.RobolectricTestRunner
|
|
12
12
|
import org.robolectric.RuntimeEnvironment
|
|
13
|
+
import org.robolectric.shadows.ShadowLog
|
|
13
14
|
|
|
14
15
|
@RunWith(RobolectricTestRunner::class)
|
|
15
16
|
class PlayerDestroyTest {
|
|
@@ -45,4 +46,15 @@ class PlayerDestroyTest {
|
|
|
45
46
|
|
|
46
47
|
assertEquals(0L, player.playbackStateStore.get()?.positionMs)
|
|
47
48
|
}
|
|
49
|
+
|
|
50
|
+
@Test
|
|
51
|
+
fun destroyTwiceReleasesTheEngineOnce() {
|
|
52
|
+
player.destroy()
|
|
53
|
+
player.destroy()
|
|
54
|
+
|
|
55
|
+
assertEquals(
|
|
56
|
+
1,
|
|
57
|
+
ShadowLog.getLogsForTag("ExoPlayerImpl").count { it.msg.startsWith("Release ") },
|
|
58
|
+
)
|
|
59
|
+
}
|
|
48
60
|
}
|
package/ios/Player/Player.swift
CHANGED
|
@@ -613,13 +613,13 @@ final class Player {
|
|
|
613
613
|
engine.loadNowPlayingMetadata(for: currentTrack)
|
|
614
614
|
persistence.save()
|
|
615
615
|
|
|
616
|
-
|
|
616
|
+
if let src = currentTrack.src {
|
|
617
|
+
engine.resolveAndLoad(src: src, track: currentTrack)
|
|
618
|
+
} else {
|
|
617
619
|
logger.error("No src for track \(currentTrack.path ?? currentTrack.title)")
|
|
618
620
|
clearItem()
|
|
619
621
|
transition(.errorOccurred(.invalidSourceUrl("nil")))
|
|
620
|
-
return
|
|
621
622
|
}
|
|
622
|
-
engine.resolveAndLoad(src: src, track: currentTrack)
|
|
623
623
|
} else {
|
|
624
624
|
unload()
|
|
625
625
|
engine.clearNowPlaying()
|
|
@@ -707,6 +707,33 @@ struct HandleCurrentTrackChangedTests {
|
|
|
707
707
|
#expect(cb.errorEvents.count >= 1)
|
|
708
708
|
}
|
|
709
709
|
|
|
710
|
+
@Test @MainActor
|
|
711
|
+
func nilSrc_emitsActiveTrackChangedEvent() throws {
|
|
712
|
+
let (c, _, cb, _) = makeCoordinator()
|
|
713
|
+
try c.setQueue([
|
|
714
|
+
Track(id: "t1", src: "https://example.com/1.mp3", title: "Track 1"),
|
|
715
|
+
Track(id: "t2", path: "/no-source", src: nil, title: "No Source"),
|
|
716
|
+
])
|
|
717
|
+
cb.activeTrackChanges.removeAll()
|
|
718
|
+
|
|
719
|
+
try c.skipTo(1)
|
|
720
|
+
|
|
721
|
+
#expect(cb.activeTrackChanges.count == 1)
|
|
722
|
+
let event = cb.activeTrackChanges.first
|
|
723
|
+
#expect(event?.track?.id == "t2")
|
|
724
|
+
#expect(event?.index == 1)
|
|
725
|
+
#expect(event?.lastTrack?.id == "t1")
|
|
726
|
+
#expect(event?.lastIndex == 0)
|
|
727
|
+
#expect(c.state == .error)
|
|
728
|
+
#expect(c.errorStatus.error == .invalidSourceUrl("nil"))
|
|
729
|
+
|
|
730
|
+
cb.activeTrackChanges.removeAll()
|
|
731
|
+
try c.skipTo(0)
|
|
732
|
+
|
|
733
|
+
#expect(cb.activeTrackChanges.first?.lastTrack?.id == "t2")
|
|
734
|
+
#expect(cb.activeTrackChanges.first?.lastIndex == 1)
|
|
735
|
+
}
|
|
736
|
+
|
|
710
737
|
@Test @MainActor
|
|
711
738
|
func emitsActiveTrackChangedEvent() throws {
|
|
712
739
|
let (c, _, cb, _) = makeCoordinator()
|