tunzo-player 1.0.33 → 1.0.39

package/dist/core/api-calles.js

@@ -48,7 +48,7 @@ class TunzoPlayerAPI {
         return __awaiter(this, arguments, void 0, function* (id, limit = 100) {
             var _a;
             try {
-                const response = yield fetch(`${this.baseUrl}/songs/${id}/suggestions?limit=${limit}`);
+                const response = yield fetch(`https://tunzo-api.vercel.app/api/songs/${id}/suggestions?limit=${limit}`);
                 if (!response.ok) {
                     throw new Error(`HTTP error! status: ${response.status}`);
                 }

package/dist/core/player.d.ts

@@ -14,8 +14,10 @@ export declare class Player {
     private static selectedQuality;
     private static intendedPlaying;
     private static toastCtrl;
+    private static isAndroid;
     /** Initialize with playlist and quality */
     static initialize(playlist: any[], quality?: number): void;
+    private static setupAndroidPlayer;
     static setToastController(controller: ToastController): void;
     /** Setup audio element for better compatibility */
     private static setupAudioElement;
@@ -23,6 +25,7 @@ export declare class Player {
     /** Call this once on user gesture to unlock audio in WebView */
     static unlockAudio(): void;
     static play(song: any, index?: number): void;
+    private static playAndroid;
     static pause(): void;
     static resume(): void;
     static togglePlayPause(): void;

package/dist/core/player.js

@@ -12,15 +12,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Player = void 0;
 const rxjs_1 = require("rxjs");
 const keep_awake_1 = require("@capacitor-community/keep-awake");
+const core_1 = require("@capacitor/core");
+const capacitor_plugin_playlist_1 = require("capacitor-plugin-playlist");
 class Player {
     /** Initialize with playlist and quality */
     static initialize(playlist, quality = 3) {
         this.playlist = playlist;
         this.selectedQuality = quality;
-        this.setupMediaSession();
-        this.setupAudioElement();
+        if (this.isAndroid) {
+            this.setupAndroidPlayer();
+        }
+        else {
+            this.setupMediaSession();
+            this.setupAudioElement();
+        }
         this.startWatchdog();
     }
+    static setupAndroidPlayer() {
+        capacitor_plugin_playlist_1.Playlist.addListener('status', (data) => {
+            if (data && data.status && (data.status.msgType === capacitor_plugin_playlist_1.RmxAudioStatusMessage.RMXSTATUS_COMPLETED ||
+                data.status.msgType === capacitor_plugin_playlist_1.RmxAudioStatusMessage.RMXSTATUS_PLAYLIST_COMPLETED)) {
+                this.autoNext();
+            }
+        });
+    }
     static setToastController(controller) {
         this.toastCtrl = controller;
     }
@@ -67,17 +82,24 @@ class Player {
     }
     static startWatchdog() {
         setInterval(() => {
-            if (this.intendedPlaying && this.audio.paused && this.currentSong) {
+            if (this.intendedPlaying && (this.isAndroid ? false : this.audio.paused) && this.currentSong) {
                 console.log('Watchdog: Audio paused unexpectedly. Attempting to resume...');
-                this.audio.play().catch(e => console.warn('Watchdog resume failed:', e));
+                if (this.isAndroid) {
+                    capacitor_plugin_playlist_1.Playlist.play().catch(e => console.warn('Watchdog resume failed:', e));
+                }
+                else {
+                    this.audio.play().catch(e => console.warn('Watchdog resume failed:', e));
+                }
             }
         }, 10000);
     }
     /** Call this once on user gesture to unlock audio in WebView */
     static unlockAudio() {
-        this.audio.src = '';
-        this.audio.load();
-        this.audio.play().catch(() => { });
+        if (!this.isAndroid) {
+            this.audio.src = '';
+            this.audio.load();
+            this.audio.play().catch(() => { });
+        }
     }
     static play(song, index = 0) {
         var _a;
@@ -91,35 +113,93 @@ class Player {
         if (url.startsWith('http://')) {
             url = url.replace('http://', 'https://');
         }
-        this.audio.src = url;
-        this.audio.load();
-        this.audio.play().then(() => {
-            this.isPlaying = true;
-            this.updateMediaSessionMetadata(song);
-            keep_awake_1.KeepAwake.keepAwake(); // Keep screen/CPU awake
-            if ('mediaSession' in navigator) {
-                navigator.mediaSession.playbackState = 'playing';
+        if (this.isAndroid) {
+            this.playAndroid(song, url);
+        }
+        else {
+            this.audio.src = url;
+            this.audio.load();
+            this.audio.play().then(() => {
+                this.isPlaying = true;
+                this.updateMediaSessionMetadata(song);
+                keep_awake_1.KeepAwake.keepAwake(); // Keep screen/CPU awake
+                if ('mediaSession' in navigator) {
+                    navigator.mediaSession.playbackState = 'playing';
+                }
+            }).catch((err) => {
+                this.isPlaying = false;
+                console.warn('Audio play failed:', err);
+            });
+        }
+    }
+    static playAndroid(song, url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            try {
+                // Extract artwork
+                let artworkUrl = '';
+                if (song.image && Array.isArray(song.image)) {
+                    const highQualityImage = song.image[song.image.length - 1];
+                    if (highQualityImage && highQualityImage.url) {
+                        artworkUrl = highQualityImage.url;
+                    }
+                }
+                // Extract artist
+                let artistName = 'Unknown Artist';
+                if (((_a = song.artists) === null || _a === void 0 ? void 0 : _a.primary) && Array.isArray(song.artists.primary) && song.artists.primary.length > 0) {
+                    artistName = song.artists.primary.map((artist) => artist.name).join(', ');
+                }
+                else if (song.primaryArtists) {
+                    artistName = song.primaryArtists;
+                }
+                else if (song.artist) {
+                    artistName = song.artist;
+                }
+                const track = {
+                    trackId: song.id,
+                    assetUrl: url,
+                    albumArt: artworkUrl,
+                    artist: artistName,
+                    album: ((_b = song.album) === null || _b === void 0 ? void 0 : _b.name) || 'Unknown Album',
+                    title: song.name || song.title || 'Unknown Title'
+                };
+                yield capacitor_plugin_playlist_1.Playlist.clearAllItems();
+                yield capacitor_plugin_playlist_1.Playlist.addItem({ item: track });
+                yield capacitor_plugin_playlist_1.Playlist.play();
+                this.isPlaying = true;
+                keep_awake_1.KeepAwake.keepAwake();
+            }
+            catch (e) {
+                console.error('Android play failed:', e);
+                this.isPlaying = false;
             }
-        }).catch((err) => {
-            this.isPlaying = false;
-            console.warn('Audio play failed:', err);
         });
     }
     static pause() {
         this.intendedPlaying = false;
-        this.audio.pause();
         this.isPlaying = false;
+        if (this.isAndroid) {
+            capacitor_plugin_playlist_1.Playlist.pause();
+        }
+        else {
+            this.audio.pause();
+        }
         keep_awake_1.KeepAwake.allowSleep();
-        if ('mediaSession' in navigator) {
+        if (!this.isAndroid && 'mediaSession' in navigator) {
             navigator.mediaSession.playbackState = 'paused';
         }
     }
     static resume() {
         this.intendedPlaying = true;
-        this.audio.play();
         this.isPlaying = true;
+        if (this.isAndroid) {
+            capacitor_plugin_playlist_1.Playlist.play();
+        }
+        else {
+            this.audio.play();
+        }
         keep_awake_1.KeepAwake.keepAwake();
-        if ('mediaSession' in navigator) {
+        if (!this.isAndroid && 'mediaSession' in navigator) {
             navigator.mediaSession.playbackState = 'playing';
         }
     }
@@ -154,8 +234,13 @@ class Player {
         }
     }
     static seek(seconds) {
-        this.audio.currentTime = seconds;
-        this.updatePositionState();
+        if (this.isAndroid) {
+            capacitor_plugin_playlist_1.Playlist.seekTo({ position: seconds });
+        }
+        else {
+            this.audio.currentTime = seconds;
+            this.updatePositionState();
+        }
     }
     static autoNext() {
         this.next();
@@ -310,3 +395,4 @@ Player.queue$ = new rxjs_1.BehaviorSubject([]);
 Player.playlist = [];
 Player.selectedQuality = 3;
 Player.intendedPlaying = false;
+Player.isAndroid = core_1.Capacitor.getPlatform() === 'android';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tunzo-player",
-    "version": "1.0.33",
+    "version": "1.0.39",
     "description": "A music playback service for Angular and Ionic apps with native audio control support.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -30,7 +30,9 @@
     },
     "dependencies": {
         "@capacitor-community/keep-awake": "^7.1.0",
+        "@capacitor/core": "^8.0.0",
         "@ionic/angular": "^8.7.11",
+        "capacitor-plugin-playlist": "^0.7.4",
         "rxjs": "^7.8.2"
     }
 }

package/src/core/api-calles.ts

@@ -36,7 +36,7 @@ export class TunzoPlayerAPI {
   async suggesstedSongs(id: string, limit: number = 100): Promise<any[]> {
     try {
       const response = await fetch(
-        `${this.baseUrl}/songs/${id}/suggestions?limit=${limit}`
+        `https://tunzo-api.vercel.app/api/songs/${id}/suggestions?limit=${limit}`
       );
 
       if (!response.ok) {

package/src/core/player.ts

@@ -1,6 +1,8 @@
 import { BehaviorSubject } from 'rxjs';
 import { KeepAwake } from '@capacitor-community/keep-awake';
 import { ToastController } from '@ionic/angular/standalone';
+import { Capacitor } from '@capacitor/core';
+import { Playlist, AudioTrack, RmxAudioStatusMessage } from 'capacitor-plugin-playlist';
 
 export class Player {
   private static audio = new Audio();
@@ -16,16 +18,32 @@ export class Player {
   private static selectedQuality = 3;
   private static intendedPlaying = false;
   private static toastCtrl: ToastController;
+  private static isAndroid = Capacitor.getPlatform() === 'android';
 
   /** Initialize with playlist and quality */
   static initialize(playlist: any[], quality = 3) {
     this.playlist = playlist;
     this.selectedQuality = quality;
-    this.setupMediaSession();
-    this.setupAudioElement();
+    if (this.isAndroid) {
+      this.setupAndroidPlayer();
+    } else {
+      this.setupMediaSession();
+      this.setupAudioElement();
+    }
     this.startWatchdog();
   }
 
+  private static setupAndroidPlayer() {
+    Playlist.addListener('status', (data) => {
+      if (data && data.status && (
+        data.status.msgType === RmxAudioStatusMessage.RMXSTATUS_COMPLETED ||
+        data.status.msgType === RmxAudioStatusMessage.RMXSTATUS_PLAYLIST_COMPLETED
+      )) {
+        this.autoNext();
+      }
+    });
+  }
+
   static setToastController(controller: ToastController) {
     this.toastCtrl = controller;
   }
@@ -81,18 +99,24 @@ export class Player {
 
   private static startWatchdog() {
     setInterval(() => {
-      if (this.intendedPlaying && this.audio.paused && this.currentSong) {
+      if (this.intendedPlaying && (this.isAndroid ? false : this.audio.paused) && this.currentSong) {
         console.log('Watchdog: Audio paused unexpectedly. Attempting to resume...');
-        this.audio.play().catch(e => console.warn('Watchdog resume failed:', e));
+        if (this.isAndroid) {
+          Playlist.play().catch(e => console.warn('Watchdog resume failed:', e));
+        } else {
+          this.audio.play().catch(e => console.warn('Watchdog resume failed:', e));
+        }
       }
     }, 10000);
   }
 
   /** Call this once on user gesture to unlock audio in WebView */
   static unlockAudio() {
-    this.audio.src = '';
-    this.audio.load();
-    this.audio.play().catch(() => { });
+    if (!this.isAndroid) {
+      this.audio.src = '';
+      this.audio.load();
+      this.audio.play().catch(() => { });
+    }
   }
 
   static play(song: any, index: number = 0) {
@@ -110,38 +134,95 @@ export class Player {
       url = url.replace('http://', 'https://');
     }
 
-    this.audio.src = url;
-    this.audio.load();
+    if (this.isAndroid) {
+      this.playAndroid(song, url);
+    } else {
+      this.audio.src = url;
+      this.audio.load();
+
+      this.audio.play().then(() => {
+        this.isPlaying = true;
+        this.updateMediaSessionMetadata(song);
+        KeepAwake.keepAwake(); // Keep screen/CPU awake
+        if ('mediaSession' in navigator) {
+          navigator.mediaSession.playbackState = 'playing';
+        }
+      }).catch((err) => {
+        this.isPlaying = false;
+        console.warn('Audio play failed:', err);
+      });
+    }
+  }
 
-    this.audio.play().then(() => {
-      this.isPlaying = true;
-      this.updateMediaSessionMetadata(song);
-      KeepAwake.keepAwake(); // Keep screen/CPU awake
-      if ('mediaSession' in navigator) {
-        navigator.mediaSession.playbackState = 'playing';
+  private static async playAndroid(song: any, url: string) {
+    try {
+      // Extract artwork
+      let artworkUrl = '';
+      if (song.image && Array.isArray(song.image)) {
+        const highQualityImage = song.image[song.image.length - 1];
+        if (highQualityImage && highQualityImage.url) {
+          artworkUrl = highQualityImage.url;
+        }
       }
-    }).catch((err) => {
+
+      // Extract artist
+      let artistName = 'Unknown Artist';
+      if (song.artists?.primary && Array.isArray(song.artists.primary) && song.artists.primary.length > 0) {
+        artistName = song.artists.primary.map((artist: any) => artist.name).join(', ');
+      } else if (song.primaryArtists) {
+        artistName = song.primaryArtists;
+      } else if (song.artist) {
+        artistName = song.artist;
+      }
+
+      const track: AudioTrack = {
+        trackId: song.id,
+        assetUrl: url,
+        albumArt: artworkUrl,
+        artist: artistName,
+        album: song.album?.name || 'Unknown Album',
+        title: song.name || song.title || 'Unknown Title'
+      };
+
+      await Playlist.clearAllItems();
+      await Playlist.addItem({ item: track });
+      await Playlist.play();
+      this.isPlaying = true;
+      KeepAwake.keepAwake();
+    } catch (e) {
+      console.error('Android play failed:', e);
       this.isPlaying = false;
-      console.warn('Audio play failed:', err);
-    });
+    }
   }
 
   static pause() {
     this.intendedPlaying = false;
-    this.audio.pause();
     this.isPlaying = false;
+
+    if (this.isAndroid) {
+      Playlist.pause();
+    } else {
+      this.audio.pause();
+    }
+
     KeepAwake.allowSleep();
-    if ('mediaSession' in navigator) {
+    if (!this.isAndroid && 'mediaSession' in navigator) {
       navigator.mediaSession.playbackState = 'paused';
     }
   }
 
   static resume() {
     this.intendedPlaying = true;
-    this.audio.play();
     this.isPlaying = true;
+
+    if (this.isAndroid) {
+      Playlist.play();
+    } else {
+      this.audio.play();
+    }
+
     KeepAwake.keepAwake();
-    if ('mediaSession' in navigator) {
+    if (!this.isAndroid && 'mediaSession' in navigator) {
       navigator.mediaSession.playbackState = 'playing';
     }
   }
@@ -176,8 +257,12 @@ export class Player {
   }
 
   static seek(seconds: number) {
-    this.audio.currentTime = seconds;
-    this.updatePositionState();
+    if (this.isAndroid) {
+      Playlist.seekTo({ position: seconds });
+    } else {
+      this.audio.currentTime = seconds;
+      this.updatePositionState();
+    }
   }
 
   static autoNext() {