react-native-audio-browser 0.2.0-next.71 → 0.2.0-next.73

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.
@@ -490,10 +490,8 @@ internal constructor(
490
490
  if (exoPlayer.playbackState == ExoPlayer.STATE_IDLE) PlaybackState.NONE
491
491
  else PlaybackState.BUFFERING
492
492
  )
493
- // The new engine can refuse the carried intent (audio focus denied) without a change event,
494
- // which would leave a stale true in the cache and in JS.
495
- playWhenReadyCache = exoPlayer.playWhenReady
496
- emitPlayWhenReadyChanged(exoPlayer.playWhenReady)
493
+ // The new engine starts unsuppressed: an unchanged state would not re-derive it.
494
+ refreshPlayingState()
497
495
  }
498
496
 
499
497
  setupAutomaticBufferManager(setupOptions.automaticBuffer)
@@ -1,13 +1,19 @@
1
1
  package com.audiobrowser.player
2
2
 
3
+ import android.content.Context
4
+ import android.media.AudioManager
5
+ import android.os.Looper
3
6
  import androidx.media3.common.Player as MediaPlayer
4
7
  import com.audiobrowser.Callbacks
5
8
  import com.audiobrowser.TestFixtures
6
9
  import com.audiobrowser.model.PlayerSetupOptions
7
10
  import com.audiobrowser.util.TrackFactory
11
+ import com.margelo.nitro.audiobrowser.PlaybackPlayWhenReadyChangedEvent
8
12
  import com.margelo.nitro.audiobrowser.PlaybackState
13
+ import com.margelo.nitro.audiobrowser.PlayingState
9
14
  import org.junit.After
10
15
  import org.junit.Assert.assertEquals
16
+ import org.junit.Assert.assertFalse
11
17
  import org.junit.Assert.assertNotSame
12
18
  import org.junit.Assert.assertSame
13
19
  import org.junit.Assert.assertTrue
@@ -15,8 +21,11 @@ import org.junit.Test
15
21
  import org.junit.runner.RunWith
16
22
  import org.mockito.Mockito.mock
17
23
  import org.mockito.Mockito.mockingDetails
24
+ import org.mockito.Mockito.verify
18
25
  import org.robolectric.RobolectricTestRunner
19
26
  import org.robolectric.RuntimeEnvironment
27
+ import org.robolectric.Shadows.shadowOf
28
+ import org.robolectric.annotation.Config
20
29
 
21
30
  @RunWith(RobolectricTestRunner::class)
22
31
  class PlayerSetupTest {
@@ -76,6 +85,42 @@ class PlayerSetupTest {
76
85
  )
77
86
  }
78
87
 
88
+ // SDK 28: from 33, media3 asks AudioManager.getAudioDevicesForAttributes, which Robolectric 4.11
89
+ // answers with null.
90
+ @Test
91
+ @Config(sdk = [28])
92
+ fun setupWithChangedOptionsReportsAnIntentTheNewEngineRefuses() {
93
+ player.setup(PlayerSetupOptions())
94
+ val engine = player.exoPlayer
95
+ engine.setMediaItems(listOf(item("a")))
96
+ engine.prepare()
97
+ engine.playWhenReady = true
98
+ player.setPlaybackState(PlaybackState.BUFFERING)
99
+ assertEquals(PlayingState(true, true), player.getPlayingState())
100
+ val callbacks = mock(Callbacks::class.java)
101
+ player.setCallbacks(callbacks)
102
+ val audioManager =
103
+ shadowOf(
104
+ RuntimeEnvironment.getApplication().getSystemService(Context.AUDIO_SERVICE) as AudioManager
105
+ )
106
+ audioManager.setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_FAILED)
107
+
108
+ player.setup(PlayerSetupOptions(maxBuffer = 120_000.0))
109
+ // ExoPlayer requests focus on its playback thread and posts the refusal back.
110
+ assertTrue(player.exoPlayer.playWhenReady)
111
+ val deadline = System.currentTimeMillis() + 5_000
112
+ while (player.exoPlayer.playWhenReady && System.currentTimeMillis() < deadline) {
113
+ Thread.sleep(10)
114
+ shadowOf(Looper.getMainLooper()).idle()
115
+ }
116
+
117
+ assertFalse("no focus refusal within 5 s", player.exoPlayer.playWhenReady)
118
+ assertEquals(PlaybackState.PAUSED, player.playbackState)
119
+ assertEquals(PlayingState(false, false), player.getPlayingState())
120
+ verify(callbacks).onPlaybackPlayWhenReadyChanged(PlaybackPlayWhenReadyChangedEvent(false))
121
+ verify(callbacks).onPlaybackPlayingState(PlayingState(false, false))
122
+ }
123
+
79
124
  @Test
