react-native-audio-browser 0.2.0-next.14 → 0.2.0-next.15

package/android/src/main/java/com/audiobrowser/AudioBrowser.kt

@@ -460,8 +460,14 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
       browserManager.config = buildConfig()
 
       // Notify player that browser configuration is ready (routes/tabs available)
-      // This allows Android Auto to start browsing content
-      connectedService?.player?.notifyBrowserConfigurationReady()
+      // This allows Android Auto to start browsing content.
+      // This reaches MediaSession.getConnectedControllers, which asserts the
+      // main thread, and this setter runs on the JS thread. Hop without
+      // blocking -- runBlockingOnMain would deadlock here for the same reason
+      // described for the navigation below (JS callbacks can't run while the
+      // JS thread waits). Ordering with navigationJob is preserved: both are
+      // queued on mainScope.
+      launchInScope { connectedService?.player?.notifyBrowserConfigurationReady() }
 
       clearNavigationError()
 
@@ -777,8 +783,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     // Invalidate cached content so future navigations fetch fresh data
     browserManager.invalidateContentCache(path)
 
-    // Notify external media controllers (Android Auto)
-    connectedService?.player?.notifyContentChanged(path)
+    // Notify external media controllers (Android Auto). Reaches MediaSession,
+    // which asserts the main thread; this override runs on the JS thread.
+    launchInScope { connectedService?.player?.notifyContentChanged(path) }
 
     // If we're currently viewing this path, refresh the content
     if (browserManager.getPath() == path) {
@@ -792,8 +799,10 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     // Clear all cached content so every path re-fetches fresh data
     browserManager.clearContentCache()
 
-    // Notify external media controllers (Android Auto) to refresh subscribed paths
-    connectedService?.player?.invalidateAllContent()
+    // Notify external media controllers (Android Auto) to refresh subscribed paths.
+    // Reaches MediaSession, which asserts the main thread; this override runs on
+    // the JS thread.
+    launchInScope { connectedService?.player?.invalidateAllContent() }
 
     // Refresh whatever the browser is currently viewing
     mainScope.launch { browserManager.refresh() }
@@ -834,14 +843,16 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     // Re-query every subscribed parent so a connected controller (Android
     // Auto) swaps its lists for the gate tile without reconnecting. Notify
     // only — the content cache stays warm for when the gate clears.
-    connectedService?.player?.invalidateAllContent()
+    // MediaSession asserts the main thread; this override runs on the JS thread.
+    launchInScope { connectedService?.player?.invalidateAllContent() }
   }
 
   override fun clearGate() {
     if (!gateState.active) return
     // Single atomic assignment — readers never see a half-cleared triple.
     gateState = GateState(active = false, chrome = null, hasResolver = false)
-    connectedService?.player?.invalidateAllContent()
+    // MediaSession asserts the main thread; this override runs on the JS thread.
+    launchInScope { connectedService?.player?.invalidateAllContent() }
   }
 
   /**
@@ -927,8 +938,17 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
 
   override fun updateOptions(options: NativeUpdateOptions) {
     updateOptions.updateFromBridge(options)
-    // Only update the options if the service is around
-    connectedService?.let { player.applyOptions(updateOptions) }
+    // Only update the options if the service is around.
+    // applyOptions touches the Media3 player, which asserts it is only ever
+    // driven from the main thread ("Player callback method is called from a
+    // wrong thread"). Nitro invokes this from the JS thread, so hop.
+    //
+    // The hop blocks rather than launching because `updateOptions` is a single
+    // mutable holder: updateFromBridge mutates it in place on the JS thread and
+    // applyOptions reads it on main. Blocking is what keeps the two ordered.
+    connectedService?.let { service ->
+      runBlockingOnMain { service.player.applyOptions(updateOptions) }
+    }
   }
 
   override fun getOptions(): Options {

package/ios/CarPlay/CarPlayImageLoader.swift

@@ -72,8 +72,10 @@ final class CarPlayImageLoader {
       return
     }
 
-    // Build URL resolver closure that wraps BrowserManager
-    let urlResolver: ((Double, Double) async -> ArtworkResolvedImage?)? = browserManager.map { bm in
+    // The annotation goes on the closure's return type, not the binding:
+    // @Sendable isn't inferred through `map`, and omitting it fails with
+    // "type of expression is ambiguous" — which doesn't mention @Sendable.
+    let urlResolver = browserManager.map { bm -> @Sendable (Double, Double) async -> ArtworkResolvedImage? in
       { [weak bm] pixelWidth, pixelHeight in
         guard let bm else { return nil }
         let imageContext = ImageContext(width: pixelWidth, height: pixelHeight)

package/ios/CarPlay/CarPlayListItemFactory.swift

@@ -259,7 +259,7 @@ final class CarPlayListItemFactory {
     // API (the elements are captured per availability branch — their type
     // doesn't exist before iOS 26). nil = the legacy gridImages path.
     // @MainActor makes the closure Sendable for the artwork completion hop.
-    var applyImage: (@MainActor (Int, UIImage) -> Void)?
+    var applyImage: (@MainActor @Sendable (Int, UIImage) -> Void)?
     // Resolved once per track, shared by element construction and the
     // artwork loads below.
     let resolvedStyles = tracks.map { StyleResolver.trackStyle(track: $0.style, section: style) }
@@ -280,7 +280,7 @@ final class CarPlayListItemFactory {
       }
       // The image setter every element family shares (`image` is on the base
       // class); bounds-checked against the elements the row was built with.
-      func imageApplier(_ elements: [some CPListImageRowItemElement]) -> @MainActor (Int, UIImage) -> Void {
+      func imageApplier(_ elements: [some CPListImageRowItemElement]) -> @MainActor @Sendable (Int, UIImage) -> Void {
         { index, image in
           guard index < elements.count else { return }
           elements[index].image = image
@@ -386,7 +386,7 @@ final class CarPlayListItemFactory {
         for: track,
         style: resolved,
         size: Self.tileImageSize(gridTile: style.gridTile, cardImage: resolved.cardImage),
-      ) { [weak item] image in
+      ) { [weak item, applyImage] image in
         Task { @MainActor in
           guard let item, let image else { return }
           if let applyImage {

package/ios/Player/SeekCompletionHandler.swift

@@ -1,3 +1,5 @@
-@MainActor protocol SeekCompletionHandler: AnyObject {
+// Sendable so LoadSeekCoordinator can carry a delegate into AVPlayer's
+// @Sendable seek completion closure; @MainActor is what keeps that sound.
+@MainActor protocol SeekCompletionHandler: AnyObject, Sendable {
   func handleSeekCompleted(to seconds: Double, didFinish: Bool)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-browser",
-  "version": "0.2.0-next.14",
+  "version": "0.2.0-next.15",
   "description": "react-native-audio-browser is a react native package built with Nitro",
   "keywords": [
     "react-native",
@@ -60,11 +60,11 @@
     "example": "yarn workspace example-native",
     "ci:android": "yarn android:format:check && yarn android:types && yarn android:test",
     "ci:format": "oxfmt --check --ignore-path .gitignore --ignore-path .oxfmtignore .",
-    "ci:format:ios": "swiftformat --lint ios",
+    "ci:format:ios": "scripts/swiftformat.sh --lint ios",
     "ci:ios": "yarn ci:format:ios && yarn ios:test",
     "ci:lint": "oxlint --type-aware src",
     "format": "oxfmt --write --ignore-path .gitignore --ignore-path .oxfmtignore .",
-    "ios:format": "swiftformat ios",
+    "ios:format": "scripts/swiftformat.sh ios",
     "ios:ide": "yarn workspace example-native ios:ide",
     "ios:rebuild": "yarn workspace example-native ios:rebuild",
     "ios:test": "swift test --disable-sandbox",
@@ -80,21 +80,21 @@
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22",
-    "@types/react": "19.1.1",
-    "@types/react-dom": "19.1.7",
+    "@types/react": "19.2.3",
+    "@types/react-dom": "^19.2.0",
     "conventional-changelog-conventionalcommits": "^9.3.0",
     "del-cli": "^5.1.0",
     "happy-dom": "^20.11.2",
-    "nitrogen": "0.35.0",
+    "nitrogen": "0.35.10",
     "oxfmt": "^0.27.0",
     "oxlint": "^1.42.0",
     "oxlint-tsgolint": "^0.11.2",
-    "react": "19.1.1",
-    "react-dom": "19.1.1",
-    "react-native": "0.83.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "react-native": "0.86.2",
     "react-native-builder-bob": "^0.37.0",
     "react-native-monorepo-config": "^0.3.1",
-    "react-native-nitro-modules": "0.35.0",
+    "react-native-nitro-modules": "0.35.10",
     "semantic-release": "^25.0.3",
     "shaka-player": "^4.15.4",
     "typescript": "^7.0.2",