capacitor-plugin-playlist 0.1.20 → 0.1.24

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/Plugin.swift

@@ -53,11 +53,11 @@ public class PlaylistPlugin: CAPPlugin, StatusUpdater {
     }
     @objc func removeItem(_ call: CAPPluginCall) {
         do {
-            if let id = call.getString("trackId"){
+            if let id = call.getString("id"){
                 try audioPlayerImpl.removeItem(id)
                 return
             }
-            guard let index = call.getString("trackIndex") else {
+            guard let index = call.getString("index") else {
                 call.reject("Cannot remove")
                 return
             }
@@ -152,7 +152,7 @@ public class PlaylistPlugin: CAPPlugin, StatusUpdater {
         }
         
         do {
-            try audioPlayerImpl.selectTrack(trackId: id)
+            try audioPlayerImpl.selectTrack(id: id)
             call.resolve();
         }
         catch let message {

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 {
@@ -205,11 +207,11 @@ final class RmxAudioPlayer: NSObject {
         avQueuePlayer.setCurrentIndex(index)
     }
 
-    func selectTrack(trackId: String) throws {
+    func selectTrack(id: String) throws {
         guard !avQueuePlayer.queuedAudioTracks.isEmpty else {
             throw "Queue is Empty"
         }
-        let result = findTrack(byId: trackId)
+        let result = findTrack(byId: id)
         let idx = (result?["index"] as? NSNumber)?.intValue ?? 0
 
         if idx >= 0 {
@@ -232,7 +234,7 @@ final class RmxAudioPlayer: NSObject {
         let track = result?["track"] as? AudioTrack
         
         guard idx >= 0 else {
-            throw "Could not find trackId"
+            throw "Could not find track by id" + id
         }
         // AudioTrack* item = [self avQueuePlayer].itemsForPlayer[idx];
         removeTrackObservers(track)
@@ -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?) {
@@ -528,31 +520,37 @@ final class RmxAudioPlayer: NSObject {
     }
 
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if keyPath != "loadedTimeRanges" {
-            print("observing \(String(describing: keyPath))")
-            print("observing \(String(describing: change))")
+        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)
         case "rate":
-            DispatchQueue.main.debounce(interval: 0.2, context: self, action: { [self] in
-                let player = object as? AVBidirectionalQueuePlayer
-                
-                guard let playerItem = player?.currentAudioTrack else { return }
+            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)
-                print("Playback rate changed: \(1), is playing: \(player?.isPlaying ?? false)")
+            let trackStatus = getStatusItem(playerItem)
+            print("Playback rate changed: \(String(describing: change[.newKey])), 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)
-                }
-            })
+            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
@@ -562,10 +560,15 @@ final class RmxAudioPlayer: NSObject {
             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)
@@ -620,19 +623,18 @@ final class RmxAudioPlayer: NSObject {
                 updatedNowPlayingInfo![MPMediaItemPropertyArtwork] = mediaItemArtwork
             }
         }
-        updatedNowPlayingInfo![MPMediaItemPropertyPlaybackDuration] = NSNumber(value: duration ?? 0.0)
-        updatedNowPlayingInfo![MPNowPlayingInfoPropertyElapsedPlaybackTime] = NSNumber(value: currentTime ?? 0.0)
-        updatedNowPlayingInfo![MPNowPlayingInfoPropertyPlaybackRate] = NSNumber(value: 1.0)
+        updatedNowPlayingInfo![MPMediaItemPropertyPlaybackDuration] = duration ?? 0.0
+        updatedNowPlayingInfo![MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentTime ?? 0.0
+        updatedNowPlayingInfo![MPNowPlayingInfoPropertyPlaybackRate] = 1.0
 
         MPNowPlayingInfoCenter.default().nowPlayingInfo = updatedNowPlayingInfo
-        print("noplaying \(String(describing: updatedNowPlayingInfo))")
+        
         let commandCenter = MPRemoteCommandCenter.shared()
         commandCenter.nextTrackCommand.isEnabled = !avQueuePlayer.isAtEnd
         commandCenter.previousTrackCommand.isEnabled = !avQueuePlayer.isAtBeginning
     }
 
     func createCoverArtwork(_ coverUriOrNil: String?) -> MPMediaItemArtwork? {
-        print("Creating cover art : \(String(describing: coverUriOrNil))")
         guard let coverUri = coverUriOrNil else {
             return nil
         }
@@ -654,9 +656,7 @@ final class RmxAudioPlayer: NSObject {
         }
         
         if isCoverImageValid(coverImage) {
-            print("valid cover image \(String(describing: coverImage)) size \(coverImage!.size)")
             return MPMediaItemArtwork.init(boundsSize: coverImage!.size, requestHandler: { (size) -> UIImage in
-                print("inted cover image \(String(describing: coverImage)) size \(coverImage!.size)")
                 return coverImage!
             })
         }
@@ -850,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 {
@@ -980,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?) {
@@ -1093,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.20",
+  "version": "0.1.24",
   "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