@capgo/native-audio 7.3.18 → 7.3.19

package/ios/Plugin/AudioAsset.swift

@@ -67,7 +67,8 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
         // Limit channels to a reasonable maximum to prevent resource issues
         let channelCount = min(max(channels ?? 1, 1), MAX_CHANNELS)
 
-        owner.executeOnAudioQueue { [self] in
+        owner.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
             for _ in 0..<channelCount {
                 do {
                     let player = try AVAudioPlayer(contentsOf: pathUrl)
@@ -88,10 +89,10 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
     deinit {
         currentTimeTimer?.invalidate()
         currentTimeTimer = nil
-        
+
         fadeTimer?.invalidate()
         fadeTimer = nil
-        
+
         // Clean up any players that might still be playing
         for player in channels {
             if player.isPlaying {
@@ -107,7 +108,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
      */
     func getCurrentTime() -> TimeInterval {
         var result: TimeInterval = 0
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             if channels.isEmpty || playIndex >= channels.count {
                 result = 0
                 return
@@ -123,7 +126,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
      * - Parameter time: Time in seconds
      */
     func setCurrentTime(time: TimeInterval) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             if channels.isEmpty || playIndex >= channels.count {
                 return
             }
@@ -140,7 +145,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
      */
     func getDuration() -> TimeInterval {
         var result: TimeInterval = 0
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             if channels.isEmpty || playIndex >= channels.count {
                 result = 0
                 return
@@ -161,7 +168,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
         stopCurrentTimeUpdates()
         stopFadeTimer()
 
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !channels.isEmpty else { return }
 
             // Reset play index if it's out of bounds
@@ -186,14 +195,16 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
             } else {
                 player.play()
             }
-            
+
             playIndex = (playIndex + 1) % channels.count
             startCurrentTimeUpdates()
         }
     }
 
     func playWithFade(time: TimeInterval) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !channels.isEmpty else { return }
 
             // Reset play index if it's out of bounds
@@ -234,36 +245,58 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
 
         player.volume = startVolume
 
-        fadeTimer = Timer.scheduledTimer(withTimeInterval: TimeInterval(timeInterval), repeats: true) { [weak self, weak player] timer in
-            guard let strongSelf = self, let strongPlayer = player else {
-                timer.invalidate()
-                return
-            }
+        // Create timer on main thread
+        DispatchQueue.main.async { [weak self, weak player] in
+            guard let self = self else { return }
 
-            currentStep += 1
-            let progress = Float(currentStep) / Float(totalSteps)
-            let newVolume = startVolume + progress * (endVolume - startVolume)
+            let timer = Timer.scheduledTimer(withTimeInterval: TimeInterval(timeInterval), repeats: true) { [weak self, weak player] timer in
+                guard let strongSelf = self, let strongPlayer = player else {
+                    timer.invalidate()
+                    return
+                }
 
-            strongPlayer.volume = newVolume
+                currentStep += 1
+                let progress = Float(currentStep) / Float(totalSteps)
+                let newVolume = startVolume + progress * (endVolume - startVolume)
 
-            if currentStep >= totalSteps {
-                strongPlayer.volume = endVolume
-                timer.invalidate()
-                strongSelf.fadeTimer = nil
+                // Update player on audio queue
+                strongSelf.owner?.executeOnAudioQueue {
+                    strongPlayer.volume = newVolume
+                }
+
+                if currentStep >= totalSteps {
+                    strongSelf.owner?.executeOnAudioQueue {
+                        strongPlayer.volume = endVolume
+                    }
+                    timer.invalidate()
+
+                    // Update timer reference on main thread
+                    DispatchQueue.main.async {
+                        strongSelf.fadeTimer = nil
+                    }
+                }
             }
+
+            self.fadeTimer = timer
+            RunLoop.current.add(timer, forMode: .common)
         }
-        RunLoop.current.add(fadeTimer!, forMode: .common)
     }
 
     internal func stopFadeTimer() {
         DispatchQueue.main.async { [weak self] in
-            self?.fadeTimer?.invalidate()
-            self?.fadeTimer = nil
+            guard let self = self else { return }
+
+            if let timer = self.fadeTimer {
+                timer.invalidate()
+                self.fadeTimer = nil
+            }
         }
     }
 
     func pause() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             stopCurrentTimeUpdates()
 
             // Check for valid playIndex
@@ -275,7 +308,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
     }
 
     func resume() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             // Check for valid playIndex
             guard !channels.isEmpty && playIndex < channels.count else { return }
 
@@ -287,7 +322,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
     }
 
     func stop() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             stopCurrentTimeUpdates()
             stopFadeTimer()
 
@@ -304,7 +341,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
 
     func stopWithFade() {
         // Store current player locally to avoid race conditions with playIndex
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !channels.isEmpty && playIndex < channels.count else {
                 stop()
                 return
@@ -329,7 +368,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
     }
 
     func loop() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             self.stop()
 
             guard !channels.isEmpty && playIndex < channels.count else { return }
@@ -344,7 +385,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
     }
 
     func unload() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             self.stop()
             stopCurrentTimeUpdates()
             stopFadeTimer()
@@ -357,7 +400,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
      * - Parameter volume: Volume level (0.0-1.0)
      */
     func setVolume(volume: NSNumber!) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             // Ensure volume is in valid range
             let validVolume = min(max(volume.floatValue, Constant.MinVolume), Constant.MaxVolume)
             for player in channels {
@@ -371,7 +416,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
      * - Parameter rate: Playback rate (0.5-2.0 is typical range)
      */
     func setRate(rate: NSNumber!) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             // Ensure rate is in valid range
             let validRate = min(max(rate.floatValue, Constant.MinRate), Constant.MaxRate)
             for player in channels {
@@ -384,11 +431,13 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
      * AVAudioPlayerDelegate method called when playback finishes
      */
     public func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             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)
@@ -403,7 +452,9 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
 
     func isPlaying() -> Bool {
         var result: Bool = false
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             if channels.isEmpty || playIndex >= channels.count {
                 result = false
                 return
@@ -440,8 +491,10 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
 
     internal func stopCurrentTimeUpdates() {
         DispatchQueue.main.async { [weak self] in
-            self?.currentTimeTimer?.invalidate()
-            self?.currentTimeTimer = nil
+            guard let self = self else { return }
+
+            self.currentTimeTimer?.invalidate()
+            self.currentTimeTimer = nil
         }
     }
 }

package/ios/Plugin/Plugin.swift

@@ -143,7 +143,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
             } else {
                 try self.session.setCategory(AVAudioSession.Category.playback, options: .mixWithOthers)
             }
-            
+
             // Only activate if needed (background mode)
             if background {
                 try self.session.setActive(true)
@@ -195,7 +195,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
                     return false
                 }
             }
-            
+
             // Only deactivate if no assets are playing
             if !hasPlayingAssets {
                 try self.session.setActive(false, options: .notifyOthersOnDeactivation)
@@ -210,7 +210,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
         // 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 {
@@ -219,7 +219,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
                 }
                 return false
             }
-            
+
             // Only end the session if no more assets are playing
             if !hasPlayingAssets {
                 self.endSession()
@@ -478,11 +478,28 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
             var basePath: String?
             if let url = URL(string: assetPath), url.scheme != nil {
-                // Handle remote URL
-                let remoteAudioAsset = RemoteAudioAsset(owner: self, withAssetId: audioId, withPath: assetPath, withChannels: channels, withVolume: volume, withFadeDelay: delay)
-                self.audioList[audioId] = remoteAudioAsset
-                call.resolve()
-                return
+                // Check if it's a local file URL or a remote URL
+                if url.isFileURL {
+                    // Handle local file URL
+                    let fileURL = url
+                    basePath = fileURL.path
+
+                    if let basePath = basePath, FileManager.default.fileExists(atPath: basePath) {
+                        let audioAsset = AudioAsset(
+                            owner: self,
+                            withAssetId: audioId, withPath: basePath, withChannels: channels,
+                            withVolume: volume, withFadeDelay: delay)
+                        self.audioList[audioId] = audioAsset
+                        call.resolve()
+                        return
+                    }
+                } else {
+                    // Handle remote URL
+                    let remoteAudioAsset = RemoteAudioAsset(owner: self, withAssetId: audioId, withPath: assetPath, withChannels: channels, withVolume: volume, withFadeDelay: delay)
+                    self.audioList[audioId] = remoteAudioAsset
+                    call.resolve()
+                    return
+                }
             } else if isLocalUrl == false {
                 // Handle public folder
                 assetPath = assetPath.starts(with: "public/") ? assetPath : "public/" + assetPath

package/ios/Plugin/RemoteAudioAsset.swift

@@ -15,7 +15,9 @@ public class RemoteAudioAsset: AudioAsset {
     override init(owner: NativeAudio, withAssetId assetId: String, withPath path: String!, withChannels channels: Int!, withVolume volume: Float!, withFadeDelay delay: Float!) {
         super.init(owner: owner, withAssetId: assetId, withPath: path, withChannels: channels ?? 1, withVolume: volume ?? 1.0, withFadeDelay: delay ?? 0.0)
 
-        owner.executeOnAudioQueue { [self] in
+        owner.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+            
             guard let url = URL(string: path ?? "") else {
                 print("Invalid URL: \(String(describing: path))")
                 return
@@ -86,7 +88,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     func playerDidFinishPlaying(player: AVPlayer) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             self.owner?.notifyListeners("complete", data: [
                 "assetId": self.assetId
             ])
@@ -94,7 +98,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func play(time: TimeInterval, delay: TimeInterval) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty else { return }
 
             // Reset play index if it's out of bounds
@@ -124,7 +130,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func pause() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty && playIndex < players.count else { return }
 
             let player = players[playIndex]
@@ -134,7 +142,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func resume() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty && playIndex < players.count else { return }
 
             let player = players[playIndex]
@@ -143,24 +153,27 @@ public class RemoteAudioAsset: AudioAsset {
             // Add notification observer for when playback stops
             cleanupNotificationObservers()
 
+            // Capture weak reference to self
             let observer = NotificationCenter.default.addObserver(
                 forName: NSNotification.Name.AVPlayerItemDidPlayToEndTime,
                 object: player.currentItem,
-                queue: nil) { [weak self] notification in
-                guard let strongSelf = self else { return }
+                queue: OperationQueue.main) { [weak self, weak player] notification in
+                    guard let strongSelf = self, let strongPlayer = player else { return }
 
-                if let currentItem = notification.object as? AVPlayerItem,
-                   currentItem == strongSelf.playerItems[strongSelf.playIndex] {
-                    strongSelf.playerDidFinishPlaying(player: strongSelf.players[strongSelf.playIndex])
+                    if let currentItem = notification.object as? AVPlayerItem,
+                       strongPlayer.currentItem == currentItem {
+                        strongSelf.playerDidFinishPlaying(player: strongPlayer)
+                    }
                 }
-            }
             notificationObservers.append(observer)
             startCurrentTimeUpdates()
         }
     }
 
     override func stop() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             stopCurrentTimeUpdates()
 
             for player in players {
@@ -178,7 +191,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func loop() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             cleanupNotificationObservers()
 
             for (index, player) in players.enumerated() {
@@ -189,14 +204,15 @@ public class RemoteAudioAsset: AudioAsset {
                 let observer = NotificationCenter.default.addObserver(
                     forName: .AVPlayerItemDidPlayToEndTime,
                     object: playerItem,
-                    queue: nil) { [weak player] notification in
-                    guard let strongPlayer = player,
-                          let item = notification.object as? AVPlayerItem,
-                          strongPlayer.currentItem === item else { return }
-
-                    strongPlayer.seek(to: .zero)
-                    strongPlayer.play()
-                }
+                    queue: OperationQueue.main) { [weak self, weak player] notification in
+                        guard let strongPlayer = player,
+                              let strongSelf = self,
+                              let item = notification.object as? AVPlayerItem,
+                              strongPlayer.currentItem === item else { return }
+
+                        strongPlayer.seek(to: .zero)
+                        strongPlayer.play()
+                    }
 
                 notificationObservers.append(observer)
 
@@ -218,7 +234,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     @objc func playerItemDidReachEnd(notification: Notification) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             if let playerItem = notification.object as? AVPlayerItem,
                let player = players.first(where: { $0.currentItem == playerItem }) {
                 player.seek(to: .zero)
@@ -228,7 +246,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func unload() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             stopCurrentTimeUpdates()
             stop()
 
@@ -245,7 +265,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func setVolume(volume: NSNumber!) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             // Ensure volume is in valid range (0.0-1.0)
             let validVolume = min(max(volume.floatValue, Constant.MinVolume), Constant.MaxVolume)
             for player in players {
@@ -255,7 +277,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func setRate(rate: NSNumber!) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             // Ensure rate is in valid range
             let validRate = min(max(rate.floatValue, Constant.MinRate), Constant.MaxRate)
             for player in players {
@@ -266,7 +290,9 @@ public class RemoteAudioAsset: AudioAsset {
 
     override func isPlaying() -> Bool {
         var result = false
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty && playIndex < players.count else {
                 result = false
                 return
@@ -279,7 +305,9 @@ public class RemoteAudioAsset: AudioAsset {
 
     override func getCurrentTime() -> TimeInterval {
         var result: TimeInterval = 0
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty && playIndex < players.count else {
                 result = 0
                 return
@@ -292,7 +320,9 @@ public class RemoteAudioAsset: AudioAsset {
 
     override func getDuration() -> TimeInterval {
         var result: TimeInterval = 0
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty && playIndex < players.count else {
                 result = 0
                 return
@@ -308,7 +338,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func playWithFade(time: TimeInterval) {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty && playIndex < players.count else { return }
 
             let player = players[playIndex]
@@ -332,7 +364,9 @@ public class RemoteAudioAsset: AudioAsset {
     }
 
     override func stopWithFade() {
-        owner?.executeOnAudioQueue { [self] in
+        owner?.executeOnAudioQueue { [weak self] in
+            guard let self = self else { return }
+
             guard !players.isEmpty && playIndex < players.count else {
                 stop()
                 return
@@ -390,24 +424,36 @@ public class RemoteAudioAsset: AudioAsset {
 
         stopFadeTimer()
 
-        fadeTimer = Timer.scheduledTimer(withTimeInterval: TimeInterval(timeInterval), repeats: true) { [weak player] timer in
-            guard let strongPlayer = player else {
-                timer.invalidate()
-                return
-            }
+        // Ensure timer creation happens on main thread
+        DispatchQueue.main.async { [weak self, weak player] in
+            guard let self = self else { return }
 
-            currentStep += 1
-            let progress = Float(currentStep) / Float(totalSteps)
-            let newVolume = startVolume + progress * (endVolume - startVolume)
+            self.fadeTimer = Timer.scheduledTimer(withTimeInterval: TimeInterval(timeInterval), repeats: true) { [weak self, weak player] timer in
+                guard let strongPlayer = player, let strongSelf = self else {
+                    timer.invalidate()
+                    return
+                }
+
+                currentStep += 1
+                let progress = Float(currentStep) / Float(totalSteps)
+                let newVolume = startVolume + progress * (endVolume - startVolume)
+
+                strongPlayer.volume = newVolume
+
+                if currentStep >= totalSteps {
+                    strongPlayer.volume = endVolume
+                    timer.invalidate()
 
-            strongPlayer.volume = newVolume
+                    // Update timer reference on main thread
+                    DispatchQueue.main.async {
+                        strongSelf.fadeTimer = nil
+                    }
+                }
+            }
 
-            if currentStep >= totalSteps {
-                strongPlayer.volume = endVolume
-                timer.invalidate()
-                self.fadeTimer = nil
+            if let timer = self.fadeTimer {
+                RunLoop.current.add(timer, forMode: .common)
             }
         }
-        RunLoop.current.add(fadeTimer!, forMode: .common)
     }
 }

package/package.json

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