capacitor-plugin-playlist 0.2.1 → 0.2.2

package/android/src/main/java/org/dwbn/plugins/playlist/RmxAudioPlayer.java

@@ -107,6 +107,10 @@ public class RmxAudioPlayer implements PlaybackStatusListener<AudioTrack>,
             JSONObject trackStatus = getPlayerStatus(item);
             onStatus(RmxAudioStatusMessage.RMXSTATUS_COMPLETED, trackId, trackStatus);
         }
+
+        if (!playlistManager.isNextAvailable()) {
+            onStatus(RmxAudioStatusMessage.RMXSTATUS_PLAYLIST_COMPLETED, "INVALID", null);
+        }
     }
 
     @Override
@@ -179,21 +183,11 @@ public class RmxAudioPlayer implements PlaybackStatusListener<AudioTrack>,
 
     @Override
     public void onItemPlaybackEnded(AudioTrack item) {
-        AudioTrack nextItem = playlistManager.getCurrentItem();
-        // String title = item != null ? item.getTitle() : "(null)";
-        // String currTitle = nextItem != null ? nextItem.getTitle() : "(null)";
-        // String currTrackId = nextItem != null ? nextItem.getTrackId() : null;
-        // Log.i(TAG, "onItemPlaybackEnded: ==> " + title + "," + trackId + " ==> next item: " + currTitle + "," + currTrackId);
-
         if (item != null) {
             String trackId = item.getTrackId();
             JSONObject trackStatus = getPlayerStatus(item);
             onStatus(RmxAudioStatusMessage.RMXSTATUS_STOPPED, trackId, trackStatus);
         }
-
-        if (nextItem == null) { // if (!playlistManager.isNextAvailable()) {
-            onStatus(RmxAudioStatusMessage.RMXSTATUS_PLAYLIST_COMPLETED, "INVALID", null);
-        }
     }
 
     @Override

package/android/src/main/java/org/dwbn/plugins/playlist/manager/PlaylistManager.kt

@@ -143,6 +143,7 @@ class PlaylistManager(application: Application) :
             currentPosition = 0
             beginPlayback(1, true)
         }
+        this.playlistHandler!!.updateMediaControls()
     }
 
     fun addAllItems(its: List<AudioTrack>?) {
@@ -177,6 +178,7 @@ class PlaylistManager(application: Application) :
         items = audioTracks
         currentPosition = if (removingCurrent) currentPosition else audioTracks.indexOf(currentItem)
         beginPlayback(currentPosition.toLong(), !wasPlaying)
+        this.playlistHandler!!.updateMediaControls()
         return foundItem
     }
 

package/android/src/main/java/org/dwbn/plugins/playlist/playlist/AudioPlaylistHandler.java

