magmastream 2.10.3-dev.0 → 2.10.3-dev.2

package/dist/statestorage/JsonQueue.js

@@ -102,11 +102,11 @@ class JsonQueue {
             const tracks = Array.isArray(track) ? track : [track];
             if (!tracks.length)
                 return;
-            const current = (await this.getPrevious()).filter((p) => p !== null);
-            const validTracks = tracks.filter((t) => t !== null && typeof t.uri === "string");
+            const current = (await this.getPrevious()).filter((previousTrack) => previousTrack !== null);
+            const validTracks = tracks.filter((track) => track !== null && typeof track.uri === "string");
             if (!validTracks.length)
                 return;
-            const newTracks = validTracks.filter((t) => !current.some((p) => p.uri === t.uri));
+            const newTracks = validTracks.filter((track) => !current.some((previousTrack) => previousTrack.uri === track.uri));
             if (!newTracks.length)
                 return;
             const updated = [...current, ...newTracks];
@@ -391,9 +391,9 @@ class JsonQueue {
             const users = [...userMap.keys()];
             const queues = users.map((id) => userMap.get(id));
             const shuffledQueue = [];
-            while (queues.some((q) => q.length > 0)) {
-                for (const q of queues) {
-                    const track = q.shift();
+            while (queues.some((queue) => queue.length > 0)) {
+                for (const queue of queues) {
+                    const track = queue.shift();
                     if (track)
                         shuffledQueue.push(track);
                 }

package/dist/statestorage/MemoryQueue.js

@@ -43,7 +43,7 @@ class MemoryQueue extends Array {
             const isArray = Array.isArray(track);
             const tracks = isArray ? [...track] : [track];
             // Get the track info as a string
-            const trackInfo = isArray ? tracks.map((t) => Utils_1.JSONUtils.safe(t, 2)).join(", ") : Utils_1.JSONUtils.safe(track, 2);
+            const trackInfo = isArray ? tracks.map((track) => Utils_1.JSONUtils.safe(track, 2)).join(", ") : Utils_1.JSONUtils.safe(track, 2);
             // Emit a debug message
             this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[MEMORYQUEUE] Added ${tracks.length} track(s) to queue: ${trackInfo}`);
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
@@ -129,13 +129,13 @@ class MemoryQueue extends Array {
     addPrevious(track) {
         try {
             const max = this.manager.options.maxPreviousTracks;
-            this.previous = this.previous.filter((p) => p !== null);
+            this.previous = this.previous.filter((previousTrack) => previousTrack !== null);
             if (Array.isArray(track)) {
-                const newTracks = track.filter((t) => !this.previous.some((p) => p?.identifier === t.identifier));
+                const newTracks = track.filter((track) => !this.previous.some((previousTrack) => previousTrack?.identifier === track.identifier));
                 this.previous.push(...newTracks);
             }
             else {
-                const exists = this.previous.some((p) => p?.identifier === track.identifier);
+                const exists = this.previous.some((previousTrack) => previousTrack?.identifier === track.identifier);
                 if (!exists) {
                     this.previous.push(track);
                 }
@@ -261,7 +261,7 @@ class MemoryQueue extends Array {
      * @returns The previous tracks.
      */
     getPrevious() {
-        this.previous = this.previous.map((t) => Utils_1.TrackUtils.revive(t));
+        this.previous = this.previous.map((track) => Utils_1.TrackUtils.revive(track));
         return [...this.previous];
     }
     /**
@@ -274,7 +274,7 @@ class MemoryQueue extends Array {
      * @returns The tracks in the queue.
      */
     getTracks() {
-        this.forEach((t) => Utils_1.TrackUtils.revive(t));
+        this.forEach((track) => Utils_1.TrackUtils.revive(track));
         return [...this]; // clone to avoid direct mutation
     }
     /**

package/dist/statestorage/RedisQueue.js

@@ -44,7 +44,7 @@ class RedisQueue {
             const isArray = Array.isArray(track);
             const tracks = isArray ? track : [track];
             // Serialize tracks
-            const serialized = tracks.map((t) => this.serialize(t));
+            const serialized = tracks.map((track) => this.serialize(track));
             const oldPlayer = this.manager.players.get(this.guildId) ? { ...this.manager.players.get(this.guildId) } : null;
             // Set current track if none exists
             if (!(await this.getCurrent())) {
@@ -524,9 +524,9 @@ class RedisQueue {
             const users = [...userMap.keys()];
             const queues = users.map((id) => userMap.get(id));
             const shuffledQueue = [];
-            while (queues.some((q) => q.length > 0)) {
-                for (const q of queues) {
-                    const track = q.shift();
+            while (queues.some((queue) => queue.length > 0)) {
+                for (const queue of queues) {
+                    const track = queue.shift();
                     if (track)
                         shuffledQueue.push(track);
                 }

package/dist/structures/Manager.js

@@ -216,8 +216,8 @@ class Manager extends events_1.EventEmitter {
         const search = isUrl ? _query.query : `${_source}:${_query.query}`;
         this.emit(Enums_1.ManagerEventTypes.Debug, isUrl ? `[MANAGER] Performing search for: ${_query.query}` : `[MANAGER] Performing ${_source} search for: ${_query.query}`);
         try {
-            const res = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(search)}`));
-            if (!res) {
+            const lavalinkResponse = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(search)}`));
+            if (!lavalinkResponse) {
                 throw new MagmastreamError_1.MagmaStreamError({
                     code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
                     message: `No results returned from Lavalink for query "${search}".`,
@@ -225,16 +225,16 @@ class Manager extends events_1.EventEmitter {
                 });
             }
             let result;
-            switch (res.loadType) {
+            switch (lavalinkResponse.loadType) {
                 case Enums_1.LoadTypes.Search: {
-                    const tracks = res.data.map((t) => Utils_1.TrackUtils.build(t, requester));
-                    result = { loadType: res.loadType, tracks };
+                    const tracks = lavalinkResponse.data.map((track) => Utils_1.TrackUtils.build(track, requester));
+                    result = { loadType: lavalinkResponse.loadType, tracks };
                     break;
                 }
                 case Enums_1.LoadTypes.Short:
                 case Enums_1.LoadTypes.Track: {
-                    const track = Utils_1.TrackUtils.build(res.data, requester);
-                    result = { loadType: res.loadType, tracks: [track] };
+                    const track = Utils_1.TrackUtils.build(lavalinkResponse.data, requester);
+                    result = { loadType: lavalinkResponse.loadType, tracks: [track] };
                     break;
                 }
                 case Enums_1.LoadTypes.Album:
@@ -243,10 +243,10 @@ class Manager extends events_1.EventEmitter {
                 case Enums_1.LoadTypes.Podcast:
                 case Enums_1.LoadTypes.Show:
                 case Enums_1.LoadTypes.Playlist: {
-                    const playlistData = res.data;
-                    const tracks = playlistData.tracks.map((t) => Utils_1.TrackUtils.build(t, requester));
+                    const playlistData = lavalinkResponse.data;
+                    const tracks = playlistData.tracks.map((track) => Utils_1.TrackUtils.build(track, requester));
                     result = {
-                        loadType: res.loadType,
+                        loadType: lavalinkResponse.loadType,
                         tracks,
                         playlist: {
                             name: playlistData.info.name,
@@ -259,7 +259,7 @@ class Manager extends events_1.EventEmitter {
                     break;
                 }
                 default:
-                    result = { loadType: res.loadType };
+                    result = { loadType: lavalinkResponse.loadType, tracks: [] };
             }
             if (this.options.normalizeYouTubeTitles && "tracks" in result) {
                 const processTrack = (track) => {
@@ -275,7 +275,9 @@ class Manager extends events_1.EventEmitter {
                     result.playlist.tracks = result.tracks;
                 }
             }
-            const summary = "tracks" in result ? result.tracks.map((t) => Object.fromEntries(Object.entries(t).filter(([key]) => key !== "requester"))) : [];
+            const summary = "tracks" in result
+                ? result.tracks.map((track) => Object.fromEntries(Object.entries(track).filter(([key]) => key !== "requester")))
+                : [];
             this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Result search for ${_query.query}: ${Utils_1.JSONUtils.safe(summary, 2)}`);
             return result;
         }
@@ -412,14 +414,14 @@ class Manager extends events_1.EventEmitter {
                     message: "No available nodes to decode tracks.",
                 });
             }
