magmastream 2.9.3-dev.21 → 2.9.3-dev.23

package/dist/index.d.ts

@@ -859,7 +859,7 @@ declare abstract class Plugin {
 interface ManagerOptions {
     /** The state storage options.
      *
-     * @default { type: StateStorageType.Collection, deleteInactivePlayers: true }
+     * @default { type: StateStorageType.Collection, deleteDestroyedPlayers: true }
      */
     stateStorage?: StateStorageOptions;
     /** Enable priority mode over least player count or load balancing?
@@ -945,7 +945,7 @@ interface StateStorageOptions {
     type: StateStorageType;
     redisConfig?: RedisConfig;
     jsonConfig?: JsonConfig;
-    deleteInactivePlayers?: boolean;
+    deleteDestroyedPlayers?: boolean;
 }
 /**
  * Node Options
@@ -2435,6 +2435,11 @@ declare class Player {
      * @returns {Promise<void>} - A promise that resolves when the voice receiver error is handled.
      */
     private onVoiceReceiverError;
+    /**
+     * Updates the voice state for the player.
+     * @returns {Promise<void>} - A promise that resolves when the voice state is updated.
+     */
+    updateVoice(): Promise<void>;
 }
 
 /** Handles the requests sent to the Lavalink REST API. */
@@ -3101,11 +3106,6 @@ declare class Manager extends EventEmitter {
      * @emits {playerDisconnect} - Emits a player disconnect event if the channel ID is null.
      */
     private handleVoiceStateUpdate;
-    /**
-     * Cleans up inactive players by removing their state files from the file system.
-     * This is done to prevent stale state files from accumulating on the file system.
-     */
-    cleanupInactivePlayers(): Promise<void>;
     /**
      * Cleans up an inactive player by removing its state data.
      * This is done to prevent stale state data from accumulating.

package/dist/structures/Manager.js

@@ -92,7 +92,7 @@ class Manager extends events_1.EventEmitter {
             stateStorage: {
                 ...options.stateStorage,
                 type: options.stateStorage?.type ?? Enums_1.StateStorageType.Memory,
-                deleteInactivePlayers: options.stateStorage?.deleteInactivePlayers ?? true,
+                deleteDestroyedPlayers: options.stateStorage?.deleteDestroyedPlayers ?? true,
             },
             autoPlaySearchPlatforms: options.autoPlaySearchPlatforms ?? [Enums_1.AutoPlayPlatform.YouTube],
             send: this._send,
@@ -558,6 +558,7 @@ class Manager extends events_1.EventEmitter {
                                 };
                                 this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${state.guildId} from saved file: ${Utils_1.JSONUtils.safe(state.options, 2)}`);
                                 const player = this.create(playerOptions);
+                                player.connect();
                                 await player.node.rest.updatePlayer({
                                     guildId: state.options.guildId,
                                     data: {
@@ -565,11 +566,10 @@ class Manager extends events_1.EventEmitter {
                                             token: state.voiceState.event.token,
                                             endpoint: state.voiceState.event.endpoint,
                                             sessionId: state.voiceState.sessionId,
-                                            channelId: state.voiceState.event.channel_id,
+                                            channelId: state.voiceState.channelId,
                                         },
                                     },
                                 });
-                                player.connect();
                                 const tracks = [];
                                 const currentTrack = state.queue.current;
                                 const queueTracks = state.queue.tracks;
@@ -747,6 +747,7 @@ class Manager extends events_1.EventEmitter {
                                 };
                                 this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${guildId} from Redis`);
                                 const player = this.create(playerOptions);
+                                player.connect();
                                 await player.node.rest.updatePlayer({
                                     guildId: state.options.guildId,
                                     data: {
@@ -754,11 +755,10 @@ class Manager extends events_1.EventEmitter {
                                             token: state.voiceState.event.token,
                                             endpoint: state.voiceState.event.endpoint,
                                             sessionId: state.voiceState.sessionId,
-                                            channelId: state.voiceState.event.channel_id,
+                                            channelId: state.voiceState.channelId,
                                         },
                                     },
                                 });
-                                player.connect();
                                 // Rest of the player state restoration code (tracks, filters, etc.)
                                 const tracks = [];
                                 const currentTrack = state.queue.current;
@@ -949,8 +949,6 @@ class Manager extends events_1.EventEmitter {
                 }
             });
             await Promise.allSettled(savePromises);
-            if (this.options.stateStorage.deleteInactivePlayers)
-                await this.cleanupInactivePlayers();
             setTimeout(() => {
                 console.warn("\x1b[32m%s\x1b[0m", "MAGMASTREAM INFO: Shutting down complete, exiting...");
                 process.exit(0);
@@ -1080,15 +1078,8 @@ class Manager extends events_1.EventEmitter {
         player.voiceState.event = update;
         const sessionId = player.voiceState.sessionId;
         const channelId = player.voiceState.channelId;
-        const token = update.token;
-        const endpoint = update.endpoint;
-        this.emit(Enums_1.ManagerEventTypes.Debug, `Updated voice server for player ${player.guildId} with token ${token} | endpoint ${endpoint} | sessionId ${sessionId} | channelId ${channelId}`);
-        if (!sessionId || !channelId)
-            return;
-        await player.node.rest.updatePlayer({
-            guildId: player.guildId,
-            data: { voice: { token, endpoint, sessionId, channelId } },
-        });
+        this.emit(Enums_1.ManagerEventTypes.Debug, `Updated voice server for player ${player.guildId} with token ${update.token} | endpoint ${update.endpoint} | sessionId ${sessionId} | channelId ${channelId}`);
+        await player.updateVoice();
     }
     /**
      * Handles a voice state update by updating the player's voice channel and session ID if provided, or by disconnecting and destroying the player if the channel ID is null.
@@ -1115,94 +1106,7 @@ class Manager extends events_1.EventEmitter {
         player.voiceState.channelId = update.channel_id;
         player.voiceChannelId = update.channel_id;
         player.options.voiceChannelId = update.channel_id;
-        const token = player.voiceState.event?.token;
-        const endpoint = player.voiceState.event?.endpoint;
-        if (!token || !endpoint)
-            return;
-        await player.node.rest.updatePlayer({
-            guildId: player.guildId,
-            data: { voice: { token, endpoint, sessionId: update.session_id, channelId: update.channel_id } },
-        });
-    }
-    /**
-     * Cleans up inactive players by removing their state files from the file system.
-     * This is done to prevent stale state files from accumulating on the file system.
-     */
-    async cleanupInactivePlayers() {
-        switch (this.options.stateStorage.type) {
-            case Enums_1.StateStorageType.JSON:
-                {
-                    const playersBaseDir = Utils_1.PlayerUtils.getPlayersBaseDir();
-                    try {
-                        await promises_1.default.mkdir(playersBaseDir, { recursive: true });
-                        const activeGuildIds = new Set(this.players.keys());
-                        // Cleanup inactive guild directories inside playersBaseDir
-                        const guildDirs = await promises_1.default.readdir(playersBaseDir, { withFileTypes: true });
-                        for (const dirent of guildDirs) {
-                            if (!dirent.isDirectory())
-                                continue;
-                            const guildId = dirent.name;
-                            if (!activeGuildIds.has(guildId)) {
-                                const guildPath = Utils_1.PlayerUtils.getGuildDir(guildId);
-                                await promises_1.default.rm(guildPath, { recursive: true, force: true });
-                                this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Deleted inactive player data folder: ${guildId}`);
-                            }
-                        }
-                    }
-                    catch (err) {
-                        this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error cleaning up inactive JSON players: ${err}`);
-                        const error = err instanceof MagmastreamError_1.MagmaStreamError
-                            ? err
-                            : new MagmastreamError_1.MagmaStreamError({
-                                code: Enums_1.MagmaStreamErrorCode.MANAGER_CLEANUP_INACTIVE_PLAYERS_FAILED,
-                                message: "Error cleaning up inactive players.",
-                                cause: err,
-                                context: { stage: "CLEANUP_INACTIVE_PLAYERS" },
-                            });
-                        console.error(error);
-                    }
-                }
-                break;
-            case Enums_1.StateStorageType.Redis:
-                {
-                    const prefix = Utils_1.PlayerUtils.getRedisKey();
-                    const pattern = `${prefix}queue:*:current`;
-                    try {
-                        const stream = this.redis.scanStream({
-                            match: pattern,
-                            count: 100,
-                        });
-                        for await (const keys of stream) {
-                            for (const key of keys) {
-                                // Extract guildId from queue key
-                                const match = key.match(new RegExp(`^${prefix}queue:(.+):current$`));
-                                if (!match)
-                                    continue;
-                                const guildId = match[1];
-                                // If player is not active in memory, clean up all keys
-                                if (!this.players.has(guildId)) {
-                                    await this.redis.del(`${prefix}playerstore:${guildId}`, `${prefix}queue:${guildId}:current`, `${prefix}queue:${guildId}:tracks`, `${prefix}queue:${guildId}:previous`);
-                                    this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Cleaned inactive Redis player data: ${guildId}`);
-                                }
-                            }
-                        }
-                    }
-                    catch (err) {
-                        const error = err instanceof MagmastreamError_1.MagmaStreamError
-                            ? err
-                            : new MagmastreamError_1.MagmaStreamError({
-                                code: Enums_1.MagmaStreamErrorCode.MANAGER_SHUTDOWN_FAILED,
-                                message: "Error saving player state.",
-                                cause: err,
-                                context: { stage: "CLEANUP_INACTIVE_PLAYERS" },
-                            });
-                        console.error(error);
-                    }
-                }
-                break;
-            default:
-                break;
-        }
+        await player.updateVoice();
     }
     /**
      * Cleans up an inactive player by removing its state data.

package/dist/structures/Node.js

@@ -99,9 +99,7 @@ class Node {
                 this.createReadmeFile();
                 break;
             case Enums_1.StateStorageType.Redis:
-                this.redisPrefix = this.manager.options.stateStorage.redisConfig.prefix?.endsWith(":")
-                    ? this.manager.options.stateStorage.redisConfig.prefix
-                    : (this.manager.options.stateStorage.redisConfig.prefix ?? "magmastream:");
+                this.redisPrefix = Utils_1.PlayerUtils.getRedisKey();
                 break;
         }
     }
@@ -125,7 +123,7 @@ class Node {
         return `${this.redisPrefix}node:sessionIds`;
     }
     getNodeSessionsDir() {
-        return path_1.default.join(process.cwd(), "magmastream", "sessionData", "cluster", String(this.manager.options.clusterId), "nodeSessions");
+        return path_1.default.join(process.cwd(), "magmastream", "sessionData", "nodeSessions");
     }
     getNodeSessionPath() {
         const safeId = String(this.options.identifier).replace(/[^a-zA-Z0-9._-]/g, "_");
@@ -1173,8 +1171,12 @@ class Node {
      * @private
      */
     createReadmeFile() {
-        const readmeFilePath = path_1.default.join(process.cwd(), "magmastream", "README.md");
+        const baseDir = path_1.default.join(process.cwd(), "magmastream");
+        const readmeFilePath = path_1.default.join(baseDir, "README.md");
         const message = "Please do NOT delete the magmastream/ folder as it is used to store player data for autoresume etc.";
+        if (!fs_1.default.existsSync(baseDir)) {
+            fs_1.default.mkdirSync(baseDir, { recursive: true });
+        }
         if (!fs_1.default.existsSync(readmeFilePath)) {
             fs_1.default.writeFileSync(readmeFilePath, message, "utf-8");
             this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Created README file at: ${readmeFilePath}`);

package/dist/structures/Player.js

@@ -281,7 +281,7 @@ class Player {
         this.nowPlayingMessage = undefined;
         this.manager.emit(Enums_1.ManagerEventTypes.PlayerDestroy, this);
         const deleted = this.manager.players.delete(this.guildId);
-        if (this.manager.options.stateStorage.deleteInactivePlayers) {
+        if (this.manager.options.stateStorage.deleteDestroyedPlayers) {
             await this.manager.cleanupInactivePlayer(this.guildId);
         }
         return deleted;
@@ -1144,5 +1144,26 @@ class Player {
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `VoiceReceiver error for player ${this.guildId}: ${error.message}`);
         this.manager.emit(Enums_1.ManagerEventTypes.VoiceReceiverError, this, error);
     }
+    /**
+     * Updates the voice state for the player.
+     * @returns {Promise<void>} - A promise that resolves when the voice state is updated.
+     */
+    async updateVoice() {
+        const vs = this.voiceState;
+        const ev = vs?.event;
+        if (!vs?.channelId || !vs?.sessionId || !ev?.token || !ev?.endpoint)
+            return;
+        await this.node.rest.updatePlayer({
+            guildId: this.options.guildId,
+            data: {
+                voice: {
+                    token: ev.token,
+                    endpoint: ev.endpoint,
+                    sessionId: vs.sessionId,
+                    channelId: vs.channelId,
+                },
+            },
+        });
+    }
 }
 exports.Player = Player;

package/package.json

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