magmastream 2.10.5 → 2.10.6-alpha.2

package/dist/structures/Manager.d.ts

@@ -117,12 +117,6 @@ export declare class Manager extends EventEmitter {
      * @param {string} guildId - The guild ID of the player to save
      */
     savePlayerState(guildId: string): Promise<void>;
-    /**
-     * Sleeps for a specified amount of time.
-     * @param ms The amount of time to sleep in milliseconds.
-     * @returns A promise that resolves after the specified amount of time.
-     */
-    private sleep;
     private restorePlayerFromState;
     private restoreQueue;
     private restorePreviousQueue;

package/dist/structures/Manager.js

@@ -529,19 +529,10 @@ class Manager extends events_1.EventEmitter {
         await player.queue.clearPrevious();
         await player.queue.setCurrent(null);
     }
-    /**
-     * Sleeps for a specified amount of time.
-     * @param ms The amount of time to sleep in milliseconds.
-     * @returns A promise that resolves after the specified amount of time.
-     */
-    async sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
     async restorePlayerFromState(node, nodeId, guildId, state, cleanup) {
         if (!state.guildId || state.node?.options?.identifier !== nodeId)
             return;
-        const hasGuild = this.resolveGuild(state.guildId);
-        if (!hasGuild)
+        if (state.guildId !== guildId)
             return;
         const lavaPlayer = (await node.rest.get(`/v4/sessions/${state.node.sessionId}/players/${state.guildId}`));
         if (!lavaPlayer)
@@ -584,7 +575,6 @@ class Manager extends events_1.EventEmitter {
             await player.pause(true);
         await cleanup();
         this.emit(Enums_1.ManagerEventTypes.PlayerRestored, player, node);
-        await this.sleep(1000);
     }
     async restoreQueue(node, player, state, lavaPlayer) {
         const currentTrack = state.queue.current;
@@ -724,12 +714,14 @@ class Manager extends events_1.EventEmitter {
                         await promises_1.default.mkdir(playersBaseDir, { recursive: true });
                     });
                     const guildDirs = await promises_1.default.readdir(playersBaseDir, { withFileTypes: true });
-                    for (const file of guildDirs) {
-                        if (!file.isDirectory())
-                            continue;
-                        const guildId = file.name;
+                    await Promise.all(guildDirs
+                        .filter((file) => file.isDirectory())
+                        .map(async ({ name: guildId }) => {
                         const stateFilePath = Utils_1.PlayerUtils.getPlayerStatePath(guildId);
                         try {
+                            // Guilds outside this client's cache belong to another cluster; skip them before reading any file.
+                            if (!this.resolveGuild(guildId))
+                                return;
                             await promises_1.default.access(stateFilePath);
                             const state = JSON.parse(await promises_1.default.readFile(stateFilePath, "utf-8"));
                             await this.restorePlayerFromState(node, nodeId, guildId, state, async () => {
@@ -740,7 +732,7 @@ class Manager extends events_1.EventEmitter {
                         catch (error) {
                             this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error processing guild ${guildId}: ${error}`);
                         }
-                    }
+                    }));
                 }
                 catch (error) {
                     this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error loading player states: ${error}`);
@@ -750,17 +742,17 @@ class Manager extends events_1.EventEmitter {
             case Enums_1.StateStorageType.Redis: {
                 try {
                     const keys = await this.redis.keys(`${Utils_1.PlayerUtils.getRedisKey()}playerstore:*`);
-                    for (const key of keys) {
+                    await Promise.all(keys.map(async (key) => {
                         try {
+                            const guildId = key.split(":").pop();
+                            if (!guildId || !this.resolveGuild(guildId))
+                                return;
                             const data = await this.redis.get(key);
                             if (!data)
-                                continue;
+                                return;
                             const state = JSON.parse(data);
                             if (!state || typeof state !== "object")
-                                continue;
-                            const guildId = key.split(":").pop();
-                            if (!guildId)
-                                continue;
+                                return;
                             await this.restorePlayerFromState(node, nodeId, guildId, state, async () => {
                                 await this.redis.del(key);
                                 this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Deleted Redis state: ${key}`);
@@ -769,7 +761,7 @@ class Manager extends events_1.EventEmitter {
                         catch (error) {
                             this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error processing Redis key ${key}: ${error}`);
                         }
-                    }
+                    }));
                 }
                 catch (error) {
                     this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error loading player states from Redis: ${error}`);

package/dist/structures/Node.js

@@ -11,6 +11,7 @@ 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((segment) => segment.toLowerCase());
+const TRACK_REQUIRED_EVENTS = new Set(["TrackStartEvent", "TrackEndEvent", "TrackStuckEvent", "TrackExceptionEvent"]);
 class Node {
     manager;
     options;
@@ -484,7 +485,9 @@ class Node {
                 this.handlePlayerUpdate(payload);
                 break;
             case "event":
-                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Node message: ${Utils_1.JSONUtils.safe(payload, 2)}`);
+                if (this.manager.listenerCount(Enums_1.ManagerEventTypes.Debug)) {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Node message: ${Utils_1.JSONUtils.safe(payload, 2)}`);
+                }
                 await this.handleEvent(payload);
                 break;
             case "ready":
@@ -531,6 +534,7 @@ class Node {
         if (!player || player.node.options.identifier !== this.options.identifier)
             return;
         player.position = payload.state.position ?? 0;
+        player.ping = payload.state.ping ?? -1;
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerUpdate, player, payload);
     }
     /**
@@ -567,8 +571,7 @@ class Node {
             return;
         const track = await this.resolveEventTrack(player, payload);
         const type = payload.type;
-        const trackRequiredEvents = ["TrackStartEvent", "TrackEndEvent", "TrackStuckEvent", "TrackExceptionEvent"];
-        if (!track && trackRequiredEvents.includes(type)) {
+        if (!track && TRACK_REQUIRED_EVENTS.has(type)) {
             this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Received ${type} for guild ${payload.guildId}, but neither the payload nor local queue contains a usable track.`);
             return;
         }
@@ -1227,7 +1230,9 @@ class Node {
     socketClosed(player, payload) {
         // A move can close the old socket after the new connection is ready.
         this.manager.emit(Enums_1.ManagerEventTypes.SocketClosed, player, payload);
-        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Websocket closed for player: ${player.guildId} with payload: ${Utils_1.JSONUtils.safe(payload, 2)}`);
+        if (this.manager.listenerCount(Enums_1.ManagerEventTypes.Debug)) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Websocket closed for player: ${player.guildId} with payload: ${Utils_1.JSONUtils.safe(payload, 2)}`);
+        }
     }
     /**
      * Emitted when the segments for a track are loaded.

package/dist/structures/Player.d.ts

@@ -18,6 +18,8 @@ export declare class Player {
     dynamicRepeat: boolean;
     /** The time the player is in the track. */
     position: number;
+    /** Last node-reported Discord voice ping in milliseconds; -1 when unavailable. */
+    ping: number;
     /** Whether the player is playing. */
     playing: boolean;
     /** Whether the player is paused. */
@@ -84,6 +86,8 @@ export declare class Player {
      * @returns {T} - The data associated with the key, cast to the specified type.
      */
     get<T>(key: string): T;
+    /** Returns the last node-reported Discord voice ping in milliseconds, or -1 when unavailable. */
+    getPing(): number;
     /**
      * Same as Manager#search() but a shortcut on the player itself.
      * @param query
@@ -101,6 +105,7 @@ export declare class Player {
      * @returns {this} The player instance.
      */
     disconnect(): Promise<this>;
+    private emitConnectionChange;
     /**
      * Destroys the player and clears the queue.
      * @param {boolean} disconnect - Whether to disconnect the player from the voice channel.

package/dist/structures/Player.js

@@ -26,6 +26,8 @@ class Player {
     dynamicRepeat = false;
     /** The time the player is in the track. */
     position = 0;
+    /** Last node-reported Discord voice ping in milliseconds; -1 when unavailable. */
+    ping = -1;
     /** Whether the player is playing. */
     playing = false;
     /** Whether the player is paused. */
@@ -162,6 +164,10 @@ class Player {
         // Access the data object using the key and cast it to the specified type T.
         return this.data[key];
     }
+    /** Returns the last node-reported Discord voice ping in milliseconds, or -1 when unavailable. */
+    getPing() {
+        return this.ping;
+    }
     /**
      * Same as Manager#search() but a shortcut on the player itself.
      * @param query
@@ -187,7 +193,7 @@ class Player {
         // Set the player state to connecting.
         this.state = Enums_1.StateTypes.Connecting;
         // Clone the current player state for comparison.
-        const oldPlayer = this ? { ...this } : null;
+        const oldPlayer = { ...this };
         this.manager.sendPacket({
             op: 4,
             d: {
@@ -200,15 +206,7 @@ class Player {
         // Set the player state to connected.
         this.state = Enums_1.StateTypes.Connected;
         // Emit the player state update event.
-        this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
-            changeType: Enums_1.PlayerStateEventTypes.ConnectionChange,
-            details: {
-                type: "connection",
-                action: "connect",
-                previousConnection: oldPlayer?.state === Enums_1.StateTypes.Connected,
-                currentConnection: true,
-            },
-        });
+        this.emitConnectionChange(oldPlayer, "connect");
     }
     /**
      * Disconnects the player from the voice channel.
@@ -218,7 +216,7 @@ class Player {
         // Set the player state to disconnecting.
         this.state = Enums_1.StateTypes.Disconnecting;
         // Clone the current player state for comparison.
-        const oldPlayer = this ? { ...this } : null;
+        const oldPlayer = { ...this };
         // Pause the player.
         if (this.options.pauseOnDisconnect) {
             await this.pause(true);
@@ -238,16 +236,19 @@ class Player {
         // Set the player state to disconnected.
         this.state = Enums_1.StateTypes.Disconnected;
         // Emit the player state update event.
+        this.emitConnectionChange(oldPlayer, "disconnect");
+        return this;
+    }
+    emitConnectionChange(oldPlayer, action) {
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Enums_1.PlayerStateEventTypes.ConnectionChange,
             details: {
                 type: "connection",
-                action: "disconnect",
+                action,
                 previousConnection: oldPlayer.state === Enums_1.StateTypes.Connected,
-                currentConnection: false,
+                currentConnection: action === "connect",
             },
         });
-        return this;
     }
     /**
      * Destroys the player and clears the queue.
@@ -1340,7 +1341,9 @@ class Player {
         }
         if (!packet?.op)
             return;
-        this.manager.emit(Enums_1.ManagerEventTypes.Debug, `VoiceReceiver recieved a payload: ${Utils_1.JSONUtils.safe(textPayload, 2)}`);
+        if (this.manager.listenerCount(Enums_1.ManagerEventTypes.Debug)) {
+            this.manager.emit(Enums_1.ManagerEventTypes.Debug, `VoiceReceiver recieved a payload: ${Utils_1.JSONUtils.safe(textPayload, 2)}`);
+        }
         switch (packet.type) {
             case "startSpeakingEvent": {
                 this.manager.emit(Enums_1.ManagerEventTypes.VoiceReceiverStartSpeaking, this, packet.data);
@@ -1355,7 +1358,9 @@ class Player {
                 break;
             }
             default: {
-                this.manager.emit(Enums_1.ManagerEventTypes.Debug, `VoiceReceiver recieved an unknown payload: ${Utils_1.JSONUtils.safe(textPayload, 2)}`);
+                if (this.manager.listenerCount(Enums_1.ManagerEventTypes.Debug)) {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `VoiceReceiver recieved an unknown payload: ${Utils_1.JSONUtils.safe(textPayload, 2)}`);
+                }
                 break;
             }
         }
@@ -1408,9 +1413,12 @@ class Player {
             return;
         }
         if (frame.op === 3) {
-            const stream = this.voiceReceiverStreams.get(key) ?? { guildId: frame.guildId, userId: frame.userId, type: frame.type, chunks: [] };
+            let stream = this.voiceReceiverStreams.get(key);
+            if (!stream) {
+                stream = { guildId: frame.guildId, userId: frame.userId, type: frame.type, chunks: [] };
+                this.voiceReceiverStreams.set(key, stream);
+            }
             stream.chunks.push(frame.data);
-            this.voiceReceiverStreams.set(key, stream);
             this.manager.emit(Enums_1.ManagerEventTypes.VoiceReceiverData, this, {
                 userId: frame.userId,
                 guildId: frame.guildId,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.5",
+    "version": "2.10.6-alpha.2",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -11,7 +11,7 @@
         "prepare": "npm run build",
         "build": "tsc",
         "types": "rtb --dist dist",
-        "test": "npm run build && node --test tests/player-state.test.cjs",
+        "test": "npm run build && node --test tests/player-state.test.cjs tests/hot-paths.test.cjs tests/restore-performance.test.cjs",
         "format": "prettier --write .",
         "format:check": "prettier --check .",
         "lint": "eslint \"src/**/*.{ts,js}\"",