magmastream 2.9.0-dev.34 → 2.9.0-dev.35

package/dist/index.d.ts

@@ -549,37 +549,68 @@ interface RedisConfig {
 /**
  * Player State Update Event
  */
-interface PlayerStateUpdateEvent {
-    changeType: PlayerStateEventTypes;
-    details?: AutoplayChangeEvent | ConnectionChangeEvent | RepeatChangeEvent | PauseChangeEvent | QueueChangeEvent | TrackChangeEvent | VolumeChangeEvent | ChannelChangeEvent;
-}
+type PlayerStateUpdateEvent = {
+    changeType: PlayerStateEventTypes.TrackChange;
+    details: TrackChangeEvent;
+} | {
+    changeType: PlayerStateEventTypes.PauseChange;
+    details: PauseChangeEvent;
+} | {
+    changeType: PlayerStateEventTypes.QueueChange;
+    details: QueueChangeEvent;
+} | {
+    changeType: PlayerStateEventTypes.ConnectionChange;
+    details: ConnectionChangeEvent;
+} | {
+    changeType: PlayerStateEventTypes.AutoPlayChange;
+    details: AutoplayChangeEvent;
+} | {
+    changeType: PlayerStateEventTypes.ChannelChange;
+    details: ChannelChangeEvent;
+} | {
+    changeType: PlayerStateEventTypes.VolumeChange;
+    details: VolumeChangeEvent;
+} | {
+    changeType: PlayerStateEventTypes.RepeatChange;
+    details: RepeatChangeEvent;
+};
+/**
+ * Player State Change Data
+ */
+type PlayerStateChangeData = AutoplayChangeEvent | ConnectionChangeEvent | RepeatChangeEvent | PauseChangeEvent | QueueChangeEvent | TrackChangeEvent | VolumeChangeEvent | ChannelChangeEvent;
 /**
  * Autoplay Change Event
  */
 interface AutoplayChangeEvent {
-    previousAutoplay: boolean;
-    currentAutoplay: boolean;
+    type: "autoplay";
+    action: "toggle";
+    previousAutoplay: boolean | null;
+    currentAutoplay: boolean | null;
 }
 /**
  * Connection Change Event
  */
 interface ConnectionChangeEvent {
-    changeType: "connect" | "disconnect";
-    previousConnection: boolean;
-    currentConnection: boolean;
+    type: "connection";
+    action: "connect" | "disconnect";
+    previousConnection: boolean | null;
+    currentConnection: boolean | null;
 }
 /**
  * Repeat Change Event
  */
 interface RepeatChangeEvent {
-    changeType: "dynamic" | "track" | "queue" | null;
-    previousRepeat: string | null;
-    currentRepeat: string | null;
+    type: "repeat";
+    action: "dynamic" | "track" | "queue" | "none";
+    previousRepeat: "dynamic" | "track" | "queue" | null;
+    currentRepeat: "dynamic" | "track" | "queue" | null;
 }
 /**
  * Pause Change Event
  */
 interface PauseChangeEvent {
+    type: "pause";
+    action: "pause" | "resume" | "toggle";
     previousPause: boolean | null;
     currentPause: boolean | null;
 }
@@ -587,14 +618,18 @@ interface PauseChangeEvent {
  * Queue Change Event
  */
 interface QueueChangeEvent {
-    changeType: "add" | "remove" | "clear" | "shuffle" | "roundRobin" | "userBlock" | "autoPlayAdd";
+    type: "queue";
+    action: "add" | "remove" | "clear" | "shuffle" | "roundRobin" | "userBlock" | "autoPlayAdd";
+    previousQueueLength: number | null;
+    currentQueueLength: number | null;
     tracks?: Track[];
 }
 /**
  * Track Change Event
  */
 interface TrackChangeEvent {
-    changeType: "start" | "end" | "previous" | "timeUpdate" | "autoPlay";
+    type: "track";
+    action: "start" | "end" | "previous" | "timeUpdate" | "autoPlay";
     track: Track;
     previousTime?: number | null;
     currentTime?: number | null;
@@ -603,6 +638,8 @@ interface TrackChangeEvent {
  * Volume Change Event
  */
 interface VolumeChangeEvent {
+    type: "volume";
+    action: "adjust";
     previousVolume: number | null;
     currentVolume: number | null;
 }
@@ -610,7 +647,8 @@ interface VolumeChangeEvent {
  * Channel Change Event
  */
 interface ChannelChangeEvent {
-    changeType: "text" | "voice";
+    type: "channel";
+    action: "text" | "voice";
     previousChannel: string | null;
     currentChannel: string | null;
 }
@@ -1599,7 +1637,7 @@ declare class Node$1 {
      * @param {TrackEndEvent} payload - The payload of the event emitted by the node.
      * @private
      */
-    protected trackEnd(player: Player, track: Track, payload: TrackEndEvent): Promise<void>;
+    trackEnd(player: Player, track: Track, payload: TrackEndEvent): Promise<void>;
     /**
      * Handles autoplay logic for a player.
      * This method is responsible for selecting an appropriate method of autoplay
@@ -1816,7 +1854,7 @@ declare class Node$1 {
 }
 
 /**
- * The main hub for interacting with Lavalink and using Magmastream,
+ * The main hub for interacting with Lavalink and using Magmastream.
  */
 declare class Manager extends EventEmitter {
     /** The map of players. */
@@ -2018,7 +2056,7 @@ declare class Manager extends EventEmitter {
      * @param player The Player instance to serialize
      * @returns The serialized Player instance
      */
-    serializePlayer(player: Player): Record<string, unknown>;
+    serializePlayer(player: Player): Promise<Record<string, unknown>>;
     /**
      * Checks for players that are no longer active and deletes their saved state files.
      * This is done to prevent stale state files from accumulating on the file system.
@@ -2931,4 +2969,4 @@ declare class OceanicManager extends Manager {
 }
 
 export { AutoPlayPlatform, AutoPlayUtils, AvailableFilters, DetritusManager, DiscordJSManager, ErisManager, Filters, LoadTypes, Manager, ManagerEventTypes, Node$1 as Node, OceanicManager, Player, PlayerStateEventTypes, Plugin$1 as Plugin, Queue, Rest, SearchPlatform, SeverityTypes, SponsorBlockSegment, StateStorageType, StateTypes, Structure, TrackEndReasonTypes, TrackPartial, TrackSourceTypes, TrackUtils, UseNodeOptions };
-export type { CPUStats, DiscordPacket, EndSpeakingEventVoiceReceiver, EndSpeakingEventVoiceReceiverData, EqualizerBand, ErrorOrEmptySearchResult, Exception, Extendable, FrameStats, IQueue, LavaPlayer, LavalinkInfo, LavalinkResponse, LoadType, Lyrics, LyricsEvent, LyricsEventType, LyricsFoundEvent, LyricsLine, LyricsLineEvent, LyricsNotFoundEvent, ManagerEvents, ManagerInitOptions, ManagerOptions, MemoryStats, NodeLinkGetLyrics, NodeLinkGetLyricsEmpty, NodeLinkGetLyricsError, NodeLinkGetLyricsMultiple, NodeLinkGetLyricsSingle, NodeMessage, NodeOptions, NodeStats, Payload, PlayOptions, PlayerEvent, PlayerEventType, PlayerEvents, PlayerOptions, PlayerStateUpdateEvent, PlayerUpdate, PlayerUpdateVoiceState, PlaylistData, PlaylistInfoData, PlaylistRawData, PlaylistSearchResult, RedisConfig, SearchQuery, SearchResult, SearchSearchResult, Severity, Sizes, SponsorBlockChapterStarted, SponsorBlockChaptersLoaded, SponsorBlockSegmentEventType, SponsorBlockSegmentEvents, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, StartSpeakingEventVoiceReceiver, StartSpeakingEventVoiceReceiverData, StateStorageOptions, Track, TrackData, TrackDataInfo, TrackEndEvent, TrackEndReason, TrackExceptionEvent, TrackPluginInfo, TrackSearchResult, TrackSourceName, TrackStartEvent, TrackStuckEvent, UseNodeOption, VoicePacket, VoiceReceiverEvent, VoiceServer, VoiceServerUpdate, VoiceState, WebSocketClosedEvent };
+export type { CPUStats, DiscordPacket, EndSpeakingEventVoiceReceiver, EndSpeakingEventVoiceReceiverData, EqualizerBand, ErrorOrEmptySearchResult, Exception, Extendable, FrameStats, IQueue, LavaPlayer, LavalinkInfo, LavalinkResponse, LoadType, Lyrics, LyricsEvent, LyricsEventType, LyricsFoundEvent, LyricsLine, LyricsLineEvent, LyricsNotFoundEvent, ManagerEvents, ManagerInitOptions, ManagerOptions, MemoryStats, NodeLinkGetLyrics, NodeLinkGetLyricsEmpty, NodeLinkGetLyricsError, NodeLinkGetLyricsMultiple, NodeLinkGetLyricsSingle, NodeMessage, NodeOptions, NodeStats, Payload, PlayOptions, PlayerEvent, PlayerEventType, PlayerEvents, PlayerOptions, PlayerStateChangeData, PlayerStateUpdateEvent, PlayerUpdate, PlayerUpdateVoiceState, PlaylistData, PlaylistInfoData, PlaylistRawData, PlaylistSearchResult, RedisConfig, SearchQuery, SearchResult, SearchSearchResult, Severity, Sizes, SponsorBlockChapterStarted, SponsorBlockChaptersLoaded, SponsorBlockSegmentEventType, SponsorBlockSegmentEvents, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, StartSpeakingEventVoiceReceiver, StartSpeakingEventVoiceReceiverData, StateStorageOptions, Track, TrackData, TrackDataInfo, TrackEndEvent, TrackEndReason, TrackExceptionEvent, TrackPluginInfo, TrackSearchResult, TrackSourceName, TrackStartEvent, TrackStuckEvent, UseNodeOption, VoicePacket, VoiceReceiverEvent, VoiceServer, VoiceServerUpdate, VoiceState, WebSocketClosedEvent };

package/dist/structures/Manager.js

@@ -14,7 +14,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const ioredis_1 = tslib_1.__importDefault(require("ioredis"));
 const Enums_1 = require("./Enums");
 /**
- * The main hub for interacting with Lavalink and using Magmastream,
+ * The main hub for interacting with Lavalink and using Magmastream.
  */
 class Manager extends events_1.EventEmitter {
     /** The map of players. */
@@ -394,7 +394,7 @@ class Manager extends events_1.EventEmitter {
                             console.warn(`Skipping save for inactive player: ${guildId}`);
                             return;
                         }
-                        const serializedPlayer = this.serializePlayer(player);
+                        const serializedPlayer = await this.serializePlayer(player);
                         await promises_1.default.writeFile(playerStateFilePath, JSON.stringify(serializedPlayer, null, 2), "utf-8");
                         this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Player state saved: ${guildId}`);
                     }
@@ -411,7 +411,7 @@ class Manager extends events_1.EventEmitter {
                             console.warn(`Skipping save for inactive player: ${guildId}`);
                             return;
                         }
-                        const serializedPlayer = this.serializePlayer(player);
+                        const serializedPlayer = await this.serializePlayer(player);
                         const redisKey = `${this.options.stateStorage.redisConfig.prefix?.endsWith(":")
                             ? this.options.stateStorage.redisConfig.prefix
                             : this.options.stateStorage.redisConfig.prefix ?? "magmastream:"}playerstore:${guildId}`;
@@ -491,39 +491,72 @@ class Manager extends events_1.EventEmitter {
                                     const tracks = [];
                                     const currentTrack = state.queue.current;
                                     const queueTracks = state.queue.tracks;
-                                    if (lavaPlayer) {
-                                        if (lavaPlayer.track) {
-                                            tracks.push(...queueTracks);
-                                            if (currentTrack && currentTrack.uri === lavaPlayer.track.info.uri) {
-                                                await player.queue.setCurrent(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester));
-                                            }
+                                    if (state.isAutoplay) {
+                                        Object.setPrototypeOf(state.data.clientUser, { constructor: { name: "User" } });
+                                        player.setAutoplay(true, state.data.clientUser, state.autoplayTries);
+                                    }
+                                    if (lavaPlayer?.track) {
+                                        // If lavaPlayer has a track, push all queue tracks
+                                        tracks.push(...queueTracks);
+                                        // Set current track if matches lavaPlayer's track URI
+                                        if (currentTrack && currentTrack.uri === lavaPlayer.track.info.uri) {
+                                            await player.queue.setCurrent(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester));
                                         }
-                                        else {
-                                            if (!currentTrack) {
-                                                const payload = {
-                                                    reason: Enums_1.TrackEndReasonTypes.Finished,
-                                                };
-                                                await node.queueEnd(player, currentTrack, payload);
-                                            }
-                                            else {
-                                                tracks.push(currentTrack, ...queueTracks);
-                                            }
+                                        // Add tracks to queue
+                                        if (tracks.length > 0) {
+                                            await player.queue.clear();
+                                            await player.queue.add(tracks);
                                         }
                                     }
                                     else {
-                                        if (!currentTrack) {
-                                            const payload = {
+                                        // LavaPlayer missing track or lavaPlayer is falsy
+                                        if (currentTrack) {
+                                            if (queueTracks.length > 0) {
+                                                tracks.push(...queueTracks);
+                                                await player.queue.clear();
+                                                await player.queue.add(tracks);
+                                            }
+                                            await node.trackEnd(player, currentTrack, {
                                                 reason: Enums_1.TrackEndReasonTypes.Finished,
-                                            };
-                                            await node.queueEnd(player, currentTrack, payload);
+                                                type: "TrackEndEvent",
+                                            });
                                         }
                                         else {
-                                            tracks.push(currentTrack, ...queueTracks);
+                                            // No current track, check previous queue for last track
+                                            const previousQueue = await player.queue.getPrevious();
+                                            const lastTrack = previousQueue?.at(-1);
+                                            if (lastTrack) {
+                                                if (queueTracks.length === 0) {
+                                                    // If no tracks in queue, end last track
+                                                    await node.trackEnd(player, lastTrack, {
+                                                        reason: Enums_1.TrackEndReasonTypes.Finished,
+                                                        type: "TrackEndEvent",
+                                                    });
+                                                }
+                                                else {
+                                                    // If there are queued tracks, add them
+                                                    tracks.push(...queueTracks);
+                                                    if (tracks.length > 0) {
+                                                        await player.queue.clear();
+                                                        await player.queue.add(tracks);
+                                                    }
+                                                }
+                                            }
+                                            else {
+                                                if (queueTracks.length > 0) {
+                                                    tracks.push(...queueTracks);
+                                                    if (tracks.length > 0) {
+                                                        await player.queue.clear();
+                                                        await player.queue.add(tracks);
+                                                    }
+                                                    await node.trackEnd(player, lastTrack, {
+                                                        reason: Enums_1.TrackEndReasonTypes.Finished,
+                                                        type: "TrackEndEvent",
+                                                    });
+                                                }
+                                            }
                                         }
                                     }
-                                    if (tracks.length > 0) {
-                                        await player.queue.add(tracks);
-                                    }
                                     if (state.queue.previous.length > 0) {
                                         await player.queue.addPrevious(state.queue.previous);
                                     }
@@ -543,10 +576,6 @@ class Manager extends events_1.EventEmitter {
                                     if (state.dynamicRepeat) {
                                         player.setDynamicRepeat(state.dynamicRepeat, state.dynamicLoopInterval._idleTimeout);
                                     }
-                                    if (state.isAutoplay) {
-                                        Object.setPrototypeOf(state.data.clientUser, { constructor: { name: "User" } });
-                                        player.setAutoplay(true, state.data.clientUser, state.autoplayTries);
-                                    }
                                     if (state.data) {
                                         for (const [name, value] of Object.entries(state.data)) {
                                             player.set(name, value);
@@ -661,39 +690,72 @@ class Manager extends events_1.EventEmitter {
                                     const tracks = [];
                                     const currentTrack = state.queue.current;
                                     const queueTracks = state.queue.tracks;
-                                    if (lavaPlayer) {
-                                        if (lavaPlayer.track) {
-                                            tracks.push(...queueTracks);
-                                            if (currentTrack && currentTrack.uri === lavaPlayer.track.info.uri) {
-                                                await player.queue.setCurrent(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester));
-                                            }
+                                    if (state.isAutoplay) {
+                                        Object.setPrototypeOf(state.data.clientUser, { constructor: { name: "User" } });
+                                        player.setAutoplay(true, state.data.clientUser, state.autoplayTries);
+                                    }
+                                    if (lavaPlayer?.track) {
+                                        // If lavaPlayer has a track, push all queue tracks
+                                        tracks.push(...queueTracks);
+                                        // Set current track if matches lavaPlayer's track URI
+                                        if (currentTrack && currentTrack.uri === lavaPlayer.track.info.uri) {
+                                            await player.queue.setCurrent(Utils_1.TrackUtils.build(lavaPlayer.track, currentTrack.requester));
                                         }
-                                        else {
-                                            if (!currentTrack) {
-                                                const payload = {
-                                                    reason: Enums_1.TrackEndReasonTypes.Finished,
-                                                };
-                                                await node.queueEnd(player, currentTrack, payload);
-                                            }
-                                            else {
-                                                tracks.push(currentTrack, ...queueTracks);
-                                            }
+                                        // Add tracks to queue
+                                        if (tracks.length > 0) {
+                                            await player.queue.clear();
+                                            await player.queue.add(tracks);
                                         }
                                     }
                                     else {
-                                        if (!currentTrack) {
-                                            const payload = {
+                                        // LavaPlayer missing track or lavaPlayer is falsy
+                                        if (currentTrack) {
+                                            if (queueTracks.length > 0) {
+                                                tracks.push(...queueTracks);
+                                                await player.queue.clear();
+                                                await player.queue.add(tracks);
+                                            }
+                                            await node.trackEnd(player, currentTrack, {
                                                 reason: Enums_1.TrackEndReasonTypes.Finished,
-                                            };
-                                            await node.queueEnd(player, currentTrack, payload);
+                                                type: "TrackEndEvent",
+                                            });
                                         }
                                         else {
-                                            tracks.push(currentTrack, ...queueTracks);
+                                            // No current track, check previous queue for last track
+                                            const previousQueue = await player.queue.getPrevious();
+                                            const lastTrack = previousQueue?.at(-1);
+                                            if (lastTrack) {
+                                                if (queueTracks.length === 0) {
+                                                    // If no tracks in queue, end last track
+                                                    await node.trackEnd(player, lastTrack, {
+                                                        reason: Enums_1.TrackEndReasonTypes.Finished,
+                                                        type: "TrackEndEvent",
+                                                    });
+                                                }
+                                                else {
+                                                    // If there are queued tracks, add them
+                                                    tracks.push(...queueTracks);
+                                                    if (tracks.length > 0) {
+                                                        await player.queue.clear();
+                                                        await player.queue.add(tracks);
+                                                    }
+                                                }
+                                            }
+                                            else {
+                                                if (queueTracks.length > 0) {
+                                                    tracks.push(...queueTracks);
+                                                    if (tracks.length > 0) {
+                                                        await player.queue.clear();
+                                                        await player.queue.add(tracks);
+                                                    }
+                                                    await node.trackEnd(player, lastTrack, {
+                                                        reason: Enums_1.TrackEndReasonTypes.Finished,
+                                                        type: "TrackEndEvent",
+                                                    });
+                                                }
+                                            }
                                         }
                                     }
-                                    if (tracks.length > 0) {
-                                        await player.queue.add(tracks);
-                                    }
                                     if (state.queue.previous.length > 0) {
                                         await player.queue.addPrevious(state.queue.previous);
                                     }
@@ -713,10 +775,6 @@ class Manager extends events_1.EventEmitter {
                                     if (state.dynamicRepeat) {
                                         player.setDynamicRepeat(state.dynamicRepeat, state.dynamicLoopInterval._idleTimeout);
                                     }
-                                    if (state.isAutoplay) {
-                                        Object.setPrototypeOf(state.data.clientUser, { constructor: { name: "User" } });
-                                        player.setAutoplay(true, state.data.clientUser, state.autoplayTries);
-                                    }
                                     if (state.data) {
                                         for (const [name, value] of Object.entries(state.data)) {
                                             player.set(name, value);
@@ -988,8 +1046,12 @@ class Manager extends events_1.EventEmitter {
      * @param player The Player instance to serialize
      * @returns The serialized Player instance
      */
-    serializePlayer(player) {
+    async serializePlayer(player) {
         const seen = new WeakSet();
+        // Fetch async queue data once before serializing
+        const current = await player.queue.getCurrent();
+        const tracks = Array.isArray(await player.queue.getTracks()) ? await player.queue.getTracks() : [];
+        const previous = Array.isArray(await player.queue.getPrevious()) ? await player.queue.getPrevious() : [];
         /**
          * Recursively serializes an object, avoiding circular references.
          * @param obj The object to serialize
@@ -1025,9 +1087,9 @@ class Manager extends events_1.EventEmitter {
             }
             if (key === "queue") {
                 return {
-                    current: value.current || null,
-                    tracks: Array.isArray(value) ? [...value] : [],
-                    previous: Array.isArray(value.previous) ? [...value.previous] : [],
+                    current,
+                    tracks,
+                    previous,
                 };
             }
             if (key === "data") {

package/dist/structures/Node.js

@@ -517,7 +517,8 @@ class Node {
             this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, player, {
                 changeType: Enums_1.PlayerStateEventTypes.TrackChange,
                 details: {
-                    changeType: "autoPlay",
+                    type: "track",
+                    action: "autoPlay",
                     track: track,
                 },
             });
@@ -526,7 +527,8 @@ class Node {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, player, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "start",
+                type: "track",
+                action: "start",
                 track: track,
             },
         });
@@ -593,7 +595,8 @@ class Node {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, player, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "end",
+                type: "track",
+                action: "end",
                 track: track,
             },
         });

package/dist/structures/Player.js

@@ -8,7 +8,6 @@ const Utils_1 = require("./Utils");
 const _ = tslib_1.__importStar(require("lodash"));
 const playerCheck_1 = tslib_1.__importDefault(require("../utils/playerCheck"));
 const RedisQueue_1 = require("./RedisQueue");
-// import { IQueue, Lyrics, PlayerOptions, PlayerUpdateVoiceState, PlayOptions, SearchQuery, SearchResult, Track, VoiceState } from "./Types";
 const Enums_1 = require("./Enums");
 const ws_1 = require("ws");
 class Player {
@@ -181,7 +180,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ConnectionChange,
             details: {
-                changeType: "connect",
+                type: "connection",
+                action: "connect",
                 previousConnection: oldPlayer?.state === Enums_1.StateTypes.Connected,
                 currentConnection: true,
             },
@@ -216,7 +216,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ConnectionChange,
             details: {
-                changeType: "disconnect",
+                type: "connection",
+                action: "disconnect",
                 previousConnection: oldPlayer.state === Enums_1.StateTypes.Connected,
                 currentConnection: false,
             },
@@ -231,7 +232,6 @@ class Player {
      * @emits {PlayerStateUpdate} - Emitted when the player state is updated.
      */
     async destroy(disconnect = true) {
-        const oldPlayer = this ? { ...this } : null;
         this.state = Enums_1.StateTypes.Destroying;
         if (disconnect) {
             await this.disconnect().catch((err) => {
@@ -244,9 +244,6 @@ class Player {
         await this.queue.clear();
         await this.queue.clearPrevious();
         await this.queue.setCurrent(null);
-        this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, null, {
-            changeType: Enums_1.PlayerStateEventTypes.PlayerDestroy,
-        });
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerDestroy, this);
         const deleted = this.manager.players.delete(this.guildId);
         return deleted;
@@ -270,7 +267,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ChannelChange,
             details: {
-                changeType: "voice",
+                type: "channel",
+                action: "voice",
                 previousChannel: oldPlayer.voiceChannelId || null,
                 currentChannel: this.voiceChannelId,
             },
@@ -299,7 +297,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ChannelChange,
             details: {
-                changeType: "text",
+                type: "channel",
+                action: "text",
                 previousChannel: oldPlayer.textChannelId || null,
                 currentChannel: this.textChannelId,
             },
@@ -378,6 +377,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.AutoPlayChange,
             details: {
+                type: "autoplay",
+                action: "toggle",
                 previousAutoplay: oldPlayer.isAutoplay,
                 currentAutoplay: this.isAutoplay,
             },
@@ -410,17 +411,19 @@ class Player {
         if (volume < 0 || volume > 1000)
             throw new RangeError("Volume must be between 0 and 1000.");
         const oldVolume = this.volume;
+        const oldPlayer = { ...this };
         await this.node.rest.updatePlayer({
             guildId: this.options.guildId,
             data: { volume },
         });
         this.volume = volume;
-        this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, {
+        this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.VolumeChange,
             details: {
+                type: "volume",
+                action: "adjust",
                 previousVolume: oldVolume,
                 currentVolume: this.volume,
-                isGradual: false,
             },
         });
         return this;
@@ -477,8 +480,9 @@ class Player {
         // Emit an event indicating the repeat mode has changed
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.RepeatChange,
-            detail: {
-                changeType: "track",
+            details: {
+                type: "repeat",
+                action: "track",
                 previousRepeat: this.getRepeatState(oldPlayer),
                 currentRepeat: this.getRepeatState(this),
             },
@@ -511,8 +515,9 @@ class Player {
         // Emit the player state update event
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.RepeatChange,
-            detail: {
-                changeType: "queue",
+            details: {
+                type: "repeat",
+                action: "queue",
                 previousRepeat: this.getRepeatState(oldPlayer),
                 currentRepeat: this.getRepeatState(this),
             },
@@ -567,8 +572,9 @@ class Player {
         // Emit a player state update event
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.RepeatChange,
-            detail: {
-                changeType: "dynamic",
+            details: {
+                type: "repeat",
+                action: "dynamic",
                 previousRepeat: this.getRepeatState(oldPlayer),
                 currentRepeat: this.getRepeatState(this),
             },
@@ -622,7 +628,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "remove",
+                type: "queue",
+                action: "remove",
                 tracks: removedTracks,
             },
         });
@@ -657,6 +664,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.PauseChange,
             details: {
+                type: "pause",
+                action: "pause",
                 previousPause: oldPlayer.paused,
                 currentPause: this.paused,
             },
@@ -684,7 +693,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "previous",
+                type: "track",
+                action: "previous",
                 track: lastTrack,
             },
         });
@@ -724,7 +734,8 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.TrackChange,
             details: {
-                changeType: "timeUpdate",
+                type: "track",
+                action: "timeUpdate",
                 previousTime: oldPlayer.position,
                 currentTime: this.position,
             },

package/dist/structures/Queue.js

@@ -137,7 +137,8 @@ class Queue extends Array {
                     this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                         changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                         details: {
-                            changeType: "autoPlayAdd",
+                            type: "queue",
+                            action: "autoPlayAdd",
                             tracks: Array.isArray(track) ? track : [track],
                         },
                     });
@@ -149,7 +150,8 @@ class Queue extends Array {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "add",
+                type: "queue",
+                action: "add",
                 tracks: Array.isArray(track) ? track : [track],
             },
         });
@@ -169,7 +171,8 @@ class Queue extends Array {
             this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                 changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                 details: {
-                    changeType: "remove",
+                    type: "queue",
+                    action: "remove",
                     tracks: removedTracks,
                 },
             });
@@ -183,7 +186,8 @@ class Queue extends Array {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "remove",
+                type: "queue",
+                action: "remove",
                 tracks: tracksToEmit,
             },
         });
@@ -202,7 +206,8 @@ class Queue extends Array {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "clear",
+                type: "queue",
+                action: "clear",
                 tracks: [], // No tracks are left after clearing
             },
         });
@@ -225,7 +230,8 @@ class Queue extends Array {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "shuffle",
+                type: "queue",
+                action: "shuffle",
             },
         });
         // Emit a debug message indicating the queue has been shuffled for a specific guild ID.
@@ -265,7 +271,8 @@ class Queue extends Array {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "userBlock",
+                type: "queue",
+                action: "userBlock",
             },
         });
         // Emit a debug message indicating the queue has been shuffled for a specific guild ID.
@@ -315,7 +322,8 @@ class Queue extends Array {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "roundRobin",
+                type: "queue",
+                action: "roundRobin",
             },
         });
         // Emit a debug message indicating the queue has been shuffled for a specific guild ID.

package/dist/structures/RedisQueue.js

@@ -101,7 +101,8 @@ class RedisQueue {
                     this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
                         changeType: Enums_1.PlayerStateEventTypes.QueueChange,
                         details: {
-                            changeType: "autoPlayAdd",
+                            type: "queue",
+                            action: "autoPlayAdd",
                             tracks: Array.isArray(track) ? track : [track],
                         },
                     });
@@ -112,7 +113,8 @@ class RedisQueue {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "add",
+                type: "queue",
+                action: "add",
                 tracks,
             },
         });
@@ -140,7 +142,8 @@ class RedisQueue {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "remove",
+                type: "queue",
+                action: "remove",
                 tracks: deserialized,
             },
         });
@@ -152,7 +155,8 @@ class RedisQueue {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
             details: {
-                changeType: "clear",
+                type: "queue",
+                action: "clear",
                 tracks: [],
             },
         });
@@ -192,7 +196,10 @@ class RedisQueue {
         }
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
-            details: { changeType: "shuffle" },
+            details: {
+                type: "queue",
+                action: "shuffle",
+            },
         });
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[QUEUE] Shuffled the queue for: ${this.guildId}`);
     }
@@ -219,7 +226,10 @@ class RedisQueue {
         await this.redis.rpush(this.queueKey, ...shuffledQueue.map(this.serialize));
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
-            details: { changeType: "userBlock" },
+            details: {
+                type: "queue",
+                action: "userBlock",
+            },
         });
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[QUEUE] userBlockShuffled the queue for: ${this.guildId}`);
     }
@@ -255,7 +265,10 @@ class RedisQueue {
         await this.redis.rpush(this.queueKey, ...shuffledQueue.map(this.serialize));
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this.manager.players.get(this.guildId), {
             changeType: Enums_1.PlayerStateEventTypes.QueueChange,
-            details: { changeType: "roundRobin" },
+            details: {
+                type: "queue",
+                action: "roundRobin",
+            },
         });
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[QUEUE] roundRobinShuffled the queue for: ${this.guildId}`);
     }

package/package.json

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