magmastream 2.9.3-dev.20 → 2.9.3-dev.21

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 import { Collection } from '@discordjs/collection';
 import { GatewayVoiceStateUpdate } from 'discord-api-types/v10';
 import { EventEmitter } from 'events';
-import { User, ClientUser, Message, Client } from 'discord.js';
-import { User as User$1, Message as Message$1, Client as Client$2 } from 'oceanic.js';
-import { User as User$2, Message as Message$2, Bot } from '@discordeno/bot';
-import { User as User$3, Message as Message$3, Client as Client$1 } from 'eris';
-import { User as User$4, ClientUser as ClientUser$1, Message as Message$4, Client as Client$3, WorkerClient } from 'seyfert';
+import { User, ClientUser, Guild, Message, Client } from 'discord.js';
+import { User as User$1, Guild as Guild$1, Message as Message$1, Client as Client$2 } from 'oceanic.js';
+import { User as User$2, Guild as Guild$2, Message as Message$2, Bot } from '@discordeno/bot';
+import { User as User$3, Guild as Guild$3, Message as Message$3, Client as Client$1 } from 'eris';
+import { User as User$4, ClientUser as ClientUser$1, Guild as Guild$4, Message as Message$4, Client as Client$3, WorkerClient } from 'seyfert';
 import WebSocket$1, { WebSocket } from 'ws';
 import { Redis } from 'ioredis';
 
@@ -925,8 +925,18 @@ interface ManagerOptions {
      * Optional user cache getter.
      * When resolving a user from a partial ID, this function will be called first.
      * Should return the full user object if cached, or undefined if not.
+     * @param id The ID of the user to get.
+     * @returns The user object if cached, or undefined if not.
      */
     getUser?: (id: string) => AnyUser | undefined;
+    /**
+     * Optional guild cache getter.
+     * When resolving a guild from a partial ID, this function will be called first.
+     * Should return the full guild object if cached, or undefined if not.
+     * @param id The ID of the guild to get.
+     * @returns The guild object if cached, or undefined if not.
+     */
+    getGuild?: (id: string) => AnyGuild | undefined;
 }
 /**
  * State Storage Options
@@ -1013,6 +1023,10 @@ interface PortableMessage {
  * Any message
  */
 type AnyMessage = PortableMessage | Message | Message$1 | Message$2 | Message$3 | Message$4;
+/**
+ * Any guild
+ */
+type AnyGuild = Guild | Guild$1 | Guild$2 | Guild$3 | Guild$4<"cached">;
 /**
  * Discord Packet
  */
