@capgo/native-audio 8.3.16 → 8.3.18

package/android/src/main/java/ee/forgr/audio/AudioAsset.java

@@ -425,6 +425,8 @@ public class AudioAsset implements AutoCloseable {
         if (audio != null && audio.isPlaying()) {
             cancelFade();
             fadeOut(audio, fadeOutDurationMs, toPause);
+        } else if (!toPause) {
+            stop();
         }
     }
 

package/android/src/main/java/ee/forgr/audio/RemoteAudioAsset.java

@@ -612,8 +612,16 @@ public class RemoteAudioAsset extends AudioAsset {
         );
     }
 
+    @Override
+    public void stopWithFade(double fadeOutDurationMs, boolean toPause) throws Exception {
+        stopWithFade((float) fadeOutDurationMs, toPause);
+    }
+
     public void stopWithFade(float fadeOutDurationMs, boolean asPause) throws Exception {
         if (players.isEmpty()) {
+            if (!asPause) {
+                stop();
+            }
             return;
         }
 
@@ -623,6 +631,12 @@ public class RemoteAudioAsset extends AudioAsset {
             .runOnUiThread(() -> {
                 if (player != null && player.isPlaying()) {
                     fadeOut(player, fadeOutDurationMs, asPause);
+                } else if (!asPause) {
+                    try {
+                        stop();
+                    } catch (Exception e) {
+                        logger.error("Error stopping remote audio after failed fade", e);
+                    }
                 }
             });
     }
@@ -661,13 +675,19 @@ public class RemoteAudioAsset extends AudioAsset {
                         owner
                             .getActivity()
                             .runOnUiThread(() -> {
-                                if (player != null && player.isPlaying()) {
+                                // Stop/pause unconditionally: the fade brought volume to zero so the
+                                // player must be stopped regardless of its current isPlaying() state
+                                // (e.g. ExoPlayer may have auto-stopped at volume 0 on some devices).
+                                if (player != null) {
                                     if (asPause) {
                                         player.pause();
                                         logger.verbose("Faded out to pause at time " + getCurrentPosition());
                                     } else {
                                         player.setVolume(0);
                                         player.stop();
+                                        dispatchComplete();
+                                        initializePlayer(player);
+                                        isPrepared = false;
                                         logger.verbose("Faded out to stop at time " + getCurrentPosition());
                                     }
                                 }
@@ -685,7 +705,7 @@ public class RemoteAudioAsset extends AudioAsset {
                     owner
                         .getActivity()
                         .runOnUiThread(() -> {
-                            if (player != null && player.isPlaying()) {
+                            if (player != null) {
                                 player.setVolume(thisTargetVolume);
                             }
                         });

package/ios/Sources/NativeAudioPlugin/AudioAsset+Fade.swift

@@ -34,14 +34,17 @@ extension AudioAsset {
         scheduleLocalFadeOutPauseOnMain(audio: audio, beforePause: beforePause)
     }
 
-    fileprivate func scheduleLocalFadeOutStopOnMain(audio: AVAudioPlayer) {
+    fileprivate func scheduleLocalFadeOutStopOnMain(audio: AVAudioPlayer, beforeStop: ((TimeInterval, TimeInterval) -> Void)?) {
         DispatchQueue.main.async { [weak self] in
             guard let self else { return }
-            self.performLocalFadeOutStopOnMain(audio: audio)
+            self.performLocalFadeOutStopOnMain(audio: audio, beforeStop: beforeStop)
         }
     }
 
-    fileprivate func performLocalFadeOutStopOnMain(audio: AVAudioPlayer) {
+    fileprivate func performLocalFadeOutStopOnMain(audio: AVAudioPlayer, beforeStop: ((TimeInterval, TimeInterval) -> Void)?) {
+        let elapsed = audio.currentTime
+        let duration = audio.duration.isFinite ? audio.duration : 0
+        beforeStop?(elapsed, duration)
         audio.stop()
         dispatchComplete()
     }
@@ -71,21 +74,25 @@ extension AudioAsset {
         }
     }
 
+    /// - Parameter beforeStop: Called on the main queue immediately before `stop()` when `toPause` is false,
+    ///   so the plugin can refresh Now Playing (rate 0) at the final elapsed time.
     /// - Parameter beforePause: Called on the main queue immediately before `pause()` when `toPause` is true,
     ///   so the plugin can persist `timeBeforePause` and update Now Playing at the actual stop position.
+    ///   Kept last so call sites can use a trailing closure for fade-out-to-pause.
     func fadeOut(
         audio: AVAudioPlayer,
         fadeOutDuration: TimeInterval,
         toPause: Bool = false,
+        beforeStop: ((TimeInterval, TimeInterval) -> Void)? = nil,
         beforePause: ((TimeInterval, TimeInterval) -> Void)? = nil
     ) {
         cancelFade()
-        let steps = Int(fadeOutDuration / TimeInterval(fadeDelaySecs))
+        let steps = max(0, Int(fadeOutDuration / TimeInterval(fadeDelaySecs)))
         guard steps > 0 else {
             if toPause {
                 scheduleLocalFadeOutPauseOnMain(audio: audio, beforePause: beforePause)
             } else {
-                scheduleLocalFadeOutStopOnMain(audio: audio)
+                scheduleLocalFadeOutStopOnMain(audio: audio, beforeStop: beforeStop)
             }
             return
         }
@@ -96,19 +103,21 @@ extension AudioAsset {
         task = DispatchWorkItem { [weak self] in
             guard let self else { return }
             for _ in 0..<steps {
-                guard let task, !task.isCancelled, self.isPlaying(), audio.isPlaying else { return }
+                guard let task, !task.isCancelled else { return }
+                guard self.isPlaying(), audio.isPlaying else { break }
                 currentVolume -= fadeStep
                 DispatchQueue.main.async {
                     audio.volume = max(currentVolume, 0)
                 }
                 Thread.sleep(forTimeInterval: TimeInterval(self.fadeDelaySecs))
             }
+            guard let task, !task.isCancelled else { return }
             DispatchQueue.main.async { [weak self] in
                 guard let self else { return }
                 if toPause {
                     self.performLocalFadeOutPauseOnMain(audio: audio, beforePause: beforePause)
                 } else {
-                    self.performLocalFadeOutStopOnMain(audio: audio)
+                    self.performLocalFadeOutStopOnMain(audio: audio, beforeStop: beforeStop)
                 }
             }
         }

package/ios/Sources/NativeAudioPlugin/AudioAsset.swift

@@ -261,10 +261,10 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
             if player.isPlaying {
                 if toPause {
                     if player.volume > 0 {
-                        fadeOut(audio: player, fadeOutDuration: fadeOutDuration, toPause: true) { [weak self] elapsed, duration in
+                        fadeOut(audio: player, fadeOutDuration: fadeOutDuration, toPause: true, beforePause: { [weak self] elapsed, duration in
                             guard let self, let owner = self.owner else { return }
                             owner.recordPausePositionAfterFade(assetId: self.assetId, elapsedTime: elapsed, duration: duration)
-                        }
+                        })
                     } else {
                         cancelFade()
                         schedulePauseWithPositionRecording(audio: player) { [weak self] elapsed, duration in
@@ -273,9 +273,15 @@ public class AudioAsset: NSObject, AVAudioPlayerDelegate {
                         }
                     }
                 } else if player.volume > 0 {
-                    fadeOut(audio: player, fadeOutDuration: fadeOutDuration, toPause: false)
+                    fadeOut(audio: player, fadeOutDuration: fadeOutDuration, toPause: false, beforeStop: { [weak self] elapsed, duration in
+                        guard let self, let owner = self.owner else { return }
+                        owner.recordStoppedPlaybackStateAfterFade(assetId: self.assetId, elapsedTime: elapsed, duration: duration)
+                    })
                 } else {
+                    let elapsed = player.currentTime
+                    let duration = player.duration.isFinite ? player.duration : 0
                     stop()
+                    owner?.recordStoppedPlaybackStateAfterFade(assetId: assetId, elapsedTime: elapsed, duration: duration)
                 }
             } else if !toPause {
                 stop()

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.3.16"
+    private let pluginVersion: String = "8.3.18"
     public let identifier = "NativeAudio"
     public let jsName = "NativeAudio"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -266,8 +266,20 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
                     return
                 }
 
+                // Sample before `stop()` — `AudioAsset.stop()` resets every channel's `currentTime` to 0.
+                let elapsedTime = asset.getCurrentTime()
+                let duration = asset.getDuration()
                 asset.stop()
-                self.currentlyPlayingAssetId = nil
+                // Keep `currentlyPlayingAssetId` and Now Playing metadata so the lock screen card
+                // stays until `unload()` (or natural completion / another `play()` replaces it).
+                if self.showNotification,
+                   self.currentlyPlayingAssetId == assetId {
+                    self.updatePlaybackState(
+                        isPlaying: false,
+                        elapsedTime: elapsedTime,
+                        duration: duration
+                    )
+                }
             }
             return .success
         }
@@ -974,7 +986,7 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
 
     /// Stops playback of the audio asset identified by `assetId` from the plugin call and performs related cleanup.
     ///
-    /// The `assetId` is read from the call using `Constant.AssetIdKey`. If the asset is currently playing it will be stopped; if `showNotification` is enabled the Now Playing info is cleared and `currentlyPlayingAssetId` is reset. If the asset was created by `playOnce`, it is removed from `playOnceAssets` and its notification metadata is removed. The audio session is ended if appropriate. The call is resolved on success or rejected with an error message on failure.
+    /// The `assetId` is read from the call using `Constant.AssetIdKey`. If the asset is currently playing it will be stopped. When `showNotification` is enabled and this asset owns Now Playing, playback state is updated to stopped but the Now Playing card is left in place until `unload()` or natural completion. If the asset was created by `playOnce`, it is removed from `playOnceAssets` and its notification metadata is removed. The audio session is ended if appropriate. The call is resolved on success or rejected with an error message on failure.
     @objc func stop(_ call: CAPPluginCall) {
         let audioId = call.getString(Constant.AssetIdKey) ?? ""
         let fadeOut = call.getBool(Constant.FadeOut) ?? false
@@ -989,11 +1001,32 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
             }
 
             do {
+                // Sample before `stopAudio` — non-fade `AudioAsset.stop()` resets `currentTime` to 0.
+                var preStopNowPlayingElapsed: TimeInterval?
+                var preStopNowPlayingDuration: TimeInterval?
+                if !fadeOut,
+                   self.showNotification,
+                   self.currentlyPlayingAssetId == audioId,
+                   let preStopAsset = self.audioList[audioId] as? AudioAsset {
+                    preStopNowPlayingElapsed = preStopAsset.getCurrentTime()
+                    preStopNowPlayingDuration = preStopAsset.getDuration()
+                }
+
                 try self.stopAudio(audioId: audioId, fadeOut: fadeOut, fadeOutDuration: fadeOutDuration)
 
-                // Reset current track when stopping the asset that was playing (internal state, not just for notifications)
-                if self.currentlyPlayingAssetId == audioId {
-                    self.currentlyPlayingAssetId = nil
+                // Keep `currentlyPlayingAssetId` so lock screen / Control Center stays tied to this asset
+                // until `unload()` clears it; refresh Now Playing to a stopped state (rate 0).
+                // Skip when fading out to stop: `recordStoppedPlaybackStateAfterFade` runs when the fade finishes
+                // (and for zero-volume immediate stop inside `stopWithFade`).
+                if let elapsed = preStopNowPlayingElapsed,
+                   let duration = preStopNowPlayingDuration,
+                   self.showNotification,
+                   self.currentlyPlayingAssetId == audioId {
+                    self.updatePlaybackState(
+                        isPlaying: false,
+                        elapsedTime: elapsed,
+                        duration: duration
+                    )
                 }
 
                 // Clean up playOnce tracking if this was a playOnce asset
@@ -1517,6 +1550,16 @@ public class NativeAudio: CAPPlugin, AVAudioPlayerDelegate, CAPBridgedPlugin {
         }
     }
 
+    /// Refreshes Now Playing to a stopped state after fade-out-to-stop completes (or zero-volume stop-with-fade).
+    internal func recordStoppedPlaybackStateAfterFade(assetId: String, elapsedTime: TimeInterval, duration: TimeInterval) {
+        audioQueue.async { [weak self] in
+            guard let self else { return }
+            if self.showNotification && self.currentlyPlayingAssetId == assetId {
+                self.updatePlaybackState(isPlaying: false, elapsedTime: elapsedTime, duration: duration)
+            }
+        }
+    }
+
     private func updatePlaybackState(isPlaying: Bool, elapsedTime: TimeInterval? = nil, duration: TimeInterval? = nil) {
         DispatchQueue.main.async {
             var nowPlayingInfo = MPNowPlayingInfoCenter.default().nowPlayingInfo ?? [String: Any]()

package/ios/Sources/NativeAudioPlugin/RemoteAudioAsset+Fade.swift

@@ -62,7 +62,7 @@ extension RemoteAudioAsset {
         beforePause: ((TimeInterval, TimeInterval) -> Void)? = nil
     ) {
         cancelFade()
-        let steps = Int(fadeOutDuration / TimeInterval(fadeDelaySecs))
+        let steps = max(0, Int(fadeOutDuration / TimeInterval(fadeDelaySecs)))
         guard steps > 0 else {
             if toPause {
                 scheduleRemoteFadeOutPauseOnMain(player: player, beforePause: beforePause)
@@ -81,13 +81,15 @@ extension RemoteAudioAsset {
         task = DispatchWorkItem { [weak self] in
             guard let self else { return }
             for _ in 0..<steps {
-                guard let task, !task.isCancelled, self.isPlaying(), player.timeControlStatus == .playing else { return }
+                guard let task, !task.isCancelled else { return }
+                guard self.isPlaying(), player.timeControlStatus == .playing else { break }
                 currentVolume -= fadeStep
                 DispatchQueue.main.async {
                     player.volume = max(currentVolume, 0)
                 }
                 Thread.sleep(forTimeInterval: TimeInterval(self.fadeDelaySecs))
             }
+            guard let task, !task.isCancelled else { return }
             DispatchQueue.main.async { [weak self] in
                 guard let self else { return }
                 if toPause {

package/package.json

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