muthera 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muthera",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "A simple Lavalink wrapper for Discord music bot. Forked from Niizuki.",
   "main": "src/index.js",
   "scripts": {

package/src/functions/autoPlay.js

@@ -147,7 +147,7 @@ async function dzAutoPlay(trackId, title = null, artist = null, retries = 3) {
     } catch (_) {}
   }
 
-  if (!trackData || trackData.error) throw new Error("Deezer track not found");
+  if (!trackData || trackData.error) return null;
 
   const originalTrackId = String(trackData.id);
   const artistId = trackData.artist?.id ? String(trackData.artist.id) : null;
@@ -196,7 +196,7 @@ async function dzAutoPlay(trackId, title = null, artist = null, retries = 3) {
   }
 
   const arr = Array.from(candidates.values());
-  if (!arr.length) throw new Error("No Deezer recommendations found");
+  if (!arr.length) return null;
   const pick = arr[Math.floor(Math.random() * arr.length)];
   return `https://www.deezer.com/track/${pick.id}`;
 } 

package/src/structures/mutheraPlayer.js

@@ -92,6 +92,14 @@ class Player extends EventEmitter {
 
     this.isAutoplay = true;
 
+    // Helper: emit autoplayFailed instead of stop() to avoid re-triggering
+    // TrackEndEvent → queueEnd → autoplay infinite loop
+    const fail = (e) => {
+      if (e) console.log(e);
+      this.muthera.emit("autoplayFailed", this);
+      return this;
+    };
+
     if (player.previous) {
       if (player.previous.info.sourceName === "youtube") {
         try {
@@ -107,23 +115,26 @@ class Player extends EventEmitter {
             !response.tracks ||
             ["error", "empty"].includes(response.loadType)
           )
-            return this.stop();
+            return fail();
+
+          // Filter out the previous track to avoid immediate duplicate
+          const tracks = response.tracks.filter(
+            (t) => t.info.identifier !== player.previous.info.identifier
+          );
 
-          let track =
-            response.tracks[
-              Math.floor(Math.random() * Math.floor(response.tracks.length))
-            ];
+          if (!tracks.length) return fail();
 
           if (this.connected) {
-            this.queue.push(track);
+            // Push entire Mix playlist into queue
+            for (const t of tracks) this.queue.push(t);
             await this.play();
           } else {
-            return this.stop();
+            return fail();
           }
 
           return this;
         } catch (e) {
-          return this.stop();
+          return fail(e);
         }
       } else if (player.previous.info.sourceName === "youtubemusic") {
         try {
@@ -138,23 +149,26 @@ class Player extends EventEmitter {
             !response.tracks ||
             ["error", "empty"].includes(response.loadType)
           )
-            return this.stop();
+            return fail();
 
-          let track =
-            response.tracks[
-              Math.floor(Math.random() * Math.floor(response.tracks.length))
-            ];
+          // Filter out the previous track to avoid immediate duplicate
+          const tracks = response.tracks.filter(
+            (t) => t.info.identifier !== player.previous.info.identifier
+          );
+
+          if (!tracks.length) return fail();
 
           if (this.connected) {
-            this.queue.push(track);
+            // Push entire Mix playlist into queue
+            for (const t of tracks) this.queue.push(t);
             await this.play();
           } else {
-            return this.stop();
+            return fail();
           }
 
           return this;
         } catch (e) {
-          return this.stop();
+          return fail(e);
         }
       } else if (player.previous.info.sourceName === "soundcloud") {
         try {
@@ -170,7 +184,7 @@ class Player extends EventEmitter {
               !response.tracks ||
               ["error", "empty"].includes(response.loadType)
             )
-              return this.stop();
+              return fail();
 
             let track =
               response.tracks[
@@ -181,19 +195,18 @@ class Player extends EventEmitter {
               this.queue.push(track);
               await this.play();
             } else {
-              return this.stop();
+              return fail();
             }
 
             return this;
           });
         } catch (e) {
-          console.log(e);
-          return this.stop();
+          return fail(e);
         }
       } else if (player.previous.info.sourceName === "deezer") {
         try {
           const data = await dzAutoPlay(player.previous.info.identifier);
-          if (!data) return this.stop();
+          if (!data) return fail();
 
           const response = await this.muthera.resolve({
             query: data,
@@ -205,8 +218,8 @@ class Player extends EventEmitter {
             !response.tracks ||
             ["error", "empty"].includes(response.loadType)
           )
-            return this.stop();
-          
+            return fail();
+
           const track =
             response.tracks[Math.floor(Math.random() * response.tracks.length)];
 
@@ -214,12 +227,11 @@ class Player extends EventEmitter {
             this.queue.push(track);
             await this.play();
           } else {
-            return this.stop();
+            return fail();
           }
           return this;
         } catch (e) {
-          console.log(e);
-          return this.stop();
+          return fail(e);
         }
       } else if (player.previous.info.sourceName === "applemusic") {
         try {
@@ -239,7 +251,7 @@ class Player extends EventEmitter {
             !response.tracks ||
             ["error", "empty"].includes(response.loadType)
           )
-            return this.stop();
+            return fail();
 
           const track =
             response.tracks[Math.floor(Math.random() * response.tracks.length)];
@@ -248,13 +260,12 @@ class Player extends EventEmitter {
             this.queue.push(track);
             await this.play();
           } else {
-            return this.stop();
+            return fail();
           }
 
           return this;
         } catch (e) {
-          console.log(e);
-          return this.stop();
+          return fail(e);
         }
       } else if (player.previous.info.sourceName === "spotify") {
         try {
@@ -265,7 +276,7 @@ class Player extends EventEmitter {
           if (platform.includes("dz")) {
             // Use Deezer related-artist API for proper similar song recommendations
             const data = await dzAutoPlay(null, title, artist);
-            if (!data) return this.stop();
+            if (!data) return fail();
 
             const response = await this.muthera.resolve({
               query: data,
@@ -278,7 +289,7 @@ class Player extends EventEmitter {
               ["error", "empty"].includes(response.loadType) ||
               response.tracks.length === 0
             )
-              return this.stop();
+              return fail();
 
             const track =
               response.tracks[Math.floor(Math.random() * response.tracks.length)];
@@ -287,7 +298,7 @@ class Player extends EventEmitter {
               this.queue.push(track);
               await this.play();
             } else {
-              return this.stop();
+              return fail();
             }
             return this;
           } else {
@@ -304,7 +315,7 @@ class Player extends EventEmitter {
               ["error", "empty"].includes(response.loadType) ||
               response.tracks.length === 0
             )
-              return this.stop();
+              return fail();
 
             const filtered = response.tracks.filter(
               (t) => t.info.title.toLowerCase() !== title.toLowerCase()
@@ -316,13 +327,12 @@ class Player extends EventEmitter {
               this.queue.push(track);
               await this.play();
             } else {
-              return this.stop();
+              return fail();
             }
             return this;
           }
         } catch (e) {
-          console.log(e);
-          return this.stop();
+          return fail(e);
         }
       }
     } else return this;