@@ -2913,6 +2927,7 @@ declare class Manager extends EventEmitter {
     redis?: Redis;
     private _send;
     private _getUser?;
+    private _getGuild?;
     private loadedPlugins;
     /**
      * Initiates the Manager class.
@@ -3142,6 +3157,11 @@ declare class Manager extends EventEmitter {
      * Can be overridden by wrapper managers to return wrapper-specific User classes.
      */
     resolveUser(user: AnyUser | string): Promise<AnyUser>;
+    /**
+     * Resolves a Guild ID to a real guild object.
+     * Can be overridden by wrapper managers to return wrapper-specific Guild classes.
+     */
+    resolveGuild(guildId: string): AnyGuild;
 }
 
 declare class Filters {
@@ -3693,6 +3713,7 @@ declare class DiscordJSManager extends Manager {
     constructor(client: Client, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
     resolveUser(user: AnyUser | string): Promise<User | AnyUser>;
+    resolveGuild(guildId: string): Guild | null;
 }
 
 /**
@@ -3703,6 +3724,7 @@ declare class ErisManager extends Manager {
     constructor(client: Client$1, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
     resolveUser(user: AnyUser | string): Promise<User$3 | AnyUser>;
+    resolveGuild(guildId: string): Guild$3;
 }
 
 /**
@@ -3713,6 +3735,7 @@ declare class OceanicManager extends Manager {
     constructor(client: Client$2, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
     resolveUser(user: AnyUser | string): Promise<User$1 | AnyUser>;
+    resolveGuild(guildId: string): Guild$1;
 }
 
 /**
@@ -3745,7 +3768,8 @@ declare class SeyfertManager extends Manager {
     constructor(client: Client$3 | WorkerClient, options?: ManagerOptions);
     protected send(packet: GatewayVoiceStateUpdate): void;
     resolveUser(user: AnyUser | string): Promise<User$4 | AnyUser>;
+    resolveGuild(guildId: string): Guild$4<"cached">;
 }
 
 export { AutoPlayPlatform, AutoPlayUtils, AvailableFilters, DiscordJSManager, DiscordenoManager, ErisManager, Filters, JSONUtils, JsonQueue, LoadTypes, MagmaStreamError, MagmaStreamErrorCode, MagmaStreamErrorNumbers, Manager, ManagerEventTypes, MemoryQueue, Node, OceanicManager, Player, PlayerStateEventTypes, PlayerUtils, Plugin, RedisQueue, Rest, SearchPlatform, SeverityTypes, SeyfertManager, SponsorBlockSegment, StateStorageType, StateTypes, Structure, TrackEndReasonTypes, TrackPartial, TrackSourceTypes, TrackUtils, UseNodeOptions };
-export type { AlbumSearchResult, AnyMessage, AnyUser, ArtistSearchResult, CPUStats, DiscordPacket, DistortionOptions, EndSpeakingEventVoiceReceiver, EndSpeakingEventVoiceReceiverData, EqualizerBand, ErrorOrEmptySearchResult, Exception, Extendable, FrameStats, IQueue, JsonConfig, KaraokeOptions, LavaPlayer, LavalinkInfo, LavalinkResponse, LavalinkVoiceStateResponse, LavalinkVoiceStateUpdate, LoadType, Lyrics, LyricsEvent, LyricsEventType, LyricsFoundEvent, LyricsLine, LyricsLineEvent, LyricsNotFoundEvent, ManagerEvents, ManagerInitOptions, ManagerOptions, MemoryStats, NodeLinkGetLyrics, NodeLinkGetLyricsEmpty, NodeLinkGetLyricsError, NodeLinkGetLyricsMultiple, NodeLinkGetLyricsSingle, NodeMessage, NodeOptions, NodeStats, PlayOptions, PlayerEvent, PlayerEventType, PlayerEvents, PlayerOptions, PlayerStateUpdateEvent, PlayerUpdateVoiceState, PlaylistData, PlaylistInfoData, PlaylistRawData, PlaylistSearchResult, PodcastSearchResult, PortableMessage, PortableUser, RedisConfig, RestPlayOptions, ReverbOptions, RotationOptions, SearchQuery, SearchResult, SearchSearchResult, Severity, ShortSearchResult, ShowSearchResult, Sizes, SponsorBlockChapterStarted, SponsorBlockChaptersLoaded, SponsorBlockSegmentEventType, SponsorBlockSegmentEvents, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, StartSpeakingEventVoiceReceiver, StartSpeakingEventVoiceReceiverData, StateStorageOptions, StationSearchResult, TimescaleOptions, Track, TrackData, TrackDataInfo, TrackEndEvent, TrackEndReason, TrackExceptionEvent, TrackPluginInfo, TrackSearchResult, TrackSourceName, TrackStartEvent, TrackStuckEvent, UseNodeOption, VibratoOptions, VoicePacket, VoiceReceiverEvent, VoiceServer, VoiceServerUpdate, VoiceState, WebSocketClosedEvent };
+export type { AlbumSearchResult, AnyGuild, AnyMessage, AnyUser, ArtistSearchResult, CPUStats, DiscordPacket, DistortionOptions, EndSpeakingEventVoiceReceiver, EndSpeakingEventVoiceReceiverData, EqualizerBand, ErrorOrEmptySearchResult, Exception, Extendable, FrameStats, IQueue, JsonConfig, KaraokeOptions, LavaPlayer, LavalinkInfo, LavalinkResponse, LavalinkVoiceStateResponse, LavalinkVoiceStateUpdate, LoadType, Lyrics, LyricsEvent, LyricsEventType, LyricsFoundEvent, LyricsLine, LyricsLineEvent, LyricsNotFoundEvent, ManagerEvents, ManagerInitOptions, ManagerOptions, MemoryStats, NodeLinkGetLyrics, NodeLinkGetLyricsEmpty, NodeLinkGetLyricsError, NodeLinkGetLyricsMultiple, NodeLinkGetLyricsSingle, NodeMessage, NodeOptions, NodeStats, PlayOptions, PlayerEvent, PlayerEventType, PlayerEvents, PlayerOptions, PlayerStateUpdateEvent, PlayerUpdateVoiceState, PlaylistData, PlaylistInfoData, PlaylistRawData, PlaylistSearchResult, PodcastSearchResult, PortableMessage, PortableUser, RedisConfig, RestPlayOptions, ReverbOptions, RotationOptions, SearchQuery, SearchResult, SearchSearchResult, Severity, ShortSearchResult, ShowSearchResult, Sizes, SponsorBlockChapterStarted, SponsorBlockChaptersLoaded, SponsorBlockSegmentEventType, SponsorBlockSegmentEvents, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, StartSpeakingEventVoiceReceiver, StartSpeakingEventVoiceReceiverData, StateStorageOptions, StationSearchResult, TimescaleOptions, Track, TrackData, TrackDataInfo, TrackEndEvent, TrackEndReason, TrackExceptionEvent, TrackPluginInfo, TrackSearchResult, TrackSourceName, TrackStartEvent, TrackStuckEvent, UseNodeOption, VibratoOptions, VoicePacket, VoiceReceiverEvent, VoiceServer, VoiceServerUpdate, VoiceState, WebSocketClosedEvent };

package/dist/structures/Manager.js

@@ -29,6 +29,7 @@ class Manager extends events_1.EventEmitter {
     redis;
     _send;
     _getUser;
+    _getGuild;
     loadedPlugins = new Set();
     /**
      * Initiates the Manager class.
@@ -64,6 +65,8 @@ class Manager extends events_1.EventEmitter {
             this._send = options.send;
         if (options.getUser && !this._getUser)
             this._getUser = options.getUser;
+        if (options.getGuild && !this._getGuild)
+            this._getGuild = options.getGuild;
         this.options = {
             ...options,
             enabledPlugins: options.enabledPlugins ?? [],
@@ -533,10 +536,11 @@ class Manager extends events_1.EventEmitter {
                                 await promises_1.default.access(stateFilePath);
                                 const rawData = await promises_1.default.readFile(stateFilePath, "utf-8");
                                 const state = JSON.parse(rawData);
-                                if (state.clusterId !== this.options.clusterId)
-                                    continue;
                                 if (!state.guildId || state.node?.options?.identifier !== nodeId)
                                     continue;
+                                const hasGuild = this.resolveGuild(state.guildId);
+                                if (!hasGuild)
+                                    continue;
                                 const lavaPlayer = await node.rest.getPlayer(state.guildId);
                                 if (!lavaPlayer) {
                                     await this.destroy(state.guildId);
@@ -686,31 +690,18 @@ class Manager extends events_1.EventEmitter {
                                         filterActions[filter](true);
                                     }
                                 }
-                                this.emit(Enums_1.ManagerEventTypes.PlayerRestored, player, node);
-                                await this.sleep(1000);
-                            }
-                            catch (error) {
-                                this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error processing player state for guild ${guildId}: ${error}`);
-                                continue;
-                            }
-                        }
-                        // Cleanup old player state files from guild directories whose nodeId matches
-                        for (const dirent of guildDirs) {
-                            if (!dirent.isDirectory())
-                                continue;
-                            const guildId = dirent.name;
-                            const stateFilePath = Utils_1.PlayerUtils.getPlayerStatePath(guildId);
-                            try {
-                                await promises_1.default.access(stateFilePath);
-                                const data = await promises_1.default.readFile(stateFilePath, "utf-8");
-                                const state = JSON.parse(data);
-                                if (state && typeof state === "object" && state.node?.options?.identifier === nodeId) {
+                                try {
                                     await promises_1.default.rm(Utils_1.PlayerUtils.getPlayerStatePath(guildId), { force: true });
                                     this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Deleted player state folder for guild ${guildId}`);
                                 }
+                                catch (error) {
+                                    this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error deleting player state for guild ${guildId}: ${error}`);
+                                }
+                                this.emit(Enums_1.ManagerEventTypes.PlayerRestored, player, node);
+                                await this.sleep(1000);
                             }
                             catch (error) {
-                                this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error deleting player state for guild ${guildId}: ${error}`);
+                                this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Error processing player state for guild ${guildId}: ${error}`);
                                 continue;
                             }
                         }
@@ -732,11 +723,14 @@ class Manager extends events_1.EventEmitter {
                                 if (!data)
                                     continue;
                                 const state = JSON.parse(data);
-                                if (!state || typeof state !== "object" || state.clusterId !== this.options.clusterId)
+                                if (!state || typeof state !== "object")
                                     continue;
                                 const guildId = key.split(":").pop();
                                 if (!guildId || state.node.options.identifier !== nodeId)
                                     continue;
+                                const hasGuild = this.resolveGuild(guildId);
+                                if (!hasGuild)
+                                    continue;
                                 const lavaPlayer = await node.rest.getPlayer(state.guildId);
                                 if (!lavaPlayer) {
                                     await this.destroy(guildId);
@@ -1468,5 +1462,14 @@ class Manager extends events_1.EventEmitter {
             return { id: user }; // fallback by ID only
         return user; // default: just return the portable user
     }
+    /**
+     * Resolves a Guild ID to a real guild object.
+     * Can be overridden by wrapper managers to return wrapper-specific Guild classes.
+     */
+    resolveGuild(guildId) {
+        if (!guildId)
+            return null;
+        return this._getGuild?.(guildId);
+    }
 }
 exports.Manager = Manager;

package/dist/structures/Utils.js

@@ -737,7 +737,7 @@ class PlayerUtils {
      * Gets the base directory for player data.
      */
     static getPlayersBaseDir() {
-        return path_1.default.join(process.cwd(), "magmastream", "sessionData", "cluster", String(this.manager.options.clusterId), "players");
+        return path_1.default.join(process.cwd(), "magmastream", "sessionData", "players");
     }
     /**
      * Gets the path to the player's directory.
@@ -777,8 +777,7 @@ class PlayerUtils {
         // Default prefix
         let prefix = (cfg.prefix ?? "magmastream:").trim();
         prefix = prefix.replace(/:+$/g, "") + ":";
-        const clusterId = String(this.manager.options.clusterId ?? 0).trim() || "0";
-        return `${prefix}cluster:${clusterId}:`;
+        return prefix;
     }
 }
 exports.PlayerUtils = PlayerUtils;

package/dist/wrappers/discord.js.js

@@ -60,5 +60,11 @@ class DiscordJSManager extends Manager_1.Manager {
             return { id, username: typeof user === "string" ? undefined : user.username };
         }
     }
+    resolveGuild(guildId) {
+        const cached = this.client.guilds.cache.get(guildId);
+        if (cached)
+            return cached;
+        return null;
+    }
 }
 exports.DiscordJSManager = DiscordJSManager;

package/dist/wrappers/eris.js

@@ -46,5 +46,11 @@ class ErisManager extends Manager_1.Manager {
             username: typeof user === "string" ? undefined : user.username,
         };
     }
+    resolveGuild(guildId) {
+        const cached = this.client.guilds.get(guildId);
+        if (cached)
+            return cached;
+        return null;
+    }
 }
 exports.ErisManager = ErisManager;

package/dist/wrappers/oceanic.js

@@ -47,5 +47,11 @@ class OceanicManager extends Manager_1.Manager {
             username: typeof user === "string" ? undefined : user.username,
         };
     }
+    resolveGuild(guildId) {
+        const cached = this.client.guilds.get(guildId);
+        if (cached)
+            return cached;
+        return null;
+    }
 }
 exports.OceanicManager = OceanicManager;

package/dist/wrappers/seyfert.js

@@ -75,5 +75,11 @@ class SeyfertManager extends Manager_1.Manager {
             return { id, username: typeof user === "string" ? undefined : user.username };
         }
     }
+    resolveGuild(guildId) {
+        const cached = this.client.cache.guilds?.get(guildId);
+        if (cached)
+            return cached;
+        return null;
+    }
 }
 exports.SeyfertManager = SeyfertManager;

package/package.json

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