@capgo/native-audio 8.2.15 → 8.3.1

package/ios/Sources/NativeAudioPlugin/Plugin.swift

@@ -12,7 +12,7 @@ enum MyError: Error {
 @objc(NativeAudio)
 // swiftlint:disable:next type_body_length
 public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.2.15"
+    private let pluginVersion: String = "8.3.1"
     public let identifier = "NativeAudio"
     public let jsName = "NativeAudio"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -49,6 +49,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
         }
     }
     private let queueKey = DispatchSpecificKey<Bool>()
+    /// Set while executing a block on the audio queue so getAudioAsset/endSession can avoid reentrant sync (deadlock).
+    private let audioQueueContextKey = DispatchSpecificKey<Bool?>()
     var session = AVAudioSession.sharedInstance()
 
     // Track if audio session has been initialized
@@ -187,7 +189,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
                 if !asset.isPlaying() {
                     asset.resume()
-                    self.updatePlaybackState(isPlaying: true)
+                    self.updateNowPlayingInfo(audioId: assetId, audioAsset: asset)
                 }
             }
             return .success
@@ -222,9 +224,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
                 }
 
                 asset.stop()
-                self.clearNowPlayingInfo()
                 self.currentlyPlayingAssetId = nil
-                self.updatePlaybackState(isPlaying: false)
             }
             return .success
         }
@@ -245,7 +245,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
                     self.updatePlaybackState(isPlaying: false)
                 } else {
                     asset.resume()
-                    self.updatePlaybackState(isPlaying: true)
+                    self.updateNowPlayingInfo(audioId: assetId, audioAsset: asset)
                 }
             }
             return .success
@@ -273,7 +273,11 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
         let focus = call.getBool(Constant.FocusAudio) ?? false
         let background = call.getBool(Constant.Background) ?? false
         let ignoreSilent = call.getBool(Constant.IgnoreSilent) ?? true
-        self.showNotification = call.getBool(Constant.ShowNotification) ?? false
+        // Only update showNotification when explicitly provided so repeated configure() calls
+        // (e.g. when switching assets) don't reset it to false and break Now Playing for the next play
+        if let showNotification = call.getBool(Constant.ShowNotification) {
+            self.showNotification = showNotification
+        }
 
         logger.info("Configuring audio session with focus=%@ background=%@ ignoreSilent=%@", "\(focus)", "\(background)", "\(ignoreSilent)")
 
@@ -415,9 +419,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
                 self.playOnceAssets.remove(assetId)
                 self.notificationMetadataMap.removeValue(forKey: assetId)
 
-                // Clear notification if this was the currently playing asset
+                // Reset current track if this was the currently playing asset (next play will overwrite Now Playing)
                 if self.currentlyPlayingAssetId == assetId {
-                    self.clearNowPlayingInfo()
                     self.currentlyPlayingAssetId = nil
                 }
 
