@capgo/native-audio 7.3.10 → 7.3.12

package/ios/Plugin/AudioAsset.swift

@@ -86,14 +86,19 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
     }
 
     deinit {
-        stopCurrentTimeUpdates()
-        stopFadeTimer()
+        currentTimeTimer?.invalidate()
+        currentTimeTimer = nil
+        
+        fadeTimer?.invalidate()
+        fadeTimer = nil
+        
         // Clean up any players that might still be playing
         for player in channels {
             if player.isPlaying {
                 player.stop()
             }
         }
+        channels = []
     }
 
     /**
@@ -153,6 +158,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
      *   - delay: Delay before playback in seconds
      */
     func play(time: TimeInterval, delay: TimeInterval) {
+        stopCurrentTimeUpdates()
+        stopFadeTimer()
+
         owner?.executeOnAudioQueue { [self] in
             guard !channels.isEmpty else { return }
 
@@ -161,6 +169,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
                 playIndex = 0
             }
 
+            // Ensure the audio session is active before playing
+            owner?.activateSession()
+
             let player = channels[playIndex]
             // Ensure time is within valid range
             let validTime = min(max(time, 0), player.duration)
@@ -175,6 +186,7 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
             } else {
                 player.play()
             }
+            
             playIndex = (playIndex + 1) % channels.count
             startCurrentTimeUpdates()
         }
@@ -368,11 +380,18 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
         }
     }
 
+    /**
+     * AVAudioPlayerDelegate method called when playback finishes
+     */
     public func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         owner?.executeOnAudioQueue { [self] in
             self.owner?.notifyListeners("complete", data: [
                 "assetId": self.assetId
             ])
+            
+            // Notify the owner that this player finished
+            // The owner will check if any other assets are still playing
+            owner?.audioPlayerDidFinishPlaying(player, successfully: flag)
         }
     }
 

package/ios/Plugin/Plugin.swift

@@ -83,9 +83,9 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     private func setupAudioSession() {
         do {
+            // Only set the category without immediately activating/deactivating
             try self.session.setCategory(AVAudioSession.Category.playback, options: .mixWithOthers)
-            try self.session.setActive(true)
-            try self.session.setActive(false)
+            // Don't activate/deactivate in setup - we'll do this explicitly when needed
         } catch {
             print("Failed to setup audio session: \(error)")
         }
@@ -135,8 +135,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
         // Use a single audio session configuration block for better atomicity
         do {
-            try self.session.setActive(true)
-
+            // Set category first
             if focus {
                 try self.session.setCategory(AVAudioSession.Category.playback, options: .duckOthers)
             } else if !ignoreSilent {
@@ -144,9 +143,10 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
             } else {
                 try self.session.setCategory(AVAudioSession.Category.playback, options: .mixWithOthers)
             }
-
-            if !background {
-                try self.session.setActive(false)
+            
+            // Only activate if needed (background mode)
+            if background {
+                try self.session.setActive(true)
             }
 
         } catch {
@@ -175,7 +175,10 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     func activateSession() {
         do {
-            try self.session.setActive(true)
+            // Only activate if not already active
+            if !session.isOtherAudioPlaying {
+                try self.session.setActive(true)
+            }
         } catch {
             print("Failed to set session active: \(error)")
         }
@@ -183,14 +186,45 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     func endSession() {
         do {
-            try self.session.setActive(false, options: .notifyOthersOnDeactivation)
+            // Check if any audio assets are still playing before deactivating
+            let 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
+            if !hasPlayingAssets {
+                try self.session.setActive(false, options: .notifyOthersOnDeactivation)
+            }
         } catch {
             print("Failed to deactivate audio session: \(error)")
         }
     }
 
     public func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
-        self.endSession()
+        // Don't immediately end the session here, as other players might still be active
+        // Instead, check if all players are done
+        audioQueue.async { [weak self] in
+            guard let self = self else { return }
+            
+            // 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 {
+                    // Check if the asset has any playing channels other than the one that just finished
+                    return audioAsset.channels.contains { $0 != player && $0.isPlaying }
+                }
+                return false
+            }
+            
+            // Only end the session if no more assets are playing
+            if !hasPlayingAssets {
+                self.endSession()
+            }
+        }
     }
 
     @objc func play(_ call: CAPPluginCall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-audio",
-  "version": "7.3.10",
+  "version": "7.3.12",
   "description": "A native plugin for native audio engine",
   "license": "MIT",
   "main": "dist/plugin.cjs.js",