magmastream 2.9.0-dev.40 → 2.9.0-dev.42

package/dist/index.d.ts

@@ -965,10 +965,10 @@ interface NodeOptions {
      * @default false
      */
     enableSessionResumeOption?: boolean;
-    /** The time the lavalink server will wait before it removes the player.
-     * @default 1000
+    /** The time in seconds the lavalink server will wait before it removes the player.
+     * @default 60
      */
-    sessionTimeoutMs?: number;
+    sessionTimeoutSeconds?: number;
     /** The timeout used for api calls.
      * @default 10000
      */
@@ -981,6 +981,10 @@ interface NodeOptions {
      * @default false
      */
     isNodeLink?: boolean;
+    /** Whether the node is a backup node.
+     * @default false
+     */
+    isBackup?: boolean;
 }
 /**
  * Discord Packet
@@ -1811,8 +1815,8 @@ interface PlayerOptions {
     textChannelId: string;
     /** The voice channel the Player belongs to. */
     voiceChannelId?: string;
-    /** The node the Player uses. */
-    node?: string;
+    /** The node identifier the Player uses. */
+    nodeIdentifier?: string;
     /** The initial volume the Player will use. */
     volume?: number;
     /** If the player should mute itself. */

package/dist/structures/Manager.js

@@ -70,7 +70,7 @@ class Manager extends events_1.EventEmitter {
                     password: "Try BlackForHosting",
                     useSSL: true,
                     enableSessionResumeOption: false,
-                    sessionTimeoutMs: 1000,
+                    sessionTimeoutSeconds: 1000,
                     nodePriority: 69,
                 },
             ],
@@ -498,7 +498,7 @@ class Manager extends events_1.EventEmitter {
                                         voiceChannelId: state.options.voiceChannelId,
                                         selfDeafen: state.options.selfDeafen,
                                         volume: lavaPlayer.volume || state.options.volume,
-                                        node: nodeId,
+                                        nodeIdentifier: nodeId,
                                     };
                                     this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${state.guildId} from saved file: ${JSON.stringify(state.options)}`);
                                     const player = this.create(playerOptions);
@@ -696,7 +696,7 @@ class Manager extends events_1.EventEmitter {
                                         voiceChannelId: state.options.voiceChannelId,
                                         selfDeafen: state.options.selfDeafen,
                                         volume: lavaPlayer?.volume || state.options.volume,
-                                        node: nodeId,
+                                        nodeIdentifier: nodeId,
                                     };
                                     this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${guildId} from Redis`);
                                     const player = this.create(playerOptions);
