feat: unify autoplay, add retries, fix clearFilters, improve logs (#36)

* Update build/structures/Node.js

Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>

* Update package.json

Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>

* Update test/v4.js

* Fix import path for autoPlay function in tests

* Update build/structures/Queue.js

* Refactor client.login to use environment variable

Updated client.login to use default token retrieval.

---------

Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>

Author: kunalkandepatil

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 pnpm-lock.yaml
+package-lock.json
 .env
+testLab

build/functions/autoPlay.js

@@ -1,9 +1,26 @@
 const undici = require('undici');
 const { JSDOM } = require('jsdom');
-const crypto = require('crypto');
 
-async function scAutoPlay(url) {
-    const res = await undici.fetch(`${url}/recommended`);
+const USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
+
+async function autoPlay(url, source) {
+    if (source === "sound-cloud") {
+        return await soundcloud(url);
+    } else if (source === "spotify") {
+        return await spotify(url);
+    } else if (source === "apple-music") {
+        return await appleMusic(url);
+    } else {
+        throw new Error("Unsupported source for autoPlay");
+    }
+}
+
+async function soundcloud(url) {
+    const res = await undici.fetch(`${url}/recommended`, {
+        headers: {
+            'User-Agent': USER_AGENT
+        }
+    });
 
     if (res.status !== 200) {
         throw new Error(`Failed to fetch URL. Status code: ${res.status}`);
@@ -14,32 +31,94 @@ async function scAutoPlay(url) {
     const dom = new JSDOM(html);
     const document = dom.window.document;
 
-    const secondNoscript = document.querySelectorAll('noscript')[1];
-    const sectionElement = secondNoscript.querySelector('section');
-    const articleElements = sectionElement.querySelectorAll('article');
+    const noscripts = document.querySelectorAll('noscript');
+    const tracks = [];
 
-    articleElements.forEach(articleElement => {
-        const h2Element = articleElement.querySelector('h2[itemprop="name"]');
+    if (noscripts.length > 1) {
+        const secondNoscript = noscripts[1];
+        const section = secondNoscript.querySelector('section');
 
-        const aElement = h2Element.querySelector('a[itemprop="url"]');
-        const href = `https://soundcloud.com${aElement.getAttribute('href')}`
+        if (section) {
+            const articles = section.querySelectorAll('article');
+            articles.forEach(article => {
+                const h2 = article.querySelector('h2[itemprop="name"]');
+                if (h2) {
+                    const a = h2.querySelector('a[itemprop="url"]');
+                    if (a) {
+                        const href = a.getAttribute('href');
+                        if (href) {
+                            tracks.push(`https://soundcloud.com${href}`);
+                        }
+                    }
+                }
+            });
+        }
+    }
 
-        return href;
-    });
+    return tracks.length > 0 ? tracks[Math.floor(Math.random() * tracks.length)] : "";
+}
+
+async function spotify(url) {
+    const res = await undici.fetch(url);
+    if (res.status !== 200) {
+        throw new Error(`Failed to fetch URL. Status code: ${res.status}`);
+    }
+
+    const html = await res.text();
+
+    const dom = new JSDOM(html);
+    const document = dom.window.document;
+
+    const recommender = document.querySelector('div[data-testid="track-internal-link-recommender"]');
+    const tracks = [];
+
+    if (recommender) {
+        const anchors = recommender.querySelectorAll('a');
+        anchors.forEach(a => {
+            const href = a.getAttribute('href');
+            if (href && href.startsWith('/track/')) {
+                tracks.push(`https://open.spotify.com${href}`);
+            }
+        });
+    }
+
+    return tracks.length > 0 ? tracks[Math.floor(Math.random() * tracks.length)] : "";
 }
 
-async function spAutoPlay(track_id) {
-    // Since Spotify's recommendations API is deprecated and unreliable,
-    // This approach is more reliable and it uses official YT recommendations API.
-
-    try {
-        // For now, return null to indicate we need track info from the player
-        // The actual implementation will be handled in the Player.autoplay method
-        return null;
-    } catch (error) {
-        console.error('Spotify autoplay error:', error);
-        return null;
+async function appleMusic(url) {
+    const res = await undici.fetch(url);
+    if (res.status !== 200) {
+        throw new Error(`Failed to fetch URL. Status code: ${res.status}`);
     }
+
+    const html = await res.text();
+
+    const dom = new JSDOM(html);
+    const document = dom.window.document;
+
+    const sections = document.querySelectorAll('div[data-testid="section-container"]');
+    const tracks = [];
+
+    sections.forEach(section => {
+        const ariaLabel = section.getAttribute('aria-label');
+        if (ariaLabel && ariaLabel.startsWith('More By')) {
+            const shelfContent = section.querySelector('ul[slot="shelf-content"]');
+            if (shelfContent) {
+                const lockups = shelfContent.querySelectorAll('div[data-testid="lockup-control"]');
+                lockups.forEach(lockup => {
+                    const a = lockup.querySelector('a');
+                    if (a) {
+                        const href = a.getAttribute('href');
+                        if (href) {
+                            tracks.push(href.startsWith('http') ? href : `https://music.apple.com${href}`);
+                        }
+                    }
+                });
+            }
+        }
+    });
+
+    return tracks.length > 0 ? tracks[Math.floor(Math.random() * tracks.length)] : "";
 }
 
-module.exports = { scAutoPlay, spAutoPlay };
+module.exports = { autoPlay };

build/index.d.ts

@@ -1,18 +1,18 @@
 import { EventEmitter } from "events";
 
 type Nullable<T> = T | null;
-type Prettify<T> = 
+type Prettify<T> =
     [T] extends [object]
-        ? { [K in keyof T]: Prettify<T[K]>}
-        : T;
+    ? { [K in keyof T]: Prettify<T[K]> }
+    : T;
 
-type PrettifyWithNull<T> = 
-  [T] extends [object]
+type PrettifyWithNull<T> =
+    [T] extends [object]
     ? { [K in keyof T]: PrettifyWithNullOrUndefined<T[K]> } & {}
     : (null extends T ? (Exclude<T, null> | null) : never);
 
 type PrettifyWithNullOrUndefined<T> =
-  [T] extends [object]
+    [T] extends [object]
     ? { [K in keyof T]: PrettifyWithNullOrUndefined<T[K]> } & {}
     : (null extends T ? (Exclude<T, null> | null) : (undefined extends T ? (Exclude<T, undefined> | undefined) : T));
 
@@ -144,7 +144,7 @@ export declare class Player extends EventEmitter {
      * @since 1.0.9
      */
     public readonly connectionTimeout: number;
-    
+
     /**
      * @warn Lazily (defined; Only when autoplay is called/used.) Initialized. 
      */
@@ -195,7 +195,7 @@ export declare class Player extends EventEmitter {
 
     /**
     * @description clears All custom Data set on the Player
-    */ 
+    */
     public clearData(): this;
     private send(data: any): void;
 
@@ -540,7 +540,7 @@ export declare class Riffy extends EventEmitter {
      */
     public readonly migrationStrategyFn?: Function;
     public defaultSearchPlatform: string;
-    
+
     public restVersion: RiffyOptions["restVersion"];
 
     /**
@@ -765,8 +765,8 @@ type NodeInfo = {
 } | {
     node: string;
     voice: {
-      name: string;
-      version: string;
+        name: string;
+        version: string;
     };
     isNodelink: boolean;
 }
@@ -934,34 +934,34 @@ export declare class Node {
          */
         getCurrentTrack: <TPlugin extends LyricPluginWithoutLavaLyrics | (string & {}) >(guildId: string, skipTrackSource: boolean, plugin?: TPlugin) => Promise<TPlugin extends LyricPluginWithoutLavaLyrics ? LyricPluginWithoutLavaLyricsResult : NodeLyricsResult | null>;
     }
-    
+
     /**
      * Nodelink Mixer API (Works Only when Node is hosted with [Nodelink Server](https://nodelink.js.org))
      * @description The Audio Mixer allows overlaying auxiliary audio tracks (like TTS, sound effects, or background music) on top of the main active track.
      */
     mixer: {
-      /**
-       * Check if Node is hosted with Nodelink Server
-       */
-       check: () => boolean;
-       /**
-        * Adds a new audio track to be mixed over the current playback.
-        * @param {string} guildId 
-        * @param {AddMixLayerOptions} mixLayerOptions 
-        */
-       addMixLayer: (guildId: string, mixLayerOptions: AddMixLayerOptions) => Promise<NodelinkMixLayer>;
-       /**
-        * Retrieves a list of currently active mix layers.
-        */
-       getActiveMixLayers: (guildId: string) => Promise<NodelinkMixLayer[]>;
-       /**
-        * Update Mix Layer Volume
-        */
-       updateMixLayerVolume: (guildId: string, mixId: string, volume: number) => Promise<void>;
-       /**
-        * Remove Mix Layer
-        */
-       removeMixLayer: (guildId: string, mixId: string) => Promise<void>;
+        /**
+         * Check if Node is hosted with Nodelink Server
+         */
+        check: () => boolean;
+        /**
+         * Adds a new audio track to be mixed over the current playback.
+         * @param {string} guildId 
+         * @param {AddMixLayerOptions} mixLayerOptions 
+         */
+        addMixLayer: (guildId: string, mixLayerOptions: AddMixLayerOptions) => Promise<NodelinkMixLayer>;
+        /**
+         * Retrieves a list of currently active mix layers.
+         */
+        getActiveMixLayers: (guildId: string) => Promise<NodelinkMixLayer[]>;
+        /**
+         * Update Mix Layer Volume
+         */
+        updateMixLayerVolume: (guildId: string, mixId: string, volume: number) => Promise<void>;
+        /**
+         * Remove Mix Layer
+         */
+        removeMixLayer: (guildId: string, mixId: string) => Promise<void>;
     }
 
     public connect(): void;
@@ -978,39 +978,39 @@ export declare class Node {
  * Options for adding a mix layer.
  */
 export type AddMixLayerOptions = {
-  track: {
-    /** 
-     * Base64 encoded track string (optional if identifier provided) 
-     */
-    encoded?: string;
+    track: {
+        /** 
+         * Base64 encoded track string (optional if identifier provided) 
+         */
+        encoded?: string;
 
-    /** 
-     * Track identifier (optional if encoded provided) 
-     */
-    identifier?: string;
+        /** 
+         * Track identifier (optional if encoded provided) 
+         */
+        identifier?: string;
+
+        /** 
+         * (Optional) Track User Data 
+         */
+        userData?: string;
+    };
 
     /** 
-     * (Optional) Track User Data 
+     * Float 0.0 to 1.0 (Default: 0.8) 
      */
-    userData?: string;
-  };
-
-  /** 
-   * Float 0.0 to 1.0 (Default: 0.8) 
-   */
-  volume?: number;
+    volume?: number;
 };
 
 export type NodelinkMixLayer = {
-  id: string;
-  track: {
-    encoded: string;
-    identifier: string;
-    userData: string;
-  };
-  volume: number;
-  position?: number;
-  startTime?: number;
+    id: string;
+    track: {
+        encoded: string;
+        identifier: string;
+        userData: string;
+    };
+    volume: number;
+    position?: number;
+    startTime?: number;
 };
 
 export type FilterOptions = {
@@ -1236,11 +1236,11 @@ export declare class Connection {
      * @private
      * @since 1.0.9
      */
-    private deferred: { 
-      promise: Promise<void>; 
-      resolve: (value?: void | PromiseLike<void>) => void 
+    private deferred: {
+        promise: Promise<void>;
+        resolve: (value?: void | PromiseLike<void>) => void
     } | null;
-  
+
     /**
      * Tracks the promise for the active REST update to the Node
      * @private
@@ -1252,18 +1252,18 @@ export declare class Connection {
      * @since 1.0.9
      */
     public establishing: boolean;
-    
+
     /**
      * Checks if we have all necessary voice credentials.
      */
     get isReady(): boolean;
-    
+
     /**
     * Waits for the connection to be ready and for any active voice updates to the Node to complete.
     * Optimization: Returns immediately if ready and idle to save resources.
     */
     public resolve(): Promise<any>;
-    
+
     /**
     * Checks if ready, performs the update, and manages the resolution flow.
     */
@@ -1279,4 +1279,4 @@ export declare class Connection {
     }): void;
 
     private updatePlayerVoiceData(): void;
-}
+}