-            const res = (await node.rest.post("/v4/decodetracks", Utils_1.JSONUtils.safe(tracks, 2)).catch((err) => reject(err)));
-            if (!res) {
+            const decodedTrackData = (await node.rest.post("/v4/decodetracks", Utils_1.JSONUtils.safe(tracks, 2)).catch((err) => reject(err)));
+            if (!decodedTrackData) {
                 throw new MagmastreamError_1.MagmaStreamError({
                     code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
                     message: "No decoded tracks returned from node.",
                 });
             }
-            return resolve(res);
+            return resolve(decodedTrackData);
         });
     }
     /**
@@ -429,9 +431,9 @@ class Manager extends events_1.EventEmitter {
      * @throws Will throw an error if no nodes are available or if the API request fails.
      */
     async decodeTrack(track) {
-        const res = await this.decodeTracks([track]);
+        const decodedTracks = await this.decodeTracks([track]);
         // Since we're only decoding one track, we can just return the first element of the array
-        return res[0];
+        return decodedTracks[0];
     }
     /**
      * Saves player states.
@@ -508,7 +510,7 @@ class Manager extends events_1.EventEmitter {
         const player = this.create(playerOptions);
         this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${guildId}`);
         if (state.isAutoplay) {
-            const savedUser = state.data?.clientUser;
+            const savedUser = (state.data?.Internal_AutoplayUser || state.data?.clientUser);
             if (savedUser) {
                 const autoPlayUser = await player.manager.resolveUser(savedUser);
                 player.setAutoplay(true, autoPlayUser, state.autoplayTries);
@@ -577,7 +579,7 @@ class Manager extends events_1.EventEmitter {
     }
     async restorePreviousQueue(player, state) {
         if (state.queue.previous.length > 0) {
-            const validPrevious = state.queue.previous.filter((t) => t !== null && typeof t.identifier === "string");
+            const validPrevious = state.queue.previous.filter((track) => track !== null && typeof track.identifier === "string");
             if (validPrevious.length > 0)
                 await player.queue.addPrevious(validPrevious);
         }
@@ -604,31 +606,31 @@ class Manager extends events_1.EventEmitter {
     restoreFilters(player, state) {
         const filterActions = {
             bassboost: () => player.filters.bassBoost(state.filters.bassBoostlevel),
-            distort: (e) => player.filters.distort(e),
+            distort: (isEnabled) => player.filters.distort(isEnabled),
             setDistortion: () => player.filters.setDistortion(state.filters.distortion),
-            eightD: (e) => player.filters.eightD(e),
+            eightD: (isEnabled) => player.filters.eightD(isEnabled),
             setKaraoke: () => player.filters.setKaraoke(state.filters.karaoke),
-            nightcore: (e) => player.filters.nightcore(e),
-            slowmo: (e) => player.filters.slowmo(e),
-            soft: (e) => player.filters.soft(e),
-            trebleBass: (e) => player.filters.trebleBass(e),
+            nightcore: (isEnabled) => player.filters.nightcore(isEnabled),
+            slowmo: (isEnabled) => player.filters.slowmo(isEnabled),
+            soft: (isEnabled) => player.filters.soft(isEnabled),
+            trebleBass: (isEnabled) => player.filters.trebleBass(isEnabled),
             setTimescale: () => player.filters.setTimescale(state.filters.timescale),
-            tv: (e) => player.filters.tv(e),
+            tv: (isEnabled) => player.filters.tv(isEnabled),
             vibrato: () => player.filters.setVibrato(state.filters.vibrato),
-            vaporwave: (e) => player.filters.vaporwave(e),
-            pop: (e) => player.filters.pop(e),
-            party: (e) => player.filters.party(e),
-            earrape: (e) => player.filters.earrape(e),
-            electronic: (e) => player.filters.electronic(e),
-            radio: (e) => player.filters.radio(e),
+            vaporwave: (isEnabled) => player.filters.vaporwave(isEnabled),
+            pop: (isEnabled) => player.filters.pop(isEnabled),
+            party: (isEnabled) => player.filters.party(isEnabled),
+            earrape: (isEnabled) => player.filters.earrape(isEnabled),
+            electronic: (isEnabled) => player.filters.electronic(isEnabled),
+            radio: (isEnabled) => player.filters.radio(isEnabled),
             setRotation: () => player.filters.setRotation(state.filters.rotation),
-            tremolo: (e) => player.filters.tremolo(e),
-            china: (e) => player.filters.china(e),
-            chipmunk: (e) => player.filters.chipmunk(e),
-            darthvader: (e) => player.filters.darthvader(e),
-            daycore: (e) => player.filters.daycore(e),
-            doubletime: (e) => player.filters.doubletime(e),
-            demon: (e) => player.filters.demon(e),
+            tremolo: (isEnabled) => player.filters.tremolo(isEnabled),
+            china: (isEnabled) => player.filters.china(isEnabled),
+            chipmunk: (isEnabled) => player.filters.chipmunk(isEnabled),
+            darthvader: (isEnabled) => player.filters.darthvader(isEnabled),
+            daycore: (isEnabled) => player.filters.daycore(isEnabled),
+            doubletime: (isEnabled) => player.filters.doubletime(isEnabled),
+            demon: (isEnabled) => player.filters.demon(isEnabled),
         };
         for (const [filter, isEnabled] of Object.entries(state.filters.filterStatus)) {
             if (isEnabled && filterActions[filter])

package/dist/structures/Node.d.ts

@@ -23,7 +23,8 @@ export declare class Node {
     private reconnectTimeout?;
     private reconnectAttempts;
     private redisPrefix?;
-    private sessionIdsMap;
+    /** Session ID sent in the reconnect header for resumption — cleared once the ready op is received. */
+    private pendingResumeSessionId;
     /**
      * Creates an instance of Node.
      * @param manager - The manager for the node.
@@ -149,7 +150,7 @@ export declare class Node {
      * @emits {nodeRaw} - Emits a nodeRaw event with the raw message received from the WebSocket connection.
      * @private
      */
