magmastream 2.10.5-alpha.1 → 2.10.6-alpha.1

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,14 +529,6 @@ 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;
@@ -584,7 +576,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,10 +715,9 @@ 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 {
                             await promises_1.default.access(stateFilePath);
@@ -740,7 +730,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 +740,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 data = await this.redis.get(key);
                             if (!data)
-                                continue;
+                                return;
                             const state = JSON.parse(data);
                             if (!state || typeof state !== "object")
-                                continue;
+                                return;
                             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 +759,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.d.ts

@@ -23,7 +23,6 @@ export declare class Node {
     private reconnectTimeout?;
     private reconnectAttempts;
     private redisPrefix?;
-    /** Session ID sent in the reconnect header for resumption — cleared once the ready op is received. */
     private pendingResumeSessionId;
     /**
      * Creates an instance of Node.

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;
@@ -31,7 +32,6 @@ class Node {
     reconnectTimeout;
     reconnectAttempts = 0;
     redisPrefix;
-    /** Session ID sent in the reconnect header for resumption — cleared once the ready op is received. */
     pendingResumeSessionId = null;
     /**
      * Creates an instance of Node.
@@ -256,12 +256,7 @@ class Node {
             "User-Id": this.manager.options.clientId,
             "Client-Name": this.manager.options.clientName,
         };
-        // Capture resume session ID for the WS header, then clear this.sessionId.
-        // REST calls guard on this.sessionId being non-null — keeping the stale value
-        // would let updatePlayer/destroyPlayer fire with an invalid session during the
-        // reconnect window (between connect() and the 'ready' op).
-        // pendingResumeSessionId is kept so the 'ready' handler can still compute
-        // hadPreviousSession correctly. this.sessionId is re-set by 'ready'.
+        // Keep the resume header while blocking REST calls until the next ready event.
         this.pendingResumeSessionId = this.sessionId;
         this.sessionId = null;
         if (typeof this.pendingResumeSessionId === "string" && this.pendingResumeSessionId.length > 0) {
@@ -310,11 +305,9 @@ class Node {
         if (players.size) {
             await Promise.all(Array.from(players.values(), (player) => player.autoMoveNode()));
         }
-        // Always clear reconnect state regardless of connection status
         clearTimeout(this.reconnectTimeout);
         this.reconnectTimeout = undefined;
         this.reconnectAttempts = 0;
-        // Only close the socket if it is actually open
         if (this.connected) {
             this.socket.close(1000, "destroy");
             this.socket.removeAllListeners();
@@ -419,9 +412,7 @@ class Node {
         };
         this.manager.emit(Enums_1.ManagerEventTypes.NodeDisconnect, this, { code, reason });
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Disconnected node: ${Utils_1.JSONUtils.safe(debugInfo, 2)}`);
-        // Null the session ID immediately so REST calls during the reconnect delay
-        // window don't fire with a stale session. connect() reloads it from storage
-        // into pendingResumeSessionId for the WS Session-Id header.
+        // Prevent REST calls from using a stale session during reconnect.
         this.sessionId = null;
         if (this.manager.useableNode) {
             const players = this.manager.players.filter((player) => player.node.options.identifier == this.options.identifier);
@@ -494,15 +485,14 @@ 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":
                 this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Node message: ${Utils_1.JSONUtils.safe(payload, 2)}`);
                 this.rest.setSessionId(payload.sessionId);
-                // pendingResumeSessionId holds what we sent in Session-Id header (if anything).
-                // Use it — not this.sessionId which was nulled in connect() — to detect whether
-                // we attempted resumption with a different session than what Lavalink gave back.
                 const hadPreviousSession = this.pendingResumeSessionId && this.pendingResumeSessionId !== payload.sessionId;
                 this.pendingResumeSessionId = null;
                 this.sessionId = payload.sessionId;
@@ -544,7 +534,6 @@ class Node {
         if (!player || player.node.options.identifier !== this.options.identifier)
             return;
         player.position = payload.state.position ?? 0;
-        // Transport status can lag lifecycle events; expose it without overwriting player.state.
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerUpdate, player, payload);
     }
     /**
@@ -581,8 +570,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;
         }
@@ -1239,9 +1227,11 @@ class Node {
      * @param {WebSocketClosedEvent} payload - The event payload containing additional data about the WebSocket close event.
      */
     socketClosed(player, payload) {
-        // This may describe the old voice socket after a channel move, not a lifecycle disconnect.
+        // 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

@@ -101,6 +101,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

@@ -187,7 +187,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 +200,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 +210,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 +230,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.
@@ -1136,9 +1131,6 @@ class Player {
                     context: { guildId: this.guildId },
                 });
             }
-            // Only destroy the player on the old node if it is still reachable.
-            // If the server is down the REST call would fail anyway; skipping it
-            // also prevents a spurious error when switching nodes during an outage.
             if (this.node.connected) {
                 await this.node.rest.destroyPlayer(this.guildId).catch(() => { });
             }
@@ -1343,7 +1335,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);
@@ -1358,7 +1352,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;
             }
         }
@@ -1411,9 +1407,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-alpha.1",
+    "version": "2.10.6-alpha.1",
     "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}\"",