@@ -605,14 +608,24 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     func endSession() {
         do {
-            // Check if any audio assets are still playing before deactivating
-            let hasPlayingAssets = audioQueue.sync {
-                return self.audioList.values.contains { asset in
+            // Avoid reentrant sync when already on audio queue (e.g. from pause()) to prevent deadlock
+            let hasPlayingAssets: Bool
+            if DispatchQueue.getSpecific(key: audioQueueContextKey) == true {
+                hasPlayingAssets = self.audioList.values.contains { asset in
                     if let audioAsset = asset as? AudioAsset {
                         return audioAsset.isPlaying()
                     }
                     return false
                 }
+            } else {
+                hasPlayingAssets = audioQueue.sync {
+                    return self.audioList.values.contains { asset in
+                        if let audioAsset = asset as? AudioAsset {
+                            return audioAsset.isPlaying()
+                        }
+                        return false
+                    }
+                }
             }
 
             // Only deactivate if no assets are playing AND no other audio is active
@@ -627,10 +640,21 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     public func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         // Don't immediately end the session here, as other players might still be active
-        // Instead, check if all players are done
+        // Instead, check if all players are done and clear Now Playing if this asset was current
         audioQueue.async { [weak self] in
             guard let self = self else { return }
 
+            // Find which asset this player belongs to; if it was the currently playing one, clear notification
+            for (audioId, asset) in self.audioList {
+                if let audioAsset = asset as? AudioAsset, audioAsset.channels.contains(player) {
+                    if self.currentlyPlayingAssetId == audioId {
+                        self.currentlyPlayingAssetId = nil
+                        self.clearNowPlayingInfo()
+                    }
+                    break
+                }
+            }
+
             // Avoid recursive calls by checking if the asset is still in the list
             let hasPlayingAssets = self.audioList.values.contains { asset in
                 if let audioAsset = asset as? AudioAsset {
@@ -642,6 +666,11 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
             // Only end the session if no more assets are playing
             if !hasPlayingAssets {
+                // If we didn't find the asset above (e.g. playOnce already removed it), clear notification when nothing is playing
+                if self.currentlyPlayingAssetId != nil {
+                    self.currentlyPlayingAssetId = nil
+                    self.clearNowPlayingInfo()
+                }
                 self.endSession()
             }
         }
@@ -727,16 +756,21 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
     }
 
     @objc private func getAudioAsset(_ call: CAPPluginCall) -> AudioAsset? {
+        // Avoid reentrant sync when already on audio queue (e.g. from pause()) to prevent deadlock
+        if DispatchQueue.getSpecific(key: audioQueueContextKey) == true {
+            return self.audioList[call.getString(Constant.AssetIdKey) ?? ""] as? AudioAsset
+        }
         var asset: AudioAsset?
-        audioQueue.sync { // Read operations should use sync
+        audioQueue.sync {
             asset = self.audioList[call.getString(Constant.AssetIdKey) ?? ""] as? AudioAsset
         }
         return asset
     }
 
     @objc func setCurrentTime(_ call: CAPPluginCall) {
-        // Consistent use of audioQueue.sync for all operations
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -752,6 +786,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     @objc func getDuration(_ call: CAPPluginCall) {
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -765,6 +801,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     @objc func getCurrentTime(_ call: CAPPluginCall) {
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -777,7 +815,10 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
     }
 
     @objc func resume(_ call: CAPPluginCall) {
+        let audioId = call.getString(Constant.AssetIdKey) ?? ""
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -807,7 +848,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
             // Update notification when resumed
             if self.showNotification {
-                self.updatePlaybackState(isPlaying: true)
+                self.updateNowPlayingInfo(audioId: audioId, audioAsset: audioAsset)
             }
 
             call.resolve()
@@ -816,6 +857,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     @objc func pause(_ call: CAPPluginCall) {
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -853,6 +896,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
         let fadeOutDuration = call.getDouble(Constant.FadeOutDuration) ?? Double(Constant.DefaultFadeDuration)
 
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard !self.audioList.isEmpty else {
                 call.reject("Audio list is empty")
                 return
@@ -861,9 +906,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
             do {
                 try self.stopAudio(audioId: audioId, fadeOut: fadeOut, fadeOutDuration: fadeOutDuration)
 
-                // Clear notification when stopped
-                if self.showNotification {
-                    self.clearNowPlayingInfo()
+                // Reset current track when stopping the asset that was playing (internal state, not just for notifications)
+                if self.currentlyPlayingAssetId == audioId {
                     self.currentlyPlayingAssetId = nil
                 }
 
@@ -883,6 +927,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     @objc func loop(_ call: CAPPluginCall) {
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -909,6 +955,11 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
                 asset.unload()
                 self.audioList[audioId] = nil
 
+                // Reset current track if this was the currently playing asset (internal state tracking)
+                if self.currentlyPlayingAssetId == audioId {
+                    self.currentlyPlayingAssetId = nil
+                }
+
                 // Clean up playOnce tracking if this was a playOnce asset
                 if self.playOnceAssets.contains(audioId) {
                     self.playOnceAssets.remove(audioId)
@@ -936,6 +987,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     @objc func setVolume(_ call: CAPPluginCall) {
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -950,6 +1003,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     @objc func setRate(_ call: CAPPluginCall) {
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -963,6 +1018,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     @objc func isPlaying(_ call: CAPPluginCall) {
         audioQueue.sync {
+            self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: true)
+            defer { self.audioQueue.setSpecific(key: self.audioQueueContextKey, value: nil) }
             guard let audioAsset: AudioAsset = self.getAudioAsset(call) else {
                 call.reject("Failed to get audio asset")
                 return
@@ -1320,6 +1377,8 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
         }
     }
 
+    /// Clears the Now Playing info. Only used when tearing down (deinit); stop/unload do not clear
+    /// so that the next play can overwrite the notification without a race.
     private func clearNowPlayingInfo() {
         DispatchQueue.main.async {
             MPNowPlayingInfoCenter.default().nowPlayingInfo = nil

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-audio",
-  "version": "8.2.15",
+  "version": "8.3.1",
   "description": "A native plugin for native audio engine",
   "license": "MPL-2.0",
   "main": "dist/plugin.cjs.js",