-    protected message(d: Buffer | string): Promise<void>;
+    protected message(messagePayload: Buffer | string): Promise<void>;
     /**
      * Handles an event emitted from the Lavalink node.
      * @param {PlayerEvent & PlayerEvents} payload The event emitted from the node.

package/dist/structures/Node.js

@@ -10,7 +10,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const Enums_1 = require("./Enums");
 const MagmastreamError_1 = require("./MagmastreamError");
-const validSponsorBlocks = Object.values(Enums_1.SponsorBlockSegment).map((v) => v.toLowerCase());
+const validSponsorBlocks = Object.values(Enums_1.SponsorBlockSegment).map((segment) => segment.toLowerCase());
 class Node {
     manager;
     options;
@@ -29,9 +29,10 @@ class Node {
     /** Whether the node is a NodeLink. */
     isNodeLink = false;
     reconnectTimeout;
-    reconnectAttempts = 1;
+    reconnectAttempts = 0;
     redisPrefix;
-    sessionIdsMap = new Map();
+    /** Session ID sent in the reconnect header for resumption — cleared once the ready op is received. */
+    pendingResumeSessionId = null;
     /**
      * Creates an instance of Node.
      * @param manager - The manager for the node.
@@ -153,8 +154,6 @@ class Node {
                 try {
                     const raw = fs_1.default.readFileSync(filePath, "utf-8").trim();
                     this.sessionId = raw.length ? raw : null;
-                    if (this.sessionId)
-                        this.sessionIdsMap.set(this.getCompositeKey(), this.sessionId);
                 }
                 catch {
                     this.sessionId = null;
@@ -169,7 +168,6 @@ class Node {
                     const sid = await this.manager.redis.hget(key, compositeKey);
                     this.sessionId = sid ?? null;
                     if (this.sessionId) {
-                        this.sessionIdsMap.set(compositeKey, this.sessionId);
                         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Restored sessionId for ${compositeKey}: ${this.sessionId}`);
                     }
                 }
@@ -210,7 +208,6 @@ class Node {
         if (this.sessionId) {
             fs_1.default.writeFileSync(tmpPath, this.sessionId, "utf-8");
             fs_1.default.renameSync(tmpPath, filePath);
-            this.sessionIdsMap.set(this.getCompositeKey(), this.sessionId);
         }
         else {
             try {
@@ -218,7 +215,6 @@ class Node {
                     fs_1.default.unlinkSync(filePath);
             }
             catch { }
-            this.sessionIdsMap.delete(this.getCompositeKey());
         }
     }
     async updateSessionIdRedis() {
@@ -228,11 +224,9 @@ class Node {
         try {
             if (this.sessionId) {
                 await this.manager.redis.hset(key, compositeKey, this.sessionId);
-                this.sessionIdsMap.set(compositeKey, this.sessionId);
             }
             else {
                 await this.manager.redis.hdel(key, compositeKey);
-                this.sessionIdsMap.delete(compositeKey);
             }
         }
         catch (err) {
@@ -262,8 +256,16 @@ class Node {
             "User-Id": this.manager.options.clientId,
             "Client-Name": this.manager.options.clientName,
         };
-        if (typeof this.sessionId === "string" && this.sessionId.length > 0) {
-            headers["Session-Id"] = this.sessionId;
+        // Capture resume session ID for the WS header, then clear this.sessionId.
+        // REST calls guard on this.sessionId being non-null — keeping the stale value
+        // would let updatePlayer/destroyPlayer fire with an invalid session during the
+        // reconnect window (between connect() and the 'ready' op).
+        // pendingResumeSessionId is kept so the 'ready' handler can still compute
+        // hadPreviousSession correctly. this.sessionId is re-set by 'ready'.
+        this.pendingResumeSessionId = this.sessionId;
+        this.sessionId = null;
+        if (typeof this.pendingResumeSessionId === "string" && this.pendingResumeSessionId.length > 0) {
+            headers["Session-Id"] = this.pendingResumeSessionId;
         }
         this.socket = new ws_1.default(`ws${this.options.useSSL ? "s" : ""}://${this.address}/v4/websocket`, { headers });
         this.socket.on("open", this.open.bind(this));
@@ -274,7 +276,7 @@ class Node {
         const debugInfo = {
             connected: this.connected,
             address: this.address,
-            sessionId: this.sessionId,
+            pendingResumeSessionId: this.pendingResumeSessionId,
             options: {
                 clientId: this.manager.options.clientId,
                 clientName: this.manager.options.clientName,
@@ -300,18 +302,18 @@ class Node {
             identifier: this.options.identifier,
             address: this.address,
             sessionId: this.sessionId,
-            playerCount: this.manager.players.filter((p) => p.node == this).size,
+            playerCount: this.manager.players.filter((player) => player.node == this).size,
         };
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Destroying node: ${Utils_1.JSONUtils.safe(debugInfo, 2)}`);
         // Automove all players connected to that node
-        const players = this.manager.players.filter((p) => p.node == this);
+        const players = this.manager.players.filter((player) => player.node == this);
         if (players.size) {
             await Promise.all(Array.from(players.values(), (player) => player.autoMoveNode()));
         }
         // Always clear reconnect state regardless of connection status
         clearTimeout(this.reconnectTimeout);
         this.reconnectTimeout = undefined;
-        this.reconnectAttempts = 1;
+        this.reconnectAttempts = 0;
         // Only close the socket if it is actually open
         if (this.connected) {
             this.socket.close(1000, "destroy");
@@ -347,7 +349,8 @@ class Node {
         };
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Reconnecting node: ${Utils_1.JSONUtils.safe(debugInfo, 2)}`);
         this.reconnectTimeout = setTimeout(async () => {
-            if (this.reconnectAttempts >= this.options.maxRetryAttempts) {
+            this.reconnectAttempts++;
+            if (this.reconnectAttempts > this.options.maxRetryAttempts) {
                 const error = new MagmastreamError_1.MagmaStreamError({
                     code: Enums_1.MagmaStreamErrorCode.NODE_RECONNECT_FAILED,
                     message: `Unable to reconnect after ${this.options.maxRetryAttempts} attempts.`,
@@ -360,7 +363,6 @@ class Node {
             this.socket = null;
             this.manager.emit(Enums_1.ManagerEventTypes.NodeReconnect, this);
             await this.connect();
-            this.reconnectAttempts++;
         }, this.options.retryDelayMs);
     }
     /**
@@ -382,13 +384,15 @@ class Node {
     open() {
         if (this.reconnectTimeout)
             clearTimeout(this.reconnectTimeout);
+        this.reconnectTimeout = undefined;
+        this.reconnectAttempts = 0;
         const debugInfo = {
             identifier: this.options.identifier,
             connected: this.connected,
         };
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Connected node: ${Utils_1.JSONUtils.safe(debugInfo, 2)}`);
         this.manager.emit(Enums_1.ManagerEventTypes.NodeConnect, this);
-        const playersOnBackupNode = this.manager.players.filter((p) => p.node.options.isBackup);
+        const playersOnBackupNode = this.manager.players.filter((player) => player.node.options.isBackup);
         if (playersOnBackupNode.size) {
             Promise.all(Array.from(playersOnBackupNode.values(), (player) => player.moveNode(this.options.identifier)));
         }
@@ -414,8 +418,12 @@ class Node {
         };
         this.manager.emit(Enums_1.ManagerEventTypes.NodeDisconnect, this, { code, reason });
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Disconnected node: ${Utils_1.JSONUtils.safe(debugInfo, 2)}`);
+        // Null the session ID immediately so REST calls during the reconnect delay
+        // window don't fire with a stale session. connect() reloads it from storage
+        // into pendingResumeSessionId for the WS Session-Id header.
+        this.sessionId = null;
         if (this.manager.useableNode) {
-            const players = this.manager.players.filter((p) => p.node.options.identifier == this.options.identifier);
+            const players = this.manager.players.filter((player) => player.node.options.identifier == this.options.identifier);
             if (players.size) {
                 await Promise.all(Array.from(players.values(), (player) => player.autoMoveNode()));
             }
@@ -457,12 +465,12 @@ class Node {
      * @emits {nodeRaw} - Emits a nodeRaw event with the raw message received from the WebSocket connection.
      * @private
      */
