react-native-audio-browser 0.2.0-next.30 → 0.2.0-next.31

package/ios/HybridAudioBrowser+PlayerCallbacks.swift

@@ -52,12 +52,11 @@ extension HybridAudioBrowser: PlayerCallbacks, AVPlayerEngineCallbacks {
     // can be set at setup (before any track) while output only begins here. Idempotent:
     // `setActive(true)` is a no-op when the session is already active.
     if state.playing || state.buffering {
-      audioSession.activate()
       // The now-playing session's activation request at link time predates this
       // (the audio session was still inactive, and the system may have declined);
-      // re-request now so the surface can appear even if playback never produces
-      // audio (first-ever load failing on a dead stream).
-      engine?.reactivateNowPlayingSession()
+      // re-request once the audio session is active, so the surface can appear even if
+      // playback never produces audio (first-ever load failing on a dead stream).
+      audioSession.activate { [weak self] in self?.engine?.reactivateNowPlayingSession() }
     }
     // A stall starting or recovering may not change the Player state.
     engine?.nowPlayingUpdater.render()

package/ios/Player/AudioSessionController.swift

@@ -35,6 +35,11 @@ final class AudioSessionController {
 
   private var releaseWork: DispatchWorkItem?
 
+  /// Where `setActive` runs: it blocks until the system has changed the session, which can take
+  /// long enough to stall the main thread. Serial, so a release and a quick re-activation keep
+  /// their order.
+  private let activationQueue = DispatchQueue(label: "com.audiobrowser.audio-session", qos: .userInitiated)
+
   /// Touched only by `init` and `deinit`.
   private nonisolated(unsafe) var observers: [NSObjectProtocol] = []
   private var volumeObservation: NSKeyValueObservation?
@@ -86,10 +91,14 @@ final class AudioSessionController {
     applyCategory()
   }
 
-  /// Activates the session for output and cancels a pending release.
-  func activate() {
-    try? session.setActive(true)
+  /// Activates the session for output and cancels a pending release. `then` runs on the main
+  /// actor once the activation has run, whether or not it succeeded.
+  func activate(then: (@MainActor @Sendable () -> Void)? = nil) {
     cancelRelease()
+    activationQueue.async {
+      try? AVAudioSession.sharedInstance().setActive(true)
+      if let then { Task { @MainActor in then() } }
+    }
   }
 
   /// Releases the session after 3 s unless playback resumes, so other apps' audio can come back.
@@ -100,7 +109,9 @@ final class AudioSessionController {
     let release = DispatchWorkItem { [weak self] in
       guard let self, player?.playWhenReady == false else { return }
       releaseWork = nil
-      try? session.setActive(false, options: .notifyOthersOnDeactivation)
+      activationQueue.async {
+        try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
+      }
     }
     releaseWork = release
     DispatchQueue.main.asyncAfter(deadline: .now() + 3, execute: release)
@@ -155,12 +166,13 @@ final class AudioSessionController {
       player?.handleInterruptionBegan()
     case .ended:
       let shouldResume = options.map { AVAudioSession.InterruptionOptions(rawValue: $0).contains(.shouldResume) } ?? false
-      // Reactivate only when a resume follows: activating while staying paused would hold a
-      // non-mixable session with nothing to release it.
+      // Reactivate only when a resume follows, and resume once it is active: activating while
+      // staying paused would hold a non-mixable session with nothing to release it.
       if shouldResume, player?.willResumeAfterInterruption == true {
-        try? session.setActive(true)
+        activate { [weak self] in self?.player?.handleInterruptionEnded(shouldResume: true) }
+      } else {
+        player?.handleInterruptionEnded(shouldResume: shouldResume)
       }
-      player?.handleInterruptionEnded(shouldResume: shouldResume)
     @unknown default:
       break
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-browser",
-  "version": "0.2.0-next.30",
+  "version": "0.2.0-next.31",
   "description": "react-native-audio-browser is a react native package built with Nitro",
   "keywords": [
     "react-native",