@@ -1127,30 +1127,30 @@ class Manager extends events_1.EventEmitter {
         switch (this.options.stateStorage.type) {
             case Enums_1.StateStorageType.JSON:
                 {
-                    const playersStoreDir = path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "playersStore");
-                    const playersDataDir = this.options.stateStorage?.jsonConfig?.path ?? path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "players");
+                    const playerStoreDir = path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "playerStore");
+                    const playerDataDir = this.options.stateStorage?.jsonConfig?.path ?? path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "players");
                     try {
-                        await promises_1.default.mkdir(playersStoreDir, { recursive: true });
-                        await promises_1.default.mkdir(playersDataDir, { recursive: true });
+                        await promises_1.default.mkdir(playerStoreDir, { recursive: true });
+                        await promises_1.default.mkdir(playerDataDir, { recursive: true });
                         const activeGuildIds = new Set(this.players.keys());
-                        // Clean up playersStore/*.json
-                        const playerStateFiles = await promises_1.default.readdir(playersStoreDir);
+                        // Clean up playerStore/*.json
+                        const playerStateFiles = await promises_1.default.readdir(playerStoreDir);
                         for (const file of playerStateFiles) {
                             const guildId = path_1.default.basename(file, ".json");
                             if (!activeGuildIds.has(guildId)) {
-                                const filePath = path_1.default.join(playersStoreDir, file);
+                                const filePath = path_1.default.join(playerStoreDir, file);
                                 await promises_1.default.unlink(filePath);
                                 this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Deleted inactive player state: ${guildId}`);
                             }
                         }
                         // Clean up players/<guildId>/ folders
-                        const guildDirs = await promises_1.default.readdir(playersDataDir, { withFileTypes: true });
+                        const guildDirs = await promises_1.default.readdir(playerDataDir, { withFileTypes: true });
                         for (const dirent of guildDirs) {
                             if (!dirent.isDirectory())
                                 continue;
                             const guildId = dirent.name;
                             if (!activeGuildIds.has(guildId)) {
-                                const guildPath = path_1.default.join(playersDataDir, guildId);
+                                const guildPath = path_1.default.join(playerDataDir, guildId);
                                 await promises_1.default.rm(guildPath, { recursive: true, force: true });
                                 this.emit(Enums_1.ManagerEventTypes.Debug, `[MANAGER] Deleted inactive player data folder: ${guildId}`);
                             }
@@ -1202,7 +1202,7 @@ class Manager extends events_1.EventEmitter {
         switch (this.options.stateStorage.type) {
             case Enums_1.StateStorageType.JSON:
                 {
-                    const playersStoreDir = path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "playersStore");
+                    const playersStoreDir = path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "playerStore");
                     const playersDataDir = this.options.stateStorage?.jsonConfig?.path ?? path_1.default.join(process.cwd(), "magmastream", "dist", "sessionData", "players");
                     try {
                         if (!this.players.has(guildId)) {
@@ -1344,7 +1344,7 @@ class Manager extends events_1.EventEmitter {
      */
     get leastLoadNode() {
         return this.nodes
-            .filter((node) => node.connected)
+            .filter((node) => node.connected && !node.options.isBackup)
             .sort((a, b) => {
             const aload = a.stats.cpu ? (a.stats.cpu.lavalinkLoad / a.stats.cpu.cores) * 100 : 0;
             const bload = b.stats.cpu ? (b.stats.cpu.lavalinkLoad / b.stats.cpu.cores) * 100 : 0;
@@ -1359,9 +1359,7 @@ class Manager extends events_1.EventEmitter {
      * @returns {Collection<string, Node>} A collection of nodes sorted by player count.
      */
     get leastPlayersNode() {
-        return this.nodes
-            .filter((node) => node.connected) // Filter out nodes that are not connected
-            .sort((a, b) => a.stats.players - b.stats.players); // Sort by the number of players
+        return this.nodes.filter((node) => node.connected && !node.options.isBackup).sort((a, b) => a.stats.players - b.stats.players);
     }
     /**
      * Returns a node based on priority.

package/dist/structures/Node.js

@@ -56,10 +56,11 @@ class Node {
             maxRetryAttempts: options.maxRetryAttempts ?? 30,
             retryDelayMs: options.retryDelayMs ?? 60000,
             enableSessionResumeOption: options.enableSessionResumeOption ?? false,
-            sessionTimeoutMs: options.sessionTimeoutMs ?? 1000,
+            sessionTimeoutSeconds: options.sessionTimeoutSeconds ?? 60,
             apiRequestTimeoutMs: options.apiRequestTimeoutMs ?? 10000,
             nodePriority: options.nodePriority ?? 0,
             isNodeLink: options.isNodeLink ?? false,
+            isBackup: options.isBackup ?? false,
         };
         if (this.options.useSSL) {
             this.options.port = 443;
@@ -373,6 +374,10 @@ class Node {
         };
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[NODE] Connected node: ${JSON.stringify(debugInfo)}`);
         this.manager.emit(Enums_1.ManagerEventTypes.NodeConnect, this);
+        const playersOnBackupNode = this.manager.players.filter((p) => p.node.options.isBackup);
+        if (playersOnBackupNode.size) {
+            Promise.all(Array.from(playersOnBackupNode.values(), (player) => player.moveNode(this.options.identifier)));
+        }
     }
     /**
      * Handles the "close" event emitted by the WebSocket connection.
@@ -401,6 +406,13 @@ class Node {
                 await Promise.all(Array.from(players.values(), (player) => player.autoMoveNode()));
             }
         }
+        else {
+            const backUpNodes = this.manager.nodes.filter((node) => node.options.isBackup && node.connected);
+            const backupNode = backUpNodes.first();
+            if (backupNode) {
+                await Promise.all(Array.from(this.manager.players.values(), (player) => player.moveNode(backupNode.options.identifier)));
+            }
+        }
         if (code !== 1000 || reason !== "destroy")
             await this.reconnect();
     }
@@ -474,7 +486,7 @@ class Node {
                 if (this.options.enableSessionResumeOption) {
                     await this.rest.patch(`/v4/sessions/${this.sessionId}`, {
                         resuming: this.options.enableSessionResumeOption,
-                        timeout: this.options.sessionTimeoutMs,
+                        timeout: this.options.sessionTimeoutSeconds,
                     });
                 }
                 break;

package/dist/structures/Player.js

@@ -92,7 +92,7 @@ class Player {
         if (options.textChannelId)
             this.textChannelId = options.textChannelId;
         // Set the node to use, either the specified node or the first available node.
-        const node = this.manager.nodes.get(options.node);
+        const node = this.manager.nodes.get(options.nodeIdentifier);
         this.node = node || this.manager.useableNode;
         // If no node is available, throw an error.
         if (!this.node)
@@ -862,7 +862,7 @@ class Player {
         if (force && newPlayer) {
             await newPlayer.destroy();
         }
-        newOptions.node = newOptions.node ?? this.options.node;
+        newOptions.nodeIdentifier = newOptions.nodeIdentifier ?? this.options.nodeIdentifier;
         newOptions.selfDeafen = newOptions.selfDeafen ?? oldPlayerProperties.selfDeafen;
         newOptions.selfMute = newOptions.selfMute ?? oldPlayerProperties.selfMute;
         newOptions.volume = newOptions.volume ?? oldPlayerProperties.volume;

package/dist/utils/nodeCheck.js

@@ -12,7 +12,7 @@ function nodeCheck(options) {
         throw new TypeError("NodeOptions must not be empty.");
     // Validate the host option
     // The host option must be present and be a non-empty string.
-    const { host, identifier, password, port, enableSessionResumeOption, sessionTimeoutMs, maxRetryAttempts, retryDelayMs, useSSL, nodePriority } = options;
+    const { host, identifier, password, port, enableSessionResumeOption, sessionTimeoutSeconds, maxRetryAttempts, retryDelayMs, useSSL, nodePriority } = options;
     if (typeof host !== "string" || !/.+/.test(host)) {
         throw new TypeError('Node option "host" must be present and be a non-empty string.');
     }
@@ -36,10 +36,10 @@ function nodeCheck(options) {
     if (typeof enableSessionResumeOption !== "undefined" && typeof enableSessionResumeOption !== "boolean") {
         throw new TypeError('Node option "enableSessionResumeOption" must be a boolean.');
     }
-    // Validate the sessionTimeoutMs option
-    // The sessionTimeoutMs option must be a number or undefined.
-    if (typeof sessionTimeoutMs !== "undefined" && typeof sessionTimeoutMs !== "number") {
-        throw new TypeError('Node option "sessionTimeoutMs" must be a number.');
+    // Validate the sessionTimeoutSeconds option
+    // The sessionTimeoutSeconds option must be a number or undefined.
+    if (typeof sessionTimeoutSeconds !== "undefined" && typeof sessionTimeoutSeconds !== "number") {
+        throw new TypeError('Node option "sessionTimeoutSeconds" must be a number.');
     }
     // Validate the maxRetryAttempts option
     // The maxRetryAttempts option must be a number or undefined.

package/dist/utils/playerCheck.js

@@ -12,7 +12,7 @@ function playerCheck(options) {
         throw new TypeError("PlayerOptions must not be empty.");
     }
     // Get the guild ID, node, selfDeafen, selfMute, textChannelId, voiceChannelId, and volume from the options.
-    const { guildId, node, selfDeafen, selfMute, textChannelId, voiceChannelId, volume } = options;
+    const { guildId, nodeIdentifier, selfDeafen, selfMute, textChannelId, voiceChannelId, volume } = options;
     // Validate the guild ID option
     // The guild ID option must be a non-empty string.
     if (!/^\d+$/.test(guildId)) {
@@ -20,8 +20,8 @@ function playerCheck(options) {
     }
     // Validate the node option
     // The node option must be a string.
-    if (node && typeof node !== "string") {
-        throw new TypeError('Player option "node" must be a non-empty string.');
+    if (nodeIdentifier && typeof nodeIdentifier !== "string") {
+        throw new TypeError('Player option "nodeIdentifier" must be a non-empty string.');
     }
     // Validate the selfDeafen option
     // The selfDeafen option must be a boolean.

package/package.json

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