magmastream 2.6.0-beta.2 → 2.6.0-beta.3

package/README.md

@@ -1,15 +1,11 @@
-<center><img src="https://capsule-render.vercel.app/api?type=waving&color=gradient&height=200&section=header&text=Magmastream&fontSize=80&fontAlignY=35&animation=twinkling&fontColor=gradient" /></center>
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-0-orange.svg?style=flat-square)](#contributors-)
+<p align="center">
+  <img src="https://capsule-render.vercel.app/api?type=waving&color=gradient&height=200&section=header&text=Magmastream&fontSize=80&fontAlignY=35&animation=twinkling&fontColor=gradient" />
+</p>
+
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-0-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
-[![License](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/Magmastream-NPM/magmastream/blob/main/LICENSE)
-[![Contributions Welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](https://github.com/Magmastream-NPM/magmastream/pulls)
-![GitHub Stars](https://img.shields.io/github/stars/Magmastream-NPM/magmastream.svg)
-[![Issues](https://img.shields.io/github/issues/Magmastream-NPM/magmastream.svg)](https://github.com/Magmastream-NPM/magmastream/issues)
-[![Pull Requests](https://img.shields.io/github/issues-pr/Magmastream-NPM/magmastream.svg)](https://github.com/Magmastream-NPM/magmastream/pulls)
-[![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/Magmastream-NPM)
-[![npm](https://img.shields.io/npm/dw/magmastream)](https://www.npmjs.com/package/magmastream)
 
 **Magmastream** a lavalink wrapper for NodeJs. Magmastream only supports lavalink version 4.
 
@@ -55,12 +51,12 @@ If you want to add your own bot create a pull request with your bot added. Pleas
 
 Special thanks to the all the contributors who have helped make Magmastream even better!
 
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ## Credits

package/dist/index.d.ts

@@ -133,6 +133,11 @@ declare class Queue extends Array<Track | UnresolvedTrack> {
     current: Track | UnresolvedTrack | null;
     /** The previous track */
     previous: Track | UnresolvedTrack | null;
+    /** The Manager instance. */
+    manager: Manager;
+    /** The guild property. */
+    guild: string;
+    constructor(guild: string, manager: Manager);
     /**
      * Adds a track to the queue.
      * @param track
@@ -224,7 +229,7 @@ declare class Player {
      * @param query
      * @param requester
      */
-    search(query: string | SearchQuery, requester?: User | ClientUser): Promise<SearchResult>;
+    search<T = User | ClientUser>(query: string | SearchQuery, requester?: T): Promise<SearchResult>;
     /** Connect to the voice channel. */
     connect(): this;
     /** Disconnect from the voice channel. */
@@ -242,7 +247,7 @@ declare class Player {
      */
     setTextChannel(channel: string): this;
     /** Sets the now playing message. */
-    setNowPlayingMessage(message: Message): Message;
+    setNowPlayingMessage<T = Message>(message: T): Message;
     /** Plays the next track. */
     play(): Promise<void>;
     /**
@@ -272,7 +277,7 @@ declare class Player {
      * @param track
      * @param requester
      */
-    getRecommended(track: Track, requester?: User | ClientUser): Promise<Track[]>;
+    getRecommended<T = User | ClientUser>(track: Track, requester?: T): Promise<Track[]>;
     /**
      * Sets the player volume.
      * @param volume
@@ -367,7 +372,7 @@ interface Track {
     /** The thumbnail of the track or null if it's a unsupported source. */
     readonly thumbnail: string | null;
     /** The user that requested the track. */
-    readonly requester: User | ClientUser | null;
+    readonly requester?: User | ClientUser;
     /** Displays the track thumbnail with optional size or null if it's a unsupported source. */
     displayThumbnail(size?: Sizes): string;
     /** Additional track info provided by plugins. */
@@ -431,6 +436,8 @@ declare class Rest {
     updatePlayer(options: playOptions): Promise<unknown>;
     /** Sends a DELETE request to the server to destroy the player. */
     destroyPlayer(guildId: string): Promise<unknown>;
+    /** Updates the session status for resuming. */
+    updateSession(resuming: boolean, timeout: number): Promise<unknown>;
     private request;
     get(endpoint: string): Promise<unknown>;
     patch(endpoint: string, body: unknown): Promise<unknown>;
@@ -497,6 +504,12 @@ declare class Node {
      * @param options
      */
     constructor(options: NodeOptions);
+    /** Creates the sessionIds.json file if it doesn't exist. */
+    createSessionIdsFile(): void;
+    /** Loads session IDs from the sessionIds.json file. */
+    loadSessionIds(): void;
+    /** Updates the session ID in the sessionIds.json file. */
+    updateSessionId(): void;
     /** Connects to the Node. */
     connect(): void;
     /** Destroys the Node and all players connected with it. */
@@ -665,13 +678,13 @@ declare abstract class TrackUtils {
      * @param data
      * @param requester
      */
-    static build(data: TrackData, requester?: User | ClientUser): Track;
+    static build<T = User | ClientUser>(data: TrackData, requester?: T): Track;
     /**
      * Builds a UnresolvedTrack to be resolved before being played  .
      * @param query
      * @param requester
      */
-    static buildUnresolved(query: string | UnresolvedQuery, requester?: User | ClientUser): UnresolvedTrack;
+    static buildUnresolved<T = User | ClientUser>(query: string | UnresolvedQuery, requester?: T): UnresolvedTrack;
     static getClosestTrack(unresolvedTrack: UnresolvedTrack): Promise<Track>;
 }
 /** Gets or extends structures to extend the built in, or already extended, classes to add more functionality. */
@@ -862,6 +875,16 @@ declare class Manager extends EventEmitter {
     /** The options that were set. */
     readonly options: ManagerOptions;
     private initiated;
+    /** Loads player states from the JSON file. */
+    loadPlayerStates(nodeId: string): void;
+    /** Gets each player's JSON file */
+    private getPlayerFilePath;
+    /** Saves player states to the JSON file. */
+    savePlayerState(guildId: string): void;
+    /** Serializes a Player instance to avoid circular references. */
+    private serializePlayer;
+    /** Check for players that are no longer active */
+    private cleanupInactivePlayers;
     /** Returns the nodes that has the least load. */
     private get leastLoadNode();
     /** Returns the nodes that has the least amount of players. */
@@ -870,6 +893,18 @@ declare class Manager extends EventEmitter {
     private get priorityNode();
     /** Returns the node to use. */
     get useableNodes(): Node;
+    /** work in progress */
+    private lastProcessedGuilds;
+    private lastSaveTimes;
+    private saveInterval;
+    private saveQueues;
+    /** Register savePlayerStates events */
+    private registerPlayerStateEvents;
+    private handleEvent;
+    /** Queues a player state save */
+    private queuePlayerStateSave;
+    /** Processes the next queued save for a specific guild */
+    private processNextQueue;
     /**
      * Initiates the Manager class.
      * @param options
@@ -886,7 +921,7 @@ declare class Manager extends EventEmitter {
      * @param requester
      * @returns The search result.
      */
-    search(query: string | SearchQuery, requester?: User | ClientUser): Promise<SearchResult>;
+    search<T = User | ClientUser>(query: string | SearchQuery, requester?: T): Promise<SearchResult>;
     private parseYouTubeTitle;
     private balanceBrackets;
     private escapeRegExp;
@@ -970,6 +1005,7 @@ interface ManagerOptions {
     send(id: string, payload: Payload): void;
 }
 type SearchPlatform = "deezer" | "soundcloud" | "youtube music" | "youtube" | "spotify" | "jiosaavn" | "tidal" | "applemusic" | "bandcamp";
+type PlayerStateEventType = "connectionChange" | "playerCreate" | "playerDestroy" | "channelChange" | "volumeChange" | "pauseChange" | "queueChange" | "trackChange" | "repeatChange" | "autoplayChange";
 interface SearchQuery {
     /** The source to search from. */
     source?: SearchPlatform | string;
@@ -1019,7 +1055,7 @@ interface ManagerEvents {
     nodeRaw: [payload: unknown];
     playerCreate: [player: Player];
     playerDestroy: [player: Player];
-    playerStateUpdate: [oldPlayer: Player, newPlayer: Player];
+    playerStateUpdate: [oldPlayer: Player, newPlayer: Player, changeType: PlayerStateEventType];
     playerMove: [player: Player, initChannel: string, newChannel: string];
     playerDisconnect: [player: Player, oldChannel: string];
     queueEnd: [player: Player, track: Track | UnresolvedTrack, payload: TrackEndEvent];
@@ -1034,4 +1070,4 @@ interface ManagerEvents {
     chaptersLoaded: [player: Player, track: Track | UnresolvedTrack, payload: SponsorBlockChaptersLoaded];
 }
 
-export { type CPUStats, type EqualizerBand, type Exception, type Extendable, type FrameStats, type LavalinkInfo, type LavalinkResponse, type LoadType, Manager, type ManagerEvents, type ManagerOptions, type MemoryStats, Node, type NodeMessage, type NodeOptions, type NodeStats, type Payload, type PlayOptions, Player, type PlayerEvent, type PlayerEventType, type PlayerEvents, type PlayerOptions, type PlayerUpdate, type PlaylistData, type PlaylistRawData, Plugin, Queue, type SearchPlatform, type SearchQuery, type SearchResult, type Severity, type Sizes, type SponsorBlockChapterStarted, type SponsorBlockChaptersLoaded, type SponsorBlockSegment, type SponsorBlockSegmentEventType, type SponsorBlockSegmentEvents, type SponsorBlockSegmentSkipped, type SponsorBlockSegmentsLoaded, type State, Structure, type Track, type TrackData, type TrackDataInfo, type TrackEndEvent, type TrackEndReason, type TrackExceptionEvent, type TrackPluginInfo, type TrackSourceName, type TrackStartEvent, type TrackStuckEvent, TrackUtils, type UnresolvedQuery, type UnresolvedTrack, type VoicePacket, type VoiceServer, type VoiceState, type WebSocketClosedEvent, validSponsorBlocks };
+export { type CPUStats, type EqualizerBand, type Exception, type Extendable, type FrameStats, type LavalinkInfo, type LavalinkResponse, type LoadType, Manager, type ManagerEvents, type ManagerOptions, type MemoryStats, Node, type NodeMessage, type NodeOptions, type NodeStats, type Payload, type PlayOptions, Player, type PlayerEvent, type PlayerEventType, type PlayerEvents, type PlayerOptions, type PlayerStateEventType, type PlayerUpdate, type PlaylistData, type PlaylistRawData, Plugin, Queue, type SearchPlatform, type SearchQuery, type SearchResult, type Severity, type Sizes, type SponsorBlockChapterStarted, type SponsorBlockChaptersLoaded, type SponsorBlockSegment, type SponsorBlockSegmentEventType, type SponsorBlockSegmentEvents, type SponsorBlockSegmentSkipped, type SponsorBlockSegmentsLoaded, type State, Structure, type Track, type TrackData, type TrackDataInfo, type TrackEndEvent, type TrackEndReason, type TrackExceptionEvent, type TrackPluginInfo, type TrackSourceName, type TrackStartEvent, type TrackStuckEvent, TrackUtils, type UnresolvedQuery, type UnresolvedTrack, type VoicePacket, type VoiceServer, type VoiceState, type WebSocketClosedEvent, validSponsorBlocks };

package/dist/structures/Manager.js

@@ -8,6 +8,8 @@ const collection_1 = require("@discordjs/collection");
 const events_1 = require("events");
 const managerCheck_1 = tslib_1.__importDefault(require("../utils/managerCheck"));
 const blockedWords_1 = require("../config/blockedWords");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
 /**
  * The main hub for interacting with Lavalink and using Magmastream,
  */
@@ -33,6 +35,136 @@ class Manager extends events_1.EventEmitter {
     /** The options that were set. */
     options;
     initiated = false;
+    /** Loads player states from the JSON file. */
+    loadPlayerStates(nodeId) {
+        const createTrackData = (song) => ({
+            encoded: song.track,
+            info: {
+                identifier: song.identifier,
+                isSeekable: song.isSeekable,
+                author: song.author,
+                length: song.duration,
+                isrc: song.isrc,
+                isStream: song.isStream,
+                title: song.title,
+                uri: song.uri,
+                artworkUrl: song.artworkUrl,
+                sourceName: song.sourceName,
+            },
+            pluginInfo: song.pluginInfo,
+        });
+        const playerStatesDir = path_1.default.join(process.cwd(), "node_modules", "magmastream", "dist", "sessionData", "players");
+        if (!fs_1.default.existsSync(playerStatesDir)) {
+            fs_1.default.mkdirSync(playerStatesDir, { recursive: true });
+            console.log(`Created directory at ${playerStatesDir}`);
+        }
+        const playerFiles = fs_1.default.readdirSync(playerStatesDir);
+        for (const file of playerFiles) {
+            const filePath = path_1.default.join(playerStatesDir, file);
+            const data = fs_1.default.readFileSync(filePath, "utf-8");
+            const state = JSON.parse(data);
+            if (state && typeof state === "object" && state.guild && state.node.options.identifier === nodeId) {
+                const playerOptions = {
+                    guild: state.options.guild,
+                    textChannel: state.options.textChannel,
+                    voiceChannel: state.options.voiceChannel,
+                    selfDeafen: state.options.selfDeafen,
+                    volume: state.options.volume,
+                };
+                this.create(playerOptions);
+            }
+            const player = this.get(state.options.guild);
+            const tracks = [];
+            if (state.queue.current !== null) {
+                const currentTrack = state.queue.current;
+                tracks.push(Utils_1.TrackUtils.build(createTrackData(currentTrack), currentTrack.requester));
+                for (const key in state.queue) {
+                    if (!isNaN(Number(key)) && key !== "current" && key !== "previous" && key !== "manager") {
+                        const song = state.queue[key];
+                        tracks.push(Utils_1.TrackUtils.build(createTrackData(song), song.requester));
+                    }
+                }
+                player.queue.add(tracks);
+            }
+            if (state.paused)
+                player.pause(true);
+            player.setTrackRepeat(state.trackRepeat);
+            player.setQueueRepeat(state.queueRepeat);
+            if (state.dynamicRepeat) {
+                player.setDynamicRepeat(state.dynamicRepeat, state.dynamicLoopInterval._idleTimeout);
+            }
+            if (state.isAutoplay) {
+                player.setAutoplay(state.isAutoplay, state.data.Internal_BotUser);
+            }
+            console.log(`Loaded player state for ${state.options.guild}.`);
+        }
+        console.log("Loaded player states from player files.");
+    }
+    /** Gets each player's JSON file */
+    getPlayerFilePath(guildId) {
+        const playerStateFilePath = path_1.default.join(process.cwd(), "node_modules", "magmastream", "dist", "sessionData", "players", `${guildId}.json`);
+        const configDir = path_1.default.dirname(playerStateFilePath);
+        if (!fs_1.default.existsSync(configDir)) {
+            fs_1.default.mkdirSync(configDir, { recursive: true });
+            console.log(`Created directory at: ${configDir}`);
+        }
+        return playerStateFilePath;
+    }
+    /** Saves player states to the JSON file. */
+    savePlayerState(guildId) {
+        const playerStateFilePath = this.getPlayerFilePath(guildId);
+        const player = this.players.get(guildId);
+        if (!player || player.state === "DISCONNECTED" || !player.voiceChannel)
+            return this.cleanupInactivePlayers();
+        const serializedPlayer = this.serializePlayer(player);
+        fs_1.default.writeFileSync(playerStateFilePath, JSON.stringify(serializedPlayer, null, 2), "utf-8");
+        console.log(`Saved ${guildId} player state to: ${playerStateFilePath}`);
+    }
+    /** Serializes a Player instance to avoid circular references. */
+    serializePlayer(player) {
+        const seen = new WeakSet();
+        const serialize = (obj) => {
+            if (obj && typeof obj === "object") {
+                if (seen.has(obj))
+                    return; // Prevent circular references
+                seen.add(obj);
+            }
+            return obj;
+        };
+        const serializedPlayer = JSON.parse(JSON.stringify(player, (key, value) => {
+            if (key === "filters" || key === "manager") {
+                return null;
+            }
+            if (key === "queue") {
+                return {
+                    ...value,
+                    current: value.current || null,
+                };
+            }
+            // return value === undefined ? null : serialize(value);
+            return serialize(value);
+        }));
+        return serializedPlayer;
+    }
+    /** Check for players that are no longer active */
+    cleanupInactivePlayers() {
+        const playerStatesDir = path_1.default.join(process.cwd(), "node_modules", "magmastream", "dist", "sessionData", "players");
+        // Create the directory if it does not exist
+        if (!fs_1.default.existsSync(playerStatesDir)) {
+            fs_1.default.mkdirSync(playerStatesDir, { recursive: true });
+            console.log(`Created directory at ${playerStatesDir}`);
+        }
+        const playerFiles = fs_1.default.readdirSync(playerStatesDir);
+        const activeGuildIds = new Set(this.players.keys());
+        for (const file of playerFiles) {
+            const guildId = path_1.default.basename(file, ".json");
+            if (!activeGuildIds.has(guildId)) {
+                const filePath = path_1.default.join(playerStatesDir, file);
+                fs_1.default.unlinkSync(filePath);
+                console.log(`Deleted inactive player state file: ${filePath}`);
+            }
+        }
+    }
     /** Returns the nodes that has the least load. */
     get leastLoadNode() {
         return this.nodes
@@ -69,12 +201,74 @@ class Manager extends events_1.EventEmitter {
     get useableNodes() {
         return this.options.usePriority ? this.priorityNode : this.options.useNode === "leastLoad" ? this.leastLoadNode.first() : this.leastPlayersNode.first();
     }
+    /** work in progress */
+    lastProcessedGuilds = new Set();
+    lastSaveTimes = new Map();
+    saveInterval = 1000;
+    saveQueues = new Map();
+    /** Register savePlayerStates events */
+    registerPlayerStateEvents() {
+        const events = ["playerStateUpdate", "playerDestroy"];
+        for (const event of events) {
+            this.on(event, (player) => this.handleEvent(event, player));
+        }
+    }
+    handleEvent(event, player) {
+        switch (event) {
+            case "playerDestroy":
+                this.lastSaveTimes.delete(player.guild);
+                this.players.delete(player.guild);
+                this.cleanupInactivePlayers();
+                break;
+            case "playerStateUpdate":
+                this.queuePlayerStateSave(player);
+                break;
+            default:
+                this.savePlayerState(player.guild);
+                break;
+        }
+    }
+    /** Queues a player state save */
+    queuePlayerStateSave(player) {
+        const guildId = player.guild;
+        // If the current guild is not being processed, save immediately
+        if (!this.lastProcessedGuilds.has(guildId)) {
+            this.lastProcessedGuilds.add(guildId);
+            this.savePlayerState(guildId);
+            setTimeout(() => {
+                this.lastProcessedGuilds.delete(guildId);
+                this.processNextQueue(guildId);
+            }, this.saveInterval);
+        }
+        else {
+            if (!this.saveQueues.has(guildId)) {
+                this.saveQueues.set(guildId, []);
+            }
+            this.saveQueues.get(guildId).push(player);
+        }
+    }
+    /** Processes the next queued save for a specific guild */
+    processNextQueue(guildId) {
+        const queue = this.saveQueues.get(guildId);
+        if (queue && queue.length > 0) {
+            const player = queue.shift();
+            this.savePlayerState(player.guild);
+            if (queue.length === 0) {
+                this.saveQueues.delete(guildId);
+            }
+            setTimeout(() => this.processNextQueue(guildId), this.saveInterval);
+        }
+        else {
+            this.lastProcessedGuilds.delete(guildId);
+        }
+    }
     /**
      * Initiates the Manager class.
      * @param options
      */
     constructor(options) {
         super();
+        this.registerPlayerStateEvents();
         (0, managerCheck_1.default)(options);
         Utils_1.Structure.get("Player").init(this);
         Utils_1.Structure.get("Node").init(this);
@@ -316,6 +510,7 @@ class Manager extends events_1.EventEmitter {
      */
     destroy(guild) {
         this.players.delete(guild);
+        this.cleanupInactivePlayers();
     }
     /**
      * Creates a node or returns one if it already exists.

package/dist/structures/Node.js

@@ -6,7 +6,16 @@ const Utils_1 = require("./Utils");
 const Rest_1 = require("./Rest");
 const nodeCheck_1 = tslib_1.__importDefault(require("../utils/nodeCheck"));
 const ws_1 = tslib_1.__importDefault(require("ws"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
 exports.validSponsorBlocks = ["sponsor", "selfpromo", "interaction", "intro", "outro", "preview", "music_offtopic", "filler"];
+const sessionIdsFilePath = path_1.default.join(process.cwd(), "node_modules", "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 });
+    console.log(`Created directory at ${configDir}`);
+}
 class Node {
     options;
     /** The socket for the node. */
@@ -88,6 +97,29 @@ class Node {
         this.manager.nodes.set(this.options.identifier, this);
         this.manager.emit("nodeCreate", this);
         this.rest = new Rest_1.Rest(this);
+        this.createSessionIdsFile(); // Create the session IDs file on initialization
+        this.loadSessionIds(); // Load session IDs on initialization
+    }
+    /** Creates the sessionIds.json file if it doesn't exist. */
+    createSessionIdsFile() {
+        if (!fs_1.default.existsSync(sessionIdsFilePath)) {
+            fs_1.default.writeFileSync(sessionIdsFilePath, JSON.stringify({}), "utf-8");
+            console.log(`Created sessionIds.json at ${sessionIdsFilePath}`);
+        }
+    }
+    /** Loads session IDs from the sessionIds.json file. */
+    loadSessionIds() {
+        if (fs_1.default.existsSync(sessionIdsFilePath)) {
+            const sessionIdsData = fs_1.default.readFileSync(sessionIdsFilePath, "utf-8");
+            sessionIdsMap = new Map(Object.entries(JSON.parse(sessionIdsData)));
+            console.log(`Loaded session IDs from JSON file`);
+        }
+    }
+    /** Updates the session ID in the sessionIds.json file. */
+    updateSessionId() {
+        sessionIdsMap.set(this.options.identifier, this.sessionId); // Store session ID
+        fs_1.default.writeFileSync(sessionIdsFilePath, JSON.stringify(Object.fromEntries(sessionIdsMap))); // Update JSON file
+        console.log(`Updated session ID for ${this.options.identifier} to ${this.sessionId}`);
     }
     /** Connects to the Node. */
     connect() {
@@ -101,6 +133,11 @@ class Node {
         if (this.sessionId) {
             headers["Session-Id"] = this.sessionId;
         }
+        else if (this.options.resumeStatus && sessionIdsMap.has(this.options.identifier)) {
+            this.sessionId = sessionIdsMap.get(this.options.identifier) || null;
+            headers["Session-Id"] = this.sessionId;
+            console.log(`Resuming session with ID: ${this.sessionId}`);
+        }
         this.socket = new ws_1.default(`ws${this.options.secure ? "s" : ""}://${this.address}/v4/websocket`, { headers });
         this.socket.on("open", this.open.bind(this));
         this.socket.on("close", this.close.bind(this));
@@ -177,7 +214,14 @@ class Node {
             case "ready":
                 this.rest.setSessionId(payload.sessionId);
                 this.sessionId = payload.sessionId;
+                this.updateSessionId(); // Call to update session ID
                 this.info = await this.fetchInfo();
+                // Log if the session was resumed successfully
+                if (payload.resumed) {
+                    console.log(`Session resumed successfully for ${this.options.identifier}`);
+                    // Load player states from the JSON file
+                    await this.manager.loadPlayerStates(this.options.identifier);
+                }
                 if (this.options.resumeStatus) {
                     this.rest.patch(`/v4/sessions/${this.sessionId}`, {
                         resuming: this.options.resumeStatus,
@@ -237,12 +281,15 @@ class Node {
         }
     }
     trackStart(player, track, payload) {
+        const oldPlayer = player;
         player.playing = true;
         player.paused = false;
         this.manager.emit("trackStart", player, track, payload);
+        this.manager.emit("playerStateUpdate", oldPlayer, player, "trackChange");
     }
     async trackEnd(player, track, payload) {
         const { reason } = payload;
+        const oldPlayer = player;
         // If the track failed to load or was cleaned up
         if (["loadFailed", "cleanup"].includes(reason)) {
             this.handleFailedTrack(player, track, payload);
@@ -264,6 +311,7 @@ class Node {
         else {
             await this.queueEnd(player, track, payload);
         }
+        this.manager.emit("playerStateUpdate", oldPlayer, player, "trackChange");
     }
     extractSpotifyTrackID(url) {
         const regex = /https:\/\/open\.spotify\.com\/track\/([a-zA-Z0-9]+)/;

package/dist/structures/Player.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Player = void 0;
 const tslib_1 = require("tslib");
 const Filters_1 = require("./Filters");
+const Queue_1 = require("./Queue");
 const Utils_1 = require("./Utils");
 const _ = tslib_1.__importStar(require("lodash"));
 const playerCheck_1 = tslib_1.__importDefault(require("../utils/playerCheck"));
 class Player {
     options;
     /** The Queue for the Player. */
-    queue = new (Utils_1.Structure.get("Queue"))();
+    queue;
     /** The filters applied to the audio. */
     filters;
     /** Whether the queue repeats the track. */
@@ -95,6 +96,8 @@ class Player {
         this.node = node || this.manager.useableNodes;
         if (!this.node)
             throw new RangeError("No available nodes.");
+        // Initialize the queue with guild and manager
+        this.queue = new Queue_1.Queue(this.guild, this.manager);
         this.manager.players.set(options.guild, this);
         this.manager.emit("playerCreate", this);
         this.setVolume(options.volume ?? 100);
@@ -124,7 +127,7 @@ class Player {
             },
         });
         this.state = "CONNECTED";
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "connectionChange");
         return this;
     }
     /** Disconnect from the voice channel. */
@@ -145,11 +148,12 @@ class Player {
         });
         this.voiceChannel = null;
         this.state = "DISCONNECTED";
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "connectionChange");
         return this;
     }
     /** Destroys the player. */
     destroy(disconnect = true) {
+        const oldPlayer = { ...this };
         this.state = "DESTROYING";
         if (disconnect) {
             this.disconnect();
@@ -157,6 +161,7 @@ class Player {
         this.node.rest.destroyPlayer(this.guild);
         this.manager.emit("playerDestroy", this);
         this.manager.players.delete(this.guild);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "playerDestroy");
     }
     /**
      * Sets the player voice channel.
@@ -168,7 +173,7 @@ class Player {
         const oldPlayer = { ...this };
         this.voiceChannel = channel;
         this.connect();
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "channelChange");
         return this;
     }
     /**
@@ -180,7 +185,7 @@ class Player {
             throw new TypeError("Channel must be a non-empty string.");
         const oldPlayer = { ...this };
         this.textChannel = channel;
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "channelChange");
         return this;
     }
     /** Sets the now playing message. */
@@ -188,7 +193,8 @@ class Player {
         if (!message) {
             throw new TypeError("You must provide the message of the now playing message.");
         }
-        return (this.nowPlayingMessage = message);
+        this.nowPlayingMessage = message;
+        return this.nowPlayingMessage;
     }
     async play(optionsOrTrack, playOptions) {
         if (typeof optionsOrTrack !== "undefined" && Utils_1.TrackUtils.validate(optionsOrTrack)) {
@@ -238,7 +244,7 @@ class Player {
         const oldPlayer = { ...this };
         this.isAutoplay = autoplayState;
         this.set("Internal_BotUser", botUser);
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "autoplayChange");
         return this;
     }
     /**
@@ -326,7 +332,7 @@ class Player {
             },
         });
         this.volume = volume;
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "volumeChange");
         return this;
     }
     /**
@@ -366,7 +372,7 @@ class Player {
             this.queueRepeat = false;
             this.dynamicRepeat = false;
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "repeatChange");
         return this;
     }
     /**
@@ -387,7 +393,7 @@ class Player {
             this.queueRepeat = false;
             this.dynamicRepeat = false;
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "repeatChange");
         return this;
     }
     /**
@@ -423,7 +429,7 @@ class Player {
             this.queueRepeat = false;
             this.dynamicRepeat = false;
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "repeatChange");
         return this;
     }
     /** Restarts the current track to the start. */
@@ -455,7 +461,7 @@ class Player {
                 encodedTrack: null,
             },
         });
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChange");
         return this;
     }
     /**
@@ -476,7 +482,7 @@ class Player {
                 paused: pause,
             },
         });
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "pauseChange");
         return this;
     }
     /** Go back to the previous song. */
@@ -484,7 +490,7 @@ class Player {
         const oldPlayer = { ...this };
         this.queue.unshift(this.queue.previous);
         this.stop();
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChange");
         return this;
     }
     /**
@@ -508,7 +514,7 @@ class Player {
                 position: position,
             },
         });
-        this.manager.emit("playerStateUpdate", oldPlayer, this);
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChange");
         return this;
     }
 }

package/dist/structures/Queue.js

@@ -23,12 +23,22 @@ class Queue extends Array {
     current = null;
     /** The previous track */
     previous = null;
+    /** The Manager instance. */
+    manager;
+    /** The guild property. */
+    guild;
+    constructor(guild, manager) {
+        super();
+        this.manager = manager; // Initialize the manager
+        this.guild = guild; // Initialize the guild property
+    }
     /**
      * Adds a track to the queue.
      * @param track
      * @param [offset=null]
      */
     add(track, offset) {
+        const oldPlayer = { ...this.manager.players.get(this.guild) };
         if (!Utils_1.TrackUtils.validate(track)) {
             throw new RangeError('Track must be a "Track" or "Track[]".');
         }
@@ -65,8 +75,10 @@ class Queue extends Array {
                 }
             }
         }
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
     }
     remove(startOrPosition = 0, end) {
+        const oldPlayer = { ...this.manager.players.get(this.guild) };
         if (typeof end !== "undefined") {
             if (isNaN(Number(startOrPosition)) || isNaN(Number(end))) {
                 throw new RangeError(`Missing "start" or "end" parameter.`);
@@ -74,22 +86,31 @@ class Queue extends Array {
             if (startOrPosition >= end || startOrPosition >= this.length) {
                 throw new RangeError("Invalid start or end values.");
             }
-            return this.splice(startOrPosition, end - startOrPosition);
+            this.splice(startOrPosition, end - startOrPosition);
+            this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+            return;
         }
-        return this.splice(startOrPosition, 1);
+        this.splice(startOrPosition, 1);
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+        return;
     }
     /** Clears the queue. */
     clear() {
+        const oldPlayer = { ...this.manager.players.get(this.guild) };
         this.splice(0);
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
     }
     /** Shuffles the queue. */
     shuffle() {
+        const oldPlayer = { ...this.manager.players.get(this.guild) };
         for (let i = this.length - 1; i > 0; i--) {
             const j = Math.floor(Math.random() * (i + 1));
             [this[i], this[j]] = [this[j], this[i]];
         }
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
     }
     userBlockShuffle() {
+        const oldPlayer = { ...this.manager.players.get(this.guild) };
         const userTracks = new Map();
         this.forEach((track) => {
             const user = track.requester.id;
@@ -107,10 +128,12 @@ class Queue extends Array {
                 }
             });
         }
-        this.clear();
+        this.splice(0);
         this.add(shuffledQueue);
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
     }
     roundRobinShuffle() {
+        const oldPlayer = { ...this.manager.players.get(this.guild) };
         const userTracks = new Map();
         this.forEach((track) => {
             const user = track.requester.id;
@@ -137,8 +160,9 @@ class Queue extends Array {
                 }
             }
         }
-        this.clear();
+        this.splice(0);
         this.add(shuffledQueue);
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
     }
 }
 exports.Queue = Queue;

package/dist/structures/Rest.js

@@ -39,6 +39,10 @@ class Rest {
     async destroyPlayer(guildId) {
         return await this.delete(`/v4/sessions/${this.sessionId}/players/${guildId}`);
     }
+    /** Updates the session status for resuming. */
+    async updateSession(resuming, timeout) {
+        return await this.patch(`/v4/sessions/${this.sessionId}`, { resuming, timeout });
+    }
     /* Sends a GET request to the specified endpoint and returns the response data. */
     async request(method, endpoint, body) {
         const config = {

package/dist/structures/Utils.js

@@ -17,9 +17,23 @@ class TrackUtils {
     static setTrackPartial(partial) {
         if (!Array.isArray(partial) || !partial.every((str) => typeof str === "string"))
             throw new Error("Provided partial is not an array or not a string array.");
-        if (!partial.includes("track"))
-            partial.unshift("track");
-        this.trackPartial = partial;
+        const defaultProperties = [
+            "encoded",
+            "pluginInfo",
+            "identifier",
+            "isSeekable",
+            "author",
+            "length",
+            "isrc",
+            "isStream",
+            "title",
+            "uri",
+            "artworkUrl",
+            "sourceName",
+        ];
+        this.trackPartial = Array.from(new Set([...defaultProperties, ...partial]));
+        if (!this.trackPartial.includes("track"))
+            this.trackPartial.unshift("track");
     }
     /**
      * Checks if the provided argument is a valid Track or UnresolvedTrack, if provided an array then every element will be checked.
@@ -81,7 +95,7 @@ class TrackUtils {
                     const finalSize = SIZES.find((s) => s === size) ?? "default";
                     return this.uri.includes("youtube") ? `https://img.youtube.com/vi/${data.info.identifier}/${finalSize}.jpg` : null;
                 },
-                requester,
+                requester: requester,
                 pluginInfo: data.pluginInfo,
                 customData: {},
             };
@@ -112,7 +126,7 @@ class TrackUtils {
         if (typeof query === "undefined")
             throw new RangeError('Argument "query" must be present.');
         let unresolvedTrack = {
-            requester,
+            requester: requester,
             async resolve() {
                 const resolved = await TrackUtils.getClosestTrack(this);
                 Object.getOwnPropertyNames(this).forEach((prop) => delete this[prop]);

package/package.json

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