capacitor-plugin-playlist 0.1.30 → 0.1.33

package/ios/Plugin/RmxAudioPlayer.swift

@@ -15,9 +15,9 @@ import UIKit
 extension String: Error {}
 
 final class RmxAudioPlayer: NSObject {
-    
+
     var statusUpdater: StatusUpdater? = nil
-    
+
     private var playbackTimeObserver: Any?
     private var wasPlayingInterrupted = false
     private var commandCenterRegistered = false
@@ -37,11 +37,11 @@ final class RmxAudioPlayer: NSObject {
         activateAudioSession()
         observeLifeCycle()
     }
-    
+
     deinit {
         releaseResources()
     }
-    
+
     func setOptions(_ options: [String:Any]) {
         print("RmxAudioPlayer.execute=setOptions, \(options)")
         resetStreamOnPause = (options["resetStreamOnPause"] as? NSNumber)?.boolValue ?? false
@@ -49,20 +49,20 @@ final class RmxAudioPlayer: NSObject {
 
     func initialize() {
         print("RmxAudioPlayer.execute=initialize")
-        
+
         avQueuePlayer.actionAtItemEnd = .advance
         avQueuePlayer.addObserver(self, forKeyPath: "currentItem", options: .new, context: nil)
         avQueuePlayer.addObserver(self, forKeyPath: "rate", options: .new, context: nil)
         avQueuePlayer.addObserver(self, forKeyPath: "timeControlStatus", options: .new, context: nil)
-        
+
         let interval = CMTimeMakeWithSeconds(Float64(1.0), preferredTimescale: Int32(Double(NSEC_PER_SEC)))
         playbackTimeObserver = avQueuePlayer.addPeriodicTimeObserver(forInterval: interval, queue: .main, using: { [weak self] time in
             self?.executePeriodicUpdate(time)
         })
-        
+
         onStatus(.rmxstatus_REGISTER, trackId: "INIT", param: nil)
     }
-    
+
     func setPlaylistItems(_ items: [AudioTrack], options: [String:Any]) {
         print("RmxAudioPlayer.execute=setPlaylistItems, \(options), \(items)")
 
@@ -74,11 +74,11 @@ final class RmxAudioPlayer: NSObject {
 
         let startPaused = options["startPaused"] != nil ? (options["startPaused"] as? Bool) ?? false : true
 
-        if retainPosition {
+        if playFromPosition > 0.0 {
+            seekToPosition = playFromPosition
+        }
+        else if retainPosition {
             seekToPosition = getTrackCurrentTime(nil)
-            if playFromPosition > 0.0 {
-                seekToPosition = playFromPosition
-            }
         }
 
         let result = findTrack(byId: playFromId)
@@ -89,7 +89,7 @@ final class RmxAudioPlayer: NSObject {
                 avQueuePlayer.setCurrentIndex(idx)
             }
         }
-        
+
         // This will wait for the AVPlayerItemStatusReadyToPlay status change, and then trigger playback.
         isWaitingToStartPlayback = !startPaused
         if isWaitingToStartPlayback {
@@ -136,7 +136,7 @@ final class RmxAudioPlayer: NSObject {
 
             }
         }
-        
+
         return removed
     }
 
@@ -149,8 +149,10 @@ final class RmxAudioPlayer: NSObject {
         guard (0..<avQueuePlayer.queuedAudioTracks.count).contains(index) else {
             throw "Provided index is out of bounds"
         }
-
-        avQueuePlayer.setCurrentIndex(index)
+        
+        if avQueuePlayer.currentIndex() != index {
+            avQueuePlayer.setCurrentIndex(index)
+        }
         playCommand(false)
 
         if positionTime != nil {
@@ -162,15 +164,17 @@ final class RmxAudioPlayer: NSObject {
         guard !avQueuePlayer.queuedAudioTracks.isEmpty else {
             throw "The playlist is empty!"
         }
-        let result = findTrack(byId: trackId)
-        let idx = result?["index"] as? Int ?? -1
-        guard idx >= 0 else {
-            throw "Track ID not found"
+        
+        if avQueuePlayer.currentAudioTrack?.trackId != trackId {
+            let result = findTrack(byId: trackId)
+            let idx = result?["index"] as? Int ?? -1
+            guard idx >= 0 else {
+                throw "Track ID not found"
+            }
+            avQueuePlayer.setCurrentIndex(idx)
         }
-
-        avQueuePlayer.setCurrentIndex(idx)
         playCommand(false)
-        
+
         if positionTime != nil {
             seek(to: positionTime!, isCommand: false)
         }
@@ -187,7 +191,7 @@ final class RmxAudioPlayer: NSObject {
 
     func setLoopAll(_ loop: Bool) {
         self.loop = loop
-         
+
         print("RmxAudioPlayer.execute=setLoopAll, \(loop)")
     }
 
@@ -227,18 +231,18 @@ final class RmxAudioPlayer: NSObject {
         removeTrackObservers(item)
         avQueuePlayer.remove(item)
     }
-    
+
     func removeItem(_ id: String) throws {
         let result = findTrack(byId: id)
         let idx = (result?["index"] as? NSNumber)?.intValue ?? 0
         let track = result?["track"] as? AudioTrack
-        
+
         guard idx >= 0 else {
             throw "Could not find track by id" + id
         }
         // AudioTrack* item = [self avQueuePlayer].itemsForPlayer[idx];
         removeTrackObservers(track)
-        
+
         if let track = track {
             avQueuePlayer.remove(track)
         }
@@ -257,14 +261,13 @@ final class RmxAudioPlayer: NSObject {
         if resetStreamOnPause,
            let currentTrack = avQueuePlayer.currentAudioTrack,
            currentTrack.isStream {
+            print( "music-stream-play")
             avQueuePlayer.seek(to: .positiveInfinity, toleranceBefore: .zero, toleranceAfter: .zero)
             currentTrack.seek(to: .positiveInfinity, toleranceBefore: .zero, toleranceAfter: .zero, completionHandler: nil)
         }
 
-        if isCommand {
-            let action = "music-controls-play"
-            print("\(action)")
-        }
+            print( "music-controls-play ")
+        
         avQueuePlayer.play()
     }
 
@@ -284,7 +287,7 @@ final class RmxAudioPlayer: NSObject {
             avQueuePlayer.seek(to: .positiveInfinity, toleranceBefore: .zero, toleranceAfter: .zero)
             currentTrack.seek(to: .positiveInfinity, toleranceBefore: .zero, toleranceAfter: .zero, completionHandler: nil)
         }
-		
+
         if isCommand {
             let action = "music-controls-pause"
             print("\(action)")
@@ -316,7 +319,7 @@ final class RmxAudioPlayer: NSObject {
     func playNext(_ isCommand: Bool) {
         wasPlayingInterrupted = false
         initializeMPCommandCenter()
-        
+
         avQueuePlayer.advanceToNextItem()
 
         if isCommand {
@@ -353,18 +356,18 @@ final class RmxAudioPlayer: NSObject {
             ])
         }
     }
-    
+
     func setVolume(_ volume: Float) {
         avQueuePlayer.volume = volume
     }
-    
+
     func addTracks(_ tracks: [AudioTrack], startPosition: Float) {
         for playerItem in tracks {
             addTrackObservers(playerItem)
         }
 
         avQueuePlayer.appendItems(tracks)
-        
+
         if startPosition > 0 {
             seek(to: startPosition, isCommand: false)
         }
@@ -445,7 +448,7 @@ final class RmxAudioPlayer: NSObject {
         // This happens when the network is insufficient to continue playback.
         let playerItem = avQueuePlayer.currentAudioTrack
         let trackStatus = getStatusItem(playerItem)
-        
+
         onStatus(.rmxstatus_STALLED, trackId: playerItem?.trackId, param: trackStatus)
     }
 
@@ -474,7 +477,7 @@ final class RmxAudioPlayer: NSObject {
                       interruptionNotification?.userInfo?[AVAudioSessionInterruptionTypeKey] as Any)
               return
         }
-        
+
         switch interruptionType {
         case AVAudioSession.InterruptionType.began:
             let suspended = (interruptionNotification?.userInfo?[AVAudioSessionInterruptionWasSuspendedKey] as? NSNumber)?.boolValue ?? false
@@ -523,24 +526,28 @@ final class RmxAudioPlayer: NSObject {
         guard let change = change else {
             return
         }
-        
+
         switch keyPath {
         case "currentItem":
             // only fire on real change!
             let player = object as? AVBidirectionalQueuePlayer
             let playerItem = player?.currentAudioTrack
-            guard lastTrackId != playerItem?.trackId else {
+            if playerItem != nil {
+            guard self.lastTrackId != playerItem?.trackId else {
                 return // todo should call super instead or?
             }
-            lastTrackId = playerItem?.trackId
+            print("observe change currentItem: lastTrackId \(self.lastTrackId) playerItem: \(playerItem?.trackId)")
+            self.lastTrackId = playerItem?.trackId
             handleCurrentItemChanged(playerItem)
+            }
+            
         case "rate":
             guard lastRate != change[.newKey] as? Float else {
                 return // todo should call super instead or?
             }
             self.lastRate = change[.newKey] as? Float
             let player = object as? AVBidirectionalQueuePlayer
-            
+
             guard let playerItem = player?.currentAudioTrack else { return }
 
             let trackStatus = getStatusItem(playerItem)
@@ -559,7 +566,7 @@ final class RmxAudioPlayer: NSObject {
         case "timeControlStatus":
             DispatchQueue.main.debounce(interval: 0.2, context: self, action: { [self] in
                 let player = object as? AVBidirectionalQueuePlayer
-                
+
                 guard let playerItem = player?.currentAudioTrack else {
                     return
                 }
@@ -594,7 +601,6 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func updateNowPlayingTrackInfo(_ playerItem: AudioTrack?, updateTrackData: Bool) {
-        
         let currentItem = playerItem ?? avQueuePlayer.currentAudioTrack
         let nowPlayingInfoCenter = MPNowPlayingInfoCenter.default()
         if updatedNowPlayingInfo == nil {
@@ -628,7 +634,7 @@ final class RmxAudioPlayer: NSObject {
         updatedNowPlayingInfo![MPNowPlayingInfoPropertyPlaybackRate] = 1.0
 
         MPNowPlayingInfoCenter.default().nowPlayingInfo = updatedNowPlayingInfo
-        
+
         let commandCenter = MPRemoteCommandCenter.shared()
         commandCenter.nextTrackCommand.isEnabled = !avQueuePlayer.isAtEnd
         commandCenter.previousTrackCommand.isEnabled = !avQueuePlayer.isAtBeginning
@@ -638,11 +644,10 @@ final class RmxAudioPlayer: NSObject {
         guard let coverUri = coverUriOrNil else {
             return nil
         }
-        
         var coverImage: UIImage? = nil
         if coverUri.hasPrefix("http://") || coverUri.hasPrefix("https://") {
             let coverImageUrl = URL(string: coverUri)!
-            
+
             do {
                 let coverImageData = try Data(contentsOf: coverImageUrl)
                 coverImage = UIImage(data: coverImageData)
@@ -654,7 +659,7 @@ final class RmxAudioPlayer: NSObject {
                 coverImage = UIImage(contentsOfFile: coverUri)
             }
         }
-        
+
         if isCoverImageValid(coverImage) {
             return MPMediaItemArtwork.init(boundsSize: coverImage!.size, requestHandler: { (size) -> UIImage in
                 return coverImage!
@@ -662,7 +667,7 @@ final class RmxAudioPlayer: NSObject {
         }
         return nil;
     }
-    
+
     func downloadImage(url: URL, completion: @escaping ((_ image: UIImage?) -> Void)){
         print("Started downloading \"\(url.deletingPathExtension().lastPathComponent)\".")
         self.getImageDataFromUrl(url) { (_ data: Data?) in
@@ -754,9 +759,10 @@ final class RmxAudioPlayer: NSObject {
                 isWaitingToStartPlayback = false
                 var errorMsg = ""
                 if playerItem.error != nil {
+                    print("\(playerItem.error)")
                     errorMsg = "Error playing audio track: \((playerItem.error as NSError?)?.localizedFailureReason ?? "")"
                 }
-                print("AVPlayerItemStatusFailed: Error playing audio track: \(errorMsg)")
+                print("AVPlayerItemStatusFailed: \(errorMsg)")
                 let errorParam = createError(withCode: .rmxerr_DECODE, message: errorMsg)
                 onStatus(.rmxstatus_ERROR, trackId: playerItem.trackId, param: errorParam)
             case .unknown:
@@ -773,9 +779,9 @@ final class RmxAudioPlayer: NSObject {
         // It doesn't always fire, and it is not needed because the queue's periodic update can also
         // deliver this info.
         //NSString* name = ((AVURLAsset*)playerItem.asset).URL.pathComponents.lastObject;
-        
+
         guard let playerItem = playerItem else { return }
-        
+
         if !CMTIME_IS_INDEFINITE(playerItem.duration) {
             let duration = CMTimeGetSeconds(playerItem.duration)
             print("The track duration was changed [\(playerItem.trackId ?? "")]: \(duration)")
@@ -860,7 +866,7 @@ final class RmxAudioPlayer: NSObject {
                 status = "paused"
             }
         }
-        
+
         return [
             "trackId": currentItem.trackId ?? "",
             "isStream": currentItem.isStream ? NSNumber(value: 1) : NSNumber(value: 0),
@@ -896,10 +902,10 @@ final class RmxAudioPlayer: NSObject {
                 "duration": NSNumber(value: 0.0)
             ]
         }
-        
+
         let duration = Float(CMTimeGetSeconds(playerItem.duration))
         let timeRanges = playerItem.loadedTimeRanges
-        
+
         guard !timeRanges.isEmpty else {
             return [
                 "start": NSNumber(value: 0.0),
@@ -908,7 +914,7 @@ final class RmxAudioPlayer: NSObject {
                 "duration": NSNumber(value: duration)
             ]
         }
-        
+
         let timerange = timeRanges[0].timeRangeValue
         let start = Float(CMTimeGetSeconds(timerange.start))
         let rangeEnd = Float(CMTimeGetSeconds(timerange.duration))
@@ -959,7 +965,7 @@ final class RmxAudioPlayer: NSObject {
         else {
             return nil
         }
-    
+
         return [
             "track": track,
             "index": NSNumber(value: index)
@@ -989,9 +995,6 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func removeTrackObservers(_ playerItem: AudioTrack?) {
-        playerItem?.removeObserver(self, forKeyPath: "status")
-        playerItem?.removeObserver(self, forKeyPath: "duration")
-        playerItem?.removeObserver(self, forKeyPath: "loadedTimeRanges")
         NotificationCenter.default.removeObserver(self, name: .AVPlayerItemDidPlayToEndTime, object: playerItem)
         NotificationCenter.default.removeObserver(self, name: .AVPlayerItemPlaybackStalled, object: playerItem)
 
@@ -1024,10 +1027,6 @@ final class RmxAudioPlayer: NSObject {
     func observeLifeCycle() {
         let listener = NotificationCenter.default
 
-        // These aren't really needed. the AVQueuePlayer handles this for us.
-        // [listener addObserver:self selector:@selector(handleEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
-        // [listener addObserver:self selector:@selector(handleEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
-
         // We do need these.
         listener.addObserver(self, selector: #selector(handleAudioSessionInterruption(_:)), name: AVAudioSession.interruptionNotification, object: AVAudioSession.sharedInstance())
 
@@ -1060,11 +1059,6 @@ final class RmxAudioPlayer: NSObject {
 
     /// Cleanup
     func deregisterMusicControlsEventListener() {
-        // We don't use the remote control, and no need to remove observer on
-        // NSNotificationCenter, that is done automatically
-        // [[UIApplication sharedApplication] endReceivingRemoteControlEvents];
-        // [[NSNotificationCenter defaultCenter] removeObserver:self name:@"receivedEvent" object:nil];
-
         let commandCenter = MPRemoteCommandCenter.shared()
         commandCenter.playCommand.removeTarget(self)
         commandCenter.pauseCommand.removeTarget(self)
@@ -1076,10 +1070,9 @@ final class RmxAudioPlayer: NSObject {
 
         commandCenterRegistered = false
     }
-    
+
     func onReset() {
         // Override to cancel any long-running requests when the WebView navigates or refreshes.
-        //super.onReset()
         releaseResources()
     }
 
@@ -1087,9 +1080,6 @@ final class RmxAudioPlayer: NSObject {
         if let playbackTimeObserver = playbackTimeObserver {
             avQueuePlayer.removeTimeObserver(playbackTimeObserver)
         }
-        avQueuePlayer.removeObserver(self as NSObject, forKeyPath: "currentItem")
-        avQueuePlayer.removeObserver(self as NSObject, forKeyPath: "rate")
-        avQueuePlayer.removeObserver(self as NSObject, forKeyPath: "timeControlStatus")
         deregisterMusicControlsEventListener()
 
         removeAllTracks()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-playlist",
-  "version": "0.1.30",
+  "version": "0.1.33",
   "description": "Playlist ",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",

package/android/.gitignore

@@ -1 +0,0 @@
-/build

package/android/.npmignore

@@ -1 +0,0 @@
-/build