80
125
  fun setupWithChangedOptionsKeepsAnUnpreparedQueueStopped() {
81
126
  player.setup(PlayerSetupOptions())
@@ -143,6 +143,19 @@ class PlayerSuppressionTest {
143
143
  assertEquals(PlayingState(false, false), player.getPlayingState())
144
144
  }
145
145
 
146
+ @Test
147
+ fun `a rebuild during a transient focus loss reports the new engine's intent`() {
148
+ focus(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT)
149
+ // As after a skip while suppressed.
150
+ player.setPlaybackState(PlaybackState.BUFFERING)
151
+ assertEquals(PlayingState(false, false), player.getPlayingState())
152
+
153
+ player.setup(PlayerSetupOptions(maxBuffer = 120_000.0))
154
+
155
+ assertEquals(PlayingState(true, true), player.getPlayingState())
156
+ verify(callbacks).onPlaybackPlayingState(PlayingState(true, true))
157
+ }
158
+
146
159
  private fun focus(change: Int) {
147
160
  audioManager.lastAudioFocusRequest.listener.onAudioFocusChange(change)
148
161
  val suppressed = change == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT
@@ -100,7 +100,7 @@ final class Player {
100
100
  ) { [unowned self] in
101
101
  currentTrack.map {
102
102
  PlaybackPersistence.snapshot(
103
- of: $0, state: state, position: enginePositionIsCurrent ? engine.currentTime : deferredSeek.target ?? 0,
103
+ of: $0, state: state, position: deferredSeek.target ?? (enginePositionIsCurrent ? engine.currentTime : 0),
104
104
  repeatMode: repeatMode,
105
105
  shuffleEnabled: shuffleEnabled, rate: rate,
106
106
  )
@@ -120,7 +120,7 @@ final class Player {
120
120
  }
121
121
 
122
122
  private var resumePosition: TimeInterval? {
123
- enginePositionIsCurrent ? engine.resumePosition : deferredSeek.target
123
+ deferredSeek.target ?? (enginePositionIsCurrent ? engine.resumePosition : nil)
124
124
  }
125
125
 
126
126
  // MARK: - Track State (for active track changed events)
@@ -617,7 +617,7 @@ final class Player {
617
617
  engine.resolveAndLoad(src: src, track: currentTrack)
618
618
  } else {
619
619
  logger.error("No src for track \(currentTrack.path ?? currentTrack.title)")
620
- clearItem()
620
+ engine.clearItem()
621
621
  transition(.errorOccurred(.invalidSourceUrl("nil")))
622
622
  }
623
623
  } else {
@@ -729,7 +729,7 @@ final class Player {
729
729
  deferredSeek.reset()
730
730
  if state == .error {
731
731
  beginLoad()
732
- clearItem()
732
+ engine.clearItem()
733
733
  engine.recreate()
734
734
  } else {
735
735
  engine.cancelLoading()
@@ -740,13 +740,8 @@ final class Player {
740
740
  transition(.trackLoading)
741
741
  }
742
742
 
743
- private func clearItem() {
744
- engine.clearItem()
745
- deferredSeek.reset()
746
- }
747
-
748
743
  private func unload() {
749
- clearItem()
744
+ engine.clearItem()
750
745
  transition(.trackUnloaded)
751
746
  }
752
747
 
@@ -756,7 +751,7 @@ final class Player {
756
751
  func mediaServicesWereReset() {
757
752
  guard currentTrack != nil else { return }
758
753
  logger.info("Media services were reset — recreating player and reloading current track")
759
- clearItem()
754
+ engine.clearItem()
760
755
  engine.recreate()
761
756
  reloadResolving(startFromCurrentTime: false)
762
757
  }
@@ -125,6 +125,18 @@ struct PlayerSeekingTests {
125
125
  #expect(engine.seekCalls == [25, 25])
126
126
  }
127
127
 
128
+ @Test func aMediaServicesResetDuringTheLoadKeepsTheStart() throws {
129
+ let engine = MockPlayerEngine()
130
+ let player = makePlayer(engine: engine, retries: false)
131
+ try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
132
+
133
+ player.mediaServicesWereReset()
134
+ engine.hasItem = true
135
+ engine.emit(.itemPrepared(likelyToKeepUp: true))
136
+
137
+ #expect(engine.seekCalls == [25])
138
+ }
139
+
128
140
  @Test func aPlayRightAfterAStopDuringTheStartSeekStartsOver() throws {
129
141
  let engine = MockPlayerEngine()
130
142
  let player = makePlayer(engine: engine, retries: false)
@@ -380,6 +392,27 @@ struct PlayerRecoveringTests {
380
392
  @Suite("Player - review regressions", .serialized)
381
393
  @MainActor
382
394
  struct PlayerReviewRegressionTests {
395
+ @Test func aRestartFromAnErrorDuringTheStartSeekKeepsTheStart() throws {
396
+ UserDefaults(suiteName: "PlayerTests")!.removePersistentDomain(forName: "PlayerTests")
397
+ let engine = MockPlayerEngine()
398
+ let player = makePlayer(engine: engine, retries: false)
399
+ try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
400
+ engine.seekResult = nil
401
+ engine.hasItem = true
402
+ engine.emit(.itemPrepared(likelyToKeepUp: true))
403
+ // The failed item's own time.
404
+ engine.resumePosition = 0
405
+ engine.emit(.unplayable)
406
+ #expect(player.state == .error)
407
+ let saved = PlaybackPersistence(defaults: UserDefaults(suiteName: "PlayerTests")!) { nil }.load()
408
+ #expect(saved?.positionMs == 25000)
409
+
410
+ player.play()
411
+ engine.emit(.itemPrepared(likelyToKeepUp: true))
412
+
413
+ #expect(engine.seekCalls == [25, 25])
414
+ }
415
+
383
416
  @Test func endingWithTheIntentAlreadyOffSavesPositionZero() throws {
384
417
  UserDefaults(suiteName: "PlayerTests")!.removePersistentDomain(forName: "PlayerTests")
385
418
  let (player, engine, _) = try makePlaying()
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-audio-browser",
3
- "version": "0.2.0-next.71",
3
+ "version": "0.2.0-next.73",
4
4
  "description": "react-native-audio-browser is a react native package built with Nitro",
5
5
  "keywords": [
6
6
  "react-native",