magmastream 2.9.3-dev.22 → 2.9.3-dev.24

package/dist/index.d.ts

@@ -915,6 +915,10 @@ interface ManagerOptions {
      * @default UseNodeOptions.LeastPlayers
      */
     useNode?: UseNodeOptions.LeastLoad | UseNodeOptions.LeastPlayers;
+    /** Whether the manager should listen to SIGINT and SIGTERM events.
+     * @default true
+     */
+    listenToSIGEvents?: boolean;
     /**
      * Function to send data to the websocket.
      * @param id The ID of the node to send the data to.
@@ -2435,6 +2439,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. */
@@ -3146,6 +3155,7 @@ declare class Manager extends EventEmitter {
     private get priorityNode();
     protected send(packet: GatewayVoiceStateUpdate): unknown;
     protected getUserFromCache(id: string): AnyUser | undefined;
+    protected getGuildFromCache(id: string): AnyGuild | undefined;
     sendPacket(packet: GatewayVoiceStateUpdate): unknown;
     /**
      * Resolves a PortableUser or ID to a real user object.
@@ -3698,6 +3708,7 @@ declare class DiscordenoManager extends Manager {
      * Uses user-provided cache getter if available, otherwise falls back to minimal info.
      */
     resolveUser(user: AnyUser | string): Promise<User$2 | AnyUser>;
+    resolveGuild(guildId: string): AnyGuild;
 }
 
 /**

package/dist/structures/Manager.js

@@ -95,6 +95,7 @@ class Manager extends events_1.EventEmitter {
                 deleteDestroyedPlayers: options.stateStorage?.deleteDestroyedPlayers ?? true,
             },
             autoPlaySearchPlatforms: options.autoPlaySearchPlatforms ?? [Enums_1.AutoPlayPlatform.YouTube],
+            listenToSIGEvents: options.listenToSIGEvents ?? true,
             send: this._send,
         };
         Utils_1.AutoPlayUtils.init(this);
@@ -102,49 +103,51 @@ class Manager extends events_1.EventEmitter {
             for (const nodeOptions of this.options.nodes)
                 new Node_1.Node(this, nodeOptions);
         }
-        process.on("SIGINT", async () => {
-            console.warn("\x1b[33mSIGINT received! Graceful shutdown initiated...\x1b[0m");
-            try {
-                await this.handleShutdown();
-                console.warn("\x1b[32mShutdown complete. Waiting for Node.js event loop to empty...\x1b[0m");
-                // Prevent forced exit by Windows
-                setTimeout(() => {
+        if (this.options.listenToSIGEvents) {
+            process.on("SIGINT", async () => {
+                console.warn("\x1b[33mSIGINT received! Graceful shutdown initiated...\x1b[0m");
+                try {
+                    await this.handleShutdown();
+                    console.warn("\x1b[32mShutdown complete. Waiting for Node.js event loop to empty...\x1b[0m");
+                    // Prevent forced exit by Windows
+                    setTimeout(() => {
+                        process.exit(0);
+                    }, 2000);
+                }
+                catch (err) {
+                    const error = err instanceof MagmastreamError_1.MagmaStreamError
+                        ? err
+                        : new MagmastreamError_1.MagmaStreamError({
+                            code: Enums_1.MagmaStreamErrorCode.MANAGER_SHUTDOWN_FAILED,
+                            message: "An unknown error occurred.",
+                            cause: err,
+                            context: { stage: "SIGINT" },
+                        });
+                    console.error(error);
+                    process.exit(1);
+                }
+            });
+            process.on("SIGTERM", async () => {
+                console.warn("\x1b[33mSIGTERM received! Graceful shutdown initiated...\x1b[0m");
+                try {
+                    await this.handleShutdown();
+                    console.warn("\x1b[32mShutdown complete. Exiting now...\x1b[0m");
                     process.exit(0);
-                }, 2000);
-            }
-            catch (err) {
-                const error = err instanceof MagmastreamError_1.MagmaStreamError
-                    ? err
-                    : new MagmastreamError_1.MagmaStreamError({
-                        code: Enums_1.MagmaStreamErrorCode.MANAGER_SHUTDOWN_FAILED,
-                        message: "An unknown error occurred.",
-                        cause: err,
-                        context: { stage: "SIGINT" },
-                    });
-                console.error(error);
-                process.exit(1);
-            }
-        });
-        process.on("SIGTERM", async () => {
-            console.warn("\x1b[33mSIGTERM received! Graceful shutdown initiated...\x1b[0m");
-            try {
-                await this.handleShutdown();
-                console.warn("\x1b[32mShutdown complete. Exiting now...\x1b[0m");
-                process.exit(0);
-            }
-            catch (err) {
-                const error = err instanceof MagmastreamError_1.MagmaStreamError
-                    ? err
-                    : new MagmastreamError_1.MagmaStreamError({
-                        code: Enums_1.MagmaStreamErrorCode.MANAGER_SHUTDOWN_FAILED,
-                        message: "An unknown error occurred.",
-                        cause: err,
-                        context: { stage: "SIGTERM" },
-                    });
-                console.error(error);
-                process.exit(1);
-            }
-        });
+                }
+                catch (err) {
+                    const error = err instanceof MagmastreamError_1.MagmaStreamError
+                        ? err
+                        : new MagmastreamError_1.MagmaStreamError({
+                            code: Enums_1.MagmaStreamErrorCode.MANAGER_SHUTDOWN_FAILED,
+                            message: "An unknown error occurred.",
+                            cause: err,
+                            context: { stage: "SIGTERM" },
+                        });
+                    console.error(error);
+                    process.exit(1);
+                }
+            });
+        }
     }
     /**
      * Initiates the Manager.
@@ -527,10 +530,10 @@ class Manager extends events_1.EventEmitter {
                         });
                         // Read guild directories inside players base dir
                         const guildDirs = await promises_1.default.readdir(playersBaseDir, { withFileTypes: true });
-                        for (const dirent of guildDirs) {
-                            if (!dirent.isDirectory())
+                        for (const file of guildDirs) {
+                            if (!file.isDirectory())
                                 continue;
-                            const guildId = dirent.name;
+                            const guildId = file.name;
                             const stateFilePath = Utils_1.PlayerUtils.getPlayerStatePath(guildId);
                             try {
                                 await promises_1.default.access(stateFilePath);
@@ -556,23 +559,9 @@ class Manager extends events_1.EventEmitter {
                                     applyVolumeAsFilter: state.options.applyVolumeAsFilter,
                                     pauseOnDisconnect: state.options.pauseOnDisconnect,
                                 };
-                                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);
-                                await player.node.rest.updatePlayer({
-                                    guildId: state.options.guildId,
-                                    data: {
-                                        voice: {
-                                            token: state.voiceState.event.token,
-                                            endpoint: state.voiceState.event.endpoint,
-                                            sessionId: state.voiceState.sessionId,
-                                            channelId: state.voiceState.event.channel_id,
-                                        },
-                                    },
-                                });
+                                this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${state.guildId} from saved file: ${Utils_1.JSONUtils.safe(state.options, 2)}`);
                                 player.connect();
-                                const tracks = [];
-                                const currentTrack = state.queue.current;
-                                const queueTracks = state.queue.tracks;
                                 if (state.isAutoplay) {
                                     const savedUser = state.data.clientUser;
                                     if (savedUser) {
@@ -584,6 +573,9 @@ class Manager extends events_1.EventEmitter {
                                 if (savedNowPlayingMessage) {
                                     player.setNowPlayingMessage(savedNowPlayingMessage);
                                 }
+                                const tracks = [];
+                                const currentTrack = state.queue.current;
+                                const queueTracks = state.queue.tracks;
                                 if (lavaPlayer.track) {
                                     await player.queue.clear();
                                     if (currentTrack) {
@@ -732,9 +724,8 @@ class Manager extends events_1.EventEmitter {
                                 if (!hasGuild)
                                     continue;
                                 const lavaPlayer = await node.rest.getPlayer(state.guildId);
-                                if (!lavaPlayer) {
+                                if (!lavaPlayer)
                                     await this.destroy(guildId);
-                                }
                                 const playerOptions = {
                                     guildId: state.options.guildId,
                                     textChannelId: state.options.textChannelId,
@@ -745,24 +736,9 @@ class Manager extends events_1.EventEmitter {
                                     applyVolumeAsFilter: state.options.applyVolumeAsFilter,
                                     pauseOnDisconnect: state.options.pauseOnDisconnect,
                                 };
-                                this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${guildId} from Redis`);
                                 const player = this.create(playerOptions);
-                                await player.node.rest.updatePlayer({
-                                    guildId: state.options.guildId,
-                                    data: {
-                                        voice: {
-                                            token: state.voiceState.event.token,
-                                            endpoint: state.voiceState.event.endpoint,
-                                            sessionId: state.voiceState.sessionId,
-                                            channelId: state.voiceState.event.channel_id,
-                                        },
-                                    },
-                                });
+                                this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${guildId} from Redis`);
                                 player.connect();
-                                // Rest of the player state restoration code (tracks, filters, etc.)
-                                const tracks = [];
-                                const currentTrack = state.queue.current;
-                                const queueTracks = state.queue.tracks;
                                 if (state.isAutoplay) {
                                     const savedUser = state.data.clientUser;
                                     if (savedUser) {
@@ -774,6 +750,10 @@ class Manager extends events_1.EventEmitter {
                                 if (savedNowPlayingMessage) {
                                     player.setNowPlayingMessage(savedNowPlayingMessage);
                                 }
+                                // Rest of the player state restoration code (tracks, filters, etc.)
+                                const tracks = [];
+                                const currentTrack = state.queue.current;
+                                const queueTracks = state.queue.tracks;
                                 if (lavaPlayer.track) {
                                     await player.queue.clear();
                                     if (currentTrack) {
@@ -1078,15 +1058,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.
@@ -1113,14 +1086,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 } },
-        });
+        await player.updateVoice();
     }
     /**
      * Cleans up an inactive player by removing its state data.
@@ -1366,6 +1332,9 @@ class Manager extends events_1.EventEmitter {
     getUserFromCache(id) {
         return this._getUser?.(id);
     }
+    getGuildFromCache(id) {
+        return this._getGuild?.(id);
+    }
     sendPacket(packet) {
         return this.send(packet);
     }

package/dist/structures/Node.js

@@ -127,7 +127,8 @@ class Node {
     }
     getNodeSessionPath() {
         const safeId = String(this.options.identifier).replace(/[^a-zA-Z0-9._-]/g, "_");
-        return path_1.default.join(this.getNodeSessionsDir(), `${safeId}.txt`);
+        const clusterId = String(this.manager.options.clusterId ?? 0);
+        return path_1.default.join(this.getNodeSessionsDir(), `${safeId}__${clusterId}.txt`);
     }
     /**
      * Loads session IDs from the sessionIds.json file if it exists.
@@ -1171,8 +1172,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

@@ -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/dist/wrappers/discordeno.js

@@ -69,5 +69,9 @@ class DiscordenoManager extends Manager_1.Manager {
             username: typeof user === "string" ? undefined : user.username,
         };
     }
+    resolveGuild(guildId) {
+        // Try user-provided cache getter
+        return this.getGuildFromCache(guildId);
+    }
 }
 exports.DiscordenoManager = DiscordenoManager;

package/package.json

@@ -1,107 +1,107 @@
 {
-	"name": "magmastream",
-	"version": "2.9.3-dev.22",
-	"description": "A user-friendly Lavalink client designed for NodeJS.",
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"files": [
-		"dist"
-	],
-	"scripts": {
-		"build": "tsc",
-		"types": "rtb --dist dist",
-		"format": "prettier --write .",
-		"format:check": "prettier --check .",
-		"lint": "eslint \"src/**/*.{ts,js}\"",
-		"lint:fix": "eslint --fix \"src/**/*.{ts,js}\"",
-		"ci": "run-s format:check lint build types",
-		"release:dev": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=dev && git push && npm publish --tag dev"
-	},
-	"devDependencies": {
-		"@favware/rollup-type-bundler": "^4.0.0",
-		"@types/jsdom": "^27.0.0",
-		"@types/lodash": "^4.17.24",
-		"@types/node": "^25.3.0",
-		"@types/ws": "^8.18.1",
-		"@typescript-eslint/eslint-plugin": "^8.56.0",
-		"@typescript-eslint/parser": "^8.56.0",
-		"eslint": "^10.0.1",
-		"npm-run-all": "^4.1.5",
-		"prettier": "^3.8.1",
-		"typedoc": "^0.28.17",
-		"typedoc-plugin-no-inherit": "^1.6.1",
-		"typescript": "^5.9.3"
-	},
-	"dependencies": {
-		"@discordjs/collection": "^2.1.1",
-		"axios": "^1.13.5",
-		"events": "^3.3.0",
-		"ioredis": "^5.9.3",
-		"jsdom": "^28.1.0",
-		"lodash": "^4.17.23",
-		"safe-stable-stringify": "^2.5.0",
-		"tslib": "^2.8.1",
-		"ws": "^8.19.0"
-	},
-	"optionalDependencies": {
-		"discord.js": "14.x",
-		"discordeno": "21.x",
-		"eris": "0.18.x",
-		"oceanic.js": "^1.13.0",
-		"seyfert": "4.x"
-	},
-	"overrides": {
-		"undici": "^6.23.0"
-	},
-	"engines": {
-		"node": ">=20.19.0"
-	},
-	"eslintConfig": {
-		"root": true,
-		"parser": "@typescript-eslint/parser",
-		"plugins": [
-			"@typescript-eslint"
-		],
-		"rules": {
-			"object-curly-spacing": [
-				"error",
-				"always"
-			]
-		},
-		"extends": [
-			"eslint:recommended",
-			"plugin:@typescript-eslint/recommended"
-		]
-	},
-	"keywords": [
-		"lavalink client",
-		"wrapper",
-		"typescript",
-		"discord.js",
-		"node.js",
-		"java",
-		"javascript",
-		"audio streaming",
-		"music bot",
-		"voice chat",
-		"discord integration",
-		"high performance",
-		"scalable",
-		"easy-to-use",
-		"feature-rich",
-		"cross-platform",
-		"seamless integration",
-		"community support",
-		"documentation",
-		"open-source",
-		"lavalink",
-		"magmastream"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git+https://gitryx.com/MagmaStream/magmastream.git#main"
-	},
-	"homepage": "https://docs.magmastream.com",
-	"author": "Abel Purnwasy",
-	"license": "Apache-2.0"
+    "name": "magmastream",
+    "version": "2.9.3-dev.24",
+    "description": "A user-friendly Lavalink client designed for NodeJS.",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "files": [
+        "dist"
+    ],
+    "scripts": {
+        "build": "tsc",
+        "types": "rtb --dist dist",
+        "format": "prettier --write .",
+        "format:check": "prettier --check .",
+        "lint": "eslint \"src/**/*.{ts,js}\"",
+        "lint:fix": "eslint --fix \"src/**/*.{ts,js}\"",
+        "ci": "run-s format:check lint build types",
+        "release:dev": "npm run format && npm run lint:fix && npm run ci && npm version prerelease --preid=dev && git push && npm publish --tag dev"
+    },
+    "devDependencies": {
+        "@favware/rollup-type-bundler": "^4.0.0",
+        "@types/jsdom": "^28.0.0",
+        "@types/lodash": "^4.17.24",
+        "@types/node": "^25.3.0",
+        "@types/ws": "^8.18.1",
+        "@typescript-eslint/eslint-plugin": "^8.56.0",
+        "@typescript-eslint/parser": "^8.56.0",
+        "eslint": "^10.0.2",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^3.8.1",
+        "typedoc": "^0.28.17",
+        "typedoc-plugin-no-inherit": "^1.6.1",
+        "typescript": "^5.9.3"
+    },
+    "dependencies": {
+        "@discordjs/collection": "^2.1.1",
+        "axios": "^1.13.6",
+        "events": "^3.3.0",
+        "ioredis": "^5.10.0",
+        "jsdom": "^28.1.0",
+        "lodash": "^4.17.23",
+        "safe-stable-stringify": "^2.5.0",
+        "tslib": "^2.8.1",
+        "ws": "^8.19.0"
+    },
+    "optionalDependencies": {
+        "discord.js": "14.x",
+        "discordeno": "21.x",
+        "eris": "0.18.x",
+        "oceanic.js": "1.13.x",
+        "seyfert": "4.x"
+    },
+    "overrides": {
+        "undici": "^7.0.0"
+    },
+    "engines": {
+        "node": ">=20.19.0"
+    },
+    "eslintConfig": {
+        "root": true,
+        "parser": "@typescript-eslint/parser",
+        "plugins": [
+            "@typescript-eslint"
+        ],
+        "rules": {
+            "object-curly-spacing": [
+                "error",
+                "always"
+            ]
+        },
+        "extends": [
+            "eslint:recommended",
+            "plugin:@typescript-eslint/recommended"
+        ]
+    },
+    "keywords": [
+        "lavalink client",
+        "wrapper",
+        "typescript",
+        "discord.js",
+        "node.js",
+        "java",
+        "javascript",
+        "audio streaming",
+        "music bot",
+        "voice chat",
+        "discord integration",
+        "high performance",
+        "scalable",
+        "easy-to-use",
+        "feature-rich",
+        "cross-platform",
+        "seamless integration",
+        "community support",
+        "documentation",
+        "open-source",
+        "lavalink",
+        "magmastream"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitryx.com/MagmaStream/magmastream.git#main"
+    },
+    "homepage": "https://docs.magmastream.com",
+    "author": "Abel Purnwasy",
+    "license": "Apache-2.0"
 }