capacitor-plugin-playlist 0.1.18 → 0.1.22

package/ios/Plugin/DispatchQueue.swift

@@ -12,7 +12,7 @@ public extension DispatchQueue {
          - action: The closure to be executed
      Delays a closure execution and ensures no other executions are made during deadline
      */
-    public func throttle(deadline: DispatchTime, context: AnyHashable? = nil, action: @escaping () -> Void) {
+    func throttle(deadline: DispatchTime, context: AnyHashable? = nil, action: @escaping () -> Void) {
         let worker = DispatchWorkItem {
             defer { throttleWorkItems.removeValue(forKey: context ?? nilContext) }
             action()
@@ -31,7 +31,7 @@ public extension DispatchQueue {
          - action: The closure to be executed
      Executes a closure and ensures no other executions will be made during the interval.
      */
-    public func debounce(interval: Double, context: AnyHashable? = nil, action: @escaping () -> Void) {
+    func debounce(interval: Double, context: AnyHashable? = nil, action: @escaping () -> Void) {
         if let last = lastDebounceCallTimes[context ?? nilContext], last + interval > .now() {
             return
         }
@@ -44,4 +44,4 @@ public extension DispatchQueue {
             lastDebounceCallTimes.removeValue(forKey: context ?? nilContext)
         }
     }
-}
+}

package/ios/Plugin/RmxAudioPlayer.swift

@@ -29,6 +29,8 @@ final class RmxAudioPlayer: NSObject {
 
     private let avQueuePlayer = AVBidirectionalQueuePlayer(items: [])
 
+    private var lastTrackId: String? = nil
+    private var lastRate: Float? = nil
     override init() {
         super.init()
 
@@ -140,7 +142,7 @@ final class RmxAudioPlayer: NSObject {
 
     func clearAllItems() {
         print("RmxAudioPlayer.execute=clearAllItems")
-        removeAllTracks(false)
+        removeAllTracks()
     }
 
     func playTrack(index: Int, positionTime: Float?) throws {
@@ -385,7 +387,7 @@ final class RmxAudioPlayer: NSObject {
         }
     }
 
-    func removeAllTracks(_ isCommand: Bool) {
+    func removeAllTracks() {
         for item in avQueuePlayer.queuedAudioTracks {
             removeTrackObservers(item)
         }
@@ -393,15 +395,6 @@ final class RmxAudioPlayer: NSObject {
         avQueuePlayer.removeAllItems()
         wasPlayingInterrupted = false
 
-        print("RmxAudioPlayer, removeAllTracks, ==> RMXSTATUS_PLAYLIST_CLEARED")
-        onStatus(.rmxstatus_PLAYLIST_CLEARED, trackId: "INVALID", param: nil)
-
-        // a.t.m there's no way for this to be triggered from within the plugin,
-        // but it might get added at some point.
-        if isCommand {
-            let action = "music-controls-clear"
-            print("\(action)")
-        }
     }
 
     // MARK: - remote control events
@@ -454,7 +447,6 @@ final class RmxAudioPlayer: NSObject {
         let trackStatus = getStatusItem(playerItem)
         
         onStatus(.rmxstatus_STALLED, trackId: playerItem?.trackId, param: trackStatus)
-        onStatus(.rmxstatus_PAUSE, trackId: playerItem?.trackId, param: trackStatus)
     }
 
     @objc func playerItemDidReachEnd(_ notification: Notification?) {
@@ -521,7 +513,6 @@ final class RmxAudioPlayer: NSObject {
             if avQueuePlayer.isPlaying {
                 let trackStatus = getStatusItem(playerItem)
                 onStatus(.rmxstatus_PLAYBACK_POSITION, trackId: playerItem.trackId, param: trackStatus)
-                // NSLog(@" . %.5f / %.5f sec (%.1f %%) [%@]", currentTime, duration, (currentTime / duration)*100.0, name);
             }
         }
 
@@ -529,50 +520,55 @@ final class RmxAudioPlayer: NSObject {
     }
 
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        print("observing \(String(describing: keyPath))")
-        print("observing \(String(describing: change))")
-        if (keyPath == "currentItem") {
+        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 {
+                return // todo should call super instead or?
+            }
+            lastTrackId = playerItem?.trackId
             handleCurrentItemChanged(playerItem)
-            return
-        }
-
-        if (keyPath == "rate") {
-            DispatchQueue.main.debounce(interval: 0.2, context: self, action: { [self] in
-                let player = object as? AVBidirectionalQueuePlayer
-                
-                guard let playerItem = player?.currentAudioTrack else { return }
-
-                let trackStatus = getStatusItem(playerItem)
-                print("Playback rate changed: \(1), is playing: \(player?.isPlaying ?? false)")
-
-                if player?.isPlaying ?? false {
-                    onStatus(.rmxstatus_PLAYING, trackId: playerItem.trackId, param: trackStatus)
-                } else {
-                    onStatus(.rmxstatus_PAUSE, trackId: playerItem.trackId, param: trackStatus)
-                }
-            })
+        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
             
-            return
-        }
+            guard let playerItem = player?.currentAudioTrack else { return }
+
+            let trackStatus = getStatusItem(playerItem)
+            print("Playback rate changed: \(String(describing: change[.newKey])), is playing: \(player?.isPlaying ?? false)")
 
-        if (keyPath == "status") {
+            if player?.isPlaying ?? false {
+                onStatus(.rmxstatus_PLAYING, trackId: playerItem.trackId, param: trackStatus)
+            } else {
+                onStatus(.rmxstatus_PAUSE, trackId: playerItem.trackId, param: trackStatus)
+            }
+        case "status":
             DispatchQueue.main.debounce(interval: 0.2, context: self, action: { [self] in
                 let playerItem = object as? AudioTrack
                 handleTrackStatusEvent(playerItem)
             })
-            return
-        }
-        
-        if (keyPath == "timeControlStatus") {
+        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 }
+                guard let playerItem = player?.currentAudioTrack else {
+                    return
+                }
+                guard lastTrackId != playerItem.trackId else {
+                    return // todo should call super instead or?
+                }
 
                 let trackStatus = getStatusItem(playerItem)
-                print("Playback rate changed: \(1), is playing: \(player?.isPlaying ?? false)")
+                print("TCSPlayback rate changed: \(String(describing: change[.newKey])), is playing: \(player?.isPlaying ?? false)")
 
                 if player?.timeControlStatus == .playing {
                     onStatus(.rmxstatus_PLAYING, trackId: playerItem.trackId, param: trackStatus)
@@ -582,36 +578,28 @@ final class RmxAudioPlayer: NSObject {
                     onStatus(.rmxstatus_PAUSE, trackId: playerItem.trackId, param: trackStatus)
                 }
             })
-            return
-        }
-
-        if (keyPath == "duration") {
+        case "duration":
             DispatchQueue.main.debounce(interval: 0.5, context: self, action: { [self] in
                 let playerItem = object as? AudioTrack
                 handleTrackDuration(playerItem)
             })
-            return
-        }
-
-        if (keyPath == "loadedTimeRanges") {
+        case "loadedTimeRanges":
             DispatchQueue.main.debounce(interval: 0.2, context: self, action: { [self] in
                 let playerItem = object as? AudioTrack
                 handleTrackBuffering(playerItem)
             })
-            return
+        default:
+            super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
         }
-
-        super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
-        return
     }
 
     func updateNowPlayingTrackInfo(_ playerItem: AudioTrack?, updateTrackData: Bool) {
+        
         let currentItem = playerItem ?? avQueuePlayer.currentAudioTrack
-
         let nowPlayingInfoCenter = MPNowPlayingInfoCenter.default()
         if updatedNowPlayingInfo == nil {
             let nowPlayingInfo = nowPlayingInfoCenter.nowPlayingInfo
-            updatedNowPlayingInfo = nowPlayingInfo
+            updatedNowPlayingInfo = nowPlayingInfo ?? [:]
         }
 
         var currentTime: Float? = nil
@@ -627,70 +615,52 @@ final class RmxAudioPlayer: NSObject {
         }
 
         if updateTrackData {
-            updatedNowPlayingInfo?[MPMediaItemPropertyArtist] = currentItem?.artist
-            updatedNowPlayingInfo?[MPMediaItemPropertyTitle] = currentItem?.title
-            updatedNowPlayingInfo?[MPMediaItemPropertyAlbumTitle] = currentItem?.album
-            let mediaItemArtwork = createCoverArtwork(currentItem?.albumArt?.absoluteString)
+            updatedNowPlayingInfo![MPMediaItemPropertyArtist] = currentItem?.artist
+            updatedNowPlayingInfo![MPMediaItemPropertyTitle] = currentItem?.title
+            updatedNowPlayingInfo![MPMediaItemPropertyAlbumTitle] = currentItem?.album
 
-            if let mediaItemArtwork = mediaItemArtwork {
-                updatedNowPlayingInfo?[MPMediaItemPropertyArtwork] = mediaItemArtwork
+            if let mediaItemArtwork = createCoverArtwork(currentItem?.albumArt?.absoluteString) {
+                updatedNowPlayingInfo![MPMediaItemPropertyArtwork] = mediaItemArtwork
             }
         }
+        updatedNowPlayingInfo![MPMediaItemPropertyPlaybackDuration] = duration ?? 0.0
+        updatedNowPlayingInfo![MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentTime ?? 0.0
+        updatedNowPlayingInfo![MPNowPlayingInfoPropertyPlaybackRate] = 1.0
 
-        updatedNowPlayingInfo?[MPMediaItemPropertyPlaybackDuration] = NSNumber(value: duration ?? 0.0)
-        updatedNowPlayingInfo?[MPNowPlayingInfoPropertyElapsedPlaybackTime] = NSNumber(value: currentTime ?? 0.0)
-        updatedNowPlayingInfo?[MPNowPlayingInfoPropertyPlaybackRate] = NSNumber(value: 1.0)
-
-        nowPlayingInfoCenter.nowPlayingInfo = updatedNowPlayingInfo
-
+        MPNowPlayingInfoCenter.default().nowPlayingInfo = updatedNowPlayingInfo
+        
         let commandCenter = MPRemoteCommandCenter.shared()
         commandCenter.nextTrackCommand.isEnabled = !avQueuePlayer.isAtEnd
         commandCenter.previousTrackCommand.isEnabled = !avQueuePlayer.isAtBeginning
     }
 
-    func createCoverArtwork(_ coverUri: String?) -> MPMediaItemArtwork? {
-        print("Creating cover art : \(String(describing: coverUri))")
-        var coverImage: UIImage? = nil
-        if coverUri == nil {
+    func createCoverArtwork(_ coverUriOrNil: String?) -> MPMediaItemArtwork? {
+        guard let coverUri = coverUriOrNil else {
             return nil
         }
-
-        if coverUri?.lowercased().hasPrefix("file://") ?? false {
-            let fullCoverImagePath = coverUri?.replacingOccurrences(of: "file://", with: "")
-
-            if FileManager.default.fileExists(atPath: fullCoverImagePath ?? "") {
-                coverImage = UIImage(contentsOfFile: fullCoverImagePath ?? "")
-            }
-        } else if coverUri?.hasPrefix("http://") ?? false || coverUri?.hasPrefix("https://") ?? false {
-            let coverImageUrl = URL(string: coverUri ?? "")
+        
+        var coverImage: UIImage? = nil
+        if coverUri.hasPrefix("http://") || coverUri.hasPrefix("https://") {
+            let coverImageUrl = URL(string: coverUri)!
             
-            var coverImageData: Data? = nil
-            if let coverImageUrl = coverImageUrl {
-                do {
-                    coverImageData = try Data(contentsOf: coverImageUrl)
-                } catch {
-                    print("Error creating the coverImageData");
-                }
-            }
-            if let coverImageData = coverImageData {
+            do {
+                let coverImageData = try Data(contentsOf: coverImageUrl)
                 coverImage = UIImage(data: coverImageData)
-            }
-        } else if !(coverUri == "") {
-            let baseCoverImagePath = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).map(\.path)[0]
-            let fullCoverImagePath = "\(baseCoverImagePath)\(coverUri ?? "")"
-            if FileManager.default.fileExists(atPath: fullCoverImagePath) {
-                coverImage = UIImage(named: fullCoverImagePath)
+            } catch {
+                print("Error creating the coverImageData");
             }
         } else {
-            coverImage = UIImage(named: "none")
+            if FileManager.default.fileExists(atPath: coverUri) {
+                coverImage = UIImage(contentsOfFile: coverUri)
+            }
         }
-        if let coverImage = coverImage {
-            return isCoverImageValid(coverImage) ? MPMediaItemArtwork.init(boundsSize: coverImage.size, requestHandler: { (size) -> UIImage in
-                return coverImage
-            }): nil
-            
+        
+        if isCoverImageValid(coverImage) {
+            return MPMediaItemArtwork.init(boundsSize: coverImage!.size, requestHandler: { (size) -> UIImage in
+                return coverImage!
+            })
         }
-        return nil
+        return nil;
     }
     
     func downloadImage(url: URL, completion: @escaping ((_ image: UIImage?) -> Void)){
@@ -720,7 +690,7 @@ final class RmxAudioPlayer: NSObject {
             print("New item ID: \(playerItem.trackId ?? "")")
             print("Queue is at end: \(avQueuePlayer.isAtEnd ? "YES" : "NO")")
             // When an item starts, immediately scrub it back to the beginning
-            playerItem.seek(to: .zero, toleranceBefore: .zero, toleranceAfter: .zero, completionHandler: nil)
+            //playerItem.seek(to: .zero, toleranceBefore: .zero, toleranceAfter: .zero, completionHandler: nil)
             // Update the command center
             updateNowPlayingTrackInfo(playerItem, updateTrackData: true)
         } else if loop {
@@ -880,7 +850,7 @@ final class RmxAudioPlayer: NSObject {
         }
 
         if avQueuePlayer.currentItem == currentItem {
-            if avQueuePlayer.rate != 0 {
+            if avQueuePlayer.rate != 0.0 {
                 status = "playing"
 
                 if position <= 0 && (bufferInfo?["bufferPercent"] as? NSNumber)?.floatValue ?? 0.0 == 0.0 {
@@ -1010,7 +980,6 @@ final class RmxAudioPlayer: NSObject {
         listener.addObserver(self, selector: #selector(itemStalledPlaying(_:)), name: .AVPlayerItemPlaybackStalled, object: playerItem)
 
         onStatus(.rmxstatus_ITEM_ADDED, trackId: playerItem?.trackId, param: playerItem?.toDict())
-        onStatus(.rmxstatus_LOADING, trackId: playerItem?.trackId, param: nil)
     }
 
     @objc func queueCleared(_ notification: Notification?) {
@@ -1123,7 +1092,7 @@ final class RmxAudioPlayer: NSObject {
         avQueuePlayer.removeObserver(self as NSObject, forKeyPath: "timeControlStatus")
         deregisterMusicControlsEventListener()
 
-        removeAllTracks(false)
+        removeAllTracks()
 
         playbackTimeObserver = nil
         isWaitingToStartPlayback = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-playlist",
-  "version": "0.1.18",
+  "version": "0.1.22",
   "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