muthera 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muthera",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "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,7 +115,38 @@ 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))
+            ];
+
+          if (this.connected) {
+            this.queue.push(track);
+            await this.play();
+          } else {
+            return fail();
+          }
+
+          return this;
+        } catch (e) {
+          return fail(e);
+        }
+      } else if (player.previous.info.sourceName === "youtubemusic") {
+        try {
+          let data = `https://music.youtube.com/watch?v=${player.previous.info.identifier}&list=RD${player.previous.info.identifier}`;
+          let response = await this.muthera.resolve({
+            query: data,
+            requester: player.previous.info.requester,
+          });
+
+          if (
+            !response ||
+            !response.tracks ||
+            ["error", "empty"].includes(response.loadType)
+          )
+            return fail();
 
           let track =
             response.tracks[
@@ -118,12 +157,12 @@ class Player extends EventEmitter {
             this.queue.push(track);
             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 {
@@ -139,7 +178,7 @@ class Player extends EventEmitter {
               !response.tracks ||
               ["error", "empty"].includes(response.loadType)
             )
-              return this.stop();
+              return fail();
 
             let track =
               response.tracks[
@@ -150,19 +189,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,
@@ -174,8 +212,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)];
 
@@ -183,12 +221,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 {
@@ -208,7 +245,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)];
@@ -217,13 +254,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 {
@@ -234,7 +270,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,
@@ -247,7 +283,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)];
@@ -256,7 +292,7 @@ class Player extends EventEmitter {
               this.queue.push(track);
               await this.play();
             } else {
-              return this.stop();
+              return fail();
             }
             return this;
           } else {
@@ -273,7 +309,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()
@@ -285,13 +321,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;