@@ -49,9 +49,19 @@ public class AudioPlaylistHandler<I extends PlaylistItem, M extends BasePlaylist
     }
 
     public void next() {
-        if (getPlaylistManager().next() != null) {
-            startItemPlayback(0, !this.isPlaying());
+        if (!getPlaylistManager().isNextAvailable()) {
+            return;
         }
+        getPlaylistManager().next();
+        startItemPlayback(0, !this.isPlaying());
+    }
+
+    public void previous() {
+        if (!getPlaylistManager().isPreviousAvailable()) {
+            return;
+        }
+        getPlaylistManager().previous();
+        startItemPlayback(0, !this.isPlaying());
     }
 
     @Override

package/dist/docs.json

@@ -531,7 +531,7 @@
           "tags": [],
           "docs": "If retainPosition is true, this value will tell the plugin the uid of the \"current\" item to start from,\nrather than letting the plugin decide based on current playback.",
           "complexTypes": [],
-          "type": "number | undefined"
+          "type": "string | undefined"
         },
         {
           "name": "startPaused",

package/dist/esm/interfaces.d.ts

@@ -66,7 +66,7 @@ export interface PlaylistItemOptions {
      * If retainPosition is true, this value will tell the plugin the uid of the "current" item to start from,
      * rather than letting the plugin decide based on current playback.
      */
-    playFromId?: number;
+    playFromId?: string;
     /**
      * If playback should immediately begin when calling setPlaylistItems on the plugin.
      * Default is false;

package/ios/Plugin/AVBidirectionalQueuePlayer.swift

@@ -155,7 +155,6 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
     }
 
     func replaceAllItems(with items: [AudioTrack]) {
-        print("AVBI, replaceAllItems")
         removeAllItemsSilently()
         appendItems(items)
     }
@@ -197,15 +196,24 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
     }*/
     // This does the same thing as the normal AVQueuePlayer removeAllItems, but clears our collection copy
     override func removeAllItems() {
-        print("removeAllItems")
         super.removeAllItems()
         queuedAudioTracks.removeAll()
 
         NotificationCenter.default.post(name: NSNotification.Name(AVBidirectionalQueueCleared), object: self, userInfo: nil)
     }
 
+    func removeAllTrackObservers() {
+        for item in queuedAudioTracks {
+            removeTrackObservers(item)
+        }
+    }
+    
+    func removeTrackObservers(_ playerItem: AudioTrack?) {
+        NotificationCenter.default.removeObserver(self, name: .AVPlayerItemDidPlayToEndTime, object: playerItem)
+        NotificationCenter.default.removeObserver(self, name: .AVPlayerItemPlaybackStalled, object: playerItem)
+    }
+
     func removeAllItemsSilently() {
-        print("removeAllItemsSilently")
         super.removeAllItems()
         queuedAudioTracks.removeAll()
     }

package/ios/Plugin/RmxAudioPlayer.swift

@@ -64,7 +64,7 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func setPlaylistItems(_ items: [AudioTrack], options: [String:Any]) {
-        print("RmxAudioPlayer.execute=setPlaylistItems, \(options), \(items)")
+        print("RmxAudioPlayer.execute=setPlaylistItems, \(options), \(items.count)")
 
         var seekToPosition: Float = 0.0
         let retainPosition = options["retainPosition"] != nil ? (options["retainPosition"] as? Bool) ?? false : false
@@ -84,19 +84,14 @@ final class RmxAudioPlayer: NSObject {
         let result = findTrack(byId: playFromId)
         let idx = (result?["index"] as? NSNumber)?.intValue ?? 0
 
-        if !avQueuePlayer.queuedAudioTracks.isEmpty {
-            if idx >= 0 {
-                avQueuePlayer.setCurrentIndex(idx)
-            }
-        }
-
+        setTracks(items, startIndex: idx, startPosition: seekToPosition)
+        
         // This will wait for the AVPlayerItemStatusReadyToPlay status change, and then trigger playback.
         isWaitingToStartPlayback = !startPaused
         if isWaitingToStartPlayback {
             print("RmxAudioPlayer[setPlaylistItems] will wait for ready event to begin playback")
         }
 
-        setTracks(items, startPosition: seekToPosition)
         if isWaitingToStartPlayback {
             playCommand(false) // but we will try to preempt it to avoid the button blinking paused.
         }
@@ -230,6 +225,7 @@ final class RmxAudioPlayer: NSObject {
         let item = avQueuePlayer.queuedAudioTracks[index]
         removeTrackObservers(item)
         avQueuePlayer.remove(item)
+        onStatus(.rmxstatus_ITEM_REMOVED, trackId: item.trackId, param: item.toDict())
     }
 
     func removeItem(_ id: String) throws {
@@ -246,6 +242,7 @@ final class RmxAudioPlayer: NSObject {
         if let track = track {
             avQueuePlayer.remove(track)
         }
+        onStatus(.rmxstatus_ITEM_REMOVED, trackId: track?.trackId, param: track?.toDict())
     }
 
     // MARK: - player actions
@@ -373,18 +370,26 @@ final class RmxAudioPlayer: NSObject {
         }
     }
 
-    func setTracks(_ tracks: [AudioTrack], startPosition: Float) {
-        for item in avQueuePlayer.queuedAudioTracks {
-            removeTrackObservers(item)
-        }
-
+    func setTracks(_ tracks: [AudioTrack], startIndex: Int, startPosition: Float) {
+        avQueuePlayer.removeAllTrackObservers()
+        
+        isReplacingItems = true
+        print("RmxAudioPlayer[setTracks] replacing tracks ")
+        avQueuePlayer.replaceAllItems(with: tracks)
+        
+        print("RmxAudioPlayer[setTracks] replacing finished ")
         for playerItem in tracks {
             addTrackObservers(playerItem)
         }
-
-        isReplacingItems = true
-        avQueuePlayer.replaceAllItems(with: tracks)
-
+        
+        isReplacingItems = false
+        print("RmxAudioPlayer[setTracks] added track observers ")
+        if !avQueuePlayer.queuedAudioTracks.isEmpty {
+            if startIndex >= 0 {
+                avQueuePlayer.setCurrentIndex(startIndex)
+            }
+        }
+        
         if startPosition > 0 {
             seek(to: startPosition, isCommand: false)
         }
@@ -393,6 +398,7 @@ final class RmxAudioPlayer: NSObject {
     func removeAllTracks() {
         for item in avQueuePlayer.queuedAudioTracks {
             removeTrackObservers(item)
+            onStatus(.rmxstatus_ITEM_REMOVED, trackId: item.trackId, param: item.toDict())
         }
 
         avQueuePlayer.removeAllItems()
@@ -536,8 +542,8 @@ final class RmxAudioPlayer: NSObject {
             let player = object as? AVBidirectionalQueuePlayer
             let playerItem = player?.currentAudioTrack
             if playerItem != nil {
-            guard self.lastTrackId != playerItem?.trackId else {
-                return // todo should call super instead or?
+            guard !isReplacingItems && self.lastTrackId != playerItem?.trackId else {
+                return
             }
             print("observe change currentItem: lastTrackId \(self.lastTrackId) playerItem: \(playerItem?.trackId)")
             self.lastTrackId = playerItem?.trackId
@@ -689,7 +695,7 @@ final class RmxAudioPlayer: NSObject {
 
     func handleCurrentItemChanged(_ playerItem: AudioTrack?) {
         if let playerItem = playerItem {
-            print("Queue changed current item to: \(playerItem.toDict() ?? [:])")
+            print("Queue changed current item to: \(playerItem.trackId)")
             // NSLog(@"New music name: %@", ((AVURLAsset*)playerItem.asset).URL.pathComponents.lastObject);
             print("New item ID: \(playerItem.trackId ?? "")")
             print("Queue is at end: \(avQueuePlayer.isAtEnd ? "YES" : "NO")")
@@ -713,6 +719,8 @@ final class RmxAudioPlayer: NSObject {
             ]
         }
         let trackId = playerItem != nil ? playerItem?.trackId : "NONE"
+        
+        print("Update Track changed: \(info)")
         onStatus(.rmxstatus_TRACK_CHANGED, trackId: trackId, param: info)
 
         if avQueuePlayer.isAtEnd && avQueuePlayer.currentItem == nil {
@@ -988,16 +996,13 @@ final class RmxAudioPlayer: NSObject {
     }
 
     @objc func queueCleared(_ notification: Notification?) {
-        isReplacingItems = false
+        isReplacingItems = false // is this necessary ?
         print("RmxAudioPlayer, queuePlayerCleared")
         onStatus(.rmxstatus_PLAYLIST_CLEARED, trackId: "INVALID", param: nil)
     }
 
     func removeTrackObservers(_ playerItem: AudioTrack?) {
-        NotificationCenter.default.removeObserver(self, name: .AVPlayerItemDidPlayToEndTime, object: playerItem)
-        NotificationCenter.default.removeObserver(self, name: .AVPlayerItemPlaybackStalled, object: playerItem)
-
-        onStatus(.rmxstatus_ITEM_REMOVED, trackId: playerItem?.trackId, param: playerItem?.toDict())
+        avQueuePlayer.removeTrackObservers(playerItem)
     }
 
     func activateAudioSession() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-playlist",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Playlist ",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -74,5 +74,8 @@
   },
   "bugs": {
     "url": "https://github.com/phiamo/capacitor-plugin-playlist/issues"
+  },
+  "publishConfig": {
+    "@phiamo:registry": "https://npm.pkg.github.com"
   }
 }

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Sat Jan 15 16:11:50 CET 2022
-sdk.dir=/home/phiamo/Android/Sdk