-    async message(d) {
-        if (Array.isArray(d))
-            d = Buffer.concat(d);
-        else if (d instanceof ArrayBuffer)
-            d = Buffer.from(d);
-        const payload = JSON.parse(d.toString());
+    async message(messagePayload) {
+        if (Array.isArray(messagePayload))
+            messagePayload = Buffer.concat(messagePayload);
+        else if (messagePayload instanceof ArrayBuffer)
+            messagePayload = Buffer.from(messagePayload);
+        const payload = JSON.parse(messagePayload.toString());
         if (!payload.op)
             return;
         this.manager.emit(Enums_1.ManagerEventTypes.NodeRaw, payload);
@@ -491,7 +499,11 @@ class Node {
             case "ready":
                 this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Node message: ${Utils_1.JSONUtils.safe(payload, 2)}`);
                 this.rest.setSessionId(payload.sessionId);
-                const hadPreviousSession = this.sessionId && this.sessionId !== payload.sessionId;
+                // pendingResumeSessionId holds what we sent in Session-Id header (if anything).
+                // Use it — not this.sessionId which was nulled in connect() — to detect whether
+                // we attempted resumption with a different session than what Lavalink gave back.
+                const hadPreviousSession = this.pendingResumeSessionId && this.pendingResumeSessionId !== payload.sessionId;
+                this.pendingResumeSessionId = null;
                 this.sessionId = payload.sessionId;
                 await this.updateSessionId();
                 this.info = await this.fetchInfo();
@@ -524,6 +536,11 @@ class Node {
             return;
         const track = await player.queue.getCurrent();
         const type = payload.type;
+        const TRACK_EVENTS = ["TrackStartEvent", "TrackEndEvent", "TrackStuckEvent", "TrackExceptionEvent"];
+        if (!track && TRACK_EVENTS.includes(type)) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[Node] Received ${type} for guild ${payload.guildId} but queue has no current track — ignoring.`);
+            return;
+        }
         let error;
         switch (type) {
             case "TrackStartEvent":
@@ -1121,15 +1138,15 @@ class Node {
                 context: { identifier: this.options.identifier, guildId: player.guildId },
             });
         }
