magmastream 2.9.0-dev.37 → 2.9.0-dev.39

package/dist/index.d.ts

@@ -1378,7 +1378,7 @@ interface ManagerEvents {
     [ManagerEventTypes.PlayerCreate]: [player: Player];
     [ManagerEventTypes.PlayerDestroy]: [player: Player];
     [ManagerEventTypes.PlayerDisconnect]: [player: Player, oldChannel: string];
-    [ManagerEventTypes.PlayerMove]: [player: Player, initChannel: string, newChannel: string];
+    [ManagerEventTypes.PlayerMove]: [player: Player, oldChannel: string, newChannel: string];
     [ManagerEventTypes.PlayerRestored]: [player: Player, node: Node];
     [ManagerEventTypes.PlayerStateUpdate]: [oldPlayer: Player, newPlayer: Player, changeType: PlayerStateUpdateEvent];
     [ManagerEventTypes.QueueEnd]: [player: Player, track: Track, payload: TrackEndEvent];
@@ -1949,15 +1949,21 @@ declare class Node {
     isNodeLink: boolean;
     private reconnectTimeout?;
     private reconnectAttempts;
+    private redisPrefix?;
+    private sessionIdsFilePath?;
+    private sessionIdsMap;
     /**
      * Creates an instance of Node.
      * @param manager - The manager for the node.
      * @param options - The options for the node.
      */
     constructor(manager: Manager, options: NodeOptions);
-    /** Returns if connected to the Node. */
+    /**
+     * Checks if the Node is currently connected.
+     * This method returns true if the Node has an active WebSocket connection, indicating it is ready to receive and process commands.
+     */
     get connected(): boolean;
-    /** Returns the address for this node. */
+    /** Returns the full address for this node, including the host and port. */
     get address(): string;
     /**
      * Creates the sessionIds.json file if it doesn't exist. This file is used to
@@ -1973,7 +1979,7 @@ declare class Node {
      * of the node identifier and cluster ID. This allows multiple clusters to
      * be used with the same node identifier.
      */
-    loadSessionIds(): void;
+    loadSessionIds(): Promise<void>;
     /**
      * Updates the session ID in the sessionIds.json file.
      *
@@ -1985,7 +1991,7 @@ declare class Node {
      * of the node identifier and cluster ID. This allows multiple clusters to
      * be used with the same node identifier.
      */
-    updateSessionId(): void;
+    updateSessionId(): Promise<void>;
     /**
      * Connects to the Node.
      *
@@ -1995,7 +2001,7 @@ declare class Node {
      * If the node has no session ID but the `enableSessionResumeOption` option is true, it will use the session ID
      * stored in the sessionIds.json file if it exists.
      */
-    connect(): void;
+    connect(): Promise<void>;
     /**
      * Destroys the node and cleans up associated resources.
      *
@@ -2323,7 +2329,7 @@ declare class Manager extends EventEmitter {
     readonly options: ManagerOptions;
     initiated: boolean;
     redis?: Redis;
-    private _send?;
+    private _send;
     private loadedPlugins;
     /**
      * Initiates the Manager class.
@@ -2347,7 +2353,7 @@ declare class Manager extends EventEmitter {
      * @param clusterId - The cluster ID which runs the current process (required).
      * @returns The manager instance.
      */
-    init(options?: ManagerInitOptions): this;
+    init(options?: ManagerInitOptions): Promise<this>;
     /**
      * Searches the enabled sources based off the URL or the `source` property.
      * @param query
@@ -2423,7 +2429,7 @@ declare class Manager extends EventEmitter {
      */
     decodeTrack(track: string): Promise<TrackData>;
     /**
-     * Saves player states to the JSON file.
+     * Saves player states.
      * @param {string} guildId - The guild ID of the player to save
      */
     savePlayerState(guildId: string): Promise<void>;
@@ -2522,8 +2528,8 @@ declare class Manager extends EventEmitter {
      */
     cleanupInactivePlayers(): Promise<void>;
     /**
-     * Cleans up an inactive player by removing its state files from the file system.
-     * This is done to prevent stale state files from accumulating on the file system.
+     * Cleans up an inactive player by removing its state data.
+     * This is done to prevent stale state data from accumulating.
      * @param guildId The guild ID of the player to clean up.
      */
     cleanupInactivePlayer(guildId: string): Promise<void>;
@@ -3396,6 +3402,9 @@ declare abstract class AutoPlayUtils {
      * @returns A single resolved {@link Track} object if found, or `null` if the search fails or returns no results.
      */
     private static resolveFirstTrackFromQuery;
+    private static isPlaylistRawData;
+    private static isTrackData;
+    private static isTrackDataArray;
     static buildTracksFromResponse<T>(recommendedResult: LavalinkResponse, requester?: T): Track[];
 }
 /** Gets or extends structures to extend the built in, or already extended, classes to add more functionality. */

package/dist/structures/Manager.js

@@ -87,6 +87,7 @@ class Manager extends events_1.EventEmitter {
                 deleteInactivePlayers: options.stateStorage?.deleteInactivePlayers ?? true,
             },
             autoPlaySearchPlatforms: options.autoPlaySearchPlatforms ?? [Enums_1.AutoPlayPlatform.YouTube],
+            send: this._send,
         };
         Utils_1.AutoPlayUtils.init(this);
         if (this.options.nodes) {
@@ -127,7 +128,7 @@ class Manager extends events_1.EventEmitter {
      * @param clusterId - The cluster ID which runs the current process (required).
      * @returns The manager instance.
      */
-    init(options = {}) {
+    async init(options = {}) {
         if (this.initiated) {
             return this;
         }
@@ -145,14 +146,6 @@ class Manager extends events_1.EventEmitter {
         else {
             this.options.clusterId = clusterId;
         }
-        for (const node of this.nodes.values()) {
-            try {
-                node.connect();
-            }
-            catch (err) {
-                this.emit(Enums_1.ManagerEventTypes.NodeError, node, err);
-            }
-        }
         if (this.options.stateStorage.type === Enums_1.StateStorageType.Redis) {
             const config = this.options.stateStorage.redisConfig;
             this.redis = new ioredis_1.default({
@@ -162,6 +155,14 @@ class Manager extends events_1.EventEmitter {
                 db: config.db ?? 0,
             });
         }
+        for (const node of this.nodes.values()) {
+            try {
+                await node.connect();
+            }
+            catch (err) {
+                this.emit(Enums_1.ManagerEventTypes.NodeError, node, err);
+            }
+        }
         this.loadPlugins();
         this.initiated = true;
         return this;
@@ -397,7 +398,7 @@ class Manager extends events_1.EventEmitter {
         return res[0];
     }
     /**
-     * Saves player states to the JSON file.
+     * Saves player states.
      * @param {string} guildId - The guild ID of the player to save
      */
     async savePlayerState(guildId) {
@@ -1193,8 +1194,8 @@ class Manager extends events_1.EventEmitter {
         }
     }
     /**
-     * Cleans up an inactive player by removing its state files from the file system.
-     * This is done to prevent stale state files from accumulating on the file system.
+     * Cleans up an inactive player by removing its state data.
+     * This is done to prevent stale state data from accumulating.
      * @param guildId The guild ID of the player to clean up.
      */
     async cleanupInactivePlayer(guildId) {
@@ -1302,30 +1303,32 @@ class Manager extends events_1.EventEmitter {
                 const prefix = this.options.stateStorage.redisConfig.prefix?.endsWith(":")
                     ? this.options.stateStorage.redisConfig.prefix
                     : this.options.stateStorage.redisConfig.prefix ?? "magmastream:";
-                const pattern = `${prefix}playerstore:*`;
+                const patterns = [`${prefix}playerstore:*`, `${prefix}queue:*`];
                 try {
-                    const stream = this.redis.scanStream({
-                        match: pattern,
-                        count: 100,
-                    });
-                    let totalDeleted = 0;
-                    stream.on("data", async (keys) => {
-                        if (keys.length) {
-                            const pipeline = this.redis.pipeline();
-                            keys.forEach((key) => pipeline.unlink(key));
-                            await pipeline.exec();
-                            totalDeleted += keys.length;
-                        }
-                    });
-                    stream.on("end", () => {
-                        this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Cleared ${totalDeleted} Redis player state keys (pattern: ${pattern})`);
-                    });
-                    stream.on("error", (err) => {
-                        console.error("[MANAGER] Error during Redis SCAN stream:", err);
-                    });
+                    for (const pattern of patterns) {
+                        const stream = this.redis.scanStream({
+                            match: pattern,
+                            count: 100,
+                        });
+                        let totalDeleted = 0;
+                        stream.on("data", async (keys) => {
+                            if (keys.length) {
+                                const pipeline = this.redis.pipeline();
+                                keys.forEach((key) => pipeline.unlink(key));
+                                await pipeline.exec();
+                                totalDeleted += keys.length;
+                            }
+                        });
+                        stream.on("end", () => {
+                            this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Cleared ${totalDeleted} Redis keys (pattern: ${pattern})`);
+                        });
+                        stream.on("error", (err) => {
+                            console.error(`[MANAGER] Error during Redis SCAN stream (${pattern}):`, err);
+                        });
+                    }
                 }
                 catch (err) {
-                    console.error("[MANAGER] Failed to clear Redis player state keys:", err);
+                    console.error("[MANAGER] Failed to clear Redis keys:", err);
                 }
                 break;
             }
@@ -1394,6 +1397,10 @@ class Manager extends events_1.EventEmitter {
         return this.options.useNode === Enums_1.UseNodeOptions.LeastLoad ? this.leastLoadNode.first() : this.leastPlayersNode.first();
     }
     send(packet) {
+        if (!this._send) {
+            console.warn("[Manager.send] _send is not defined! Packet will not be sent.");
+            return;
+        }
         return this._send(packet);
     }
     sendPacket(packet) {

package/dist/structures/Node.js

@@ -10,12 +10,6 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const Enums_1 = require("./Enums");
 const validSponsorBlocks = Object.values(Enums_1.SponsorBlockSegment).map((v) => v.toLowerCase());
-const sessionIdsFilePath = path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "sessionIds.json");
-let sessionIdsMap = new Map();
-const configDir = path_1.default.dirname(sessionIdsFilePath);
-if (!fs_1.default.existsSync(configDir)) {
-    fs_1.default.mkdirSync(configDir, { recursive: true });
-}
 class Node {
     manager;
     options;
@@ -35,6 +29,9 @@ class Node {
     isNodeLink = false;
     reconnectTimeout;
     reconnectAttempts = 1;
+    redisPrefix;
+    sessionIdsFilePath;
+    sessionIdsMap = new Map();
     /**
      * Creates an instance of Node.
      * @param manager - The manager for the node.
@@ -91,18 +88,33 @@ class Node {
         this.manager.nodes.set(this.options.identifier, this);
         this.manager.emit(Enums_1.ManagerEventTypes.NodeCreate, this);
         this.rest = new Rest_1.Rest(this, this.manager);
-        this.createSessionIdsFile();
-        this.loadSessionIds();
-        // Create README file to inform the user about the magmastream folder
-        this.createReadmeFile();
+        switch (this.manager.options.stateStorage.type) {
+            case Enums_1.StateStorageType.JSON:
+                this.sessionIdsFilePath = path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "sessionIds.json");
+                const configDir = path_1.default.dirname(this.sessionIdsFilePath);
+                if (!fs_1.default.existsSync(configDir)) {
+                    fs_1.default.mkdirSync(configDir, { recursive: true });
+                }
+                this.createSessionIdsFile();
+                this.createReadmeFile();
+                break;
+            case Enums_1.StateStorageType.Redis:
+                this.redisPrefix = this.manager.options.stateStorage.redisConfig.prefix?.endsWith(":")
+                    ? this.manager.options.stateStorage.redisConfig.prefix
+                    : this.manager.options.stateStorage.redisConfig.prefix ?? "magmastream:";
+                break;
+        }
     }
-    /** Returns if connected to the Node. */
+    /**
+     * Checks if the Node is currently connected.
+     * This method returns true if the Node has an active WebSocket connection, indicating it is ready to receive and process commands.
+     */
     get connected() {
         if (!this.socket)
             return false;
         return this.socket.readyState === ws_1.default.OPEN;
     }
-    /** Returns the address for this node. */
+    /** Returns the full address for this node, including the host and port. */
     get address() {
         return `${this.options.host}:${this.options.port}`;
     }
@@ -112,11 +124,9 @@ class Node {
      * the node when resuming a session.
      */
     createSessionIdsFile() {
-        // If the sessionIds.json file does not exist, create it
-        if (!fs_1.default.existsSync(sessionIdsFilePath)) {
-            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Creating sessionId file at: ${sessionIdsFilePath}`);
-            // Create the file with an empty object as the content
-            fs_1.default.writeFileSync(sessionIdsFilePath, JSON.stringify({}), "utf-8");
+        if (!fs_1.default.existsSync(this.sessionIdsFilePath)) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Creating sessionId file at: ${this.sessionIdsFilePath}`);
+            fs_1.default.writeFileSync(this.sessionIdsFilePath, JSON.stringify({}), "utf-8");
         }
     }
     /**
@@ -127,21 +137,48 @@ class Node {
      * of the node identifier and cluster ID. This allows multiple clusters to
      * be used with the same node identifier.
      */
-    loadSessionIds() {
-        // Check if the sessionIds.json file exists
-        if (fs_1.default.existsSync(sessionIdsFilePath)) {
-            // Emit a debug event indicating that session IDs are being loaded
-            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Loading sessionIds from file: ${sessionIdsFilePath}`);
-            // Read the content of the sessionIds.json file as a string
-            const sessionIdsData = fs_1.default.readFileSync(sessionIdsFilePath, "utf-8");
-            // Parse the JSON string into an object and convert it into a Map
-            sessionIdsMap = new Map(Object.entries(JSON.parse(sessionIdsData)));
-            // Check if the session IDs Map contains the session ID for this node
-            const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
-            if (sessionIdsMap.has(compositeKey)) {
-                // Set the session ID on this node if it exists in the session IDs Map
-                this.sessionId = sessionIdsMap.get(compositeKey);
+    async loadSessionIds() {
+        switch (this.manager.options.stateStorage.type) {
+            case Enums_1.StateStorageType.JSON: {
+                if (fs_1.default.existsSync(this.sessionIdsFilePath)) {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Loading sessionIds from file: ${this.sessionIdsFilePath}`);
+                    const sessionIdsData = fs_1.default.readFileSync(this.sessionIdsFilePath, "utf-8");
+                    this.sessionIdsMap = new Map(Object.entries(JSON.parse(sessionIdsData)));
+                    const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
+                    if (this.sessionIdsMap.has(compositeKey)) {
+                        this.sessionId = this.sessionIdsMap.get(compositeKey);
+                    }
+                }
+                break;
             }
+            case Enums_1.StateStorageType.Redis:
+                const key = `${this.redisPrefix}node:sessionIds`;
+                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Loading sessionIds from Redis key: ${key}`);
+                const currentRaw = await this.manager.redis.get(key);
+                if (currentRaw) {
+                    try {
+                        const sessionIds = JSON.parse(currentRaw);
+                        if (typeof sessionIds !== "object" || Array.isArray(sessionIds)) {
+                            throw new Error("[NODE] loadSessionIds invalid data type from Redis.");
+                        }
+                        this.sessionIdsMap = new Map(Object.entries(sessionIds));
+                        const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
+                        if (this.sessionIdsMap.has(compositeKey)) {
+                            this.sessionId = this.sessionIdsMap.get(compositeKey) || null;
+                            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Restored sessionId for ${compositeKey}: ${this.sessionId}`);
+                        }
+                    }
+                    catch (err) {
+                        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Failed to parse Redis sessionIds: ${err.message}`);
+                        this.sessionIdsMap = new Map();
+                    }
+                }
+                else {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] No sessionIds found in Redis — creating new key.`);
+                    await this.manager.redis.set(key, JSON.stringify({}));
+                    this.sessionIdsMap = new Map();
+                }
+                break;
         }
     }
     /**
@@ -155,15 +192,43 @@ class Node {
      * of the node identifier and cluster ID. This allows multiple clusters to
      * be used with the same node identifier.
      */
-    updateSessionId() {
-        // Emit a debug event indicating that the session IDs are being updated
-        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Updating sessionIds to file: ${sessionIdsFilePath}`);
-        // Create a composite key using identifier and clusterId
-        const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
-        // Update the session IDs Map with the new session ID
-        sessionIdsMap.set(compositeKey, this.sessionId);
-        // Write the updated session IDs Map to the sessionIds.json file
-        fs_1.default.writeFileSync(sessionIdsFilePath, JSON.stringify(Object.fromEntries(sessionIdsMap)));
+    async updateSessionId() {
+        switch (this.manager.options.stateStorage.type) {
+            case Enums_1.StateStorageType.JSON: {
+                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Updating sessionIds to file: ${this.sessionIdsFilePath}`);
+                const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
+                this.sessionIdsMap.set(compositeKey, this.sessionId);
+                fs_1.default.writeFileSync(this.sessionIdsFilePath, JSON.stringify(Object.fromEntries(this.sessionIdsMap)));
+                break;
+            }
+            case Enums_1.StateStorageType.Redis: {
+                const key = `${this.redisPrefix}node:sessionIds`;
+                const compositeKey = `${this.options.identifier}::${this.manager.options.clusterId}`;
+                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Updating sessionIds in Redis key: ${key}`);
+                const currentRaw = await this.manager.redis.get(key);
+                let sessionIds;
+                if (currentRaw) {
+                    try {
+                        sessionIds = JSON.parse(currentRaw);
+                        if (typeof sessionIds !== "object" || Array.isArray(sessionIds)) {
+                            throw new Error("Invalid data type in Redis");
+                        }
+                    }
+                    catch (err) {
+                        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Corrupted Redis sessionIds, reinitializing: ${err.message}`);
+                        sessionIds = {};
+                    }
+                }
+                else {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Redis key not found — creating new sessionIds key.`);
+                    sessionIds = {};
+                }
+                sessionIds[compositeKey] = this.sessionId;
+                this.sessionIdsMap = new Map(Object.entries(sessionIds));
+                await this.manager.redis.set(key, JSON.stringify(sessionIds));
+                break;
+            }
+        }
     }
     /**
      * Connects to the Node.
@@ -174,7 +239,8 @@ class Node {
      * If the node has no session ID but the `enableSessionResumeOption` option is true, it will use the session ID
      * stored in the sessionIds.json file if it exists.
      */
-    connect() {
+    async connect() {
+        await this.loadSessionIds();
         if (this.connected)
             return;
         const headers = {
@@ -186,8 +252,8 @@ class Node {
         if (this.sessionId) {
             headers["Session-Id"] = this.sessionId;
         }
-        else if (this.options.enableSessionResumeOption && sessionIdsMap.has(compositeKey)) {
-            this.sessionId = sessionIdsMap.get(compositeKey) || null;
+        else if (this.options.enableSessionResumeOption && this.sessionIdsMap.has(compositeKey)) {
+            this.sessionId = this.sessionIdsMap.get(compositeKey) || null;
             headers["Session-Id"] = this.sessionId;
         }
         this.socket = new ws_1.default(`ws${this.options.useSSL ? "s" : ""}://${this.address}/v4/websocket`, { headers });
@@ -222,7 +288,6 @@ class Node {
     async destroy() {
         if (!this.connected)
             return;
-        // Emit a debug event indicating that the node is being destroyed
         const debugInfo = {
             connected: this.connected,
             identifier: this.options.identifier,
@@ -238,16 +303,11 @@ class Node {
                 await player.autoMoveNode();
             }
         }
-        // Close the WebSocket connection
         this.socket.close(1000, "destroy");
-        // Remove all event listeners on the WebSocket
         this.socket.removeAllListeners();
-        // Clear the reconnect timeout
         this.reconnectAttempts = 1;
         clearTimeout(this.reconnectTimeout);
-        // Emit a "nodeDestroy" event with the node as the argument
         this.manager.emit(Enums_1.ManagerEventTypes.NodeDestroy, this);
-        // Remove the node from the manager
         this.manager.nodes.delete(this.options.identifier);
     }
     /**
@@ -267,7 +327,6 @@ class Node {
      * @emits {nodeDestroy} - Emits a nodeDestroy event if the maximum number of retry attempts is reached.
      */
     async reconnect() {
-        // Collect debug information regarding the current state of the node
         const debugInfo = {
             identifier: this.options.identifier,
             connected: this.connected,
@@ -275,24 +334,17 @@ class Node {
             maxRetryAttempts: this.options.maxRetryAttempts,
             retryDelayMs: this.options.retryDelayMs,
         };
-        // Emit a debug event indicating the node is attempting to reconnect
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Reconnecting node: ${JSON.stringify(debugInfo)}`);
-        // Schedule the reconnection attempt after the specified retry delay
         this.reconnectTimeout = setTimeout(async () => {
-            // Check if the maximum number of retry attempts has been reached
             if (this.reconnectAttempts >= this.options.maxRetryAttempts) {
-                // Emit an error event and destroy the node if retries are exhausted
                 const error = new Error(`Unable to connect after ${this.options.maxRetryAttempts} attempts.`);
                 this.manager.emit(Enums_1.ManagerEventTypes.NodeError, this, error);
                 return await this.destroy();
             }
-            // Remove all listeners from the current WebSocket and reset it
             this.socket?.removeAllListeners();
             this.socket = null;
-            // Emit a nodeReconnect event and attempt to connect again
             this.manager.emit(Enums_1.ManagerEventTypes.NodeReconnect, this);
             this.connect();
-            // Increment the reconnect attempts counter
             this.reconnectAttempts++;
         }, this.options.retryDelayMs);
     }
@@ -313,17 +365,13 @@ class Node {
      * with the node as the argument.
      */
     open() {
-        // Clear any existing reconnect timeouts
         if (this.reconnectTimeout)
             clearTimeout(this.reconnectTimeout);
-        // Collect debug information regarding the current state of the node
         const debugInfo = {
             identifier: this.options.identifier,
             connected: this.connected,
         };
-        // Emit a debug event indicating the node is connected
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Connected node: ${JSON.stringify(debugInfo)}`);
-        // Emit a "nodeConnect" event with the node as the argument
         this.manager.emit(Enums_1.ManagerEventTypes.NodeConnect, this);
     }
     /**
@@ -345,18 +393,14 @@ class Node {
             code,
             reason,
         };
-        // Emit a "nodeDisconnect" event with the node and the close event as arguments
         this.manager.emit(Enums_1.ManagerEventTypes.NodeDisconnect, this, { code, reason });
-        // Emit a debug event indicating the node is disconnected
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Disconnected node: ${JSON.stringify(debugInfo)}`);
-        // Try moving all players connected to that node to a useable one
         if (this.manager.useableNode) {
             const players = this.manager.players.filter((p) => p.node.options.identifier == this.options.identifier);
             if (players.size) {
                 await Promise.all(Array.from(players.values(), (player) => player.autoMoveNode()));
             }
         }
-        // If the close event was not initiated by the user, attempt to reconnect
         if (code !== 1000 || reason !== "destroy")
             await this.reconnect();
     }
@@ -371,14 +415,11 @@ class Node {
     error(error) {
         if (!error)
             return;
-        // Collect debug information regarding the error
         const debugInfo = {
             identifier: this.options.identifier,
             error: error.message,
         };
-        // Emit a debug event indicating the error on the node
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Error on node: ${JSON.stringify(debugInfo)}`);
-        // Emit a "nodeError" event with the node and the error as arguments
         this.manager.emit(Enums_1.ManagerEventTypes.NodeError, this, error);
     }
     /**
@@ -406,7 +447,7 @@ class Node {
                 this.stats = { ...payload };
                 break;
             case "playerUpdate":
-                player = await this.manager.players.get(payload.guildId);
+                player = this.manager.players.get(payload.guildId);
                 if (player && player.node.options.identifier !== this.options.identifier) {
                     return;
                 }
@@ -414,7 +455,7 @@ class Node {
                     player.position = payload.state.position || 0;
                 break;
             case "event":
-                player = await this.manager.players.get(payload.guildId);
+                player = this.manager.players.get(payload.guildId);
                 if (player && player.node.options.identifier !== this.options.identifier) {
                     return;
                 }
@@ -425,11 +466,9 @@ class Node {
                 this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Node message: ${JSON.stringify(payload)}`);
                 this.rest.setSessionId(payload.sessionId);
                 this.sessionId = payload.sessionId;
-                this.updateSessionId(); // Call to update session ID
+                await this.updateSessionId();
                 this.info = await this.fetchInfo();
-                // Log if the session was resumed successfully
                 if (payload.resumed) {
-                    // Load player states from the JSON file
                     await this.manager.loadPlayerStates(this.options.identifier);
                 }
                 if (this.options.enableSessionResumeOption) {
@@ -453,7 +492,7 @@ class Node {
     async handleEvent(payload) {
         if (!payload.guildId)
             return;
-        const player = await this.manager.players.get(payload.guildId);
+        const player = this.manager.players.get(payload.guildId);
         if (!player)
             return;
         const track = await player.queue.getCurrent();
@@ -560,18 +599,14 @@ class Node {
         }
         player.set("skipFlag", false);
         const oldPlayer = player;
-        // Handle track end events
         switch (reason) {
             case Enums_1.TrackEndReasonTypes.LoadFailed:
             case Enums_1.TrackEndReasonTypes.Cleanup:
-                // Handle the case when a track failed to load or was cleaned up
                 await this.handleFailedTrack(player, track, payload);
                 break;
             case Enums_1.TrackEndReasonTypes.Replaced:
-                // Handle the case when a track was replaced
                 break;
             case Enums_1.TrackEndReasonTypes.Stopped:
-                // If the track was forcibly replaced
                 if (await player.queue.size()) {
                     await this.playNextTrack(player, track, payload);
                 }
@@ -686,9 +721,7 @@ class Node {
         }
         // Move to the next track
         await queue.setCurrent(await queue.dequeue());
-        // Emit track end event
         this.manager.emit(Enums_1.ManagerEventTypes.TrackEnd, player, track, payload);
-        // If the track was stopped manually and no more tracks exist, end the queue
         if (payload.reason === Enums_1.TrackEndReasonTypes.Stopped) {
             const next = await queue.dequeue();
             await queue.setCurrent(next ?? null);
@@ -697,7 +730,6 @@ class Node {
                 return;
             }
         }
-        // If autoplay is enabled, play the next track
         if (playNextOnEnd)
             await player.play();
     }
@@ -715,9 +747,7 @@ class Node {
     async playNextTrack(player, track, payload) {
         // Shift the queue to set the next track as current
         await player.queue.setCurrent(await player.queue.dequeue());
-        // Emit the track end event
         this.manager.emit(Enums_1.ManagerEventTypes.TrackEnd, player, track, payload);
-        // If autoplay is enabled, play the next track
         if (this.manager.options.playNextOnEnd)
             await player.play();
     }
@@ -745,7 +775,6 @@ class Node {
                 return;
             attempt++;
         }
-        // If all attempts fail, reset the player state and emit queueEnd
         player.playing = false;
         this.manager.emit(Enums_1.ManagerEventTypes.QueueEnd, player, track, payload);
     }

package/dist/structures/Player.js

@@ -690,6 +690,7 @@ class Player {
         // Get and remove the most recent previous track
         const lastTrack = await this.queue.popPrevious();
         if (!lastTrack) {
+            await this.queue.clearPrevious();
             throw new Error("No previous track available.");
         }
         // Capture the current state of the player before making changes.

package/dist/structures/Utils.js

@@ -263,9 +263,11 @@ class AutoPlayUtils {
      */
     static async getRecommendedTracksFromSource(track, platform) {
         const requester = track.requester;
+        const parsedURL = new URL(track.uri);
         switch (platform) {
             case Enums_1.AutoPlayPlatform.Spotify: {
-                if (!track.uri.includes("spotify")) {
+                const allowedSpotifyHosts = ["open.spotify.com", "www.spotify.com"];
+                if (!allowedSpotifyHosts.includes(parsedURL.host)) {
                     const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.Spotify, requester);
                     if (!resolvedTrack)
                         return [];
@@ -282,7 +284,8 @@ class AutoPlayUtils {
                 return tracks;
             }
             case Enums_1.AutoPlayPlatform.Deezer: {
-                if (!track.uri.includes("deezer")) {
+                const allowedDeezerHosts = ["deezer.com", "www.deezer.com", "www.deezer.page.link"];
+                if (!allowedDeezerHosts.includes(parsedURL.host)) {
                     const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.Deezer, requester);
                     if (!resolvedTrack)
                         return [];
@@ -294,7 +297,8 @@ class AutoPlayUtils {
                 return tracks;
             }
             case Enums_1.AutoPlayPlatform.SoundCloud: {
-                if (!track.uri.includes("soundcloud")) {
+                const allowedSoundCloudHosts = ["soundcloud.com", "www.soundcloud.com"];
+                if (!allowedSoundCloudHosts.includes(parsedURL.host)) {
                     const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.SoundCloud, requester);
                     if (!resolvedTrack)
                         return [];
@@ -345,7 +349,8 @@ class AutoPlayUtils {
                 }
             }
             case Enums_1.AutoPlayPlatform.YouTube: {
-                const hasYouTubeURL = ["youtube.com", "youtu.be"].some((url) => track.uri.includes(url));
+                const allowedYouTubeHosts = ["youtube.com", "youtu.be"];
+                const hasYouTubeURL = allowedYouTubeHosts.some((url) => track.uri.includes(url));
                 let videoID = null;
                 if (hasYouTubeURL) {
                     videoID = track.uri.split("=").pop();
@@ -370,7 +375,8 @@ class AutoPlayUtils {
                 return filteredTracks;
             }
             case Enums_1.AutoPlayPlatform.Tidal: {
-                if (!track.uri.includes("tidal")) {
+                const allowedTidalHosts = ["tidal.com", "www.tidal.com"];
+                if (!allowedTidalHosts.includes(parsedURL.host)) {
                     const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.Tidal, requester);
                     if (!resolvedTrack)
                         return [];
@@ -382,7 +388,8 @@ class AutoPlayUtils {
                 return tracks;
             }
             case Enums_1.AutoPlayPlatform.VKMusic: {
-                if (!track.uri.includes("vk.com") && !track.uri.includes("vk.ru")) {
+                const allowedVKHosts = ["vk.com", "www.vk.com", "vk.ru", "www.vk.ru"];
+                if (!allowedVKHosts.includes(parsedURL.host)) {
                     const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.VKMusic, requester);
                     if (!resolvedTrack)
                         return [];
@@ -394,7 +401,8 @@ class AutoPlayUtils {
                 return tracks;
             }
             case Enums_1.AutoPlayPlatform.Qobuz: {
-                if (!track.uri.includes("qobuz.com")) {
+                const allowedQobuzHosts = ["qobuz.com", "www.qobuz.com", "play.qobuz.com"];
+                if (!allowedQobuzHosts.includes(parsedURL.host)) {
                     const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.Qobuz, requester);
                     if (!resolvedTrack)
                         return [];
@@ -522,24 +530,48 @@ class AutoPlayUtils {
     // 		console.error("[Spotify] Failed to launch Playwright:", err);
     // 	}
     // }
+    static isPlaylistRawData(data) {
+        return typeof data === "object" && data !== null && Array.isArray(data.tracks);
+    }
+    static isTrackData(data) {
+        return typeof data === "object" && data !== null && "encoded" in data && "info" in data;
+    }
+    static isTrackDataArray(data) {
+        return (Array.isArray(data) &&
+            data.every((track) => typeof track === "object" && track !== null && "encoded" in track && "info" in track && typeof track.encoded === "string"));
+    }
     static buildTracksFromResponse(recommendedResult, requester) {
         if (!recommendedResult)
             return [];
         if (TrackUtils.isErrorOrEmptySearchResult(recommendedResult))
             return [];
         switch (recommendedResult.loadType) {
-            case Enums_1.LoadTypes.Search: {
-                const tracks = recommendedResult.data.map((t) => TrackUtils.build(t, requester));
-                return tracks;
-            }
             case Enums_1.LoadTypes.Track: {
-                const track = TrackUtils.build(recommendedResult.data, requester);
-                return [track];
+                const data = recommendedResult.data;
+                if (!this.isTrackData(data)) {
+                    throw new Error("[TrackBuilder] Invalid TrackData object.");
+                }
+                return [TrackUtils.build(data, requester)];
+            }
+            case Enums_1.LoadTypes.Short:
+            case Enums_1.LoadTypes.Search: {
+                const data = recommendedResult.data;
+                if (!this.isTrackDataArray(data)) {
+                    throw new Error("[TrackBuilder] Invalid TrackData[] array for LoadTypes.Search or Short.");
+                }
+                return data.map((d) => TrackUtils.build(d, requester));
             }
+            case Enums_1.LoadTypes.Album:
+            case Enums_1.LoadTypes.Artist:
+            case Enums_1.LoadTypes.Station:
+            case Enums_1.LoadTypes.Podcast:
+            case Enums_1.LoadTypes.Show:
             case Enums_1.LoadTypes.Playlist: {
-                const playlistData = recommendedResult.data;
-                const tracks = playlistData.tracks.map((t) => TrackUtils.build(t, requester));
-                return tracks;
+                const data = recommendedResult.data;
+                if (this.isPlaylistRawData(data)) {
+                    return data.tracks.map((d) => TrackUtils.build(d, requester));
+                }
+                throw new Error(`[TrackBuilder] Invalid playlist data for loadType: ${recommendedResult.loadType}`);
             }
             default:
                 throw new Error(`[TrackBuilder] Unsupported loadType: ${recommendedResult.loadType}`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.9.0-dev.37",
+	"version": "2.9.0-dev.39",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -95,4 +95,4 @@
 	"homepage": "https://docs.magmastream.com",
 	"author": "Abel Purnwasy",
 	"license": "Apache-2.0"
-}
+}