-        if (segments.some((v) => !validSponsorBlocks.includes(v.toLowerCase()))) {
+        if (segments.some((segment) => !validSponsorBlocks.includes(segment.toLowerCase()))) {
             throw new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.NODE_PROTOCOL_ERROR,
-                message: `Invalid SponsorBlock segments provided. Valid ones are: ${validSponsorBlocks.map((v) => `'${v}'`).join(", ")}`,
+                message: `Invalid SponsorBlock segments provided. Valid ones are: ${validSponsorBlocks.map((segment) => `'${segment}'`).join(", ")}`,
                 context: { identifier: this.options.identifier, guildId: player.guildId, invalidSegments: segments },
             });
         }
         try {
-            await this.rest.put(`/v4/sessions/${this.sessionId}/players/${player.guildId}/sponsorblock/categories`, segments.map((v) => v.toLowerCase()));
+            await this.rest.put(`/v4/sessions/${this.sessionId}/players/${player.guildId}/sponsorblock/categories`, segments.map((segment) => segment.toLowerCase()));
         }
         catch (err) {
             throw err instanceof MagmastreamError_1.MagmaStreamError

package/dist/structures/Player.d.ts

@@ -55,7 +55,7 @@ export declare class Player {
     /** Should only be used when the node is a NodeLink */
     protected voiceReceiverWsClient: WebSocket | null;
     protected isConnectToVoiceReceiver: boolean;
-    protected voiceReceiverReconnectTimeout: NodeJS.Timeout | null;
+    protected voiceReceiverReconnectTimeout?: NodeJS.Timeout;
     protected voiceReceiverAttempt: number;
     protected voiceReceiverReconnectTries: number;
     /**

package/dist/structures/Player.js

@@ -263,7 +263,7 @@ class Player {
         }
         if (this.voiceReceiverReconnectTimeout) {
             clearTimeout(this.voiceReceiverReconnectTimeout);
-            this.voiceReceiverReconnectTimeout = null;
+            this.voiceReceiverReconnectTimeout = undefined;
         }
         if (this.voiceReceiverWsClient) {
             this.voiceReceiverWsClient.removeAllListeners();
@@ -1043,7 +1043,7 @@ class Player {
         this.voiceReceiverWsClient = new ws_1.WebSocket(`${useSSL ? "wss" : "ws"}://${host}:${port}/connection/data`, { headers });
         this.voiceReceiverWsClient.on("open", () => this.openVoiceReceiver());
         this.voiceReceiverWsClient.on("error", (err) => this.onVoiceReceiverError(err));
-        this.voiceReceiverWsClient.on("message", (data) => this.onVoiceReceiverMessage(data.toString()));
+        this.voiceReceiverWsClient.on("message", (rawMessage) => this.onVoiceReceiverMessage(rawMessage.toString()));
         this.voiceReceiverWsClient.on("close", (code, reason) => this.closeVoiceReceiver(code, reason.toString()));
     }
     /**
@@ -1118,7 +1118,7 @@ class Player {
     async openVoiceReceiver() {
         if (this.voiceReceiverReconnectTimeout)
             clearTimeout(this.voiceReceiverReconnectTimeout);
-        this.voiceReceiverReconnectTimeout = null;
+        this.voiceReceiverReconnectTimeout = undefined;
         this.isConnectToVoiceReceiver = true;
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[PLAYER] Opened voice receiver for player ${this.guildId}`);
         this.manager.emit(Enums_1.ManagerEventTypes.VoiceReceiverConnect, this);
@@ -1166,18 +1166,18 @@ class Player {
      * @returns {Promise<void>} - A promise that resolves when the voice state is updated.
      */
     async updateVoice() {
-        const vs = this.voiceState;
-        const ev = vs?.event;
-        if (!vs?.channelId || !vs?.sessionId || !ev?.token || !ev?.endpoint)
+        const voiceState = this.voiceState;
+        const voiceEvent = voiceState?.event;
+        if (!voiceState?.channelId || !voiceState?.sessionId || !voiceEvent?.token || !voiceEvent?.endpoint)
             return;
         await this.node.rest.updatePlayer({
             guildId: this.options.guildId,
             data: {
                 voice: {
-                    token: ev.token,
-                    endpoint: ev.endpoint,
-                    sessionId: vs.sessionId,
-                    channelId: vs.channelId,
+                    token: voiceEvent.token,
+                    endpoint: voiceEvent.endpoint,
+                    sessionId: voiceState.sessionId,
+                    channelId: voiceState.channelId,
                 },
             },
         });

package/dist/structures/Types.d.ts

@@ -497,6 +497,8 @@ export interface LavaPlayer {
 export interface ErrorOrEmptySearchResult {
     /** The load type of the result. */
     loadType: LoadTypes.Empty | LoadTypes.Error;
+    /** Always an empty array for error/empty results. */
+    tracks: [];
 }
 /**
  * Track Search Result

package/dist/structures/Utils.js

@@ -62,8 +62,8 @@ class TrackUtils {
     static isTrack(track) {
         if (typeof track !== "object" || track === null)
             return false;
-        const t = track;
-        return REQUIRED_TRACK_KEYS.every((key) => typeof t[key] === "string");
+        const trackRecord = track;
+        return REQUIRED_TRACK_KEYS.every((key) => typeof trackRecord[key] === "string");
     }
     /**
      * Checks if the provided argument is a valid Track array.
@@ -295,7 +295,7 @@ class AutoPlayUtils {
             const resolvedTracks = await this.resolveTracksFromQuery(`${randomTrack.artist.name} - ${randomTrack.name}`, this.manager.options.defaultSearchPlatform, track.requester);
             if (!resolvedTracks.length)
                 return [];
-            const filteredTracks = resolvedTracks.filter((t) => t.uri !== track.uri);
+            const filteredTracks = resolvedTracks.filter((resolvedTrack) => resolvedTrack.uri !== track.uri);
             if (!filteredTracks.length) {
                 return [];
             }
@@ -392,10 +392,10 @@ class AutoPlayUtils {
                         const h2 = element.querySelector('h2[itemprop="name"]');
                         if (!h2)
                             return null;
-                        const a = h2.querySelector('a[itemprop="url"]');
-                        if (!a)
+                        const anchorElement = h2.querySelector('a[itemprop="url"]');
+                        if (!anchorElement)
                             return null;
-                        const href = a.getAttribute("href");
+                        const href = anchorElement.getAttribute("href");
                         return href ? `https://soundcloud.com${href}` : null;
                     })
                         .filter(Boolean);
@@ -433,7 +433,7 @@ class AutoPlayUtils {
                     searchURI = `https://www.youtube.com/watch?v=${videoID}&list=RD${videoID}&index=${randomIndex}`;
                 } while (track.uri.includes(searchURI));
                 const resolvedTracks = await this.resolveTracksFromQuery(searchURI, Enums_1.SearchPlatform.YouTube, requester);
-                const filteredTracks = resolvedTracks.filter((t) => t.uri !== track.uri);
+                const filteredTracks = resolvedTracks.filter((resolvedTrack) => resolvedTrack.uri !== track.uri);
                 return filteredTracks;
             }
             case Enums_1.AutoPlayPlatform.Tidal: {
@@ -596,7 +596,7 @@ class AutoPlayUtils {
                         context: { recommendedResult },
                     });
                 }
-                return data.map((d) => TrackUtils.build(d, requester, true));
+                return data.map((trackData) => TrackUtils.build(trackData, requester, true));
             }
             case Enums_1.LoadTypes.Album:
             case Enums_1.LoadTypes.Artist:
@@ -606,7 +606,7 @@ class AutoPlayUtils {
             case Enums_1.LoadTypes.Playlist: {
                 const data = recommendedResult.data;
                 if (this.isPlaylistRawData(data)) {
-                    return data.tracks.map((d) => TrackUtils.build(d, requester, true));
+                    return data.tracks.map((trackData) => TrackUtils.build(trackData, requester, true));
                 }
                 throw new MagmastreamError_1.MagmaStreamError({
                     code: Enums_1.MagmaStreamErrorCode.UTILS_AUTOPLAY_BUILD_FAILED,
@@ -666,9 +666,9 @@ class PlayerUtils {
             if (!obj || typeof obj !== "object")
                 return obj;
             const result = {};
-            for (const [k, v] of Object.entries(obj)) {
-                if (!isNonSerializable(v)) {
-                    result[k] = v;
+            for (const [k, entryValue] of Object.entries(obj)) {
+                if (!isNonSerializable(entryValue)) {
+                    result[k] = entryValue;
                 }
             }
             return result;
@@ -690,8 +690,8 @@ class PlayerUtils {
                 }
             };
             const safeCurrent = current ? serializeTrack(current) : null;
-            const safeTracks = tracks.map(serializeTrack).filter((t) => t !== null);
-            const safePrevious = previous.map(serializeTrack).filter((t) => t !== null);
+            const safeTracks = tracks.map(serializeTrack).filter((serializedTrack) => serializedTrack !== null);
+            const safePrevious = previous.map(serializeTrack).filter((serializedTrack) => serializedTrack !== null);
             let safeNode = null;
             if (player.node) {
                 try {
@@ -721,6 +721,8 @@ class PlayerUtils {
                 paused: player.paused,
                 playing: player.playing,
                 position: player.position,
+                isAutoplay: player.isAutoplay,
+                autoplayTries: player.autoplayTries,
                 trackRepeat: player.trackRepeat,
                 queueRepeat: player.queueRepeat,
                 dynamicRepeat: player.dynamicRepeat,

package/dist/wrappers/cloudstorm.js

@@ -63,12 +63,12 @@ class CloudstormManager extends Manager_1.Manager {
     }
     // CloudStorm has no user/guild cache — return minimal portable info only.
     async resolveUser(user) {
-        const id = typeof user === "string" ? user : String(user.id);
-        const cached = this.getUserFromCache(id);
+        const userId = typeof user === "string" ? user : String(user.id);
+        const cached = this.getUserFromCache(userId);
         if (cached)
             return cached;
         return {
-            id,
+            id: userId,
             username: typeof user === "string" ? undefined : user.username,
         };
     }

package/dist/wrappers/discord.js.js

@@ -50,16 +50,16 @@ class DiscordJSManager extends Manager_1.Manager {
             guild.shard.send(packet);
     }
     async resolveUser(user) {
-        const id = typeof user === "string" ? user : String(user.id);
-        const cached = this.client.users.cache.get(id);
+        const userId = typeof user === "string" ? user : String(user.id);
+        const cached = this.client.users.cache.get(userId);
         if (cached)
             return cached;
         try {
-            const fetched = await this.client.users.fetch(id);
+            const fetched = await this.client.users.fetch(userId);
             return fetched;
         }
         catch {
-            return { id, username: typeof user === "string" ? undefined : user.username };
+            return { id: userId, username: typeof user === "string" ? undefined : user.username };
         }
     }
     resolveGuild(guildId) {

package/dist/wrappers/discordeno.js

@@ -57,14 +57,14 @@ class DiscordenoManager extends Manager_1.Manager {
      * Uses user-provided cache getter if available, otherwise falls back to minimal info.
      */
     async resolveUser(user) {
-        const id = typeof user === "string" ? user : String(user.id);
+        const userId = typeof user === "string" ? user : String(user.id);
         // Try user-provided cache getter
-        const cached = this.getUserFromCache(id);
+        const cached = this.getUserFromCache(userId);
         if (cached)
             return cached;
         // Fallback: return minimal info
         return {
-            id,
+            id: userId,
             username: typeof user === "string" ? undefined : user.username,
         };
     }

package/dist/wrappers/eris.js

@@ -35,12 +35,12 @@ class ErisManager extends Manager_1.Manager {
             guild.shard.sendWS(packet.op, packet.d);
     }
     async resolveUser(user) {
-        const id = typeof user === "string" ? user : String(user.id);
-        const cached = this.client.users.get(id);
+        const userId = typeof user === "string" ? user : String(user.id);
+        const cached = this.client.users.get(userId);
         if (cached)
             return cached;
         return {
-            id,
+            id: userId,
             username: typeof user === "string" ? undefined : user.username,
         };
     }

package/dist/wrappers/oceanic.js

@@ -35,12 +35,12 @@ class OceanicManager extends Manager_1.Manager {
             guild.shard.send(packet.op, packet.d);
     }
     async resolveUser(user) {
-        const id = typeof user === "string" ? user : String(user.id);
-        const cached = this.client.users.get(id);
+        const userId = typeof user === "string" ? user : String(user.id);
+        const cached = this.client.users.get(userId);
         if (cached)
             return cached;
         return {
-            id,
+            id: userId,
             username: typeof user === "string" ? undefined : user.username,
         };
     }

package/dist/wrappers/seyfert.js

@@ -63,15 +63,15 @@ class SeyfertManager extends Manager_1.Manager {
         }
     }
     async resolveUser(user) {
-        const id = typeof user === "string" ? user : String(user.id);
-        const cached = this.client.cache.users?.get(id);
+        const userId = typeof user === "string" ? user : String(user.id);
+        const cached = this.client.cache.users?.get(userId);
         if (cached)
             return cached;
         try {
-            return await this.client.users.fetch(id);
+            return await this.client.users.fetch(userId);
         }
         catch {
-            return { id, username: typeof user === "string" ? undefined : user.username };
+            return { id: userId, username: typeof user === "string" ? undefined : user.username };
         }
     }
     resolveGuild(guildId) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.3-dev.0",
+    "version": "2.10.3-dev.2",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",